Merge branch 'netcore/members-userstore' into netcore/feature/members-roles

This commit is contained in:
Emma Garland
2021-02-01 17:47:41 +00:00

View File

@@ -438,6 +438,12 @@ namespace Umbraco.Web.BackOffice.Controllers
string newPassword = _memberManager.HashPassword(contentItem.Password.NewPassword);
identityMember.PasswordHash = newPassword;
contentItem.PersistedContent.RawPasswordValue = identityMember.PasswordHash;
if (identityMember.LastPasswordChangeDateUtc != null)
{
contentItem.PersistedContent.LastPasswordChangeDate = DateTime.UtcNow;
identityMember.LastPasswordChangeDateUtc = contentItem.PersistedContent.LastPasswordChangeDate;
}
}
IdentityResult updatedResult = await _memberManager.UpdateAsync(identityMember);
@@ -447,12 +453,6 @@ namespace Umbraco.Web.BackOffice.Controllers
return new ValidationErrorResult(updatedResult.Errors.ToErrorMessage());
}
contentItem.PersistedContent.RawPasswordValue = identityMember.PasswordHash;
if (identityMember.LastPasswordChangeDateUtc != null)
{
contentItem.PersistedContent.LastPasswordChangeDate = DateTime.Now;
}
_memberService.Save(contentItem.PersistedContent);
AddOrUpdateRoles(contentItem, identityMember);