Merge pull request #339 from VSP-Technologies/support-email-verificat…

…ion-and-two-factor fix #233
jeffgreco13 · Mar 2, 2024 · e7a9aa4 · e7a9aa4
2 parents cee88e8 + bace9de
commit e7a9aa4
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/BreezyCore.php b/src/BreezyCore.php
@@ -319,6 +319,10 @@ public function verify(string $code, ?Authenticatable $user = null)
 
     public function shouldForceTwoFactor(): bool
     {
+        if ($this->getCurrentPanel()->isEmailVerificationRequired()) {
+            return $this->forceTwoFactorAuthentication && ! $this->auth()->user()?->hasConfirmedTwoFactor() && $this->auth()->user()?->hasVerifiedEmail();
+        }
+
         return $this->forceTwoFactorAuthentication && ! $this->auth()->user()?->hasConfirmedTwoFactor();
     }