Merge 41882e8 into 3fc3b91

README.md

@@ -23,7 +23,7 @@ Please note that until I reach 1.0, I **WILL NOT** follow semantic version. This
 Installation is only officially supported using Composer:
 
 ```sh
-php composer.phar require zfr/zfr-oauth2-server-module:0.4.*
+php composer.phar require zfr/zfr-oauth2-server-module:0.5.*
 ```
 
 Copy-paste the `zfr_oauth2_server.global.php.dist` file to your `autoload` folder, and enable the module by adding

composer.json

@@ -24,7 +24,7 @@
     "zendframework/zend-console": "~2.2",
     "zendframework/zend-stdlib": "~2.2",
     "doctrine/doctrine-module": "~0.8",
-    "zfr/zfr-oauth2-server": "0.4.*"
+    "zfr/zfr-oauth2-server": "0.5.*"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",

config/module.config.php

@@ -82,6 +82,17 @@
                                 'action'     => 'token'
                             ]
                         ]
+                    ],
+
+                    'revoke' => [
+                        'type'    => 'Literal',
+                        'options' => [
+                            'route'    => '/revoke',
+                            'defaults' => [
+                                'controller' => 'ZfrOAuth2Module\Server\Controller\TokenController',
+                                'action'     => 'revoke'
+                            ]
+                        ]
                     ]
                 ]
             ]

src/ZfrOAuth2Module/Server/Controller/TokenController.php

@@ -58,6 +58,21 @@ public function tokenAction()
         return $this->authorizationServer->handleTokenRequest($this->request);
     }
 
+    /**
+     * Handle a token revocation request
+     *
+     * @return \Zend\Http\Response|null
+     */
+    public function revokeAction()
+    {
+        // Can't do anything if not HTTP request...
+        if (!$this->request instanceof HttpRequest) {
+            return null;
+        }
+
+        return $this->authorizationServer->handleRevocationRequest($this->request);
+    }
+
     /**
      * Delete expired tokens
      *

src/ZfrOAuth2Module/Server/Factory/AuthorizationServerFactory.php

@@ -47,6 +47,12 @@ public function createService(ServiceLocatorInterface $serviceLocator)
             $grants[] = $grantPluginManager->get($grant);
         }
 
-        return new AuthorizationServer($clientService, $grants);
+        /** @var \ZfrOAuth2\Server\Service\TokenService $accessTokenService */
+        $accessTokenService = $serviceLocator->get('ZfrOAuth2\Server\Service\AccessTokenService');
+
+        /** @var \ZfrOAuth2\Server\Service\TokenService $refreshTokenService */
+        $refreshTokenService = $serviceLocator->get('ZfrOAuth2\Server\Service\RefreshTokenService');
+
+        return new AuthorizationServer($clientService, $grants, $accessTokenService, $refreshTokenService);
     }
 }

tests/ZfrOAuth2ModuleTest/Server/Controller/TokenControllerTest.php

@@ -65,4 +65,24 @@ public function testDelegateToAuthorizationServerIfHttpRequest()
 
         $this->assertSame($response, $controller->tokenAction($request));
     }
+
+    public function testCanRevokeToken()
+    {
+        $authorizationServer = $this->getMock('ZfrOAuth2\Server\AuthorizationServer', [], [], '', false);
+        $controller          = new TokenController($authorizationServer);
+
+        $request  = new HttpRequest();
+        $response = new HttpResponse();
+
+        $reflProperty = new \ReflectionProperty($controller, 'request');
+        $reflProperty->setAccessible(true);
+        $reflProperty->setValue($controller, $request);
+
+        $authorizationServer->expects($this->once())
+                            ->method('handleRevocationRequest')
+                            ->with($request)
+                            ->will($this->returnValue($response));
+
+        $this->assertSame($response, $controller->revokeAction($request));
+    }
 }

tests/ZfrOAuth2ModuleTest/Server/Factory/AuthorizationServerFactoryTest.php

@@ -52,6 +52,16 @@ public function testCanCreateFromFactory()
             $grantPluginManager
         );
 
+        $serviceManager->setService(
+            'ZfrOAuth2\Server\Service\AccessTokenService',
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false)
+        );
+
+        $serviceManager->setService(
+            'ZfrOAuth2\Server\Service\RefreshTokenService',
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false)
+        );
+
         $grantPluginManager->expects($this->once())
                            ->method('get')
                            ->with('MyGrant')