@@ -187,15 +187,15 @@ |
||
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | $data = [ |
| 190 | - 'user' => [ |
|
| 190 | + 'user' => [ |
|
| 191 | 191 | 'id' => $user->id, |
| 192 | 192 | 'username' => $user->username, |
| 193 | 193 | 'lastname' => $user->lastname, |
| 194 | 194 | 'firstname' => $user->firstname, |
| 195 | 195 | 'email' => $user->email, |
| 196 | 196 | 'status' => $user->status, |
| 197 | - ], |
|
| 198 | - 'permissions' => $permissions, |
|
| 197 | + ], |
|
| 198 | + 'permissions' => $permissions, |
|
| 199 | 199 | ]; |
| 200 | 200 | |
| 201 | 201 | $loginData = array_merge($data, $this->getUserData($user)); |
@@ -230,12 +230,12 @@ discard block |
||
| 230 | 230 | $tokenExpire = time() + $expire; |
| 231 | 231 | $refreshTokenExpire = time() + $refreshExpire; |
| 232 | 232 | $this->jwt->setSecret($secret) |
| 233 | - ->setPayload([ |
|
| 234 | - 'sub' => $user->id, |
|
| 235 | - 'exp' => $tokenExpire, |
|
| 236 | - 'permissions' => $permissions, |
|
| 237 | - ]) |
|
| 238 | - ->sign(); |
|
| 233 | + ->setPayload([ |
|
| 234 | + 'sub' => $user->id, |
|
| 235 | + 'exp' => $tokenExpire, |
|
| 236 | + 'permissions' => $permissions, |
|
| 237 | + ]) |
|
| 238 | + ->sign(); |
|
| 239 | 239 | |
| 240 | 240 | $refreshToken = Str::random(64); |
| 241 | 241 | $jwtToken = $this->jwt->getToken(); |
@@ -249,17 +249,17 @@ discard block |
||
| 249 | 249 | $this->tokenRepository->save($token); |
| 250 | 250 | |
| 251 | 251 | $data = [ |
| 252 | - 'user' => [ |
|
| 252 | + 'user' => [ |
|
| 253 | 253 | 'id' => $user->id, |
| 254 | 254 | 'username' => $user->username, |
| 255 | 255 | 'lastname' => $user->lastname, |
| 256 | 256 | 'firstname' => $user->firstname, |
| 257 | 257 | 'email' => $user->email, |
| 258 | 258 | 'status' => $user->status, |
| 259 | - ], |
|
| 260 | - 'permissions' => $permissions, |
|
| 261 | - 'token' => $jwtToken, |
|
| 262 | - 'refresh_token' => $refreshToken, |
|
| 259 | + ], |
|
| 260 | + 'permissions' => $permissions, |
|
| 261 | + 'token' => $jwtToken, |
|
| 262 | + 'refresh_token' => $refreshToken, |
|
| 263 | 263 | ]; |
| 264 | 264 | |
| 265 | 265 | return array_merge($data, $this->getUserData($user, $token)); |