From 191e0adc58b0bbe56b898f33d87d28ff54304d3d Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Sat, 16 Mar 2024 19:28:25 -0400
Subject: [PATCH] Remove recovery token repository

---
 .../Eloquent/RecoveryTokenRepository.php            | 13 -------------
 app/Services/Users/ToggleTwoFactorService.php       |  9 ++++-----
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 app/Repositories/Eloquent/RecoveryTokenRepository.php

diff --git a/app/Repositories/Eloquent/RecoveryTokenRepository.php b/app/Repositories/Eloquent/RecoveryTokenRepository.php
deleted file mode 100644
index b6a01c398..000000000
--- a/app/Repositories/Eloquent/RecoveryTokenRepository.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Repositories\Eloquent;
-
-use App\Models\RecoveryToken;
-
-class RecoveryTokenRepository extends EloquentRepository
-{
-    public function model(): string
-    {
-        return RecoveryToken::class;
-    }
-}
diff --git a/app/Services/Users/ToggleTwoFactorService.php b/app/Services/Users/ToggleTwoFactorService.php
index f510f8d4e..e80d33d94 100644
--- a/app/Services/Users/ToggleTwoFactorService.php
+++ b/app/Services/Users/ToggleTwoFactorService.php
@@ -2,13 +2,13 @@
 
 namespace App\Services\Users;
 
+use App\Models\RecoveryToken;
 use Carbon\Carbon;
 use Illuminate\Support\Str;
 use App\Models\User;
 use PragmaRX\Google2FA\Google2FA;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Encryption\Encrypter;
-use App\Repositories\Eloquent\RecoveryTokenRepository;
 use App\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
 
 class ToggleTwoFactorService
@@ -20,7 +20,6 @@ class ToggleTwoFactorService
         private ConnectionInterface $connection,
         private Encrypter $encrypter,
         private Google2FA $google2FA,
-        private RecoveryTokenRepository $recoveryTokenRepository,
     ) {
     }
 
@@ -68,12 +67,12 @@ class ToggleTwoFactorService
                     $tokens[] = $token;
                 }
 
-                // Before inserting any new records make sure all of the old ones are deleted to avoid
+                // Before inserting any new records make sure all the old ones are deleted to avoid
                 // any issues or storing an unnecessary number of tokens in the database.
-                $this->recoveryTokenRepository->deleteWhere(['user_id' => $user->id]);
+                $user->recoveryTokens()->delete();
 
                 // Bulk insert the hashed tokens.
-                $this->recoveryTokenRepository->insert($inserts);
+                RecoveryToken::query()->insert($inserts);
             }
 
             $user->totp_authenticated_at = now();