php-guard / oauth-server

src/OAuth2/EndpointMessages/Authorization/ErrorResponse.php

Spacing +5 added lines, -5 removed lines

@@ -37,18 +37,18 @@ 
                                 ?string $errorUri = null, ?string $state = null)
     {
         if ($this->containsNotAsciiChar($error)) {
-            throw new \Exception('Malformed error type. Expect ascii string. Got : ' . $error);
+            throw new \Exception('Malformed error type. Expect ascii string. Got : '.$error);
         }
 
         if (!in_array($error, self::errors)) {
-            throw new \Exception('Unexpected error type. Expect one of : ' . implode(', ', self::errors));
+            throw new \Exception('Unexpected error type. Expect one of : '.implode(', ', self::errors));
         }
 
         $redirectUri = Uri::withQueryValue($redirectUri, 'error', $error);
 
         if ($errorDescription) {
             if ($this->containsNotAsciiChar($errorDescription)) {
-                throw new \Exception('Malformed error description. Expect ascii string. Got : ' . $errorDescription);
+                throw new \Exception('Malformed error description. Expect ascii string. Got : '.$errorDescription);
             }
 
             $redirectUri = Uri::withQueryValue($redirectUri, 'error_description', $errorDescription);
@@ -56,13 +56,13 @@ 
 
         if ($errorUri) {
             if ($this->containsNotAsciiChar($errorUri)) {
-                throw new \Exception('Malformed error uri. Expect ascii string. Got : ' . $errorUri);
+                throw new \Exception('Malformed error uri. Expect ascii string. Got : '.$errorUri);
             }
 
             $redirectUri = Uri::withQueryValue($redirectUri, 'error_uri', $errorUri);
         }
 
-        if($state) {
+        if ($state) {
             $redirectUri = Uri::withQueryValue($redirectUri, 'state', $state);
         }
 

src/OAuth2/Endpoints/AuthorizationEndpoint.php

Spacing +1 added lines, -1 removed lines

@@ -221,7 +221,7 @@
             if (!$scopePolicyManager->checkScope($client, $scope)) {
                 $supportedScopes = implode(', ', $scopePolicyManager->getSupportedScopes($client));
                 throw new OAuthException('invalid_scope',
-                    'Some of requested scopes are not supported. Scope supported : ' . $supportedScopes,
+                    'Some of requested scopes are not supported. Scope supported : '.$supportedScopes,
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
 

src/OAuth2/Endpoints/TokenEndpoint.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
         $grantType = $this->server->getGrantTypeRepository()->getGrantType($grantTypeName);
         if (!$grantType) {
             return new ErrorResponse('unsupported_grant_type',
-                'Unsupported grant type : ' . $grantTypeName,
+                'Unsupported grant type : '.$grantTypeName,
                 'https://tools.ietf.org/html/rfc6749#section-5.2');
         }
 
@@ -54,18 +54,18 @@ 
         } catch (OAuthException $e) {
             if ($e->getError() == 'invalid_client' && $request->hasHeader('Authorization')) {
                 return new ErrorResponse($e->getError(),
-                    'Client authentication failed : ' . $e->getMessage(),
+                    'Client authentication failed : '.$e->getMessage(),
                     $e->getErrorUri(), 401, [
                         'WWW-Authenticate' => 'Basic'
                     ]);
             } else {
                 return new ErrorResponse($e->getError(),
-                    'Client authentication failed : ' . $e->getMessage(),
+                    'Client authentication failed : '.$e->getMessage(),
                     $e->getErrorUri(), 401);
             }
         }
 
-        if(!$client) {
+        if (!$client) {
             if (!isset($request->getParsedBody()['client_id'])) {
                 return new ErrorResponse('invalid_request',
                     'Client authentication not included, missing a parameter : client_id : ',
@@ -81,7 +81,7 @@ 
 
             if ($client->hasCredentials()) {
                 return new ErrorResponse('invalid_client',
-                    'Client authentication failed : ' . $guard->getError(),
+                    'Client authentication failed : '.$guard->getError(),
                     'https://tools.ietf.org/html/rfc6749#section-5.2', 401, [
                         'WWW-Authenticate' => 'Basic'
                     ]);
@@ -90,7 +90,7 @@ 
 
         if (is_array($client->getSupportedGrantTypes()) && !in_array($grantType->getUri(), $client->getSupportedGrantTypes())) {
             return new ErrorResponse('unauthorized_client',
-                'Unauthorized grant type : ' . $grantType->getUri(),
+                'Unauthorized grant type : '.$grantType->getUri(),
                 'https://tools.ietf.org/html/rfc6749#section-5.2');
         }
 

Braces +1 added lines, -2 removed lines

@@ -96,8 +96,7 @@
 
         try {
             return $grantType->grant($request, $client);
-        }
-        catch (OAuthException $e) {
+        } catch (OAuthException $e) {
             return new ErrorResponse($e->getError(),
                 $e->getErrorDescription(),
                 $e->getErrorUri());

src/OAuth2/Repositories/ClientAuthenticatorRepository.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      */
     public function __construct(array $authenticators)
     {
-        if(!isset($authenticators[ClientPasswordAuthenticator::class])) {
+        if (!isset($authenticators[ClientPasswordAuthenticator::class])) {
             throw new \Exception('Authorization server MUST support the HTTP Basic authentication scheme');
         }
         $this->authenticators = $authenticators;

src/OAuth2/Repositories/ConfigurationRepository.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public function __construct(array $config = [])
     {
         if (array_diff(self::MINIMAL_CONFIG, array_keys($config))) {
-            throw new \Exception('Missing minimal configuration. Required : ' . implode(', ', self::MINIMAL_CONFIG));
+            throw new \Exception('Missing minimal configuration. Required : '.implode(', ', self::MINIMAL_CONFIG));
         }
 
         $this->config = array_merge(self::DEFAULT_CONFIG, $config);
@@ -52,7 +52,7 @@ 
      * @throws \Exception
      */
     public function getConfig(string $name) {
-        if(!array_key_exists($name, $this->config)) {
+        if (!array_key_exists($name, $this->config)) {
             throw new \Exception("Unknown config '$name' in ".implode(', ', array_keys($this->config)));
         }
         return $this->config[$name];

src/OAuth2/Repositories/GrantTypeRepository.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
         $clientCredentialsGrantType = new ClientCredentialsGrantType($scopePolicyManager, $accessTokenStorage);
         $resourceOwnerPasswordCredentialsGrantType = new ResourceOwnerPasswordCredentialsGrantType(
             $resourceOwnerProvider, $scopePolicyManager, $accessTokenStorage, $refreshTokenStorage);
-        $refreshTokenGrantType = new RefreshTokenGrantType($configurationRepository , $scopePolicyManager, $accessTokenStorage, $refreshTokenStorage);
+        $refreshTokenGrantType = new RefreshTokenGrantType($configurationRepository, $scopePolicyManager, $accessTokenStorage, $refreshTokenStorage);
         return [
             $authorizationCodeGrantType->getUri() => $authorizationCodeGrantType,
             $clientCredentialsGrantType->getUri() => $clientCredentialsGrantType,

src/OAuth2/ScopePolicy/Policies/ScopePolicyInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,5 +14,5 @@
 interface ScopePolicyInterface
 {
 //    function check(array $scope, ClientInterface $client): bool ;
-    function getDefaultScopes(ClientInterface $client) : ?array ;
+    function getDefaultScopes(ClientInterface $client) : ?array;
 }
\ No newline at end of file

src/OAuth2/GrantTypes/ClientCredentialsGrantType.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         if (!$this->scopePolicyManager->checkScope($client, $scope)) {
             $supportedScopes = implode(', ', $this->scopePolicyManager->getSupportedScopes($client));
             throw new OAuthException('invalid_scope',
-                'Some of requested scopes are not supported. Scope supported : ' . $supportedScopes,
+                'Some of requested scopes are not supported. Scope supported : '.$supportedScopes,
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
         }
 

src/OAuth2/GrantTypes/ResourceOwnerPasswordCredentialsGrantType.php

Spacing +5 added lines, -5 removed lines

@@ -63,14 +63,14 @@ 
                 'https://tools.ietf.org/html/rfc6749#section-5.2');
         }
 
-        $username= $request->getParsedBody()['username'] ?? '';
-        if(!$username) {
+        $username = $request->getParsedBody()['username'] ?? '';
+        if (!$username) {
             throw new OAuthException('invalid_request', 'Missing a required parameter : username',
                 'https://tools.ietf.org/html/rfc6749#section-4.3');
         }
 
-        $password= $request->getParsedBody()['password'] ?? '';
-        if(!$password) {
+        $password = $request->getParsedBody()['password'] ?? '';
+        if (!$password) {
             throw new OAuthException('invalid_request', 'Missing a required parameter : password',
                 'https://tools.ietf.org/html/rfc6749#section-4.3');
         }
@@ -79,7 +79,7 @@ 
         if (!$this->scopePolicyManager->checkScope($client, $scope)) {
             $supportedScopes = implode(', ', $this->scopePolicyManager->getSupportedScopes($client));
             throw new OAuthException('invalid_scope',
-                'Some of requested scopes are not supported. Scope supported : ' . $supportedScopes,
+                'Some of requested scopes are not supported. Scope supported : '.$supportedScopes,
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
         }
 

Braces +1 added lines, -2 removed lines

@@ -85,8 +85,7 @@
 
         try {
             $resourceOwner = $this->resourceOwnerProvider->authenticate($username, $password);
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             throw new OAuthException('invalid_grant', $e->getMessage(),
                 'https://tools.ietf.org/html/rfc6749#section-4.3');
         }