pgaultier / yii2-oauth2

src/controllers/AuthorizeController.php

Spacing +1 added lines, -1 removed lines

@@ -233,7 +233,7 @@
                     } else {
                         Yii::$app->session->setFlash('error', [
                             'error' => 'invalid_scope',
-                            'error_description' => 'Scope ' . $scope . ' does not exist.',
+                            'error_description' => 'Scope '.$scope.' does not exist.',
                         ], false);
                         return $this->redirect(['error']);
                     }

src/Module.php

Spacing +8 added lines, -8 removed lines

@@ -192,7 +192,7 @@ 
     /**
      * @var int duration of login time for multiple authorize calls
      */
-    public $loginDuration = 60 * 60 * 24 * 30;
+    public $loginDuration = 60*60*24*30;
 
     /**
      * @var bool configure authorization code (enforce_redirect)
@@ -273,19 +273,19 @@ 
         }
         $this->setUpDi($app);
         if (empty($this->baseEndPoint) === false) {
-            $this->baseEndPoint = trim($this->baseEndPoint, '/') . '/';
+            $this->baseEndPoint = trim($this->baseEndPoint, '/').'/';
         }
 
         if ($app instanceof ConsoleApplication) {
             $this->mapConsoleControllers($app);
         } else {
             $app->getUrlManager()->addRules([
-                ['verb' => 'POST', 'pattern' => $this->baseEndPoint . 'token', 'route' => $this->id . '/token/index'],
-                ['verb' => 'OPTIONS', 'pattern' => $this->baseEndPoint . 'token', 'route' => $this->id . '/token/options'],
-                ['verb' => 'GET', 'pattern' => $this->baseEndPoint . 'authorize', 'route' => $this->id . '/authorize/index'],
-                ['pattern' => $this->baseEndPoint . 'authorize-login', 'route' => $this->id . '/authorize/login'],
-                ['pattern' => $this->baseEndPoint . 'authorize-application', 'route' => $this->id . '/authorize/authorize'],
-                ['pattern' => $this->baseEndPoint . 'authorize-error', 'route' => $this->id . '/authorize/error'],
+                ['verb' => 'POST', 'pattern' => $this->baseEndPoint.'token', 'route' => $this->id.'/token/index'],
+                ['verb' => 'OPTIONS', 'pattern' => $this->baseEndPoint.'token', 'route' => $this->id.'/token/options'],
+                ['verb' => 'GET', 'pattern' => $this->baseEndPoint.'authorize', 'route' => $this->id.'/authorize/index'],
+                ['pattern' => $this->baseEndPoint.'authorize-login', 'route' => $this->id.'/authorize/login'],
+                ['pattern' => $this->baseEndPoint.'authorize-application', 'route' => $this->id.'/authorize/authorize'],
+                ['pattern' => $this->baseEndPoint.'authorize-error', 'route' => $this->id.'/authorize/error'],
             ]);
         }
     }

src/services/redis/JtiService.php

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
      */
     protected function getJtiKey($jid)
     {
-        return $this->namespace . ':' . $jid;
+        return $this->namespace.':'.$jid;
     }
 
     /**
@@ -62,7 +62,7 @@ 
      */
     protected function getSubjectJtisKey($sid)
     {
-        return $this->subjectNamespace . ':' . $sid . ':jtis';
+        return $this->subjectNamespace.':'.$sid.':jtis';
     }
 
     /**
@@ -71,7 +71,7 @@ 
      */
     protected function getClientJtisKey($cid)
     {
-        return $this->clientNamespace . ':' . $cid . ':jtis';
+        return $this->clientNamespace.':'.$cid.':jtis';
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     protected function getJtiListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -87,7 +87,7 @@ 
      */
     protected function getSubjectListKey()
     {
-        return $this->subjectNamespace . ':keys';
+        return $this->subjectNamespace.':keys';
     }
 
     /**
@@ -133,7 +133,7 @@ 
         //check if record exists
         $entityStatus = (int)$this->db->executeCommand('EXISTS', [$jtiKey]);
         if ($entityStatus === 1) {
-            throw new DuplicateKeyException('Duplicate key "' . $jtiKey . '"');
+            throw new DuplicateKeyException('Duplicate key "'.$jtiKey.'"');
         }
 
         $values = $jti->getDirtyAttributes($attributes);
@@ -213,7 +213,7 @@ 
             $newJtiKey = $this->getJtiKey($values[$modelKey]);
             $entityStatus = (int)$this->db->executeCommand('EXISTS', [$newJtiKey]);
             if ($entityStatus === 1) {
-                throw new DuplicateKeyException('Duplicate key "' . $newJtiKey . '"');
+                throw new DuplicateKeyException('Duplicate key "'.$newJtiKey.'"');
             }
         }
 

src/services/redis/AccessTokenService.php

Spacing +7 added lines, -7 removed lines

@@ -55,7 +55,7 @@ 
      */
     protected function getAccessTokenKey($aid)
     {
-        return $this->namespace . ':' . $aid;
+        return $this->namespace.':'.$aid;
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     protected function getUserAccessTokensKey($uid)
     {
-        return $this->userNamespace . ':' . $uid . ':accessTokens';
+        return $this->userNamespace.':'.$uid.':accessTokens';
     }
 
     /**
@@ -75,7 +75,7 @@ 
      */
     protected function getClientAccessTokensKey($cid)
     {
-        return $this->clientNamespace . ':' . $cid . ':accessTokens';
+        return $this->clientNamespace.':'.$cid.':accessTokens';
     }
 
     /**
@@ -83,7 +83,7 @@ 
      */
     protected function getAccessTokenListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -91,7 +91,7 @@ 
      */
     protected function getUserListKey()
     {
-        return $this->userNamespace . ':keys';
+        return $this->userNamespace.':keys';
     }
 
     /**
@@ -137,7 +137,7 @@ 
         //check if record exists
         $entityStatus = (int)$this->db->executeCommand('EXISTS', [$accessTokenKey]);
         if ($entityStatus === 1) {
-            throw new DuplicateKeyException('Duplicate key "' . $accessTokenKey . '"');
+            throw new DuplicateKeyException('Duplicate key "'.$accessTokenKey.'"');
         }
 
         $values = $accessToken->getDirtyAttributes($attributes);
@@ -217,7 +217,7 @@ 
             $newAccessTokenKey = $this->getAccessTokenKey($values[$modelKey]);
             $entityStatus = (int)$this->db->executeCommand('EXISTS', [$newAccessTokenKey]);
             if ($entityStatus === 1) {
-                throw new DuplicateKeyException('Duplicate key "' . $newAccessTokenKey . '"');
+                throw new DuplicateKeyException('Duplicate key "'.$newAccessTokenKey.'"');
             }
         }
 

src/services/redis/ClientService.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
      */
     protected function getClientKey($cid)
     {
-        return $this->namespace . ':' . $cid;
+        return $this->namespace.':'.$cid;
     }
 
     /**
@@ -60,7 +60,7 @@ 
      */
     protected function getClientUsersListKey($cid)
     {
-        return $this->namespace . ':' . $cid . ':users';
+        return $this->namespace.':'.$cid.':users';
     }
 
     /**
@@ -70,7 +70,7 @@ 
      */
     protected function getUserClientsListKey($uid)
     {
-        return $this->userNamespace . ':' . $uid . ':clients';
+        return $this->userNamespace.':'.$uid.':clients';
     }
 
     /**
@@ -78,7 +78,7 @@ 
      */
     protected function getClientListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -115,7 +115,7 @@ 
         //check if record exists
         $entityStatus = (int)$this->db->executeCommand('EXISTS', [$clientKey]);
         if ($entityStatus === 1) {
-            throw new DuplicateKeyException('Duplicate key "' . $clientKey . '"');
+            throw new DuplicateKeyException('Duplicate key "'.$clientKey.'"');
         }
 
         $values = $client->getDirtyAttributes($attributes);
@@ -175,7 +175,7 @@ 
             $newClientKey = $this->getClientKey($values[$modelKey]);
             $entityStatus = (int)$this->db->executeCommand('EXISTS', [$newClientKey]);
             if ($entityStatus === 1) {
-                throw new DuplicateKeyException('Duplicate key "' . $newClientKey . '"');
+                throw new DuplicateKeyException('Duplicate key "'.$newClientKey.'"');
             }
         }
 

src/services/redis/RefreshTokenService.php

Spacing +7 added lines, -7 removed lines

@@ -55,7 +55,7 @@ 
      */
     protected function getRefreshTokenKey($rid)
     {
-        return $this->namespace . ':' . $rid;
+        return $this->namespace.':'.$rid;
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     protected function getUserRefreshTokensKey($uid)
     {
-        return $this->userNamespace . ':' . $uid . ':refreshTokens';
+        return $this->userNamespace.':'.$uid.':refreshTokens';
     }
 
     /**
@@ -75,7 +75,7 @@ 
      */
     protected function getClientRefreshTokensKey($cid)
     {
-        return $this->clientNamespace . ':' . $cid . ':refreshTokens';
+        return $this->clientNamespace.':'.$cid.':refreshTokens';
     }
 
     /**
@@ -83,7 +83,7 @@ 
      */
     protected function getRefreshTokenListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -91,7 +91,7 @@ 
      */
     protected function getUserListKey()
     {
-        return $this->userNamespace . ':keys';
+        return $this->userNamespace.':keys';
     }
 
     /**
@@ -341,7 +341,7 @@ 
         $userRefreshTokens = $this->db->executeCommand('ZRANGE', [$userRefreshTokensKey, 0, -1]);
         $refreshTokens = [];
         if ((is_array($userRefreshTokens) === true) && (count($userRefreshTokens) > 0)) {
-            foreach($userRefreshTokens as $userRefreshTokenId) {
+            foreach ($userRefreshTokens as $userRefreshTokenId) {
                 $refreshTokens[] = $this->findOne($userRefreshTokenId);
             }
         }
@@ -373,7 +373,7 @@ 
         $clientRefreshTokens = $this->db->executeCommand('ZRANGE', [$clientRefreshTokensKey, 0, -1]);
         $refreshTokens = [];
         if ((is_array($clientRefreshTokens) === true) && (count($clientRefreshTokens) > 0)) {
-            foreach($clientRefreshTokens as $clientRefreshTokenId) {
+            foreach ($clientRefreshTokens as $clientRefreshTokenId) {
                 $refreshTokens[] = $this->findOne($clientRefreshTokenId);
             }
         }

src/services/Oauth.php

Spacing +6 added lines, -6 removed lines

@@ -44,38 +44,38 @@
     public static function register($app)
     {
         $module = Module::getInstance();
-        Yii::$container->set('OAuth2\Server', function ($container, $params, $config) use ($module) {
+        Yii::$container->set('OAuth2\Server', function($container, $params, $config) use ($module) {
             $storage = Yii::createObject('sweelix\oauth2\server\storage\OauthStorage');
             $server = new Server($storage, self::prepareServerConfig($config, $module));
             return $server;
         });
 
-        Yii::$container->set('OAuth2\GrantType\AuthorizationCode', function ($container, $params, $config) {
+        Yii::$container->set('OAuth2\GrantType\AuthorizationCode', function($container, $params, $config) {
             $storage = Yii::createObject('sweelix\oauth2\server\storage\OauthStorage');
             $grantType = new AuthorizationCode($storage);
             return $grantType;
         });
 
-        Yii::$container->set('OAuth2\GrantType\ClientCredentials', function ($container, $params, $config) use ($module) {
+        Yii::$container->set('OAuth2\GrantType\ClientCredentials', function($container, $params, $config) use ($module) {
             $storage = Yii::createObject('sweelix\oauth2\server\storage\OauthStorage');
             $grantType = new ClientCredentials($storage, self::prepareServerConfig($config, $module));
             return $grantType;
         });
 
-        Yii::$container->set('OAuth2\GrantType\JwtBearer', function ($container, $params, $config) use ($module) {
+        Yii::$container->set('OAuth2\GrantType\JwtBearer', function($container, $params, $config) use ($module) {
             $storage = Yii::createObject('sweelix\oauth2\server\storage\OauthStorage');
             $audience = Url::to($module->jwtAudience, true);
             $grantType = new JwtBearer($storage, $audience, null, self::prepareServerConfig($config, $module));
             return $grantType;
         });
 
-        Yii::$container->set('OAuth2\GrantType\RefreshToken', function ($container, $params, $config) use ($module) {
+        Yii::$container->set('OAuth2\GrantType\RefreshToken', function($container, $params, $config) use ($module) {
             $storage = Yii::createObject('sweelix\oauth2\server\storage\OauthStorage');
             $grantType = new RefreshToken($storage, self::prepareServerConfig($config, $module));
             return $grantType;
         });
 
-        Yii::$container->set('OAuth2\GrantType\UserCredentials', function ($container, $params, $config) {
+        Yii::$container->set('OAuth2\GrantType\UserCredentials', function($container, $params, $config) {
             $storage = Yii::createObject('sweelix\oauth2\server\storage\OauthStorage');
             $grantType = new UserCredentials($storage);
             return $grantType;

src/commands/ScopeController.php

Spacing +14 added lines, -14 removed lines

@@ -63,13 +63,13 @@ 
         $scope->isDefault = (bool)$this->isDefault;
         $scope->definition = $this->definition;
         if ($scope->save() === true) {
-            $this->stdout('Scope created :' . "\n");
-            $this->stdout(' - id: ' . $scope->id . "\n");
-            $this->stdout(' - isDefault: ' . ($scope->isDefault ? 'Yes' : 'No') . "\n");
-            $this->stdout(' - definition: ' . $scope->definition . "\n");
+            $this->stdout('Scope created :'."\n");
+            $this->stdout(' - id: '.$scope->id."\n");
+            $this->stdout(' - isDefault: '.($scope->isDefault ? 'Yes' : 'No')."\n");
+            $this->stdout(' - definition: '.$scope->definition."\n");
             return ExitCode::OK;
         } else {
-            $this->stdout('Scope cannot be created.' . "\n");
+            $this->stdout('Scope cannot be created.'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }
@@ -91,17 +91,17 @@ 
             $scope->isDefault = $this->isDefault;
             $scope->definition = $this->definition;
             if ($scope->save() === true) {
-                $this->stdout('Scope updated :' . "\n");
-                $this->stdout(' - id: ' . $scope->id . "\n");
-                $this->stdout(' - isDefault: ' . ($scope->isDefault ? 'Yes' : 'No') . "\n");
-                $this->stdout(' - definition: ' . $scope->definition . "\n");
+                $this->stdout('Scope updated :'."\n");
+                $this->stdout(' - id: '.$scope->id."\n");
+                $this->stdout(' - isDefault: '.($scope->isDefault ? 'Yes' : 'No')."\n");
+                $this->stdout(' - definition: '.$scope->definition."\n");
                 return ExitCode::OK;
             } else {
-                $this->stdout('Scope ' . $id . ' cannot be updated' . "\n");
+                $this->stdout('Scope '.$id.' cannot be updated'."\n");
                 return ExitCode::UNSPECIFIED_ERROR;
             }
         } else {
-            $this->stdout('Scope ' . $id . ' does not exist' . "\n");
+            $this->stdout('Scope '.$id.' does not exist'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }
@@ -121,14 +121,14 @@ 
         $scope = $scopeClass::findOne($id);
         if ($scope !== null) {
             if ($scope->delete() === true) {
-                $this->stdout('Scope ' . $id . ' deleted' . "\n");
+                $this->stdout('Scope '.$id.' deleted'."\n");
                 return ExitCode::OK;
             } else {
-                $this->stdout('Scope ' . $id . ' cannot be deleted' . "\n");
+                $this->stdout('Scope '.$id.' cannot be deleted'."\n");
                 return ExitCode::UNSPECIFIED_ERROR;
             }
         } else {
-            $this->stdout('Scope ' . $id . ' does not exist' . "\n");
+            $this->stdout('Scope '.$id.' does not exist'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }

src/commands/ClientController.php

Spacing +17 added lines, -17 removed lines

@@ -79,14 +79,14 @@ 
         $client->scopes = empty($this->scopes) ? null : explode(',', $this->scopes);
         $client->grantTypes = empty($this->grantTypes) ? null : explode(',', $this->grantTypes);
         if ($client->save() === true) {
-            $this->stdout('Client created :' . "\n");
-            $this->stdout(' - id: ' . $client->id . "\n");
-            $this->stdout(' - secret: ' . $client->secret . "\n");
-            $this->stdout(' - name: ' . $client->name . "\n");
-            $this->stdout(' - redirectUri: ' . implode(',', $client->redirectUri) . "\n");
+            $this->stdout('Client created :'."\n");
+            $this->stdout(' - id: '.$client->id."\n");
+            $this->stdout(' - secret: '.$client->secret."\n");
+            $this->stdout(' - name: '.$client->name."\n");
+            $this->stdout(' - redirectUri: '.implode(',', $client->redirectUri)."\n");
             return ExitCode::OK;
         } else {
-            $this->stdout('Client cannot be created.' . "\n");
+            $this->stdout('Client cannot be created.'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }
@@ -99,7 +99,7 @@ 
      */
     protected function getRandomString($length = 40)
     {
-        $bytes = (int)$length / 2;
+        $bytes = (int)$length/2;
         return bin2hex(openssl_random_pseudo_bytes($bytes));
     }
 
@@ -124,18 +124,18 @@ 
             $client->scopes = empty($this->scopes) ? null : explode(',', $this->scopes);
             $client->grantTypes = empty($this->grantTypes) ? null : explode(',', $this->grantTypes);
             if ($client->save() === true) {
-                $this->stdout('Client updated :' . "\n");
-                $this->stdout(' - id: ' . $client->id . "\n");
-                $this->stdout(' - secret: ' . $client->secret . "\n");
-                $this->stdout(' - name: ' . $client->name . "\n");
-                $this->stdout(' - redirectUri: ' . implode(',', $client->redirectUri) . "\n");
+                $this->stdout('Client updated :'."\n");
+                $this->stdout(' - id: '.$client->id."\n");
+                $this->stdout(' - secret: '.$client->secret."\n");
+                $this->stdout(' - name: '.$client->name."\n");
+                $this->stdout(' - redirectUri: '.implode(',', $client->redirectUri)."\n");
                 return ExitCode::OK;
             } else {
-                $this->stdout('Client ' . $id . ' cannot be updated.' . "\n");
+                $this->stdout('Client '.$id.' cannot be updated.'."\n");
                 return ExitCode::UNSPECIFIED_ERROR;
             }
         } else {
-            $this->stdout('Client ' . $id . ' does not exist' . "\n");
+            $this->stdout('Client '.$id.' does not exist'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }
@@ -155,14 +155,14 @@ 
         $client = $clientClass::findOne($id);
         if ($client !== null) {
             if ($client->delete() === true) {
-                $this->stdout('Client ' . $id . ' deleted' . "\n");
+                $this->stdout('Client '.$id.' deleted'."\n");
                 return ExitCode::OK;
             } else {
-                $this->stdout('Client ' . $id . ' cannot be deleted.' . "\n");
+                $this->stdout('Client '.$id.' cannot be deleted.'."\n");
                 return ExitCode::UNSPECIFIED_ERROR;
             }
         } else {
-            $this->stdout('Client ' . $id . ' does not exist' . "\n");
+            $this->stdout('Client '.$id.' does not exist'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }