fix: invalid kid exception handling

PrestaShopCorp · Dec 10, 2024 · cf00c5d · cf00c5d
1 parent 7844c0c
commit cf00c5d
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Provider/Traits/TokenValidatorTrait.php b/src/Provider/Traits/TokenValidatorTrait.php
@@ -8,7 +8,6 @@
 use Firebase\JWT\SignatureInvalidException;
 use PrestaShop\OAuth2\Client\Provider\CachedFile;
 use PrestaShop\OAuth2\Client\Provider\Exception;
-use PrestaShop\OAuth2\Client\Provider\Exception\KidInvalidException;
 
 trait TokenValidatorTrait
 {
@@ -62,8 +61,11 @@ public function verifyToken($token, $refreshJwks = false)
             throw new Exception\SignatureInvalidException($e->getMessage());
         } catch (\UnexpectedValueException $e) {
             // FIXME: check kid header by ourselves
-            if (!$refreshJwks && $e->getMessage() == '"kid" invalid, unable to lookup correct key') {
-                return $this->verifyToken($token, true);
+            if ($e->getMessage() == '"kid" invalid, unable to lookup correct key') {
+                if (!$refreshJwks) {
+                    return $this->verifyToken($token, true);
+                }
+                throw new Exception\KidInvalidException($e->getMessage());
             }
             throw new Exception\TokenInvalidException($e->getMessage());
         } catch (\Throwable $e) {