Use arrays for audience

src/Builder.php

@@ -17,8 +17,10 @@
 
 use function array_key_exists;
 use function assert;
+use function current;
 use function implode;
 use function in_array;
+use function is_array;
 
 /**
  * This class makes easier the token creation process
@@ -106,7 +108,7 @@ public function canOnlyBeUsedBy($audience, $replicateAsHeader = false)
      */
     public function permittedFor($audience, $replicateAsHeader = false)
     {
-        return $this->setRegisteredClaim('aud', (string) $audience, $replicateAsHeader);
+        return $this->setRegisteredClaim('aud', [(string) $audience], $replicateAsHeader);
     }
 
     /**
@@ -122,7 +124,7 @@ public function permittedFor($audience, $replicateAsHeader = false)
      */
     public function setAudience($audience, $replicateAsHeader = false)
     {
-        return $this->setRegisteredClaim('aud', (string) $audience, $replicateAsHeader);
+        return $this->permittedFor($audience, $replicateAsHeader);
     }
 
     /**
@@ -482,8 +484,8 @@ public function getToken(Signer $signer = null, Key $key = null)
         }
 
         $payload = [
-            $this->encoder->base64UrlEncode($this->encoder->jsonEncode($this->convertDatesToInt($this->headers))),
-            $this->encoder->base64UrlEncode($this->encoder->jsonEncode($this->convertDatesToInt($this->claims)))
+            $this->encoder->base64UrlEncode($this->encoder->jsonEncode($this->convertItems($this->headers))),
+            $this->encoder->base64UrlEncode($this->encoder->jsonEncode($this->convertItems($this->claims)))
         ];
 
         $signature = $this->createSignature($payload, $signer, $key);
@@ -503,7 +505,7 @@ public function getToken(Signer $signer = null, Key $key = null)
      *
      * @return array<string, mixed>
      */
