php-guard / oauth-server

src/OAuth2OLD/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/OAuth2OLD/Repositories/StorageRepository.php

Spacing +3 added lines, -3 removed lines

@@ -34,10 +34,10 @@ 
     public function __construct(array $storages)
     {
         foreach (static::STORAGES_INTERFACES as $name => $interface) {
-            if(!isset($storages[$name])) {
+            if (!isset($storages[$name])) {
                 throw new \Exception("Missing storage '$name'");
             }
-            if(!is_a($storages[$name], $interface)) {
+            if (!is_a($storages[$name], $interface)) {
                 throw new \Exception("Storage '$name' must implement '$interface'");
             }
             $this->storages[$name] = $storages[$name];
@@ -50,7 +50,7 @@ 
      * @throws \Exception
      */
     public function getStorage(string $name) {
-        if(!isset($this->storages[$name])) {
+        if (!isset($this->storages[$name])) {
             throw new \Exception("Unknown storage '$name'");
         }
         return $this->storages[$name];

src/OAuth2OLD/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/OAuth2OLD/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/OAuth2OLD/GrantTypes/RefreshTokenGrantType.php

Spacing +6 added lines, -6 removed lines

@@ -65,18 +65,18 @@ 
         }
 
         $refreshToken = $request->getParsedBody()['refresh_token'] ?? '';
-        if(!$refreshToken) {
+        if (!$refreshToken) {
             throw new OAuthException('invalid_request', 'Missing a required parameter : refresh_token',
                 'https://tools.ietf.org/html/rfc6749#section-4.3');
         }
 
         $refreshToken = $this->refreshTokenStorage->get($refreshToken);
-        if(!$refreshToken || $refreshToken->getClientId() !== $client->getIdentifier()) {
+        if (!$refreshToken || $refreshToken->getClientId() !== $client->getIdentifier()) {
             throw new OAuthException('invalid_grant', 'Refresh token is invalid',
                 'https://tools.ietf.org/html/rfc6749#section-4.3');
         }
 
-        if(!is_null($refreshToken->getExpiresAt()) && $refreshToken->getExpiresAt() < time()) {
+        if (!is_null($refreshToken->getExpiresAt()) && $refreshToken->getExpiresAt() < time()) {
             $this->refreshTokenStorage->revoke($refreshToken->getToken());
 
             throw new OAuthException('invalid_grant', 'Refresh token has expired',
@@ -84,16 +84,16 @@ 
         }
 
         $includedScopes = isset($request->getParsedBody()['scope']) ? explode(' ', $request->getParsedBody()['scope']) : null;
-        if(is_array($includedScopes) && !empty(array_diff($includedScopes, explode(' ', $refreshToken->getToken())))) {
+        if (is_array($includedScopes) && !empty(array_diff($includedScopes, explode(' ', $refreshToken->getToken())))) {
             throw new OAuthException('invalid_scope',
-                'Some of scope included are not granted for this token. Scope granted : ' . $refreshToken->getScope(),
+                'Some of scope included are not granted for this token. Scope granted : '.$refreshToken->getScope(),
                 'https://tools.ietf.org/html/rfc6749#section-6');
         }
 
         // issue an access token token and, optionally, a refresh token
         $accessToken = $this->accessTokenStorage->create($client->getIdentifier(), $refreshToken->getUserId(), $refreshToken->getScope());
         $newRefreshToken = null;
-        if($this->configurationRepository->getConfig(Config::REGENERATE_REFRESH_TOKENS_AFTER_USE)) {
+        if ($this->configurationRepository->getConfig(Config::REGENERATE_REFRESH_TOKENS_AFTER_USE)) {
             $this->refreshTokenStorage->revoke($refreshToken->getToken());
             $newRefreshToken = $this->refreshTokenStorage->create(
                 $refreshToken->getClientId(), $refreshToken->getUserId(), $refreshToken->getScope())->getToken();

src/OAuth2OLD/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');
         }

src/OAuth2OLD/GrantTypes/AuthorizationCodeGrantType.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 
         $this->authorizationCodeStorage->revoke($authorizationCode->getCode());
 
-        if($authorizationCode->getExpiresAt() < time()) {
+        if ($authorizationCode->getExpiresAt() < time()) {
             throw new OAuthException('invalid_grant', 'Authorization code has expired',
                 'https://tools.ietf.org/html/rfc6749#section-4.1.3');
         }

src/OAuth2/ScopePolicy/ScopePolicyManager.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     {
         if ($client instanceof RegisteredClient && is_array($client->getMetadata()->getScope())) {
             $supportedScopes = explode(' ', $client->getMetadata()->getScope());
-            if(empty($scopes) || !empty(array_diff($scopes, $supportedScopes))) {
+            if (empty($scopes) || !empty(array_diff($scopes, $supportedScopes))) {
                 throw new OAuthException('invalid_scope',
                     'The request scope is invalid. Supported scopes : '.$client->getMetadata()->getScope(),
                     'https://tools.ietf.org/html/rfc6749#section-4.1');

src/OAuth2/Endpoints/AuthorizationEndpoint.php

Indentation +1 added lines, -1 removed lines

@@ -212,7 +212,7 @@
         }
         else {
             if (count($redirectUris) == 1) {
-               $redirectUri = $redirectUris[0];
+                $redirectUri = $redirectUris[0];
             }
             else {
                 throw new OAuthException('invalid_request', 'The request is missing the required parameter redirect_uri.',

Spacing +4 added lines, -4 removed lines

@@ -124,14 +124,14 @@ 
              * If the Authorization Server encounters any error, it MUST return an error response, per Section 3.1.2.6.
              */
             $uri = $this->getRedirectUri();
-            if(!empty($this->state)) {
+            if (!empty($this->state)) {
                 $uri = Uri::withQueryValue($uri, 'state', $this->state);
             }
             $uri = Uri::withQueryValue($uri, 'error', $e->getError());
-            if($e->getErrorDescription()) {
+            if ($e->getErrorDescription()) {
                 $uri = Uri::withQueryValue($uri, 'error_description', $e->getErrorDescription());
             }
-            if($e->getErrorUri()) {
+            if ($e->getErrorUri()) {
                 $uri = Uri::withQueryValue($uri, 'error_uri', $e->getErrorUri());
             }
             return new Response(302, ['Location' => $uri]);
@@ -173,7 +173,7 @@ 
 
         $supportedResponseTypes = $this->client->getMetadata()->getResponseTypes() ?: ['code'];
         foreach (explode(' ', $requestData['response_type']) as $responseType) {
-            if(!in_array($responseType, $supportedResponseTypes)) {
+            if (!in_array($responseType, $supportedResponseTypes)) {
             throw new OAuthException('unsupported_response_type',
                 'The authorization server does not support obtaining an authorization code using this method.',
                 'https://tools.ietf.org/html/rfc6749#section-4.1');

Braces +3 added lines, -6 removed lines

@@ -209,12 +209,10 @@ 
                 throw new OAuthException('invalid_request', 'The request includes the invalid parameter redirect_uri.',
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
-        }
-        else {
+        } else {
             if (count($redirectUris) == 1) {
                $redirectUri = $redirectUris[0];
-            }
-            else {
+            } else {
                 throw new OAuthException('invalid_request', 'The request is missing the required parameter redirect_uri.',
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
@@ -222,8 +220,7 @@ 
         try {
 
             $this->redirectUri = new Uri($redirectUri);
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             throw new OAuthException('invalid_request', 'The request includes the malformed parameter redirect_uri.',
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
         }