Merge pull request #1222 from pkostic/8.x

Fix 500 Internal Server Error response on validating recently deleted client
laravel · Apr 21, 2020 · 31d5dfc · 31d5dfc
2 parents 02e2d83 + 010b807
commit 31d5dfc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Http/Middleware/CheckClientCredentials.php b/src/Http/Middleware/CheckClientCredentials.php
@@ -17,7 +17,7 @@ class CheckClientCredentials extends CheckCredentials
      */
     protected function validateCredentials($token)
     {
-        if (! $token || $token->client->firstParty()) {
+        if (! $token || ! $token->client || $token->client->firstParty()) {
             throw new AuthenticationException;
         }
     }

diff --git a/src/Http/Middleware/CheckClientCredentialsForAnyScope.php b/src/Http/Middleware/CheckClientCredentialsForAnyScope.php
@@ -17,7 +17,7 @@ class CheckClientCredentialsForAnyScope extends CheckCredentials
      */
     protected function validateCredentials($token)
     {
-        if (! $token || $token->client->firstParty()) {
+        if (! $token || ! $token->client || $token->client->firstParty()) {
             throw new AuthenticationException;
         }
     }