CalvinBackup/notesnook-sync-server_customPrivateV1
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook-sync-server.git synced 2026-02-12 11:12:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

identity: fix 2fa recovery codes not working

Browse Source
This commit is contained in:
Abdullah Atta
2025-07-15 13:35:07 +05:00
parent 34fa43f302
commit 76af2cbfc8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Streetwriters.Identity/Services/MFAService.cs
View File

@@ -125,7 +125,8 @@ namespace Streetwriters.Identity.Services
{
var primaryMethod = GetPrimaryMethod(user);
var secondaryMethod = GetSecondaryMethod(user);
return IsValidMFAMethod(method) && (method == primaryMethod || method == secondaryMethod);
if (!IsValidMFAMethod(method)) return false;
return method == primaryMethod || (!string.IsNullOrEmpty(secondaryMethod) && method == secondaryMethod);
}
private Task RemoveSecondaryMethodAsync(User user)
@@ -164,7 +165,7 @@ namespace Streetwriters.Identity.Services
public async Task SendOTPAsync(User user, IClient client, MultiFactorSetupForm form, bool isSetup = false)
{
var method = form.Type;
if ((method != MFAMethods.Email && method != MFAMethods.SMS) || !IsValidMFAMethod(method, user))
if ((method != MFAMethods.Email && method != MFAMethods.SMS) || !IsValidMFAMethod(method))
throw new Exception("Invalid method.");
if (isSetup &&

2
Streetwriters.Identity/Validation/MFAGrantValidator.cs
View File

@@ -101,7 +101,7 @@ namespace Streetwriters.Identity.Validation
context.Result.ErrorDescription = "Please provide a valid multi-factor authentication code.";
if (string.IsNullOrEmpty(mfaCode)) return;
if (string.IsNullOrEmpty(mfaMethod) || !MFAService.IsValidMFAMethod(mfaMethod, user))
if (string.IsNullOrEmpty(mfaMethod) || (!MFAService.IsValidMFAMethod(mfaMethod, user) && mfaMethod != MFAMethods.RecoveryCode))
{
context.Result.ErrorDescription = "Please provide a valid multi-factor authentication method.";
return;