fix authenticateUsing getting called twice

laravel · Apr 23, 2024 · 5fae9fc · 5fae9fc
1 parent 0c1721f
commit 5fae9fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/Actions/AttemptToAuthenticate.php b/src/Actions/AttemptToAuthenticate.php
@@ -69,7 +69,7 @@ public function handle($request, $next)
      */
     protected function handleUsingCustomCallback($request, $next)
     {
-        $user = call_user_func(Fortify::$authenticateUsingCallback, $request);
+        $user = $request['authUser'] ?? call_user_func(Fortify::$authenticateUsingCallback, $request);
 
         if (! $user) {
             $this->fireFailedEvent($request);

diff --git a/src/Actions/RedirectIfTwoFactorAuthenticatable.php b/src/Actions/RedirectIfTwoFactorAuthenticatable.php
@@ -48,7 +48,7 @@ public function __construct(StatefulGuard $guard, LoginRateLimiter $limiter)
      */
     public function handle($request, $next)
     {
-        $user = $this->validateCredentials($request);
+        $user = $request['authUser'] ?? $this->validateCredentials($request);
 
         if (Fortify::confirmsTwoFactorAuthentication()) {
             if (optional($user)->two_factor_secret &&

diff --git a/src/Http/Controllers/AuthenticatedSessionController.php b/src/Http/Controllers/AuthenticatedSessionController.php
@@ -82,6 +82,8 @@ protected function loginPipeline(LoginRequest $request)
             ));
         }
 
+        $request['authUser'] = call_user_func(Fortify::$authenticateUsingCallback, $request);
+
         return (new Pipeline(app()))->send($request)->through(array_filter([
             config('fortify.limiters.login') ? null : EnsureLoginIsNotThrottled::class,
             config('fortify.lowercase_usernames') ? CanonicalizeUsername::class : null,