Update lcobucci/jwt to ^3.4. (#59)

Author: mvdnbrk

composer.json

@@ -21,7 +21,7 @@
         "ext-json": "*",
         "composer/ca-bundle": "^1.2",
         "guzzlehttp/guzzle": "^6.4 || ^7.1",
-        "lcobucci/jwt": "^3.3",
+        "lcobucci/jwt": "^3.4",
         "ramsey/uuid": "^4.0",
         "tightenco/collect": "^5.8 || ^6.0 || ^7.0 || ^8.0"
     },

src/Resources/AccessToken.php

@@ -30,9 +30,9 @@ private function parseToken(): void
     {
         $token = (new Parser)->parse($this->token);
 
-        $this->expiresAt = (new DateTimeImmutable)->setTimestamp($token->getClaim('exp')) ?: new DateTimeImmutable;
-        $this->accounts = $token->getClaim('accounts');
-        $this->roles = $token->getClaim('roles');
+        $this->expiresAt = $token->claims()->get('exp') ?: new DateTimeImmutable;
+        $this->accounts = $token->claims()->get('accounts');
+        $this->roles = $token->claims()->get('roles');
     }
 
     public function isExpired(): bool

tests/Unit/Resources/AccessTokenTest.php

@@ -2,17 +2,30 @@
 
 namespace Mvdnbrk\DhlParcel\Tests\Unit\Resources;
 
-use Lcobucci\JWT\Builder;
+use DateInterval;
+use DateTimeImmutable;
+use Lcobucci\JWT\Configuration;
 use Mvdnbrk\DhlParcel\Resources\AccessToken;
 use Mvdnbrk\DhlParcel\Tests\TestCase;
 
 class AccessTokenTest extends TestCase
 {
+    /** @var \Lcobucci\JWT\Configuration */
+    protected $config;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->config = Configuration::forUnsecuredSigner();
+    }
+
     /** @test */
     public function create_a_new_access_token()
     {
+        $expires = (new DateTimeImmutable('1970-01-01 00:00:00'))->add(new DateInterval('PT9S'));
         $accessToken = new AccessToken(
-            (new Builder)->setExpiration(9)->set('accounts', [])->set('roles', [])->getToken()->__toString()
+            $this->config->builder()->expiresAt($expires)->withClaim('accounts', [])->withClaim('roles', [])->getToken($this->config->signer(), $this->config->signingKey())->toString()
         );
 
         $this->assertSame('eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJleHAiOjksImFjY291bnRzIjpbXSwicm9sZXMiOltdfQ.', $accessToken->token);
@@ -22,14 +35,16 @@ public function create_a_new_access_token()
     /** @test */
     public function it_can_determine_if_the_access_token_has_expired()
     {
+        $expires = (new DateTimeImmutable())->sub(new DateInterval('PT1S'));
         $accessToken = new AccessToken(
-            (new Builder)->setExpiration(0)->set('accounts', [])->set('roles', [])->getToken()->__toString()
+            $this->config->builder()->expiresAt($expires)->withClaim('accounts', [])->withClaim('roles', [])->getToken($this->config->signer(), $this->config->signingKey())->toString()
         );
 
         $this->assertTrue($accessToken->isExpired());
 
+        $expires = (new DateTimeImmutable())->add(new DateInterval('PT9S'));
         $accessToken = new AccessToken(
-            (new Builder)->setExpiration(time() + 999)->set('accounts', [])->set('roles', [])->getToken()->__toString()
+            $this->config->builder()->expiresAt($expires)->withClaim('accounts', [])->withClaim('roles', [])->getToken($this->config->signer(), $this->config->signingKey())->toString()
         );
 
         $this->assertFalse($accessToken->isExpired());
@@ -38,8 +53,9 @@ public function it_can_determine_if_the_access_token_has_expired()
     /** @test */
     public function it_can_retrieve_the_account_id_from_the_token()
     {
+        $expires = new DateTimeImmutable();
         $accessToken = new AccessToken(
-            (new Builder)->setExpiration(0)->set('accounts', ['123456'])->set('roles', [])->getToken()->__toString()
+            $this->config->builder()->expiresAt($expires)->withClaim('accounts', ['123456'])->withClaim('roles', [])->getToken($this->config->signer(), $this->config->signingKey())->toString()
         );
 
         $this->assertEquals('123456', $accessToken->getAccountId());
@@ -48,8 +64,9 @@ public function it_can_retrieve_the_account_id_from_the_token()
     /** @test */
     public function it_can_set_the_account_id()
     {
+        $expires = new DateTimeImmutable();
         $accessToken = new AccessToken(
-            (new Builder)->setExpiration(0)->set('accounts', ['1111', '2222'])->set('roles', [])->getToken()->__toString()
+            $this->config->builder()->expiresAt($expires)->withClaim('accounts', ['1111', '2222'])->withClaim('roles', [])->getToken($this->config->signer(), $this->config->signingKey())->toString()
         );
 
         $accessToken->setAccountId('does-not-exist');