Fix cases where user returned by Auth facade was null (using authenti…

…catable model from Authenticated and TokenAuthenticated events)
alajusticia · Oct 25, 2024 · 9f380a6 · 9f380a6
1 parent 8b3d557
commit 9f380a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/src/CurrentLogin.php b/src/CurrentLogin.php
@@ -3,6 +3,7 @@
 namespace ALajusticia\Logins;
 
 use ALajusticia\Logins\Models\Login;
+use Illuminate\Contracts\Auth\Authenticatable;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
 
@@ -15,19 +16,21 @@ public function __construct()
         $this->loadCurrentLogin();
     }
 
-    public function loadCurrentLogin(): void
+    public function loadCurrentLogin(?Authenticatable $user = null): void
     {
-        if (Auth::user() && Logins::tracked(Auth::user()) && ! $this->currentLogin) {
-            if (Auth::user()->isAuthenticatedBySession()) {
+        $user = $user ?? Auth::user();
 
-                $this->currentLogin = Auth::user()->logins()
+        if ($user && Logins::tracked($user) && ! $this->currentLogin) {
+            if ($user->isAuthenticatedBySession()) {
+
+                $this->currentLogin = $user->logins()
                     ->where('session_id', session()->getId())
                     ->first();
 
-            } elseif (Config::get('logins.sanctum_token_tracking') && Auth::user()->isAuthenticatedBySanctumToken()) {
+            } elseif (Config::get('logins.sanctum_token_tracking') && $user->isAuthenticatedBySanctumToken()) {
 
-                $this->currentLogin = Auth::user()->logins()
-                    ->where('personal_access_token_id', Auth::user()->currentAccessToken()->getKey())
+                $this->currentLogin = $user->logins()
+                    ->where('personal_access_token_id', $user->currentAccessToken()->getKey())
                     ->first();
 
             }

diff --git a/src/Listeners/SanctumEventSubscriber.php b/src/Listeners/SanctumEventSubscriber.php
@@ -24,7 +24,7 @@ class SanctumEventSubscriber
     public function handlePersonalAccessTokenAuthentication(TokenAuthenticated $event): void
     {
         if (Logins::tracked($event->token->tokenable)) {
-            app(CurrentLogin::class)->loadCurrentLogin();
+            app(CurrentLogin::class)->loadCurrentLogin($event->token->tokenable);
 
             Logins::updateLastActivity();
         }

diff --git a/src/Logins.php b/src/Logins.php
@@ -119,7 +119,7 @@ public static function checkSessionId($user)
                 }
             }
 
-            app(CurrentLogin::class)->loadCurrentLogin();
+            app(CurrentLogin::class)->loadCurrentLogin($user);
 
             if ($updated === 0) {
                 self::updateLastActivity();