Merge pull request #502 from lucadegasperi/middleware

Added New Middleware

Author: lucadegasperi

src/Middleware/OAuthOwnerMiddleware.php renamed to src/Middleware/OAuthClientOwnerMiddleware.php

@@ -16,11 +16,11 @@
 use LucaDegasperi\OAuth2Server\Authorizer;
 
 /**
- * This is the oauth owner middleware class.
+ * This is the oauth client middleware class.
  *
- * @author Luca Degasperi <packages@lucadegasperi.com>
+ * @author Vincent Klaiber <hello@vinkla.com>
  */
-class OAuthOwnerMiddleware
+class OAuthClientOwnerMiddleware
 {
     /**
      * The Authorizer instance.
@@ -30,7 +30,7 @@ class OAuthOwnerMiddleware
     protected $authorizer;
 
     /**
-     * Create a new oauth owner middleware instance.
+     * Create a new oauth client middleware instance.
      *
      * @param \LucaDegasperi\OAuth2Server\Authorizer $authorizer
      */
@@ -44,21 +44,14 @@ public function __construct(Authorizer $authorizer)
      *
      * @param \Illuminate\Http\Request $request
      * @param \Closure $next
-     * @param string|null $ownerTypesString
      *
      * @throws \League\OAuth2\Server\Exception\AccessDeniedException
      *
      * @return mixed
      */
-    public function handle($request, Closure $next, $ownerTypesString = null)
+    public function handle($request, Closure $next)
     {
-        $ownerTypes = [];
-
-        if (!is_null($ownerTypesString)) {
-            $ownerTypes = explode('+', $ownerTypesString);
-        }
-
-        if (!in_array($this->authorizer->getResourceOwnerType(), $ownerTypes)) {
+        if ($this->authorizer->getResourceOwnerType() !== 'client') {
             throw new AccessDeniedException();
         }
 

src/Middleware/OAuthUserOwnerMiddleware.php

@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of OAuth 2.0 Laravel.
+ *
+ * (c) Luca Degasperi <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace LucaDegasperi\OAuth2Server\Middleware;
+
+use Closure;
+use League\OAuth2\Server\Exception\AccessDeniedException;
+use LucaDegasperi\OAuth2Server\Authorizer;
+
+/**
+ * This is the oauth user middleware class.
+ *
+ * @author Vincent Klaiber <[email protected]>
+ */
+class OAuthUserOwnerMiddleware
+{
+    /**
+     * The Authorizer instance.
+     *
+     * @var \LucaDegasperi\OAuth2Server\Authorizer
+     */
+    protected $authorizer;
+
+    /**
+     * Create a new oauth user middleware instance.
+     *
+     * @param \LucaDegasperi\OAuth2Server\Authorizer $authorizer
+     */
+    public function __construct(Authorizer $authorizer)
+    {
+        $this->authorizer = $authorizer;
+    }
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @param \Closure $next
+     *
+     * @throws \League\OAuth2\Server\Exception\AccessDeniedException
+     *
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($this->authorizer->getResourceOwnerType() !== 'user') {
+            throw new AccessDeniedException();
+        }
+
+        return $next($request);
+    }
+}

tests/unit/LucaDegasperi/OAuth2Server/Middleware/OAuthClientOwnerMiddlewareSpec.php

@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of OAuth 2.0 Laravel.
+ *
+ * (c) Luca Degasperi <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace unit\LucaDegasperi\OAuth2Server\Middleware;
+
+use Illuminate\Http\Request;
+use League\OAuth2\Server\Exception\AccessDeniedException;
+use LucaDegasperi\OAuth2Server\Authorizer;
+use PhpSpec\ObjectBehavior;
+
+/**
+ * This is the oauth client middleware spec class.
+ *
+ * @author Vincent Klaiber <[email protected]>
+ */
+class OAuthClientOwnerMiddlewareSpec extends ObjectBehavior
+{
+    private $next = null;
+
+    public function __construct()
+    {
+        $this->next = (function () {
+            throw new MiddlewareException('Called execution of $next');
+        });
+    }
+
+    public function let(Authorizer $authorizer)
+    {
+        $this->beConstructedWith($authorizer);
+    }
+
+    public function it_is_initializable()
+    {
+        $this->shouldHaveType('LucaDegasperi\OAuth2Server\Middleware\OAuthClientOwnerMiddleware');
+    }
+
+    public function it_passes_if_resource_owners_are_allowed(Request $request, Authorizer $authorizer)
+    {
+        $authorizer->getResourceOwnerType()->willReturn('client')->shouldBeCalled();
+
+        $this->shouldThrow(new MiddlewareException('Called execution of $next'))
+            ->during('handle', [$request, $this->next]);
+    }
+
+    public function it_blocks_if_resource_owners_are_not_allowed(Request $request, Authorizer $authorizer)
+    {
+        $authorizer->getResourceOwnerType()->willReturn('user')->shouldBeCalled();
+
+        $this->shouldThrow(new AccessDeniedException())
+            ->during('handle', [$request, $this->next]);
+
+        $this->shouldNotThrow(new MiddlewareException('Called execution of $next'))
+            ->during('handle', [$request, $this->next]);
+    }
+}

tests/unit/LucaDegasperi/OAuth2Server/Middleware/OAuthOwnerMiddlewareSpec.php renamed to tests/unit/LucaDegasperi/OAuth2Server/Middleware/OAuthUserOwnerMiddlewareSpec.php

@@ -16,7 +16,12 @@
 use LucaDegasperi\OAuth2Server\Authorizer;
 use PhpSpec\ObjectBehavior;
 
-class OAuthOwnerMiddlewareSpec extends ObjectBehavior
+/**
+ * This is the oauth user middleware spec class.
+ *
+ * @author Vincent Klaiber <[email protected]>
+ */
+class OAuthUserOwnerMiddlewareSpec extends ObjectBehavior
 {
     private $next = null;
 
@@ -34,25 +39,25 @@ public function let(Authorizer $authorizer)
 
     public function it_is_initializable()
     {
-        $this->shouldHaveType('LucaDegasperi\OAuth2Server\Middleware\OAuthOwnerMiddleware');
+        $this->shouldHaveType('LucaDegasperi\OAuth2Server\Middleware\OAuthUserOwnerMiddleware');
     }
 
     public function it_passes_if_resource_owners_are_allowed(Request $request, Authorizer $authorizer)
     {
         $authorizer->getResourceOwnerType()->willReturn('user')->shouldBeCalled();
 
         $this->shouldThrow(new MiddlewareException('Called execution of $next'))
-                ->during('handle', [$request, $this->next, 'user']);
+            ->during('handle', [$request, $this->next]);
     }
 
     public function it_blocks_if_resource_owners_are_not_allowed(Request $request, Authorizer $authorizer)
     {
-        $authorizer->getResourceOwnerType()->willReturn('user')->shouldBeCalled();
+        $authorizer->getResourceOwnerType()->willReturn('client')->shouldBeCalled();
 
         $this->shouldThrow(new AccessDeniedException())
-                ->during('handle', [$request, $this->next, 'client']);
+            ->during('handle', [$request, $this->next]);
 
         $this->shouldNotThrow(new MiddlewareException('Called execution of $next'))
-                ->during('handle', [$request, $this->next, 'client']);
+            ->during('handle', [$request, $this->next]);
     }
 }