Merge pull request #98 from geekwright/jwtupdates

Update to firebase/php-jwt 6.0.0
XOOPS · Mar 19, 2023 · c52381b · c52381b
2 parents 42a5d0e + a0da343
commit c52381b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
       "kint-php/kint": "^3.3",
       "symfony/yaml": "^2.8",
       "paragonie/random_compat": "^2",
-      "firebase/php-jwt": "^5.0",
+      "firebase/php-jwt": "6.0.0",
       "webmozart/assert": "1.9.1"
     },
     "require-dev": {

diff --git a/src/Jwt/JsonWebToken.php b/src/Jwt/JsonWebToken.php
@@ -12,6 +12,7 @@
 namespace Xmf\Jwt;
 
 use Firebase\JWT\JWT;
+use Firebase\JWT\Key;
 use Xmf\Key\KeyAbstract;
 
 /**
@@ -20,7 +21,7 @@
  * @category  Xmf\Jwt\JsonWebToken
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2018 XOOPS Project (https://xoops.org)
+ * @copyright 2018-2023 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */
@@ -80,9 +81,8 @@ public function setAlgorithm($algorithm)
      */
     public function decode($jwtString, $assertClaims = array())
     {
-        $allowedAlgorithms = array($this->algorithm);
         try {
-            $values = JWT::decode($jwtString, $this->key->getVerifying(), $allowedAlgorithms);
+            $values = JWT::decode($jwtString, new Key($this->key->getVerifying(), $this->algorithm));
         } catch (\Exception $e) {
             trigger_error($e->getMessage(), E_USER_NOTICE);
             return false;

diff --git a/src/Key/Basic.php b/src/Key/Basic.php
@@ -14,14 +14,14 @@
 use Xmf\Random;
 
 /**
- * Xmf\Key\StorageInterface
+ * Xmf\Key\Basic
  *
- * load a database table
+ * a basic general purpose key
  *
  * @category  Xmf\Key\Basic
  * @package   Xmf
  * @author    Richard Griffith <[email protected]>
- * @copyright 2018 XOOPS Project (https://xoops.org)
+ * @copyright 2018-2023 XOOPS Project (https://xoops.org)
  * @license   GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
  * @link      https://xoops.org
  */

diff --git a/src/Key/KeyAbstract.php b/src/Key/KeyAbstract.php
@@ -12,9 +12,9 @@
 namespace Xmf\Key;
 
 /**
- * Xmf\Key\StorageInterface
+ * Xmf\Key\KeyAbstract
  *
- * load a database table
+ * manage key and related storage
  *
  * @category  Xmf\Key\KeyAbstract
  * @package   Xmf