php-guard / oauth-server

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/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 +7 added lines, -7 removed lines

@@ -85,10 +85,10 @@ 
 
     function handleRequest(ServerRequestInterface $request): ResponseInterface
     {
-        if($request->getMethod() === 'GET') {
+        if ($request->getMethod() === 'GET') {
             $requestData = $request->getQueryParams();
         }
-        else if($request->getMethod() === 'POST') {
+        else if ($request->getMethod() === 'POST') {
             $requestData = $request->getParsedBody();
         }
         else {
@@ -132,15 +132,15 @@ 
             $responseData = [
                 'error' => $e->getError()
             ];
-            if($e->getErrorDescription()) {
+            if ($e->getErrorDescription()) {
                 $responseData['error_description'] = $e->getErrorDescription();
             }
-            if($e->getErrorUri()) {
+            if ($e->getErrorUri()) {
                 $responseData['error_uri'] = $e->getErrorUri();
             }
         }
 
-        if(!empty($this->state)) {
+        if (!empty($this->state)) {
             $responseData['state'] = $this->state;
         }
 
@@ -179,7 +179,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');
@@ -227,7 +227,7 @@ 
         }
         try {
             $redirectUri = new Uri($redirectUri);
-            if($redirectUri->getFragment()) {
+            if ($redirectUri->getFragment()) {
                 throw new \InvalidArgumentException('The endpoint URI must not include a fragment component.');
             }
             $this->redirectUri = $redirectUri;

Braces +5 added lines, -10 removed lines

@@ -87,11 +87,9 @@ 
     {
         if($request->getMethod() === 'GET') {
             $requestData = $request->getQueryParams();
-        }
-        else if($request->getMethod() === 'POST') {
+        } else if($request->getMethod() === 'POST') {
             $requestData = $request->getParsedBody();
-        }
-        else {
+        } else {
             return new Response(404);
         }
 
@@ -215,12 +213,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');
             }
@@ -231,8 +227,7 @@ 
                 throw new \InvalidArgumentException('The endpoint URI must not include a fragment component.');
             }
             $this->redirectUri = $redirectUri;
-        }
-        catch (\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             throw new OAuthException('invalid_request', 'The request includes the malformed parameter redirect_uri. '.$e->getMessage(),
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
         }

src/OAuth2/ScopePolicy/ScopePolicyManager.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
      */
     public function verifyScopes(ClientInterface $client, array $scopes): void
     {
-        if(empty($scopes)) {
+        if (empty($scopes)) {
             throw new OAuthException('invalid_scope',
                 'The request scope is unknown.',
                 'https://tools.ietf.org/html/rfc6749#section-4.1');
@@ -57,7 +57,7 @@ 
 
         if ($client instanceof RegisteredClient && is_array($client->getMetadata()->getScope())) {
             $supportedScopes = explode(' ', $client->getMetadata()->getScope());
-            if(!empty(array_diff($scopes, $supportedScopes))) {
+            if (!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/Extensions/OpenID/Endpoints/AuthorizationEndpoint.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
              */
             $scope = $requestData['scope'] ?? '';
             $scopes = explode(' ', $scope);
-            if(!in_array('openid', $scopes)) {
+            if (!in_array('openid', $scopes)) {
                 return parent::handleRequest($request);
             }
 

Braces +1 added lines, -2 removed lines

@@ -121,8 +121,7 @@
              * specified in the Authorization Request using the application/x-www-form-urlencoded format,
              * unless a different Response Mode was specified.
              */
-        }
-        catch (OAuthException $e) {
+        } catch (OAuthException $e) {
             /**
              * If the Authorization Server encounters any error, it MUST return an error response, per Section 3.1.2.6.
              */

src/OAuth2/Extensions/PKCE/Credentials/AuthorizationCode.php

Indentation +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
                                 int $expiresAt, ?string $requestedScope = null, ?string $redirectUri = null,
                                 ?string $codeChallenge = null, ?string $codeChallengeMethod = null)
     {
-       parent::__construct($code, $scope, $clientIdentifier, $resourceOwnerIdentifier, $expiresAt, $requestedScope, $redirectUri);
+        parent::__construct($code, $scope, $clientIdentifier, $resourceOwnerIdentifier, $expiresAt, $requestedScope, $redirectUri);
         $this->codeChallenge = $codeChallenge;
         $this->codeChallengeMethod = $codeChallengeMethod;
     }

src/OAuth2/Endpoints/TokenEndpoint.php

Spacing +2 added lines, -2 removed lines

@@ -88,9 +88,9 @@
              */
             $status = 400;
             $headers = ['Content-Type' => 'application/json'];
-            if($e->getError() === 'invalid_client') {
+            if ($e->getError() === 'invalid_client') {
                 $status = 401;
-                    if($request->hasHeader('Authorization')) {
+                    if ($request->hasHeader('Authorization')) {
                         $headers['WWW-Authenticate'] = 'Basic';
                 }
             }