Merge pull request #177 from kenjis/fix-lastLogin

fix: lastLogin()

Author: kenjis

src/Entities/User.php

@@ -224,21 +224,13 @@ public function getPasswordHash(): ?string
     }
 
     /**
-     * Returns the last login information for this
-     * user as
+     * Returns the last login information for this user as
      */
-    public function lastLogin(bool $allowFailed = false): ?Login
+    public function lastLogin(): ?Login
     {
+        /** @var LoginModel $logins */
         $logins = model(LoginModel::class);
 
-        if (! $allowFailed) {
-            $logins->where('success', 1)
-                ->where('user_id', $this->attributes['id'] ?? null);
-        }
-
-        return $logins
-            ->where('identifier', $this->getEmail())
-            ->orderBy('date', 'desc')
-            ->first();
+        return $logins->lastLogin($this);
     }
 }

src/Models/LoginModel.php

@@ -5,6 +5,7 @@
 use CodeIgniter\I18n\Time;
 use CodeIgniter\Model;
 use CodeIgniter\Shield\Entities\Login;
+use CodeIgniter\Shield\Entities\User;
 use Exception;
 use Faker\Generator;
 
@@ -57,6 +58,17 @@ public function recordLoginAttempt(
         $this->checkQueryReturn($return);
     }
 
+    /**
+     * Returns the last login information for the user
+     */
+    public function lastLogin(User $user): ?Login
+    {
+        return $this->where('success', 1)
+            ->where('user_id', $user->id)
+            ->orderBy('id', 'desc')
+            ->first();
+    }
+
     /**
      * Generate a fake login for testing
      *

tests/Unit/UserTest.php

@@ -76,7 +76,11 @@ public function testLastLogin()
         // No logins found.
         $this->assertNull($this->user->lastLogin());
 
-        $login = fake(
+        fake(
+            LoginModel::class,
+            ['identifier' => $this->user->email, 'user_id' => $this->user->id]
+        );
+        $login2 = fake(
             LoginModel::class,
             ['identifier' => $this->user->email, 'user_id' => $this->user->id]
         );
@@ -88,7 +92,7 @@ public function testLastLogin()
         $last = $this->user->lastLogin();
 
         $this->assertInstanceOf(Login::class, $last); // @phpstan-ignore-line
-        $this->assertSame($login->id, $last->id);
+        $this->assertSame($login2->id, $last->id);
         $this->assertInstanceOf(Time::class, $last->date);
     }