pgaultier /
yii2-oauth2
@@ -32,8 +32,8 @@ |
||
| 32 | 32 | <div class="row"> |
| 33 | 33 | <div class="col-md-push-3 col-md-6 col-sm-push-2 col-sm-8 col-xs-12 white-panel"> |
| 34 | 34 | <div class="alert" role="alert"> |
| 35 | - <h4 class="alert-heading"><?php echo ($type ? : 'Unkown error'); ?></h4> |
|
| 36 | - <p><?php echo ($description ? : 'Please check your request'); ?></p> |
|
| 35 | + <h4 class="alert-heading"><?php echo ($type ?: 'Unkown error'); ?></h4> |
|
| 36 | + <p><?php echo ($description ?: 'Please check your request'); ?></p> |
|
| 37 | 37 | </div> |
| 38 | 38 | </div> |
| 39 | 39 | </div> |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | </head> |
| 28 | 28 | <body> |
| 29 | 29 | <?php $this->beginBody(); ?> |
| 30 | - <?php echo $content;?> |
|
| 30 | + <?php echo $content; ?> |
|
| 31 | 31 | <?php $this->endBody(); ?> |
| 32 | 32 | </body> |
| 33 | 33 | |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | if (is_array($data) === false) { |
| 74 | 74 | $data = explode(' ', $data); |
| 75 | 75 | } |
| 76 | - foreach($data as $redirectUri) { |
|
| 76 | + foreach ($data as $redirectUri) { |
|
| 77 | 77 | $isLocalhost = strncmp('http://localhost', $redirectUri, 16); |
| 78 | 78 | $isSecureLocalhost = strncmp('https://localhost', $redirectUri, 17); |
| 79 | 79 | if (($isLocalhost !== 0) && ($isSecureLocalhost !== 0)) { |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | */ |
| 56 | 56 | protected function getAccessTokenKey($aid) |
| 57 | 57 | { |
| 58 | - return $this->namespace . ':' . $aid; |
|
| 58 | + return $this->namespace.':'.$aid; |
|
| 59 | 59 | } |
| 60 | 60 | |
| 61 | 61 | /** |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | protected function getUserAccessTokensKey($uid) |
| 67 | 67 | { |
| 68 | - return $this->userNamespace . ':' . $uid . ':accessTokens'; |
|
| 68 | + return $this->userNamespace.':'.$uid.':accessTokens'; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | */ |
| 76 | 76 | protected function getClientAccessTokensKey($cid) |
| 77 | 77 | { |
| 78 | - return $this->clientNamespace . ':' . $cid . ':accessTokens'; |
|
| 78 | + return $this->clientNamespace.':'.$cid.':accessTokens'; |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | /** |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | $userAccessTokens = $this->db->executeCommand('SMEMBERS', [$userAccessTokensKey]); |
| 290 | 290 | $accessTokens = []; |
| 291 | 291 | if ((is_array($userAccessTokens) === true) && (count($userAccessTokens) > 0)) { |
| 292 | - foreach($userAccessTokens as $userAccessTokenId) { |
|
| 292 | + foreach ($userAccessTokens as $userAccessTokenId) { |
|
| 293 | 293 | $accessTokens[] = $this->findOne($userAccessTokenId); |
| 294 | 294 | } |
| 295 | 295 | } |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | $clientAccessTokens = $this->db->executeCommand('SMEMBERS', [$clientAccessTokensKey]); |
| 306 | 306 | $accessTokens = []; |
| 307 | 307 | if ((is_array($clientAccessTokens) === true) && (count($clientAccessTokens) > 0)) { |
| 308 | - foreach($clientAccessTokens as $clientAccessTokenId) { |
|
| 308 | + foreach ($clientAccessTokens as $clientAccessTokenId) { |
|
| 309 | 309 | $accessTokens[] = $this->findOne($clientAccessTokenId); |
| 310 | 310 | } |
| 311 | 311 | } |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | */ |
| 55 | 55 | protected function getRefreshTokenKey($rid) |
| 56 | 56 | { |
| 57 | - return $this->namespace . ':' . $rid; |
|
| 57 | + return $this->namespace.':'.$rid; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | /** |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | */ |
| 65 | 65 | protected function getUserRefreshTokensKey($uid) |
| 66 | 66 | { |
| 67 | - return $this->userNamespace . ':' . $uid . ':refreshTokens'; |
|
| 67 | + return $this->userNamespace.':'.$uid.':refreshTokens'; |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | /** |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | */ |
| 75 | 75 | protected function getClientRefreshTokensKey($cid) |
| 76 | 76 | { |
| 77 | - return $this->clientNamespace . ':' . $cid . ':refreshTokens'; |
|
| 77 | + return $this->clientNamespace.':'.$cid.':refreshTokens'; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | $userRefreshTokens = $this->db->executeCommand('SMEMBERS', [$userRefreshTokensKey]); |
| 290 | 290 | $refreshTokens = []; |
| 291 | 291 | if ((is_array($userRefreshTokens) === true) && (count($userRefreshTokens) > 0)) { |
| 292 | - foreach($userRefreshTokens as $userRefreshTokenId) { |
|
| 292 | + foreach ($userRefreshTokens as $userRefreshTokenId) { |
|
| 293 | 293 | $refreshTokens[] = $this->findOne($userRefreshTokenId); |
| 294 | 294 | } |
| 295 | 295 | } |
@@ -305,7 +305,7 @@ discard block |
||
| 305 | 305 | $clientRefreshTokens = $this->db->executeCommand('SMEMBERS', [$clientRefreshTokensKey]); |
| 306 | 306 | $refreshTokens = []; |
| 307 | 307 | if ((is_array($clientRefreshTokens) === true) && (count($clientRefreshTokens) > 0)) { |
| 308 | - foreach($clientRefreshTokens as $clientRefreshTokenId) { |
|
| 308 | + foreach ($clientRefreshTokens as $clientRefreshTokenId) { |
|
| 309 | 309 | $refreshTokens[] = $this->findOne($clientRefreshTokenId); |
| 310 | 310 | } |
| 311 | 311 | } |
@@ -85,6 +85,7 @@ |
||
| 85 | 85 | |
| 86 | 86 | /** |
| 87 | 87 | * @param mixed $config |
| 88 | + * @param \yii\base\Module|null $module |
|
| 88 | 89 | * @return array Oauth server configuration |
| 89 | 90 | * @since 1.0.0 |
| 90 | 91 | */ |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | */ |
| 57 | 57 | public function updateAttribute() |
| 58 | 58 | { |
| 59 | - foreach($this->attributes as $attribute) { |
|
| 59 | + foreach ($this->attributes as $attribute) { |
|
| 60 | 60 | if (empty($this->owner->{$attribute}) === true) { |
| 61 | 61 | $this->owner->{$attribute} = []; |
| 62 | 62 | } elseif (is_array($this->owner->{$attribute}) === false) { |
@@ -174,7 +174,7 @@ |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | $headers = $oauthResponse->getHttpHeaders(); |
| 177 | - foreach($headers as $name => $value) |
|
| 177 | + foreach ($headers as $name => $value) |
|
| 178 | 178 | { |
| 179 | 179 | $response->headers->set($name, $value); |
| 180 | 180 | } |
@@ -224,7 +224,7 @@ |
||
| 224 | 224 | $requestedScopes = []; |
| 225 | 225 | if (empty($additionalScopes) === false) { |
| 226 | 226 | $additionalScopes = explode(' ', $additionalScopes); |
| 227 | - foreach($additionalScopes as $scope) { |
|
| 227 | + foreach ($additionalScopes as $scope) { |
|
| 228 | 228 | $dbScope = Scope::findOne($scope); |
| 229 | 229 | if ($dbScope !== null) { |
| 230 | 230 | $requestedScopes[] = $dbScope; |
