add validation before the page is rendered (#48)

src/Http/Livewire/LockerScreen.php

@@ -7,6 +7,7 @@
 use Filament\Facades\Filament;
 use Filament\Actions\Action;
 use Filament\Forms\Components\TextInput;
+use Filament\Pages\Actions\ActionGroup;
 use Filament\Pages\BasePage;
 use Filament\Pages\Concerns\InteractsWithFormActions;
 use Filament\Forms\Contracts\HasForms;
@@ -35,6 +36,14 @@ 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(!Filament::auth()->check())
+        {
+            return redirect(Filament::getDefaultPanel()->getLoginUrl());
+        }
+
         session(['lockscreen' => true]);
         if (! config('filament-lockscreen.enable_redirect_to')) {
             if (! session()->has('next') || session()->get('next') === null) {
@@ -43,7 +52,7 @@ public function mount()
         }
     }
 
-    protected function forceLogout()
+    protected function forceLogout(): void
     {
         Filament::auth()->logout();
         session()->invalidate();
@@ -56,7 +65,7 @@ protected function forceLogout()
             ->send();
     }
 
-    public function authenticate()
+    public function authenticate(): \Illuminate\Routing\Redirector|\Illuminate\Http\RedirectResponse|\Illuminate\Contracts\Foundation\Application|null
     {
         $data = $this->form->getState();
         $this->account_password_field = config('filament-lockscreen.table_columns.account_password_field');

src/Http/Middleware/Locker.php

@@ -15,9 +15,8 @@ class Locker
      */
     public function handle($request, Closure $next)
     {
-
-        if ($request->session()->get('lockscreen') && $request->method() === 'GET') {
-            $panelId = filament()->getCurrentPanel()->getId();
+        if ($request->method() === 'GET' && $request->session()->get('lockscreen') ) {
+            $panelId = filament()->getCurrentPanel()?->getId();
             return redirect()->route("lockscreen.{$panelId}.page");
         }
         return $next($request);