fix: fix basic auth with token (#6673)

monicahq · Jun 12, 2023 · fab6c32 · fab6c32
1 parent ec3a44d
commit fab6c32
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php b/app/Http/Middleware/AuthenticateWithTokenOnBasicAuth.php
@@ -64,7 +64,8 @@ private function sanctumUser(Request $request): ?User
         $user = $this->sanctum()->setRequest($request)->user();
 
         // if there is no bearer token PHP_AUTH_USER header must match user email
-        if ($user->currentAccessToken() !== null
+        if ($user !== null
+            && $user->currentAccessToken() !== null
             && $request->bearerToken() !== null
             && $request->getUser() !== $user->email) {
             return null;