yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Browse Source 
Conflicts:
	src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
This commit is contained in:
Shannon
2014-01-08 18:13:35 +11:00
parent 250f082346 ffed85640d
commit 3274d873a9
5 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Models/Membership/UmbracoMembershipMember.cs
View File

@@ -27,7 +27,7 @@ namespace Umbraco.Core.Models.Membership
// validation for that doesn't need to be there anyways (have checked the source).
public UmbracoMembershipMember(IMembershipUser member, string providerName)
{
_member = member;
_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)
@@ -37,18 +37,18 @@ namespace Umbraco.Core.Models.Membership
if (member.PasswordQuestion != null)
_passwordQuestion = member.PasswordQuestion.Trim();
_providerName = providerName;
_providerUserKey = member.ProviderUserKey;
_providerUserKey = member.ProviderUserKey;
_comment = member.Comments;
_isApproved = member.IsApproved;
_isLockedOut = member.IsLockedOut;
_creationDate = member.CreateDate.ToUniversalTime();
_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 IMembershipUser Member
{
get { return _member; }

33
src/Umbraco.Core/Models/Membership/User.cs
View File

@@ -71,7 +71,6 @@ namespace Umbraco.Core.Models.Membership
private static readonly PropertyInfo AllowedSectionsSelector = ExpressionHelper.GetPropertyInfo<User, IEnumerable<string>>(x => x.AllowedSections);
private static readonly PropertyInfo IdSelector = ExpressionHelper.GetPropertyInfo<User, object>(x => x.Id);
private static readonly PropertyInfo NameSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Name);
private static readonly PropertyInfo KeySelector = ExpressionHelper.GetPropertyInfo<User, Guid>(x => x.Key);
private static readonly PropertyInfo UserTypeKeySelector = ExpressionHelper.GetPropertyInfo<User, Type>(x => x.ProviderUserKeyType);
private static readonly PropertyInfo UsernameSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Username);
@@ -102,22 +101,9 @@ namespace Umbraco.Core.Models.Membership
}
}
//this doesn't get used
[IgnoreDataMember]
public Guid Key
{
get
{
return _key;
}
set
{
SetPropertyValueAndDetectChanges(o =>
{
_key = value;
return _key;
}, _key, KeySelector);
}
}
public Guid Key { get; set; }
#endregion
@@ -126,19 +112,8 @@ namespace Umbraco.Core.Models.Membership
[IgnoreDataMember]
public object ProviderUserKey
{
get { return Key; }
set
{
var result = value.TryConvertTo<Guid>();
if (result.Success)
{
Key = result.Result;
}
else
{
throw new NotSupportedException("The User object cannot have a ProviderUserKey of anything other than a GUID");
}
}
get { return Id; }
set { throw new NotSupportedException("Cannot set the provider user key for a user"); }
}
/// <summary>