From 0762191e8b8a23da7446cf67329c5ba04d8900a2 Mon Sep 17 00:00:00 2001
From: Dries Vints <dries@vints.io>
Date: Mon, 8 Mar 2021 14:44:09 +0100
Subject: [PATCH] Fix two factor login check (#235)

---
 src/Http/Requests/TwoFactorLoginRequest.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Http/Requests/TwoFactorLoginRequest.php b/src/Http/Requests/TwoFactorLoginRequest.php
index 39732427..051959d6 100644
--- a/src/Http/Requests/TwoFactorLoginRequest.php
+++ b/src/Http/Requests/TwoFactorLoginRequest.php
@@ -82,13 +82,10 @@ public function validRecoveryCode()
      */
     public function hasChallengedUser()
     {
-        try {
-            $user = $this->challengedUser();
-        } catch (HttpResponseException $e) {
-            return false;
-        }
+        $model = app(StatefulGuard::class)->getProvider()->getModel();
 
-        return $user !== null;
+        return $this->session()->has('login.id') &&
+            $model::find($this->session()->get('login.id'));
     }
 
     /**