diff --git a/app/config/collections/common.php b/app/config/collections/common.php index 9c33d6e554..70b0730077 100644 --- a/app/config/collections/common.php +++ b/app/config/collections/common.php @@ -603,6 +603,13 @@ return [ 'lengths' => [Database::LENGTH_KEY], 'orders' => [Database::ORDER_ASC], ], + [ + '$id' => ID::custom('_key_type_expire'), + 'type' => Database::INDEX_KEY, + 'attributes' => ['type', 'expire'], + 'lengths' => [], + 'orders' => [Database::ORDER_ASC, Database::ORDER_ASC], + ], ], ], diff --git a/src/Appwrite/Migration/Version/V24.php b/src/Appwrite/Migration/Version/V24.php index 0aa67cb74e..65da1bd20d 100644 --- a/src/Appwrite/Migration/Version/V24.php +++ b/src/Appwrite/Migration/Version/V24.php @@ -213,6 +213,15 @@ class V24 extends Migration $this->dbForProject->purgeCachedCollection($id); break; + case 'tokens': + try { + $this->createIndexFromCollection($this->dbForProject, $id, '_key_type_expire'); + } catch (Throwable $th) { + Console::warning("Failed to create index \"_key_type_expire\" from {$id}: {$th->getMessage()}"); + } + $this->dbForProject->purgeCachedCollection($id); + break; + case 'databases': if ($collectionType === 'projects') { try { diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php index 0a066570d3..9eda3dbd52 100644 --- a/src/Appwrite/Platform/Workers/Deletes.php +++ b/src/Appwrite/Platform/Workers/Deletes.php @@ -221,6 +221,7 @@ class Deletes extends Action $this->deleteAuditLogs($project, $getAudit, $auditRetention); $this->deleteUsageStats($project, $getProjectDB, $getLogsDB, $hourlyUsageRetentionDatetime); $this->deleteExpiredSessions($project, $getProjectDB); + $this->deleteExpiredOAuth2Grants($project, $getProjectDB); $this->deleteExpiredTransactions($project, $getProjectDB); $this->deleteExpiredPresences($project, $getProjectDB, $publisherForUsage); $this->deleteOldDeployments($publisherForDeletes, $project, $getProjectDB); @@ -1147,6 +1148,27 @@ class Deletes extends Action ], $dbForProject); } + /** + * @param Document $project + * @param callable $getProjectDB + * @return void + * @throws Exception|Throwable + */ + private function deleteExpiredOAuth2Grants(Document $project, callable $getProjectDB): void + { + Console::info('Delete expired OAuth2 grants'); + + $dbForProject = $getProjectDB($project); + + $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); + } + /** * @param Database $dbForPlatform * @param Device $deviceForFiles