platine-php / framework

src/OAuth2/Middleware/OauthResourceMiddleware.php

Indentation +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
      */

     protected function shouldBeProcessed(ServerRequestInterface $request): bool

     {

-       //If no route has been match no need check

+        //If no route has been match no need check

         /** @var Route|null $route */

         $route = $request->getAttribute(Route::class);

         if ($route === null) {

Braces +8 added lines, -9 removed lines

@@ -49,8 +49,7 @@ 
  * @package Platine\Framework\OAuth2\Middleware

  * @template T

  */

-class OauthResourceMiddleware implements MiddlewareInterface

-{

+class OauthResourceMiddleware implements MiddlewareInterface {
     /**

      * The Resource Server

      * @var ResourceServerInterface

@@ -77,7 +76,7 @@ 
     public function __construct(

         ResourceServerInterface $resourceServer,

         Config $config

-    ) {

+    ) {
         $this->resourceServer = $resourceServer;

         $this->config = $config;

     }

@@ -89,16 +88,16 @@ 
         ServerRequestInterface $request,

         RequestHandlerInterface $handler

     ): ResponseInterface {

-        if ($this->shouldBeProcessed($request) === false) {

+        if ($this->shouldBeProcessed($request) === false) {
             return $handler->handle($request);

         }

 

-        try {

+        try {
             $token = $this->resourceServer->getAccessToken($request, $this->scopes);

-            if ($token === null) {

+            if ($token === null) {
                 throw InvalidAccessTokenException::invalidToken('No access token found in the request');

             }

-        } catch (InvalidAccessTokenException $ex) {

+        } catch (InvalidAccessTokenException $ex) {
             // If we're here, this means that there was an access token, but it's either expired

             // or invalid. If that's the case we must immediately return

             return new JsonResponse(

@@ -123,7 +122,7 @@ 
        //If no route has been match no need check

         /** @var Route|null $route */

         $route = $request->getAttribute(Route::class);

-        if ($route === null) {

+        if ($route === null) {
             return false;

         }

 

@@ -132,7 +131,7 @@ 
 

         //check if is url whitelist

         $urls = $this->config->get('oauth2.url_whitelist', []);

-        if (in_array($route->getName(), $urls)) {

+        if (in_array($route->getName(), $urls)) {
             return false;

         }

 

src/OAuth2/Handler/AuthorizationRequestHandler.php

Braces +2 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
  * @class AuthorizationRequestHandler

  * @package Platine\Framework\OAuth2\Handler

  */

-class AuthorizationRequestHandler implements RequestHandlerInterface

-{

+class AuthorizationRequestHandler implements RequestHandlerInterface {
     /**

      * The Authorization Server

      * @var AuthorizationServerInterface

@@ -55,8 +54,7 @@ 
      * Create new instance

      * @param AuthorizationServerInterface $authorizationServer

      */

-    public function __construct(AuthorizationServerInterface $authorizationServer)

-    {

+    public function __construct(AuthorizationServerInterface $authorizationServer) {
         $this->authorizationServer = $authorizationServer;

     }

 

src/OAuth2/Handler/AccessTokenRequestHandler.php

Braces +2 added lines, -4 removed lines

@@ -43,8 +43,7 @@ 
  * @class AccessTokenRequestHandler

  * @package Platine\Framework\OAuth2\Handler

  */

-class AccessTokenRequestHandler implements RequestHandlerInterface

-{

+class AccessTokenRequestHandler implements RequestHandlerInterface {
     /**

      * The Authorization Server

      * @var AuthorizationServerInterface

@@ -55,8 +54,7 @@ 
      * Create new instance

      * @param AuthorizationServerInterface $authorizationServer

      */

-    public function __construct(AuthorizationServerInterface $authorizationServer)

-    {

+    public function __construct(AuthorizationServerInterface $authorizationServer) {
         $this->authorizationServer = $authorizationServer;

     }

 

src/OAuth2/Handler/TokenRevocationRequestHandler.php

Braces +2 added lines, -4 removed lines

@@ -42,8 +42,7 @@ 
  * @class TokenRevocationRequestHandler

  * @package Platine\Framework\OAuth2\Handler

  */

-class TokenRevocationRequestHandler implements RequestHandlerInterface

-{

+class TokenRevocationRequestHandler implements RequestHandlerInterface {
     /**

      * The Authorization Server

      * @var AuthorizationServerInterface

@@ -54,8 +53,7 @@ 
      * Create new instance

      * @param AuthorizationServerInterface $authorizationServer

      */

-    public function __construct(AuthorizationServerInterface $authorizationServer)

-    {

+    public function __construct(AuthorizationServerInterface $authorizationServer) {
         $this->authorizationServer = $authorizationServer;

     }

 

src/OAuth2/Repository/RefreshTokenRepository.php

Indentation +17 added lines, -17 removed lines

@@ -80,27 +80,27 @@ 
         $this->clientService = $clientService;

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function cleanExpiredTokens(): void

     {

         $this->query()->where('expires')->lte(date('Y-m-d H:i:s'))

-                      ->delete();

+                        ->delete();

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function deleteToken(BaseToken $token): bool

     {

         return $this->query()->where('refresh_token')->is($token->getToken())

-                             ->delete() >= 0;

+                                ->delete() >= 0;

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function getByToken(string $token): ?BaseToken

     {

         $refreshToken = $this->find($token);

@@ -122,17 +122,17 @@ 
         ]);

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function isTokenExists(string $token): bool

     {

         return $this->find($token) !== null;

     }

 

-     /**

-     * {@inheritdoc}

-     */

+        /**

+         * {@inheritdoc}

+         */

     public function saveRefreshToken(RefreshToken $token): RefreshToken

     {

         $clientId = null;

Braces +6 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
  * @package Platine\Framework\OAuth2\Repository

  * @extends Repository<OauthRefreshToken>

  */

-class RefreshTokenRepository extends Repository implements RefreshTokenRepositoryInterface

-{

+class RefreshTokenRepository extends Repository implements RefreshTokenRepositoryInterface {
     /**

      * The Client Service

      * @var ClientService

@@ -74,8 +73,7 @@ 
      * @param EntityManager<OauthRefreshToken> $manager

      * @param ClientService $clientService

      */

-    public function __construct(EntityManager $manager, ClientService $clientService)

-    {

+    public function __construct(EntityManager $manager, ClientService $clientService) {
         parent::__construct($manager, OauthRefreshToken::class);

         $this->clientService = $clientService;

     }

@@ -104,12 +102,12 @@ 
     public function getByToken(string $token): ?BaseToken

     {

         $refreshToken = $this->find($token);

-        if ($refreshToken === null) {

+        if ($refreshToken === null) {
             return null;

         }

 

         $client = null;

-        if ($refreshToken->client_id !== null) {

+        if ($refreshToken->client_id !== null) {
             $client = $this->clientService->find($refreshToken->client_id);

         }

 

@@ -136,12 +134,12 @@ 
     public function saveRefreshToken(RefreshToken $token): RefreshToken

     {

         $clientId = null;

-        if ($token->getClient() !== null) {

+        if ($token->getClient() !== null) {
             $clientId = $token->getClient()->getId();

         }

 

         $ownerId = null;

-        if ($token->getOwner() !== null) {

+        if ($token->getOwner() !== null) {
             $ownerId = $token->getOwner()->getOwnerId();

         }

 

src/OAuth2/Repository/ClientRepository.php

Braces +3 added lines, -5 removed lines

@@ -58,14 +58,12 @@ 
  * @package Platine\Framework\OAuth2\Repository

  * @extends Repository<OauthClient>

  */

-class ClientRepository extends Repository implements ClientRepositoryInterface

-{

+class ClientRepository extends Repository implements ClientRepositoryInterface {
     /**

      * Create new instance

      * @param EntityManager<OauthClient> $manager

      */

-    public function __construct(EntityManager $manager)

-    {

+    public function __construct(EntityManager $manager) {
         parent::__construct($manager, OauthClient::class);

     }

 

@@ -83,7 +81,7 @@ 
     public function findClient(string $id): ?Client

     {

         $client = $this->find($id);

-        if ($client === null) {

+        if ($client === null) {
             return null;

         }

         return Client::hydrate([

src/OAuth2/Repository/ScopeRepository.php

Indentation +2 added lines, -2 removed lines

@@ -93,8 +93,8 @@
     public function getDefaultScopes(): array

     {

         $result = $this->query()

-                       ->where('is_default')->is(1)

-                       ->all();

+                        ->where('is_default')->is(1)

+                        ->all();

         $scopes = [];

         foreach ($result as $row) {

             $scopes[] = Scope::createNewScope(

Braces +4 added lines, -6 removed lines

@@ -58,14 +58,12 @@ 
  * @package Platine\Framework\OAuth2\Repository

  * @extends Repository<OauthScope>

  */

-class ScopeRepository extends Repository implements ScopeRepositoryInterface

-{

+class ScopeRepository extends Repository implements ScopeRepositoryInterface {
     /**

      * Create new instance

      * @param EntityManager<OauthScope> $manager

      */

-    public function __construct(EntityManager $manager)

-    {

+    public function __construct(EntityManager $manager) {
         parent::__construct($manager, OauthScope::class);

     }

 

@@ -76,7 +74,7 @@ 
     {

         $result = $this->all();

         $scopes = [];

-        foreach ($result as $row) {

+        foreach ($result as $row) {
             $scopes[] = Scope::createNewScope(

                 $row->id,

                 $row->name,

@@ -96,7 +94,7 @@ 
                        ->where('is_default')->is(1)

                        ->all();

         $scopes = [];

-        foreach ($result as $row) {

+        foreach ($result as $row) {
             $scopes[] = Scope::createNewScope(

                 $row->id,

                 $row->name,

src/OAuth2/Repository/AuthorizationCodeRepository.php

Indentation +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     public function cleanExpiredTokens(): void

     {

         $this->query()->where('expires')->lte(date('Y-m-d H:i:s'))

-                      ->delete();

+                        ->delete();

     }

 

     /**

@@ -95,7 +95,7 @@ 
     public function deleteToken(BaseToken $token): bool

     {

         return $this->query()->where('authorization_code')->is($token->getToken())

-                             ->delete() >= 0;

+                                ->delete() >= 0;

     }

 

     /**

Braces +6 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
  * @package Platine\Framework\OAuth2\Repository

  * @extends Repository<OauthAuthorizationCode>

  */

-class AuthorizationCodeRepository extends Repository implements AuthorizationCodeRepositoryInterface

-{

+class AuthorizationCodeRepository extends Repository implements AuthorizationCodeRepositoryInterface {
     /**

      * The Client Service

      * @var ClientService

@@ -74,8 +73,7 @@ 
      * @param EntityManager<OauthAuthorizationCode> $manager

      * @param ClientService $clientService

      */

-    public function __construct(EntityManager $manager, ClientService $clientService)

-    {

+    public function __construct(EntityManager $manager, ClientService $clientService) {
         parent::__construct($manager, OauthAuthorizationCode::class);

         $this->clientService = $clientService;

     }

@@ -104,12 +102,12 @@ 
     public function getByToken(string $token): ?BaseToken

     {

         $code = $this->find($token);

-        if ($code === null) {

+        if ($code === null) {
             return null;

         }

 

         $client = null;

-        if ($code->client_id !== null) {

+        if ($code->client_id !== null) {
             $client = $this->clientService->find($code->client_id);

         }

 

@@ -137,12 +135,12 @@ 
     public function saveCode(AuthorizationCode $token): AuthorizationCode

     {

         $clientId = null;

-        if ($token->getClient() !== null) {

+        if ($token->getClient() !== null) {
             $clientId = $token->getClient()->getId();

         }

 

         $ownerId = null;

-        if ($token->getOwner() !== null) {

+        if ($token->getOwner() !== null) {
             $ownerId = $token->getOwner()->getOwnerId();

         }

 

src/OAuth2/Repository/AccessTokenRepository.php

Indentation +2 added lines, -2 removed lines

@@ -86,7 +86,7 @@ 
     public function cleanExpiredTokens(): void

     {

         $this->query()->where('expires')->lte(date('Y-m-d H:i:s'))

-                      ->delete();

+                        ->delete();

     }

 

     /**

@@ -95,7 +95,7 @@ 
     public function deleteToken(BaseToken $token): bool

     {

         return $this->query()->where('access_token')->is($token->getToken())

-                             ->delete() >= 0;

+                                ->delete() >= 0;

     }

 

     /**

Braces +6 added lines, -8 removed lines

@@ -61,8 +61,7 @@ 
  * @package Platine\Framework\OAuth2\Repository

  * @extends Repository<OauthAccessToken>

  */

-class AccessTokenRepository extends Repository implements AccessTokenRepositoryInterface

-{

+class AccessTokenRepository extends Repository implements AccessTokenRepositoryInterface {
     /**

      * The Client Service

      * @var ClientService

@@ -74,8 +73,7 @@ 
      * @param EntityManager<OauthAccessToken> $manager

      * @param ClientService $clientService

      */

-    public function __construct(EntityManager $manager, ClientService $clientService)

-    {

+    public function __construct(EntityManager $manager, ClientService $clientService) {
         parent::__construct($manager, OauthAccessToken::class);

         $this->clientService = $clientService;

     }

@@ -104,12 +102,12 @@ 
     public function getByToken(string $token): ?BaseToken

     {

         $accessToken = $this->find($token);

-        if ($accessToken === null) {

+        if ($accessToken === null) {
             return null;

         }

 

         $client = null;

-        if ($accessToken->client_id !== null) {

+        if ($accessToken->client_id !== null) {
             $client = $this->clientService->find($accessToken->client_id);

         }

 

@@ -136,12 +134,12 @@ 
     public function saveAccessToken(AccessToken $token): AccessToken

     {

         $clientId = null;

-        if ($token->getClient() !== null) {

+        if ($token->getClient() !== null) {
             $clientId = $token->getClient()->getId();

         }

 

         $ownerId = null;

-        if ($token->getOwner() !== null) {

+        if ($token->getOwner() !== null) {
             $ownerId = $token->getOwner()->getOwnerId();

         }