wip

Author: chrysanthos

src/Listeners/OtpListener.php

@@ -7,7 +7,6 @@
 use Illuminate\Auth\Events\Logout;
 use Illuminate\Foundation\Auth\User;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Session;
 
 class OtpListener
 {
@@ -20,19 +19,7 @@ public function generate(Login $event)
             return;
         }
 
-        $service = app(OtpService::class);
-
-        if (Session::get($key = $service->generateKey($user))) {
-            return;
-        }
-
-        $otp = $service->generateRandomOtp();
-
-        $service->storeOtpCode($key, $otp);
-
-        $class = config('otp.notification');
-
-        $user->notify(new $class($otp));
+        app(OtpService::class)->generateOtpAndSend($user);
     }
 
     public function clear(Logout $event)

src/Support/OtpService.php

@@ -3,10 +3,27 @@
 namespace Chrysanthos\LaravelOtp\Support;
 
 use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Foundation\Auth\User;
 use Illuminate\Support\Facades\Session;
 
 class OtpService
 {
+    /**
+     * @param User $user
+     *
+     * @return void
+     */
+    public function generateOtpAndSend(User $user)
+    {
+        $otp = $this->generateRandomOtp();
+
+        $this->storeOtpCode($this->generateKey($user), $otp);
+
+        $class = config('otp.notification');
+
+        $user->notify(new $class($otp));
+    }
+
     public function generateRandomOtp(): int
     {
         return random_int(100001, 999999);