Merge pull request #94 from basz/master

implement psr15

Author: prolic

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## dev-master
 
+* Implement PSR15
+
 ## v0.8.0-beta2
 
 * When an token can't be found the returned error response by the resource server middleware is now in a similar format to other errors. This might BC if your client depends on the error key in the message.

composer.json

@@ -26,7 +26,8 @@
     "zendframework/zend-diactoros": "^1.1",
     "psr/container": "^1.0",
     "ramsey/uuid": "^3.1",
-    "roave/security-advisories": "dev-master"
+    "roave/security-advisories": "dev-master",
+    "http-interop/http-middleware": "^0.4.1"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^2.1",

src/Middleware/AuthorizationRequestMiddleware.php

@@ -21,14 +21,16 @@
 
 namespace ZfrOAuth2\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use ZfrOAuth2\Server\AuthorizationServerInterface;
 
 /**
  * Authorization request middleware endpoint of the authorization server
  */
-class AuthorizationRequestMiddleware
+class AuthorizationRequestMiddleware implements MiddlewareInterface
 {
     /**
      * @var AuthorizationServerInterface
@@ -48,11 +50,8 @@ public function __construct(
         $this->ownerRequestAttribute = $ownerRequestAttribute;
     }
 
-    public function __invoke(
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        callable $next
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    {
         $owner = $request->getAttribute($this->ownerRequestAttribute);
 
         return $this->authorizationServer->handleAuthorizationRequest($request, $owner);

src/Middleware/ResourceServerMiddleware.php

@@ -21,6 +21,8 @@
 
 namespace ZfrOAuth2\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Zend\Diactoros\Response\JsonResponse;
@@ -36,7 +38,7 @@
  * If the token is valid, it will store it as part of the request under the attribute "oauth_token", so that it can
  * be used later one by a permission system, for instance
  */
-class ResourceServerMiddleware
+class ResourceServerMiddleware implements MiddlewareInterface
 {
     /**
      * @var ResourceServerInterface
@@ -57,11 +59,8 @@ public function __construct(ResourceServerInterface $resourceServer, string $tok
         $this->tokenRequestAttribute = $tokenRequestAttribute;
     }
 
-    public function __invoke(
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        callable $next
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    {
         try {
             $token = $this->resourceServer->getAccessToken($request);
         } catch (InvalidAccessTokenException $exception) {
@@ -72,6 +71,6 @@ public function __invoke(
         }
 
         // Otherwise, if we actually have a token and set it as part of the request attribute for next step
-        return $next($request->withAttribute($this->tokenRequestAttribute, $token), $response);
+        return $delegate->process($request->withAttribute($this->tokenRequestAttribute, $token));
     }
 }

src/Middleware/RevocationRequestMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -21,14 +21,16 @@
 
 namespace ZfrOAuth2\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use ZfrOAuth2\Server\AuthorizationServerInterface;
 
 /**
  * Token revocation request middleware endpoint of the authorization server
  */
-class RevocationRequestMiddleware
+class RevocationRequestMiddleware implements MiddlewareInterface
 {
     /**
      * @var AuthorizationServerInterface
@@ -40,11 +42,8 @@ public function __construct(AuthorizationServerInterface $authorizationServer)
         $this->authorizationServer = $authorizationServer;
     }
 
-    public function __invoke(
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        callable $next
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    {
         return $this->authorizationServer->handleRevocationRequest($request);
     }
 }

src/Middleware/TokenRequestMiddleware.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /*
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -21,14 +21,16 @@
 
 namespace ZfrOAuth2\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
+use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use ZfrOAuth2\Server\AuthorizationServerInterface;
 
 /**
  * Token request request middleware endpoint of the authorization server
  */
-class TokenRequestMiddleware
+class TokenRequestMiddleware implements MiddlewareInterface
 {
     /**
      * @var AuthorizationServerInterface
@@ -40,11 +42,8 @@ public function __construct(AuthorizationServerInterface $authorizationServer)
         $this->authorizationServer = $authorizationServer;
     }
 
-    public function __invoke(
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        callable $next
-    ): ResponseInterface {
+    public function process(ServerRequestInterface $request, DelegateInterface $delegate): ResponseInterface
+    {
         return $this->authorizationServer->handleTokenRequest($request);
     }
 }

tests/src/Middleware/AuthorizationRequestMiddlewareTest.php

@@ -20,12 +20,12 @@
 
 namespace ZfrOAuth2Test\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as RequestInterface;
 use ZfrOAuth2\Server\AuthorizationServerInterface;
 use ZfrOAuth2\Server\Middleware\AuthorizationRequestMiddleware;
-use ZfrOAuth2\Server\Options\ServerOptions;
 
 /**
  * @author  Michaël Gallego <mic.gallego@gmail.com>
@@ -37,18 +37,16 @@ class AuthorizationRequestMiddlewareTest extends TestCase
     public function testWillHandleAuthorizationRequest()
     {
         $authorizationServer = $this->createMock(AuthorizationServerInterface::class);
-        $serverOptions       = ServerOptions::fromArray();
         $middleware          = new AuthorizationRequestMiddleware($authorizationServer, 'owner');
 
         $request  = $this->createMock(RequestInterface::class);
-        $response = $this->createMock(ResponseInterface::class);
+        $delegate = $this->createMock(DelegateInterface::class);
 
         $authorizationServer->expects($this->once())
             ->method('handleAuthorizationRequest')
             ->with($request)
             ->willReturn($this->createMock(ResponseInterface::class));
 
-        $middleware($request, $response, function () {
-        });
+        $middleware->process($request, $delegate);
     }
 }

tests/src/Middleware/ResourceServerMiddlewareTest.php

@@ -20,6 +20,7 @@
 
 namespace ZfrOAuth2Test\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as RequestInterface;
@@ -43,6 +44,12 @@ public function testWillGetAccessTokenWithAccessTokenAsResult()
         $accessToken    = $this->createMock(AccessToken::class);
         $request        = $this->createMock(RequestInterface::class);
         $response       = $this->createMock(ResponseInterface::class);
+        $delegate       = $this->createMock(DelegateInterface::class);
+
+        $delegate->expects($this->once())
+            ->method('process')
+            ->with($request)
+            ->willReturn($response);
 
         $resourceServer->expects($this->once())
             ->method('getAccessToken')
@@ -57,9 +64,7 @@ public function testWillGetAccessTokenWithAccessTokenAsResult()
             )
             ->willReturn($request);
 
-        $middleware($request, $response, function ($request, $response) {
-            return $response;
-        });
+        $middleware->process($request, $delegate);
     }
 
     public function testWillGetAccessTokenWithNullAsResult()
@@ -69,6 +74,12 @@ public function testWillGetAccessTokenWithNullAsResult()
         $accessToken    = null;
         $request        = $this->createMock(RequestInterface::class);
         $response       = $this->createMock(ResponseInterface::class);
+        $delegate       = $this->createMock(DelegateInterface::class);
+
+        $delegate->expects($this->once())
+            ->method('process')
+            ->with($request)
+            ->willReturn($response);
 
         $resourceServer->expects($this->once())
             ->method('getAccessToken')
@@ -83,26 +94,22 @@ public function testWillGetAccessTokenWithNullAsResult()
             )
             ->willReturn($request);
 
-        $middleware($request, $response, function ($request, $response) {
-            return $response;
-        });
+        $result = $middleware->process($request, $delegate);
     }
 
     public function testWillCallGetAccessTokenWithException()
     {
         $resourceServer = $this->createMock(ResourceServer::class);
         $middleware     = new ResourceServerMiddleware($resourceServer, 'oauth_token');
         $request        = $this->createMock(RequestInterface::class);
-        $response       = $this->createMock(ResponseInterface::class);
+        $delegate       = $this->createMock(DelegateInterface::class);
 
         $resourceServer->expects($this->once())
             ->method('getAccessToken')
             ->with($request)
             ->willThrowException(InvalidAccessTokenException::invalidToken('error message'));
 
-        $result = $middleware($request, $response, function ($request, $response) {
-            return $response;
-        });
+        $result = $middleware->process($request, $delegate);
 
         $this->assertInstanceOf(JsonResponse::class, $result);
 

tests/src/Middleware/RevocationRequestMiddlewareTest.php

@@ -20,6 +20,7 @@
 
 namespace ZfrOAuth2Test\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as RequestInterface;
@@ -52,16 +53,13 @@ public function setUp()
     public function testCanHandleRevocationRequest()
     {
         $request  = $this->createMock(RequestInterface::class);
-        $response = $this->createMock(ResponseInterface::class);
-        $next     = function () {
-        };
+        $delegate = $this->createMock(DelegateInterface::class);
 
         $this->authorizationServer->expects($this->once())
             ->method('handleRevocationRequest')
             ->with($request)
             ->willReturn($this->createMock(ResponseInterface::class));
 
-        $middleware = $this->middleware;
-        $middleware ($request, $response, $next);
+        $this->middleware->process($request, $delegate);
     }
 }

tests/src/Middleware/TokenRequestMiddlewareTest.php

@@ -20,6 +20,7 @@
 
 namespace ZfrOAuth2Test\Server\Middleware;
 
+use Interop\Http\ServerMiddleware\DelegateInterface;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface as RequestInterface;
@@ -52,16 +53,13 @@ public function setUp()
     public function testCanHandleTokenRequest()
     {
         $request  = $this->createMock(RequestInterface::class);
-        $response = $this->createMock(ResponseInterface::class);
-        $next     = function () {
-        };
+        $delegate = $this->createMock(DelegateInterface::class);
 
         $this->authorizationServer->expects($this->once())
             ->method('handleTokenRequest')
             ->with($request)
             ->willReturn($this->createMock(ResponseInterface::class));
 
-        $middleware = $this->middleware;
-        $middleware ($request, $response, $next);
+        $this->middleware->process($request, $delegate);
     }
 }