adds tests and server integration for new refresh token config

bshaffer · Apr 24, 2015 · cd648bc · cd648bc
1 parent fd49216
commit cd648bc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/src/OAuth2/Server.php b/src/OAuth2/Server.php
@@ -122,6 +122,7 @@ public function __construct($storage = array(), array $config = array(), array $
             'allow_credentials_in_request_body' => true,
             'allow_public_clients'     => true,
             'always_issue_new_refresh_token' => false,
+            'unset_refresh_token_after_use' => true,
         ), $config);
 
         foreach ($grantTypes as $key => $grantType) {
@@ -604,7 +605,7 @@ protected function getDefaultGrantTypes()
         }
 
         if (isset($this->storages['refresh_token'])) {
-            $config = array_intersect_key($this->config, array('always_issue_new_refresh_token' => ''));
+            $config = array_intersect_key($this->config, array_flip(explode(' ', 'always_issue_new_refresh_token unset_refresh_token_after_use')));
             $grantTypes['refresh_token'] = new RefreshToken($this->storages['refresh_token'], $config);
         }
 

diff --git a/test/OAuth2/GrantType/RefreshTokenTest.php b/test/OAuth2/GrantType/RefreshTokenTest.php
@@ -69,6 +69,27 @@ public function testValidRefreshTokenWithNewRefreshTokenInResponse()
         $this->assertFalse($used_token, 'the refresh token used is no longer valid');
     }
 
+    public function testValidRefreshTokenDoesNotUnsetToken()
+    {
+        $server = $this->getTestServer();
+        $server->addGrantType(new RefreshToken($this->storage, array(
+            'always_issue_new_refresh_token' => true,
+            'unset_refresh_token_after_use'  => false,
+        )));
+
+        $request = TestRequest::createPost(array(
+            'grant_type' => 'refresh_token', // valid grant type
+            'client_id' => 'Test Client ID', // valid client id
+            'client_secret' => 'TestSecret', // valid client secret
+            'refresh_token' => 'test-refreshtoken', // valid refresh token
+        ));
+        $token = $server->grantAccessToken($request, new Response());
+        $this->assertTrue(isset($token['refresh_token']), 'refresh token should always refresh');
+
+        $used_token = $this->storage->getRefreshToken('test-refreshtoken');
+        $this->assertNotNull($used_token, 'the refresh token used is still valid');
+    }
+
     public function testValidRefreshTokenWithNoRefreshTokenInResponse()
     {
         $server = $this->getTestServer();

diff --git a/test/OAuth2/ServerTest.php b/test/OAuth2/ServerTest.php
@@ -364,7 +364,7 @@ public function testRefreshTokenConfig()
         // create mock storage
         $storage = Bootstrap::getInstance()->getMemoryStorage();
         $server1 = new Server(array($storage));
-        $server2 = new Server(array($storage), array('always_issue_new_refresh_token' => true));
+        $server2 = new Server(array($storage), array('always_issue_new_refresh_token' => true, 'unset_refresh_token_after_use' => false));
 
         $server1->getTokenController();
         $refreshToken1 = $server1->getGrantType('refresh_token');
@@ -386,6 +386,9 @@ public function testRefreshTokenConfig()
 
         $this->assertEquals($config1['always_issue_new_refresh_token'], false);
         $this->assertEquals($config2['always_issue_new_refresh_token'], true);
+
+        $this->assertEquals($config1['unset_refresh_token_after_use'], true);
+        $this->assertEquals($config2['unset_refresh_token_after_use'], false);
     }
 
     /**