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

Removed unwanted comments

Browse Source
This commit is contained in:
Emma Garland
2020-12-03 17:54:02 +00:00
parent 785570761a
commit 57684a8672
3 changed files with 22 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Umbraco.Infrastructure/Members/UmbracoMembersUserStore.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Infrastructure.Members
/// A custom user store that uses Umbraco member data
/// </summary>
public class UmbracoMembersUserStore : DisposableObjectSlim,
IUserStore<UmbracoMembersIdentityUser>,
//IUserStore<UmbracoMembersIdentityUser>,
IUserPasswordStore<UmbracoMembersIdentityUser>
//IUserEmailStore<UmbracoMembersIdentityUser>
//IUserLoginStore<UmbracoMembersIdentityUser>
@@ -52,8 +52,7 @@ namespace Umbraco.Infrastructure.Members
UpdateMemberProperties(member, user);
//TODO: do we want to accept empty passwords here - if thirdparty for example? In other method if so?
//TODO: do we want to accept empty passwords here - if third-party for example? In other method if so?
_memberService.Save(member);
//re-assign id
@@ -106,33 +105,6 @@ namespace Umbraco.Infrastructure.Members
//[Comments as per BackOfficeUserStore & identity package]
var anythingChanged = false;
//don't assign anything if nothing has changed as this will trigger the track changes of the model
//if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.LastLoginDateUtc))
// || (member.LastLoginDate != default(DateTime) && identityUser.LastLoginDateUtc.HasValue == false)
// || identityUser.LastLoginDateUtc.HasValue && member.LastLoginDate.ToUniversalTime() != identityUser.LastLoginDateUtc.Value)
//{
// anythingChanged = true;
// //if the LastLoginDate is being set to MinValue, don't convert it ToLocalTime
// var dt = identityUser.LastLoginDateUtc == DateTime.MinValue ? DateTime.MinValue : identityUser.LastLoginDateUtc.Value.ToLocalTime();
// member.LastLoginDate = dt;
//}
//if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.LastPasswordChangeDateUtc))
// || (member.LastPasswordChangeDate != default(DateTime) && identityUser.LastPasswordChangeDateUtc.HasValue == false)
// || identityUser.LastPasswordChangeDateUtc.HasValue && member.LastPasswordChangeDate.ToUniversalTime() != identityUser.LastPasswordChangeDateUtc.Value)
//{
// anythingChanged = true;
// member.LastPasswordChangeDate = identityUser.LastPasswordChangeDateUtc.Value.ToLocalTime();
//}
//if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.EmailConfirmed))
// || (member.EmailConfirmedDate.HasValue && member.EmailConfirmedDate.Value != default(DateTime) && identityUser.EmailConfirmed == false)
// || ((member.EmailConfirmedDate.HasValue == false || member.EmailConfirmedDate.Value == default(DateTime)) && identityUser.EmailConfirmed))
//{
// anythingChanged = true;
// member.EmailConfirmedDate = identityUser.EmailConfirmed ? (DateTime?)DateTime.Now : null;
//}
if (
//memberIdentityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Name)) &&
member.Name != memberIdentityUser.Name && memberIdentityUser.Name.IsNullOrWhiteSpace() == false)
@@ -147,15 +119,7 @@ namespace Umbraco.Infrastructure.Members
anythingChanged = true;
member.Email = memberIdentityUser.Email;
}
//TODO: AccessFailedCount
//if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.AccessFailedCount))
// && member.FailedPasswordAttempts != identityUser.AccessFailedCount)
//{
// anythingChanged = true;
// member.FailedPasswordAttempts = identityUser.AccessFailedCount;
//}
if (member.IsLockedOut != memberIdentityUser.IsLockedOut)
{
anythingChanged = true;
@@ -175,7 +139,6 @@ namespace Umbraco.Infrastructure.Members
member.Username = memberIdentityUser.UserName;
}
//TODO: PasswordHash and PasswordConfig
if (
//member.IsPropertyDirty(nameof(BackOfficeIdentityUser.PasswordHash))&&
member.RawPasswordValue != memberIdentityUser.PasswordHash
@@ -186,13 +149,6 @@ namespace Umbraco.Infrastructure.Members
member.PasswordConfiguration = memberIdentityUser.PasswordConfig;
}
//TODO: SecurityStamp
//if (member.SecurityStamp != identityUser.SecurityStamp)
//{
// anythingChanged = true;
// member.SecurityStamp = identityUser.SecurityStamp;
//}
// TODO: Roles
// [Comment] Same comment as per BackOfficeUserStore: Fix this for Groups too
//if (identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Roles)) || identityUser.IsPropertyDirty(nameof(BackOfficeIdentityUser.Groups)))

