CalvinBackup/notesnook-sync-server_customPrivateV1
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook-sync-server.git synced 2026-08-14 20:40:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

identity: many fixes to auth grant validation

Browse Source
This commit is contained in:
Abdullah Atta
2024-05-16 13:15:41 +05:00
parent abe7e67933
commit dac2d7a577
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Streetwriters.Identity/Validation/LockedOutValidationResult.cs
+4 -3
View File
@@ -26,11 +26,12 @@ namespace Streetwriters.Identity.Validation
{ {
public LockedOutValidationResult(TimeSpan? timeLeft) public LockedOutValidationResult(TimeSpan? timeLeft)
{ {
base.Error = "locked_out"; Error = "locked_out";
IsError = true;
if (timeLeft.HasValue) if (timeLeft.HasValue)
base.ErrorDescription = $"You have been locked out. Please try again in {timeLeft?.Minutes.Pluralize("minute", "minutes")} and {timeLeft?.Seconds.Pluralize("second", "seconds")}."; ErrorDescription = $"You have been locked out. Please try again in {timeLeft?.Minutes.Pluralize("minute", "minutes")} and {timeLeft?.Seconds.Pluralize("second", "seconds")}.";
else else
base.ErrorDescription = $"You have been locked out."; ErrorDescription = $"You have been locked out.";
} }
} }
} }
Streetwriters.Identity/Validation/MFAGrantValidator.cs
+10 -9
View File
@@ -89,6 +89,14 @@ namespace Streetwriters.Identity.Validation
var user = await UserManager.FindByIdAsync(userId); var user = await UserManager.FindByIdAsync(userId);
if (user == null) return; if (user == null) return;
var isLockedOut = await UserManager.IsLockedOutAsync(user);
if (isLockedOut)
{
var timeLeft = user.LockoutEnd - DateTimeOffset.Now;
context.Result = new LockedOutValidationResult(timeLeft);
return;
}
context.Result.Error = "invalid_mfa"; context.Result.Error = "invalid_mfa";
context.Result.ErrorDescription = "Please provide a valid multi-factor authentication code."; context.Result.ErrorDescription = "Please provide a valid multi-factor authentication code.";
@@ -102,14 +110,6 @@ namespace Streetwriters.Identity.Validation
return; return;
} }
var isLockedOut = await UserManager.IsLockedOutAsync(user);
if (isLockedOut)
{
var timeLeft = user.LockoutEnd - DateTimeOffset.Now;
context.Result = new LockedOutValidationResult(timeLeft);
return;
}
if (mfaMethod == MFAMethods.RecoveryCode) if (mfaMethod == MFAMethods.RecoveryCode)
{ {
context.Result.ErrorDescription = "Please provide a valid multi-factor authentication recovery code."; context.Result.ErrorDescription = "Please provide a valid multi-factor authentication recovery code.";
@@ -132,8 +132,9 @@ namespace Streetwriters.Identity.Validation
} }
} }
await UserManager.ResetAccessFailedCountAsync(user);
context.Result.IsError = false; context.Result.IsError = false;
context.Result.Subject = await TokenGenerationService.TransformTokenRequestAsync(context.Request, user, GrantType, new string[] { Config.MFA_PASSWORD_GRANT_TYPE_SCOPE }); context.Result.Subject = await TokenGenerationService.TransformTokenRequestAsync(context.Request, user, GrantType, [Config.MFA_PASSWORD_GRANT_TYPE_SCOPE]);
} }
Streetwriters.Identity/Validation/MFAPasswordGrantValidator.cs
+1
View File
@@ -101,6 +101,7 @@ namespace Streetwriters.Identity.Validation
return; return;
} }
await UserManager.ResetAccessFailedCountAsync(user);
var sub = await UserManager.GetUserIdAsync(user); var sub = await UserManager.GetUserIdAsync(user);
context.Result = new GrantValidationResult(sub, AuthenticationMethods.Password); context.Result = new GrantValidationResult(sub, AuthenticationMethods.Password);
} }