From 7fa842c2b820090306cdee67827557df0c00d3eb Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Thu, 8 Jun 2023 16:12:15 +0200
Subject: [PATCH] Fix return URL.

---
 .../Areas/IdentityServer/Config/CreateAdminInitializer.cs       | 1 -
 .../IdentityServer/Controllers/Account/AccountController.cs     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/src/Squidex/Areas/IdentityServer/Config/CreateAdminInitializer.cs b/backend/src/Squidex/Areas/IdentityServer/Config/CreateAdminInitializer.cs
index fa7d3dd58..d528f3670 100644
--- 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
index 8eab5d873..74f750420 100644
--- a/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
+++ b/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
@@ -184,7 +184,7 @@ public sealed class AccountController : IdentityServerController
         {
             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.