Merge pull request #4622 from sbwalker/dev

allow external login to support SecurityStamp
oqtane · Sep 17, 2024 · 6f5da1c · 6f5da1c
2 parents d4d4034 + 3351732
commit 6f5da1c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs b/Oqtane.Server/Extensions/OqtaneSiteAuthenticationBuilderExtensions.cs
@@ -20,7 +20,6 @@
 using System.Net;
 using System.Text.Json.Nodes;
 using System.Globalization;
-using System.Net.WebSockets;
 
 namespace Oqtane.Extensions
 {
@@ -366,6 +365,7 @@ private static async Task<ClaimsIdentity> ValidateUser(string id, string name, s
                 {
                     user = _users.GetUser(identityuser.UserName);
                     user.SiteId = alias.SiteId;
+                    user.SecurityStamp = identityuser.SecurityStamp;
                 }
                 else
                 {
@@ -431,14 +431,17 @@ private static async Task<ClaimsIdentity> ValidateUser(string id, string name, s
                                 var result = await _identityUserManager.CreateAsync(identityuser, password);
                                 if (result.Succeeded)
                                 {
+                                    identityuser = await _identityUserManager.FindByNameAsync(username);
+
                                     user = new User
                                     {
                                         SiteId = alias.SiteId,
                                         Username = username,
                                         DisplayName = displayname,
                                         Email = emailaddress,
                                         LastLoginOn = null,
-                                        LastIPAddress = ""
+                                        LastIPAddress = "",
+                                        SecurityStamp = identityuser.SecurityStamp
                                     };
                                     user = _users.AddUser(user);