ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2025-01-03 10:41:51 +05:30
Code Issues Packages Projects Releases Wiki Activity

Applied fixes from StyleCI

Browse Source
This commit is contained in:
Alex Bilbie 2016-02-22 03:00:50 -05:00 committed by StyleCI Bot
parent e2794c47af
commit 997d390f3d
16 changed files with 55 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/public/auth_code.php
View File

@ -13,7 +13,7 @@ use Slim\App;
use Slim\Http\Request;
use Slim\Http\Response;
include __DIR__.'/../vendor/autoload.php';
include __DIR__ . '/../vendor/autoload.php';
// App
$app = new App([
@ -27,8 +27,8 @@ $app = new App([
$refreshTokenRepository = new RefreshTokenRepository();
$authCodeRepository = new AuthCodeRepository();
$privateKeyPath = 'file://'.__DIR__.'/../private.key';
$publicKeyPath = 'file://'.__DIR__.'/../public.key';
$privateKeyPath = 'file://' . __DIR__ . '/../private.key';
$publicKeyPath = 'file://' . __DIR__ . '/../public.key';
// Setup the authorization server
$server = new Server(

6
examples/public/client_credentials.php
View File

@ -10,7 +10,7 @@ use Slim\App;
use Slim\Http\Request;
use Slim\Http\Response;
include __DIR__.'/../vendor/autoload.php';
include __DIR__ . '/../vendor/autoload.php';
// App
$app = new App([
@ -21,8 +21,8 @@ $app = new App([
$scopeRepository = new ScopeRepository();
$accessTokenRepository = new AccessTokenRepository();
$privateKeyPath = 'file://'.__DIR__.'/../private.key';
$publicKeyPath = 'file://'.__DIR__.'/../public.key';
$privateKeyPath = 'file://' . __DIR__ . '/../private.key';
$publicKeyPath = 'file://' . __DIR__ . '/../public.key';
// Setup the authorization server
$server = new Server(

6
examples/public/middleware_authentication.php
View File

@ -11,7 +11,7 @@ use OAuth2ServerExamples\Repositories\ScopeRepository;
use OAuth2ServerExamples\Repositories\UserRepository;
use Slim\App;
include __DIR__.'/../vendor/autoload.php';
include __DIR__ . '/../vendor/autoload.php';
// App
$app = new App([
@ -27,8 +27,8 @@ $app = new App([
$userRepository = new UserRepository();
$refreshTokenRepository = new RefreshTokenRepository();
$privateKeyPath = 'file://'.__DIR__.'/../private.key';
$publicKeyPath = 'file://'.__DIR__.'/../public.key';
$privateKeyPath = 'file://' . __DIR__ . '/../private.key';
$publicKeyPath = 'file://' . __DIR__ . '/../public.key';
// Setup the authorization server
$server = new Server(

6
examples/public/password.php
View File

@ -12,7 +12,7 @@ use Slim\App;
use Slim\Http\Request;
use Slim\Http\Response;
include __DIR__.'/../vendor/autoload.php';
include __DIR__ . '/../vendor/autoload.php';
// App
$app = new App([
@ -25,8 +25,8 @@ $app = new App([
$userRepository = new UserRepository();
$refreshTokenRepository = new RefreshTokenRepository();
$privateKeyPath = 'file://'.__DIR__.'/../private.key';
$publicKeyPath = 'file://'.__DIR__.'/../public.key';
$privateKeyPath = 'file://' . __DIR__ . '/../private.key';
$publicKeyPath = 'file://' . __DIR__ . '/../public.key';
// Setup the authorization server
$server = new Server(

6
examples/public/protected_api.php
View File

@ -9,7 +9,7 @@ use Slim\App;
use Slim\Http\Request;
use Slim\Http\Response;
include __DIR__.'/../vendor/autoload.php';
include __DIR__ . '/../vendor/autoload.php';
// App
$app = new App([
@ -23,8 +23,8 @@ $app = new App([
$scopeRepository = new ScopeRepository();
$accessTokenRepository = new AccessTokenRepository();
$privateKeyPath = 'file://'.__DIR__.'/../private.key';
$publicKeyPath = 'file://'.__DIR__.'/../public.key';
$privateKeyPath = 'file://' . __DIR__ . '/../private.key';
$publicKeyPath = 'file://' . __DIR__ . '/../public.key';
// Setup the authorization server
$server = new Server(

6
examples/public/refresh_token.php
View File

@ -11,7 +11,7 @@ use Slim\App;
use Slim\Http\Request;
use Slim\Http\Response;
include __DIR__.'/../vendor/autoload.php';
include __DIR__ . '/../vendor/autoload.php';
// App
$app = new App([Server::class => function () {
@ -21,8 +21,8 @@ $app = new App([Server::class => function () {
$accessTokenRepository = new AccessTokenRepository();
$refreshTokenRepository = new RefreshTokenRepository();
$privateKeyPath = 'file://'.__DIR__.'/../private.key';
$publicKeyPath = 'file://'.__DIR__.'/../public.key';
$privateKeyPath = 'file://' . __DIR__ . '/../private.key';
$publicKeyPath = 'file://' . __DIR__ . '/../public.key';
// Setup the authorization server
$server = new Server(

2
src/Entities/Interfaces/AccessTokenEntityInterface.php
View File

@ -2,8 +2,6 @@
namespace League\OAuth2\Server\Entities\Interfaces;
use Lcobucci\JWT\Builder;
interface AccessTokenEntityInterface extends TokenInterface
{
/**

1
src/Exception/OAuthServerException.php
View File

@ -50,6 +50,7 @@ class OAuthServerException extends \Exception
/**
* Invalid grant type error.
*
* @return static
*/
public static function invalidGrantType()

1
src/Grant/AbstractGrant.php
View File

@ -16,7 +16,6 @@ use League\Event\Event;
use League\OAuth2\Server\Entities\AccessTokenEntity;
use League\OAuth2\Server\Entities\AuthCodeEntity;
use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface;
use League\OAuth2\Server\Entities\Interfaces\ScopeEntityInterface;
use League\OAuth2\Server\Entities\RefreshTokenEntity;
use League\OAuth2\Server\Entities\ScopeEntity;
use League\OAuth2\Server\Exception\OAuthServerException;

1
src/Grant/ImplicitGrant.php
View File

@ -2,7 +2,6 @@
namespace League\OAuth2\Server\Grant;
use DateInterval;
use League\Event\Event;
use League\OAuth2\Server\Entities\Interfaces\ClientEntityInterface;
use League\OAuth2\Server\Entities\Interfaces\UserEntityInterface;

8
src/Grant/RefreshTokenGrant.php
View File

@ -102,7 +102,7 @@ class RefreshTokenGrant extends AbstractGrant
try {
$refreshToken = KeyCrypt::decrypt($encryptedRefreshToken, $this->pathToPublicKey);
} catch (\LogicException $e) {
throw OAuthServerException::invalidRefreshToken('Cannot parse refresh token: '.$e->getMessage());
throw OAuthServerException::invalidRefreshToken('Cannot parse refresh token: ' . $e->getMessage());
}
$refreshTokenData = json_decode($refreshToken, true);
@ -110,9 +110,9 @@ class RefreshTokenGrant extends AbstractGrant
$this->getEmitter()->emit(new Event('refresh_token.client.failed', $request));
throw OAuthServerException::invalidRefreshToken(
'Token is not linked to client,'.
' got: '.$clientId.
' expected: '.$refreshTokenData['client_id']
'Token is not linked to client,' .
' got: ' . $clientId .
' expected: ' . $refreshTokenData['client_id']
);
}

2
src/ResponseTypes/BearerTokenResponse.php
View File

@ -10,9 +10,7 @@
*/
namespace League\OAuth2\Server\ResponseTypes;
use Lcobucci\JWT\Builder;
use Lcobucci\JWT\Parser;
use Lcobucci\JWT\Signer\Key;
use Lcobucci\JWT\Signer\Rsa\Sha256;
use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface;
use League\OAuth2\Server\Exception\OAuthServerException;

2
tests/Bootstrap.php
View File

@ -1,5 +1,5 @@
<?php
if (!@include_once __DIR__.'/../vendor/autoload.php') {
if (!@include_once __DIR__ . '/../vendor/autoload.php') {
exit("You must set up the project dependencies, run the following commands:\n> wget http://getcomposer.org/composer.phar\n> php composer.phar install\n");
}

72
tests/Grant/AuthCodeGrantTest.php
View File

@ -7,16 +7,15 @@ use League\OAuth2\Server\Entities\Interfaces\AccessTokenEntityInterface;
use League\OAuth2\Server\Entities\Interfaces\RefreshTokenEntityInterface;
use League\OAuth2\Server\Exception\OAuthServerException;
use League\OAuth2\Server\Grant\AuthCodeGrant;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use League\OAuth2\Server\Repositories\AuthCodeRepositoryInterface;
use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
use League\OAuth2\Server\Repositories\RefreshTokenRepositoryInterface;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use League\OAuth2\Server\Repositories\UserRepositoryInterface;
use League\OAuth2\Server\Utils\KeyCrypt;
use LeagueTests\Stubs\StubResponseType;
use LeagueTests\Stubs\UserEntity;
use Psr\Http\Message\ResponseInterface;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequest;
class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
@ -46,8 +45,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
null,
'php://input',
@ -90,8 +88,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -148,8 +145,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -211,8 +207,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -263,8 +258,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -287,7 +281,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
);
try {
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
} catch (OAuthServerException $e) {
$this->assertEquals($e->getMessage(), 'Client authentication failed');
@ -319,8 +313,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -334,7 +327,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
[
'response_type' => 'code',
'client_id' => 'foo',
'redirect_uri' => 'sdfsdf'
'redirect_uri' => 'sdfsdf',
],
[
'username' => 'alex',
@ -344,7 +337,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
);
try {
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
} catch (OAuthServerException $e) {
$this->assertEquals($e->getMessage(), 'Client authentication failed');
@ -383,8 +376,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -436,8 +428,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -491,8 +482,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -547,8 +537,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
'HTTP_HOST' => 'auth-server.tld',
'REQUEST_URI' => '/authorize',
],
[]
,
[],
null,
'POST',
'php://input',
@ -607,8 +596,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -667,8 +655,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -680,7 +667,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
]
);
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
}
@ -714,8 +701,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -730,7 +716,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
]
);
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
}
@ -766,8 +752,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -795,7 +780,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
);
try {
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
} catch (OAuthServerException $e) {
$this->assertEquals($e->getHint(), 'Authorization code has expired');
@ -837,8 +822,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -866,7 +850,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
);
try {
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
} catch (OAuthServerException $e) {
$this->assertEquals($e->getHint(), 'Authorization code has been revoked');
@ -905,8 +889,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -934,7 +917,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
);
try {
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
} catch (OAuthServerException $e) {
$this->assertEquals($e->getHint(), 'Authorization code was not issued to this client');
@ -973,8 +956,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
$request = new ServerRequest(
[],
[]
,
[],
null,
'POST',
'php://input',
@ -990,7 +972,7 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
);
try {
/** @var StubResponseType $response */
/* @var StubResponseType $response */
$grant->respondToRequest($request, new StubResponseType(), new \DateInterval('PT10M'));
} catch (OAuthServerException $e) {
$this->assertEquals($e->getHint(), 'Cannot decrypt the authorization code');

1
tests/Grant/PasswordGrantTest.php
View File

@ -5,7 +5,6 @@ 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\Exception\OAuthServerException;
use League\OAuth2\Server\Grant\PasswordGrant;
use League\OAuth2\Server\Repositories\AccessTokenRepositoryInterface;
use League\OAuth2\Server\Repositories\ClientRepositoryInterface;

8
tests/Utils/KeyCryptTest.php
View File

@ -9,8 +9,8 @@ class KeyCryptTest extends \PHPUnit_Framework_TestCase
public function testEncryptDecrypt()
{
$payload = 'alex loves whisky';
$encrypted = KeyCrypt::encrypt($payload, 'file://'.__DIR__.'/private.key');
$plainText = KeyCrypt::decrypt($encrypted, 'file://'.__DIR__.'/public.key');
$encrypted = KeyCrypt::encrypt($payload, 'file://' . __DIR__ . '/private.key');
$plainText = KeyCrypt::decrypt($encrypted, 'file://' . __DIR__ . '/public.key');
$this->assertNotEquals($payload, $encrypted);
$this->assertEquals($payload, $plainText);
@ -21,7 +21,7 @@ class KeyCryptTest extends \PHPUnit_Framework_TestCase
*/
public function testBadPrivateKey()
{
KeyCrypt::encrypt('', 'file://'.__DIR__.'/public.key');
KeyCrypt::encrypt('', 'file://' . __DIR__ . '/public.key');
}
/**
@ -29,6 +29,6 @@ class KeyCryptTest extends \PHPUnit_Framework_TestCase
*/
public function testBadPublicKey()
{
KeyCrypt::decrypt('', 'file://'.__DIR__.'/private.key');
KeyCrypt::decrypt('', 'file://' . __DIR__ . '/private.key');
}
}