fixes #591 - adds jti

bshaffer · May 21, 2015 · 4aceb7c · 4aceb7c · basz · May 21, 2015
1 parent 2b3d4c2
commit 4aceb7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/OAuth2/ResponseType/JwtAccessToken.php b/src/OAuth2/ResponseType/JwtAccessToken.php
@@ -61,8 +61,10 @@ public function createAccessToken($client_id, $user_id, $scope = null, $includeR
     {
         // token to encrypt
         $expires = time() + $this->config['access_lifetime'];
+        $id = $this->generateAccessToken();
         $jwtAccessToken = array(
-            'id'         => $this->generateAccessToken(),
+            'id'         => $id, // for BC (see #591)
+            'jti'        => $id,
             'iss'        => $this->config['issuer'],
             'aud'        => $client_id,
             'sub'        => $user_id,

diff --git a/test/OAuth2/ResponseType/JwtAccessTokenTest.php b/test/OAuth2/ResponseType/JwtAccessTokenTest.php
@@ -24,6 +24,7 @@ public function testCreateAccessToken()
         $decodedAccessToken = $jwt->decode($accessToken['access_token'], null, false);
 
         $this->assertArrayHasKey('id', $decodedAccessToken);
+        $this->assertArrayHasKey('jti', $decodedAccessToken);
         $this->assertArrayHasKey('iss', $decodedAccessToken);
         $this->assertArrayHasKey('aud', $decodedAccessToken);
         $this->assertArrayHasKey('exp', $decodedAccessToken);
@@ -36,6 +37,7 @@ public function testCreateAccessToken()
         $this->assertEquals(123, $decodedAccessToken['sub']);
         $delta = $decodedAccessToken['exp'] - $decodedAccessToken['iat'];
         $this->assertEquals(3600, $delta);
+        $this->assertEquals($decodedAccessToken['id'], $decodedAccessToken['jti']);
     }
 
     public function testGrantJwtAccessToken()