From dccacbe93211d59b0ccd55ff7f9b93ae940e98fc Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Feb 2025 10:35:51 -0500
Subject: [PATCH 1/2] revert

---
 .../LaravelTwelveTokenRepository.php          | 98 -------------------
 src/Auth/Passwords/PasswordBrokerManager.php  | 15 +--
 2 files changed, 2 insertions(+), 111 deletions(-)
 delete mode 100644 src/Auth/Passwords/LaravelTwelveTokenRepository.php

diff --git a/src/Auth/Passwords/LaravelTwelveTokenRepository.php b/src/Auth/Passwords/LaravelTwelveTokenRepository.php
deleted file mode 100644
index 17b2891cc2..0000000000
--- a/src/Auth/Passwords/LaravelTwelveTokenRepository.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Statamic\Auth\Passwords;
-
-use Illuminate\Auth\Passwords\DatabaseTokenRepository;
-use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
-use Illuminate\Contracts\Hashing\Hasher as HasherContract;
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Carbon;
-use Statamic\Facades\YAML;
-
-/** @deprecated  */
-class LaravelTwelveTokenRepository extends DatabaseTokenRepository
-{
-    protected $path;
-
-    public function __construct(
-        protected Filesystem $files,
-        protected HasherContract $hasher,
-        protected string $table,
-        protected string $hashKey,
-        protected int $expires = 3600,
-        protected int $throttle = 60
-    ) {
-        $this->path = storage_path("statamic/password_resets/$table.yaml");
-    }
-
-    public function create(CanResetPasswordContract $user)
-    {
-        $email = $user->getEmailForPasswordReset();
-
-        $token = $this->createNewToken();
-
-        $this->insert($this->getPayload($email, $token));
-
-        return $token;
-    }
-
-    protected function insert($payload)
-    {
-        $resets = $this->getResets();
-
-        $resets[$payload['email']] = [
-            'token' => $payload['token'],
-            'created_at' => $payload['created_at']->timestamp,
-        ];
-
-        $this->putResets($resets);
-    }
-
-    public function delete(CanResetPasswordContract $user)
-    {
-        $this->putResets(
-            $this->getResets()->forget($user->email())
-        );
-    }
-
-    public function deleteExpired()
-    {
-        $this->putResets($this->getResets()->reject(function ($item, $email) {
-            return $this->tokenExpired($item['created_at']);
-        }));
-    }
-
-    public function exists(CanResetPasswordContract $user, $token)
-    {
-        $record = $this->getResets()->get($user->email());
-
-        return $record &&
-            ! $this->tokenExpired(Carbon::createFromTimestamp($record['created_at'], config('app.timezone')))
-            && $this->hasher->check($token, $record['token']);
-    }
-
-    public function recentlyCreatedToken(CanResetPasswordContract $user)
-    {
-        $record = $this->getResets()->get($user->email());
-
-        return $record && parent::tokenRecentlyCreated($record['created_at']);
-    }
-
-    protected function getResets()
-    {
-        if (! $this->files->exists($this->path)) {
-            return collect();
-        }
-
-        return collect(YAML::parse($this->files->get($this->path)));
-    }
-
-    protected function putResets($resets)
-    {
-        if (! $this->files->isDirectory($dir = dirname($this->path))) {
-            $this->files->makeDirectory($dir);
-        }
-
-        $this->files->put($this->path, YAML::dump($resets->all()));
-    }
-}
diff --git a/src/Auth/Passwords/PasswordBrokerManager.php b/src/Auth/Passwords/PasswordBrokerManager.php
index 0267a1e2ac..3e70c7cd14 100644
--- a/src/Auth/Passwords/PasswordBrokerManager.php
+++ b/src/Auth/Passwords/PasswordBrokerManager.php
@@ -15,23 +15,12 @@ protected function createTokenRepository(array $config)
             $key = base64_decode(substr($key, 7));
         }
 
-        if (version_compare(app()->version(), '12', '<')) {
-            return new TokenRepository(
-                $this->app['files'],
-                $this->app['hash'],
-                $config['table'],
-                $key,
-                $config['expire'],
-                $config['throttle'] ?? 0
-            );
-        }
-
-        return new LaravelTwelveTokenRepository(
+        return new TokenRepository(
             $this->app['files'],
             $this->app['hash'],
             $config['table'],
             $key,
-            ($config['expire'] ?? 60) * 60,
+            $config['expire'],
             $config['throttle'] ?? 0
         );
     }

From 41a84b4adee7f70f0aefd07df52f52f240339359 Mon Sep 17 00:00:00 2001
From: Jason Varga <jason@pixelfear.com>
Date: Wed, 26 Feb 2025 10:47:21 -0500
Subject: [PATCH 2/2] dont redefine the properties

---
 src/Auth/Passwords/TokenRepository.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Auth/Passwords/TokenRepository.php b/src/Auth/Passwords/TokenRepository.php
index 0a717929fb..3ba24434f5 100644
--- a/src/Auth/Passwords/TokenRepository.php
+++ b/src/Auth/Passwords/TokenRepository.php
@@ -12,9 +12,6 @@
 class TokenRepository extends DatabaseTokenRepository
 {
     protected $files;
-    protected $hasher;
-    protected $hashKey;
-    protected $expires;
     protected $path;
 
     public function __construct(Filesystem $files, HasherContract $hasher, $table, $hashKey, $expires = 60, $throttle = 60)