Merge pull request #392 from pjsde/refactor_recordActiveDate

Refactor record active date

Author: kenjis

src/Authentication/Authenticators/AccessTokens.php

@@ -237,6 +237,6 @@ public function recordActiveDate(): void
 
         $this->user->last_active = Time::now();
 
-        $this->provider->save($this->user);
+        $this->provider->updateActiveDate($this->user);
     }
 }

src/Authentication/Authenticators/Session.php

@@ -830,7 +830,7 @@ public function recordActiveDate(): void
 
         $this->user->last_active = Time::now();
 
-        $this->provider->save($this->user);
+        $this->provider->updateActiveDate($this->user);
     }
 
     /**

src/Models/UserModel.php

@@ -320,4 +320,14 @@ protected function saveEmailIdentity(array $data): array
 
         return $data;
     }
+
+    /**
+     * Updates the user's last active date.
+     */
+    public function updateActiveDate(User $user): void
+    {
+        $this->builder->set('last_active', $user->last_active)
+            ->where('id', $user->id)
+            ->update();
+    }
 }

tests/Authentication/Filters/SessionFilterTest.php

@@ -45,4 +45,16 @@ public function testFilterSuccess(): void
         // Last Active should have been updated
         $this->assertNotEmpty(auth('session')->user()->last_active);
     }
+
+    public function testRecordActiveDate(): void
+    {
+        $user                   = fake(UserModel::class);
+        $_SESSION['user']['id'] = $user->id;
+
+        $this->withSession(['user' => ['id' => $user->id]])
+            ->get('protected-route');
+
+        // Last Active should be greater than 'updated_at' column
+        $this->assertGreaterThan(auth('session')->user()->updated_at, auth('session')->user()->last_active);
+    }
 }

tests/Authentication/Filters/TokenFilterTest.php

@@ -50,4 +50,17 @@ public function testFilterSuccess(): void
         $this->assertInstanceOf(AccessToken::class, auth('tokens')->user()->currentAccessToken());
         $this->assertSame($token->id, auth('tokens')->user()->currentAccessToken()->id);
     }
+
+    public function testRecordActiveDate(): void
+    {
+        /** @var User $user */
+        $user  = fake(UserModel::class);
+        $token = $user->generateAccessToken('foo');
+
+        $this->withHeaders(['Authorization' => 'Bearer ' . $token->raw_token])
+            ->get('protected-route');
+
+        // Last Active should be greater than 'updated_at' column
+        $this->assertGreaterThan(auth('tokens')->user()->updated_at, auth('tokens')->user()->last_active);
+    }
 }