redirect guest user to the login page of current panel, or default pa…

…nel if current panel could not be detected. (#57)
MarJose123 · Aug 21, 2024 · 2d48df9 · 2d48df9
2 parents c802bfc + a388b15
commit 2d48df9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/routes/web.php b/routes/web.php
@@ -22,7 +22,7 @@
                                 ? config('filament-lockscreen.url')
                                 : '/screen/lock',
                             LockerScreen::class
-                        )->name('page')->middleware(['auth']);
+                        )->name('page');
                     });
 
             }

diff --git a/src/Http/Livewire/LockerScreen.php b/src/Http/Livewire/LockerScreen.php
@@ -37,11 +37,15 @@ class LockerScreen extends BasePage
     public function mount()
     {
         // Check if the request is still authenticated or not before rendering the page,
-        // if not authenticated then redirect to the default filament login page
+        // if not authenticated then redirect to the login page of current panel, or default panel if current panel could not be detected.
 
-        if(!Filament::auth()->check())
+        if (!Filament::auth()->check())
         {
-            return redirect(Filament::getDefaultPanel()->getLoginUrl());
+            if (filament()->getCurrentPanel()) {
+                return redirect(filament()->getCurrentPanel()->getLoginUrl());
+            }
+
+            return redirect(filament()->getDefaultPanel()->getLoginUrl());
         }
 
         session(['lockscreen' => true]);