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

identity: refactor sms mfa authorization check

Browse Source
This commit is contained in:
Abdullah Atta
2025-09-29 09:56:39 +05:00
committed by Abdullah Atta
parent cc459f9fea
commit 9860df2379
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Streetwriters.Identity/Services/MFAService.cs
+1 -3
View File
@@ -169,11 +169,9 @@ namespace Streetwriters.Identity.Services
if ((method != MFAMethods.Email && method != MFAMethods.SMS) || !IsValidMFAMethod(method))
throw new Exception("Invalid method.");
var userPlan = UserService.GetUserSubscriptionPlan(client.Id, user);
if (isSetup &&
method == MFAMethods.SMS &&
!UserService.IsUserPremium(client.Id, user) &&
userPlan != SubscriptionPlan.BELIEVER && userPlan != SubscriptionPlan.PRO)
!UserService.IsSMSMFAAllowed(client.Id, user))
throw new Exception("Due to the high costs of SMS, 2FA via SMS is only available on Pro & Believer plans.");
// if (!user.EmailConfirmed) throw new Exception("Please confirm your email before activating 2FA by email.");
Streetwriters.Identity/Services/UserService.cs
+13 -7
View File
@@ -28,7 +28,7 @@ namespace Streetwriters.Identity.Services
{
public class UserService
{
public static SubscriptionType GetUserSubscriptionStatus(string clientId, User user)
private static SubscriptionType? GetUserSubscriptionStatus(string clientId, User user)
{
var claimKey = GetClaimKey(clientId);
var status = user.Claims.FirstOrDefault((c) => c.ClaimType == claimKey).ClaimValue;
@@ -45,11 +45,11 @@ namespace Streetwriters.Identity.Services
case "premium_expired":
return SubscriptionType.PREMIUM_EXPIRED;
default:
return SubscriptionType.BASIC;
return null;
}
}
public static SubscriptionPlan GetUserSubscriptionPlan(string clientId, User user)
private static SubscriptionPlan? GetUserSubscriptionPlan(string clientId, User user)
{
var claimKey = GetClaimKey(clientId);
var status = user.Claims.FirstOrDefault((c) => c.ClaimType == claimKey).ClaimValue;
@@ -66,14 +66,20 @@ namespace Streetwriters.Identity.Services
case "pro":
return SubscriptionPlan.PRO;
default:
return SubscriptionPlan.FREE;
return null;
}
}
public static bool IsUserPremium(string clientId, User user)
public static bool IsSMSMFAAllowed(string clientId, User user)
{
var status = GetUserSubscriptionStatus(clientId, user);
return status == SubscriptionType.PREMIUM || status == SubscriptionType.PREMIUM_CANCELED;
var legacyStatus = GetUserSubscriptionStatus(clientId, user);
var status = GetUserSubscriptionPlan(clientId, user);
if (legacyStatus == null && status == null) return false;
return legacyStatus == SubscriptionType.PREMIUM ||
legacyStatus == SubscriptionType.PREMIUM_CANCELED ||
status == SubscriptionPlan.PRO ||
status == SubscriptionPlan.EDUCATION ||
status == SubscriptionPlan.BELIEVER;
}
public static Claim SubscriptionTypeToClaim(string clientId, SubscriptionType type)