Fixes made for 3.x ported to 4.x

Author: lucadegasperi

src/Authorizer.php

@@ -133,9 +133,9 @@ public function authCodeRequestDeniedRedirectUri()
     {
         $error = new AccessDeniedException;
         return $this->getRedirectUriGenerator()->make($this->getAuthCodeRequestParam('redirect_uri'), [
-                'error' =>  $error->errorType,
-                'error_description' =>  $error->getMessage()
-            ]
+                        'error' =>  $error->errorType,
+                        'error_description' =>  $error->getMessage()
+                ]
         );
     }
 
@@ -177,7 +177,7 @@ public function validateAccessToken($httpHeadersOnly = false, $accessToken = nul
      */
     public function getScopes()
     {
-        return $this->checker->getScopes();
+        return $this->checker->getAccessToken()->getScopes();
     }
 
     /**
@@ -187,7 +187,7 @@ public function getScopes()
      */
     public function hasScope($scope)
     {
-        return $this->checker->hasScope($scope);
+        return $this->checker->getAccessToken()->hasScope($scope);
     }
 
     /**
@@ -196,7 +196,7 @@ public function hasScope($scope)
      */
     public function getResourceOwnerId()
     {
-        return $this->checker->getOwnerId();
+        return $this->checker->getAccessToken()->getSession()->getOwnerId();
     }
 
     /**
@@ -205,7 +205,7 @@ public function getResourceOwnerId()
      */
     public function getResourceOwnerType()
     {
-        return $this->checker->getOwnerType();
+        return $this->checker->getAccessToken()->getSession()->getOwnerType();
     }
 
     /**
@@ -214,7 +214,7 @@ public function getResourceOwnerType()
      */
     public function getClientId()
     {
-        return $this->checker->getClientId();
+        return $this->checker->getAccessToken()->getSession()->getClient()->getId();
     }
 
     /**

tests/unit/LucaDegasperi/OAuth2Server/AuthorizerSpec.php

@@ -3,6 +3,9 @@
 namespace unit\LucaDegasperi\OAuth2Server;
 
 use League\OAuth2\Server\AuthorizationServer;
+use League\OAuth2\Server\Entity\AccessTokenEntity;
+use League\OAuth2\Server\Entity\ClientEntity;
+use League\OAuth2\Server\Entity\SessionEntity;
 use League\OAuth2\Server\Grant\AuthCodeGrant;
 use League\OAuth2\Server\ResourceServer;
 use League\OAuth2\Server\TokenType\TokenTypeInterface;
@@ -47,36 +50,46 @@ function it_issues_an_auth_code(AuthorizationServer $issuer, AuthCodeGrant $auth
         $this->issueAuthCode('user', '1', ['foo' => 'bar'])->shouldReturn('baz');
     }
 
-    function it_returns_the_current_scopes(ResourceServer $checker)
+    function it_returns_the_current_scopes(ResourceServer $checker, AccessTokenEntity $accessTokenEntity)
     {
-        $checker->getScopes()->willReturn(['foo', 'bar'])->shouldBeCalled();
+        $accessTokenEntity->getScopes()->willReturn(['foo','bar']);
+        $checker->getAccessToken()->willReturn($accessTokenEntity)->shouldBeCalled();
         $this->getScopes()->shouldReturn(['foo', 'bar']);
     }
 
-    function it_checks_if_a_scope_is_included_into_the_current_ones(ResourceServer $checker)
+    function it_checks_if_a_scope_is_included_into_the_current_ones(ResourceServer $checker, AccessTokenEntity $accessTokenEntity)
     {
-        $checker->hasScope('foo')->willReturn(true)->shouldBeCalled();
+        $accessTokenEntity->hasScope('foo')->willReturn(true)->shouldBeCalled();
+        $checker->getAccessToken()->willReturn($accessTokenEntity)->shouldBeCalled();
         $this->hasScope('foo')->shouldReturn(true);
 
-        $checker->hasScope(['foo', 'bar'])->willReturn(false)->shouldBeCalled();
+        $accessTokenEntity->hasScope(['foo', 'bar'])->willReturn(false)->shouldBecalled();
+        $checker->getAccessToken()->willReturn($accessTokenEntity)->shouldBeCalled();
         $this->hasScope(['foo', 'bar'])->shouldReturn(false);
     }
 
-    function it_returns_the_resource_owner_id(ResourceServer $checker)
+    function it_returns_the_resource_owner_id(ResourceServer $checker, AccessTokenEntity $accessTokenEntity, SessionEntity $sessionEntity)
     {
-        $checker->getOwnerId()->willReturn('1')->shouldBeCalled();
+        $sessionEntity->getOwnerId()->willReturn('1')->shouldBeCalled();
+        $accessTokenEntity->getSession()->willReturn($sessionEntity)->shouldBeCalled();
+        $checker->getAccessToken()->willReturn($accessTokenEntity)->shouldBeCalled();
         $this->getResourceOwnerId()->shouldReturn('1');
     }
 
-    function it_returns_the_resource_owner_type(ResourceServer $checker)
+    function it_returns_the_resource_owner_type(ResourceServer $checker, AccessTokenEntity $accessTokenEntity, SessionEntity $sessionEntity)
     {
-        $checker->getOwnerType()->willReturn('user')->shouldBeCalled();
+        $sessionEntity->getOwnerType()->willReturn('user')->shouldBeCalled();
+        $accessTokenEntity->getSession()->willReturn($sessionEntity)->shouldBeCalled();
+        $checker->getAccessToken()->willReturn($accessTokenEntity)->shouldBeCalled();
         $this->getResourceOwnerType()->shouldReturn('user');
     }
 
-    function it_returns_the_client_id(ResourceServer $checker)
+    function it_returns_the_client_id(ResourceServer $checker, AccessTokenEntity $accessTokenEntity, SessionEntity $sessionEntity, ClientEntity $clientEntity)
     {
-        $checker->getClientId()->willReturn('1')->shouldBeCalled();
+        $clientEntity->getId()->willReturn('1')->shouldBeCalled();
+        $sessionEntity->getClient()->willReturn($clientEntity)->shouldBeCalled();
+        $accessTokenEntity->getSession()->willReturn($sessionEntity)->shouldBeCalled();
+        $checker->getAccessToken()->willReturn($accessTokenEntity)->shouldBeCalled();
         $this->getClientId()->shouldReturn('1');
     }