feat: additional changes

Author: beliven-fabrizio-gortani

database/migrations/create_lockout_logs_table.php.stub

@@ -10,7 +10,6 @@ return new class extends Migration
     {
         Schema::create('lockout_logs', function (Blueprint $table) {
             $table->id();
-            $table->nullableMorphs('model');
             $table->string('identifier')->nullable();
             $table->string('ip_address')->nullable();
             $table->string('user_agent')->nullable();

database/migrations/create_model_lockouts_table.php.stub

@@ -27,8 +27,7 @@ return new class extends Migration
             $table->id();
 
             // Polymorphic relation
-            $table->string('model_type');
-            $table->unsignedBigInteger('model_id');
+            $table->morphs('model');
 
             // Lock tracking
             $table->timestamp('locked_at')->useCurrent();

src/Http/Controllers/UnlockController.php

@@ -3,7 +3,6 @@
 namespace Beliven\Lockout\Http\Controllers;
 
 use Beliven\Lockout\Facades\Lockout;
-use Beliven\Lockout\Models\ModelLockout;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 
@@ -12,9 +11,7 @@ class UnlockController
     public function __invoke(Request $request): RedirectResponse
     {
         $identifier = $this->resolveIdentifier($request);
-        $model = ModelLockout::active()
-            ->where('identifier', $identifier)
-            ->first()?->model;
+        $model = Lockout::getLoginModel($identifier);
 
         if (!$model) {
             return $this->redirectWithError();

src/Http/Middleware/EnsureUserIsNotLocked.php

@@ -3,7 +3,6 @@
 namespace Beliven\Lockout\Http\Middleware;
 
 use Beliven\Lockout\Facades\Lockout;
-use Beliven\Lockout\Models\ModelLockout;
 use Closure;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\JsonResponse;
@@ -21,9 +20,7 @@ public function handle($request, Closure $next)
 
         // If a model exists for the identifier and it has an active persistent lock,
         // short-circuit with a 429 response.
-        $model = ModelLockout::active()
-            ->where('identifier', $identifier)
-            ->first()?->model;
+        $model = Lockout::getLoginModel($identifier);
 
         if ($model && $this->modelHasActiveLock($model)) {
             return $this->lockedResponse();

src/Listeners/MarkModelAsLocked.php

@@ -3,8 +3,7 @@
 namespace Beliven\Lockout\Listeners;
 
 use Beliven\Lockout\Events\EntityLocked;
-use Beliven\Lockout\Lockout as LockoutService;
-use Beliven\Lockout\Models\ModelLockout;
+use Beliven\Lockout\Facades\Lockout;
 use Throwable;
 
 class MarkModelAsLocked
@@ -19,11 +18,12 @@ public function handle(EntityLocked $event): void
         try {
             $identifier = $event->identifier;
 
-            // Resolve the Lockout service and model for the identifier.
-            $lockout = app(LockoutService::class);
-            $model = ModelLockout::active()
-                ->where('identifier', $identifier)
-                ->first()?->model;
+            // Resolve the concrete model via the Lockout facade (single-model strategy).
+            try {
+                $model = Lockout::getLoginModel($identifier);
+            } catch (Throwable $_) {
+                $model = null;
+            }
 
             if (!$model) {
                 return;

src/Lockout.php

@@ -78,13 +78,13 @@ public function attemptLockout(string $id, object $data): bool
 
     public function attemptSendLockoutNotification(string $id, object $data): void
     {
-        // When the use disable the unlock via notification feature
+        // When the user disables the unlock via notification feature
         // we can skip sending the notification
         if (!$this->unlockViaNotification) {
             return;
         }
 
-        // Check also if the column is a valid email format
+        // Check also if the identifier is a valid email format
         if (!filter_var($id, FILTER_VALIDATE_EMAIL)) {
             return;
         }
@@ -99,10 +99,8 @@ public function attemptSendLockoutNotification(string $id, object $data): void
 
         $notification = new $notificationClass($id, $this->decayMinutes, $signedUnlockUrl);
 
-        $model = ModelLockout::active()
-            ->where('identifier', $id)
-            ->first()?->model;
-
+        // Resolve the login model using the single-model strategy configured in auth.providers.users.model
+        $model = $this->getLoginModel($id);
         if (!$model) {
             return;
         }
@@ -119,6 +117,20 @@ public function getLoginField(): string
         return config('lockout.login_field', 'email');
     }
 
+    public function getLoginModelClass(): string
+    {
+        $loginField = $this->getLoginField();
+
+        return config('auth.providers.users.model');
+    }
+
+    public function getLoginModel(string $identifier): ?Model
+    {
+        $modelClass = $this->getLoginModelClass();
+
+        return $modelClass::where($this->getLoginField(), $identifier)->first();
+    }
+
     protected function throttleKey(string $id): string
     {
         return 'login-attempts:' . $id;
@@ -148,6 +160,18 @@ protected function createLog(string $id, object $data): void
         $logModel->user_agent = $data->user_agent ?? null;
         $logModel->attempted_at = now();
 
+        // Attempt to associate the created log with the configured login model
+        // (single-model strategy). Be defensive: swallow any errors so tests and
+        // constrained environments without the users table do not fail.
+        try {
+            $model = $this->getLoginModel($id);
+            if ($model instanceof Model) {
+                $logModel->model()->associate($model);
+            }
+        } catch (\Throwable $_) {
+            // ignore association failures
+        }
+
         $logModel->save();
     }
 }

tests/Unit/Controllers/UnlockControllerUnitTest.php

@@ -39,8 +39,12 @@ public function save(array $options = [])
             }
         };
 
-        // Expect the Lockout facade to return our model for the identifier
-        Lockout::shouldReceive('getLoginModel')->once()->with($identifier)->andReturn($model);
+        // Mock the Lockout service and bind it into the container so the controller
+        // resolves the mocked instance instead of the facade. This mirrors how the
+        // listener and other code resolve the service via the container.
+        $mockService = Mockery::mock(\Beliven\Lockout\Lockout::class);
+        $mockService->shouldReceive('getLoginModel')->once()->with($identifier)->andReturn($model);
+        app()->instance(\Beliven\Lockout\Lockout::class, $mockService);
 
         $request = Request::create('/lockout/unlock', 'GET', ['identifier' => $identifier]);
 
@@ -81,7 +85,10 @@ public function save(array $options = [])
         // Set a locked_at initially to ensure legacy behavior would have cleared it.
         $model->locked_at = now();
 
-        Lockout::shouldReceive('getLoginModel')->once()->with($identifier)->andReturn($model);
+        // Bind a mocked Lockout service into the container for this test case.
+        $mockService = Mockery::mock(\Beliven\Lockout\Lockout::class);
+        $mockService->shouldReceive('getLoginModel')->once()->with($identifier)->andReturn($model);
+        app()->instance(\Beliven\Lockout\Lockout::class, $mockService);
 
         $request = Request::create('/lockout/unlock', 'GET', ['identifier' => $identifier]);
 
@@ -99,8 +106,10 @@ public function save(array $options = [])
     it('redirects to login with error when model is not found', function () {
         $identifier = 'nonexistent@example.test';
 
-        // Lockout returns null when no model found
-        Lockout::shouldReceive('getLoginModel')->once()->with($identifier)->andReturn(null);
+        // Bind a mocked Lockout service that returns null so controller handles not-found flow.
+        $mockService = Mockery::mock(\Beliven\Lockout\Lockout::class);
+        $mockService->shouldReceive('getLoginModel')->once()->with($identifier)->andReturn(null);
+        app()->instance(\Beliven\Lockout\Lockout::class, $mockService);
 
         $request = Request::create('/lockout/unlock', 'GET', ['identifier' => $identifier]);