Skip to content

Commit 3ae70ef

Browse files
committed
Use existing method to handle the login
1 parent 4d3362b commit 3ae70ef

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,21 @@ public function login(Request $request): JsonResponse
6767
$this->sendFailedLoginResponse($request, $user);
6868
}
6969

70-
if ($user->use_totp) {
71-
$token = Str::random(64);
72-
73-
$request->session()->put('auth_confirmation_token', [
74-
'user_id' => $user->id,
75-
'token_value' => $token,
76-
'expires_at' => CarbonImmutable::now()->addMinutes(5),
77-
]);
78-
79-
return new JsonResponse([
80-
'data' => [
81-
'complete' => false,
82-
'confirmation_token' => $token,
83-
],
84-
]);
70+
if (!$user->use_totp) {
71+
return $this->sendLoginResponse($user, $request);
8572
}
8673

87-
$this->auth->guard()->login($user, true);
88-
89-
$request->session()->regenerate();
90-
91-
return $this->sendLoginResponse($user, $request);
74+
$request->session()->put('auth_confirmation_token', [
75+
'user_id' => $user->id,
76+
'token_value' => $token = Str::random(64),
77+
'expires_at' => CarbonImmutable::now()->addMinutes(5),
78+
]);
79+
80+
return new JsonResponse([
81+
'data' => [
82+
'complete' => false,
83+
'confirmation_token' => $token,
84+
],
85+
]);
9286
}
9387
}

0 commit comments

Comments
 (0)