Merge branch 'master' into contest-judging

venix12 · Nov 30, 2023 · de8e1ef · de8e1ef
2 parents b68a1dd + 1c8aeed
commit de8e1ef
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -23,6 +23,7 @@ class Kernel extends HttpKernel
             Middleware\AuthApi::class,
             Middleware\SetLocaleApi::class,
             Middleware\CheckUserBanStatus::class,
+            Middleware\UpdateUserLastvisit::class,
         ],
         'web' => [
             Middleware\StripCookies::class,

diff --git a/app/Http/Middleware/AuthApi.php b/app/Http/Middleware/AuthApi.php
@@ -79,6 +79,7 @@ private function validTokenFromRequest($psr)
             throw new AuthenticationException('invalid token');
         }
 
+        $token->setRelation('client', $client);
         $token->validate();
 
         $user = $token->getResourceOwner();

diff --git a/app/Http/Middleware/UpdateUserLastvisit.php b/app/Http/Middleware/UpdateUserLastvisit.php
@@ -24,24 +24,30 @@ public function handle($request, Closure $next)
         $user = $this->auth->user();
 
         if ($user !== null) {
-            $isInactive = $user->isInactive();
+            $token = $user->token();
+            $shouldUpdate = $token === null || $token->client->password_client;
 
-            if ($isInactive) {
-                $isVerified = $user->isSessionVerified();
-            }
+            if ($shouldUpdate) {
+                $isInactive = $user->isInactive();
+                if ($isInactive) {
+                    $isVerified = $user->isSessionVerified();
+                }
 
-            if (!$isInactive || $isVerified) {
-                $recordedLastVisit = $user->getRawAttribute('user_lastvisit');
-                $currentLastVisit = time();
+                if (!$isInactive || $isVerified) {
+                    $recordedLastVisit = $user->getRawAttribute('user_lastvisit');
+                    $currentLastVisit = time();
 
-                if ($currentLastVisit - $recordedLastVisit > 300) {
-                    $user->update([
-                        'user_lastvisit' => $currentLastVisit,
-                    ], ['skipValidations' => true]);
+                    if ($currentLastVisit - $recordedLastVisit > 300) {
+                        $user->update([
+                            'user_lastvisit' => $currentLastVisit,
+                        ], ['skipValidations' => true]);
+                    }
                 }
-            }
 
-            $this->recordSession($request);
+                if ($token === null) {
+                    $this->recordSession($request);
+                }
+            }
         }
 
         return $next($request);