Merge pull request #11 from RaiolaNetworks/develop

feat: added a check if the OAuth information exists in the renew func…
RaiolaNetworks · Oct 2, 2024 · c6dbde3 · c6dbde3
2 parents 5433f50 + 7d9a9a6
commit c6dbde3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Controllers/OAuthController.php b/src/Controllers/OAuthController.php
@@ -133,10 +133,10 @@ public function renew(): null|\Illuminate\Routing\Redirector|RedirectResponse
 
         if (Auth::guard($guardName)->check()) {
             $user      = Auth::guard($guardName)->user();
-            $oauthData = OAuth::whereUserId($user?->getAuthIdentifier())->firstOrFail();
+            $oauthData = OAuth::whereUserId($user?->getAuthIdentifier())->first();
 
             // @phpstan-ignore-next-line
-            if ($oauthData->oauth_token !== null && $oauthData->oauth_token_expires_at < now()->timestamp) {
+            if ($oauthData !== null && $oauthData->oauth_token !== null && $oauthData->oauth_token_expires_at < now()->timestamp) {
                 if (config('oauth.offline_access') === false) {
                     return $this->unauthorizeAndLogout($oauthData, $guardName);
                 }