Merge branch 'V5-WIP' into move_identifier_generation

2025-05-31 14:12:07 +05:30 · 2016-02-18 18:14:59 +01:00
parent 5d6634aa9f 13baa0bb26
commit a644eacea7
15 changed files with 628 additions and 101 deletions
--- a/tests/Grant/AbstractGrantTest.php
+++ b/tests/Grant/AbstractGrantTest.php
@@ -10,33 +10,56 @@ use League\OAuth2\Server\Entities\Interfaces\AuthCodeEntityInterface;
 use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface;
 use League\OAuth2\Server\Entities\ScopeEntity;
 use League\OAuth2\Server\Grant\AbstractGrant;
-use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
+use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
 use Zend\Diactoros\ServerRequest;

 class AbstractGrantTest extends \PHPUnit_Framework_TestCase
 {
    public function testGetSet()
    {
-        $clientRepositoryMock = $this->getMock(ClientRepositoryInterface::class);
-        $accessTokenRepositoryMock = $this->getMock(AccessTokenRepositoryInterface::class);
-        $scopeRepositoryMock = $this->getMock(ScopeRepositoryInterface::class);
+        /** @var AbstractGrant $grantMock */
+        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
+        $grantMock->setPathToPrivateKey('./private.key');
+        $grantMock->setPathToPublicKey('./public.key');
+        $grantMock->setEmitter(new Emitter());
+    }
+
+    public function testValidateClientPublic()
+    {
+        $client = new ClientEntity();
+
+        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
+        $clientRepositoryMock->method('getClientEntity')->willReturn($client);

        /** @var AbstractGrant $grantMock */
        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
        $grantMock->setClientRepository($clientRepositoryMock);
-        $grantMock->setAccessTokenRepository($accessTokenRepositoryMock);
-        $grantMock->setScopeRepository($scopeRepositoryMock);
-        $grantMock->setPathToPrivateKey('./private.key');
-        $grantMock->setPathToPublicKey('./public.key');
-        $grantMock->setEmitter(new Emitter());
-        $grantMock->setRefreshTokenTTL(new \DateInterval('PT1H'));
+
+        $abstractGrantReflection = new \ReflectionClass($grantMock);
+
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody(
+            [
+                'client_id' => 'foo',
+            ]
+        );
+        $validateClientMethod = $abstractGrantReflection->getMethod('validateClient');
+        $validateClientMethod->setAccessible(true);
+
+        $result = $validateClientMethod->invoke($grantMock, $serverRequest, true, true);
+        $this->assertEquals($client, $result);
    }

-    public function testValidateClient()
+    public function testValidateClientConfidential()
    {
        $client = new ClientEntity();
+        $client->setSecret('bar');
+        $client->setRedirectUri('http://foo/bar');
+
        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
        $clientRepositoryMock->method('getClientEntity')->willReturn($client);

@@ -89,6 +112,7 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase
    public function testValidateClientMissingClientSecret()
    {
        $client = new ClientEntity();
+        $client->setSecret('bar');
        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
        $clientRepositoryMock->method('getClientEntity')->willReturn($client);

@@ -112,9 +136,10 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase
    /**
     * @expectedException \League\OAuth2\Server\Exception\OAuthServerException
     */
-    public function testValidateClientMissingRedirectUri()
+    public function testValidateClientInvalidClientSecret()
    {
        $client = new ClientEntity();
+        $client->setSecret('bar');
        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
        $clientRepositoryMock->method('getClientEntity')->willReturn($client);

@@ -124,6 +149,60 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase

        $abstractGrantReflection = new \ReflectionClass($grantMock);

+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody([
+            'client_id' => 'foo',
+            'client_secret' => 'foo',
+        ]);
+
+        $validateClientMethod = $abstractGrantReflection->getMethod('validateClient');
+        $validateClientMethod->setAccessible(true);
+
+        $validateClientMethod->invoke($grantMock, $serverRequest, true, true);
+    }
+
+    /**
+     * @expectedException \League\OAuth2\Server\Exception\OAuthServerException
+     */
+    public function testValidateClientInvalidRedirectUri()
+    {
+        $client = new ClientEntity();
+        $client->setRedirectUri('http://foo/bar');
+        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
+        $clientRepositoryMock->method('getClientEntity')->willReturn($client);
+
+        /** @var AbstractGrant $grantMock */
+        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
+        $grantMock->setClientRepository($clientRepositoryMock);
+
+        $abstractGrantReflection = new \ReflectionClass($grantMock);
+
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody([
+            'client_id'     => 'foo',
+            'redirect_uri'  =>  'http://bar/foo'
+        ]);
+
+        $validateClientMethod = $abstractGrantReflection->getMethod('validateClient');
+        $validateClientMethod->setAccessible(true);
+
+        $validateClientMethod->invoke($grantMock, $serverRequest, true, true);
+    }
+
+    /**
+     * @expectedException \League\OAuth2\Server\Exception\OAuthServerException
+     */
+    public function testValidateClientBadClient()
+    {
+        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
+        $clientRepositoryMock->method('getClientEntity')->willReturn(null);
+
+        /** @var AbstractGrant $grantMock */
+        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
+        $grantMock->setClientRepository($clientRepositoryMock);
+
+        $abstractGrantReflection = new \ReflectionClass($grantMock);
+
        $serverRequest = new ServerRequest();
        $serverRequest = $serverRequest->withParsedBody([
            'client_id'     => 'foo',
@@ -133,7 +212,7 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase
        $validateClientMethod = $abstractGrantReflection->getMethod('validateClient');
        $validateClientMethod->setAccessible(true);

-        $validateClientMethod->invoke($grantMock, $serverRequest, true, true);
+        $validateClientMethod->invoke($grantMock, $serverRequest, true);
    }

    public function testCanRespondToRequest()
@@ -151,9 +230,12 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase

    public function testIssueRefreshToken()
    {
+        $refreshTokenRepoMock = $this->getMock(RefreshTokenRepositoryInterface::class);
+
        /** @var AbstractGrant $grantMock */
        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
        $grantMock->setRefreshTokenTTL(new \DateInterval('PT1M'));
+        $grantMock->setRefreshTokenRepository($refreshTokenRepoMock);

        $abstractGrantReflection = new \ReflectionClass($grantMock);
        $issueRefreshTokenMethod = $abstractGrantReflection->getMethod('issueRefreshToken');
@@ -169,8 +251,11 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase

    public function testIssueAccessToken()
    {
+        $accessTokenRepoMock = $this->getMock(AccessTokenRepositoryInterface::class);
+
        /** @var AbstractGrant $grantMock */
        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
+        $grantMock->setAccessTokenRepository($accessTokenRepoMock);

        $abstractGrantReflection = new \ReflectionClass($grantMock);
        $issueAccessTokenMethod = $abstractGrantReflection->getMethod('issueAccessToken');
@@ -190,8 +275,11 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase

    public function testIssueAuthCode()
    {
+        $authCodeRepoMock = $this->getMock(AuthCodeRepositoryInterface::class);
+
        /** @var AbstractGrant $grantMock */
        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
+        $grantMock->setAuthCodeRepository($authCodeRepoMock);

        $abstractGrantReflection = new \ReflectionClass($grantMock);
        $issueAuthCodeMethod = $abstractGrantReflection->getMethod('issueAuthCode');
@@ -286,4 +374,15 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase

        $grantMock->validateScopes($serverRequest, new ClientEntity());
    }
+
+    public function testGenerateUniqueIdentifier()
+    {
+        $grantMock = $this->getMockForAbstractClass(AbstractGrant::class);
+
+        $abstractGrantReflection = new \ReflectionClass($grantMock);
+        $method = $abstractGrantReflection->getMethod('generateUniqueIdentifier');
+        $method->setAccessible(true);
+
+        $this->assertTrue(is_string($method->invoke($grantMock)));
+    }
 }
--- a/tests/Grant/ClientCredentialsGrantTest.php
+++ b/tests/Grant/ClientCredentialsGrantTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace LeagueTests\Grant;
+
+use League\OAuth2\Server\Entities\ClientEntity;
+use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
+use League\OAuth2\Server\Grant\ClientCredentialsGrant;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use LeagueTests\Stubs\StubResponseType;
+use Zend\Diactoros\ServerRequest;
+
+class ClientCredentialsGrantTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetIdentifier()
+    {
+        $grant = new ClientCredentialsGrant();
+        $this->assertEquals('client_credentials', $grant->getIdentifier());
+    }
+
+    public function testRespondToRequest()
+    {
+        $client = new ClientEntity();
+        $client->setSecret('bar');
+        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
+        $clientRepositoryMock->method('getClientEntity')->willReturn($client);
+
+        $accessTokenRepositoryMock = $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock();
+        $accessTokenRepositoryMock->method('persistNewAccessToken')->willReturnSelf();
+
+        $grant = new ClientCredentialsGrant();
+        $grant->setClientRepository($clientRepositoryMock);
+        $grant->setAccessTokenRepository($accessTokenRepositoryMock);
+
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody(
+            [
+                'client_id'     => 'foo',
+                'client_secret' => 'bar',
+            ]
+        );
+
+        $responseType = new StubResponseType();
+        $grant->respondToRequest($serverRequest, $responseType, new \DateInterval('PT5M'));
+        
+        $this->assertTrue($responseType->getAccessToken() instanceof AccessTokenEntityInterface);
+    }
+}
--- a/tests/Grant/PasswordGrantTest.php
+++ b/tests/Grant/PasswordGrantTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace LeagueTests\Grant;
+
+use League\OAuth2\Server\Entities\ClientEntity;
+use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
+use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface;
+use League\OAuth2\Server\Grant\PasswordGrant;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use LeagueTests\Stubs\StubResponseType;
+use LeagueTests\Stubs\UserEntity;
+use Zend\Diactoros\ServerRequest;
+
+class PasswordGrantTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetIdentifier()
+    {
+        $userRepositoryMock = $this->getMock(UserRepositoryInterface::class);
+        $refreshTokenRepositoryMock = $this->getMock(RefreshTokenRepositoryInterface::class);
+
+        $grant = new PasswordGrant($userRepositoryMock, $refreshTokenRepositoryMock);
+        $this->assertEquals('password', $grant->getIdentifier());
+    }
+
+    public function testRespondToRequest()
+    {
+        $client = new ClientEntity();
+        $client->setSecret('bar');
+        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
+        $clientRepositoryMock->method('getClientEntity')->willReturn($client);
+
+        $accessTokenRepositoryMock = $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock();
+        $accessTokenRepositoryMock->method('persistNewAccessToken')->willReturnSelf();
+
+        $userRepositoryMock = $this->getMockBuilder(UserRepositoryInterface::class)->getMock();
+        $userEntity = new UserEntity();
+        $userRepositoryMock->method('getUserEntityByUserCredentials')->willReturn($userEntity);
+
+        $refreshTokenRepositoryMock = $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock();
+        $refreshTokenRepositoryMock->method('persistNewRefreshToken')->willReturnSelf();
+
+        $grant = new PasswordGrant($userRepositoryMock, $refreshTokenRepositoryMock);
+        $grant->setClientRepository($clientRepositoryMock);
+        $grant->setAccessTokenRepository($accessTokenRepositoryMock);
+
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody(
+            [
+                'client_id'     => 'foo',
+                'client_secret' => 'bar',
+                'username'      => 'foo',
+                'password'      => 'bar',
+            ]
+        );
+
+        $responseType = new StubResponseType();
+        $grant->respondToRequest($serverRequest, $responseType, new \DateInterval('PT5M'));
+
+        $this->assertTrue($responseType->getAccessToken() instanceof AccessTokenEntityInterface);
+        $this->assertTrue($responseType->getRefreshToken() instanceof RefreshTokenEntityInterface);
+    }
+}
--- a/tests/Grant/RefreshTokenGrantTest.php
+++ b/tests/Grant/RefreshTokenGrantTest.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace LeagueTests\Grant;
+
+use League\OAuth2\Server\Entities\ClientEntity;
+use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
+use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface;
+use League\OAuth2\Server\Grant\PasswordGrant;
+use League\OAuth2\Server\Grant\RefreshTokenGrant;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\UserRepositoryInterface;
+use League\OAuth2\Server\Utils\KeyCrypt;
+use LeagueTests\Stubs\StubResponseType;
+use LeagueTests\Stubs\UserEntity;
+use OAuth2ServerExamples\Repositories\RefreshTokenRepository;
+use Zend\Diactoros\ServerRequest;
+
+class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetIdentifier()
+    {
+        $refreshTokenRepositoryMock = $this->getMock(RefreshTokenRepositoryInterface::class);
+
+        $grant = new RefreshTokenGrant($refreshTokenRepositoryMock);
+        $this->assertEquals('refresh_token', $grant->getIdentifier());
+    }
+
+    public function testRespondToRequest()
+    {
+        $client = new ClientEntity();
+        $client->setIdentifier('foo');
+        $client->setSecret('bar');
+        $clientRepositoryMock = $this->getMockBuilder(ClientRepositoryInterface::class)->getMock();
+        $clientRepositoryMock->method('getClientEntity')->willReturn($client);
+
+        $accessTokenRepositoryMock = $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock();
+        $accessTokenRepositoryMock->method('persistNewAccessToken')->willReturnSelf();
+
+        $userRepositoryMock = $this->getMockBuilder(UserRepositoryInterface::class)->getMock();
+        $userEntity = new UserEntity();
+        $userRepositoryMock->method('getUserEntityByUserCredentials')->willReturn($userEntity);
+
+        $refreshTokenRepositoryMock = $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock();
+        $refreshTokenRepositoryMock->method('persistNewRefreshToken')->willReturnSelf();
+
+        $grant = new RefreshTokenGrant($refreshTokenRepositoryMock);
+        $grant->setClientRepository($clientRepositoryMock);
+        $grant->setAccessTokenRepository($accessTokenRepositoryMock);
+        $grant->setPathToPublicKey('file://'.__DIR__.'/../Utils/public.key');
+        $grant->setPathToPrivateKey('file://'.__DIR__.'/../Utils/private.key');
+
+        $oldRefreshToken = KeyCrypt::encrypt(
+            json_encode(
+                [
+                    'client_id'        => 'foo',
+                    'refresh_token_id' => 'zyxwvu',
+                    'access_token_id'  => 'abcdef',
+                    'scopes'           => ['foo'],
+                    'user_id'          => 123,
+                    'expire_time'      => time() + 3600,
+                ]
+            ),
+            'file://'.__DIR__.'/../Utils/private.key'
+        );
+
+        $serverRequest = new ServerRequest();
+        $serverRequest = $serverRequest->withParsedBody(
+            [
+                'client_id'     => 'foo',
+                'client_secret' => 'bar',
+                'refresh_token' => $oldRefreshToken,
+            ]
+        );
+
+        $responseType = new StubResponseType();
+        $grant->respondToRequest($serverRequest, $responseType, new \DateInterval('PT5M'));
+
+        $this->assertTrue($responseType->getAccessToken() instanceof AccessTokenEntityInterface);
+        $this->assertTrue($responseType->getRefreshToken() instanceof RefreshTokenEntityInterface);
+    }
+}
--- a/tests/ServerTest.php
+++ b/tests/ServerTest.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace LeagueTests;
+
+use League\OAuth2\Server\Entities\ClientEntity;
+use League\OAuth2\Server\Grant\ClientCredentialsGrant;
+use League\OAuth2\Server\Server;
+use LeagueTests\Stubs\StubResponseType;
+use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
+use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
+use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
+use Psr\Http\Message\ResponseInterface;
+
+class ServerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testRespondToRequestInvalidGrantType()
+    {
+        $server = new Server(
+            $this->getMock(ClientRepositoryInterface::class),
+            $this->getMock(AccessTokenRepositoryInterface::class),
+            $this->getMock(ScopeRepositoryInterface::class),
+            '',
+            '',
+            new StubResponseType()
+        );
+
+        $server->enableGrantType(new ClientCredentialsGrant(), new \DateInterval('PT1M'));
+
+        $response = $server->respondToRequest();
+        $this->assertTrue($response instanceof ResponseInterface);
+        $this->assertEquals(400, $response->getStatusCode());
+    }
+
+    public function testRespondToRequest()
+    {
+        $clientRepository = $this->getMock(ClientRepositoryInterface::class);
+        $clientRepository->method('getClientEntity')->willReturn(new ClientEntity());
+
+        $server = new Server(
+            $clientRepository,
+            $this->getMock(AccessTokenRepositoryInterface::class),
+            $this->getMock(ScopeRepositoryInterface::class),
+            '',
+            '',
+            new StubResponseType()
+        );
+
+        $server->enableGrantType(new ClientCredentialsGrant(), new \DateInterval('PT1M'));
+
+        $_POST['grant_type'] = 'client_credentials';
+        $_POST['client_id'] = 'foo';
+        $_POST['client_secret'] = 'bar';
+        $response = $server->respondToRequest();
+        $this->assertEquals(200, $response->getStatusCode());
+    }
+}
--- a/tests/Stubs/StubResponseType.php
+++ b/tests/Stubs/StubResponseType.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace LeagueTests\Stubs;
+
+use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
+use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface;
+use League\OAuth2\Server\ResponseTypes\AbstractResponseType;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Zend\Diactoros\Response;
+
+class StubResponseType extends AbstractResponseType
+{
+    public function __construct() {}
+
+    public function getAccessToken()
+    {
+        return $this->accessToken;
+    }
+
+    public function getRefreshToken()
+    {
+        return $this->refreshToken;
+    }
+
+    /**
+     * @param \League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface $accessToken
+     */
+    public function setAccessToken(AccessTokenEntityInterface $accessToken)
+    {
+        $this->accessToken = $accessToken;
+    }
+
+    /**
+     * @param \League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface $refreshToken
+     */
+    public function setRefreshToken(RefreshTokenEntityInterface $refreshToken)
+    {
+        $this->refreshToken = $refreshToken;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     *
+     * @return ServerRequestInterface
+     */
+    public function determineAccessTokenInHeader(ServerRequestInterface $request)
+    {
+        // TODO: Implement determineAccessTokenInHeader() method.
+    }
+
+    /**
+     * @param ResponseInterface $response
+     *
+     * @return ResponseInterface
+     */
+    public function generateHttpResponse(ResponseInterface $response)
+    {
+        return new Response();
+    }
+}
--- a/tests/Stubs/UserEntity.php
+++ b/tests/Stubs/UserEntity.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace LeagueTests\Stubs;
+
+use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface;
+
+class UserEntity implements UserEntityInterface
+{
+    public function getIdentifier()
+    {
+        return 123;
+    }
+}