Add getter

zf-fr · Feb 13, 2014 · 7f4cf56 · 7f4cf56
1 parent fd1ca9c
commit 7f4cf56
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 8 deletions.
diff --git a/src/ZfrOAuth2/Server/AuthorizationServer.php b/src/ZfrOAuth2/Server/AuthorizationServer.php
@@ -67,10 +67,10 @@ public function __construct(ClientService $clientService, array $grants)
                 $grant->setAuthorizationServer($this);
             }
 
-            $this->grants[$grant::GRANT_TYPE] = $grant;
+            $this->grants[$grant->getType()] = $grant;
 
-            if (null !== $grant::GRANT_RESPONSE_TYPE) {
-                $this->responseTypes[$grant::GRANT_RESPONSE_TYPE] = $grant;
+            if ($responseType = $grant->getResponseType()) {
+                $this->responseTypes[$responseType] = $grant;
             }
         }
     }

diff --git a/src/ZfrOAuth2/Server/Grant/AbstractGrant.php b/src/ZfrOAuth2/Server/Grant/AbstractGrant.php
@@ -55,4 +55,20 @@ protected function populateToken(
 
         $token->setScopes($scopes ?: []);
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getType()
+    {
+        return static::GRANT_TYPE;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getResponseType()
+    {
+        return static::GRANT_RESPONSE_TYPE;
+    }
 }
diff --git a/src/ZfrOAuth2/Server/Grant/GrantInterface.php b/src/ZfrOAuth2/Server/Grant/GrantInterface.php
@@ -61,6 +61,20 @@ public function createAuthorizationResponse(Request $request, Client $client, To
      */
     public function createTokenResponse(Request $request, Client $client = null, TokenOwnerInterface $owner = null);
 
+    /**
+     * Get the grant type
+     *
+     * @return string
+     */
+    public function getType();
+
+    /**
+     * Get the grant response type
+     *
+     * @return string|null
+     */
+    public function getResponseType();
+
     /**
      * Does this authorization grant allow public clients?
      *

diff --git a/tests/ZfrOAuth2Test/Server/AuthorizationServerTest.php b/tests/ZfrOAuth2Test/Server/AuthorizationServerTest.php
@@ -34,7 +34,11 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase
     public function testCanCheckAndGetForGrants()
     {
         $clientService = $this->getMock('ZfrOAuth2\Server\Service\ClientService', [], [], '', false);
-        $grant         = $this->getMock('ZfrOAuth2\Server\Grant\PasswordGrant', [], [], '', false);
+        $grant         = new PasswordGrant(
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false),
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false),
+            function() {}
+        );
 
         $authorizationServer = new AuthorizationServer($clientService, [$grant]);
 
@@ -50,7 +54,11 @@ public function testCanCheckAndGetForGrants()
     public function testCanCheckAndGetForResponseType()
     {
         $clientService = $this->getMock('ZfrOAuth2\Server\Service\ClientService', [], [], '', false);
-        $grant         = $this->getMock('ZfrOAuth2\Server\Grant\AuthorizationGrant', [], [], '', false);
+        $grant         = new AuthorizationGrant(
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false),
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false),
+            $this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false)
+        );
 
         $authorizationServer = new AuthorizationServer($clientService, [$grant]);
 
@@ -98,11 +106,10 @@ public function testThrowExceptionIfPrivateClientDoesNotHaveSecret()
         $request = new HttpRequest();
         $request->getPost()->set('grant_type', 'client_credentials');
 
-        $grantType = $this->getMock('ZfrOAuth2\Server\Grant\ClientCredentialsGrant', [], [], '', false);
-        $grantType->expects($this->once())->method('allowPublicClients')->will($this->returnValue(false));
+        $grant = new ClientCredentialsGrant($this->getMock('ZfrOAuth2\Server\Service\TokenService', [], [], '', false));
 
         $clientService       = $this->getMock('ZfrOAuth2\Server\Service\ClientService', [], [], '', false);
-        $authorizationServer = new AuthorizationServer($clientService, [$grantType]);
+        $authorizationServer = new AuthorizationServer($clientService, [$grant]);
 
         $response = $authorizationServer->handleTokenRequest($request);
         $body     = json_decode($response->getBody(), true);