Merge pull request #26 from bilogic/url-intended

bramr94 · web-flow · commit 023e12d2d3f0 · 2025-01-06T10:17:41.000+01:00
`url.intended` as highest priority
diff --git a/src/FilamentDevelopersLogin.php b/src/FilamentDevelopersLogin.php
@@ -6,6 +6,7 @@
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Panel;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Redirect;
 use Illuminate\Validation\ValidationException;
 use Livewire\Features\SupportRedirects\Redirector;
 
@@ -50,6 +51,6 @@ public function login(Panel $panel, FilamentDeveloperLoginsPlugin $plugin, strin
         session()->regenerate();
 
         return redirect()
-            ->to($plugin->getRedirectTo() ?? $panel->getUrl());
+            ->to(Redirect::getIntendedUrl() ?? $plugin->getRedirectTo() ?? $panel->getUrl());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`use Filament\Models\Contracts\FilamentUser;`
`7`	`7`	`use Filament\Panel;`
`8`	`8`	`use Illuminate\Http\RedirectResponse;`
	`9`	`+use Illuminate\Support\Facades\Redirect;`
`9`	`10`	`use Illuminate\Validation\ValidationException;`
`10`	`11`	`use Livewire\Features\SupportRedirects\Redirector;`
`11`	`12`
`@@ -50,6 +51,6 @@ public function login(Panel $panel, FilamentDeveloperLoginsPlugin $plugin, strin`
`50`	`51`	`session()->regenerate();`
`51`	`52`
`52`	`53`	`return redirect()`
`53`		`- ->to($plugin->getRedirectTo() ?? $panel->getUrl());`
	`54`	`+ ->to(Redirect::getIntendedUrl() ?? $plugin->getRedirectTo() ?? $panel->getUrl());`
`54`	`55`	`}`
`55`	`56`	`}`