From 9e49d331add38ea4abf46972c1c9a1f8e13eda30 Mon Sep 17 00:00:00 2001 From: fogelito Date: Wed, 12 Aug 2026 16:05:31 +0300 Subject: [PATCH 1/3] Delete --- src/Appwrite/Platform/Workers/Deletes.php | 35 ++++++++++++++++------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php index 0b64907ca1..773e1d0753 100644 --- a/src/Appwrite/Platform/Workers/Deletes.php +++ b/src/Appwrite/Platform/Workers/Deletes.php @@ -210,7 +210,7 @@ class Deletes extends Action $this->deleteExecutionLogs($project, $getProjectDB, $executionRetention, $executionsRetentionCount); $this->deleteUsageStats($project, $getProjectDB, $getLogsDB, $hourlyUsageRetentionDatetime); $this->deleteExpiredSessions($project, $getProjectDB); - $this->deleteExpiredOAuth2Grants($project, $getProjectDB); + $this->deleteExpiredTokens($project, $getProjectDB); $this->deleteExpiredChallenges($project, $getProjectDB); $this->deleteExpiredTransactions($project, $getProjectDB); $this->deleteExpiredPresences($project, $getProjectDB, $publisherForUsage); @@ -1152,19 +1152,34 @@ class Deletes extends Action * @return void * @throws Exception|Throwable */ - private function deleteExpiredOAuth2Grants(Document $project, callable $getProjectDB): void + private function deleteExpiredTokens(Document $project, callable $getProjectDB): void { - Console::info('Delete expired OAuth2 grants'); + Console::info('Delete expired tokens'); $dbForProject = $getProjectDB($project); + $expire = DateTime::format(new \DateTime()); - $this->deleteByGroup('tokens', [ - Query::select([...$this->selects, 'expire']), - Query::equal('type', [TOKEN_TYPE_OAUTH2]), - Query::lessThan('expire', DateTime::format(new \DateTime())), - Query::orderAsc('expire'), - Query::orderAsc(), - ], $dbForProject); + $types = [ + TOKEN_TYPE_LOGIN, + TOKEN_TYPE_VERIFICATION, + TOKEN_TYPE_RECOVERY, + TOKEN_TYPE_INVITE, + TOKEN_TYPE_MAGIC_URL, + TOKEN_TYPE_PHONE, + TOKEN_TYPE_OAUTH2, + TOKEN_TYPE_GENERIC, + TOKEN_TYPE_EMAIL, + ]; + + foreach ($types as $type) { + $this->deleteByGroup('tokens', [ + Query::select([...$this->selects, 'expire']), + Query::equal('type', [$type]), + Query::lessThan('expire', $expire), + Query::orderDesc('expire'), + Query::orderDesc(), + ], $dbForProject); + } } /** From a498b3e64870ca9edfd0a7ca8c3bbb74264319cd Mon Sep 17 00:00:00 2001 From: fogelito Date: Wed, 12 Aug 2026 16:25:22 +0300 Subject: [PATCH 2/3] Message --- src/Appwrite/Platform/Workers/Deletes.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php index 773e1d0753..2e8eb64cdf 100644 --- a/src/Appwrite/Platform/Workers/Deletes.php +++ b/src/Appwrite/Platform/Workers/Deletes.php @@ -1171,6 +1171,9 @@ class Deletes extends Action TOKEN_TYPE_EMAIL, ]; + // Current index is on {`type`, `expire`} + // Should be changed to use only {`expire`} + foreach ($types as $type) { $this->deleteByGroup('tokens', [ Query::select([...$this->selects, 'expire']), From d72b82cf8032cedfaab7e0b4517b79858d3a994b Mon Sep 17 00:00:00 2001 From: fogelito Date: Wed, 12 Aug 2026 16:26:08 +0300 Subject: [PATCH 3/3] Message --- src/Appwrite/Platform/Workers/Deletes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php index 2e8eb64cdf..56c6549b98 100644 --- a/src/Appwrite/Platform/Workers/Deletes.php +++ b/src/Appwrite/Platform/Workers/Deletes.php @@ -1172,7 +1172,7 @@ class Deletes extends Action ]; // Current index is on {`type`, `expire`} - // Should be changed to use only {`expire`} + // Should be changed to {`expire`} foreach ($types as $type) { $this->deleteByGroup('tokens', [