This commit is contained in:
fogelito committed 2026-08-12 16:05:31 +03:00
1 parent 8e04766bf7
commit 9e49d331ad
1 file changed
+25 -10
+25 -10
View File
@@ -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);
}
}
/**