wip

Author: chrysanthos

src/Http/Controllers/OtpVerificationController.php

@@ -5,7 +5,6 @@
 use Chrysanthos\LaravelOtp\Support\OtpService;
 use Illuminate\Foundation\Auth\User;
 use Illuminate\Routing\Controller;
-use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Session;
 
 class OtpVerificationController extends Controller
@@ -25,7 +24,7 @@ public function send()
         $key = $service->generateKey($user);
 
         if ($service->check($user, request()->integer('otp-code'))) {
-            Cache::forever($service->generateVerifiedKey($user), true);
+            Session::put($service->generateVerifiedKey($user), true);
             Session::forget($key);
 
             return redirect()->intended('/dashboard');

src/Listeners/OtpListener.php

@@ -6,7 +6,7 @@
 use Illuminate\Auth\Events\Login;
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Foundation\Auth\User;
-use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Session;
 
 class OtpListener
 {
@@ -24,7 +24,7 @@ public function generate(Login $event)
 
     public function clear(Logout $event)
     {
-        Cache::forget(
+        Session::forget(
             app(OtpService::class)->generateVerifiedKey($event->user)
         );
     }

src/Middleware/RedirectToOtpPage.php

@@ -6,7 +6,7 @@
 use Closure;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Session;
 use Symfony\Component\HttpFoundation\Response;
 
 class RedirectToOtpPage
@@ -32,7 +32,13 @@ public function handle(Request $request, Closure $next)
             return $next($request);
         }
 
-        if (Cache::missing(app(OtpService::class)->generateVerifiedKey($user))) {
+        $otpService = app(OtpService::class);
+
+        if (!Session::has($otpService->generateVerifiedKey($user))) {
+            if (!Session::has($otpService->generateOtpSentKey($user))) {
+                $otpService->generateOtpAndSend($user);
+            }
+
             if ($request->header('X-Inertia')) {
                 return inertia()->location(route('2fa.index'));
             }

src/Support/OtpService.php

@@ -47,4 +47,9 @@ public function generateVerifiedKey(Authenticatable $user): string
     {
         return get_class($user).'-'.$user->id.'2fa-verified';
     }
+
+    public function generateOtpSentKey(Authenticatable $user): string
+    {
+        return get_class($user).'-'.$user->id.'otp-sent';
+    }
 }