mirror of
				https://github.com/elyby/oauth2-server.git
				synced 2025-05-31 14:12:07 +05:30 
			
		
		
		
	Applied fixes from StyleCI
This commit is contained in:
		@@ -31,7 +31,6 @@ $app->add(
 | 
			
		||||
$app->get(
 | 
			
		||||
    '/users',
 | 
			
		||||
    function (ServerRequestInterface $request, ResponseInterface $response) use ($app) {
 | 
			
		||||
 | 
			
		||||
        $users = [
 | 
			
		||||
            [
 | 
			
		||||
                'id'    => 123,
 | 
			
		||||
 
 | 
			
		||||
@@ -30,9 +30,9 @@ $app = new App([
 | 
			
		||||
        $accessTokenRepository = new AccessTokenRepository(); // instance of AccessTokenRepositoryInterface
 | 
			
		||||
 | 
			
		||||
        // Path to public and private keys
 | 
			
		||||
        $privateKey = 'file://'.__DIR__.'/../private.key';
 | 
			
		||||
        $privateKey = 'file://' . __DIR__ . '/../private.key';
 | 
			
		||||
        //$privateKey = new CryptKey('file://path/to/private.key', 'passphrase'); // if private key has a pass phrase
 | 
			
		||||
        $publicKey = 'file://'.__DIR__.'/../public.key';
 | 
			
		||||
        $publicKey = 'file://' . __DIR__ . '/../public.key';
 | 
			
		||||
 | 
			
		||||
        // Setup the authorization server
 | 
			
		||||
        $server = new AuthorizationServer(
 | 
			
		||||
 
 | 
			
		||||
@@ -23,8 +23,8 @@ $app = new App([
 | 
			
		||||
            new ClientRepository(),                 // instance of ClientRepositoryInterface
 | 
			
		||||
            new AccessTokenRepository(),            // instance of AccessTokenRepositoryInterface
 | 
			
		||||
            new ScopeRepository(),                  // instance of ScopeRepositoryInterface
 | 
			
		||||
            'file://'.__DIR__.'/../private.key',    // path to private key
 | 
			
		||||
            'file://'.__DIR__.'/../public.key'      // path to public key
 | 
			
		||||
            'file://' . __DIR__ . '/../private.key',    // path to private key
 | 
			
		||||
            'file://' . __DIR__ . '/../public.key'      // path to public key
 | 
			
		||||
        );
 | 
			
		||||
 | 
			
		||||
        $grant = new PasswordGrant(
 | 
			
		||||
@@ -54,19 +54,17 @@ $app->post(
 | 
			
		||||
 | 
			
		||||
            // Try to respond to the access token request
 | 
			
		||||
            return $server->respondToAccessTokenRequest($request, $response);
 | 
			
		||||
 | 
			
		||||
        } catch (OAuthServerException $exception) {
 | 
			
		||||
 | 
			
		||||
            // All instances of OAuthServerException can be converted to a PSR-7 response
 | 
			
		||||
            return $exception->generateHttpResponse($response);
 | 
			
		||||
 | 
			
		||||
        } catch (\Exception $exception) {
 | 
			
		||||
 | 
			
		||||
            // Catch unexpected exceptions
 | 
			
		||||
            $body = $response->getBody();
 | 
			
		||||
            $body->write($exception->getMessage());
 | 
			
		||||
            return $response->withStatus(500)->withBody($body);
 | 
			
		||||
 | 
			
		||||
            return $response->withStatus(500)->withBody($body);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
);
 | 
			
		||||
 
 | 
			
		||||
@@ -75,7 +75,7 @@ class BearerTokenValidator implements AuthorizationValidatorInterface
 | 
			
		||||
        } catch (\InvalidArgumentException $exception) {
 | 
			
		||||
            // JWT couldn't be parsed so return the request as is
 | 
			
		||||
            throw OAuthServerException::accessDenied($exception->getMessage());
 | 
			
		||||
        } catch(\RuntimeException $exception){
 | 
			
		||||
        } catch (\RuntimeException $exception) {
 | 
			
		||||
            //JWR couldn't be parsed so return the request as is
 | 
			
		||||
            throw OAuthServerException::accessDenied('Error while decoding to JSON');
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,6 @@
 | 
			
		||||
 | 
			
		||||
namespace League\OAuth2\Server\Exception;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class UniqueTokenIdentifierConstraintViolationException extends OAuthServerException
 | 
			
		||||
{
 | 
			
		||||
    public static function create()
 | 
			
		||||
 
 | 
			
		||||
@@ -345,6 +345,7 @@ abstract class AbstractGrant implements GrantTypeInterface
 | 
			
		||||
            $accessToken->setIdentifier($this->generateUniqueIdentifier());
 | 
			
		||||
            try {
 | 
			
		||||
                $this->accessTokenRepository->persistNewAccessToken($accessToken);
 | 
			
		||||
 | 
			
		||||
                return $accessToken;
 | 
			
		||||
            } catch (UniqueTokenIdentifierConstraintViolationException $e) {
 | 
			
		||||
                if ($maxGenerationAttempts === 0) {
 | 
			
		||||
@@ -391,6 +392,7 @@ abstract class AbstractGrant implements GrantTypeInterface
 | 
			
		||||
            $authCode->setIdentifier($this->generateUniqueIdentifier());
 | 
			
		||||
            try {
 | 
			
		||||
                $this->authCodeRepository->persistNewAuthCode($authCode);
 | 
			
		||||
 | 
			
		||||
                return $authCode;
 | 
			
		||||
            } catch (UniqueTokenIdentifierConstraintViolationException $e) {
 | 
			
		||||
                if ($maxGenerationAttempts === 0) {
 | 
			
		||||
@@ -420,6 +422,7 @@ abstract class AbstractGrant implements GrantTypeInterface
 | 
			
		||||
            $refreshToken->setIdentifier($this->generateUniqueIdentifier());
 | 
			
		||||
            try {
 | 
			
		||||
                $this->refreshTokenRepository->persistNewRefreshToken($refreshToken);
 | 
			
		||||
 | 
			
		||||
                return $refreshToken;
 | 
			
		||||
            } catch (UniqueTokenIdentifierConstraintViolationException $e) {
 | 
			
		||||
                if ($maxGenerationAttempts === 0) {
 | 
			
		||||
 
 | 
			
		||||
@@ -66,12 +66,14 @@ class AuthorizationRequest
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The code challenge (if provided)
 | 
			
		||||
     *
 | 
			
		||||
     * @var string
 | 
			
		||||
     */
 | 
			
		||||
    protected $codeChallenge;
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * The code challenge method (if provided)
 | 
			
		||||
     *
 | 
			
		||||
     * @var string
 | 
			
		||||
     */
 | 
			
		||||
    protected $codeChallengeMethod;
 | 
			
		||||
 
 | 
			
		||||
@@ -68,6 +68,7 @@ class BearerTokenResponse extends AbstractResponseType
 | 
			
		||||
     * this class rather than the default.
 | 
			
		||||
     *
 | 
			
		||||
     * @param AccessTokenEntityInterface $accessToken
 | 
			
		||||
     *
 | 
			
		||||
     * @return array
 | 
			
		||||
     */
 | 
			
		||||
    protected function getExtraParams(AccessTokenEntityInterface $accessToken)
 | 
			
		||||
 
 | 
			
		||||
@@ -137,7 +137,6 @@ class AuthCodeGrantTest extends \PHPUnit_Framework_TestCase
 | 
			
		||||
        $this->assertTrue($grant->validateAuthorizationRequest($request) instanceof AuthorizationRequest);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    public function testValidateAuthorizationRequestCodeChallenge()
 | 
			
		||||
    {
 | 
			
		||||
        $client = new ClientEntity();
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user