var alias = match.Groups[2].Value;
var sb = new StringBuilder("
5000 || image.Height > 5000)
+ {
+ //use mid quality
+ g.InterpolationMode = InterpolationMode.Bilinear;
+ }
+ else
+ {
+ //use best quality
+ g.InterpolationMode = InterpolationMode.HighQualityBicubic;
+ }
+
+
+ g.SmoothingMode = SmoothingMode.HighQuality;
g.PixelOffsetMode = PixelOffsetMode.HighQuality;
g.CompositingQuality = CompositingQuality.HighQuality;
diff --git a/src/Umbraco.Core/Models/ContentBase.cs b/src/Umbraco.Core/Models/ContentBase.cs
index 3fbdeccda8..c18c7c3a43 100644
--- a/src/Umbraco.Core/Models/ContentBase.cs
+++ b/src/Umbraco.Core/Models/ContentBase.cs
@@ -306,10 +306,8 @@ namespace Umbraco.Core.Models
///
Value as a
public virtual TPassType GetValue
(string propertyTypeAlias)
{
- if (Properties[propertyTypeAlias].Value is TPassType)
- return (TPassType)Properties[propertyTypeAlias].Value;
-
- return (TPassType)Convert.ChangeType(Properties[propertyTypeAlias].Value, typeof(TPassType));
+ var convertAttempt = Properties[propertyTypeAlias].Value.TryConvertTo();
+ return convertAttempt.Success ? convertAttempt.Result : default(TPassType);
}
///
diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs
index d377095a05..73b5ed34db 100644
--- a/src/Umbraco.Core/Models/ContentExtensions.cs
+++ b/src/Umbraco.Core/Models/ContentExtensions.cs
@@ -26,6 +26,20 @@ namespace Umbraco.Core.Models
{
#region IContent
+ ///
+ /// Returns true if this entity was just published as part of a recent save operation (i.e. it wasn't previously published)
+ ///
+ ///
+ ///
+ ///
+ /// This is helpful for determining if the published event will execute during the saved event for a content item.
+ ///
+ internal static bool JustPublished(this IContent entity)
+ {
+ var dirty = (IRememberBeingDirty)entity;
+ return dirty.WasPropertyDirty("Published") && entity.Published;
+ }
+
///
/// Determines if a new version should be created
///
@@ -618,7 +632,7 @@ namespace Umbraco.Core.Models
/// Xml representation of the passed in
internal static XElement ToDeepXml(this IContent content)
{
- return ApplicationContext.Current.Services.PackagingService.Export(content, true);
+ return ApplicationContext.Current.Services.PackagingService.Export(content, true, raiseEvents: false);
}
///
@@ -628,7 +642,7 @@ namespace Umbraco.Core.Models
/// Xml representation of the passed in
public static XElement ToXml(this IContent content)
{
- return ApplicationContext.Current.Services.PackagingService.Export(content);
+ return ApplicationContext.Current.Services.PackagingService.Export(content, raiseEvents: false);
}
///
@@ -638,24 +652,19 @@ namespace Umbraco.Core.Models
/// Xml representation of the passed in
public static XElement ToXml(this IMedia media)
{
- return ApplicationContext.Current.Services.PackagingService.Export(media);
- }
-
- internal static XElement ToDeepXml(this IMedia media)
- {
- return ApplicationContext.Current.Services.PackagingService.Export(media, true);
+ return ApplicationContext.Current.Services.PackagingService.Export(media, raiseEvents: false);
}
///
- /// Creates the xml representation for the object
+ /// Creates the full xml representation for the object and all of it's descendants
///
- /// to generate xml for
- /// Xml representation of the passed in
- public static XElement ToXml(this IMember member)
+ /// to generate xml for
+ /// Xml representation of the passed in
+ internal static XElement ToDeepXml(this IMedia media)
{
- return ApplicationContext.Current.Services.PackagingService.Export(member);
+ return ApplicationContext.Current.Services.PackagingService.Export(media, true, raiseEvents: false);
}
-
+
///
/// Creates the xml representation for the object
///
@@ -668,6 +677,16 @@ namespace Umbraco.Core.Models
//If current IContent is published we should get latest unpublished version
return content.ToXml();
}
+
+ ///
+ /// Creates the xml representation for the object
+ ///
+ /// to generate xml for
+ /// Xml representation of the passed in
+ public static XElement ToXml(this IMember member)
+ {
+ return ((PackagingService)(ApplicationContext.Current.Services.PackagingService)).Export(member);
+ }
#endregion
}
diff --git a/src/Umbraco.Core/Models/ContentTypeBase.cs b/src/Umbraco.Core/Models/ContentTypeBase.cs
index 87acf07d45..f22c72f34d 100644
--- a/src/Umbraco.Core/Models/ContentTypeBase.cs
+++ b/src/Umbraco.Core/Models/ContentTypeBase.cs
@@ -43,6 +43,7 @@ namespace Umbraco.Core.Models
_allowedContentTypes = new List();
_propertyGroups = new PropertyGroupCollection();
_propertyTypes = new PropertyTypeCollection();
+ _propertyTypes.CollectionChanged += PropertyTypesChanged;
_additionalData = new Dictionary();
}
@@ -54,6 +55,7 @@ namespace Umbraco.Core.Models
_allowedContentTypes = new List();
_propertyGroups = new PropertyGroupCollection();
_propertyTypes = new PropertyTypeCollection();
+ _propertyTypes.CollectionChanged += PropertyTypesChanged;
_additionalData = new Dictionary();
}
@@ -433,8 +435,7 @@ namespace Umbraco.Core.Models
{
if (PropertyTypeExists(propertyType.Alias) == false)
{
- _propertyTypes.Add(propertyType);
- _propertyTypes.CollectionChanged += PropertyTypesChanged;
+ _propertyTypes.Add(propertyType);
return true;
}
diff --git a/src/Umbraco.Core/Models/DictionaryItem.cs b/src/Umbraco.Core/Models/DictionaryItem.cs
index db3f47ba13..c670a75108 100644
--- a/src/Umbraco.Core/Models/DictionaryItem.cs
+++ b/src/Umbraco.Core/Models/DictionaryItem.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Reflection;
using System.Runtime.Serialization;
using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
namespace Umbraco.Core.Models
{
diff --git a/src/Umbraco.Core/Models/EntityExtensions.cs b/src/Umbraco.Core/Models/EntityExtensions.cs
new file mode 100644
index 0000000000..6daf99a58d
--- /dev/null
+++ b/src/Umbraco.Core/Models/EntityExtensions.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+ public static class EntityExtensions
+ {
+
+ ///
+ /// Returns true if this entity has just been created and persisted to the data store
+ ///
+ ///
+ ///
+ ///
+ /// This is useful when handling events to determine if an entity is a brand new entity or was
+ /// already existing.
+ ///
+ public static bool IsNewEntity(this IEntity entity)
+ {
+ var dirty = (IRememberBeingDirty)entity;
+ return dirty.WasPropertyDirty("Id");
+ }
+ }
+}
diff --git a/src/Umbraco.Core/Models/File.cs b/src/Umbraco.Core/Models/File.cs
index 978e54390f..f520b63210 100644
--- a/src/Umbraco.Core/Models/File.cs
+++ b/src/Umbraco.Core/Models/File.cs
@@ -6,6 +6,16 @@ using Umbraco.Core.Models.EntityBase;
namespace Umbraco.Core.Models
{
+ internal sealed class Folder : Entity
+ {
+ public Folder(string folderPath)
+ {
+ Path = folderPath;
+ }
+
+ public string Path { get; set; }
+ }
+
///
/// Represents an abstract file which provides basic functionality for a File with an Alias and Name
///
@@ -23,6 +33,8 @@ namespace Umbraco.Core.Models
private static readonly PropertyInfo ContentSelector = ExpressionHelper.GetPropertyInfo(x => x.Content);
private static readonly PropertyInfo PathSelector = ExpressionHelper.GetPropertyInfo(x => x.Path);
+ private string _alias;
+ private string _name;
///
/// Gets or sets the Name of the File including extension
@@ -32,7 +44,11 @@ namespace Umbraco.Core.Models
{
get
{
- return new FileInfo(Path).Name;
+ if (_name == null)
+ {
+ _name = System.IO.Path.GetFileName(Path);
+ }
+ return _name;
}
}
@@ -44,10 +60,14 @@ namespace Umbraco.Core.Models
{
get
{
- var fileInfo = new FileInfo(Path);
- var name = fileInfo.Name;
- int lastIndexOf = name.LastIndexOf(".", StringComparison.InvariantCultureIgnoreCase);
- return name.Substring(0, lastIndexOf);
+ if (_alias == null)
+ {
+ var name = System.IO.Path.GetFileName(Path);
+ if (name == null) return string.Empty;
+ var lastIndexOf = name.LastIndexOf(".", StringComparison.InvariantCultureIgnoreCase);
+ _alias = name.Substring(0, lastIndexOf);
+ }
+ return _alias;
}
}
@@ -60,6 +80,10 @@ namespace Umbraco.Core.Models
get { return _path; }
set
{
+ //reset
+ _alias = null;
+ _name = null;
+
SetPropertyValueAndDetectChanges(o =>
{
_path = value;
diff --git a/src/Umbraco.Core/Models/IMember.cs b/src/Umbraco.Core/Models/IMember.cs
index edacd0b62b..d5838f30ff 100644
--- a/src/Umbraco.Core/Models/IMember.cs
+++ b/src/Umbraco.Core/Models/IMember.cs
@@ -1,106 +1,10 @@
using System;
+using Umbraco.Core.Models.Membership;
namespace Umbraco.Core.Models
{
- public interface IMember : IContentBase
+ public interface IMember : IContentBase, IMembershipUser
{
- ///
- /// Gets or sets the Username
- ///
- string Username { get; set; }
-
- ///
- /// Gets or sets the Email
- ///
- string Email { get; set; }
-
- ///
- /// Gets or sets the Password
- ///
- string Password { get; set; }
-
- ///
- /// Gets or sets the Password Question
- ///
- ///
- /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- string PasswordQuestion { get; set; }
-
- ///
- /// Gets or sets the Password Answer
- ///
- ///
- /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- string PasswordAnswer { get; set; }
-
- ///
- /// Gets or set the comments for the member
- ///
- ///
- /// Alias: umbracoCommentPropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- string Comments { get; set; }
-
- ///
- /// Gets or sets a boolean indicating whether the Member is approved
- ///
- ///
- /// Alias: umbracoApprovePropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- bool IsApproved { get; set; }
-
- ///
- /// Gets or sets a boolean indicating whether the Member is locked out
- ///
- ///
- /// Alias: umbracoLockPropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- bool IsLockedOut { get; set; }
-
- ///
- /// Gets or sets the date for last login
- ///
- ///
- /// Alias: umbracoLastLoginPropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- DateTime LastLoginDate { get; set; }
-
- ///
- /// Gest or sets the date for last password change
- ///
- ///
- /// Alias: umbracoMemberLastPasswordChange
- /// Part of the standard properties collection.
- ///
- DateTime LastPasswordChangeDate { get; set; }
-
- ///
- /// Gets or sets the date for when Member was locked out
- ///
- ///
- /// Alias: umbracoMemberLastLockout
- /// Part of the standard properties collection.
- ///
- DateTime LastLockoutDate { get; set; }
-
- ///
- /// Gets or sets the number of failed password attempts.
- /// This is the number of times the password was entered incorrectly upon login.
- ///
- ///
- /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
- /// Part of the standard properties collection.
- ///
- int FailedPasswordAttempts { get; set; }
-
///
/// String alias of the default ContentType
///
diff --git a/src/Umbraco.Core/Models/IMemberGroup.cs b/src/Umbraco.Core/Models/IMemberGroup.cs
new file mode 100644
index 0000000000..5c3741997b
--- /dev/null
+++ b/src/Umbraco.Core/Models/IMemberGroup.cs
@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+ ///
+ /// Represents a member type
+ ///
+ public interface IMemberGroup : IAggregateRoot
+ {
+ ///
+ /// The name of the member group
+ ///
+ string Name { get; set; }
+
+ ///
+ /// Profile of the user who created this Entity
+ ///
+ int CreatorId { get; set; }
+
+ ///
+ /// Some entities may expose additional data that other's might not, this custom data will be available in this collection
+ ///
+ IDictionary AdditionalData { get; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/ITemplate.cs b/src/Umbraco.Core/Models/ITemplate.cs
index 2014ac9837..7fb4eac4cf 100644
--- a/src/Umbraco.Core/Models/ITemplate.cs
+++ b/src/Umbraco.Core/Models/ITemplate.cs
@@ -10,5 +10,11 @@
///
///
RenderingEngine GetTypeOfRenderingEngine();
+
+ ///
+ /// Set the mastertemplate
+ ///
+ ///
+ void SetMasterTemplate(ITemplate masterTemplate);
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Language.cs b/src/Umbraco.Core/Models/Language.cs
index 6986fae027..ef8ebbf931 100644
--- a/src/Umbraco.Core/Models/Language.cs
+++ b/src/Umbraco.Core/Models/Language.cs
@@ -3,7 +3,6 @@ using System.Globalization;
using System.Reflection;
using System.Runtime.Serialization;
using Umbraco.Core.Models.EntityBase;
-using Umbraco.Core.Persistence.Mappers;
namespace Umbraco.Core.Models
{
diff --git a/src/Umbraco.Core/Models/Macro.cs b/src/Umbraco.Core/Models/Macro.cs
index 914847aea2..d81f49fc4f 100644
--- a/src/Umbraco.Core/Models/Macro.cs
+++ b/src/Umbraco.Core/Models/Macro.cs
@@ -107,7 +107,7 @@ namespace Umbraco.Core.Models
private bool _dontRender;
private string _scriptFile;
private string _scriptAssembly;
- private string _python;
+ private string _scriptPath;
private string _xslt;
private readonly MacroPropertyCollection _properties;
private readonly List _addedProperties;
@@ -360,14 +360,14 @@ namespace Umbraco.Core.Models
[DataMember]
public string ScriptPath
{
- get { return _python; }
+ get { return _scriptPath; }
set
{
SetPropertyValueAndDetectChanges(o =>
{
- _python = value;
- return _python;
- }, _python, ScriptPathSelector);
+ _scriptPath = value;
+ return _scriptPath;
+ }, _scriptPath, ScriptPathSelector);
}
}
diff --git a/src/Umbraco.Core/Models/MacroProperty.cs b/src/Umbraco.Core/Models/MacroProperty.cs
index 243e5c0e91..ef0a024973 100644
--- a/src/Umbraco.Core/Models/MacroProperty.cs
+++ b/src/Umbraco.Core/Models/MacroProperty.cs
@@ -155,7 +155,6 @@ namespace Umbraco.Core.Models
///
[DataMember]
public string EditorAlias
-
{
get { return _editorAlias; }
set
diff --git a/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs b/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs
index 4864c4bba4..f9c0c2cc1e 100644
--- a/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs
+++ b/src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Core.Models.Mapping
/// All automapper configurations are done during startup
/// inside an Automapper Initialize call which is better for performance
///
- internal interface IMapperConfiguration : IApplicationEventHandler
+ public interface IMapperConfiguration : IApplicationEventHandler
{
void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext);
}
diff --git a/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs b/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs
index 1e88e648cf..52683231e2 100644
--- a/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs
+++ b/src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core.Models.Mapping
///
/// Use this class if your mapper configuration isn't also explicitly an ApplicationEventHandler.
///
- internal abstract class MapperConfiguration : ApplicationEventHandler, IMapperConfiguration
+ public abstract class MapperConfiguration : ApplicationEventHandler, IMapperConfiguration
{
public abstract void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext);
}
diff --git a/src/Umbraco.Core/Models/Member.cs b/src/Umbraco.Core/Models/Member.cs
index 2f0e96f294..cb41f2b7f8 100644
--- a/src/Umbraco.Core/Models/Member.cs
+++ b/src/Umbraco.Core/Models/Member.cs
@@ -1,7 +1,9 @@
using System;
using System.Collections.Generic;
+using System.Linq;
using System.Reflection;
using System.Runtime.Serialization;
+using Umbraco.Core.Logging;
namespace Umbraco.Core.Models
{
@@ -13,50 +15,104 @@ namespace Umbraco.Core.Models
public class Member : ContentBase, IMember
{
private readonly IMemberType _contentType;
- private string _contentTypeAlias;
+ private readonly string _contentTypeAlias;
private string _username;
private string _email;
- private string _password;
+ private string _rawPasswordValue;
private object _providerUserKey;
private Type _userTypeKey;
+ ///
+ /// Constructor for creating an empty Member object
+ ///
+ /// ContentType for the current Content object
+ public Member(IMemberType contentType)
+ : base("", -1, contentType, new PropertyCollection())
+ {
+ Mandate.ParameterNotNull(contentType, "contentType");
+
+ _contentTypeAlias = contentType.Alias;
+ _contentType = contentType;
+ IsApproved = true;
+
+ //this cannot be null but can be empty
+ _rawPasswordValue = "";
+ _email = "";
+ _username = "";
+ }
+
///
/// Constructor for creating a Member object
///
/// Name of the content
/// ContentType for the current Content object
public Member(string name, IMemberType contentType)
+ : this(contentType)
+ {
+ Mandate.ParameterNotNull(contentType, "contentType");
+ Mandate.ParameterNotNullOrEmpty(name, "name");
+
+ _contentTypeAlias = contentType.Alias;
+ _contentType = contentType;
+ IsApproved = true;
+
+ //this cannot be null but can be empty
+ _rawPasswordValue = "";
+ _email = "";
+ _username = "";
+ }
+
+ ///
+ /// Constructor for creating a Member object
+ ///
+ ///
+ ///
+ ///
+ ///
+ public Member(string name, string email, string username, IMemberType contentType)
: base(name, -1, contentType, new PropertyCollection())
- {
- _contentType = contentType;
- }
-
- public Member(string name, string email, string username, string password, int parentId, IMemberType contentType)
- : base(name, parentId, contentType, new PropertyCollection())
{
Mandate.ParameterNotNull(contentType, "contentType");
+ Mandate.ParameterNotNullOrEmpty(name, "name");
+ Mandate.ParameterNotNullOrEmpty(email, "email");
+ Mandate.ParameterNotNullOrEmpty(username, "username");
+ _contentTypeAlias = contentType.Alias;
_contentType = contentType;
_email = email;
_username = username;
- _password = password;
+ IsApproved = true;
+
+ //this cannot be null but can be empty
+ _rawPasswordValue = "";
}
- public Member(string name, string email, string username, string password, IContentBase parent, IMemberType contentType)
- : base(name, parent, contentType, new PropertyCollection())
+ ///
+ /// Constructor for creating a Member object
+ ///
+ ///
+ ///
+ ///
+ ///
+ /// The password value passed in to this parameter should be the encoded/encrypted/hashed format of the member's password
+ ///
+ ///
+ public Member(string name, string email, string username, string rawPasswordValue, IMemberType contentType)
+ : base(name, -1, contentType, new PropertyCollection())
{
Mandate.ParameterNotNull(contentType, "contentType");
+ _contentTypeAlias = contentType.Alias;
_contentType = contentType;
_email = email;
_username = username;
- _password = password;
+ _rawPasswordValue = rawPasswordValue;
+ IsApproved = true;
}
- private static readonly PropertyInfo DefaultContentTypeAliasSelector = ExpressionHelper.GetPropertyInfo(x => x.ContentTypeAlias);
private static readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo(x => x.Username);
private static readonly PropertyInfo EmailSelector = ExpressionHelper.GetPropertyInfo(x => x.Email);
- private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo(x => x.Password);
+ private static readonly PropertyInfo PasswordSelector = ExpressionHelper.GetPropertyInfo(x => x.RawPasswordValue);
private static readonly PropertyInfo ProviderUserKeySelector = ExpressionHelper.GetPropertyInfo(x => x.ProviderUserKey);
private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo(x => x.ProviderUserKeyType);
@@ -95,19 +151,19 @@ namespace Umbraco.Core.Models
}
///
- /// Gets or sets the Password
+ /// Gets or sets the raw password value
///
[DataMember]
- public string Password
+ public string RawPasswordValue
{
- get { return _password; }
+ get { return _rawPasswordValue; }
set
{
SetPropertyValueAndDetectChanges(o =>
{
- _password = value;
- return _password;
- }, _password, PasswordSelector);
+ _rawPasswordValue = value;
+ return _rawPasswordValue;
+ }, _rawPasswordValue, PasswordSelector);
}
}
@@ -125,7 +181,7 @@ namespace Umbraco.Core.Models
/// Gets or sets the Password Question
///
///
- /// Alias: umbracoPasswordRetrievalQuestionPropertyTypeAlias
+ /// Alias: umbracoMemberPasswordRetrievalQuestion
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -133,34 +189,50 @@ namespace Umbraco.Core.Models
{
get
{
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.PasswordQuestion, "PasswordQuestion", default(string));
+ if (a.Success == false) return a.Result;
+
return Properties[Constants.Conventions.Member.PasswordQuestion].Value == null
? string.Empty
: Properties[Constants.Conventions.Member.PasswordQuestion].Value.ToString();
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.PasswordQuestion,
+ "PasswordQuestion") == false) return;
+
Properties[Constants.Conventions.Member.PasswordQuestion].Value = value;
}
}
///
- /// Gets or sets the Password Answer
+ /// Gets or sets the raw password answer value
///
///
- /// Alias: umbracoPasswordRetrievalAnswerPropertyTypeAlias
+ /// For security reasons this value should be encrypted, the encryption process is handled by the memberhip provider
+ /// Alias: umbracoMemberPasswordRetrievalAnswer
+ ///
/// Part of the standard properties collection.
///
[IgnoreDataMember]
- public string PasswordAnswer
+ public string RawPasswordAnswerValue
{
get
{
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.PasswordAnswer, "PasswordAnswer", default(string));
+ if (a.Success == false) return a.Result;
+
return Properties[Constants.Conventions.Member.PasswordAnswer].Value == null
? string.Empty
: Properties[Constants.Conventions.Member.PasswordAnswer].Value.ToString();
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.PasswordAnswer,
+ "PasswordAnswer") == false) return;
+
Properties[Constants.Conventions.Member.PasswordAnswer].Value = value;
}
}
@@ -169,7 +241,7 @@ namespace Umbraco.Core.Models
/// Gets or set the comments for the member
///
///
- /// Alias: umbracoCommentPropertyTypeAlias
+ /// Alias: umbracoMemberComments
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -177,12 +249,19 @@ namespace Umbraco.Core.Models
{
get
{
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.Comments, "Comments", default(string));
+ if (a.Success == false) return a.Result;
+
return Properties[Constants.Conventions.Member.Comments].Value == null
? string.Empty
: Properties[Constants.Conventions.Member.Comments].Value.ToString();
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.Comments,
+ "Comments") == false) return;
+
Properties[Constants.Conventions.Member.Comments].Value = value;
}
}
@@ -191,7 +270,7 @@ namespace Umbraco.Core.Models
/// Gets or sets a boolean indicating whether the Member is approved
///
///
- /// Alias: umbracoApprovePropertyTypeAlias
+ /// Alias: umbracoMemberApproved
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -199,17 +278,25 @@ namespace Umbraco.Core.Models
{
get
{
- if (Properties[Constants.Conventions.Member.IsApproved].Value == null)
- return default(bool);
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.IsApproved, "IsApproved",
+ //This is the default value if the prop is not found
+ true);
+ if (a.Success == false) return a.Result;
- if (Properties[Constants.Conventions.Member.IsApproved].Value is bool)
- return (bool)Properties[Constants.Conventions.Member.IsApproved].Value;
-
- //TODO: Use TryConvertTo instead
- return (bool)Convert.ChangeType(Properties[Constants.Conventions.Member.IsApproved].Value, typeof(bool));
+ var tryConvert = Properties[Constants.Conventions.Member.IsApproved].Value.TryConvertTo();
+ if (tryConvert.Success)
+ {
+ return tryConvert.Result;
+ }
+ //if the property exists but it cannot be converted, we will assume true
+ return true;
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.IsApproved,
+ "IsApproved") == false) return;
+
Properties[Constants.Conventions.Member.IsApproved].Value = value;
}
}
@@ -218,7 +305,7 @@ namespace Umbraco.Core.Models
/// Gets or sets a boolean indicating whether the Member is locked out
///
///
- /// Alias: umbracoLockPropertyTypeAlias
+ /// Alias: umbracoMemberLockedOut
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -226,17 +313,23 @@ namespace Umbraco.Core.Models
{
get
{
- if (Properties[Constants.Conventions.Member.IsLockedOut].Value == null)
- return default(bool);
-
- if (Properties[Constants.Conventions.Member.IsLockedOut].Value is bool)
- return (bool)Properties[Constants.Conventions.Member.IsLockedOut].Value;
-
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.IsLockedOut, "IsLockedOut", false);
+ if (a.Success == false) return a.Result;
+
+ var tryConvert = Properties[Constants.Conventions.Member.IsLockedOut].Value.TryConvertTo();
+ if (tryConvert.Success)
+ {
+ return tryConvert.Result;
+ }
+ return false;
//TODO: Use TryConvertTo instead
- return (bool)Convert.ChangeType(Properties[Constants.Conventions.Member.IsLockedOut].Value, typeof(bool));
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.IsLockedOut,
+ "IsLockedOut") == false) return;
+
Properties[Constants.Conventions.Member.IsLockedOut].Value = value;
}
}
@@ -245,7 +338,7 @@ namespace Umbraco.Core.Models
/// Gets or sets the date for last login
///
///
- /// Alias: umbracoLastLoginPropertyTypeAlias
+ /// Alias: umbracoMemberLastLogin
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -253,17 +346,23 @@ namespace Umbraco.Core.Models
{
get
{
- if (Properties[Constants.Conventions.Member.LastLoginDate].Value == null)
- return default(DateTime);
-
- if (Properties[Constants.Conventions.Member.LastLoginDate].Value is DateTime)
- return (DateTime)Properties[Constants.Conventions.Member.LastLoginDate].Value;
-
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.LastLoginDate, "LastLoginDate", default(DateTime));
+ if (a.Success == false) return a.Result;
+
+ var tryConvert = Properties[Constants.Conventions.Member.LastLoginDate].Value.TryConvertTo();
+ if (tryConvert.Success)
+ {
+ return tryConvert.Result;
+ }
+ return default(DateTime);
//TODO: Use TryConvertTo instead
- return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastLoginDate].Value, typeof(DateTime));
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.LastLoginDate,
+ "LastLoginDate") == false) return;
+
Properties[Constants.Conventions.Member.LastLoginDate].Value = value;
}
}
@@ -272,7 +371,7 @@ namespace Umbraco.Core.Models
/// Gest or sets the date for last password change
///
///
- /// Alias: umbracoMemberLastPasswordChange
+ /// Alias: umbracoMemberLastPasswordChangeDate
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -280,17 +379,23 @@ namespace Umbraco.Core.Models
{
get
{
- if (Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value == null)
- return default(DateTime);
-
- if (Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value is DateTime)
- return (DateTime)Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value;
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.LastPasswordChangeDate, "LastPasswordChangeDate", default(DateTime));
+ if (a.Success == false) return a.Result;
+ var tryConvert = Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value.TryConvertTo();
+ if (tryConvert.Success)
+ {
+ return tryConvert.Result;
+ }
+ return default(DateTime);
//TODO: Use TryConvertTo instead
- return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value, typeof(DateTime));
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.LastPasswordChangeDate,
+ "LastPasswordChangeDate") == false) return;
+
Properties[Constants.Conventions.Member.LastPasswordChangeDate].Value = value;
}
}
@@ -299,7 +404,7 @@ namespace Umbraco.Core.Models
/// Gets or sets the date for when Member was locked out
///
///
- /// Alias: umbracoMemberLastLockout
+ /// Alias: umbracoMemberLastLockoutDate
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -307,17 +412,23 @@ namespace Umbraco.Core.Models
{
get
{
- if (Properties[Constants.Conventions.Member.LastLockoutDate].Value == null)
- return default(DateTime);
-
- if (Properties[Constants.Conventions.Member.LastLockoutDate].Value is DateTime)
- return (DateTime)Properties[Constants.Conventions.Member.LastLockoutDate].Value;
-
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.LastLockoutDate, "LastLockoutDate", default(DateTime));
+ if (a.Success == false) return a.Result;
+
+ var tryConvert = Properties[Constants.Conventions.Member.LastLockoutDate].Value.TryConvertTo();
+ if (tryConvert.Success)
+ {
+ return tryConvert.Result;
+ }
+ return default(DateTime);
//TODO: Use TryConvertTo instead
- return (DateTime)Convert.ChangeType(Properties[Constants.Conventions.Member.LastLockoutDate].Value, typeof(DateTime));
}
set
{
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.LastLockoutDate,
+ "LastLockoutDate") == false) return;
+
Properties[Constants.Conventions.Member.LastLockoutDate].Value = value;
}
}
@@ -327,7 +438,7 @@ namespace Umbraco.Core.Models
/// This is the number of times the password was entered incorrectly upon login.
///
///
- /// Alias: umbracoFailedPasswordAttemptsPropertyTypeAlias
+ /// Alias: umbracoMemberFailedPasswordAttempts
/// Part of the standard properties collection.
///
[IgnoreDataMember]
@@ -335,18 +446,24 @@ namespace Umbraco.Core.Models
{
get
{
- if (Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value == null)
- return default(int);
-
- if (Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value is int)
- return (int)Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value;
-
+ var a = WarnIfPropertyTypeNotFoundOnGet(Constants.Conventions.Member.FailedPasswordAttempts, "FailedPasswordAttempts", 0);
+ if (a.Success == false) return a.Result;
+
+ var tryConvert = Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value.TryConvertTo();
+ if (tryConvert.Success)
+ {
+ return tryConvert.Result;
+ }
+ return default(int);
//TODO: Use TryConvertTo instead
- return (int)Convert.ChangeType(Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value, typeof(int));
}
set
{
- Properties[Constants.Conventions.Member.LastLockoutDate].Value = value;
+ if (WarnIfPropertyTypeNotFoundOnSet(
+ Constants.Conventions.Member.FailedPasswordAttempts,
+ "FailedPasswordAttempts") == false) return;
+
+ Properties[Constants.Conventions.Member.FailedPasswordAttempts].Value = value;
}
}
@@ -357,14 +474,6 @@ namespace Umbraco.Core.Models
public virtual string ContentTypeAlias
{
get { return _contentTypeAlias; }
- internal set
- {
- SetPropertyValueAndDetectChanges(o =>
- {
- _contentTypeAlias = value;
- return _contentTypeAlias;
- }, _contentTypeAlias, DefaultContentTypeAliasSelector);
- }
}
///
@@ -377,7 +486,7 @@ namespace Umbraco.Core.Models
/// membership provider.
///
[DataMember]
- internal virtual object ProviderUserKey
+ public virtual object ProviderUserKey
{
get
{
@@ -460,5 +569,73 @@ namespace Umbraco.Core.Models
internal bool BoolPropertyValue { get; set; }
internal DateTime DateTimePropertyValue { get; set; }
internal string PropertyTypeAlias { get; set; }
+
+ private Attempt WarnIfPropertyTypeNotFoundOnGet(string propertyAlias, string propertyName, T defaultVal)
+ {
+ Action doLog = () => LogHelper.Warn(
+ "Trying to access the '"
+ + propertyName
+ + "' property on "
+ + typeof(Member)
+ + " but the "
+ + propertyAlias
+ + " property does not exist on the member type so a default value is returned. Ensure that you have a property type with alias: "
+ + propertyAlias
+ + " configured on your member type in order to use the '"
+ + propertyName
+ + "' property on the model correctly.");
+
+ //if the property doesn't exist, then do the logging and return a failure
+ if (Properties.Contains(propertyAlias) == false)
+ {
+ //we'll put a warn in the log if this entity has been persisted
+ if (HasIdentity)
+ {
+ doLog();
+ }
+ return Attempt.Fail(defaultVal);
+ }
+
+ //if the property doesn't have an identity but we do, then do logging and return failure
+ var prop = Properties.Single(x => x.Alias == propertyAlias);
+ if (prop.HasIdentity == false && HasIdentity)
+ {
+ doLog();
+ return Attempt.Fail(defaultVal);
+ }
+
+ return Attempt.Succeed();
+ }
+
+ private bool WarnIfPropertyTypeNotFoundOnSet(string propertyAlias, string propertyname)
+ {
+ Action doLog = () => LogHelper.Warn("An attempt was made to set a value on the property '"
+ + propertyname
+ + "' on type "
+ + typeof(Member)
+ + " but the property type "
+ + propertyAlias
+ + " does not exist on the member type, ensure that this property type exists so that setting this property works correctly.");
+
+ //if the property doesn't exist, then do the logging and return a failure
+ if (Properties.Contains(propertyAlias) == false)
+ {
+ if (HasIdentity)
+ {
+ doLog();
+ }
+ return false;
+ }
+
+ //if the property doesn't have an identity but we do, then do logging and return failure
+ var prop = Properties.Single(x => x.Alias == propertyAlias);
+ if (prop.HasIdentity == false && HasIdentity)
+ {
+ doLog();
+ return false;
+ }
+
+ return true;
+ }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/MemberGroup.cs b/src/Umbraco.Core/Models/MemberGroup.cs
new file mode 100644
index 0000000000..e52448a11d
--- /dev/null
+++ b/src/Umbraco.Core/Models/MemberGroup.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Runtime.Serialization;
+using Umbraco.Core.Models.EntityBase;
+
+namespace Umbraco.Core.Models
+{
+ ///
+ /// Represents a member type
+ ///
+ [Serializable]
+ [DataContract(IsReference = true)]
+ public class MemberGroup : Entity, IMemberGroup
+ {
+ public MemberGroup()
+ {
+ AdditionalData = new Dictionary();
+ }
+
+ private string _name;
+ private int _creatorId;
+
+ private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name);
+ private static readonly PropertyInfo CreatorIdSelector = ExpressionHelper.GetPropertyInfo(x => x.CreatorId);
+
+ [DataMember]
+ public string Name
+ {
+ get { return _name; }
+ set
+ {
+ SetPropertyValueAndDetectChanges(o =>
+ {
+ if (_name != value)
+ {
+ //if the name has changed, add the value to the additional data,
+ //this is required purely for event handlers to know the previous name of the group
+ //so we can keep the public access up to date.
+ AdditionalData["previousName"] = _name;
+ }
+
+ _name = value;
+ return _name;
+ }, _name, NameSelector);
+ }
+ }
+
+ public int CreatorId
+ {
+ get { return _creatorId; }
+ set
+ {
+ SetPropertyValueAndDetectChanges(o =>
+ {
+ _creatorId = value;
+ return _creatorId;
+ }, _creatorId, CreatorIdSelector);
+ }
+ }
+
+ public IDictionary AdditionalData { get; private set; }
+
+ ///
+ /// Method to call when Entity is being saved
+ ///
+ /// Created date is set and a Unique key is assigned
+ internal override void AddingEntity()
+ {
+ base.AddingEntity();
+
+ if (Key == Guid.Empty)
+ Key = Guid.NewGuid();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/MemberType.cs b/src/Umbraco.Core/Models/MemberType.cs
index c361891fa0..527e379d17 100644
--- a/src/Umbraco.Core/Models/MemberType.cs
+++ b/src/Umbraco.Core/Models/MemberType.cs
@@ -14,37 +14,50 @@ namespace Umbraco.Core.Models
public class MemberType : ContentTypeCompositionBase, IMemberType
{
//Dictionary is divided into string: PropertyTypeAlias, Tuple: MemberCanEdit, VisibleOnProfile, PropertyTypeId
- private IDictionary> _memberTypePropertyTypes;
+ private string _alias;
public MemberType(int parentId) : base(parentId)
{
- _memberTypePropertyTypes = new Dictionary>();
+ MemberTypePropertyTypes = new Dictionary();
}
public MemberType(IContentTypeComposition parent) : base(parent)
{
- _memberTypePropertyTypes = new Dictionary>();
+ MemberTypePropertyTypes = new Dictionary();
}
- private static readonly PropertyInfo MemberTypePropertyTypesSelector = ExpressionHelper.GetPropertyInfo>>(x => x.MemberTypePropertyTypes);
+ private static readonly PropertyInfo AliasSelector = ExpressionHelper.GetPropertyInfo(x => x.Alias);
///
- /// Gets or Sets a Dictionary of Tuples (MemberCanEdit, VisibleOnProfile, PropertyTypeId) by the PropertyTypes' alias.
+ /// The Alias of the ContentType
///
[DataMember]
- internal IDictionary> MemberTypePropertyTypes
+ public override string Alias
{
- get { return _memberTypePropertyTypes; }
+ get { return _alias; }
set
{
+ //NOTE: WE are overriding this because we don't want to do a ToSafeAlias when the alias is the special case of
+ // "_umbracoSystemDefaultProtectType" which is used internally, currently there is an issue with the safe alias as it strips
+ // leading underscores which we don't want in this case.
+ // see : http://issues.umbraco.org/issue/U4-3968
+
SetPropertyValueAndDetectChanges(o =>
{
- _memberTypePropertyTypes = value;
- return _memberTypePropertyTypes;
- }, _memberTypePropertyTypes, MemberTypePropertyTypesSelector);
+ _alias = value == "_umbracoSystemDefaultProtectType"
+ ? value
+ : (value == null ? string.Empty : value.ToSafeAlias() );
+ return _alias;
+ }, _alias, AliasSelector);
}
}
+ ///
+ /// Gets or Sets a Dictionary of Tuples (MemberCanEdit, VisibleOnProfile) by the PropertyTypes' alias.
+ ///
+ [DataMember]
+ internal IDictionary MemberTypePropertyTypes { get; private set; }
+
///
/// Gets a boolean indicating whether a Property is editable by the Member.
///
@@ -54,7 +67,7 @@ namespace Umbraco.Core.Models
{
if (MemberTypePropertyTypes.ContainsKey(propertyTypeAlias))
{
- return MemberTypePropertyTypes[propertyTypeAlias].Item1;
+ return MemberTypePropertyTypes[propertyTypeAlias].IsEditable;
}
return false;
@@ -69,7 +82,7 @@ namespace Umbraco.Core.Models
{
if (MemberTypePropertyTypes.ContainsKey(propertyTypeAlias))
{
- return MemberTypePropertyTypes[propertyTypeAlias].Item2;
+ return MemberTypePropertyTypes[propertyTypeAlias].IsVisible;
}
return false;
@@ -84,13 +97,11 @@ namespace Umbraco.Core.Models
{
if (MemberTypePropertyTypes.ContainsKey(propertyTypeAlias))
{
- var tuple = MemberTypePropertyTypes[propertyTypeAlias];
- MemberTypePropertyTypes[propertyTypeAlias] = new Tuple(value, tuple.Item2, tuple.Item3);
+ MemberTypePropertyTypes[propertyTypeAlias].IsEditable = value;
}
else
{
- var propertyType = PropertyTypes.First(x => x.Alias.Equals(propertyTypeAlias));
- var tuple = new Tuple(value, false, propertyType.Id);
+ var tuple = new MemberTypePropertyProfileAccess(false, value);
MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
}
}
@@ -104,13 +115,11 @@ namespace Umbraco.Core.Models
{
if (MemberTypePropertyTypes.ContainsKey(propertyTypeAlias))
{
- var tuple = MemberTypePropertyTypes[propertyTypeAlias];
- MemberTypePropertyTypes[propertyTypeAlias] = new Tuple(tuple.Item1, value, tuple.Item3);
+ MemberTypePropertyTypes[propertyTypeAlias].IsVisible = value;
}
else
{
- var propertyType = PropertyTypes.First(x => x.Alias.Equals(propertyTypeAlias));
- var tuple = new Tuple(false, value, propertyType.Id);
+ var tuple = new MemberTypePropertyProfileAccess(value, false);
MemberTypePropertyTypes.Add(propertyTypeAlias, tuple);
}
}
diff --git a/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs b/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
new file mode 100644
index 0000000000..fa9e0b7307
--- /dev/null
+++ b/src/Umbraco.Core/Models/MemberTypePropertyProfileAccess.cs
@@ -0,0 +1,17 @@
+namespace Umbraco.Core.Models
+{
+ ///
+ /// Used to track the property types that are visible/editable on member profiles
+ ///
+ internal class MemberTypePropertyProfileAccess
+ {
+ public MemberTypePropertyProfileAccess(bool isVisible, bool isEditable)
+ {
+ IsVisible = isVisible;
+ IsEditable = isEditable;
+ }
+
+ public bool IsVisible { get; set; }
+ public bool IsEditable { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Membership/EntityPermission.cs b/src/Umbraco.Core/Models/Membership/EntityPermission.cs
index c417a4985c..175e571fdf 100644
--- a/src/Umbraco.Core/Models/Membership/EntityPermission.cs
+++ b/src/Umbraco.Core/Models/Membership/EntityPermission.cs
@@ -5,14 +5,14 @@
///
public class EntityPermission
{
- public EntityPermission(object userId, int entityId, string[] assignedPermissions)
+ public EntityPermission(int userId, int entityId, string[] assignedPermissions)
{
UserId = userId;
EntityId = entityId;
AssignedPermissions = assignedPermissions;
}
- public object UserId { get; private set; }
+ public int UserId { get; private set; }
public int EntityId { get; private set; }
///
diff --git a/src/Umbraco.Core/Models/Membership/IMembershipUser.cs b/src/Umbraco.Core/Models/Membership/IMembershipUser.cs
index 422b47da22..b304f72777 100644
--- a/src/Umbraco.Core/Models/Membership/IMembershipUser.cs
+++ b/src/Umbraco.Core/Models/Membership/IMembershipUser.cs
@@ -4,23 +4,42 @@ using Umbraco.Core.Models.EntityBase;
namespace Umbraco.Core.Models.Membership
{
- internal interface IMembershipUser : IMembershipUserId, IAggregateRoot
- {
- /*new object Id { get; set; }*/
+ public interface IMembershipUser : IAggregateRoot
+ {
+ object ProviderUserKey { get; set; }
string Username { get; set; }
string Email { get; set; }
- string Password { get; set; }
+
+ ///
+ /// Gets or sets the raw password value
+ ///
+ string RawPasswordValue { get; set; }
+
string PasswordQuestion { get; set; }
- string PasswordAnswer { get; set; }
+
+ ///
+ /// Gets or sets the raw password answer value
+ ///
+ string RawPasswordAnswerValue { get; set; }
+
string Comments { get; set; }
bool IsApproved { get; set; }
- bool IsOnline { get; set; }
bool IsLockedOut { get; set; }
DateTime LastLoginDate { get; set; }
DateTime LastPasswordChangeDate { get; set; }
DateTime LastLockoutDate { get; set; }
- object ProfileId { get; set; }
- IEnumerable
/// Will be left internal until a proper Membership implementation is part of the roadmap
- internal interface IUser : IMembershipUser, IUserProfile
+ public interface IUser : IMembershipUser
{
- new object Id { get; set; }
- //string Name { get; set; }
+ string Name { get; set; }
int SessionTimeout { get; set; }
int StartContentId { get; set; }
int StartMediaId { get; set; }
string Language { get; set; }
- bool NoConsole { get; set; }
- IUserType UserType { get; }
-
///
- /// The default permissions for the user
+ /// Gets/sets the user type for the user
+ ///
+ IUserType UserType { get; set; }
+
+ ///
+ /// The default permission set for the user
///
///
- /// The default permissions are assigned to the user object based on the user type's default permissions
- ///
- string DefaultPermissions { get; }
- }
+ /// Currently in umbraco each permission is a single char but with an Enumerable{string} collection this allows for flexible changes to this in the future
+ ///
+ IEnumerable DefaultPermissions { get; set; }
- internal interface IUserProfile : IProfile
- {
IEnumerable AllowedSections { get; }
void RemoveAllowedSection(string sectionAlias);
void AddAllowedSection(string sectionAlias);
+
+ ///
+ /// Exposes the basic profile data
+ ///
+ IProfile ProfileData { get; }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Membership/IUserType.cs b/src/Umbraco.Core/Models/Membership/IUserType.cs
index aa837bf890..fe678afd2b 100644
--- a/src/Umbraco.Core/Models/Membership/IUserType.cs
+++ b/src/Umbraco.Core/Models/Membership/IUserType.cs
@@ -1,13 +1,28 @@
+using System.Collections.Generic;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Persistence.Mappers;
namespace Umbraco.Core.Models.Membership
{
- internal interface IUserType : IAggregateRoot
+ public interface IUserType : IAggregateRoot
{
+ ///
+ /// The user type alias
+ ///
string Alias { get; set; }
+
+ ///
+ /// The user type name
+ ///
string Name { get; set; }
- string Permissions { get; set; }
+
+ ///
+ /// The set of default permissions for the user type
+ ///
+ ///
+ /// By default each permission is simply a single char but we've made this an enumerable{string} to support a more flexible permissions structure in the future.
+ ///
+ IEnumerable Permissions { get; set; }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Membership/MemberCountType.cs b/src/Umbraco.Core/Models/Membership/MemberCountType.cs
new file mode 100644
index 0000000000..89b428a827
--- /dev/null
+++ b/src/Umbraco.Core/Models/Membership/MemberCountType.cs
@@ -0,0 +1,13 @@
+namespace Umbraco.Core.Models.Membership
+{
+ ///
+ /// The types of members to count
+ ///
+ public enum MemberCountType
+ {
+ All,
+ Online,
+ LockedOut,
+ Approved
+ }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Membership/MembershipExtensions.cs b/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
similarity index 65%
rename from src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
rename to src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
index df0ee1529a..6008c0ae02 100644
--- a/src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
+++ b/src/Umbraco.Core/Models/Membership/MembershipUserExtensions.cs
@@ -1,20 +1,21 @@
using System;
using System.Web.Security;
+using Umbraco.Core.Security;
using Umbraco.Core.Services;
namespace Umbraco.Core.Models.Membership
{
- internal static class MembershipExtensions
+ internal static class MembershipUserExtensions
{
- internal static MembershipUser AsConcreteMembershipUser(this IMember member)
+ internal static UmbracoMembershipMember AsConcreteMembershipUser(this IMembershipUser member, string providerName)
{
- var membershipMember = new UmbracoMembershipMember(member);
+ var membershipMember = new UmbracoMembershipMember(member, providerName);
return membershipMember;
}
- internal static IMember AsIMember(this MembershipUser membershipMember)
+ internal static IMembershipUser AsIMember(this UmbracoMembershipMember membershipMember)
{
- var member = membershipMember as UmbracoMembershipMember;
+ var member = membershipMember;
if (member != null)
{
return member.Member;
@@ -32,11 +33,12 @@ namespace Umbraco.Core.Models.Membership
{
if (_scenario.HasValue == false)
{
- if (System.Web.Security.Membership.Provider.Name == Constants.Conventions.Member.UmbracoMemberProviderName)
+ var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
+ if (provider.IsUmbracoMembershipProvider())
{
return MembershipScenario.NativeUmbraco;
}
- var memberType = ApplicationContext.Current.Services.MemberTypeService.GetMemberType(Constants.Conventions.MemberTypes.Member);
+ var memberType = ApplicationContext.Current.Services.MemberTypeService.Get(Constants.Conventions.MemberTypes.DefaultAlias);
return memberType != null
? MembershipScenario.CustomProviderWithUmbracoLink
: MembershipScenario.StandaloneCustomProvider;
diff --git a/src/Umbraco.Core/Models/Membership/Profile.cs b/src/Umbraco.Core/Models/Membership/Profile.cs
deleted file mode 100644
index b3959bb9cd..0000000000
--- a/src/Umbraco.Core/Models/Membership/Profile.cs
+++ /dev/null
@@ -1,123 +0,0 @@
-using System;
-using System.Reflection;
-using System.Runtime.Serialization;
-using Umbraco.Core.Models.EntityBase;
-
-namespace Umbraco.Core.Models.Membership
-{
- ///
- /// Represents a Profile which is shared between Members and Users
- ///
- [Serializable]
- [DataContract(IsReference = true)]
- internal class Profile : TracksChangesEntityBase, IProfile, IRememberBeingDirty
- {
- ///
- /// Initializes a new instance of the class.
- ///
- protected Profile()
- {
- ProviderUserKeyType = typeof(int);
- }
-
- public Profile(object id, string name)
- {
- ProviderUserKeyType = typeof(int);
- Id = id;
- Name = name;
- }
-
- private object _id;
- private string _name;
- private object _providerUserKey;
- private Type _userTypeKey;
-
- private static readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo(x => x.Id);
- private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo(x => x.Name);
- private static readonly PropertyInfo ProviderUserKeySelector = ExpressionHelper.GetPropertyInfo(x => x.ProviderUserKey);
- private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo(x => x.ProviderUserKeyType);
-
- [DataMember]
- public virtual object Id
- {
- get
- {
- return _id;
- }
- set
- {
- SetPropertyValueAndDetectChanges(o =>
- {
- _id = value;
- return _id;
- }, _id, IdSelector);
- }
- }
-
- [DataMember]
- public virtual string Name
- {
- get
- {
- return _name;
- }
- set
- {
- SetPropertyValueAndDetectChanges(o =>
- {
- _name = value;
- return _name;
- }, _name, NameSelector);
- }
- }
-
- [IgnoreDataMember]
- public virtual object ProviderUserKey
- {
- get
- {
- return _providerUserKey;
- }
- set
- {
- SetPropertyValueAndDetectChanges(o =>
- {
- _providerUserKey = value;
- return _id;
- }, _providerUserKey, ProviderUserKeySelector);
- }
- }
-
- ///
- /// Gets or sets the type of the provider user key.
- ///
- ///
- /// The type of the provider user key.
- ///
- [IgnoreDataMember]
- internal Type ProviderUserKeyType
- {
- get
- {
- return _userTypeKey;
- }
- private set
- {
- SetPropertyValueAndDetectChanges(o =>
- {
- _userTypeKey = value;
- return _userTypeKey;
- }, _userTypeKey, UserTypeKeySelector);
- }
- }
-
- ///
- /// Sets the type of the provider user key.
- ///
- /// The type.
- internal void SetProviderUserKeyType(Type type)
- {
- ProviderUserKeyType = type;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
index 4397f766c0..1b8c7f5393 100644
--- a/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
+++ b/src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
@@ -1,66 +1,127 @@
-using System.Web.Security;
+using System;
+using System.Web.Security;
namespace Umbraco.Core.Models.Membership
{
- //TODO: THere's still a bunch of properties that don't exist in this use that need to be mapped somehow.
internal class UmbracoMembershipMember : MembershipUser
{
- private readonly IMember _member;
+ private readonly IMembershipUser _member;
+ private readonly string _userName;
+ private readonly object _providerUserKey;
+ private readonly string _passwordQuestion;
+ private readonly bool _isLockedOut;
+ private readonly DateTime _lastLockoutDate;
+ private readonly DateTime _creationDate;
+ private DateTime _lastLoginDate;
+ private readonly DateTime _lastPasswordChangedDate;
+ private readonly string _providerName;
+ private string _email;
+ private string _comment;
+ private bool _isApproved;
+ private DateTime _lastActivityDate;
- public UmbracoMembershipMember(IMember member)
+ //NOTE: We are only overriding the properties that matter, we don't override things like IsOnline since that is handled with the sub-class and the membership providers.
+
+ //NOTE: We are not calling the base constructor which will validate that a provider with the specified name exists which causes issues with unit tests. The ctor
+ // validation for that doesn't need to be there anyways (have checked the source).
+ public UmbracoMembershipMember(IMembershipUser member, string providerName)
{
_member = member;
+ //NOTE: We are copying the values here so that everything is consistent with how the underlying built-in ASP.Net membership user
+ // handles data! We don't want to do anything differently there but since we cannot use their ctor we'll need to handle this logic ourselves.
+ if (member.Username != null)
+ _userName = member.Username.Trim();
+ if (member.Email != null)
+ _email = member.Email.Trim();
+ if (member.PasswordQuestion != null)
+ _passwordQuestion = member.PasswordQuestion.Trim();
+ _providerName = providerName;
+ _providerUserKey = member.ProviderUserKey;
+ _comment = member.Comments;
+ _isApproved = member.IsApproved;
+ _isLockedOut = member.IsLockedOut;
+ _creationDate = member.CreateDate.ToUniversalTime();
+ _lastLoginDate = member.LastLoginDate.ToUniversalTime();
+ //TODO: We currently don't really have any place to store this data!!
+ _lastActivityDate = member.LastLoginDate.ToUniversalTime();
+ _lastPasswordChangedDate = member.LastPasswordChangeDate.ToUniversalTime();
+ _lastLockoutDate = member.LastLockoutDate.ToUniversalTime();
}
-
- internal IMember Member
+
+ internal IMembershipUser Member
{
get { return _member; }
}
- public override string Email
+ public override string UserName
{
- get { return _member.Email; }
- set { _member.Email = value; }
+ get { return _userName; }
}
public override object ProviderUserKey
{
- get { return _member.Key; }
+ get { return _providerUserKey; }
}
- public override System.DateTime CreationDate
+ public override string Email
{
- get { return _member.CreateDate; }
+ get { return _email; }
+ set { _email = value; }
}
- public override string UserName
+ public override string PasswordQuestion
{
- get { return _member.Username; }
+ get { return _passwordQuestion; }
}
public override string Comment
{
- get { return _member.Comments; }
- set { _member.Comments = value; }
+ get { return _comment; }
+ set { _comment = value; }
}
public override bool IsApproved
{
- get { return _member.IsApproved; }
- set { _member.IsApproved = value; }
+ get { return _isApproved; }
+ set { _isApproved = value; }
}
public override bool IsLockedOut
{
- get { return _member.IsLockedOut; }
+ get { return _isLockedOut; }
}
- public override System.DateTime LastLoginDate
+ public override DateTime LastLockoutDate
{
- get { return _member.LastLoginDate; }
- set { _member.LastLoginDate = value; }
+ get { return _lastLockoutDate; }
}
+ public override DateTime CreationDate
+ {
+ get { return _creationDate; }
+ }
+
+ public override DateTime LastLoginDate
+ {
+ get { return _lastLoginDate; }
+ set { _lastLoginDate = value; }
+ }
+
+ public override DateTime LastActivityDate
+ {
+ get { return _lastActivityDate; }
+ set { _lastActivityDate = value; }
+ }
+
+ public override DateTime LastPasswordChangedDate
+ {
+ get { return _lastPasswordChangedDate; }
+ }
+
+ public override string ProviderName
+ {
+ get { return _providerName; }
+ }
}
}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Models/Membership/User.cs b/src/Umbraco.Core/Models/Membership/User.cs
index 9840c25b98..2010161df0 100644
--- a/src/Umbraco.Core/Models/Membership/User.cs
+++ b/src/Umbraco.Core/Models/Membership/User.cs
@@ -1,7 +1,11 @@
using System;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
using System.Linq;
+using System.Reflection;
using System.Runtime.Serialization;
+using Umbraco.Core.Configuration;
using Umbraco.Core.Models.EntityBase;
using Umbraco.Core.Persistence.Mappers;
@@ -16,97 +20,501 @@ namespace Umbraco.Core.Models.Membership
///
[Serializable]
[DataContract(IsReference = true)]
- internal class User : UserProfile, IUser
+ public class User : TracksChangesEntityBase, IUser
{
- private bool _hasIdentity;
-
public User(IUserType userType)
{
- Groups = new List