[Fix] Redirecting to wrong panel after challenge

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) {

src/Http/Livewire/Auth/PasswordReset.php

@@ -26,7 +26,7 @@ class PasswordReset extends Page implements HasForms
     public function mount(): void
     {
         if (Filament::auth()->check()) {
-            redirect()->intended(Filament::getUrl());
+            redirect()->intended(Filament::getCurrentPanel()->getUrl());
         }
 
         if (session('status')) {

src/Http/Livewire/Auth/RequestPasswordReset.php

@@ -21,7 +21,7 @@ class RequestPasswordReset extends Page implements HasForms
     public function mount(): void
     {
         if (Filament::auth()->check()) {
-            redirect()->intended(Filament::getUrl());
+            redirect()->intended(Filament::getCurrentPanel()->getUrl());
         }
 
         if (session('status')) {

src/Http/Responses/LoginResponse.php

@@ -17,6 +17,6 @@ public function toResponse($request)
     {
         return $request->wantsJson()
             ? response()->json(['two_factor' => false])
-            : redirect()->intended(Filament::getUrl());
+            : redirect()->intended(Filament::getCurrentPanel()->getUrl());
     }
 }

src/Http/Responses/TwoFactorChallengeViewResponse.php

@@ -15,6 +15,6 @@ class TwoFactorChallengeViewResponse implements LoginResponseContract
      */
     public function toResponse($request)
     {
-        return redirect()->intended(Filament::getUrl());
+        return redirect()->intended(Filament::getCurrentPanel()->getUrl());
     }
 }

src/Http/Responses/TwoFactorLoginResponse.php

@@ -15,6 +15,10 @@ class TwoFactorLoginResponse implements LoginResponseContract
      */
     public function toResponse($request)
     {
-        return redirect()->intended(Filament::getUrl());
+        $panel = Filament::getPanel(session()->get('panel'));
+
+        session()->forget('panel');
+
+        return redirect()->intended($panel->getUrl());
     }
 }