wip

Author: chrysanthos

src/Middleware/RedirectToOtpPage.php

@@ -39,11 +39,11 @@ public function handle(Request $request, Closure $next)
         }
 
         if (! Session::has($otpService->generateVerifiedKey($user))) {
-            if (! Session::has($otpService->generateOtpSentKey($user))) {
+            if (! $otpService->optSendRecently($user)) {
                 $otpService->generateOtpAndSend($user);
             }
 
-            if ($request->header('X-Inertia')) {
+            if ($request->header('X-Inertia') && function_exists('inertia')) {
                 return inertia()->location(route('2fa.index'));
             }
 

src/Support/OtpService.php

@@ -9,6 +9,8 @@
 
 class OtpService
 {
+    protected $resendAfterMinutes = 2;
+
     /**
      * @param  User  $user
      * @return void
@@ -23,7 +25,7 @@ public function generateOtpAndSend(User $user)
 
         $user->notify(new $class($otp));
 
-        Session::put($this->generateOtpSentKey($user), true);
+        Session::put($this->generateOtpSentKey($user), time());
     }
 
     public function generateRandomOtp(): int
@@ -56,6 +58,17 @@ public function generateOtpSentKey(Authenticatable $user): string
         return get_class($user).'-'.$user->id.'otp-sent';
     }
 
+    public function optSendRecently(Authenticatable $user): bool
+    {
+        if (!Session::has($key = $this->generateOtpSentKey($user))) {
+            return false;
+        }
+
+        $otpSentAt = Session::get($key);
+
+        return $otpSentAt > time() - (60 * $this->resendAfterMinutes);
+    }
+
     public function shouldCoverRoutePath(string $path): bool
     {
         $paths = Arr::wrap(config('otp.paths'));