From 27bd93460629fd3ce67fcf024e8fdfc94306f256 Mon Sep 17 00:00:00 2001 From: daycry <7590335+daycry@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:22:15 +0100 Subject: [PATCH 1/2] Update AccessToken.php Fix: Exception when token was expired --- src/Token/AccessToken.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Token/AccessToken.php b/src/Token/AccessToken.php index a268c20..969643f 100644 --- a/src/Token/AccessToken.php +++ b/src/Token/AccessToken.php @@ -2,6 +2,7 @@ namespace TheNetworg\OAuth2\Client\Token; +use Firebase\JWT\ExpiredException; use Firebase\JWT\JWT; use RuntimeException; use TheNetworg\OAuth2\Client\Provider\Azure; @@ -39,7 +40,7 @@ public function __construct(array $options, $provider) // Then parse the idToken claims only without validating the signature $idTokenClaims = (array)JWT::jsonDecode(JWT::urlsafeB64Decode($tks[1])); } - } catch (JWT_Exception $e) { + } catch (ExpiredException $e) { throw new RuntimeException('Unable to parse the id_token!'); } From 2e6e49570d5de97159009c653345ae4a781aa3f4 Mon Sep 17 00:00:00 2001 From: daycry <7590335+daycry@users.noreply.github.com> Date: Thu, 23 Nov 2023 16:37:01 +0100 Subject: [PATCH 2/2] Update AccessToken.php --- src/Token/AccessToken.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Token/AccessToken.php b/src/Token/AccessToken.php index 969643f..c237687 100644 --- a/src/Token/AccessToken.php +++ b/src/Token/AccessToken.php @@ -2,10 +2,10 @@ namespace TheNetworg\OAuth2\Client\Token; -use Firebase\JWT\ExpiredException; use Firebase\JWT\JWT; use RuntimeException; use TheNetworg\OAuth2\Client\Provider\Azure; +use Exception; class AccessToken extends \League\OAuth2\Client\Token\AccessToken { @@ -40,7 +40,7 @@ public function __construct(array $options, $provider) // Then parse the idToken claims only without validating the signature $idTokenClaims = (array)JWT::jsonDecode(JWT::urlsafeB64Decode($tks[1])); } - } catch (ExpiredException $e) { + } catch (Exception $e) { throw new RuntimeException('Unable to parse the id_token!'); }