@@ -212,10 +212,10 @@ |
||
212 | 212 | return $this; |
213 | 213 | } |
214 | 214 | |
215 | - /** |
|
216 | - * Return the application root path |
|
217 | - * @return string |
|
218 | - */ |
|
215 | + /** |
|
216 | + * Return the application root path |
|
217 | + * @return string |
|
218 | + */ |
|
219 | 219 | public function getAppPath(): string |
220 | 220 | { |
221 | 221 | return $this->appPath; |
@@ -185,11 +185,11 @@ |
||
185 | 185 | } |
186 | 186 | |
187 | 187 | $data = [ |
188 | - 'id' => $user->id, |
|
189 | - 'username' => $user->username, |
|
190 | - 'lastname' => $user->lastname, |
|
191 | - 'firstname' => $user->firstname, |
|
192 | - 'permissions' => array_unique($permissions), |
|
188 | + 'id' => $user->id, |
|
189 | + 'username' => $user->username, |
|
190 | + 'lastname' => $user->lastname, |
|
191 | + 'firstname' => $user->firstname, |
|
192 | + 'permissions' => array_unique($permissions), |
|
193 | 193 | ]; |
194 | 194 | |
195 | 195 | $this->session->set('user', array_merge($data, $this->getUserData($user))); |
@@ -248,12 +248,12 @@ discard block |
||
248 | 248 | $tokenExpire = time() + $expire; |
249 | 249 | $refreshTokenExpire = time() + $refreshExpire; |
250 | 250 | $this->jwt->setSecret($secret) |
251 | - ->setPayload([ |
|
252 | - 'sub' => $user->id, |
|
253 | - 'exp' => $tokenExpire, |
|
254 | - 'permissions' => $permissions, |
|
255 | - ]) |
|
256 | - ->sign(); |
|
251 | + ->setPayload([ |
|
252 | + 'sub' => $user->id, |
|
253 | + 'exp' => $tokenExpire, |
|
254 | + 'permissions' => $permissions, |
|
255 | + ]) |
|
256 | + ->sign(); |
|
257 | 257 | $refreshToken = bin2hex(random_bytes(20)); |
258 | 258 | $jwtToken = $this->jwt->getToken(); |
259 | 259 | |
@@ -267,16 +267,16 @@ discard block |
||
267 | 267 | $this->tokenRepository->save($token); |
268 | 268 | |
269 | 269 | $data = [ |
270 | - 'user' => [ |
|
270 | + 'user' => [ |
|
271 | 271 | 'id' => $user->id, |
272 | 272 | 'username' => $user->username, |
273 | 273 | 'lastname' => $user->lastname, |
274 | 274 | 'firstname' => $user->firstname, |
275 | 275 | 'email' => $user->email, |
276 | 276 | 'permissions' => $permissions, |
277 | - ], |
|
278 | - 'token' => $jwtToken, |
|
279 | - 'refresh_token' => $refreshToken, |
|
277 | + ], |
|
278 | + 'token' => $jwtToken, |
|
279 | + 'refresh_token' => $refreshToken, |
|
280 | 280 | ]; |
281 | 281 | |
282 | 282 | return array_merge($data, $this->getUserData($user, $token)); |
@@ -115,12 +115,12 @@ |
||
115 | 115 | $options = 0 |
116 | 116 | ) { |
117 | 117 | static $special = [ |
118 | - 'true' => true, |
|
119 | - 'TRUE' => true, |
|
120 | - 'false' => false, |
|
121 | - 'FALSE' => false, |
|
122 | - 'null' => null, |
|
123 | - 'NULL' => null, |
|
118 | + 'true' => true, |
|
119 | + 'TRUE' => true, |
|
120 | + 'false' => false, |
|
121 | + 'FALSE' => false, |
|
122 | + 'null' => null, |
|
123 | + 'NULL' => null, |
|
124 | 124 | ]; |
125 | 125 | |
126 | 126 | $valueResolved = static::resolveReference($value); |
@@ -120,7 +120,7 @@ |
||
120 | 120 | */ |
121 | 121 | protected function shouldBeProcessed(ServerRequestInterface $request): bool |
122 | 122 | { |
123 | - //If no route has been match no need check |
|
123 | + //If no route has been match no need check |
|
124 | 124 | /** @var Route|null $route */ |
125 | 125 | $route = $request->getAttribute(Route::class); |
126 | 126 | if ($route === null) { |
@@ -80,27 +80,27 @@ discard block |
||
80 | 80 | $this->clientService = $clientService; |
81 | 81 | } |
82 | 82 | |
83 | - /** |
|
84 | - * {@inheritdoc} |
|
85 | - */ |
|
83 | + /** |
|
84 | + * {@inheritdoc} |
|
85 | + */ |
|
86 | 86 | public function cleanExpiredTokens(): void |
87 | 87 | { |
88 | 88 | $this->query()->where('expires')->lte(date('Y-m-d H:i:s')) |
89 | - ->delete(); |
|
89 | + ->delete(); |
|
90 | 90 | } |
91 | 91 | |
92 | - /** |
|
93 | - * {@inheritdoc} |
|
94 | - */ |
|
92 | + /** |
|
93 | + * {@inheritdoc} |
|
94 | + */ |
|
95 | 95 | public function deleteToken(BaseToken $token): bool |
96 | 96 | { |
97 | 97 | return $this->query()->where('refresh_token')->is($token->getToken()) |
98 | - ->delete() >= 0; |
|
98 | + ->delete() >= 0; |
|
99 | 99 | } |
100 | 100 | |
101 | - /** |
|
102 | - * {@inheritdoc} |
|
103 | - */ |
|
101 | + /** |
|
102 | + * {@inheritdoc} |
|
103 | + */ |
|
104 | 104 | public function getByToken(string $token): ?BaseToken |
105 | 105 | { |
106 | 106 | $refreshToken = $this->find($token); |
@@ -122,17 +122,17 @@ discard block |
||
122 | 122 | ]); |
123 | 123 | } |
124 | 124 | |
125 | - /** |
|
126 | - * {@inheritdoc} |
|
127 | - */ |
|
125 | + /** |
|
126 | + * {@inheritdoc} |
|
127 | + */ |
|
128 | 128 | public function isTokenExists(string $token): bool |
129 | 129 | { |
130 | 130 | return $this->find($token) !== null; |
131 | 131 | } |
132 | 132 | |
133 | - /** |
|
134 | - * {@inheritdoc} |
|
135 | - */ |
|
133 | + /** |
|
134 | + * {@inheritdoc} |
|
135 | + */ |
|
136 | 136 | public function saveRefreshToken(RefreshToken $token): RefreshToken |
137 | 137 | { |
138 | 138 | $clientId = null; |
@@ -93,8 +93,8 @@ |
||
93 | 93 | public function getDefaultScopes(): array |
94 | 94 | { |
95 | 95 | $result = $this->query() |
96 | - ->where('is_default')->is(1) |
|
97 | - ->all(); |
|
96 | + ->where('is_default')->is(1) |
|
97 | + ->all(); |
|
98 | 98 | $scopes = []; |
99 | 99 | foreach ($result as $row) { |
100 | 100 | $scopes[] = Scope::createNewScope( |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function cleanExpiredTokens(): void |
87 | 87 | { |
88 | 88 | $this->query()->where('expires')->lte(date('Y-m-d H:i:s')) |
89 | - ->delete(); |
|
89 | + ->delete(); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | public function deleteToken(BaseToken $token): bool |
96 | 96 | { |
97 | 97 | return $this->query()->where('authorization_code')->is($token->getToken()) |
98 | - ->delete() >= 0; |
|
98 | + ->delete() >= 0; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | public function cleanExpiredTokens(): void |
87 | 87 | { |
88 | 88 | $this->query()->where('expires')->lte(date('Y-m-d H:i:s')) |
89 | - ->delete(); |
|
89 | + ->delete(); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | public function deleteToken(BaseToken $token): bool |
96 | 96 | { |
97 | 97 | return $this->query()->where('access_token')->is($token->getToken()) |
98 | - ->delete() >= 0; |
|
98 | + ->delete() >= 0; |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |