From 541f4b07e38c14b3d714328faa50c3951b5dc6b0 Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 9 Dec 2024 19:19:32 +0100 Subject: [PATCH 1/4] Fix route login not found --- docs-assets/app/app/Http/Kernel.php | 2 +- .../app/Providers/Filament/AdminPanelProvider.php | 2 +- .../src/Http/Middleware/AuthenticateSession.php | 14 ++++++++++++++ packages/support/stubs/DefaultPanelProvider.stub | 2 +- packages/support/stubs/PanelProvider.stub | 2 +- .../bin/create-filament-v3-panel-provider.php | 2 +- tests/src/AdminPanelProvider.php | 2 +- tests/src/CustomPanelProvider.php | 2 +- tests/src/DomainTenancyPanelProvider.php | 2 +- tests/src/MultiDomainPanel.php | 4 ++-- tests/src/SingleDomainPanel.php | 2 +- tests/src/SlugsPanelProvider.php | 2 +- tests/src/TenancyPanelProvider.php | 2 +- 13 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 packages/panels/src/Http/Middleware/AuthenticateSession.php diff --git a/docs-assets/app/app/Http/Kernel.php b/docs-assets/app/app/Http/Kernel.php index a9f9fefbcd..a63eab185f 100644 --- a/docs-assets/app/app/Http/Kernel.php +++ b/docs-assets/app/app/Http/Kernel.php @@ -22,7 +22,7 @@ use Illuminate\Http\Middleware\HandleCors; use Illuminate\Http\Middleware\SetCacheHeaders; use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Middleware\ThrottleRequests; -use Illuminate\Session\Middleware\AuthenticateSession; +use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php b/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php index 41b2a43094..879a3c2965 100644 --- a/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php +++ b/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php @@ -14,7 +14,7 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Illuminate\Session\Middleware\AuthenticateSession; +use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/packages/panels/src/Http/Middleware/AuthenticateSession.php b/packages/panels/src/Http/Middleware/AuthenticateSession.php new file mode 100644 index 0000000000..c108950af9 --- /dev/null +++ b/packages/panels/src/Http/Middleware/AuthenticateSession.php @@ -0,0 +1,14 @@ + Date: Mon, 9 Dec 2024 19:24:40 +0100 Subject: [PATCH 2/4] Style --- docs-assets/app/app/Http/Kernel.php | 2 +- docs-assets/app/app/Providers/Filament/AdminPanelProvider.php | 2 +- tests/src/AdminPanelProvider.php | 2 +- tests/src/CustomPanelProvider.php | 2 +- tests/src/DomainTenancyPanelProvider.php | 2 +- tests/src/MultiDomainPanel.php | 1 - tests/src/SingleDomainPanel.php | 2 +- tests/src/SlugsPanelProvider.php | 2 +- tests/src/TenancyPanelProvider.php | 2 +- 9 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs-assets/app/app/Http/Kernel.php b/docs-assets/app/app/Http/Kernel.php index a63eab185f..707f8f1a18 100644 --- a/docs-assets/app/app/Http/Kernel.php +++ b/docs-assets/app/app/Http/Kernel.php @@ -10,6 +10,7 @@ use App\Http\Middleware\TrimStrings; use App\Http\Middleware\TrustProxies; use App\Http\Middleware\ValidateSignature; use App\Http\Middleware\VerifyCsrfToken; +use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth; use Illuminate\Auth\Middleware\Authorize; use Illuminate\Auth\Middleware\EnsureEmailIsVerified; @@ -22,7 +23,6 @@ use Illuminate\Http\Middleware\HandleCors; use Illuminate\Http\Middleware\SetCacheHeaders; use Illuminate\Routing\Middleware\SubstituteBindings; use Illuminate\Routing\Middleware\ThrottleRequests; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php b/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php index 879a3c2965..a206a4c51a 100644 --- a/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php +++ b/docs-assets/app/app/Providers/Filament/AdminPanelProvider.php @@ -3,6 +3,7 @@ namespace App\Providers\Filament; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Pages; @@ -14,7 +15,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/AdminPanelProvider.php b/tests/src/AdminPanelProvider.php index d46c2a5fa1..f05ca91d19 100644 --- a/tests/src/AdminPanelProvider.php +++ b/tests/src/AdminPanelProvider.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Pages; @@ -18,7 +19,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/CustomPanelProvider.php b/tests/src/CustomPanelProvider.php index 4b41996029..f6f8386577 100644 --- a/tests/src/CustomPanelProvider.php +++ b/tests/src/CustomPanelProvider.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Panel; @@ -11,7 +12,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/DomainTenancyPanelProvider.php b/tests/src/DomainTenancyPanelProvider.php index 541b7dbe2a..a029b19924 100644 --- a/tests/src/DomainTenancyPanelProvider.php +++ b/tests/src/DomainTenancyPanelProvider.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Http\Middleware\IdentifyTenant; @@ -20,7 +21,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/MultiDomainPanel.php b/tests/src/MultiDomainPanel.php index bd9e1f9b0e..b0f2705219 100644 --- a/tests/src/MultiDomainPanel.php +++ b/tests/src/MultiDomainPanel.php @@ -18,7 +18,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/SingleDomainPanel.php b/tests/src/SingleDomainPanel.php index a33ac46f6b..373a6d30b6 100644 --- a/tests/src/SingleDomainPanel.php +++ b/tests/src/SingleDomainPanel.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Pages; @@ -18,7 +19,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/SlugsPanelProvider.php b/tests/src/SlugsPanelProvider.php index 5ced898c62..1864fc6d81 100644 --- a/tests/src/SlugsPanelProvider.php +++ b/tests/src/SlugsPanelProvider.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Panel; @@ -11,7 +12,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/tests/src/TenancyPanelProvider.php b/tests/src/TenancyPanelProvider.php index f698126d41..bfbed239d4 100644 --- a/tests/src/TenancyPanelProvider.php +++ b/tests/src/TenancyPanelProvider.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Http\Middleware\IdentifyTenant; @@ -20,7 +21,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; From 3d45a04cc8170cb88af31f8fb9a2cd27fcac7e17 Mon Sep 17 00:00:00 2001 From: ralphjsmit Date: Mon, 9 Dec 2024 18:32:24 +0000 Subject: [PATCH 3/4] chore: fix code style --- tests/src/MultiDomainPanel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/src/MultiDomainPanel.php b/tests/src/MultiDomainPanel.php index b0f2705219..d24acfc8e4 100644 --- a/tests/src/MultiDomainPanel.php +++ b/tests/src/MultiDomainPanel.php @@ -3,6 +3,7 @@ namespace Filament\Tests; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Pages; @@ -47,7 +48,7 @@ class MultiDomainPanel extends PanelProvider EncryptCookies::class, AddQueuedCookiesToResponse::class, StartSession::class, - \Filament\Http\Middleware\AuthenticateSession::class, + AuthenticateSession::class, ShareErrorsFromSession::class, VerifyCsrfToken::class, SubstituteBindings::class, From 9bf48a81b93b703c35a08c58c491aa1a9db5532f Mon Sep 17 00:00:00 2001 From: "Ralph J. Smit" <59207045+ralphjsmit@users.noreply.github.com> Date: Mon, 9 Dec 2024 20:07:00 +0100 Subject: [PATCH 4/4] Fix order in stubs --- packages/support/stubs/DefaultPanelProvider.stub | 2 +- packages/upgrade/bin/create-filament-v3-panel-provider.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/support/stubs/DefaultPanelProvider.stub b/packages/support/stubs/DefaultPanelProvider.stub index 0601162ac4..a80bae5b6e 100644 --- a/packages/support/stubs/DefaultPanelProvider.stub +++ b/packages/support/stubs/DefaultPanelProvider.stub @@ -3,6 +3,7 @@ namespace App\Providers\Filament; use Filament\Http\Middleware\Authenticate; +use Filament\Http\Middleware\AuthenticateSession; use Filament\Http\Middleware\DisableBladeIconComponents; use Filament\Http\Middleware\DispatchServingFilamentEvent; use Filament\Pages; @@ -14,7 +15,6 @@ use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse; use Illuminate\Cookie\Middleware\EncryptCookies; use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken; use Illuminate\Routing\Middleware\SubstituteBindings; -use Filament\Http\Middleware\AuthenticateSession; use Illuminate\Session\Middleware\StartSession; use Illuminate\View\Middleware\ShareErrorsFromSession; diff --git a/packages/upgrade/bin/create-filament-v3-panel-provider.php b/packages/upgrade/bin/create-filament-v3-panel-provider.php index 5391211130..42b7950be7 100644 --- a/packages/upgrade/bin/create-filament-v3-panel-provider.php +++ b/packages/upgrade/bin/create-filament-v3-panel-provider.php @@ -57,6 +57,7 @@ file_put_contents("app/Providers/Filament/{$className}.php", "