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

U4-9898 Reset password should unlock a locked account

Browse Source
This commit is contained in:
Sebastiaan Janssen
2017-05-20 14:33:33 +02:00
parent d0f69907db
commit aee06c4574
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -204,7 +204,7 @@ namespace Umbraco.Web.Editors
if (identityUser != null)
{
var user = Services.UserService.GetByEmail(model.Email);
if (user != null && user.IsLockedOut == false)
if (user != null)
{
var code = await UserManager.GeneratePasswordResetTokenAsync(identityUser.Id);
var callbackUrl = ConstructCallbackUrl(identityUser.Id, code);
@@ -303,9 +303,27 @@ namespace Umbraco.Web.Editors
var result = await UserManager.ResetPasswordAsync(model.UserId, model.ResetCode, model.Password);
if (result.Succeeded)
{
var lockedOut = await UserManager.IsLockedOutAsync(model.UserId);
if (lockedOut)
{
Logger.Info<AuthenticationController>(
"User {0} is currently locked out, unlocking and resetting AccessFailedCount",
() => model.UserId);
var user = await UserManager.FindByIdAsync(model.UserId);
if (user != null)
{
user.LockoutEnabled = false;
user.AccessFailedCount = 0;
var setLockoutDisabled = await UserManager.UpdateAsync(user);
if (setLockoutDisabled.Succeeded == false)
Logger.Info<AuthenticationController>("Could not unlock for user {0} - error {1}",
() => model.UserId, () => setLockoutDisabled.Errors.First());
}
}
return Request.CreateResponse(HttpStatusCode.OK);
}
return Request.CreateValidationErrorResponse(
result.Errors.Any() ? result.Errors.First() : "Set password failed");
}