Encode "aud" as string when we just have one permitted client

lcobucci · Feb 17, 2017 · 31a7d7f · 31a7d7f
1 parent d57ac6a
commit 31a7d7f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/Token/Builder.php b/src/Token/Builder.php
@@ -173,6 +173,10 @@ public function getToken(Signer $signer, Key $key): Plain
 
     private function formatClaims(array $claims): array
     {
+        if (isset($claims[RegisteredClaims::AUDIENCE]) && count($claims[RegisteredClaims::AUDIENCE]) === 1) {
+            $claims[RegisteredClaims::AUDIENCE] = $claims[RegisteredClaims::AUDIENCE][0];
+        }
+
         foreach (RegisteredClaims::DATE_CLAIMS as $claim) {
             if (!isset($claims[$claim])) {
                 continue;

diff --git a/test/unit/Token/BuilderTest.php b/test/unit/Token/BuilderTest.php
@@ -414,7 +414,7 @@ public function getTokenMustReturnANewTokenWithCurrentConfiguration(): void
         $this->signer->method('sign')->willReturn('testing');
 
         $headers = ['typ' => 'JWT', 'alg' => 'RS256'];
-        $claims = ['test' => 123, 'iat' => 1487285080, 'exp' => '1487285080.123456'];
+        $claims = ['test' => 123, 'aud' => 'test', 'iat' => 1487285080, 'exp' => '1487285080.123456'];
 
         $this->encoder->expects($this->exactly(2))
                       ->method('jsonEncode')
@@ -429,6 +429,7 @@ public function getTokenMustReturnANewTokenWithCurrentConfiguration(): void
         $token = $this->createBuilder()
                       ->issuedAt(new DateTimeImmutable('@1487285080'))
                       ->expiresAt(DateTimeImmutable::createFromFormat('U.u', '1487285080.123456'))
+                      ->permittedFor('test')
                       ->withClaim('test', 123)
                       ->getToken($this->signer, new Key('123'));