Merge pull request #4948 from zyhfish/task/fix-4947

Fix #4947: check the 2FA settings.
oqtane · Dec 24, 2024 · d19d7d2 · d19d7d2
2 parents 9bfaa02 + af7b4db
commit d19d7d2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Oqtane.Server/Managers/UserManager.cs b/Oqtane.Server/Managers/UserManager.cs
@@ -512,7 +512,10 @@ public User VerifyTwoFactor(User user, string token)
             user = _users.GetUser(user.Username);
             if (user != null)
             {
-                if (user.TwoFactorRequired && user.TwoFactorCode == token && DateTime.UtcNow < user.TwoFactorExpiry)
+                var alias = _tenantManager.GetAlias();
+                var twoFactorSetting = _settings.GetSetting(EntityNames.Site, alias.SiteId, "LoginOptions:TwoFactor")?.SettingValue ?? "false";
+                var twoFactorRequired = twoFactorSetting == "required" || user.TwoFactorRequired;
+                if (twoFactorRequired && user.TwoFactorCode == token && DateTime.UtcNow < user.TwoFactorExpiry)
                 {
                     user.IsAuthenticated = true;
                 }