Merge branch 'main' into main

Author: slimani-dev

.github/workflows/phpstan.yml

@@ -5,7 +5,8 @@ on:
     paths:
       - '**.php'
       - '.github/workflows/phpstan.yml'
-      - 'phpstan.neon.dist'
+      - 'phpstan.neon'
+      - 'phpstan.laravel-10.neon'
   pull_request:
     branches:
       - '**'
@@ -23,8 +24,10 @@ jobs:
         include:
           - laravel: 10.*
             testbench: 8.*
+            phpstan_neon: phpstan.laravel-10.neon
           - laravel: 11.*
             testbench: 9.*
+            phpstan_neon: phpstan.neon
         exclude:
           - laravel: 11.*
             php: 8.1
@@ -50,4 +53,4 @@ jobs:
         run: composer show -D
 
       - name: Run PHPStan
-        run: vendor/bin/phpstan --error-format=github
+        run: vendor/bin/phpstan --error-format=github --configuration=${{ matrix.phpstan_neon }}

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `dutchcodingcompany/developer-logins` will be documented in this file.
 
+## 1.3.0 - 2024-10-11
+
+- Catch model-not-found errors + simplify code by @bert-w in https://github.com/DutchCodingCompany/filament-developer-logins/pull/10
+- Fix: Clear session password hash to resolve "Switch To" Button Error (Issue #15) by @slimani-dev in https://github.com/DutchCodingCompany/filament-developer-logins/pull/17
+
 ## 1.2.1 - 2024-06-19
 
 - Bugfix: Plugin issue with multiple panels by @ainesophaur in https://github.com/DutchCodingCompany/filament-developer-logins/pull/9

phpstan-baseline.neon

@@ -11,15 +11,20 @@ parameters:
 			path: src/FilamentDeveloperLoginsPlugin.php
 
 		-
-			message: "#^Call to an undefined method object\\:\\:where\\(\\)\\.$#"
+			message: "#^Property DutchCodingCompany\\\\FilamentDeveloperLogins\\\\FilamentDeveloperLoginsPlugin\\:\\:\\$modelClass \\(class\\-string\\<Illuminate\\\\Contracts\\\\Auth\\\\Authenticatable&Illuminate\\\\Database\\\\Eloquent\\\\Model\\>\\) does not accept default value of type string\\.$#"
 			count: 1
-			path: src/FilamentDevelopersLogin.php
+			path: src/FilamentDeveloperLoginsPlugin.php
 
 		-
-			message: "#^Call to an undefined method Livewire\\\\Features\\\\SupportTesting\\\\Testable\\:\\:test\\(\\)\\.$#"
+			message: "#^Call to an undefined method Illuminate\\\\Testing\\\\TestResponse\\:\\:assertDontSeeLivewire\\(\\)\\.$#"
 			count: 3
 			path: tests/Feature/MenuLoginsTest.php
 
+		-
+			message: "#^Call to an undefined method Illuminate\\\\Testing\\\\TestResponse\\:\\:assertSeeLivewire\\(\\)\\.$#"
+			count: 2
+			path: tests/Feature/MenuLoginsTest.php
+
 		-
 			message: "#^Access to an undefined property DutchCodingCompany\\\\FilamentDeveloperLogins\\\\Tests\\\\Fixtures\\\\TestUser\\:\\:\\$is_admin\\.$#"
 			count: 1

phpstan.laravel-10.neon

@@ -0,0 +1,17 @@
+includes:
+    - ./vendor/larastan/larastan/extension.neon
+    - phpstan-baseline.neon
+
+parameters:
+    level: 7
+
+    paths:
+        - database
+        - src
+        - tests
+
+    ignoreErrors:
+        -
+            message: "#^PHPDoc tag @use contains generic type Illuminate\\\\Database\\\\Eloquent\\\\Factories\\\\HasFactory\\<DutchCodingCompany\\\\FilamentDeveloperLogins\\\\Database\\\\Factories\\\\TestUserFactory\\> but trait Illuminate\\\\Database\\\\Eloquent\\\\Factories\\\\HasFactory is not generic\\.$#"
+            count: 1
+            path: tests/Fixtures/TestUser.php

resources/lang/en/auth.php

@@ -6,5 +6,6 @@
 
     'messages' => [
         'failed' => 'Login failed, check if the user is allowed to access the panel.',
+        'failed_not_found' => 'Login failed, the user cannot be found.',
     ],
 ];

resources/views/components/developer-logins.blade.php

@@ -27,8 +27,6 @@
                 :attributes="\Filament\Support\prepare_inherited_attributes($attributes)->class('fi-wi gap-4')"
         >
             @foreach ($users as $label => $credentials)
-                @if ($loop->first)
-                @endif
                 <form action="{{ route('filament-developer-logins.login-as') }}" method="POST">
                     @csrf
 
@@ -42,4 +40,4 @@
             @endforeach
         </x-filament::grid>
     </div>
-@endif
+@endif

src/FilamentDeveloperLoginsPlugin.php

@@ -31,6 +31,9 @@ class FilamentDeveloperLoginsPlugin implements Plugin
 
     public string $column = 'email';
 
+    /**
+     * @var class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     */
     public string $modelClass = User::class;
 
     public function getId(): string
@@ -145,6 +148,9 @@ public function getColumn(): string
         return $this->column;
     }
 
+    /**
+     * @param class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable> $modelClass
+     */
     public function modelClass(string $modelClass): static
     {
         if (! is_a($modelClass, Authenticatable::class, true)) {
@@ -156,6 +162,9 @@ public function modelClass(string $modelClass): static
         return $this;
     }
 
+    /**
+     * @return class-string<\Illuminate\Database\Eloquent\Model&\Illuminate\Contracts\Auth\Authenticatable>
+     */
     public function getModelClass(): string
     {
         return $this->modelClass;

src/FilamentDevelopersLogin.php

@@ -19,12 +19,20 @@ public function login(Panel $panel, FilamentDeveloperLoginsPlugin $plugin, strin
 
         if ($panel->auth()->check()) {
             $panel->auth()->logout();
+
             session()->forget('password_hash_'.$panel->getAuthGuard());
         }
 
+        /** @var ?\Illuminate\Contracts\Auth\Authenticatable $model */
         $model = (new ($plugin->getModelClass()))
             ->where($plugin->getColumn(), $credentials)
-            ->firstOrFail();
+            ->first();
+
+        if (! $model) {
+            throw ValidationException::withMessages([
+                'developer-logins-failed' => __('filament-developer-logins::auth.messages.failed_not_found'),
+            ]);
+        }
 
         $panel->auth()->login($model);
 

tests/Fixtures/TestUser.php

@@ -10,6 +10,9 @@
 
 class TestUser extends Model implements Authenticatable, FilamentUser
 {
+    /**
+     * @use \Illuminate\Database\Eloquent\Factories\HasFactory<\DutchCodingCompany\FilamentDeveloperLogins\Database\Factories\TestUserFactory>
+     */
     use HasFactory;
 
     protected $table = 'users';