From db6c65c7e88cf190bf089532c490e418f20e1626 Mon Sep 17 00:00:00 2001
From: mostafametwally <mosta_eg@hotmail.com>
Date: Fri, 16 Feb 2024 23:17:56 +0100
Subject: [PATCH] fix account lockout to read from correct setting, consider
 timezone offset and enable lockout

---
 .../Extensions/OqtaneSiteIdentityBuilderExtensions.cs        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Oqtane.Server/Extensions/OqtaneSiteIdentityBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneSiteIdentityBuilderExtensions.cs
index d732421f..6234d2fb 100644
--- a/Oqtane.Server/Extensions/OqtaneSiteIdentityBuilderExtensions.cs
+++ b/Oqtane.Server/Extensions/OqtaneSiteIdentityBuilderExtensions.cs
@@ -21,8 +21,9 @@ namespace Oqtane.Extensions
                 options.Password.RequireNonAlphanumeric = bool.Parse(sitesettings.GetValue("IdentityOptions:Password:RequireNonAlphanumeric", options.Password.RequireNonAlphanumeric.ToString()));
 
                 // lockout options
-                options.Lockout.MaxFailedAccessAttempts = int.Parse(sitesettings.GetValue("IdentityOptions:Password:MaxFailedAccessAttempts", options.Lockout.MaxFailedAccessAttempts.ToString()));
-                options.Lockout.DefaultLockoutTimeSpan = TimeSpan.Parse(sitesettings.GetValue("IdentityOptions:Password:DefaultLockoutTimeSpan", options.Lockout.DefaultLockoutTimeSpan.ToString()));
+                options.Lockout.MaxFailedAccessAttempts = int.Parse(sitesettings.GetValue("IdentityOptions:Lockout:MaxFailedAccessAttempts", options.Lockout.MaxFailedAccessAttempts.ToString()));
+                options.Lockout.DefaultLockoutTimeSpan = TimeZoneInfo.Local.GetUtcOffset(DateTime.UtcNow) + TimeSpan.Parse(sitesettings.GetValue("IdentityOptions:Lockout:DefaultLockoutTimeSpan", options.Lockout.DefaultLockoutTimeSpan.ToString()));
+                options.Lockout.AllowedForNewUsers = options.Lockout.MaxFailedAccessAttempts > 0;
             });
 
             return builder;