Fix redirect to correct panel by saving panel ID in the session

vormkracht10 · Aug 19, 2024 · efc1503 · efc1503
1 parent cde2e87
commit efc1503
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Http/Livewire/Auth/Login.php b/src/Http/Livewire/Auth/Login.php
@@ -75,6 +75,8 @@ protected function getFormSchema(): array
 
     public function loginWithFortify()
     {
+        session()->put('panel', Filament::getCurrentPanel()->getId());
+
         try {
             $this->rateLimit(5);
         } catch (TooManyRequestsException $exception) {

diff --git a/src/Http/Responses/TwoFactorLoginResponse.php b/src/Http/Responses/TwoFactorLoginResponse.php
@@ -15,6 +15,10 @@ class TwoFactorLoginResponse implements LoginResponseContract
      */
     public function toResponse($request)
     {
-        return redirect()->intended(Filament::getCurrentPanel()->getUrl());
+        $panel = Filament::getPanel(session()->get('panel'));
+
+        session()->forget('panel');
+
+        return redirect()->intended($panel->getUrl());
     }
 }