From f6fc425c981916d5b1fccfbe8c26ae8bbb3b2e18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 14 Mar 2025 09:37:44 +0100
Subject: [PATCH 1/2] Add rule attributes

---
 app/config/collections/platform.php | 38 ++++++++++++++++++++++++++++-
 app/controllers/api/functions.php   |  2 ++
 app/controllers/api/proxy.php       |  2 ++
 app/controllers/general.php         | 10 +++++++-
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/app/config/collections/platform.php b/app/config/collections/platform.php
index 8a46bfd3ec..8725f4b4ce 100644
--- a/app/config/collections/platform.php
+++ b/app/config/collections/platform.php
@@ -1066,7 +1066,29 @@ return [
                 'default' => null,
                 'array' => false,
                 'filters' => [],
-            ]
+            ],
+            [
+                '$id' => ID::custom('owner'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16,
+                'signed' => true,
+                'required' => false,
+                'default' => '', // "Appwrite" or empty string
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('region'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16,
+                'signed' => true,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
@@ -1111,6 +1133,20 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_owner'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['owner'],
+                'lengths' => [16],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => ID::custom('_key_region'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region'],
+                'lengths' => [16],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 583468f6c1..88e1e2ae7b 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -387,6 +387,8 @@ App::post('/v1/functions')
                     'resourceInternalId' => $function->getInternalId(),
                     'status' => 'verified',
                     'certificateId' => '',
+                    'owner' => 'Appwrite',
+                    'region' => $project->getAttribute('region')
                 ]))
             );
 
diff --git a/app/controllers/api/proxy.php b/app/controllers/api/proxy.php
index 2567c23be6..393caad93d 100644
--- a/app/controllers/api/proxy.php
+++ b/app/controllers/api/proxy.php
@@ -130,6 +130,8 @@ App::post('/v1/proxy/rules')
             'resourceId' => $resourceId,
             'resourceInternalId' => $resourceInternalId,
             'certificateId' => '',
+            'owner' => '',
+            'region' => $project->getAttribute('region')
         ]);
 
         $status = 'created';
diff --git a/app/controllers/general.php b/app/controllers/general.php
index d93766a5e7..e3c28f4276 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -582,6 +582,12 @@ App::init()
                         ]);
                     }
 
+                    $owner = '';
+                    $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+                    if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
+                        $owner = 'Appwrite';
+                    }
+
                     if ($domainDocument->isEmpty()) {
                         $domainDocument = new Document([
                             // TODO: @christyjacob remove once we migrate the rules in 1.7.x
@@ -590,7 +596,9 @@ App::init()
                             'resourceType' => 'api',
                             'status' => 'verifying',
                             'projectId' => 'console',
-                            'projectInternalId' => 'console'
+                            'projectInternalId' => 'console',
+                            'owner' => $owner,
+                            'region' => 'fra'
                         ]);
 
                         $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);

From 5f2512dc4f31ef8c457b746cd73f87a0788217e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Fri, 14 Mar 2025 12:07:38 +0100
Subject: [PATCH 2/2] code quality improvement

---
 app/config/console.php      | 1 +
 app/controllers/general.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/config/console.php b/app/config/console.php
index 5c15a7930f..e37c9b7836 100644
--- a/app/config/console.php
+++ b/app/config/console.php
@@ -27,6 +27,7 @@ $console = [
             'hostname' => 'localhost',
         ], // Current host is added on app init
     ],
+    'region' => 'fra',
     'legalName' => '',
     'legalCountry' => '',
     'legalState' => '',
diff --git a/app/controllers/general.php b/app/controllers/general.php
index e3c28f4276..a374aa3c39 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -595,10 +595,10 @@ App::init()
                             'domain' => $domain->get(),
                             'resourceType' => 'api',
                             'status' => 'verifying',
-                            'projectId' => 'console',
-                            'projectInternalId' => 'console',
+                            'projectId' => $console->getId(),
+                            'projectInternalId' => $console->getInternalId(),
                             'owner' => $owner,
-                            'region' => 'fra'
+                            'region' => $console->getAttribute('region')
                         ]);
 
                         $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);