From 706dd6523e27d852412f58188434d27d34d7cb87 Mon Sep 17 00:00:00 2001
From: Lance Pioch <git@lance.sh>
Date: Sat, 22 Oct 2022 20:06:44 -0400
Subject: [PATCH] Replace 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 5d4dc4850..000000000
--- a/app/Repositories/Eloquent/RecoveryTokenRepository.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Pterodactyl\Repositories\Eloquent;
-
-use Pterodactyl\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 a91615b1c..bf4ba5ea6 100644
--- a/app/Services/Users/ToggleTwoFactorService.php
+++ b/app/Services/Users/ToggleTwoFactorService.php
@@ -6,10 +6,10 @@ use Carbon\Carbon;
 use Illuminate\Support\Str;
 use Pterodactyl\Models\User;
 use PragmaRX\Google2FA\Google2FA;
+use Pterodactyl\Models\RecoveryToken;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Contracts\Encryption\Encrypter;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
-use Pterodactyl\Repositories\Eloquent\RecoveryTokenRepository;
 use Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid;
 
 class ToggleTwoFactorService
@@ -21,7 +21,6 @@ class ToggleTwoFactorService
         private ConnectionInterface $connection,
         private Encrypter $encrypter,
         private Google2FA $google2FA,
-        private RecoveryTokenRepository $recoveryTokenRepository,
         private UserRepositoryInterface $repository
     ) {
     }
@@ -70,12 +69,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);
             }
 
             $this->repository->withoutFreshModel()->update($user->id, [