From 6df67cd93e51832e425fb78966a1924ca58d0887 Mon Sep 17 00:00:00 2001 From: Emma Garland Date: Fri, 29 Jan 2021 15:03:06 +0000 Subject: [PATCH] Corrected password logic --- .../Controllers/MemberController.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs index 24958dbde5..360ca9399f 100644 --- a/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs +++ b/src/Umbraco.Web.BackOffice/Controllers/MemberController.cs @@ -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,13 +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.UtcNow; - identityMember.LastPasswordChangeDateUtc = contentItem.PersistedContent.LastPasswordChangeDate; - } - _memberService.Save(contentItem.PersistedContent); AddOrUpdateRoles(contentItem);