From 69d5ce0f550bc4d5411e3ca7b6d010abd45769a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 19 Dec 2025 13:40:32 +0100
Subject: [PATCH] Switch over to resource-based key DB structure

---
 app/config/collections/platform.php             |  2 +-
 app/controllers/api/projects.php                | 17 +++++++++++------
 app/controllers/mock.php                        |  5 +++--
 app/init/database/filters.php                   |  3 ++-
 src/Appwrite/Platform/Workers/Deletes.php       |  3 ++-
 .../Platform/Workers/StatsResources.php         |  3 ++-
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/config/collections/platform.php b/app/config/collections/platform.php
index eb4184b72a..0ad1b3fbc0 100644
--- a/app/config/collections/platform.php
+++ b/app/config/collections/platform.php
@@ -653,7 +653,7 @@ return [
                 'default' => null,
                 'array' => false,
                 'filters' => []
-            ],            
+            ],
             [
                 '$id' => ID::custom('name'),
                 'type' => Database::VAR_STRING,
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index c4d703d744..45a63e4966 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -1497,8 +1497,9 @@ App::post('/v1/projects/:projectId/keys')
                 Permission::update(Role::any()),
                 Permission::delete(Role::any()),
             ],
-            'projectInternalId' => $project->getSequence(),
-            'projectId' => $project->getId(),
+            'resourceInternalId' => $project->getSequence(),
+            'resourceId' => $project->getId(),
+            'resourceType' => 'projects',
             'name' => $name,
             'scopes' => $scopes,
             'expire' => $expire,
@@ -1546,7 +1547,8 @@ App::get('/v1/projects/:projectId/keys')
         }
 
         $keys = $dbForPlatform->find('keys', [
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
             Query::limit(5000),
         ]);
 
@@ -1587,7 +1589,8 @@ App::get('/v1/projects/:projectId/keys/:keyId')
 
         $key = $dbForPlatform->findOne('keys', [
             Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
         ]);
 
         if ($key->isEmpty()) {
@@ -1631,7 +1634,8 @@ App::put('/v1/projects/:projectId/keys/:keyId')
 
         $key = $dbForPlatform->findOne('keys', [
             Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
         ]);
 
         if ($key->isEmpty()) {
@@ -1682,7 +1686,8 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
 
         $key = $dbForPlatform->findOne('keys', [
             Query::equal('$id', [$keyId]),
-            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+            Query::equal('resourceType', ['projects']),
         ]);
 
         if ($key->isEmpty()) {
diff --git a/app/controllers/mock.php b/app/controllers/mock.php
index 6f092a5d19..2c0ef443ee 100644
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@@ -200,8 +200,9 @@ App::post('/v1/mock/api-key-unprefixed')
                 Permission::update(Role::any()),
                 Permission::delete(Role::any()),
             ],
-            'projectInternalId' => $project->getSequence(),
-            'projectId' => $project->getId(),
+            'resourceType' => 'projects',
+            'resourceInternalId' => $project->getSequence(),
+            'resourceId' => $project->getId(),
             'name' => 'Outdated key',
             'scopes' => $scopes,
             'expire' => null,
diff --git a/app/init/database/filters.php b/app/init/database/filters.php
index 2bff778017..590c78be42 100644
--- a/app/init/database/filters.php
+++ b/app/init/database/filters.php
@@ -135,7 +135,8 @@ Database::addFilter(
     function (mixed $value, Document $document, Database $database) {
         return $database->getAuthorization()->skip(fn () => $database
             ->find('keys', [
-                Query::equal('projectInternalId', [$document->getSequence()]),
+                Query::equal('resourceInternalId', [$document->getSequence()]),
+                Query::equal('resourceType', ['projects']),
                 Query::limit(APP_LIMIT_SUBQUERY),
             ]));
     }
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index 247044f4c3..072dfa9bf9 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -562,7 +562,8 @@ class Deletes extends Action
 
         // Delete Keys
         $this->deleteByGroup('keys', [
-            Query::equal('projectInternalId', [$projectInternalId]),
+            Query::equal('resourceInternalId', [$projectInternalId]),
+            Query::equal('resourceType', ['projects']),
             Query::orderAsc()
         ], $dbForPlatform);
 
diff --git a/src/Appwrite/Platform/Workers/StatsResources.php b/src/Appwrite/Platform/Workers/StatsResources.php
index 1ef348091a..118f83c031 100644
--- a/src/Appwrite/Platform/Workers/StatsResources.php
+++ b/src/Appwrite/Platform/Workers/StatsResources.php
@@ -111,7 +111,8 @@ class StatsResources extends Action
                 Query::equal('projectInternalId', [$project->getSequence()])
             ]);
             $keys = $dbForPlatform->count('keys', [
-                Query::equal('projectInternalId', [$project->getSequence()])
+                Query::equal('resourceInternalId', [$project->getSequence()]),
+                Query::equal('resourceType', ['projects']),
             ]);
 
             $domains = $dbForPlatform->count('rules', [