From 4cb719800694340887bb64cbe94af44dcd1879ec Mon Sep 17 00:00:00 2001
From: Adam Daley <admdly@users.noreply.github.com>
Date: Tue, 28 Apr 2026 12:39:31 +0100
Subject: [PATCH] Remove `ClientPasswordResetTable` and inline cleanup (#3453)

---
 .../Model/ClientPasswordResetTable.php        | 50 -------------------
 src/modules/Client/Service.php                |  6 ++-
 2 files changed, 4 insertions(+), 52 deletions(-)
 delete mode 100644 src/library/Model/ClientPasswordResetTable.php

diff --git a/src/library/Model/ClientPasswordResetTable.php b/src/library/Model/ClientPasswordResetTable.php
deleted file mode 100644
index 5f49d1941..000000000
--- a/src/library/Model/ClientPasswordResetTable.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * Copyright 2022-2025 FOSSBilling
- * Copyright 2011-2021 BoxBilling, Inc.
- * SPDX-License-Identifier: Apache-2.0.
- *
- * @copyright FOSSBilling (https://www.fossbilling.org)
- * @license http://www.apache.org/licenses/LICENSE-2.0 Apache-2.0
- */
-class Model_ClientPasswordResetTable implements FOSSBilling\InjectionAwareInterface
-{
-    protected ?Pimple\Container $di = null;
-
-    public function setDi(Pimple\Container $di): void
-    {
-        $this->di = $di;
-    }
-
-    public function getDi(): ?Pimple\Container
-    {
-        return $this->di;
-    }
-
-    public function generate(Model_Client $client, $ip)
-    {
-        $r = $this->di['db']->findOne('ClientPasswordReset', 'client_id', $client->id);
-        if (!$r instanceof Model_ClientPasswordReset) {
-            $r = $this->di['db']->dispense('ClientPasswordReset');
-            $r->created_at = date('Y-m-d H:i:s');
-            $r->client_id = $client->id;
-        }
-
-        $r->ip = $ip;
-        $r->hash = hash('sha256', random_int(50, random_int(10, 99)));
-        $r->updated_at = date('Y-m-d H:i:s');
-        $this->di['db']->store($r);
-
-        return $r;
-    }
-
-    public function rmByClient(Model_Client $client): void
-    {
-        $models = $this->di['db']->find('ClientPasswordReset', 'client_id = ?', [$client->id]);
-        foreach ($models as $model) {
-            $this->di['db']->trash($model);
-        }
-    }
-}
diff --git a/src/modules/Client/Service.php b/src/modules/Client/Service.php
index 6d076871c..1abfba338 100644
--- a/src/modules/Client/Service.php
+++ b/src/modules/Client/Service.php
@@ -663,8 +663,10 @@ class Service implements InjectionAwareInterface
         $service = $this->di['mod_service']('Activity');
         $service->rmByClient($model);
 
-        $table = $this->di['table']('ClientPasswordReset');
-        $table->rmByClient($model);
+        $resetRecords = $this->di['db']->find('ClientPasswordReset', 'client_id = ?', [$model->id]);
+        foreach ($resetRecords as $resetRecord) {
+            $this->di['db']->trash($resetRecord);
+        }
 
         $query = $this->di['dbal']->createQueryBuilder();
         $query