mirror of
https://github.com/appwrite/appwrite.git
synced 2026-11-18 20:36:03 +00:00
Clean up expired OAuth2 grants (#12538)
This commit is contained in:
1 parent
f090e990f3
commit
8a63bfadbb
3 files changed
+38
No files matched your search
@@ -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],
|
||||
],
|
||||
],
|
||||
],
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user