Fix tenant admin Google OAuth redirect

2026-01-23 17:25:12 +01:00
parent ee6fb7a5bb
commit 7dd8bc4c91
2 changed files with 35 additions and 1 deletions
--- a/app/Http/Controllers/TenantAdminGoogleController.php
+++ b/app/Http/Controllers/TenantAdminGoogleController.php
@@ -57,6 +57,7 @@ class TenantAdminGoogleController extends Controller

        Auth::login($user, true);
        $request->session()->regenerate();
+        $request->session()->forget('url.intended');

        $returnTo = $request->session()->pull('tenant_oauth_return_to');
        if (is_string($returnTo)) {
@@ -66,7 +67,12 @@ class TenantAdminGoogleController extends Controller
            }
        }

-        return redirect()->intended('/event-admin/dashboard');
+        $fallback = $request->session()->pull('tenant_admin.return_to');
+        if (is_string($fallback) && str_starts_with($fallback, '/event-admin')) {
+            return redirect()->to($fallback);
+        }
+
+        return redirect()->to('/event-admin/dashboard');
    }

    private function sendBackWithError(Request $request, string $code, string $message): RedirectResponse