Merge branch '1.9.x' into feat/corporate-email-policy

This commit is contained in:
Harsh Mahajan authored and GitHub committed 2026-06-08 17:14:14 +05:30
commit ca7f6771dc
3 files changed
+38

No files matched your search

+7
View File
@@ -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],
],
],
],
+9
View File
@@ -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 {
+22
View File
@@ -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