@@ -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 = Str::randomToken(24); |
| 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)); |
@@ -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))); |