feat: remove lcobucci/jwt deprecations

oat-sa · Mar 10, 2024 · a0f60be · a0f60be
1 parent 35e6fb0
commit a0f60be
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 77 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -5,9 +5,6 @@
     <include>
       <directory>src</directory>
     </include>
-    <exclude>
-      <file>src/Security/Jwt/Decoder/AssociativeDecoder.php</file>
-    </exclude>
   </coverage>
   <php>
     <env name="TEST_KEYS_ROOT_DIR" value="file://tests/Resource/Key/RSA"/>

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -51,16 +51,6 @@
                 <file name="src/Service/Server/LtiServiceServer.php"/>
             </errorLevel>
         </TypeDoesNotContainType>
-        <UndefinedClass>
-            <errorLevel type="suppress">
-                <file name="src/Security/Jwt/Decoder/AssociativeDecoder.php"/>
-            </errorLevel>
-        </UndefinedClass>
-        <UndefinedConstant>
-            <errorLevel type="suppress">
-                <file name="src/Security/Jwt/Decoder/AssociativeDecoder.php"/>
-            </errorLevel>
-        </UndefinedConstant>
         <RedundantCondition>
             <errorLevel type="suppress">
                 <file name="src/Message/LtiMessage.php"/>

diff --git a/src/Security/Jwt/Builder/Builder.php b/src/Security/Jwt/Builder/Builder.php
@@ -78,7 +78,6 @@ public function build(array $headers, array $claims, KeyInterface $key): TokenIn
                     MessagePayloadInterface::CLAIM_EXP => $now->addSeconds($this->messageTtl)->toDateTimeImmutable(),
                 ]
             );
-
             foreach ($claims as $claimName => $claimValue) {
                 switch ($claimName) {
                     case MessagePayloadInterface::CLAIM_JTI:

diff --git a/src/Security/Jwt/Configuration/ConfigurationFactory.php b/src/Security/Jwt/Configuration/ConfigurationFactory.php
@@ -24,12 +24,12 @@
 
 use Lcobucci\Clock\SystemClock;
 use Lcobucci\JWT\Configuration;
+use Lcobucci\JWT\Encoding\JoseEncoder;
 use Lcobucci\JWT\Signer\Key;
 use Lcobucci\JWT\Signer\Key\InMemory;
+use Lcobucci\JWT\Validation\Constraint\LooseValidAt;
 use Lcobucci\JWT\Validation\Constraint\SignedWith;
-use Lcobucci\JWT\Validation\Constraint\ValidAt;
 use OAT\Library\Lti1p3Core\Security\Jwt\Converter\KeyConverter;
-use OAT\Library\Lti1p3Core\Security\Jwt\Decoder\AssociativeDecoder;
 use OAT\Library\Lti1p3Core\Security\Jwt\Signer\SignerFactory;
 use OAT\Library\Lti1p3Core\Security\Key\KeyInterface;
 
@@ -51,18 +51,16 @@ public function create(?KeyInterface $signingKey = null, ?KeyInterface $verifica
     {
         $algorithm = $this->findAlgorithm($signingKey, $verificationKey);
 
-        $decoder = class_exists('Lcobucci\JWT\Parsing\Decoder') ? new AssociativeDecoder() : null;
-
         $configuration = Configuration::forAsymmetricSigner(
             $this->factory->create($algorithm),
             $this->convertKey($signingKey),
             $this->convertKey($verificationKey),
-            null,
-            $decoder
+            new JoseEncoder(),
+            new JoseEncoder(),
         );
 
         $configuration->setValidationConstraints(
-            new ValidAt(SystemClock::fromUTC()),
+            new LooseValidAt(SystemClock::fromUTC()),
             new SignedWith($configuration->signer(), $configuration->verificationKey())
         );
 
@@ -85,9 +83,7 @@ private function findAlgorithm(?KeyInterface $signingKey = null, ?KeyInterface $
     private function convertKey(?KeyInterface $key = null): Key
     {
         if (null === $key) {
-            return method_exists(InMemory::class, 'empty')
-                ? InMemory::empty()
-                : InMemory::plainText('');
+            return InMemory::plainText('empty', 'empty');
         }
 
         return $this->converter->convert($key);

diff --git a/src/Security/Jwt/Decoder/AssociativeDecoder.php b/src/Security/Jwt/Decoder/AssociativeDecoder.php