2.x user menu post action (#64)

config/filament-lockscreen.php

@@ -2,7 +2,6 @@
 
 return [
 
-
     /*
      *  Lock Screen Icon
      */

resources/lang/ckb/default.php

@@ -1,17 +1,17 @@
-<?php
-
-return [
-    'heading' => 'قوفڵی شاشه‌',
-    'user_menu_title' => 'قوفڵی شاشه‌',
-    'fields' => [
-        'password' => 'وشەی نهێنی',
-    ],
-    'button' => [
-        'switch_account' => 'گۆرینی هەژمار',
-        'submit_label' => 'چوونە ژوورەوە',
-    ],
-    'notification' => [
-        'title' => 'شکستی چوونەژوورەوە',
-        'message' => 'دوای شکستی چوونەژوورەوەی سەرکەوتوو ئاڕاستەکرایتەوە بۆ لاپەڕەی چوونەژوورەوە.',
-    ],
-];
+<?php
+
+return [
+    'heading' => 'قوفڵی شاشه‌',
+    'user_menu_title' => 'قوفڵی شاشه‌',
+    'fields' => [
+        'password' => 'وشەی نهێنی',
+    ],
+    'button' => [
+        'switch_account' => 'گۆرینی هەژمار',
+        'submit_label' => 'چوونە ژوورەوە',
+    ],
+    'notification' => [
+        'title' => 'شکستی چوونەژوورەوە',
+        'message' => 'دوای شکستی چوونەژوورەوەی سەرکەوتوو ئاڕاستەکرایتەوە بۆ لاپەڕەی چوونەژوورەوە.',
+    ],
+];

resources/lang/ku/default.php

@@ -1,17 +1,17 @@
-<?php
-
-return [
-    'heading' => 'قوفڵی شاشه‌',
-    'user_menu_title' => 'قوفڵی شاشه‌',
-    'fields' => [
-        'password' => 'وشەی نهێنی',
-    ],
-    'button' => [
-        'switch_account' => 'گۆرینی هەژمار',
-        'submit_label' => 'چوونە ژوورەوە',
-    ],
-    'notification' => [
-        'title' => 'شکستی چوونەژوورەوە',
-        'message' => 'دوای شکستی چوونەژوورەوەی سەرکەوتوو ئاڕاستەکرایتەوە بۆ لاپەڕەی چوونەژوورەوە.',
-    ],
-];
+<?php
+
+return [
+    'heading' => 'قوفڵی شاشه‌',
+    'user_menu_title' => 'قوفڵی شاشه‌',
+    'fields' => [
+        'password' => 'وشەی نهێنی',
+    ],
+    'button' => [
+        'switch_account' => 'گۆرینی هەژمار',
+        'submit_label' => 'چوونە ژوورەوە',
+    ],
+    'notification' => [
+        'title' => 'شکستی چوونەژوورەوە',
+        'message' => 'دوای شکستی چوونەژوورەوەی سەرکەوتوو ئاڕاستەکرایتەوە بۆ لاپەڕەی چوونەژوورەوە.',
+    ],
+];

routes/web.php

@@ -3,10 +3,10 @@
 use Filament\Facades\Filament;
 use Illuminate\Support\Facades\Route;
 use lockscreen\FilamentLockscreen\Http\Livewire\LockerScreen;
-
+use lockscreen\FilamentLockscreen\Http\LockscreenSessionController;
 
 Route::name('lockscreen.')
-    ->group(function (){
+    ->group(function () {
         foreach (Filament::getPanels() as $panel) {
             $panelId = $panel->getId();
             $domains = $panel->getDomains();
@@ -17,6 +17,8 @@
                     ->name("{$panelId}.")
                     ->prefix($panel->getPath())
                     ->group(function () {
+                        Route::post('lock-session', [LockscreenSessionController::class, 'lockSession'])
+                            ->name('lock-session');
                         Route::get(
                             (config()->has('filament-lockscreen.url') && config('filament-lockscreen.url') !== '' && config('filament-lockscreen.url') !== '/')
                                 ? config('filament-lockscreen.url')
@@ -27,6 +29,5 @@
 
             }
 
-
         }
     });

src/FilamentLockscreenServiceProvider.php

@@ -2,15 +2,11 @@
 
 namespace lockscreen\FilamentLockscreen;
 
-use Filament\Facades\Filament;
-use Filament\Navigation\UserMenuItem;
-use Spatie\LaravelPackageTools\Package;
-use Spatie\LaravelPackageTools\PackageServiceProvider;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Routing\Router;
-use Livewire\Livewire;
-use lockscreen\FilamentLockscreen\Http\Livewire\LockerScreen;
 use lockscreen\FilamentLockscreen\Http\Middleware\Locker;
+use Spatie\LaravelPackageTools\Package;
+use Spatie\LaravelPackageTools\PackageServiceProvider;
 
 class FilamentLockscreenServiceProvider extends PackageServiceProvider
 {

src/Http/Livewire/LockerScreen.php

@@ -4,17 +4,16 @@
 
 use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
 use DanHarrin\LivewireRateLimiting\WithRateLimiting;
-use Filament\Facades\Filament;
 use Filament\Actions\Action;
+use Filament\Exceptions\NoDefaultPanelSetException;
+use Filament\Facades\Filament;
 use Filament\Forms\Components\TextInput;
+use Filament\Notifications\Notification;
 use Filament\Pages\Actions\ActionGroup;
 use Filament\Pages\BasePage;
 use Filament\Pages\Concerns\InteractsWithFormActions;
-use Filament\Forms\Contracts\HasForms;
-use Filament\Notifications\Notification;
-use Filament\Pages\SimplePage;
-use Illuminate\Contracts\View\View;
-use Livewire\Component;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 class LockerScreen extends BasePage
 {
@@ -28,29 +27,38 @@ class LockerScreen extends BasePage
 
     public ?string $password = '';
 
-    protected static string $view ='filament-lockscreen::page.auth.login' ;
+    protected static string $view = 'filament-lockscreen::page.auth.login';
 
     private ?string $account_username_field;
 
     private ?string $account_password_field;
 
+    /**
+     * @throws ContainerExceptionInterface
+     * @throws NoDefaultPanelSetException
+     * @throws NotFoundExceptionInterface
+     */
     public function mount()
     {
         // Check if the request is still authenticated or not before rendering the 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()) {
             if (filament()->getCurrentPanel()) {
                 return redirect(filament()->getCurrentPanel()->getLoginUrl());
             }
 
             return redirect(filament()->getDefaultPanel()->getLoginUrl());
         }
 
-        session(['lockscreen' => true]);
+        // redirect to the filament default home url if session is not locked
+        if (!session()->has('lockscreen')) {
+            return redirect(session()->has('next') ? session('next') :  filament()->getDefaultPanel()->getPath());
+        }
+
         if (! config('filament-lockscreen.enable_redirect_to')) {
-            if (! session()->has('next') || session()->get('next') === null) {
+            if (! session()->has('next') || session('next') === null) {
                 session(['next' => url()->previous()]);
             }
         }
@@ -96,8 +104,10 @@ public function authenticate(): \Illuminate\Routing\Redirector|\Illuminate\Http\
                 if (config('filament-lockscreen.rate_limit.force_logout', false)) {
                     $this->forceLogout();
                     $panelId = filament()->getCurrentPanel()->getId();
+
                     return redirect()->route("filament.{$panelId}.auth.login");
                 }
+
                 return null;
             }
         }
@@ -107,6 +117,7 @@ public function authenticate(): \Illuminate\Routing\Redirector|\Illuminate\Http\
             $this->account_password_field => $data['password'],
         ])) {
             $this->addError('password', __('filament-panels::pages/auth/login.messages.failed'));
+
             return null;
         }
 
@@ -118,7 +129,7 @@ public function authenticate(): \Illuminate\Routing\Redirector|\Illuminate\Http\
             return redirect()->route(config('filament-lockscreen.redirect_route'));
         }
         // store to variable
-        $url = session()->get('next');
+        $url = session('next');
         // remove the value
         session()->forget('next');
 
@@ -127,7 +138,7 @@ public function authenticate(): \Illuminate\Routing\Redirector|\Illuminate\Http\
 
     protected function getFormSchema(): array
     {
-        return[
+        return [
             TextInput::make('password')
                 ->label(__('filament-lockscreen::default.fields.password'))
                 ->password()
@@ -138,7 +149,7 @@ protected function getFormSchema(): array
 
     public function getTitle(): \Illuminate\Contracts\Support\Htmlable|string
     {
-        return static::$title ?? (string) str(__('filament-lockscreen::default.heading'))
+        return (string) str(__('filament-lockscreen::default.heading'))
             ->kebab()
             ->replace('-', ' ')
             ->title();
@@ -165,9 +176,9 @@ protected function getFormActions(): array
             $this->getAuthenticateFormAction(),
         ];
     }
+
     protected function hasFullWidthFormActions(): bool
     {
         return true;
     }
-
 }

src/Http/Livewire/LockerScreenLoginPage.php

@@ -2,7 +2,4 @@
 
 namespace lockscreen\FilamentLockscreen\Http\Livewire;
 
-class LockerScreenLoginPage extends LockerScreen
-{
-
-}
+class LockerScreenLoginPage extends LockerScreen {}

src/Http/LockscreenSessionController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace lockscreen\FilamentLockscreen\Http;
+
+use Filament\Facades\Filament;
+use Illuminate\Http\RedirectResponse;
+
+class LockscreenSessionController
+{
+    /**
+     * @throws \Exception
+     */
+    public function lockSession(): RedirectResponse
+    {
+        $currentPanel = filament()->getCurrentPanel();
+        /**
+         * Check if the request is still authenticated or not before rendering the 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()->getCurrentPanel()) {
+                return redirect(filament()->getCurrentPanel()->getLoginUrl());
+            }
+
+            return redirect(filament()->getDefaultPanel()->getLoginUrl());
+        }
+
+        session(['lockscreen' => true]);
+
+        return redirect()->route("lockscreen.{$currentPanel->getId()}.page");
+    }
+}

src/Http/Middleware/Locker.php

@@ -3,7 +3,6 @@
 namespace lockscreen\FilamentLockscreen\Http\Middleware;
 
 use Closure;
-use Illuminate\Http\Request;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
@@ -12,13 +11,16 @@ class Locker
     /**
      * @throws ContainerExceptionInterface
      * @throws NotFoundExceptionInterface
+     * @throws \Exception
      */
     public function handle($request, Closure $next)
     {
-        if ($request->method() === 'GET' && $request->session()->get('lockscreen') ) {
+        if ($request->method() === 'GET' && $request->session()->get('lockscreen')) {
             $panelId = filament()->getCurrentPanel()?->getId();
+
             return redirect()->route("lockscreen.{$panelId}.page");
         }
+
         return $next($request);
     }
 }

src/Http/Middleware/LockerTimer.php

@@ -15,9 +15,9 @@ class LockerTimer
      */
     public function handle(Request $request, Closure $next)
     {
-        if (!$request->session()->has('lockscreen')) {
+        if (! $request->session()->has('lockscreen')) {
             $lastActivity = $request->session()->get('locker_last_activity');
-            $activityTimeout =  config('filament-lockscreen.activity_timeout', 60 * 30 /* 30 minutes */);
+            $activityTimeout = config('filament-lockscreen.activity_timeout', 60 * 30 /* 30 minutes */);
 
             if ($request->method() === 'GET' && $lastActivity && (time() - $lastActivity) > $activityTimeout) {
                 $request->session()->put('lockscreen', true);

src/Lockscreen.php

@@ -4,9 +4,7 @@
 
 use Filament\Contracts\Plugin;
 use Filament\Navigation\MenuItem;
-use Filament\Navigation\UserMenuItem;
 use Filament\Panel;
-use Filament\PanelProvider;
 use Livewire\Livewire;
 use lockscreen\FilamentLockscreen\Http\Livewire\LockerScreen;
 
@@ -16,7 +14,7 @@ class Lockscreen implements Plugin
 
     public function getId(): string
     {
-         return 'filament-lockscreen';
+        return 'filament-lockscreen';
     }
 
     public static function make(): static
@@ -29,22 +27,18 @@ public static function get(): static
         return filament(app(static::class)->getId());
     }
 
-    public function register(Panel $panel): void
-    {
-
-    }
+    public function register(Panel $panel): void {}
 
     public function boot(Panel $panel): void
     {
 
         $panel->userMenuItems([
             'lockscreen' => MenuItem::make()
                 ->label(fn () => __('filament-lockscreen::default.user_menu_title'))
-                ->url(route("lockscreen.{$panel->getId()}.page"))
+                ->postAction(route("lockscreen.{$panel->getId()}.lock-session"))
                 ->icon(config('filament-lockscreen.icon')),
         ]);
 
         Livewire::component('LockerScreen', LockerScreen::class);
     }
-
 }