26
src/Umbraco.Web.BackOffice/Controllers/MemberController.cs
View File

@@ -334,8 +334,6 @@ namespace Umbraco.Web.BackOffice.Controllers
/// <returns></returns>
private async Task CreateMemberAsync(MemberSave contentItem, UmbracoMembersIdentityUser identityMember)
{
// TODO: all member password processing and creation needs to be done with a new aspnet identity MemberUserManager that hasn't been created yet.
//var memberType = _memberTypeService.Get(contentItem.ContentTypeAlias);
//if (memberType == null)
// throw new InvalidOperationException($"No member type found with alias {contentItem.ContentTypeAlias}");
@@ -349,9 +347,6 @@ namespace Umbraco.Web.BackOffice.Controllers
//return member;
IdentityResult created = await _memberManager.CreateAsync(identityMember, contentItem.Password.NewPassword);
if (created.Succeeded == false)
{
@@ -362,7 +357,6 @@ namespace Umbraco.Web.BackOffice.Controllers
IMember member = _memberService.GetByEmail(contentItem.Email);
member.CreatorId = _backofficeSecurityAccessor.BackOfficeSecurity.CurrentUser.Id;
member.RawPasswordValue = identityMember.RawPasswordValue;
//since the back office user is creating this member, they will be set to approved
member.IsApproved = true;
@@ -374,7 +368,6 @@ namespace Umbraco.Web.BackOffice.Controllers
private UmbracoMembersIdentityUser ValidateMemberData(MemberSave contentItem)
{
var memberType = _memberTypeService.Get(contentItem.ContentTypeAlias);
if (memberType == null)
{
@@ -404,13 +397,30 @@ namespace Umbraco.Web.BackOffice.Controllers
$"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}email");
}
if (contentItem.Password != null && !contentItem.Password.NewPassword.IsNullOrWhiteSpace())
{
//TODO: check password
//var validPassword = await _memberManager.CheckPasswordAsync(null, contentItem.Password.NewPassword);
//if (!validPassword)
//{
// ModelState.AddPropertyError(
// new ValidationResult("Invalid password", new[] { "value" }),
// $"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}password");
//}
}
else
{
ModelState.AddPropertyError(
new ValidationResult("Password cannot be empty", new[] { "value" }),
$"{Constants.PropertyEditors.InternalGenericPropertiesPrefix}password");
}
// Create the member with the MemberManager
var identityMember = UmbracoMembersIdentityUser.CreateNew(
contentItem.Username,
contentItem.Email,
memberType.Alias,
contentItem.Name);
//TODO: confirm where to do this
identityMember.RawPasswordValue = contentItem.Password.NewPassword;
return identityMember;

1
src/Umbraco.Web/Security/MembershipProviderBase.cs
View File

@@ -19,6 +19,7 @@ namespace Umbraco.Web.Security
/// <summary>
/// A base membership provider class offering much of the underlying functionality for initializing and password encryption/hashing.
/// </summary>
[Obsolete("Will be replaced by UmbracoMemberUserManager")]
public abstract class MembershipProviderBase : MembershipProvider
{
private readonly IHostingEnvironment _hostingEnvironment;