php-guard / oauth-server

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';
                 }
             }

src/OAuth2/Endpoints/AuthorizationEndpoint.php

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/ClientAuthentication/ClientAuthenticationMethodManager.php

Spacing +6 added lines, -6 removed lines

@@ -42,8 +42,8 @@ 
          */
         $clientAuthenticationMethodUsedIdentifier = null;
         foreach ($this->clientAuthenticationMethods as $identifier => $clientAuthenticationMethod) {
-            if($clientAuthenticationMethod->support($request, $requestData))  {
-                if($clientAuthenticationMethodUsedIdentifier) {
+            if ($clientAuthenticationMethod->support($request, $requestData)) {
+                if ($clientAuthenticationMethodUsedIdentifier) {
                     throw new OAuthException('invalid_request',
                         'The request utilizes more than one mechanism for authenticating the client.',
                         'https://tools.ietf.org/html/rfc6749#section-3.2.1');
@@ -52,14 +52,14 @@ 
             }
         }
 
-        if($clientAuthenticationMethod = $this->clientAuthenticationMethods[$clientAuthenticationMethodUsedIdentifier] ?? null) {
-            if(!$client = $clientAuthenticationMethod->authenticate($request, $requestData)) {
+        if ($clientAuthenticationMethod = $this->clientAuthenticationMethods[$clientAuthenticationMethodUsedIdentifier] ?? null) {
+            if (!$client = $clientAuthenticationMethod->authenticate($request, $requestData)) {
                 throw new OAuthException('invalid_client',
                     'Client authentication failed. Unknown client.',
                     'https://tools.ietf.org/html/rfc6749#section-3.2.1');
             }
 
-            if($client->getMetadata()->getTokenEndpointAuthMethod())
+            if ($client->getMetadata()->getTokenEndpointAuthMethod())
         } else { // else check client_id parameter
             if (empty($requestData['client_id'])) {
                 throw new OAuthException('invalid_request', 'The request is missing the required parameter client_id.',
@@ -73,7 +73,7 @@ 
         }
 
 
-        if($client->hasCredentials()) {
+        if ($client->hasCredentials()) {
             $tokenEndpointAuthMethod = $this->client->getMetadata()->getTokenEndpointAuthMethod() ?: 'client_secret_basic';
             if (!$clientAuthenticationMethod = $this->clientAuthenticationMethodManager->getClientAuthenticationMethod($tokenEndpointAuthMethod)) {
                 throw new OAuthException('invalid_client', 'Client authentication failed. Unsupported authentication method',

Braces +3 added lines, -2 removed lines

@@ -59,12 +59,13 @@
                     'https://tools.ietf.org/html/rfc6749#section-3.2.1');
             }
 
-            if($client->getMetadata()->getTokenEndpointAuthMethod())
-        } else { // else check client_id parameter
+            if($client->getMetadata()->getTokenEndpointAuthMethod()) {
+                    } else { // else check client_id parameter
             if (empty($requestData['client_id'])) {
                 throw new OAuthException('invalid_request', 'The request is missing the required parameter client_id.',
                     'https://tools.ietf.org/html/rfc6749#section-4.1');
             }
+            }
 
             if (!$client = $this->clientStorage->get($requestData['client_id'])) {
                 throw new OAuthException('invalid_request', 'The request includes the invalid parameter client_id.',