Fix return URL.

Squidex · Jun 8, 2023 · 7fa842c · 7fa842c
1 parent a6179e1
commit 7fa842c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/backend/src/Squidex/Areas/IdentityServer/Config/CreateAdminInitializer.cs b/backend/src/Squidex/Areas/IdentityServer/Config/CreateAdminInitializer.cs
@@ -27,7 +27,6 @@ public sealed class CreateAdminInitializer : IInitializable
     public CreateAdminInitializer(IServiceProvider serviceProvider, IOptions<MyIdentityOptions> identityOptions)
     {
         this.serviceProvider = serviceProvider;
-
         this.identityOptions = identityOptions.Value;
     }
 

diff --git a/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
@@ -184,7 +184,7 @@ private async Task<IActionResult> LoginViewAsync(string? returnUrl, bool isLogin
         {
             var provider = externalProviders[0].AuthenticationScheme;
 
-            var challengeRedirectUrl = Url.Action(nameof(ExternalCallback));
+            var challengeRedirectUrl = Url.Action(nameof(ExternalCallback), new { returnUrl });
             var challengeProperties = SignInManager.ConfigureExternalAuthenticationProperties(provider, challengeRedirectUrl);
 
             // Redirect to the external authentication provider.