check if came from filament first

joelbutcher · Sep 11, 2024 · cee500c · cee500c
1 parent 7c8f020
commit cee500c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Http/Responses/OAuthLoginResponse.php b/src/Http/Responses/OAuthLoginResponse.php
@@ -20,7 +20,7 @@ class OAuthLoginResponse implements LoginResponseContract
     public function toResponse($request): RedirectResponse|FortifyLoginResponse
     {
         return match (true) {
-            $this->usesFilament() && $this->hasFilamentAuthRoutes() => redirect()->route(
+            $this->cameFromFilamentAuthRoute() && $this->usesFilament() && $this->hasFilamentAuthRoutes() => redirect()->route(
                 config('socialstream.filament-route', 'filament.admin.pages.dashboard')
             ),
             $this->hasComposerPackage('laravel/jetstream') => $this->fortifyResponse($request),

diff --git a/src/Http/Responses/OAuthRegisterResponse.php b/src/Http/Responses/OAuthRegisterResponse.php
@@ -21,7 +21,7 @@ class OAuthRegisterResponse implements RegisterResponseContract
     public function toResponse($request): RedirectResponse|RegisterResponse
     {
         return match (true) {
-            $this->usesFilament() && $this->hasFilamentAuthRoutes() => redirect()->route(
+            $this->cameFromFilamentAuthRoute() && $this->usesFilament() && $this->hasFilamentAuthRoutes() => redirect()->route(
                 config('socialstream.filament-route', 'filament.admin.pages.dashboard')
             ),
             $this->hasComposerPackage('laravel/jetstream') => $this->fortifyResponse($request),