wip

Author: iamgergo

src/Http/Controllers/Auth/LoginController.php

@@ -59,7 +59,7 @@ public function login(Request $request): RedirectResponse
 
         if ($request->user()->can('viewRoot') && $request->user()->shouldTwoFactorAuthenticate($request)) {
             $request->user()->notify(
-                new AuthCodeNotification($request->user()->authCodes()->create())
+                new AuthCodeNotification($request->user()->generateAuthCode())
             );
 
             $request->session()->flash('status', __('The two factor authentication link has been sent!'));

src/Http/Controllers/Auth/TwoFactorController.php

@@ -79,7 +79,7 @@ public function verify(Request $request): RedirectResponse
      */
     public function resend(Request $request): RedirectResponse
     {
-        $code = $request->user()->authCodes()->create();
+        $code = $request->user()->generateAuthCode();
 
         $request->user()->notify(new AuthCodeNotification($code));
 

src/Interfaces/Models/User.php

@@ -4,6 +4,7 @@
 
 namespace Cone\Root\Interfaces\Models;
 
+use Cone\Root\Models\AuthCode;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -34,4 +35,9 @@ public function authCodes(): HasMany;
      * Determine whether the object requires two factor authentication.
      */
     public function requiresTwoFactorAuthentication(): bool;
+
+    /**
+     * Generate a new auth code for the user.
+     */
+    public function generateAuthCode(): AuthCode;
 }

src/Models/AuthCode.php

@@ -23,7 +23,9 @@ class AuthCode extends Model implements Contract
      *
      * @var list<string>
      */
-    protected $fillable = [];
+    protected $fillable = [
+        'code',
+    ];
 
     /**
      * The table associated with the model.

src/Models/User.php

@@ -15,6 +15,7 @@
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Http\Request;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Date;
 
 class User extends Authenticatable implements Contract
 {
@@ -103,6 +104,22 @@ public function shouldTwoFactorAuthenticate(Request $request): bool
         return ! $request->session()->has('root.auth.two-factor');
     }
 
+    /**
+     * Generate a new auth code for the user.
+     */
+    public function generateAuthCode(): AuthCode
+    {
+        $this->authCodes()->delete();
+
+        $code = $this->authCodes()->make()->forceFill([
+            'expires_at' => Date::now()->addMinutes(5),
+        ]);
+
+        $code->save();
+
+        return $code;
+    }
+
     /**
      * Generate a device token.
      */