feat: delete old sessions with maintenance task

app/controllers/api/projects.php

@@ -776,7 +776,7 @@
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
-    ->param('expire', 0, new Integer() , 'Key expiration time in Unix timestamp. Use 0 for unlimited expiration.', true)
+    ->param('expire', 0, new Integer(), 'Key expiration time in Unix timestamp. Use 0 for unlimited expiration.', true)
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $name, array $scopes, int $expire, Response $response, Database $dbForConsole) {
@@ -885,7 +885,7 @@
     ->param('keyId', null, new UID(), 'Key unique ID.')
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
-    ->param('expire', 0, new Integer() , 'Key expiration time in Unix timestamp. Use 0 for unlimited expiration.', true)
+    ->param('expire', 0, new Integer(), 'Key expiration time in Unix timestamp. Use 0 for unlimited expiration.', true)
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $keyId, string $name, array $scopes, int $expire, Response $response, Database $dbForConsole) {

app/controllers/general.php

@@ -281,9 +281,9 @@
 
             $expire = $key->getAttribute('expire', 0);
 
-            if(!empty($expire) && $expire < \time()){
+            if (!empty($expire) && $expire < \time()) {
                 throw new AppwriteException('Project key expired', 401, AppwriteException:: PROJECT_KEY_EXPIRED);
-             }
+            }
 
             Authorization::setRole('role:' . Auth::USER_ROLE_APP);
             Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.

app/init.php

@@ -131,6 +131,7 @@
 const DELETE_TYPE_USAGE = 'usage';
 const DELETE_TYPE_REALTIME = 'realtime';
 const DELETE_TYPE_BUCKETS = 'buckets';
+const DELETE_TYPE_SESSIONS = 'sessions';
 // Mail Types
 const MAIL_TYPE_VERIFICATION = 'verification';
 const MAIL_TYPE_MAGIC_SESSION = 'magicSession';

app/tasks/maintenance.php

@@ -3,6 +3,7 @@
 global $cli;
 global $register;
 
+use Appwrite\Auth\Auth;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Utopia\App;
@@ -93,6 +94,14 @@ function notifyDeleteConnections()
                 ->trigger();
         }
 
+        function notifyDeleteExpiredSessions()
+        {
+            (new Delete())
+                ->setType(DELETE_TYPE_SESSIONS)
+                ->setTimestamp(time() - Auth::TOKEN_EXPIRATION_LOGIN_LONG)
+                ->trigger();
+        }
+
         function renewCertificates($dbForConsole)
         {
             $time = date('d-m-Y H:i:s', time());
@@ -136,6 +145,7 @@ function renewCertificates($dbForConsole)
             notifyDeleteAuditLogs($auditLogRetention);
             notifyDeleteUsageStats($usageStatsRetention30m, $usageStatsRetention1d);
             notifyDeleteConnections();
+            notifyDeleteExpiredSessions();
             renewCertificates($database);
         }, $interval);
     });

app/workers/deletes.php

@@ -100,6 +100,10 @@ public function run(): void
                 $this->deleteRealtimeUsage($this->args['timestamp']);
                 break;
 
+            case DELETE_TYPE_SESSIONS:
+                $this->deleteExpiredSessions($this->args['timestamp']);
+                break;
+
             case DELETE_TYPE_CERTIFICATES:
                 $document = new Document($this->args['document']);
                 $this->deleteCertificates($document);
@@ -250,6 +254,20 @@ protected function deleteExecutionLogs(int $timestamp): void
         });
     }
 
+    /**
+     * @param int $timestamp
+     */
+    protected function deleteExpiredSessions(int $timestamp): void
+    {
+        $this->deleteForProjectIds(function (string $projectId) use ($timestamp) {
+            $dbForProject = $this->getProjectDB($projectId);
+            // Delete Sessions
+            $this->deleteByGroup('sessions', [
+                new Query('expire', Query::TYPE_LESSER, [$timestamp])
+            ], $dbForProject);
+        });
+    }
+
     /**
      * @param int $timestamp
      */

tests/e2e/Services/Projects/ProjectsConsoleClientTest.php

@@ -1260,10 +1260,10 @@ public function testValidateProjectKey($data): void
         ], $this->getHeaders()), [
             'name' => 'Key Test',
             'scopes' => ['health.read'],
-            'expire' => time()+3600,
+            'expire' => time() + 3600,
         ]);
 
-        $response = $this->client->call(Client::METHOD_GET, '/health' , [
+        $response = $this->client->call(Client::METHOD_GET, '/health', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $id,
             'x-appwrite-key' => $response['body']['secret']
@@ -1283,7 +1283,7 @@ public function testValidateProjectKey($data): void
             'expire' => 0,
         ]);
 
-        $response = $this->client->call(Client::METHOD_GET, '/health' , [
+        $response = $this->client->call(Client::METHOD_GET, '/health', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $id,
             'x-appwrite-key' => $response['body']['secret']
@@ -1300,17 +1300,16 @@ public function testValidateProjectKey($data): void
         ], $this->getHeaders()), [
             'name' => 'Key Test',
             'scopes' => ['health.read'],
-            'expire' => time()-3600,
+            'expire' => time() - 3600,
         ]);
 
-        $response = $this->client->call(Client::METHOD_GET, '/health' , [
+        $response = $this->client->call(Client::METHOD_GET, '/health', [
             'content-type' => 'application/json',
             'x-appwrite-project' => $id,
             'x-appwrite-key' => $response['body']['secret']
         ], []);
 
         $this->assertEquals(401, $response['headers']['status-code']);
-
     }
 
 
@@ -1328,7 +1327,7 @@ public function testUpdateProjectKey($data): array
         ], $this->getHeaders()), [
             'name' => 'Key Test Update',
             'scopes' => ['users.read', 'users.write', 'collections.read'],
-            'expire' => time()+360,
+            'expire' => time() + 360,
         ]);
 
         $this->assertEquals(200, $response['headers']['status-code']);