mirror of
				https://github.com/elyby/oauth2-server.git
				synced 2025-05-31 14:12:07 +05:30 
			
		
		
		
	Fixed broken tests
This commit is contained in:
		| @@ -33,10 +33,9 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock(), | ||||
|             $this->getMockBuilder(ScopeRepositoryInterface::class)->getMock(), | ||||
|             'file://' . __DIR__ . '/Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/Stubs/public.key', | ||||
|             base64_encode(random_bytes(36)), | ||||
|             new StubResponseType() | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $server->enableGrantType(new ClientCredentialsGrant(), new \DateInterval('PT1M')); | ||||
|  | ||||
| @@ -64,10 +63,9 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             $accessTokenRepositoryMock, | ||||
|             $scopeRepositoryMock, | ||||
|             'file://' . __DIR__ . '/Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/Stubs/public.key', | ||||
|             base64_encode(random_bytes(36)), | ||||
|             new StubResponseType() | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $server->enableGrantType(new ClientCredentialsGrant(), new \DateInterval('PT1M')); | ||||
|  | ||||
| @@ -89,7 +87,6 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             'file://' . __DIR__ . '/Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/Stubs/public.key' | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $abstractGrantReflection = new \ReflectionClass($server); | ||||
|         $method = $abstractGrantReflection->getMethod('getResponseType'); | ||||
| @@ -109,7 +106,6 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             'file://' . __DIR__ . '/Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/Stubs/public.key' | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $authCodeRepository = $this->getMockBuilder(AuthCodeRepositoryInterface::class)->getMock(); | ||||
|         $authCodeRepository->method('getNewAuthCode')->willReturn(new AuthCodeEntity()); | ||||
| @@ -120,9 +116,6 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|  | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/Stubs/public.key')); | ||||
|  | ||||
|         $server->enableGrantType($grant); | ||||
|  | ||||
|         $authRequest = new AuthorizationRequest(); | ||||
| @@ -156,7 +149,6 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             'file://' . __DIR__ . '/Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/Stubs/public.key' | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|         $server->enableGrantType($grant); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
| @@ -189,7 +181,6 @@ class AuthorizationServerTest extends \PHPUnit_Framework_TestCase | ||||
|             'file://' . __DIR__ . '/Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/Stubs/public.key' | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
|   | ||||
| @@ -8,7 +8,7 @@ use LeagueTests\Stubs\CryptTraitStub; | ||||
| class CryptTraitTest extends \PHPUnit_Framework_TestCase | ||||
| { | ||||
|     /** | ||||
|      * CryptTrait stub | ||||
|      * @var \LeagueTests\Stubs\CryptTraitStub | ||||
|      */ | ||||
|     protected $cryptStub; | ||||
|  | ||||
| @@ -26,30 +26,4 @@ class CryptTraitTest extends \PHPUnit_Framework_TestCase | ||||
|         $this->assertNotEquals($payload, $encrypted); | ||||
|         $this->assertEquals($payload, $plainText); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @expectedException \LogicException | ||||
|      */ | ||||
|     public function testBadPrivateKey() | ||||
|     { | ||||
|         $this->cryptStub->setPrivateKey(new CryptKey(__DIR__ . '/Stubs/public.key')); | ||||
|         $this->cryptStub->doEncrypt(''); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @expectedException \LogicException | ||||
|      */ | ||||
|     public function testBadPublicKey() | ||||
|     { | ||||
|         $this->cryptStub->setPublicKey(new CryptKey(__DIR__ . '/Stubs/private.key')); | ||||
|         $this->cryptStub->doDecrypt(''); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * @expectedException \LogicException | ||||
|      */ | ||||
|     public function testNonExistentKey() | ||||
|     { | ||||
|         new CryptKey('foo/bar'); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -27,8 +27,6 @@ class AbstractGrantTest extends \PHPUnit_Framework_TestCase | ||||
|     { | ||||
|         /** @var AbstractGrant $grantMock */ | ||||
|         $grantMock = $this->getMockForAbstractClass(AbstractGrant::class); | ||||
|         $grantMock->setPrivateKey(new CryptKey(__DIR__ . '/../Stubs/private.key')); | ||||
|         $grantMock->setPublicKey(new CryptKey(__DIR__ . '/../Stubs/public.key')); | ||||
|         $grantMock->setEmitter(new Emitter()); | ||||
|     } | ||||
|  | ||||
|   | ||||
| @@ -510,9 +510,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock(), | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|  | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $this->assertTrue($grant->completeAuthorizationRequest($authRequest) instanceof RedirectResponse); | ||||
|     } | ||||
| @@ -537,9 +535,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock(), | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|  | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $grant->completeAuthorizationRequest($authRequest); | ||||
|     } | ||||
| @@ -574,8 +570,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -643,8 +638,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -715,8 +709,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -773,7 +766,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -820,7 +813,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -873,8 +866,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -919,8 +911,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -983,8 +974,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1044,8 +1034,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1105,8 +1094,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1164,8 +1152,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1237,8 +1224,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1310,8 +1296,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1370,9 +1355,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock(), | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|  | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $this->assertTrue($grant->completeAuthorizationRequest($authRequest) instanceof RedirectResponse); | ||||
|     } | ||||
| @@ -1398,9 +1381,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock(), | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|  | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $this->assertTrue($grant->completeAuthorizationRequest($authRequest) instanceof RedirectResponse); | ||||
|     } | ||||
| @@ -1427,9 +1408,6 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|             new \DateInterval('PT10M') | ||||
|         ); | ||||
|  | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|  | ||||
|         $this->assertTrue($grant->completeAuthorizationRequest($authRequest) instanceof RedirectResponse); | ||||
|     } | ||||
|  | ||||
| @@ -1464,8 +1442,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1536,8 +1513,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
| @@ -1608,8 +1584,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setRefreshTokenRepository($refreshTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|  | ||||
|         $request = new ServerRequest( | ||||
|             [], | ||||
|   | ||||
| @@ -283,7 +283,6 @@ class ImplicitGrantTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $grant = new ImplicitGrant(new \DateInterval('PT10M')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|  | ||||
|         $this->assertTrue($grant->completeAuthorizationRequest($authRequest) instanceof RedirectResponse); | ||||
| @@ -307,7 +306,6 @@ class ImplicitGrantTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $grant = new ImplicitGrant(new \DateInterval('PT10M')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|  | ||||
|         $grant->completeAuthorizationRequest($authRequest); | ||||
| @@ -329,7 +327,6 @@ class ImplicitGrantTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $grant = new ImplicitGrant(new \DateInterval('PT10M')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|  | ||||
|         $this->assertTrue($grant->completeAuthorizationRequest($authRequest) instanceof RedirectResponse); | ||||
| @@ -354,7 +351,6 @@ class ImplicitGrantTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $grant = new ImplicitGrant(new \DateInterval('PT10M')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|  | ||||
|         $grant->completeAuthorizationRequest($authRequest); | ||||
| @@ -379,7 +375,6 @@ class ImplicitGrantTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $grant = new ImplicitGrant(new \DateInterval('PT10M')); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|  | ||||
|         $grant->completeAuthorizationRequest($authRequest); | ||||
|   | ||||
| @@ -21,7 +21,7 @@ use Zend\Diactoros\ServerRequest; | ||||
| class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
| { | ||||
|     /** | ||||
|      * CryptTrait stub | ||||
|      * @var CryptTraitStub | ||||
|      */ | ||||
|     protected $cryptStub; | ||||
|  | ||||
| @@ -65,7 +65,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = $this->cryptStub->doEncrypt( | ||||
| @@ -121,7 +121,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = $this->cryptStub->doEncrypt( | ||||
| @@ -180,7 +180,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setScopeRepository($scopeRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = $this->cryptStub->doEncrypt( | ||||
| @@ -227,7 +227,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant = new RefreshTokenGrant($refreshTokenRepositoryMock); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $serverRequest = new ServerRequest(); | ||||
| @@ -259,7 +259,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant = new RefreshTokenGrant($refreshTokenRepositoryMock); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = 'foobar'; | ||||
| @@ -291,14 +291,13 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $accessTokenRepositoryMock = $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock(); | ||||
|         $accessTokenRepositoryMock->method('persistNewAccessToken')->willReturnSelf(); | ||||
|  | ||||
|  | ||||
|         $refreshTokenRepositoryMock = $this->getMockBuilder(RefreshTokenRepositoryInterface::class)->getMock(); | ||||
|         $refreshTokenRepositoryMock->method('persistNewRefreshToken')->willReturnSelf(); | ||||
|  | ||||
|         $grant = new RefreshTokenGrant($refreshTokenRepositoryMock); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = $this->cryptStub->doEncrypt( | ||||
| @@ -344,7 +343,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant = new RefreshTokenGrant($refreshTokenRepositoryMock); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = $this->cryptStub->doEncrypt( | ||||
| @@ -391,7 +390,7 @@ class RefreshTokenGrantTest extends \PHPUnit_Framework_TestCase | ||||
|         $grant = new RefreshTokenGrant($refreshTokenRepositoryMock); | ||||
|         $grant->setClientRepository($clientRepositoryMock); | ||||
|         $grant->setAccessTokenRepository($accessTokenRepositoryMock); | ||||
|         $grant->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $grant->setEncryptionKey($this->cryptStub->getKey()); | ||||
|         $grant->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|  | ||||
|         $oldRefreshToken = $this->cryptStub->doEncrypt( | ||||
|   | ||||
| @@ -33,10 +33,9 @@ class AuthorizationServerMiddlewareTest extends \PHPUnit_Framework_TestCase | ||||
|             $accessRepositoryMock, | ||||
|             $scopeRepositoryMock, | ||||
|             'file://' . __DIR__ . '/../Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/../Stubs/public.key', | ||||
|             base64_encode(random_bytes(36)), | ||||
|             new StubResponseType() | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $server->enableGrantType(new ClientCredentialsGrant()); | ||||
|  | ||||
| @@ -67,10 +66,9 @@ class AuthorizationServerMiddlewareTest extends \PHPUnit_Framework_TestCase | ||||
|             $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock(), | ||||
|             $this->getMockBuilder(ScopeRepositoryInterface::class)->getMock(), | ||||
|             'file://' . __DIR__ . '/../Stubs/private.key', | ||||
|             'file://' . __DIR__ . '/../Stubs/public.key', | ||||
|             base64_encode(random_bytes(36)), | ||||
|             new StubResponseType() | ||||
|         ); | ||||
|         $server->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $server->enableGrantType(new ClientCredentialsGrant(), new \DateInterval('PT1M')); | ||||
|  | ||||
| @@ -99,7 +97,8 @@ class AuthorizationServerMiddlewareTest extends \PHPUnit_Framework_TestCase | ||||
|         $response = $exception->generateHttpResponse(new Response()); | ||||
|  | ||||
|         $this->assertEquals(302, $response->getStatusCode()); | ||||
|         $this->assertEquals('http://foo/bar?error=invalid_scope&message=The+requested+scope+is+invalid%2C+unknown%2C+or+malformed&hint=Check+the+%60test%60+scope', $response->getHeader('location')[0]); | ||||
|         $this->assertEquals('http://foo/bar?error=invalid_scope&message=The+requested+scope+is+invalid%2C+unknown%2C+or+malformed&hint=Check+the+%60test%60+scope', | ||||
|             $response->getHeader('location')[0]); | ||||
|     } | ||||
|  | ||||
|     public function testOAuthErrorResponseRedirectUriFragment() | ||||
| @@ -108,6 +107,7 @@ class AuthorizationServerMiddlewareTest extends \PHPUnit_Framework_TestCase | ||||
|         $response = $exception->generateHttpResponse(new Response(), true); | ||||
|  | ||||
|         $this->assertEquals(302, $response->getStatusCode()); | ||||
|         $this->assertEquals('http://foo/bar#error=invalid_scope&message=The+requested+scope+is+invalid%2C+unknown%2C+or+malformed&hint=Check+the+%60test%60+scope', $response->getHeader('location')[0]); | ||||
|         $this->assertEquals('http://foo/bar#error=invalid_scope&message=The+requested+scope+is+invalid%2C+unknown%2C+or+malformed&hint=Check+the+%60test%60+scope', | ||||
|             $response->getHeader('location')[0]); | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -23,7 +23,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $responseType = new BearerTokenResponse($accessTokenRepositoryMock); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $client = new ClientEntity(); | ||||
|         $client->setIdentifier('clientName'); | ||||
| @@ -67,7 +67,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $responseType = new BearerTokenResponseWithParams($accessTokenRepositoryMock); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $client = new ClientEntity(); | ||||
|         $client->setIdentifier('clientName'); | ||||
| @@ -115,7 +115,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $responseType = new BearerTokenResponse($accessTokenRepositoryMock); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $client = new ClientEntity(); | ||||
|         $client->setIdentifier('clientName'); | ||||
| @@ -141,7 +141,6 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|         $accessTokenRepositoryMock->method('isAccessTokenRevoked')->willReturn(false); | ||||
|  | ||||
|         $authorizationValidator = new BearerTokenValidator($accessTokenRepositoryMock); | ||||
|         $authorizationValidator->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $authorizationValidator->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|  | ||||
|         $request = new ServerRequest(); | ||||
| @@ -162,7 +161,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $responseType = new BearerTokenResponse($accessTokenRepositoryMock); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $client = new ClientEntity(); | ||||
|         $client->setIdentifier('clientName'); | ||||
| @@ -185,7 +184,6 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|         $json = json_decode((string) $response->getBody()); | ||||
|  | ||||
|         $authorizationValidator = new BearerTokenValidator($accessTokenRepositoryMock); | ||||
|         $authorizationValidator->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $authorizationValidator->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|  | ||||
|         $request = new ServerRequest(); | ||||
| @@ -205,7 +203,7 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|     { | ||||
|         $responseType = new BearerTokenResponse(); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $client = new ClientEntity(); | ||||
|         $client->setIdentifier('clientName'); | ||||
| @@ -231,7 +229,6 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|         $accessTokenRepositoryMock->method('isAccessTokenRevoked')->willReturn(true); | ||||
|  | ||||
|         $authorizationValidator = new BearerTokenValidator($accessTokenRepositoryMock); | ||||
|         $authorizationValidator->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $authorizationValidator->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|  | ||||
|         $request = new ServerRequest(); | ||||
| @@ -253,12 +250,11 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $responseType = new BearerTokenResponse($accessTokenRepositoryMock); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $accessTokenRepositoryMock = $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock(); | ||||
|  | ||||
|         $authorizationValidator = new BearerTokenValidator($accessTokenRepositoryMock); | ||||
|         $authorizationValidator->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $authorizationValidator->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|  | ||||
|         $request = new ServerRequest(); | ||||
| @@ -280,12 +276,11 @@ class BearerResponseTypeTest extends \PHPUnit_Framework_TestCase | ||||
|  | ||||
|         $responseType = new BearerTokenResponse($accessTokenRepositoryMock); | ||||
|         $responseType->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $responseType->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|         $responseType->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|  | ||||
|         $accessTokenRepositoryMock = $this->getMockBuilder(AccessTokenRepositoryInterface::class)->getMock(); | ||||
|  | ||||
|         $authorizationValidator = new BearerTokenValidator($accessTokenRepositoryMock); | ||||
|         $authorizationValidator->setPrivateKey(new CryptKey('file://' . __DIR__ . '/../Stubs/private.key')); | ||||
|         $authorizationValidator->setPublicKey(new CryptKey('file://' . __DIR__ . '/../Stubs/public.key')); | ||||
|  | ||||
|         $request = new ServerRequest(); | ||||
|   | ||||
| @@ -11,8 +11,12 @@ class CryptTraitStub | ||||
|  | ||||
|     public function __construct() | ||||
|     { | ||||
|         $this->setPrivateKey(new CryptKey('file://' . __DIR__ . '/private.key')); | ||||
|         $this->setPublicKey(new CryptKey('file://' . __DIR__ . '/public.key')); | ||||
|         $this->setEncryptionKey(base64_encode(random_bytes(36))); | ||||
|     } | ||||
|  | ||||
|     public function getKey() | ||||
|     { | ||||
|         return $this->encryptionKey; | ||||
|     } | ||||
|  | ||||
|     public function doEncrypt($unencryptedData) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user