won't invalidate JTI due to incorrect key returned

TomHAnderson · May 18, 2015 · 0192552 · 0192552
1 parent e3ad481
commit 0192552
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/oauth2.doctrine-orm.global.php.dist b/config/oauth2.doctrine-orm.global.php.dist
@@ -254,7 +254,7 @@ return array(
                             'name' => 'audience',
                             'datatype' => 'string',
                         ),
-                        'expiration' => array(
+                        'expires' => array(
                             'type' => 'field',
                             'name' => 'expires',
                             'datatype' => 'datetime',

diff --git a/src/Adapter/DoctrineAdapter.php b/src/Adapter/DoctrineAdapter.php
@@ -1233,22 +1233,22 @@ public function getJti(
         $client_id,
         $subject,
         $audience,
-        $expiration,
+        $expires,
         $jti
     ) {
         $config = $this->getConfig();
         $doctrineClientIdField = $config['mapping']['ZF\OAuth2\Doctrine\Mapper\Jti']['mapping']['client_id']['name'];
         $doctrineSubjectField = $config['mapping']['ZF\OAuth2\Doctrine\Mapper\Jti']['mapping']['subject']['name'];
         $doctrineAudienceField = $config['mapping']['ZF\OAuth2\Doctrine\Mapper\Jti']['mapping']['audience']['name'];
-        $doctrineExpirationField = $config['mapping']['ZF\OAuth2\Doctrine\Mapper\Jti']['mapping']['expiration']['name'];
+        $doctrineExpirationField = $config['mapping']['ZF\OAuth2\Doctrine\Mapper\Jti']['mapping']['expires']['name'];
         $doctrineJtiField = $config['mapping']['ZF\OAuth2\Doctrine\Mapper\Jti']['mapping']['jti']['name'];
 
         $mapper = $this->getServiceLocator()->get('ZF\OAuth2\Doctrine\Mapper\Jti')->reset();
         $mapper->exchangeOAuth2Array(array(
             'client_id' => $client_id,
             'subject' => $subject,
             'audience' => $audience,
-            'expiration' => $expiration,
+            'expires' => $expires,
             'jti' => $jti,
         ));