merge hotfix

Etherna · Jun 5, 2023 · 02c68a7 · 02c68a7
2 parents 41f23e4 + 447a866
commit 02c68a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/EthernaSSO/Configs/Identity/UserStore.cs b/src/EthernaSSO/Configs/Identity/UserStore.cs
@@ -483,7 +483,11 @@ public Task SetUserNameAsync(UserBase user, string? userName, CancellationToken
         [SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "External library doesn't declare exceptions")]
         public async Task<IdentityResult> UpdateAsync(UserBase user, CancellationToken cancellationToken)
         {
-            try { await ssoDbContext.Users.ReplaceAsync(user, cancellationToken: cancellationToken); }
+            try
+            {
+                //update both UserBase and UserSharedInfo
+                await ssoDbContext.SaveChangesAsync(cancellationToken);
+            }
             catch { return IdentityResult.Failed(); }
             return IdentityResult.Success;
         }

diff --git a/src/EthernaSSO/Startup.cs b/src/EthernaSSO/Startup.cs
@@ -293,6 +293,7 @@ static Task unauthorizedApiCallHandler(RedirectContext<CookieAuthenticationOptio
             var idServerConfig = new IdServerConfig(Configuration);
             var builder = services.AddIdentityServer(options =>
             {
+                options.Authentication.CookieAuthenticationScheme = IdentityConstants.ApplicationScheme;
                 options.LicenseKey = Configuration["IdServer:LicenseKey"]; //can be null in dev env
                 options.UserInteraction.ErrorUrl = "/Error";
             })