-    private function convertDatesToInt(array $items)
+    private function convertItems(array $items)
     {
         foreach (RegisteredClaims::DATE_CLAIMS as $name) {
             if (! array_key_exists($name, $items) || ! $items[$name] instanceof DateTimeImmutable) {
@@ -513,6 +515,10 @@ private function convertDatesToInt(array $items)
             $items[$name] = $items[$name]->getTimestamp();
         }
 
+        if (array_key_exists(RegisteredClaims::AUDIENCE, $items) && is_array($items[RegisteredClaims::AUDIENCE])) {
+            $items[RegisteredClaims::AUDIENCE] = current($items[RegisteredClaims::AUDIENCE]);
+        }
+
         return $items;
     }
 

src/Claim/Factory.php

@@ -10,7 +10,9 @@
 use DateTimeImmutable;
 use Lcobucci\JWT\Claim;
 use Lcobucci\JWT\Token\RegisteredClaims;
+use function current;
 use function in_array;
+use function is_array;
 
 /**
  * Class that create claims
@@ -64,6 +66,10 @@ public function create($name, $value)
             $value = $value->getTimestamp();
         }
 
+        if ($name === RegisteredClaims::AUDIENCE && is_array($value)) {
+            $value = current($value);
+        }
+
         if (!empty($this->callbacks[$name])) {
             return call_user_func($this->callbacks[$name], $name, $value);
         }

src/Parser.php

@@ -17,6 +17,7 @@
 use Lcobucci\JWT\Token\UnsupportedHeaderFound;
 use RuntimeException;
 use function array_key_exists;
+use function is_array;
 
 /**
  * This class parses the JWT strings and convert them into tokens
@@ -119,7 +120,7 @@ protected function parseHeader($data)
             throw UnsupportedHeaderFound::encryption();
         }
 
-        return $this->convertToDateObjects($header);
+        return $this->convertItems($header);
     }
 
     /**
@@ -133,15 +134,15 @@ protected function parseClaims($data)
     {
         $claims = (array) $this->decoder->jsonDecode($this->decoder->base64UrlDecode($data));
 
-        return $this->convertToDateObjects($claims);
+        return $this->convertItems($claims);
     }
 
     /**
      * @param array<string, mixed> $items
      *
      * @return array<string, mixed>
      */
-    private function convertToDateObjects(array $items)
+    private function convertItems(array $items)
     {
         foreach (RegisteredClaims::DATE_CLAIMS as $name) {
             if (! array_key_exists($name, $items)) {
@@ -151,6 +152,10 @@ private function convertToDateObjects(array $items)
             $items[$name] = new DateTimeImmutable('@' . ((int) $items[$name]));
         }
 
+        if (array_key_exists(RegisteredClaims::AUDIENCE, $items) && ! is_array($items[RegisteredClaims::AUDIENCE])) {
+            $items[RegisteredClaims::AUDIENCE] = [$items[RegisteredClaims::AUDIENCE]];
+        }
+
         return $items;
     }
 

src/Token.php

@@ -16,8 +16,10 @@
 use Lcobucci\JWT\Token\DataSet;
 use Lcobucci\JWT\Token\RegisteredClaims;
 use OutOfBoundsException;
+use function current;
 use function func_num_args;
 use function in_array;
+use function is_array;
 use function sprintf;
 
 /**
@@ -237,7 +239,11 @@ public function getClaim($name, $default = null)
         }
 
         if ($value instanceof DateTimeImmutable && in_array($name, RegisteredClaims::DATE_CLAIMS, true)) {
-            $value = $value->getTimestamp();
+            return $value->getTimestamp();
+        }
+
+        if ($name === RegisteredClaims::AUDIENCE && is_array($value)) {
+            return current($value);
         }
 
         return $value;

test/functional/CompatibilityLayerTest.php

@@ -65,18 +65,21 @@ public function registeredDateClaimsShouldBeConvertedToDateObjects()
 
         $token = $config->builder()
             ->issuedAt($now)
+            ->permittedFor('test')
             ->canOnlyBeUsedAfter($now + 5)
             ->expiresAt($now + 3600)
             ->getToken($config->signer(), $config->signingKey());
 
         $expectedNow = new DateTimeImmutable('@' . $now);
 
+        self::assertSame(['test'], $token->claims()->get('aud'));
         self::assertEquals($expectedNow, $token->claims()->get('iat'));
         self::assertEquals($expectedNow->modify('+5 seconds'), $token->claims()->get('nbf'));
         self::assertEquals($expectedNow->modify('+1 hour'), $token->claims()->get('exp'));
 
         $token2 = $config->parser()->parse($token->toString());
 
+        self::assertSame(['test'], $token2->claims()->get('aud'));
         self::assertEquals($expectedNow, $token2->claims()->get('iat'));
         self::assertEquals($expectedNow->modify('+5 seconds'), $token2->claims()->get('nbf'));
         self::assertEquals($expectedNow->modify('+1 hour'), $token2->claims()->get('exp'));

test/unit/BuilderTest.php

@@ -62,7 +62,7 @@ private function createBuilder()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -85,7 +85,7 @@ public function permittedForMustChangeTheAudClaim()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -124,7 +124,7 @@ public function permittedForMustKeepAFluentInterface()
      * @covers ::configureClaim
      * @covers ::createSignature
      * @covers ::convertToDate
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -149,7 +149,7 @@ public function expiresAtMustChangeTheExpClaim()
      * @covers ::createSignature
      * @covers ::convertToDate
      * @covers ::convertToDate
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -188,7 +188,7 @@ public function expiresAtMustKeepAFluentInterface()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -211,7 +211,7 @@ public function identifiedByMustChangeTheJtiClaim()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -250,7 +250,7 @@ public function identifiedByMustKeepAFluentInterface()
      * @covers ::configureClaim
      * @covers ::createSignature
      * @covers ::convertToDate
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -274,7 +274,7 @@ public function issuedAtMustChangeTheIatClaim()
      * @covers ::configureClaim
      * @covers ::createSignature
      * @covers ::convertToDate
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -313,7 +313,7 @@ public function issuedAtMustKeepAFluentInterface()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -336,7 +336,7 @@ public function issuedByMustChangeTheIssClaim()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -375,7 +375,7 @@ public function issuedByMustKeepAFluentInterface()
      * @covers ::configureClaim
      * @covers ::createSignature
      * @covers ::convertToDate
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -399,7 +399,7 @@ public function canOnlyBeUsedAfterMustChangeTheNbfClaim()
      * @covers ::configureClaim
      * @covers ::createSignature
      * @covers ::convertToDate
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -438,7 +438,7 @@ public function canOnlyBeUsedAfterMustKeepAFluentInterface()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -461,7 +461,7 @@ public function relatedToMustChangeTheSubClaim()
      * @covers ::setRegisteredClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -498,7 +498,7 @@ public function relatedToMustKeepAFluentInterface()
      * @covers ::withClaim
      * @covers ::configureClaim
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -547,7 +547,7 @@ public function withClaimShouldThrowExceptionWhenTryingToConfigureARegisteredCla
      * @covers ::__construct
      * @covers ::withHeader
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -581,7 +581,7 @@ public function withHeaderMustKeepAFluentInterface()
      * @covers ::__construct
      * @covers ::sign
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::getToken
      */
@@ -644,7 +644,7 @@ public function unsignMustKeepAFluentInterface(Builder $builder)
      *
      * @covers ::getToken
      * @covers ::createSignature
-     * @covers ::convertDatesToInt
+     * @covers ::convertItems
      *
      * @uses \Lcobucci\JWT\Builder::__construct
      * @uses \Lcobucci\JWT\Builder::configureClaim

test/unit/ParserTest.php

@@ -140,7 +140,7 @@ public function parseMustRaiseExceptionWhenHeaderIsFromAnEncryptedToken()
      * @covers Lcobucci\JWT\Parser::parseHeader
      * @covers Lcobucci\JWT\Parser::parseClaims
      * @covers Lcobucci\JWT\Parser::parseSignature
-     * @covers Lcobucci\JWT\Parser::convertToDateObjects
+     * @covers Lcobucci\JWT\Parser::convertItems
      * @covers \Lcobucci\JWT\Claim\Factory
      * @covers \Lcobucci\JWT\Claim\Basic
      * @covers \Lcobucci\JWT\Claim\EqualsTo
@@ -175,7 +175,7 @@ public function parseMustReturnANonSignedTokenWhenSignatureIsNotInformed()
      * @covers Lcobucci\JWT\Parser::parseHeader
      * @covers Lcobucci\JWT\Parser::parseClaims
      * @covers Lcobucci\JWT\Parser::parseSignature
-     * @covers Lcobucci\JWT\Parser::convertToDateObjects
+     * @covers Lcobucci\JWT\Parser::convertItems
      * @covers \Lcobucci\JWT\Claim\Factory
      * @covers \Lcobucci\JWT\Claim\Basic
      * @covers \Lcobucci\JWT\Claim\EqualsTo
@@ -214,7 +214,7 @@ public function parseShouldReplicateClaimValueOnHeaderWhenNeeded()
      * @covers Lcobucci\JWT\Parser::parseHeader
      * @covers Lcobucci\JWT\Parser::parseClaims
      * @covers Lcobucci\JWT\Parser::parseSignature
-     * @covers Lcobucci\JWT\Parser::convertToDateObjects
+     * @covers Lcobucci\JWT\Parser::convertItems
      * @covers \Lcobucci\JWT\Claim\Factory
      * @covers \Lcobucci\JWT\Claim\Basic
      * @covers \Lcobucci\JWT\Claim\EqualsTo