chore: use user for senderId

Feat/index length

.env

@@ -15,6 +15,7 @@ _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
+_APP_CUSTOM_DOMAIN_DENY_LIST=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
@@ -81,11 +82,12 @@ _APP_EXECUTOR_SECRET=your-secret-key
 _APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_DELAY=
+_APP_MAINTENANCE_START_TIME=12:00
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000

.github/workflows/publish.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        username: ${{ vars.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        username: ${{ vars.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker

.gitpod.yml

@@ -7,6 +7,7 @@ tasks:
       docker pull composer
     command: |
       docker run --rm --interactive --tty \
+      --user "$(id -u):$(id -g)" \
       --volume $PWD:/app \
       composer install \
       --ignore-platform-reqs \
@@ -23,11 +24,3 @@ vscode:
   extensions:
     - ms-azuretools.vscode-docker
     - zobo.php-intellisense
-
-github:
-  # https://www.gitpod.io/docs/prebuilds#github-specific-configuration
-  prebuilds:
-    # enable for pull requests coming from forks (defaults to false)
-    pullRequestsFromForks: true
-    # add a check to pull requests (defaults to true)
-    addCheck: false

Dockerfile

@@ -86,7 +86,6 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/worker-migrations && \
     chmod +x /usr/local/bin/worker-webhooks && \
     chmod +x /usr/local/bin/worker-stats-usage && \
-    chmod +x /usr/local/bin/worker-stats-usage-dump && \
     chmod +x /usr/local/bin/stats-resources && \
     chmod +x /usr/local/bin/worker-stats-resources
 

README-CN.md

@@ -72,7 +72,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.6.1
+    appwrite/appwrite:1.6.2
 ```
 
 ### Windows
@@ -84,7 +84,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.6.1
+    appwrite/appwrite:1.6.2
 ```
 
 #### PowerShell
@@ -94,7 +94,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.6.1
+    appwrite/appwrite:1.6.2
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -1,4 +1,4 @@
-> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) :rocket:
+> [Get started with Appwrite](https://apwr.dev/appcloud)
 
 <br />
 <p align="center">
@@ -24,11 +24,9 @@
 
 English | [简体中文](README-CN.md)
 
-[**Announcing Appwrite Cloud Public Beta! Sign up today!**](https://cloud.appwrite.io)
-
 Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker<nobr> microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster.
 
-Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, and [more services](https://appwrite.io/docs).
+Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, messaging, and [more services](https://appwrite.io/docs).
 
 <p align="center">
     <br />
@@ -52,7 +50,7 @@ Table of Contents:
   - [Upgrade from an Older Version](#upgrade-from-an-older-version)
 - [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
-  - [Services](#services)
+  - [Products](#products)
   - [SDKs](#sdks)
     - [Client](#client)
     - [Server](#server)
@@ -79,7 +77,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.6.1
+    appwrite/appwrite:1.6.2
 ```
 
 ### Windows
@@ -91,7 +89,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.6.1
+    appwrite/appwrite:1.6.2
 ```
 
 #### PowerShell
@@ -101,7 +99,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.6.1
+    appwrite/appwrite:1.6.2
 ```
 
 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.

app/cli.php

@@ -9,6 +9,8 @@ use Appwrite\Event\StatsResources;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
+use Executor\Executor;
+use Swoole\Timer;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
@@ -24,8 +26,11 @@ use Utopia\Pools\Group;
 use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
-// overwriting runtimes to be architectur agnostic for CLI
+use function Swoole\Coroutine\run;
+
+// Overwriting runtimes to be architecture agnostic for CLI
 Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
 
 // require controllers after overwriting runtimes
@@ -43,8 +48,7 @@ CLI::setResource('cache', function ($pools) {
         $adapters[] = $pools
             ->get($value)
             ->pop()
-            ->getResource()
-        ;
+            ->getResource();
     }
 
     return new Cache(new Sharding($adapters));
@@ -99,6 +103,10 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
     return $dbForPlatform;
 }, ['pools', 'cache']);
 
+CLI::setResource('console', function () {
+    return new Document(Config::getParam('console'));
+}, []);
+
 CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
@@ -183,7 +191,7 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
         $database
             ->setSharedTables(true)
             ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
             ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
 
         // set tenant
@@ -195,7 +203,7 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
     };
 }, ['pools', 'cache']);
 
-CLI::setResource('queueForStatsUsage', function (Connection $publisher) {
+CLI::setResource('queueForStatsUsage', function (Publisher $publisher) {
     return new StatsUsage($publisher);
 }, ['publisher']);
 CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
@@ -215,6 +223,13 @@ CLI::setResource('queueForCertificates', function (Publisher $publisher) {
 }, ['publisher']);
 CLI::setResource('logError', function (Registry $register) {
     return function (Throwable $error, string $namespace, string $action) use ($register) {
+        Console::error('[Error] Timestamp: ' . date('c', time()));
+        Console::error('[Error] Type: ' . get_class($error));
+        Console::error('[Error] Message: ' . $error->getMessage());
+        Console::error('[Error] File: ' . $error->getFile());
+        Console::error('[Error] Line: ' . $error->getLine());
+        Console::error('[Error] Trace: ' . $error->getTraceAsString());
+
         $logger = $register->get('logger');
 
         if ($logger) {
@@ -233,6 +248,7 @@ CLI::setResource('logError', function (Registry $register) {
             $log->addExtra('file', $error->getFile());
             $log->addExtra('line', $error->getLine());
             $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('detailedTrace', $error->getTrace());
 
             $log->setAction($action);
 
@@ -246,22 +262,40 @@ CLI::setResource('logError', function (Registry $register) {
                 Console::error('Error pushing log: ' . $th->getMessage());
             }
         }
-
-        Console::warning("Failed: {$error->getMessage()}");
-        Console::warning($error->getTraceAsString());
     };
 }, ['register']);
 
-$platform = new Appwrite();
-$platform->init(Service::TYPE_TASK);
+CLI::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
 
+CLI::setResource('telemetry', fn () => new NoTelemetry());
+
+$platform = new Appwrite();
+$args = $platform->getEnv('argv');
+
+if (!isset($args[0])) {
+    Console::error('Missing task name');
+    Console::exit(1);
+}
+
+\array_shift($args);
+$taskName = $args[0];
+$platform->init(Service::TYPE_TASK);
 $cli = $platform->getCli();
 
 $cli
     ->error()
     ->inject('error')
-    ->action(function (Throwable $error) {
-        Console::error($error->getMessage());
+    ->inject('logError')
+    ->action(function (Throwable $error, callable $logError) use ($taskName) {
+        call_user_func_array($logError, [
+            $error,
+            'Task',
+            $taskName,
+        ]);
+
+        Timer::clearAll();
     });
 
-$cli->run();
+$cli->shutdown()->action(fn () => Timer::clearAll());
+
+run($cli->run(...));

app/config/collections/common.php

@@ -1038,7 +1038,7 @@ return [
                 '$id' => ID::custom('providerUid'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 2048,
+                'size' => 2048, // Decrease to 128 as in index length?
                 'signed' => true,
                 'required' => false,
                 'default' => null,
@@ -1107,14 +1107,14 @@ return [
                 '$id' => ID::custom('_key_userInternalId_provider_providerUid'),
                 'type' => Database::INDEX_UNIQUE,
                 'attributes' => ['userInternalId', 'provider', 'providerUid'],
-                'lengths' => [11, 128, 128],
+                'lengths' => [11, 128, 128], // providerUid is length 2000!
                 'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_provider_providerUid'),
                 'type' => Database::INDEX_UNIQUE,
                 'attributes' => ['provider', 'providerUid'],
-                'lengths' => [128, 128],
+                'lengths' => [128, 128], // providerUid is length 2000!
                 'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
             ],
             [
@@ -2352,6 +2352,20 @@ return [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_expired'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['expired'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_session_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['sessionInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 

app/config/collections/platform.php

@@ -356,7 +356,21 @@ return [
                 'attributes' => ['pingedAt'],
                 'lengths' => [],
                 'orders' => [],
-            ]
+            ],
+            [
+                '$id' => ID::custom('_key_database'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['database'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_region_accessed_at'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'accessedAt'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -480,6 +494,20 @@ return [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_project_id_region'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectId', 'region'],
+                'lengths' => [],
+                'orders' => [],
+            ],
+            [
+                '$id' => ID::custom('_key_region_rt_active'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['region', 'resourceType', 'active'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -1066,7 +1094,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 +1161,27 @@ 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],
+            ],
+            [
+                '$id' => ID::custom('_key_piid_riid_rt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectInternalId', 'resourceInternalId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -1406,7 +1477,14 @@ return [
                 'attributes' => ['resourceType'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
-            ]
+            ],
+            [
+                '$id' => ID::custom('_key_piid_riid_rt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectInternalId', 'resourceInternalId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -1554,6 +1632,13 @@ return [
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_piid_prid_rt'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['projectInternalId', 'providerRepositoryId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 

app/config/collections/projects.php

@@ -1182,6 +1182,13 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_resource_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -1330,7 +1337,14 @@ return [
                 'attributes' => ['deploymentId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
-            ]
+            ],
+            [
+                '$id' => ID::custom('_key_deployment_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['deploymentInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -1602,6 +1616,13 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_function_internal_id'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['functionInternalId'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 
@@ -1720,6 +1741,13 @@ return [
                 'lengths' => [],
                 'orders' => [],
             ],
+            [
+                '$id' => ID::custom('_key_resource_internal_id_resource_type'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceInternalId', 'resourceType'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 

app/config/console.php

@@ -0,0 +1,53 @@
+<?php
+
+/**
+ * Initializes console project document.
+ */
+
+use Appwrite\Auth\Auth;
+use Appwrite\Network\Validator\Origin;
+use Utopia\Database\Helpers\ID;
+use Utopia\System\System;
+
+$console = [
+    '$id' => ID::custom('console'),
+    '$internalId' => ID::custom('console'),
+    'name' => 'Appwrite',
+    '$collection' => ID::custom('projects'),
+    'description' => 'Appwrite core engine',
+    'logo' => '',
+    'teamId' => null,
+    'webhooks' => [],
+    'keys' => [],
+    'platforms' => [
+        [
+            '$collection' => ID::custom('platforms'),
+            'name' => 'Localhost',
+            'type' => Origin::CLIENT_TYPE_WEB,
+            'hostname' => 'localhost',
+        ], // Current host is added on app init
+    ],
+    'region' => 'fra',
+    'legalName' => '',
+    'legalCountry' => '',
+    'legalState' => '',
+    'legalCity' => '',
+    'legalAddress' => '',
+    'legalTaxId' => '',
+    'auths' => [
+        'mockNumbers' => [],
+        'invites' => System::getEnv('_APP_CONSOLE_INVITES', 'enabled') === 'enabled',
+        'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
+        'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
+        'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled'
+    ],
+    'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
+    'authWhitelistIPs' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
+    'oAuthProviders' => [
+        'githubEnabled' => true,
+        'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
+        'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', '')
+    ],
+];
+
+return $console;

app/config/errors.php

@@ -593,6 +593,11 @@ return [
         'description' => 'Database timed out. Try adjusting your queries or adding an index.',
         'code' => 408
     ],
+    Exception::DATABASE_QUERY_ORDER_NULL => [
+        'name' => Exception::DATABASE_QUERY_ORDER_NULL,
+        'description' => 'The order attribute had a null value. Cursor pagination requires all documents order attribute values are non-null.',
+        'code' => 400,
+    ],
 
     /** Collections */
     Exception::COLLECTION_NOT_FOUND => [

app/config/locale/continents.php

@@ -1,11 +1,46 @@
 <?php
 
+/**
+ * Continent codes with names and approximate central coordinates
+ *
+ * Coordinates represent approximate geographical centers of each continent
+ * Note: These are simplified centroids and may not represent the exact geographical center
+ */
+
 return [
-    'AF',
-    'AN',
-    'AS',
-    'EU',
-    'NA',
-    'OC',
-    'SA',
+    'AF' => [
+        'name' => 'Africa',
+        'latitude' => 8.7832,
+        'longitude' => 34.5085
+    ],
+    'AN' => [
+        'name' => 'Antarctica',
+        'latitude' => -82.8628,
+        'longitude' => 135.0000
+    ],
+    'AS' => [
+        'name' => 'Asia',
+        'latitude' => 34.0479,
+        'longitude' => 100.6197
+    ],
+    'EU' => [
+        'name' => 'Europe',
+        'latitude' => 54.5260,
+        'longitude' => 15.2551
+    ],
+    'NA' => [
+        'name' => 'North America',
+        'latitude' => 54.5260,
+        'longitude' => -105.2551
+    ],
+    'OC' => [
+        'name' => 'Oceania',
+        'latitude' => -22.7359,
+        'longitude' => 140.0188
+    ],
+    'SA' => [
+        'name' => 'South America',
+        'latitude' => -8.7832,
+        'longitude' => -55.4915
+    ],
 ];

app/config/locale/countries.php

@@ -1,209 +1,210 @@
 <?php
 
 /**
- * ISO 3166 standard country codes
+ * ISO 3166 standard country codes with country names and coordinates
  * https://www.iso.org/iso-3166-country-codes.html
  *
  * Source:
  * https://www.iso.org/obp/ui/#search/code/
+ * Coordinates source: Natural Earth Data (approximate country centroids)
  */
 
 return [
-    'AF',
-    'AO',
-    'AL',
-    'AD',
-    'AE',
-    'AR',
-    'AM',
-    'AG',
-    'AU',
-    'AT',
-    'AZ',
-    'BI',
-    'BE',
-    'BJ',
-    'BF',
-    'BD',
-    'BG',
-    'BH',
-    'BS',
-    'BA',
-    'BY',
-    'BZ',
-    'BO',
-    'BR',
-    'BB',
-    'BN',
-    'BT',
-    'BW',
-    'CF',
-    'CA',
-    'CH',
-    'CL',
-    'CN',
-    'CI',
-    'CM',
-    'CD',
-    'CG',
-    'CO',
-    'KM',
-    'CV',
-    'CR',
-    'CU',
-    'CY',
-    'CZ',
-    'DE',
-    'DJ',
-    'DM',
-    'DK',
-    'DO',
-    'DZ',
-    'EC',
-    'EG',
-    'ER',
-    'ES',
-    'EE',
-    'ET',
-    'FI',
-    'FJ',
-    'FR',
-    'FM',
-    'GA',
-    'GB',
-    'GE',
-    'GH',
-    'GN',
-    'GM',
-    'GW',
-    'GQ',
-    'GR',
-    'GD',
-    'GT',
-    'GY',
-    'HK',
-    'HN',
-    'HR',
-    'HT',
-    'HU',
-    'ID',
-    'IN',
-    'IE',
-    'IR',
-    'IQ',
-    'IS',
-    'IL',
-    'IT',
-    'JM',
-    'JO',
-    'JP',
-    'KZ',
-    'KE',
-    'KG',
-    'KH',
-    'KI',
-    'KN',
-    'KR',
-    'KW',
-    'LA',
-    'LB',
-    'LR',
-    'LY',
-    'LC',
-    'LI',
-    'LK',
-    'LS',
-    'LT',
-    'LU',
-    'LV',
-    'MA',
-    'MC',
-    'MD',
-    'MG',
-    'MV',
-    'MX',
-    'MH',
-    'MK',
-    'ML',
-    'MT',
-    'MM',
-    'ME',
-    'MN',
-    'MZ',
-    'MR',
-    'MU',
-    'MW',
-    'MY',
-    'NA',
-    'NE',
-    'NG',
-    'NI',
-    'NL',
-    'NO',
-    'NP',
-    'NR',
-    'NZ',
-    'OM',
-    'PK',
-    'PS',
-    'PA',
-    'PE',
-    'PH',
-    'PW',
-    'PG',
-    'PL',
-    'KP',
-    'PT',
-    'PY',
-    'QA',
-    'RO',
-    'RU',
-    'RW',
-    'SA',
-    'SD',
-    'SN',
-    'SG',
-    'SB',
-    'SL',
-    'SV',
-    'SM',
-    'SO',
-    'RS',
-    'SS',
-    'ST',
-    'SR',
-    'SK',
-    'SI',
-    'SE',
-    'SZ',
-    'SC',
-    'SY',
-    'TD',
-    'TG',
-    'TH',
-    'TJ',
-    'TM',
-    'TL',
-    'TO',
-    'TT',
-    'TN',
-    'TR',
-    'TV',
-    'TZ',
-    'TW',
-    'UG',
-    'UA',
-    'UY',
-    'US',
-    'UZ',
-    'VA',
-    'VC',
-    'VE',
-    'VN',
-    'VU',
-    'WS',
-    'YE',
-    'ZA',
-    'ZM',
-    'ZW',
+    'AF' => ['name' => 'Afghanistan', 'latitude' => 33.0, 'longitude' => 66.0],
+    'AO' => ['name' => 'Angola', 'latitude' => -12.5, 'longitude' => 18.5],
+    'AL' => ['name' => 'Albania', 'latitude' => 41.0, 'longitude' => 20.0],
+    'AD' => ['name' => 'Andorra', 'latitude' => 42.5, 'longitude' => 1.6],
+    'AE' => ['name' => 'United Arab Emirates', 'latitude' => 24.0, 'longitude' => 54.0],
+    'AR' => ['name' => 'Argentina', 'latitude' => -34.0, 'longitude' => -64.0],
+    'AM' => ['name' => 'Armenia', 'latitude' => 40.0, 'longitude' => 45.0],
+    'AG' => ['name' => 'Antigua and Barbuda', 'latitude' => 17.05, 'longitude' => -61.8],
+    'AU' => ['name' => 'Australia', 'latitude' => -25.0, 'longitude' => 135.0],
+    'AT' => ['name' => 'Austria', 'latitude' => 47.3, 'longitude' => 13.3],
+    'AZ' => ['name' => 'Azerbaijan', 'latitude' => 40.5, 'longitude' => 47.5],
+    'BI' => ['name' => 'Burundi', 'latitude' => -3.5, 'longitude' => 30.0],
+    'BE' => ['name' => 'Belgium', 'latitude' => 50.8, 'longitude' => 4.0],
+    'BJ' => ['name' => 'Benin', 'latitude' => 9.5, 'longitude' => 2.25],
+    'BF' => ['name' => 'Burkina Faso', 'latitude' => 13.0, 'longitude' => -2.0],
+    'BD' => ['name' => 'Bangladesh', 'latitude' => 24.0, 'longitude' => 90.0],
+    'BG' => ['name' => 'Bulgaria', 'latitude' => 43.0, 'longitude' => 25.0],
+    'BH' => ['name' => 'Bahrain', 'latitude' => 26.0, 'longitude' => 50.5],
+    'BS' => ['name' => 'Bahamas', 'latitude' => 24.25, 'longitude' => -76.0],
+    'BA' => ['name' => 'Bosnia and Herzegovina', 'latitude' => 44.0, 'longitude' => 18.0],
+    'BY' => ['name' => 'Belarus', 'latitude' => 53.0, 'longitude' => 28.0],
+    'BZ' => ['name' => 'Belize', 'latitude' => 17.25, 'longitude' => -88.75],
+    'BO' => ['name' => 'Bolivia', 'latitude' => -17.0, 'longitude' => -65.0],
+    'BR' => ['name' => 'Brazil', 'latitude' => -10.0, 'longitude' => -55.0],
+    'BB' => ['name' => 'Barbados', 'latitude' => 13.17, 'longitude' => -59.53],
+    'BN' => ['name' => 'Brunei', 'latitude' => 4.5, 'longitude' => 114.67],
+    'BT' => ['name' => 'Bhutan', 'latitude' => 27.5, 'longitude' => 90.5],
+    'BW' => ['name' => 'Botswana', 'latitude' => -22.0, 'longitude' => 24.0],
+    'CF' => ['name' => 'Central African Republic', 'latitude' => 7.0, 'longitude' => 21.0],
+    'CA' => ['name' => 'Canada', 'latitude' => 60.0, 'longitude' => -95.0],
+    'CH' => ['name' => 'Switzerland', 'latitude' => 47.0, 'longitude' => 8.0],
+    'CL' => ['name' => 'Chile', 'latitude' => -30.0, 'longitude' => -71.0],
+    'CN' => ['name' => 'China', 'latitude' => 35.0, 'longitude' => 105.0],
+    'CI' => ['name' => 'Côte d\'Ivoire', 'latitude' => 8.0, 'longitude' => -5.0],
+    'CM' => ['name' => 'Cameroon', 'latitude' => 6.0, 'longitude' => 12.0],
+    'CD' => ['name' => 'Democratic Republic of the Congo', 'latitude' => -2.5, 'longitude' => 23.5],
+    'CG' => ['name' => 'Republic of the Congo', 'latitude' => -1.0, 'longitude' => 15.0],
+    'CO' => ['name' => 'Colombia', 'latitude' => 4.0, 'longitude' => -72.0],
+    'KM' => ['name' => 'Comoros', 'latitude' => -12.17, 'longitude' => 44.25],
+    'CV' => ['name' => 'Cape Verde', 'latitude' => 16.0, 'longitude' => -24.0],
+    'CR' => ['name' => 'Costa Rica', 'latitude' => 10.0, 'longitude' => -84.0],
+    'CU' => ['name' => 'Cuba', 'latitude' => 21.5, 'longitude' => -80.0],
+    'CY' => ['name' => 'Cyprus', 'latitude' => 35.0, 'longitude' => 33.0],
+    'CZ' => ['name' => 'Czech Republic', 'latitude' => 49.75, 'longitude' => 15.5],
+    'DE' => ['name' => 'Germany', 'latitude' => 51.0, 'longitude' => 9.0],
+    'DJ' => ['name' => 'Djibouti', 'latitude' => 11.5, 'longitude' => 43.0],
+    'DM' => ['name' => 'Dominica', 'latitude' => 15.42, 'longitude' => -61.33],
+    'DK' => ['name' => 'Denmark', 'latitude' => 56.0, 'longitude' => 10.0],
+    'DO' => ['name' => 'Dominican Republic', 'latitude' => 19.0, 'longitude' => -70.67],
+    'DZ' => ['name' => 'Algeria', 'latitude' => 28.0, 'longitude' => 3.0],
+    'EC' => ['name' => 'Ecuador', 'latitude' => -2.0, 'longitude' => -77.5],
+    'EG' => ['name' => 'Egypt', 'latitude' => 27.0, 'longitude' => 30.0],
+    'ER' => ['name' => 'Eritrea', 'latitude' => 15.0, 'longitude' => 39.0],
+    'ES' => ['name' => 'Spain', 'latitude' => 40.0, 'longitude' => -4.0],
+    'EE' => ['name' => 'Estonia', 'latitude' => 59.0, 'longitude' => 26.0],
+    'ET' => ['name' => 'Ethiopia', 'latitude' => 8.0, 'longitude' => 38.0],
+    'FI' => ['name' => 'Finland', 'latitude' => 64.0, 'longitude' => 26.0],
+    'FJ' => ['name' => 'Fiji', 'latitude' => -18.0, 'longitude' => 175.0],
+    'FR' => ['name' => 'France', 'latitude' => 46.0, 'longitude' => 2.0],
+    'FM' => ['name' => 'Micronesia', 'latitude' => 6.92, 'longitude' => 158.25],
+    'GA' => ['name' => 'Gabon', 'latitude' => -1.0, 'longitude' => 11.75],
+    'GB' => ['name' => 'United Kingdom', 'latitude' => 54.0, 'longitude' => -2.0],
+    'GE' => ['name' => 'Georgia', 'latitude' => 42.0, 'longitude' => 43.5],
+    'GH' => ['name' => 'Ghana', 'latitude' => 8.0, 'longitude' => -2.0],
+    'GN' => ['name' => 'Guinea', 'latitude' => 11.0, 'longitude' => -10.0],
+    'GM' => ['name' => 'Gambia', 'latitude' => 13.47, 'longitude' => -16.57],
+    'GW' => ['name' => 'Guinea-Bissau', 'latitude' => 12.0, 'longitude' => -15.0],
+    'GQ' => ['name' => 'Equatorial Guinea', 'latitude' => 2.0, 'longitude' => 10.0],
+    'GR' => ['name' => 'Greece', 'latitude' => 39.0, 'longitude' => 22.0],
+    'GD' => ['name' => 'Grenada', 'latitude' => 12.12, 'longitude' => -61.67],
+    'GT' => ['name' => 'Guatemala', 'latitude' => 15.5, 'longitude' => -90.25],
+    'GY' => ['name' => 'Guyana', 'latitude' => 5.0, 'longitude' => -59.0],
+    'HK' => ['name' => 'Hong Kong', 'latitude' => 22.25, 'longitude' => 114.17],
+    'HN' => ['name' => 'Honduras', 'latitude' => 15.0, 'longitude' => -86.5],
+    'HR' => ['name' => 'Croatia', 'latitude' => 45.17, 'longitude' => 15.5],
+    'HT' => ['name' => 'Haiti', 'latitude' => 19.0, 'longitude' => -72.42],
+    'HU' => ['name' => 'Hungary', 'latitude' => 47.0, 'longitude' => 20.0],
+    'ID' => ['name' => 'Indonesia', 'latitude' => -5.0, 'longitude' => 120.0],
+    'IN' => ['name' => 'India', 'latitude' => 20.0, 'longitude' => 77.0],
+    'IE' => ['name' => 'Ireland', 'latitude' => 53.0, 'longitude' => -8.0],
+    'IR' => ['name' => 'Iran', 'latitude' => 32.0, 'longitude' => 53.0],
+    'IQ' => ['name' => 'Iraq', 'latitude' => 33.0, 'longitude' => 44.0],
+    'IS' => ['name' => 'Iceland', 'latitude' => 65.0, 'longitude' => -18.0],
+    'IL' => ['name' => 'Israel', 'latitude' => 31.5, 'longitude' => 34.75],
+    'IT' => ['name' => 'Italy', 'latitude' => 42.83, 'longitude' => 12.83],
+    'JM' => ['name' => 'Jamaica', 'latitude' => 18.25, 'longitude' => -77.5],
+    'JO' => ['name' => 'Jordan', 'latitude' => 31.0, 'longitude' => 36.0],
+    'JP' => ['name' => 'Japan', 'latitude' => 36.0, 'longitude' => 138.0],
+    'KZ' => ['name' => 'Kazakhstan', 'latitude' => 48.0, 'longitude' => 68.0],
+    'KE' => ['name' => 'Kenya', 'latitude' => 1.0, 'longitude' => 38.0],
+    'KG' => ['name' => 'Kyrgyzstan', 'latitude' => 41.0, 'longitude' => 75.0],
+    'KH' => ['name' => 'Cambodia', 'latitude' => 13.0, 'longitude' => 105.0],
+    'KI' => ['name' => 'Kiribati', 'latitude' => 1.42, 'longitude' => 173.0],
+    'KN' => ['name' => 'Saint Kitts and Nevis', 'latitude' => 17.33, 'longitude' => -62.75],
+    'KR' => ['name' => 'South Korea', 'latitude' => 37.0, 'longitude' => 127.5],
+    'KW' => ['name' => 'Kuwait', 'latitude' => 29.34, 'longitude' => 47.66],
+    'LA' => ['name' => 'Laos', 'latitude' => 18.0, 'longitude' => 105.0],
+    'LB' => ['name' => 'Lebanon', 'latitude' => 33.83, 'longitude' => 35.83],
+    'LR' => ['name' => 'Liberia', 'latitude' => 6.5, 'longitude' => -9.5],
+    'LY' => ['name' => 'Libya', 'latitude' => 25.0, 'longitude' => 17.0],
+    'LC' => ['name' => 'Saint Lucia', 'latitude' => 13.88, 'longitude' => -61.13],
+    'LI' => ['name' => 'Liechtenstein', 'latitude' => 47.17, 'longitude' => 9.53],
+    'LK' => ['name' => 'Sri Lanka', 'latitude' => 7.0, 'longitude' => 81.0],
+    'LS' => ['name' => 'Lesotho', 'latitude' => -29.5, 'longitude' => 28.5],
+    'LT' => ['name' => 'Lithuania', 'latitude' => 56.0, 'longitude' => 24.0],
+    'LU' => ['name' => 'Luxembourg', 'latitude' => 49.75, 'longitude' => 6.17],
+    'LV' => ['name' => 'latitudevia', 'latitude' => 57.0, 'longitude' => 25.0],
+    'MA' => ['name' => 'Morocco', 'latitude' => 32.0, 'longitude' => -5.0],
+    'MC' => ['name' => 'Monaco', 'latitude' => 43.73, 'longitude' => 7.4],
+    'MD' => ['name' => 'Moldova', 'latitude' => 47.0, 'longitude' => 29.0],
+    'MG' => ['name' => 'Madagascar', 'latitude' => -20.0, 'longitude' => 47.0],
+    'MV' => ['name' => 'Maldives', 'latitude' => 3.25, 'longitude' => 73.0],
+    'MX' => ['name' => 'Mexico', 'latitude' => 23.0, 'longitude' => -102.0],
+    'MH' => ['name' => 'Marshall Islands', 'latitude' => 9.0, 'longitude' => 168.0],
+    'MK' => ['name' => 'North Macedonia', 'latitude' => 41.83, 'longitude' => 22.0],
+    'ML' => ['name' => 'Mali', 'latitude' => 17.0, 'longitude' => -4.0],
+    'MT' => ['name' => 'Malta', 'latitude' => 35.83, 'longitude' => 14.58],
+    'MM' => ['name' => 'Myanmar', 'latitude' => 22.0, 'longitude' => 98.0],
+    'ME' => ['name' => 'Montenegro', 'latitude' => 42.5, 'longitude' => 19.3],
+    'MN' => ['name' => 'Mongolia', 'latitude' => 46.0, 'longitude' => 105.0],
+    'MZ' => ['name' => 'Mozambique', 'latitude' => -18.25, 'longitude' => 35.0],
+    'MR' => ['name' => 'Mauritania', 'latitude' => 20.0, 'longitude' => -12.0],
+    'MU' => ['name' => 'Mauritius', 'latitude' => -20.28, 'longitude' => 57.55],
+    'MW' => ['name' => 'Malawi', 'latitude' => -13.5, 'longitude' => 34.0],
+    'MY' => ['name' => 'Malaysia', 'latitude' => 2.5, 'longitude' => 112.5],
+    'NA' => ['name' => 'Namibia', 'latitude' => -22.0, 'longitude' => 17.0],
+    'NE' => ['name' => 'Niger', 'latitude' => 16.0, 'longitude' => 8.0],
+    'NG' => ['name' => 'Nigeria', 'latitude' => 10.0, 'longitude' => 8.0],
+    'NI' => ['name' => 'Nicaragua', 'latitude' => 13.0, 'longitude' => -85.0],
+    'NL' => ['name' => 'Netherlands', 'latitude' => 52.5, 'longitude' => 5.75],
+    'NO' => ['name' => 'Norway', 'latitude' => 62.0, 'longitude' => 10.0],
+    'NP' => ['name' => 'Nepal', 'latitude' => 28.0, 'longitude' => 84.0],
+    'NR' => ['name' => 'Nauru', 'latitude' => -0.53, 'longitude' => 166.92],
+    'NZ' => ['name' => 'New Zealand', 'latitude' => -41.0, 'longitude' => 174.0],
+    'OM' => ['name' => 'Oman', 'latitude' => 21.0, 'longitude' => 57.0],
+    'PK' => ['name' => 'Pakistan', 'latitude' => 30.0, 'longitude' => 70.0],
+    'PS' => ['name' => 'Palestine', 'latitude' => 31.9, 'longitude' => 35.2],
+    'PA' => ['name' => 'Panama', 'latitude' => 9.0, 'longitude' => -80.0],
+    'PE' => ['name' => 'Peru', 'latitude' => -10.0, 'longitude' => -76.0],
+    'PH' => ['name' => 'Philippines', 'latitude' => 13.0, 'longitude' => 122.0],
+    'PW' => ['name' => 'Palau', 'latitude' => 7.5, 'longitude' => 134.5],
+    'PG' => ['name' => 'Papua New Guinea', 'latitude' => -6.0, 'longitude' => 147.0],
+    'PL' => ['name' => 'Poland', 'latitude' => 52.0, 'longitude' => 20.0],
+    'KP' => ['name' => 'North Korea', 'latitude' => 40.0, 'longitude' => 127.0],
+    'PT' => ['name' => 'Portugal', 'latitude' => 39.5, 'longitude' => -8.0],
+    'PY' => ['name' => 'Paraguay', 'latitude' => -23.0, 'longitude' => -58.0],
+    'QA' => ['name' => 'Qatar', 'latitude' => 25.5, 'longitude' => 51.25],
+    'RO' => ['name' => 'Romania', 'latitude' => 46.0, 'longitude' => 25.0],
+    'RU' => ['name' => 'Russia', 'latitude' => 60.0, 'longitude' => 100.0],
+    'RW' => ['name' => 'Rwanda', 'latitude' => -2.0, 'longitude' => 30.0],
+    'SA' => ['name' => 'Saudi Arabia', 'latitude' => 25.0, 'longitude' => 45.0],
+    'SD' => ['name' => 'Sudan', 'latitude' => 15.0, 'longitude' => 30.0],
+    'SN' => ['name' => 'Senegal', 'latitude' => 14.0, 'longitude' => -14.0],
+    'SG' => ['name' => 'Singapore', 'latitude' => 1.37, 'longitude' => 103.8],
+    'SB' => ['name' => 'Solomon Islands', 'latitude' => -8.0, 'longitude' => 159.0],
+    'SL' => ['name' => 'Sierra Leone', 'latitude' => 8.5, 'longitude' => -11.5],
+    'SV' => ['name' => 'El Salvador', 'latitude' => 13.83, 'longitude' => -88.92],
+    'SM' => ['name' => 'San Marino', 'latitude' => 43.77, 'longitude' => 12.42],
+    'SO' => ['name' => 'Somalia', 'latitude' => 10.0, 'longitude' => 49.0],
+    'RS' => ['name' => 'Serbia', 'latitude' => 44.0, 'longitude' => 21.0],
+    'SS' => ['name' => 'South Sudan', 'latitude' => 8.0, 'longitude' => 30.0],
+    'ST' => ['name' => 'São Tomé and Príncipe', 'latitude' => 1.0, 'longitude' => 7.0],
+    'SR' => ['name' => 'Suriname', 'latitude' => 4.0, 'longitude' => -56.0],
+    'SK' => ['name' => 'Slovakia', 'latitude' => 48.67, 'longitude' => 19.5],
+    'SI' => ['name' => 'Slovenia', 'latitude' => 46.0, 'longitude' => 15.0],
+    'SE' => ['name' => 'Sweden', 'latitude' => 62.0, 'longitude' => 15.0],
+    'SZ' => ['name' => 'Eswatini', 'latitude' => -26.5, 'longitude' => 31.5],
+    'SC' => ['name' => 'Seychelles', 'latitude' => -4.58, 'longitude' => 55.67],
+    'SY' => ['name' => 'Syria', 'latitude' => 35.0, 'longitude' => 38.0],
+    'TD' => ['name' => 'Chad', 'latitude' => 15.0, 'longitude' => 19.0],
+    'TG' => ['name' => 'Togo', 'latitude' => 8.0, 'longitude' => 1.17],
+    'TH' => ['name' => 'Thailand', 'latitude' => 15.0, 'longitude' => 100.0],
+    'TJ' => ['name' => 'Tajikistan', 'latitude' => 39.0, 'longitude' => 71.0],
+    'TM' => ['name' => 'Turkmenistan', 'latitude' => 40.0, 'longitude' => 60.0],
+    'TL' => ['name' => 'Timor-Leste', 'latitude' => -8.83, 'longitude' => 125.92],
+    'TO' => ['name' => 'Tonga', 'latitude' => -20.0, 'longitude' => -175.0],
+    'TT' => ['name' => 'Trinidad and Tobago', 'latitude' => 11.0, 'longitude' => -61.0],
+    'TN' => ['name' => 'Tunisia', 'latitude' => 34.0, 'longitude' => 9.0],
+    'TR' => ['name' => 'Turkey', 'latitude' => 39.0, 'longitude' => 35.0],
+    'TV' => ['name' => 'Tuvalu', 'latitude' => -8.0, 'longitude' => 178.0],
+    'TZ' => ['name' => 'Tanzania', 'latitude' => -6.0, 'longitude' => 35.0],
+    'TW' => ['name' => 'Taiwan', 'latitude' => 23.5, 'longitude' => 121.0],
+    'UG' => ['name' => 'Uganda', 'latitude' => 1.0, 'longitude' => 32.0],
+    'UA' => ['name' => 'Ukraine', 'latitude' => 49.0, 'longitude' => 32.0],
+    'UY' => ['name' => 'Uruguay', 'latitude' => -33.0, 'longitude' => -56.0],
+    'US' => ['name' => 'United States', 'latitude' => 38.0, 'longitude' => -97.0],
+    'UZ' => ['name' => 'Uzbekistan', 'latitude' => 41.0, 'longitude' => 64.0],
+    'VA' => ['name' => 'Vatican City', 'latitude' => 41.9, 'longitude' => 12.45],
+    'VC' => ['name' => 'Saint Vincent and the Grenadines', 'latitude' => 13.25, 'longitude' => -61.2],
+    'VE' => ['name' => 'Venezuela', 'latitude' => 8.0, 'longitude' => -66.0],
+    'VN' => ['name' => 'Vietnam', 'latitude' => 16.0, 'longitude' => 106.0],
+    'VU' => ['name' => 'Vanuatu', 'latitude' => -16.0, 'longitude' => 167.0],
+    'WS' => ['name' => 'Samoa', 'latitude' => -13.58, 'longitude' => -172.33],
+    'YE' => ['name' => 'Yemen', 'latitude' => 15.0, 'longitude' => 48.0],
+    'ZA' => ['name' => 'South Africa', 'latitude' => -29.0, 'longitude' => 24.0],
+    'ZM' => ['name' => 'Zambia', 'latitude' => -15.0, 'longitude' => 30.0],
+    'ZW' => ['name' => 'Zimbabwe', 'latitude' => -20.0, 'longitude' => 30.0],
 ];

app/config/oAuthProviders.php

@@ -142,6 +142,16 @@ return [
         'beta' => false,
         'mock' => false,
     ],
+    'figma' => [
+        'name' => 'Figma',
+        'developers' => 'https://www.figma.com/developers/api#oauth2',
+        'icon' => 'icon-figma',
+        'enabled' => true,
+        'sandbox' => false,
+        'form' => false,
+        'beta' => false,
+        'mock' => false,
+    ],
     'github' => [
         'name' => 'GitHub',
         'developers' => 'https://developer.github.com/',

app/config/platforms.php

@@ -11,7 +11,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '16.1.0',
+                'version' => '17.0.2',
                 'url' => 'https://github.com/appwrite/sdk-for-web',
                 'package' => 'https://www.npmjs.com/package/appwrite',
                 'enabled' => true,
@@ -59,7 +59,7 @@ return [
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '13.1.1',
+                'version' => '15.0.2',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -77,7 +77,7 @@ return [
             [
                 'key' => 'apple',
                 'name' => 'Apple',
-                'version' => '7.1.0',
+                'version' => '9.0.1',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
@@ -112,7 +112,7 @@ return [
             [
                 'key' => 'android',
                 'name' => 'Android',
-                'version' => '6.1.0',
+                'version' => '7.0.1',
                 'url' => 'https://github.com/appwrite/sdk-for-android',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                 'enabled' => true,
@@ -134,7 +134,7 @@ return [
             [
                 'key' => 'react-native',
                 'name' => 'React Native',
-                'version' => '0.6.0',
+                'version' => '0.7.3',
                 'url' => 'https://github.com/appwrite/sdk-for-react-native',
                 'package' => 'https://npmjs.com/package/react-native-appwrite',
                 'enabled' => true,
@@ -217,7 +217,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '6.2.0',
+                'version' => '6.2.3',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,
@@ -245,7 +245,7 @@ return [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '14.2.0',
+                'version' => '16.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -263,7 +263,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '12.2.0',
+                'version' => '14.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -281,7 +281,7 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '12.2.0',
+                'version' => '14.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -299,7 +299,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '6.2.0',
+                'version' => '10.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -317,7 +317,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '12.2.0',
+                'version' => '15.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -335,7 +335,7 @@ return [
             [
                 'key' => 'go',
                 'name' => 'Go',
-                'version' => '0.3.0',
+                'version' => '0.6.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-go',
                 'package' => 'https://github.com/appwrite/sdk-for-go',
                 'enabled' => true,
@@ -353,7 +353,7 @@ return [
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '0.11.0',
+                'version' => '0.13.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => true,
@@ -371,7 +371,7 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '12.2.0',
+                'version' => '15.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
@@ -389,7 +389,7 @@ return [
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '6.2.0',
+                'version' => '8.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,
@@ -411,7 +411,7 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '6.2.0',
+                'version' => '9.1.0-rc.1',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,

app/config/regions.php

@@ -3,72 +3,8 @@
 return [
     'default' => [
         '$id' => 'default',
-        'name' => 'Frankfurt',
+        'name' => 'default',
         'disabled' => false,
-        'flag' => 'de',
-        'default' => true,
-    ],
-    'fra' => [
-        '$id' => 'fra',
-        'name' => 'Frankfurt',
-        'disabled' => false,
-        'flag' => 'de',
-        'default' => true,
-    ],
-    'nyc' => [
-        '$id' => 'nyc',
-        'name' => 'New York',
-        'disabled' => true,
-        'flag' => 'us',
-        'default' => true,
-    ],
-    'sfo' => [
-        '$id' => 'sfo',
-        'name' => 'San Francisco',
-        'disabled' => true,
-        'flag' => 'us',
-        'default' => true,
-    ],
-    'blr' => [
-        '$id' => 'blr',
-        'name' => 'Bengaluru',
-        'disabled' => true,
-        'flag' => 'in',
-        'default' => true,
-    ],
-    'lon' => [
-        '$id' => 'lon',
-        'name' => 'London',
-        'disabled' => true,
-        'flag' => 'gb',
-        'default' => true,
-    ],
-    'ams' => [
-        '$id' => 'ams',
-        'name' => 'Amsterdam',
-        'disabled' => true,
-        'flag' => 'nl',
-        'default' => true,
-    ],
-    'sgp' => [
-        '$id' => 'sgp',
-        'name' => 'Singapore',
-        'disabled' => true,
-        'flag' => 'sg',
-        'default' => true,
-    ],
-    'tor' => [
-        '$id' => 'tor',
-        'name' => 'Toronto',
-        'disabled' => true,
-        'flag' => 'ca',
-        'default' => true,
-    ],
-    'syd' => [
-        '$id' => 'syd',
-        'name' => 'Sydney',
-        'disabled' => true,
-        'flag' => 'au',
         'default' => true,
     ],
 ];

app/config/services.php

@@ -65,9 +65,6 @@ return [
         'tests' => false,
         'optional' => true,
         'icon' => '/images/services/databases.png',
-        'globalAttributes' => [
-            'databaseId'
-        ]
     ],
     'locale' => [
         'key' => 'locale',

app/config/variables.php

@@ -79,6 +79,15 @@ return [
                 'question' => 'Enter your Appwrite hostname',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_CUSTOM_DOMAIN_DENY_LIST',
+                'description' => 'List of reserved or prohibited domains when configuring custom domains.',
+                'introduction' => '',
+                'default' => 'example.com,test.com,app.example.com',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_DOMAIN_FUNCTIONS',
                 'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
@@ -791,7 +800,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
+                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty or 0, CPU limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -800,7 +809,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
+                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty or 0, memory limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
@@ -1021,13 +1030,22 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_DELAY',
-                'description' => 'Delay value containing the number of seconds that the Appwrite maintenance process should wait before executing system cleanups and optimizations. The default value is 0 seconds.',
+                'description' => 'Deprecated with 1.6.2 use _APP_MAINTENANCE_START_TIME instead to run the maintenance at a specific time per day.',
                 'introduction' => '1.5.0',
                 'default' => '0',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_MAINTENANCE_START_TIME',
+                'description' => 'The time of day (in 24-hour format) when the maintenance process should start. The default value is 00:00.',
+                'introduction' => '1.6.2',
+                'default' => '00:00',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_CACHE',
                 'description' => 'The maximum duration (in seconds) upto which to retain cached files. The default value is 2592000 seconds (30 days).',
@@ -1048,13 +1066,22 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                 'introduction' => '0.7.0',
                 'default' => '1209600',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
+            [
+                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
+                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
+                'introduction' => '1.6.2',
+                'default' => '15778800',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                 'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',

app/controllers/api/account.php

@@ -43,6 +43,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -155,9 +156,6 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, Doc
 
 
 $createSession = function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails) {
-    $roles = Authorization::getRoles();
-    $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-    $isAppUser = Auth::isAppUser($roles);
 
     /** @var Utopia\Database\Document $user */
     $userFromRequest = Authorization::skip(fn () => $dbForProject->getDocument('users', $userId));
@@ -273,7 +271,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         ->setAttribute('current', true)
         ->setAttribute('countryName', $countryName)
         ->setAttribute('expire', $expire)
-        ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $sessionSecret) : '')
+        ->setAttribute('secret', Auth::encodeSession($user->getId(), $sessionSecret))
     ;
 
     $response->dynamic($session, Response::MODEL_SESSION);
@@ -289,6 +287,7 @@ App::post('/v1/account')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'create',
         description: '/docs/references/account/create.md',
         auth: [],
@@ -432,6 +431,7 @@ App::get('/v1/account')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'get',
         description: '/docs/references/account/get.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -461,6 +461,7 @@ App::delete('/v1/account')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'delete',
         description: '/docs/references/account/delete.md',
         auth: [AuthType::ADMIN],
@@ -513,6 +514,7 @@ App::get('/v1/account/sessions')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'listSessions',
         description: '/docs/references/account/list-sessions.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -530,9 +532,6 @@ App::get('/v1/account/sessions')
     ->inject('project')
     ->action(function (Response $response, Document $user, Locale $locale, Document $project) {
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
 
         $sessions = $user->getAttribute('sessions', []);
         $current = Auth::sessionVerify($sessions, Auth::$secret);
@@ -542,7 +541,7 @@ App::get('/v1/account/sessions')
 
             $session->setAttribute('countryName', $countryName);
             $session->setAttribute('current', ($current == $session->getId()) ? true : false);
-            $session->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $session->getAttribute('secret', '') : '');
+            $session->setAttribute('secret', $session->getAttribute('secret', ''));
 
             $sessions[$key] = $session;
         }
@@ -562,6 +561,7 @@ App::delete('/v1/account/sessions')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'deleteSessions',
         description: '/docs/references/account/delete-sessions.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -631,6 +631,7 @@ App::get('/v1/account/sessions/:sessionId')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'getSession',
         description: '/docs/references/account/get-session.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -649,10 +650,6 @@ App::get('/v1/account/sessions/:sessionId')
     ->inject('project')
     ->action(function (?string $sessionId, Response $response, Document $user, Locale $locale, Document $project) {
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
         $sessions = $user->getAttribute('sessions', []);
         $sessionId = ($sessionId === 'current')
             ? Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret)
@@ -665,7 +662,7 @@ App::get('/v1/account/sessions/:sessionId')
                 $session
                     ->setAttribute('current', ($session->getAttribute('secret') == Auth::hash(Auth::$secret)))
                     ->setAttribute('countryName', $countryName)
-                    ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $session->getAttribute('secret', '') : '')
+                    ->setAttribute('secret', $session->getAttribute('secret', ''))
                 ;
 
                 return $response->dynamic($session, Response::MODEL_SESSION);
@@ -684,6 +681,7 @@ App::delete('/v1/account/sessions/:sessionId')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'deleteSession',
         description: '/docs/references/account/delete-session.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -721,9 +719,7 @@ App::delete('/v1/account/sessions/:sessionId')
                 continue;
             }
 
-            $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $session) {
-                return $dbForProject->deleteDocument('sessions', $session->getId());
-            });
+            $dbForProject->deleteDocument('sessions', $session->getId());
 
             unset($sessions[$key]);
 
@@ -772,6 +768,7 @@ App::patch('/v1/account/sessions/:sessionId')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'updateSession',
         description: '/docs/references/account/update-session.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -856,6 +853,7 @@ App::post('/v1/account/sessions/email')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'createEmailPasswordSession',
         description: '/docs/references/account/create-session-email-password.md',
         auth: [],
@@ -897,10 +895,6 @@ App::post('/v1/account/sessions/email')
             throw new Exception(Exception::USER_BLOCKED); // User is in status blocked
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
         $user->setAttributes($profile->getArrayCopy());
 
         $hooks->trigger('passwordValidator', [$dbForProject, $project, $password, &$user, false]);
@@ -966,7 +960,7 @@ App::post('/v1/account/sessions/email')
         $session
             ->setAttribute('current', true)
             ->setAttribute('countryName', $countryName)
-            ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '')
+            ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
         ;
 
         $queueForEvents
@@ -996,6 +990,7 @@ App::post('/v1/account/sessions/anonymous')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'createAnonymousSession',
         description: '/docs/references/account/create-session-anonymous.md',
         auth: [],
@@ -1019,9 +1014,6 @@ App::post('/v1/account/sessions/anonymous')
     ->inject('queueForEvents')
     ->action(function (Request $request, Response $response, Locale $locale, Document $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents) {
         $protocol = $request->getProtocol();
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
 
         if ('console' === $project->getId()) {
             throw new Exception(Exception::USER_ANONYMOUS_CONSOLE_PROHIBITED, 'Failed to create anonymous user');
@@ -1123,7 +1115,7 @@ App::post('/v1/account/sessions/anonymous')
         $session
             ->setAttribute('current', true)
             ->setAttribute('countryName', $countryName)
-            ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '')
+            ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
         ;
 
         $response->dynamic($session, Response::MODEL_SESSION);
@@ -1139,6 +1131,7 @@ App::post('/v1/account/sessions/token')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'createSession',
         description: '/docs/references/account/create-session.md',
         auth: [],
@@ -1172,6 +1165,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
     ->label('scope', 'sessions.write')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'createOAuth2Session',
         description: '/docs/references/account/create-session-oauth2.md',
         type: MethodType::WEBAUTH,
@@ -1243,7 +1237,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
     });
 
 App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('OAuth2 callback')
+    ->desc('Get OAuth2 callback')
     ->groups(['account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -1273,7 +1267,7 @@ App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     });
 
 App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('OAuth2 callback')
+    ->desc('Create OAuth2 callback')
     ->groups(['account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -1304,7 +1298,7 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     });
 
 App::get('/v1/account/sessions/oauth2/:provider/redirect')
-    ->desc('OAuth2 redirect')
+    ->desc('Get OAuth2 redirect')
     ->groups(['api', 'account', 'session'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -1449,7 +1443,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::notEqual('userInternalId', $user->getInternalId()),
             ]);
             if (!$identityWithMatchingEmail->isEmpty()) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS);
+                $failureRedirect(Exception::USER_ALREADY_EXISTS);
             }
 
             $userWithMatchingEmail = $dbForProject->find('users', [
@@ -1457,7 +1451,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::notEqual('$id', $userId),
             ]);
             if (!empty($userWithMatchingEmail)) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS);
+                $failureRedirect(Exception::USER_ALREADY_EXISTS);
             }
 
             $sessionUpgrade = true;
@@ -1486,7 +1480,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
 
         if ($user === false || $user->isEmpty()) { // No user logged in or with OAuth2 provider ID, create new one or connect with account with same email
             if (empty($email)) {
-                throw new Exception(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
+                $failureRedirect(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
             }
 
             /**
@@ -1529,7 +1523,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                     Query::equal('providerEmail', [$email]),
                 ]);
                 if (!$identityWithMatchingEmail->isEmpty()) {
-                    throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                    $failureRedirect(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
                 }
 
                 try {
@@ -1601,7 +1595,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::notEqual('userInternalId', $user->getInternalId()),
             ]);
             if (!empty($identitiesWithMatchingEmail)) {
-                throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                $failureRedirect(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
             }
 
             $dbForProject->createDocument('identities', new Document([
@@ -1769,6 +1763,7 @@ App::get('/v1/account/tokens/oauth2/:provider')
     ->label('scope', 'sessions.write')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'tokens',
         name: 'createOAuth2Token',
         description: '/docs/references/account/create-token-oauth2.md',
         auth: [],
@@ -1849,6 +1844,7 @@ App::post('/v1/account/tokens/magic-url')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'tokens',
         name: 'createMagicURLToken',
         description: '/docs/references/account/create-token-magic-url.md',
         auth: [],
@@ -1884,9 +1880,6 @@ App::post('/v1/account/tokens/magic-url')
             $phrase = Phrase::generate();
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
 
         $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
         if (!$result->isEmpty()) {
@@ -2006,6 +1999,7 @@ App::post('/v1/account/tokens/magic-url')
 
         $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
         $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+
         $replyTo = "";
 
         if ($smtpEnabled) {
@@ -2068,17 +2062,11 @@ App::post('/v1/account/tokens/magic-url')
             ->setRecipient($email)
             ->trigger();
 
-        // Set to unhashed secret for events and server responses
         $token->setAttribute('secret', $tokenSecret);
 
         $queueForEvents
             ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);
 
-        // Hide secret for clients
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $token->setAttribute('secret', '');
-        }
-
         if (!empty($phrase)) {
             $token->setAttribute('phrase', $phrase);
         }
@@ -2098,6 +2086,7 @@ App::post('/v1/account/tokens/email')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'tokens',
         name: 'createEmailToken',
         description: '/docs/references/account/create-token-email.md',
         auth: [],
@@ -2110,7 +2099,7 @@ App::post('/v1/account/tokens/email')
         contentType: ContentType::JSON,
     ))
     ->label('abuse-limit', 10)
-    ->label('abuse-key', 'url:{url},email:{param-email}')
+    ->label('abuse-key', ['url:{url},email:{param-email}', 'url:{url},ip:{ip}'])
     ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('email', '', new Email(), 'User email.')
     ->param('phrase', false, new Boolean(), 'Toggle for security phrase. If enabled, email will be send with a randomly generated phrase and the phrase will also be included in the response. Confirming phrases match increases the security of your authentication flow.', true)
@@ -2131,10 +2120,6 @@ App::post('/v1/account/tokens/email')
             $phrase = Phrase::generate();
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
         $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
         if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
@@ -2303,17 +2288,11 @@ App::post('/v1/account/tokens/email')
             ->setRecipient($email)
             ->trigger();
 
-        // Set to unhashed secret for events and server responses
         $token->setAttribute('secret', $tokenSecret);
 
         $queueForEvents
             ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);
 
-        // Hide secret for clients
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $token->setAttribute('secret', '');
-        }
-
         if (!empty($phrase)) {
             $token->setAttribute('phrase', $phrase);
         }
@@ -2333,6 +2312,7 @@ App::put('/v1/account/sessions/magic-url')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'updateMagicURLSession',
         description: '/docs/references/account/create-session.md',
         auth: [],
@@ -2370,6 +2350,7 @@ App::put('/v1/account/sessions/phone')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'sessions',
         name: 'updatePhoneSession',
         description: '/docs/references/account/create-session.md',
         auth: [],
@@ -2408,6 +2389,7 @@ App::post('/v1/account/tokens/phone')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'tokens',
         name: 'createPhoneToken',
         description: '/docs/references/account/create-token-phone.md',
         auth: [],
@@ -2439,10 +2421,6 @@ App::post('/v1/account/tokens/phone')
             throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
         $result = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
         if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
@@ -2594,14 +2572,13 @@ App::post('/v1/account/tokens/phone')
             }
         }
 
-        // Set to unhashed secret for events and server responses
         $token->setAttribute('secret', $secret);
 
         $queueForEvents
             ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);
 
-        // Hide secret for clients
-        $token->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '');
+        // Encode secret for clients
+        $token->setAttribute('secret', Auth::encodeSession($user->getId(), $secret));
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -2616,6 +2593,7 @@ App::post('/v1/account/jwts')
     ->label('auth.type', 'jwt')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'tokens',
         name: 'createJWT',
         description: '/docs/references/account/create-jwt.md',
         auth: [],
@@ -2664,6 +2642,7 @@ App::get('/v1/account/prefs')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'getPrefs',
         description: '/docs/references/account/get-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2690,6 +2669,7 @@ App::get('/v1/account/logs')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'logs',
         name: 'listLogs',
         description: '/docs/references/account/list-logs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2766,6 +2746,7 @@ App::patch('/v1/account/name')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'updateName',
         description: '/docs/references/account/update-name.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2787,7 +2768,7 @@ App::patch('/v1/account/name')
 
         $user->setAttribute('name', $name);
 
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -2804,6 +2785,7 @@ App::patch('/v1/account/password')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'updatePassword',
         description: '/docs/references/account/update-password.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2861,7 +2843,7 @@ App::patch('/v1/account/password')
             ->setAttribute('hash', Auth::DEFAULT_ALGO)
             ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS);
 
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -2877,6 +2859,7 @@ App::patch('/v1/account/email')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'updateEmail',
         description: '/docs/references/account/update-email.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2945,7 +2928,7 @@ App::patch('/v1/account/email')
         }
 
         try {
-            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
             /**
              * @var Document $oldTarget
              */
@@ -2973,6 +2956,7 @@ App::patch('/v1/account/phone')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'updatePhone',
         description: '/docs/references/account/update-phone.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3030,7 +3014,7 @@ App::patch('/v1/account/phone')
         }
 
         try {
-            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
             /**
              * @var Document $oldTarget
              */
@@ -3058,6 +3042,7 @@ App::patch('/v1/account/prefs')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'updatePrefs',
         description: '/docs/references/account/update-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3079,7 +3064,7 @@ App::patch('/v1/account/prefs')
 
         $user->setAttribute('prefs', $prefs);
 
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -3095,6 +3080,7 @@ App::patch('/v1/account/status')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'account',
         name: 'updateStatus',
         description: '/docs/references/account/update-status.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3116,7 +3102,7 @@ App::patch('/v1/account/status')
 
         $user->setAttribute('status', false);
 
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $queueForEvents
             ->setParam('userId', $user->getId())
@@ -3145,6 +3131,7 @@ App::post('/v1/account/recovery')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'recovery',
         name: 'createRecovery',
         description: '/docs/references/account/create-recovery.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3174,11 +3161,6 @@ App::post('/v1/account/recovery')
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
         }
         $url = htmlentities($url);
-
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
         $email = \strtolower($email);
 
         $profile = $dbForProject->findOne('users', [
@@ -3302,19 +3284,13 @@ App::post('/v1/account/recovery')
             ->setSubject($subject)
             ->trigger();
 
-        // Set to unhashed secret for events and server responses
         $recovery->setAttribute('secret', $secret);
 
         $queueForEvents
             ->setParam('userId', $profile->getId())
             ->setParam('tokenId', $recovery->getId())
             ->setUser($profile)
-            ->setPayload($response->output($recovery, Response::MODEL_TOKEN), sensitive: ['secret']);
-
-        // Hide secret for clients
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $recovery->setAttribute('secret', '');
-        }
+            ->setPayload(Response::showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3322,7 +3298,7 @@ App::post('/v1/account/recovery')
     });
 
 App::put('/v1/account/recovery')
-    ->desc('Create password recovery (confirmation)')
+    ->desc('Update password recovery (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'sessions.write')
     ->label('event', 'users.[userId].recovery.[tokenId].update')
@@ -3331,6 +3307,7 @@ App::put('/v1/account/recovery')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'recovery',
         name: 'updateRecovery',
         description: '/docs/references/account/update-recovery.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3407,7 +3384,7 @@ App::put('/v1/account/recovery')
         $queueForEvents
             ->setParam('userId', $profile->getId())
             ->setParam('tokenId', $recoveryDocument->getId())
-        ;
+            ->setPayload(Response::showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response->dynamic($recoveryDocument, Response::MODEL_TOKEN);
     });
@@ -3421,6 +3398,7 @@ App::post('/v1/account/verification')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'verification',
         name: 'createVerification',
         description: '/docs/references/account/create-email-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3454,9 +3432,6 @@ App::post('/v1/account/verification')
             throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED);
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
         $verificationSecret = Auth::tokenGenerator(Auth::TOKEN_LENGTH_VERIFICATION);
         $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
 
@@ -3565,18 +3540,12 @@ App::post('/v1/account/verification')
             ->setName($user->getAttribute('name') ?? '')
             ->trigger();
 
-        // Set to unhashed secret for events and server responses
         $verification->setAttribute('secret', $verificationSecret);
 
         $queueForEvents
             ->setParam('userId', $user->getId())
             ->setParam('tokenId', $verification->getId())
-            ->setPayload($response->output($verification, Response::MODEL_TOKEN), sensitive: ['secret']);
-
-        // Hide secret for clients
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $verification->setAttribute('secret', '');
-        }
+            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3584,7 +3553,7 @@ App::post('/v1/account/verification')
     });
 
 App::put('/v1/account/verification')
-    ->desc('Create email verification (confirmation)')
+    ->desc('Update email verification (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].verification.[tokenId].update')
@@ -3592,6 +3561,7 @@ App::put('/v1/account/verification')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'verification',
         name: 'updateVerification',
         description: '/docs/references/account/update-email-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3643,7 +3613,8 @@ App::put('/v1/account/verification')
 
         $queueForEvents
             ->setParam('userId', $userId)
-            ->setParam('tokenId', $verification->getId());
+            ->setParam('tokenId', $verification->getId())
+            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response->dynamic($verification, Response::MODEL_TOKEN);
     });
@@ -3658,6 +3629,7 @@ App::post('/v1/account/verification/phone')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'verification',
         name: 'createPhoneVerification',
         description: '/docs/references/account/create-phone-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3696,10 +3668,6 @@ App::post('/v1/account/verification/phone')
             throw new Exception(Exception::USER_PHONE_ALREADY_VERIFIED);
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
         $secret = null;
         $sendSMS = true;
         $mockNumbers = $project->getAttribute('auths', [])['mockNumbers'] ?? [];
@@ -3788,7 +3756,6 @@ App::post('/v1/account/verification/phone')
             }
         }
 
-        // Set to unhashed secret for events and server responses
         $verification->setAttribute('secret', $secret);
 
         $queueForEvents
@@ -3796,11 +3763,6 @@ App::post('/v1/account/verification/phone')
             ->setParam('tokenId', $verification->getId())
             ->setPayload($response->output($verification, Response::MODEL_TOKEN), sensitive: ['secret']);
 
-        // Hide secret for clients
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $verification->setAttribute('secret', '');
-        }
-
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($verification, Response::MODEL_TOKEN);
@@ -3815,6 +3777,7 @@ App::put('/v1/account/verification/phone')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'verification',
         name: 'updatePhoneVerification',
         description: '/docs/references/account/update-phone-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3880,6 +3843,7 @@ App::patch('/v1/account/mfa')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'updateMFA',
         description: '/docs/references/account/update-mfa.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3902,7 +3866,7 @@ App::patch('/v1/account/mfa')
 
         $user->setAttribute('mfa', $mfa);
 
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         if ($mfa) {
             $factors = $session->getAttribute('factors', []);
@@ -3933,6 +3897,7 @@ App::get('/v1/account/mfa/factors')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'listMfaFactors',
         description: '/docs/references/account/list-mfa-factors.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3973,6 +3938,7 @@ App::post('/v1/account/mfa/authenticators/:type')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'createMfaAuthenticator',
         description: '/docs/references/account/create-mfa-authenticator.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4040,7 +4006,7 @@ App::post('/v1/account/mfa/authenticators/:type')
     });
 
 App::put('/v1/account/mfa/authenticators/:type')
-    ->desc('Verify authenticator')
+    ->desc('Update authenticator (confirmation)')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.mfa')
     ->label('scope', 'account')
@@ -4049,6 +4015,7 @@ App::put('/v1/account/mfa/authenticators/:type')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'updateMfaAuthenticator',
         description: '/docs/references/account/update-mfa-authenticator.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4118,6 +4085,7 @@ App::post('/v1/account/mfa/recovery-codes')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'createMfaRecoveryCodes',
         description: '/docs/references/account/create-mfa-recovery-codes.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4155,7 +4123,7 @@ App::post('/v1/account/mfa/recovery-codes')
     });
 
 App::patch('/v1/account/mfa/recovery-codes')
-    ->desc('Regenerate MFA recovery codes')
+    ->desc('Update MFA recovery codes (regenerate)')
     ->groups(['api', 'account', 'mfaProtected'])
     ->label('event', 'users.[userId].update.mfa')
     ->label('scope', 'account')
@@ -4164,6 +4132,7 @@ App::patch('/v1/account/mfa/recovery-codes')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'updateMfaRecoveryCodes',
         description: '/docs/references/account/update-mfa-recovery-codes.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4200,11 +4169,12 @@ App::patch('/v1/account/mfa/recovery-codes')
     });
 
 App::get('/v1/account/mfa/recovery-codes')
-    ->desc('Get MFA recovery codes')
+    ->desc('List MFA recovery codes')
     ->groups(['api', 'account', 'mfaProtected'])
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'getMfaRecoveryCodes',
         description: '/docs/references/account/get-mfa-recovery-codes.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4243,6 +4213,7 @@ App::delete('/v1/account/mfa/authenticators/:type')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'deleteMfaAuthenticator',
         description: '/docs/references/account/delete-mfa-authenticator.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4288,6 +4259,7 @@ App::post('/v1/account/mfa/challenge')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'createMfaChallenge',
         description: '/docs/references/account/create-mfa-challenge.md',
         auth: [],
@@ -4498,7 +4470,7 @@ App::post('/v1/account/mfa/challenge')
     });
 
 App::put('/v1/account/mfa/challenge')
-    ->desc('Create MFA challenge (confirmation)')
+    ->desc('Update MFA challenge (confirmation)')
     ->groups(['api', 'account', 'mfa'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -4507,6 +4479,7 @@ App::put('/v1/account/mfa/challenge')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'mfa',
         name: 'updateMfaChallenge',
         description: '/docs/references/account/update-mfa-challenge.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4600,6 +4573,7 @@ App::post('/v1/account/targets/push')
     ->label('event', 'users.[userId].targets.[targetId].create')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'pushTargets',
         name: 'createPushTarget',
         description: '/docs/references/account/create-push-target.md',
         auth: [AuthType::SESSION],
@@ -4680,6 +4654,7 @@ App::put('/v1/account/targets/:targetId/push')
     ->label('event', 'users.[userId].targets.[targetId].update')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'pushTargets',
         name: 'updatePushTarget',
         description: '/docs/references/account/update-push-target.md',
         auth: [AuthType::SESSION],
@@ -4744,6 +4719,7 @@ App::delete('/v1/account/targets/:targetId/push')
     ->label('event', 'users.[userId].targets.[targetId].delete')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'pushTargets',
         name: 'deletePushTarget',
         description: '/docs/references/account/delete-push-target.md',
         auth: [AuthType::SESSION],
@@ -4794,6 +4770,7 @@ App::get('/v1/account/identities')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'identities',
         name: 'listIdentities',
         description: '/docs/references/account/list-identities.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4845,8 +4822,11 @@ App::get('/v1/account/identities')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('identities', $queries);
+        try {
+            $results = $dbForProject->find('identities', $queries);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
@@ -4865,6 +4845,7 @@ App::delete('/v1/account/identities/:identityId')
     ->label('audits.userId', '{user.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
+        group: 'identities',
         name: 'deleteIdentity',
         description: '/docs/references/account/delete-identity.md',
         auth: [AuthType::SESSION, AuthType::JWT],

app/controllers/api/avatars.php

@@ -171,6 +171,7 @@ App::get('/v1/avatars/credit-cards/:code')
     ->label('cache.resource', 'avatar/credit-card')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getCreditCard',
         description: '/docs/references/avatars/get-credit-card.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -198,6 +199,7 @@ App::get('/v1/avatars/browsers/:code')
     ->label('cache.resource', 'avatar/browser')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getBrowser',
         description: '/docs/references/avatars/get-browser.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -225,6 +227,7 @@ App::get('/v1/avatars/flags/:code')
     ->label('cache.resource', 'avatar/flag')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getFlag',
         description: '/docs/references/avatars/get-flag.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -252,6 +255,7 @@ App::get('/v1/avatars/image')
     ->label('cache.resource', 'avatar/image')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getImage',
         description: '/docs/references/avatars/get-image.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -322,6 +326,7 @@ App::get('/v1/avatars/favicon')
     ->label('cache.resource', 'avatar/favicon')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getFavicon',
         description: '/docs/references/avatars/get-favicon.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -472,6 +477,7 @@ App::get('/v1/avatars/qr')
     ->label('scope', 'avatars.read')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getQR',
         description: '/docs/references/avatars/get-qr.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -520,6 +526,7 @@ App::get('/v1/avatars/initials')
     ->label('cache.resource', 'avatar/initials')
     ->label('sdk', new Method(
         namespace: 'avatars',
+        group: null,
         name: 'getInitials',
         description: '/docs/references/avatars/get-initials.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],

app/controllers/api/console.php

@@ -27,6 +27,7 @@ App::get('/v1/console/variables')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'console',
+        group: 'console',
         name: 'variables',
         description: '/docs/references/console/variables.md',
         auth: [AuthType::ADMIN],
@@ -67,11 +68,12 @@ App::get('/v1/console/variables')
     });
 
 App::post('/v1/console/assistant')
-    ->desc('Ask query')
+    ->desc('Create assistant query')
     ->groups(['api', 'assistant'])
     ->label('scope', 'assistant.read')
     ->label('sdk', new Method(
         namespace: 'assistant',
+        group: 'console',
         name: 'chat',
         description: '/docs/references/assistant/chat.md',
         auth: [AuthType::ADMIN],

app/controllers/api/functions.php

@@ -37,6 +37,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -150,6 +151,7 @@ App::post('/v1/functions')
     ->label('audits.resource', 'function/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'functions',
         name: 'create',
         description: '/docs/references/functions/create-function.md',
         auth: [AuthType::KEY],
@@ -184,8 +186,8 @@ App::post('/v1/functions')
     ->param('specification', APP_FUNCTION_SPECIFICATION_DEFAULT, fn (array $plan) => new RuntimeSpecification(
         $plan,
         Config::getParam('runtime-specifications', []),
-        App::getEnv('_APP_FUNCTIONS_CPUS', APP_FUNCTION_CPUS_DEFAULT),
-        App::getEnv('_APP_FUNCTIONS_MEMORY', APP_FUNCTION_MEMORY_DEFAULT)
+        System::getEnv('_APP_FUNCTIONS_CPUS', 0),
+        System::getEnv('_APP_FUNCTIONS_MEMORY', 0)
     ), 'Runtime specification for the function and builds.', true, ['plan'])
     ->inject('request')
     ->inject('response')
@@ -295,7 +297,7 @@ App::post('/v1/functions')
 
         $schedule = Authorization::skip(
             fn () => $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'), // Todo replace with projects region
+                'region' => $project->getAttribute('region'),
                 'resourceType' => 'function',
                 'resourceId' => $function->getId(),
                 'resourceInternalId' => $function->getInternalId(),
@@ -387,6 +389,8 @@ App::post('/v1/functions')
                     'resourceInternalId' => $function->getInternalId(),
                     'status' => 'verified',
                     'certificateId' => '',
+                    'owner' => 'Appwrite',
+                    'region' => $project->getAttribute('region')
                 ]))
             );
 
@@ -429,6 +433,7 @@ App::get('/v1/functions')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'functions',
         name: 'list',
         description: '/docs/references/functions/list-functions.md',
         auth: [AuthType::KEY],
@@ -481,10 +486,15 @@ App::get('/v1/functions')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $functions = $dbForProject->find('functions', $queries);
+            $total = $dbForProject->count('functions', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'functions' => $dbForProject->find('functions', $queries),
-            'total' => $dbForProject->count('functions', $filterQueries, APP_LIMIT_COUNT),
+            'functions' => $functions,
+            'total' => $total,
         ]), Response::MODEL_FUNCTION_LIST);
     });
 
@@ -495,6 +505,7 @@ App::get('/v1/functions/runtimes')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'runtimes',
         name: 'listRuntimes',
         description: '/docs/references/functions/list-runtimes.md',
         auth: [AuthType::KEY],
@@ -534,6 +545,7 @@ App::get('/v1/functions/specifications')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'runtimes',
         name: 'listSpecifications',
         description: '/docs/references/functions/list-specifications.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -557,8 +569,12 @@ App::get('/v1/functions/specifications')
                 $spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']);
             }
 
+            $maxCpus = System::getEnv('_APP_FUNCTIONS_CPUS', 0);
+            $maxMemory = System::getEnv('_APP_FUNCTIONS_MEMORY', 0);
+
             // Only add specs that are within the limits set by environment variables
-            if ($spec['cpus'] <= System::getEnv('_APP_FUNCTIONS_CPUS', 1) && $spec['memory'] <= System::getEnv('_APP_FUNCTIONS_MEMORY', 512)) {
+            // Treat 0 as no limit
+            if ((empty($maxCpus) || $spec['cpus'] <= $maxCpus) && (empty($maxMemory) || $spec['memory'] <= $maxMemory)) {
                 $runtimeSpecs[] = $spec;
             }
         }
@@ -576,6 +592,7 @@ App::get('/v1/functions/:functionId')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'functions',
         name: 'get',
         description: '/docs/references/functions/get-function.md',
         auth: [AuthType::KEY],
@@ -606,6 +623,7 @@ App::get('/v1/functions/:functionId/usage')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: null,
         name: 'getFunctionUsage',
         description: '/docs/references/functions/get-function-usage.md',
         auth: [AuthType::ADMIN],
@@ -717,6 +735,7 @@ App::get('/v1/functions/usage')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: null,
         name: 'getUsage',
         description: '/docs/references/functions/get-functions-usage.md',
         auth: [AuthType::ADMIN],
@@ -826,6 +845,7 @@ App::put('/v1/functions/:functionId')
     ->label('audits.resource', 'function/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'functions',
         name: 'update',
         description: '/docs/references/functions/update-function.md',
         auth: [AuthType::KEY],
@@ -856,8 +876,8 @@ App::put('/v1/functions/:functionId')
     ->param('specification', APP_FUNCTION_SPECIFICATION_DEFAULT, fn (array $plan) => new RuntimeSpecification(
         $plan,
         Config::getParam('runtime-specifications', []),
-        App::getEnv('_APP_FUNCTIONS_CPUS', APP_FUNCTION_CPUS_DEFAULT),
-        App::getEnv('_APP_FUNCTIONS_MEMORY', APP_FUNCTION_MEMORY_DEFAULT)
+        System::getEnv('_APP_FUNCTIONS_CPUS', 0),
+        System::getEnv('_APP_FUNCTIONS_MEMORY', 0)
     ), 'Runtime specification for the function and builds.', true, ['plan'])
     ->inject('request')
     ->inject('response')
@@ -867,7 +887,8 @@ App::put('/v1/functions/:functionId')
     ->inject('queueForBuilds')
     ->inject('dbForPlatform')
     ->inject('gitHub')
-    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, array $scopes, string $installationId, ?string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $specification, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds, Database $dbForPlatform, GitHub $github) use ($redeployVcs) {
+    ->inject('executor')
+    ->action(function (string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, array $scopes, string $installationId, ?string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $specification, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds, Database $dbForPlatform, GitHub $github, Executor $executor) use ($redeployVcs) {
         // TODO: If only branch changes, re-deploy
         $function = $dbForProject->getDocument('functions', $functionId);
 
@@ -970,7 +991,6 @@ App::put('/v1/functions/:functionId')
 
         // Enforce Cold Start if spec limits change.
         if ($function->getAttribute('specification') !== $specification && !empty($function->getAttribute('deployment'))) {
-            $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
             try {
                 $executor->deleteRuntime($project->getId(), $function->getAttribute('deployment'));
             } catch (\Throwable $th) {
@@ -1026,11 +1046,12 @@ App::put('/v1/functions/:functionId')
 
 App::get('/v1/functions/:functionId/deployments/:deploymentId/download')
     ->groups(['api', 'functions'])
-    ->desc('Download deployment')
+    ->desc('Get deployment download')
     ->label('scope', 'functions.read')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'getDeploymentDownload',
         description: '/docs/references/functions/get-deployment-download.md',
         auth: [AuthType::KEY, AuthType::JWT],
@@ -1127,6 +1148,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'updateDeployment',
         description: '/docs/references/functions/update-function-deployment.md',
         auth: [AuthType::KEY],
@@ -1195,6 +1217,7 @@ App::delete('/v1/functions/:functionId')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'functions',
         name: 'delete',
         description: '/docs/references/functions/delete-function.md',
         auth: [AuthType::KEY],
@@ -1250,6 +1273,7 @@ App::post('/v1/functions/:functionId/deployments')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'createDeployment',
         description: '/docs/references/functions/create-deployment.md',
         auth: [AuthType::KEY],
@@ -1261,7 +1285,7 @@ App::post('/v1/functions/:functionId/deployments')
         ],
         type: MethodType::UPLOAD,
         packaging: true,
-        requestType: 'multipart/form-data',
+        requestType: ContentType::MULTIPART,
     ))
     ->param('functionId', '', new UID(), 'Function ID.')
     ->param('entrypoint', null, new Text(1028), 'Entrypoint File.', true)
@@ -1472,6 +1496,7 @@ App::get('/v1/functions/:functionId/deployments')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'listDeployments',
         description: '/docs/references/functions/list-deployments.md',
         auth: [AuthType::KEY],
@@ -1535,9 +1560,12 @@ App::get('/v1/functions/:functionId/deployments')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('deployments', $queries);
-        $total = $dbForProject->count('deployments', $filterQueries, APP_LIMIT_COUNT);
+        try {
+            $results = $dbForProject->find('deployments', $queries);
+            $total = $dbForProject->count('deployments', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
 
         foreach ($results as $result) {
             $build = $dbForProject->getDocument('builds', $result->getAttribute('buildId', ''));
@@ -1561,6 +1589,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'getDeployment',
         description: '/docs/references/functions/get-deployment.md',
         auth: [AuthType::KEY],
@@ -1613,6 +1642,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'deleteDeployment',
         description: '/docs/references/functions/delete-deployment.md',
         auth: [AuthType::KEY],
@@ -1678,7 +1708,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
 App::post('/v1/functions/:functionId/deployments/:deploymentId/build')
     ->alias('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
     ->groups(['api', 'functions'])
-    ->desc('Rebuild deployment')
+    ->desc('Create deployment build')
     ->label('scope', 'functions.write')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
@@ -1686,6 +1716,7 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/build')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'createBuild',
         description: '/docs/references/functions/create-build.md',
         auth: [AuthType::KEY],
@@ -1761,6 +1792,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId/build')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'deployments',
         name: 'updateDeploymentBuild',
         description: '/docs/references/functions/update-deployment-build.md',
         auth: [AuthType::KEY],
@@ -1777,7 +1809,8 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId/build')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('queueForEvents')
-    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Document $project, Event $queueForEvents) {
+    ->inject('executor')
+    ->action(function (string $functionId, string $deploymentId, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Executor $executor) {
         $function = $dbForProject->getDocument('functions', $functionId);
 
         if ($function->isEmpty()) {
@@ -1832,7 +1865,6 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId/build')
         $dbForProject->purgeCachedDocument('deployments', $deployment->getId());
 
         try {
-            $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
             $executor->deleteRuntime($project->getId(), $deploymentId . "-build");
         } catch (\Throwable $th) {
             // Don't throw if the deployment doesn't exist
@@ -1856,6 +1888,7 @@ App::post('/v1/functions/:functionId/executions')
     ->label('event', 'functions.[functionId].executions.[executionId].create')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'executions',
         name: 'createExecution',
         description: '/docs/references/functions/create-execution.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1866,7 +1899,6 @@ App::post('/v1/functions/:functionId/executions')
             )
         ],
         contentType: ContentType::MULTIPART,
-        requestType: 'application/json',
     ))
     ->param('functionId', '', new UID(), 'Function ID.')
     ->param('body', '', new Text(10485760, 0), 'HTTP body of execution. Default value is empty string.', true)
@@ -1884,8 +1916,9 @@ App::post('/v1/functions/:functionId/executions')
     ->inject('queueForEvents')
     ->inject('queueForStatsUsage')
     ->inject('queueForFunctions')
+    ->inject('executor')
     ->inject('geodb')
-    ->action(function (string $functionId, string $body, mixed $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForPlatform, Document $user, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb) {
+    ->action(function (string $functionId, string $body, mixed $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForPlatform, Document $user, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb) {
         $async = \strval($async) === 'true' || \strval($async) === '1';
 
         if (!$async && !is_null($scheduledAt)) {
@@ -2077,7 +2110,7 @@ App::post('/v1/functions/:functionId/executions')
                 ];
 
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                     'resourceType' => ScheduleExecutions::getSupportedResource(),
                     'resourceId' => $execution->getId(),
                     'resourceInternalId' => $execution->getInternalId(),
@@ -2158,7 +2191,6 @@ App::post('/v1/functions/:functionId/executions')
         ]);
 
         /** Execute function */
-        $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
         try {
             $version = $function->getAttribute('version', 'v2');
             $command = $runtime['startCommand'];
@@ -2224,15 +2256,6 @@ App::post('/v1/functions/:functionId/executions')
             $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $execution->setAttribute('logs', '');
-            $execution->setAttribute('errors', '');
-        }
-
         $headers = [];
         foreach (($executionResponse['headers'] ?? []) as $key => $value) {
             $headers[] = ['name' => $key, 'value' => $value];
@@ -2264,6 +2287,7 @@ App::get('/v1/functions/:functionId/executions')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'executions',
         name: 'listExecutions',
         description: '/docs/references/functions/list-executions.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -2329,19 +2353,11 @@ App::get('/v1/functions/:functionId/executions')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('executions', $queries);
-        $total = $dbForProject->count('executions', $filterQueries, APP_LIMIT_COUNT);
-
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $results = array_map(function ($execution) {
-                $execution->setAttribute('logs', '');
-                $execution->setAttribute('errors', '');
-                return $execution;
-            }, $results);
+        try {
+            $results = $dbForProject->find('executions', $queries);
+            $total = $dbForProject->count('executions', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
         }
 
         $response->dynamic(new Document([
@@ -2357,6 +2373,7 @@ App::get('/v1/functions/:functionId/executions/:executionId')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'executions',
         name: 'getExecution',
         description: '/docs/references/functions/get-execution.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -2392,14 +2409,6 @@ App::get('/v1/functions/:functionId/executions/:executionId')
             throw new Exception(Exception::EXECUTION_NOT_FOUND);
         }
 
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $execution->setAttribute('logs', '');
-            $execution->setAttribute('errors', '');
-        }
-
         $response->dynamic($execution, Response::MODEL_EXECUTION);
     });
 
@@ -2413,6 +2422,7 @@ App::delete('/v1/functions/:functionId/executions/:executionId')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'executions',
         name: 'deleteExecution',
         description: '/docs/references/functions/delete-execution.md',
         auth: [AuthType::KEY],
@@ -2490,6 +2500,7 @@ App::post('/v1/functions/:functionId/variables')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'variables',
         name: 'createVariable',
         description: '/docs/references/functions/create-variable.md',
         auth: [AuthType::KEY],
@@ -2560,6 +2571,7 @@ App::get('/v1/functions/:functionId/variables')
         'sdk',
         new Method(
             namespace: 'functions',
+            group: 'variables',
             name: 'listVariables',
             description: '/docs/references/functions/list-variables.md',
             auth: [AuthType::KEY],
@@ -2596,6 +2608,7 @@ App::get('/v1/functions/:functionId/variables/:variableId')
         'sdk',
         new Method(
             namespace: 'functions',
+            group: 'variables',
             name: 'getVariable',
             description: '/docs/references/functions/get-variable.md',
             auth: [AuthType::KEY],
@@ -2644,6 +2657,7 @@ App::put('/v1/functions/:functionId/variables/:variableId')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'variables',
         name: 'updateVariable',
         description: '/docs/references/functions/update-variable.md',
         auth: [AuthType::KEY],
@@ -2711,6 +2725,7 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
     ->label('audits.resource', 'function/{request.functionId}')
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'variables',
         name: 'deleteVariable',
         description: '/docs/references/functions/delete-variable.md',
         auth: [AuthType::KEY],
@@ -2765,6 +2780,7 @@ App::get('/v1/functions/templates')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'templates',
         name: 'listTemplates',
         description: '/docs/references/functions/list-templates.md',
         auth: [AuthType::ADMIN],
@@ -2808,6 +2824,7 @@ App::get('/v1/functions/templates/:templateId')
     ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
     ->label('sdk', new Method(
         namespace: 'functions',
+        group: 'templates',
         name: 'getTemplate',
         description: '/docs/references/functions/get-template.md',
         auth: [AuthType::ADMIN],

app/controllers/api/graphql.php

@@ -44,6 +44,7 @@ App::get('/v1/graphql')
     ->label('scope', 'graphql')
     ->label('sdk', new Method(
         namespace: 'graphql',
+        group: 'graphql',
         name: 'get',
         auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
         hide: true,
@@ -90,6 +91,7 @@ App::post('/v1/graphql/mutation')
     ->label('scope', 'graphql')
     ->label('sdk', new Method(
         namespace: 'graphql',
+        group: 'graphql',
         name: 'mutation',
         auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
         description: '/docs/references/graphql/post.md',
@@ -140,6 +142,7 @@ App::post('/v1/graphql')
     ->label('scope', 'graphql')
     ->label('sdk', new Method(
         namespace: 'graphql',
+        group: 'graphql',
         name: 'query',
         auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
         description: '/docs/references/graphql/post.md',

app/controllers/api/health.php

@@ -32,6 +32,7 @@ App::get('/v1/health')
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
         namespace: 'health',
+        group: 'health',
         name: 'get',
         auth: [AuthType::KEY],
         description: '/docs/references/health/get.md',
@@ -71,6 +72,7 @@ App::get('/v1/health/db')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'health',
         name: 'getDB',
         description: '/docs/references/health/get-db.md',
         responses: [
@@ -131,6 +133,7 @@ App::get('/v1/health/cache')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'health',
         name: 'getCache',
         description: '/docs/references/health/get-cache.md',
         responses: [
@@ -195,6 +198,7 @@ App::get('/v1/health/pubsub')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'health',
         name: 'getPubSub',
         description: '/docs/references/health/get-pubsub.md',
         responses: [
@@ -259,6 +263,7 @@ App::get('/v1/health/time')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'health',
         name: 'getTime',
         description: '/docs/references/health/get-time.md',
         responses: [
@@ -322,6 +327,7 @@ App::get('/v1/health/queue/webhooks')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueWebhooks',
         description: '/docs/references/health/get-queue-webhooks.md',
         responses: [
@@ -354,6 +360,7 @@ App::get('/v1/health/queue/logs')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueLogs',
         description: '/docs/references/health/get-queue-logs.md',
         responses: [
@@ -386,6 +393,7 @@ App::get('/v1/health/certificate')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'health',
         name: 'getCertificate',
         description: '/docs/references/health/get-certificate.md',
         responses: [
@@ -442,6 +450,7 @@ App::get('/v1/health/queue/certificates')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueCertificates',
         description: '/docs/references/health/get-queue-certificates.md',
         responses: [
@@ -474,6 +483,7 @@ App::get('/v1/health/queue/builds')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueBuilds',
         description: '/docs/references/health/get-queue-builds.md',
         responses: [
@@ -506,6 +516,7 @@ App::get('/v1/health/queue/databases')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueDatabases',
         description: '/docs/references/health/get-queue-databases.md',
         responses: [
@@ -539,6 +550,7 @@ App::get('/v1/health/queue/deletes')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueDeletes',
         description: '/docs/references/health/get-queue-deletes.md',
         responses: [
@@ -571,6 +583,7 @@ App::get('/v1/health/queue/mails')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueMails',
         description: '/docs/references/health/get-queue-mails.md',
         responses: [
@@ -603,6 +616,7 @@ App::get('/v1/health/queue/messaging')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueMessaging',
         description: '/docs/references/health/get-queue-messaging.md',
         responses: [
@@ -635,6 +649,7 @@ App::get('/v1/health/queue/migrations')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueMigrations',
         description: '/docs/references/health/get-queue-migrations.md',
         responses: [
@@ -667,6 +682,7 @@ App::get('/v1/health/queue/functions')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueFunctions',
         description: '/docs/references/health/get-queue-functions.md',
         responses: [
@@ -699,6 +715,7 @@ App::get('/v1/health/queue/stats-resources')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueStatsResources',
         description: '/docs/references/health/get-queue-stats-resources.md',
         responses: [
@@ -731,6 +748,7 @@ App::get('/v1/health/queue/stats-usage')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getQueueUsage',
         description: '/docs/references/health/get-queue-stats-usage.md',
         responses: [
@@ -756,38 +774,6 @@ App::get('/v1/health/queue/stats-usage')
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
     });
 
-App::get('/v1/health/queue/stats-usage-dump')
-    ->desc('Get usage dump queue')
-    ->groups(['api', 'health'])
-    ->label('scope', 'health.read')
-    ->label('sdk', new Method(
-        auth: [AuthType::KEY],
-        namespace: 'health',
-        name: 'getQueueStatsUsageDump',
-        description: '/docs/references/health/get-queue-stats-usage-dump.md',
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_HEALTH_QUEUE,
-            )
-        ],
-        contentType: ContentType::JSON
-    ))
-    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
-    ->inject('publisher')
-    ->inject('response')
-    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
-        $threshold = \intval($threshold);
-
-        $size = $publisher->getQueueSize(new Queue(Event::STATS_USAGE_DUMP_QUEUE_NAME));
-
-        if ($size >= $threshold) {
-            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
-        }
-
-        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
-
 App::get('/v1/health/storage/local')
     ->desc('Get local storage')
     ->groups(['api', 'health'])
@@ -795,6 +781,7 @@ App::get('/v1/health/storage/local')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'storage',
         name: 'getStorageLocal',
         description: '/docs/references/health/get-storage-local.md',
         responses: [
@@ -844,6 +831,7 @@ App::get('/v1/health/storage')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'storage',
         name: 'getStorage',
         description: '/docs/references/health/get-storage.md',
         responses: [
@@ -891,6 +879,7 @@ App::get('/v1/health/anti-virus')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'health',
         name: 'getAntivirus',
         description: '/docs/references/health/get-storage-anti-virus.md',
         responses: [
@@ -936,6 +925,7 @@ App::get('/v1/health/queue/failed/:name')
     ->label('sdk', new Method(
         auth: [AuthType::KEY],
         namespace: 'health',
+        group: 'queue',
         name: 'getFailedJobs',
         description: '/docs/references/health/get-failed-queue-jobs.md',
         responses: [
@@ -954,7 +944,6 @@ App::get('/v1/health/queue/failed/:name')
         Event::FUNCTIONS_QUEUE_NAME,
         Event::STATS_RESOURCES_QUEUE_NAME,
         Event::STATS_USAGE_QUEUE_NAME,
-        Event::STATS_USAGE_DUMP_QUEUE_NAME,
         Event::WEBHOOK_QUEUE_NAME,
         Event::CERTIFICATES_QUEUE_NAME,
         Event::BUILDS_QUEUE_NAME,
@@ -980,9 +969,6 @@ App::get('/v1/health/stats') // Currently only used internally
 ->desc('Get system stats')
     ->groups(['api', 'health'])
     ->label('scope', 'root')
-    // ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
-    // ->label('sdk.namespace', 'health')
-    // ->label('sdk.method', 'getStats')
     ->label('docs', false)
     ->inject('response')
     ->inject('register')

app/controllers/api/locale.php

@@ -17,6 +17,7 @@ App::get('/v1/locale')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'get',
         description: '/docs/references/locale/get-locale.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -80,6 +81,7 @@ App::get('/v1/locale/codes')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listCodes',
         description: '/docs/references/locale/list-locale-codes.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -105,6 +107,7 @@ App::get('/v1/locale/countries')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listCountries',
         description: '/docs/references/locale/list-countries.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -118,7 +121,7 @@ App::get('/v1/locale/countries')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
-        $list = Config::getParam('locale-countries'); /* @var $list array */
+        $list = array_keys(Config::getParam('locale-countries')); /* @var $list array */
         $output = [];
 
         foreach ($list as $value) {
@@ -141,6 +144,7 @@ App::get('/v1/locale/countries/eu')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listCountriesEU',
         description: '/docs/references/locale/list-countries-eu.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -179,6 +183,7 @@ App::get('/v1/locale/countries/phones')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listCountriesPhones',
         description: '/docs/references/locale/list-countries-phones.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -216,6 +221,7 @@ App::get('/v1/locale/continents')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listContinents',
         description: '/docs/references/locale/list-continents.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -229,7 +235,7 @@ App::get('/v1/locale/continents')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
-        $list = Config::getParam('locale-continents');
+        $list = array_keys(Config::getParam('locale-continents'));
 
         foreach ($list as $value) {
             $output[] = new Document([
@@ -251,6 +257,7 @@ App::get('/v1/locale/currencies')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listCurrencies',
         description: '/docs/references/locale/list-currencies.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -277,6 +284,7 @@ App::get('/v1/locale/languages')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
+        group: null,
         name: 'listLanguages',
         description: '/docs/references/locale/list-languages.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],

app/controllers/api/messaging.php

@@ -30,6 +30,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -63,6 +64,7 @@ App::post('/v1/messaging/providers/mailgun')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createMailgunProvider',
         description: '/docs/references/messaging/create-mailgun-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -156,6 +158,7 @@ App::post('/v1/messaging/providers/sendgrid')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createSendgridProvider',
         description: '/docs/references/messaging/create-sendgrid-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -237,6 +240,7 @@ App::post('/v1/messaging/providers/smtp')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createSmtpProvider',
         description: '/docs/references/messaging/create-smtp-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -331,6 +335,7 @@ App::post('/v1/messaging/providers/msg91')
     ->label('event', 'providers.[providerId].create')
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createMsg91Provider',
         description: '/docs/references/messaging/create-msg91-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -413,6 +418,7 @@ App::post('/v1/messaging/providers/telesign')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createTelesignProvider',
         description: '/docs/references/messaging/create-telesign-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -496,6 +502,7 @@ App::post('/v1/messaging/providers/textmagic')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createTextmagicProvider',
         description: '/docs/references/messaging/create-textmagic-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -579,6 +586,7 @@ App::post('/v1/messaging/providers/twilio')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createTwilioProvider',
         description: '/docs/references/messaging/create-twilio-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -662,6 +670,7 @@ App::post('/v1/messaging/providers/vonage')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createVonageProvider',
         description: '/docs/references/messaging/create-vonage-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -745,6 +754,7 @@ App::post('/v1/messaging/providers/fcm')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createFcmProvider',
         description: '/docs/references/messaging/create-fcm-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -814,6 +824,7 @@ App::post('/v1/messaging/providers/apns')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'createApnsProvider',
         description: '/docs/references/messaging/create-apns-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -903,6 +914,7 @@ App::get('/v1/messaging/providers')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'listProviders',
         description: '/docs/references/messaging/list-providers.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -951,10 +963,15 @@ App::get('/v1/messaging/providers')
 
             $cursor->setValue($cursorDocument);
         }
-
+        try {
+            $providers = $dbForProject->find('providers', $queries);
+            $total = $dbForProject->count('providers', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'providers' => $dbForProject->find('providers', $queries),
-            'total' => $dbForProject->count('providers', $queries, APP_LIMIT_COUNT),
+            'providers' => $providers,
+            'total' => $total,
         ]), Response::MODEL_PROVIDER_LIST);
     });
 
@@ -965,6 +982,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'listProviderLogs',
         description: '/docs/references/messaging/list-provider-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1061,6 +1079,7 @@ App::get('/v1/messaging/providers/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'getProvider',
         description: '/docs/references/messaging/get-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1094,6 +1113,7 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateMailgunProvider',
         description: '/docs/references/messaging/update-mailgun-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1206,6 +1226,7 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateSendgridProvider',
         description: '/docs/references/messaging/update-sendgrid-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1303,6 +1324,7 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateSmtpProvider',
         description: '/docs/references/messaging/update-smtp-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1431,6 +1453,7 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateMsg91Provider',
         description: '/docs/references/messaging/update-msg91-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1517,6 +1540,7 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateTelesignProvider',
         description: '/docs/references/messaging/update-telesign-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1605,6 +1629,7 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateTextmagicProvider',
         description: '/docs/references/messaging/update-textmagic-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1693,6 +1718,7 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateTwilioProvider',
         description: '/docs/references/messaging/update-twilio-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1781,6 +1807,7 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateVonageProvider',
         description: '/docs/references/messaging/update-vonage-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1869,6 +1896,7 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateFcmProvider',
         description: '/docs/references/messaging/update-fcm-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1944,6 +1972,7 @@ App::patch('/v1/messaging/providers/apns/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'updateApnsProvider',
         description: '/docs/references/messaging/update-apns-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2045,6 +2074,7 @@ App::delete('/v1/messaging/providers/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'providers',
         name: 'deleteProvider',
         description: '/docs/references/messaging/delete-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2087,6 +2117,7 @@ App::post('/v1/messaging/topics')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'topics',
         name: 'createTopic',
         description: '/docs/references/messaging/create-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2133,6 +2164,7 @@ App::get('/v1/messaging/topics')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'topics',
         name: 'listTopics',
         description: '/docs/references/messaging/list-topics.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2181,10 +2213,15 @@ App::get('/v1/messaging/topics')
 
             $cursor->setValue($cursorDocument[0]);
         }
-
+        try {
+            $topics = $dbForProject->find('topics', $queries);
+            $total = $dbForProject->count('topics', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'topics' => $dbForProject->find('topics', $queries),
-            'total' => $dbForProject->count('topics', $queries, APP_LIMIT_COUNT),
+            'topics' => $topics,
+            'total' => $total,
         ]), Response::MODEL_TOPIC_LIST);
     });
 
@@ -2195,6 +2232,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'topics',
         name: 'listTopicLogs',
         description: '/docs/references/messaging/list-topic-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2292,6 +2330,7 @@ App::get('/v1/messaging/topics/:topicId')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'topics',
         name: 'getTopic',
         description: '/docs/references/messaging/get-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2326,6 +2365,7 @@ App::patch('/v1/messaging/topics/:topicId')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'topics',
         name: 'updateTopic',
         description: '/docs/references/messaging/update-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2376,6 +2416,7 @@ App::delete('/v1/messaging/topics/:topicId')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'topics',
         name: 'deleteTopic',
         description: '/docs/references/messaging/delete-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2423,6 +2464,7 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'subscribers',
         name: 'createSubscriber',
         description: '/docs/references/messaging/create-subscriber.md',
         auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2522,6 +2564,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'subscribers',
         name: 'listSubscribers',
         description: '/docs/references/messaging/list-subscribers.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2579,8 +2622,11 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
 
             $cursor->setValue($cursorDocument);
         }
-
-        $subscribers = $dbForProject->find('subscribers', $queries);
+        try {
+            $subscribers = $dbForProject->find('subscribers', $queries);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
 
         $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject) {
             return function () use ($subscriber, $dbForProject) {
@@ -2607,6 +2653,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'subscribers',
         name: 'listSubscriberLogs',
         description: '/docs/references/messaging/list-subscriber-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2704,6 +2751,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'subscribers',
         name: 'getSubscriber',
         description: '/docs/references/messaging/get-subscriber.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2752,6 +2800,7 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'subscribers',
         name: 'deleteSubscriber',
         description: '/docs/references/messaging/delete-subscriber.md',
         auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2818,6 +2867,7 @@ App::post('/v1/messaging/messages/email')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'createEmail',
         description: '/docs/references/messaging/create-email.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2936,7 +2986,7 @@ App::post('/v1/messaging/messages/email')
                 break;
             case MessageStatus::SCHEDULED:
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                     'resourceType' => 'message',
                     'resourceId' => $message->getId(),
                     'resourceInternalId' => $message->getInternalId(),
@@ -2976,6 +3026,7 @@ App::post('/v1/messaging/messages/sms')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'createSms',
         description: '/docs/references/messaging/create-sms.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3058,7 +3109,7 @@ App::post('/v1/messaging/messages/sms')
                 break;
             case MessageStatus::SCHEDULED:
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                     'resourceType' => 'message',
                     'resourceId' => $message->getId(),
                     'resourceInternalId' => $message->getInternalId(),
@@ -3098,6 +3149,7 @@ App::post('/v1/messaging/messages/push')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'createPush',
         description: '/docs/references/messaging/create-push.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3275,7 +3327,7 @@ App::post('/v1/messaging/messages/push')
                 break;
             case MessageStatus::SCHEDULED:
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
+                    'region' => $project->getAttribute('region'),
                     'resourceType' => 'message',
                     'resourceId' => $message->getId(),
                     'resourceInternalId' => $message->getInternalId(),
@@ -3312,6 +3364,7 @@ App::get('/v1/messaging/messages')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'listMessages',
         description: '/docs/references/messaging/list-messages.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3360,10 +3413,15 @@ App::get('/v1/messaging/messages')
 
             $cursor->setValue($cursorDocument);
         }
-
+        try {
+            $messages = $dbForProject->find('messages', $queries);
+            $total = $dbForProject->count('messages', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'messages' => $dbForProject->find('messages', $queries),
-            'total' => $dbForProject->count('messages', $queries, APP_LIMIT_COUNT),
+            'messages' => $messages,
+            'total' => $total,
         ]), Response::MODEL_MESSAGE_LIST);
     });
 
@@ -3374,6 +3432,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'logs',
         name: 'listMessageLogs',
         description: '/docs/references/messaging/list-message-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3471,6 +3530,7 @@ App::get('/v1/messaging/messages/:messageId/targets')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'listTargets',
         description: '/docs/references/messaging/list-message-targets.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3533,10 +3593,15 @@ App::get('/v1/messaging/messages/:messageId/targets')
 
             $cursor->setValue($cursorDocument);
         }
-
+        try {
+            $targets = $dbForProject->find('targets', $queries);
+            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'targets' => $dbForProject->find('targets', $queries),
-            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
+            'targets' => $targets,
+            'total' => $total,
         ]), Response::MODEL_TARGET_LIST);
     });
 
@@ -3547,6 +3612,7 @@ App::get('/v1/messaging/messages/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'getMessage',
         description: '/docs/references/messaging/get-message.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3580,6 +3646,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'updateEmail',
         description: '/docs/references/messaging/update-email.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3661,7 +3728,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
 
         if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
             $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'),
+                'region' => $project->getAttribute('region'),
                 'resourceType' => 'message',
                 'resourceId' => $message->getId(),
                 'resourceInternalId' => $message->getInternalId(),
@@ -3786,6 +3853,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'updateSms',
         description: '/docs/references/messaging/update-sms.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3862,7 +3930,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
 
         if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
             $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'),
+                'region' => $project->getAttribute('region'),
                 'resourceType' => 'message',
                 'resourceId' => $message->getId(),
                 'resourceInternalId' => $message->getInternalId(),
@@ -3947,6 +4015,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'updatePush',
         description: '/docs/references/messaging/update-push.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -4035,7 +4104,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
 
         if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
             $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'),
+                'region' => $project->getAttribute('region'),
                 'resourceType' => 'message',
                 'resourceId' => $message->getId(),
                 'resourceInternalId' => $message->getInternalId(),
@@ -4206,6 +4275,7 @@ App::delete('/v1/messaging/messages/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
+        group: 'messages',
         name: 'delete',
         description: '/docs/references/messaging/delete-message.md',
         auth: [AuthType::ADMIN, AuthType::KEY],

app/controllers/api/migrations.php

@@ -12,6 +12,7 @@ use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -31,12 +32,13 @@ include_once __DIR__ . '/../shared/api.php';
 
 App::post('/v1/migrations/appwrite')
     ->groups(['api', 'migrations'])
-    ->desc('Migrate Appwrite data')
+    ->desc('Create Appwrite migration')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'createAppwriteMigration',
         description: '/docs/references/migrations/migration-appwrite.md',
         auth: [AuthType::ADMIN],
@@ -92,12 +94,13 @@ App::post('/v1/migrations/appwrite')
 
 App::post('/v1/migrations/firebase')
     ->groups(['api', 'migrations'])
-    ->desc('Migrate Firebase data')
+    ->desc('Create Firebase migration')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'createFirebaseMigration',
         description: '/docs/references/migrations/migration-firebase.md',
         auth: [AuthType::ADMIN],
@@ -158,12 +161,13 @@ App::post('/v1/migrations/firebase')
 
 App::post('/v1/migrations/supabase')
     ->groups(['api', 'migrations'])
-    ->desc('Migrate Supabase data')
+    ->desc('Create Supabase migration')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'createSupabaseMigration',
         description: '/docs/references/migrations/migration-supabase.md',
         auth: [AuthType::ADMIN],
@@ -224,12 +228,13 @@ App::post('/v1/migrations/supabase')
 
 App::post('/v1/migrations/nhost')
     ->groups(['api', 'migrations'])
-    ->desc('Migrate NHost data')
+    ->desc('Create NHost migration')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'createNHostMigration',
         description: '/docs/references/migrations/migration-nhost.md',
         auth: [AuthType::ADMIN],
@@ -296,6 +301,7 @@ App::get('/v1/migrations')
     ->label('scope', 'migrations.read')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'list',
         description: '/docs/references/migrations/list-migrations.md',
         auth: [AuthType::ADMIN],
@@ -347,10 +353,15 @@ App::get('/v1/migrations')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $migrations = $dbForProject->find('migrations', $queries);
+            $total = $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'migrations' => $dbForProject->find('migrations', $queries),
-            'total' => $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT),
+            'migrations' => $migrations,
+            'total' => $total,
         ]), Response::MODEL_MIGRATION_LIST);
     });
 
@@ -360,6 +371,7 @@ App::get('/v1/migrations/:migrationId')
     ->label('scope', 'migrations.read')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'get',
         description: '/docs/references/migrations/get-migration.md',
         auth: [AuthType::ADMIN],
@@ -385,10 +397,11 @@ App::get('/v1/migrations/:migrationId')
 
 App::get('/v1/migrations/appwrite/report')
     ->groups(['api', 'migrations'])
-    ->desc('Generate a report on Appwrite data')
+    ->desc('Get Appwrite migration report')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'getAppwriteReport',
         description: '/docs/references/migrations/migration-appwrite-report.md',
         auth: [AuthType::ADMIN],
@@ -408,6 +421,7 @@ App::get('/v1/migrations/appwrite/report')
     ->inject('project')
     ->inject('user')
     ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
+
         $appwrite = new Appwrite($projectID, $endpoint, $key);
 
         try {
@@ -432,10 +446,11 @@ App::get('/v1/migrations/appwrite/report')
 
 App::get('/v1/migrations/firebase/report')
     ->groups(['api', 'migrations'])
-    ->desc('Generate a report on Firebase data')
+    ->desc('Get Firebase migration report')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'getFirebaseReport',
         description: '/docs/references/migrations/migration-firebase-report.md',
         auth: [AuthType::ADMIN],
@@ -484,10 +499,11 @@ App::get('/v1/migrations/firebase/report')
 
 App::get('/v1/migrations/supabase/report')
     ->groups(['api', 'migrations'])
-    ->desc('Generate a report on Supabase Data')
+    ->desc('Get Supabase migration report')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'getSupabaseReport',
         description: '/docs/references/migrations/migration-supabase-report.md',
         auth: [AuthType::ADMIN],
@@ -532,10 +548,11 @@ App::get('/v1/migrations/supabase/report')
 
 App::get('/v1/migrations/nhost/report')
     ->groups(['api', 'migrations'])
-    ->desc('Generate a report on NHost Data')
+    ->desc('Get NHost migration report')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'getNHostReport',
         description: '/docs/references/migrations/migration-nhost-report.md',
         auth: [AuthType::ADMIN],
@@ -580,13 +597,14 @@ App::get('/v1/migrations/nhost/report')
 
 App::patch('/v1/migrations/:migrationId')
     ->groups(['api', 'migrations'])
-    ->desc('Retry migration')
+    ->desc('Update retry migration')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].retry')
     ->label('audits.event', 'migration.retry')
     ->label('audits.resource', 'migrations/{request.migrationId}')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'retry',
         description: '/docs/references/migrations/retry-migration.md',
         auth: [AuthType::ADMIN],
@@ -637,6 +655,7 @@ App::delete('/v1/migrations/:migrationId')
     ->label('audits.resource', 'migrations/{request.migrationId}')
     ->label('sdk', new Method(
         namespace: 'migrations',
+        group: null,
         name: 'delete',
         description: '/docs/references/migrations/delete-migration.md',
         auth: [AuthType::ADMIN],

app/controllers/api/project.php

@@ -26,6 +26,7 @@ App::get('/v1/project/usage')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'project',
+        group: null,
         name: 'getUsage',
         description: '/docs/references/project/get-usage.md',
         auth: [AuthType::ADMIN],
@@ -387,6 +388,7 @@ App::post('/v1/project/variables')
     ->label('audits.event', 'variable.create')
     ->label('sdk', new Method(
         namespace: 'project',
+        group: null,
         name: 'createVariable',
         description: '/docs/references/project/create-variable.md',
         auth: [AuthType::ADMIN],
@@ -446,6 +448,7 @@ App::get('/v1/project/variables')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'project',
+        group: null,
         name: 'listVariables',
         description: '/docs/references/project/list-variables.md',
         auth: [AuthType::ADMIN],
@@ -476,6 +479,7 @@ App::get('/v1/project/variables/:variableId')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'project',
+        group: null,
         name: 'getVariable',
         description: '/docs/references/project/get-variable.md',
         auth: [AuthType::ADMIN],
@@ -505,6 +509,7 @@ App::put('/v1/project/variables/:variableId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'project',
+        group: null,
         name: 'updateVariable',
         description: '/docs/references/project/update-variable.md',
         auth: [AuthType::ADMIN],
@@ -556,6 +561,7 @@ App::delete('/v1/project/variables/:variableId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'project',
+        group: null,
         name: 'deleteVariable',
         description: '/docs/references/project/delete-variable.md',
         auth: [AuthType::ADMIN],

app/controllers/api/projects.php

@@ -28,6 +28,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -68,6 +69,7 @@ App::post('/v1/projects')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'create',
         description: '/docs/references/projects/create.md',
         auth: [AuthType::ADMIN],
@@ -138,6 +140,14 @@ App::post('/v1/projects')
 
         $databases = Config::getParam('pools-database', []);
 
+        if ($region !== 'default') {
+            $databaseKeys = System::getEnv('_APP_DATABASE_KEYS', '');
+            $keys = explode(',', $databaseKeys);
+            $databases = array_filter($keys, function ($value) use ($region) {
+                return str_contains($value, $region);
+            });
+        }
+
         $databaseOverride = System::getEnv('_APP_DATABASE_OVERRIDE');
         $index = \array_search($databaseOverride, $databases);
         if ($index !== false) {
@@ -205,17 +215,17 @@ App::post('/v1/projects')
             $dsn = new DSN('mysql://' . $dsn);
         }
 
-        $adapter = $pools->get($dsn->getHost())->pop()->getResource();
-        $dbForProject = new Database($adapter, $cache);
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
         $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
-
         $projectTables = !\in_array($dsn->getHost(), $sharedTables);
         $sharedTablesV1 = \in_array($dsn->getHost(), $sharedTablesV1);
         $sharedTablesV2 = !$projectTables && !$sharedTablesV1;
         $sharedTables = $sharedTablesV1 || $sharedTablesV2;
 
         if (!$sharedTablesV2) {
+            $adapter = $pools->get($dsn->getHost())->pop()->getResource();
+            $dbForProject = new Database($adapter, $cache);
+
             if ($sharedTables) {
                 $dbForProject
                     ->setSharedTables(true)
@@ -297,6 +307,7 @@ App::get('/v1/projects')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'list',
         description: '/docs/references/projects/list.md',
         auth: [AuthType::ADMIN],
@@ -349,10 +360,15 @@ App::get('/v1/projects')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $projects = $dbForPlatform->find('projects', $queries);
+            $total = $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'projects' => $dbForPlatform->find('projects', $queries),
-            'total' => $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT),
+            'projects' => $projects,
+            'total' => $total,
         ]), Response::MODEL_PROJECT_LIST);
     });
 
@@ -362,6 +378,7 @@ App::get('/v1/projects/:projectId')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'get',
         description: '/docs/references/projects/get.md',
         auth: [AuthType::ADMIN],
@@ -394,6 +411,7 @@ App::patch('/v1/projects/:projectId')
     ->label('audits.resource', 'project/{request.projectId}')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'update',
         description: '/docs/references/projects/update.md',
         auth: [AuthType::ADMIN],
@@ -447,6 +465,7 @@ App::patch('/v1/projects/:projectId/team')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'updateTeam',
         description: '/docs/references/projects/update-team.md',
         auth: [AuthType::ADMIN],
@@ -521,6 +540,7 @@ App::patch('/v1/projects/:projectId/service')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'updateServiceStatus',
         description: '/docs/references/projects/update-service-status.md',
         auth: [AuthType::ADMIN],
@@ -558,6 +578,7 @@ App::patch('/v1/projects/:projectId/service/all')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'updateServiceStatusAll',
         description: '/docs/references/projects/update-service-status-all.md',
         auth: [AuthType::ADMIN],
@@ -598,6 +619,7 @@ App::patch('/v1/projects/:projectId/api')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'updateApiStatus',
         description: '/docs/references/projects/update-api-status.md',
         auth: [AuthType::ADMIN],
@@ -635,6 +657,7 @@ App::patch('/v1/projects/:projectId/api/all')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'updateApiStatusAll',
         description: '/docs/references/projects/update-api-status-all.md',
         auth: [AuthType::ADMIN],
@@ -675,6 +698,7 @@ App::patch('/v1/projects/:projectId/oauth2')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateOAuth2',
         description: '/docs/references/projects/update-oauth2.md',
         auth: [AuthType::ADMIN],
@@ -725,6 +749,7 @@ App::patch('/v1/projects/:projectId/auth/session-alerts')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateSessionAlerts',
         description: '/docs/references/projects/update-session-alerts.md',
         auth: [AuthType::ADMIN],
@@ -762,6 +787,7 @@ App::patch('/v1/projects/:projectId/auth/memberships-privacy')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateMembershipsPrivacy',
         description: '/docs/references/projects/update-memberships-privacy.md',
         auth: [AuthType::ADMIN],
@@ -803,6 +829,7 @@ App::patch('/v1/projects/:projectId/auth/limit')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateAuthLimit',
         description: '/docs/references/projects/update-auth-limit.md',
         auth: [AuthType::ADMIN],
@@ -840,6 +867,7 @@ App::patch('/v1/projects/:projectId/auth/duration')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateAuthDuration',
         description: '/docs/references/projects/update-auth-duration.md',
         auth: [AuthType::ADMIN],
@@ -877,6 +905,7 @@ App::patch('/v1/projects/:projectId/auth/:method')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateAuthStatus',
         description: '/docs/references/projects/update-auth-status.md',
         auth: [AuthType::ADMIN],
@@ -917,6 +946,7 @@ App::patch('/v1/projects/:projectId/auth/password-history')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateAuthPasswordHistory',
         description: '/docs/references/projects/update-auth-password-history.md',
         auth: [AuthType::ADMIN],
@@ -954,6 +984,7 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateAuthPasswordDictionary',
         description: '/docs/references/projects/update-auth-password-dictionary.md',
         auth: [AuthType::ADMIN],
@@ -986,11 +1017,12 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
     });
 
 App::patch('/v1/projects/:projectId/auth/personal-data')
-    ->desc('Enable or disable checking user passwords for similarity with their personal data.')
+    ->desc('Update personal data check')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updatePersonalDataCheck',
         description: '/docs/references/projects/update-personal-data-check.md',
         auth: [AuthType::ADMIN],
@@ -1028,6 +1060,7 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateAuthSessionsLimit',
         description: '/docs/references/projects/update-auth-sessions-limit.md',
         auth: [AuthType::ADMIN],
@@ -1065,6 +1098,7 @@ App::patch('/v1/projects/:projectId/auth/mock-numbers')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'updateMockNumbers',
         description: '/docs/references/projects/update-mock-numbers.md',
         auth: [AuthType::ADMIN],
@@ -1112,6 +1146,7 @@ App::delete('/v1/projects/:projectId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'projects',
         name: 'delete',
         description: '/docs/references/projects/delete.md',
         auth: [AuthType::ADMIN],
@@ -1155,6 +1190,7 @@ App::post('/v1/projects/:projectId/webhooks')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'webhooks',
         name: 'createWebhook',
         description: '/docs/references/projects/create-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1219,6 +1255,7 @@ App::get('/v1/projects/:projectId/webhooks')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'webhooks',
         name: 'listWebhooks',
         description: '/docs/references/projects/list-webhooks.md',
         auth: [AuthType::ADMIN],
@@ -1257,6 +1294,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'webhooks',
         name: 'getWebhook',
         description: '/docs/references/projects/get-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1297,6 +1335,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'webhooks',
         name: 'updateWebhook',
         description: '/docs/references/projects/update-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1362,6 +1401,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'webhooks',
         name: 'updateWebhookSignature',
         description: '/docs/references/projects/update-webhook-signature.md',
         auth: [AuthType::ADMIN],
@@ -1407,6 +1447,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'webhooks',
         name: 'deleteWebhook',
         description: '/docs/references/projects/delete-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1454,6 +1495,7 @@ App::post('/v1/projects/:projectId/keys')
     ->label('scope', 'keys.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'keys',
         name: 'createKey',
         description: '/docs/references/projects/create-key.md',
         auth: [AuthType::ADMIN],
@@ -1510,6 +1552,7 @@ App::get('/v1/projects/:projectId/keys')
     ->label('scope', 'keys.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'keys',
         name: 'listKeys',
         description: '/docs/references/projects/list-keys.md',
         auth: [AuthType::ADMIN],
@@ -1548,6 +1591,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
     ->label('scope', 'keys.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'keys',
         name: 'getKey',
         description: '/docs/references/projects/get-key.md',
         auth: [AuthType::ADMIN],
@@ -1588,6 +1632,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
     ->label('scope', 'keys.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'keys',
         name: 'updateKey',
         description: '/docs/references/projects/update-key.md',
         auth: [AuthType::ADMIN],
@@ -1640,6 +1685,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
     ->label('scope', 'keys.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'keys',
         name: 'deleteKey',
         description: '/docs/references/projects/delete-key.md',
         auth: [AuthType::ADMIN],
@@ -1687,6 +1733,7 @@ App::post('/v1/projects/:projectId/jwts')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'auth',
         name: 'createJWT',
         description: '/docs/references/projects/create-jwt.md',
         auth: [AuthType::ADMIN],
@@ -1730,6 +1777,7 @@ App::post('/v1/projects/:projectId/platforms')
     ->label('scope', 'platforms.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'platforms',
         name: 'createPlatform',
         description: '/docs/references/projects/create-platform.md',
         auth: [AuthType::ADMIN],
@@ -1786,6 +1834,7 @@ App::get('/v1/projects/:projectId/platforms')
     ->label('scope', 'platforms.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'platforms',
         name: 'listPlatforms',
         description: '/docs/references/projects/list-platforms.md',
         auth: [AuthType::ADMIN],
@@ -1824,6 +1873,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
     ->label('scope', 'platforms.read')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'platforms',
         name: 'getPlatform',
         description: '/docs/references/projects/get-platform.md',
         auth: [AuthType::ADMIN],
@@ -1864,6 +1914,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
     ->label('scope', 'platforms.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'platforms',
         name: 'updatePlatform',
         description: '/docs/references/projects/update-platform.md',
         auth: [AuthType::ADMIN],
@@ -1919,6 +1970,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
     ->label('scope', 'platforms.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'platforms',
         name: 'deletePlatform',
         description: '/docs/references/projects/delete-platform.md',
         auth: [AuthType::ADMIN],
@@ -1966,6 +2018,7 @@ App::patch('/v1/projects/:projectId/smtp')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'updateSmtp',
         description: '/docs/references/projects/update-smtp.md',
         auth: [AuthType::ADMIN],
@@ -2062,6 +2115,7 @@ App::post('/v1/projects/:projectId/smtp/tests')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'createSmtpTest',
         description: '/docs/references/projects/create-smtp-test.md',
         auth: [AuthType::ADMIN],
@@ -2128,6 +2182,7 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'getSmsTemplate',
         description: '/docs/references/projects/get-sms-template.md',
         auth: [AuthType::ADMIN],
@@ -2175,6 +2230,7 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'getEmailTemplate',
         description: '/docs/references/projects/get-email-template.md',
         auth: [AuthType::ADMIN],
@@ -2233,6 +2289,7 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'updateSmsTemplate',
         description: '/docs/references/projects/update-sms-template.md',
         auth: [AuthType::ADMIN],
@@ -2279,6 +2336,7 @@ App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'updateEmailTemplate',
         description: '/docs/references/projects/update-email-template.md',
         auth: [AuthType::ADMIN],
@@ -2335,6 +2393,7 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'deleteSmsTemplate',
         description: '/docs/references/projects/delete-sms-template.md',
         auth: [AuthType::ADMIN],
@@ -2380,11 +2439,12 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
     });
 
 App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
-    ->desc('Reset custom email template')
+    ->desc('Delete custom email template')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
+        group: 'templates',
         name: 'deleteEmailTemplate',
         description: '/docs/references/projects/delete-email-template.md',
         auth: [AuthType::ADMIN],

app/controllers/api/proxy.php

@@ -35,6 +35,7 @@ App::post('/v1/proxy/rules')
     ->label('audits.resource', 'rule/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'proxy',
+        group: null,
         name: 'createRule',
         description: '/docs/references/proxy/create-rule.md',
         auth: [AuthType::ADMIN],
@@ -55,14 +56,25 @@ App::post('/v1/proxy/rules')
     ->inject('dbForPlatform')
     ->inject('dbForProject')
     ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject) {
+
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         if ($domain === $mainDomain) {
             throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
         }
 
-        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-        if ($functionsDomain != '' && str_ends_with($domain, $functionsDomain)) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or it\'s subdomain to specific resource. Please use different domain.');
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
+        $denyListDomains = System::getEnv('_APP_CUSTOM_DOMAIN_DENY_LIST');
+
+        if (!empty($denyListDomains)) {
+            $functionsDomain .= ',' . $denyListDomains;
+        }
+
+        $deniedDomains = array_map('trim', explode(',', $functionsDomain));
+
+        foreach ($deniedDomains as $deniedDomain) {
+            if (str_ends_with($domain, $deniedDomain)) {
+                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or its subdomain to a specific resource. Please use a different domain.');
+            }
         }
 
         if ($domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
@@ -130,6 +142,8 @@ App::post('/v1/proxy/rules')
             'resourceId' => $resourceId,
             'resourceInternalId' => $resourceInternalId,
             'certificateId' => '',
+            'owner' => '',
+            'region' => $project->getAttribute('region')
         ]);
 
         $status = 'created';
@@ -171,6 +185,7 @@ App::get('/v1/proxy/rules')
     ->label('scope', 'rules.read')
     ->label('sdk', new Method(
         namespace: 'proxy',
+        group: null,
         name: 'listRules',
         description: '/docs/references/proxy/list-rules.md',
         auth: [AuthType::ADMIN],
@@ -245,6 +260,7 @@ App::get('/v1/proxy/rules/:ruleId')
     ->label('scope', 'rules.read')
     ->label('sdk', new Method(
         namespace: 'proxy',
+        group: null,
         name: 'getRule',
         description: '/docs/references/proxy/get-rule.md',
         auth: [AuthType::ADMIN],
@@ -282,6 +298,7 @@ App::delete('/v1/proxy/rules/:ruleId')
     ->label('audits.resource', 'rule/{request.ruleId}')
     ->label('sdk', new Method(
         namespace: 'proxy',
+        group: null,
         name: 'deleteRule',
         description: '/docs/references/proxy/delete-rule.md',
         auth: [AuthType::ADMIN],
@@ -326,6 +343,7 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
     ->label('audits.resource', 'rule/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'proxy',
+        group: null,
         name: 'updateRuleVerification',
         description: '/docs/references/proxy/update-rule-verification.md',
         auth: [AuthType::ADMIN],

app/controllers/api/storage.php

@@ -24,6 +24,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -62,6 +63,7 @@ App::post('/v1/storage/buckets')
     ->label('audits.resource', 'bucket/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'buckets',
         name: 'createBucket',
         description: '/docs/references/storage/create-bucket.md',
         auth: [AuthType::KEY],
@@ -164,6 +166,7 @@ App::get('/v1/storage/buckets')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'buckets',
         name: 'listBuckets',
         description: '/docs/references/storage/list-buckets.md',
         auth: [AuthType::KEY],
@@ -216,10 +219,15 @@ App::get('/v1/storage/buckets')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $buckets = $dbForProject->find('buckets', $queries);
+            $total = $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'buckets' => $dbForProject->find('buckets', $queries),
-            'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
+            'buckets' => $buckets,
+            'total' => $total,
         ]), Response::MODEL_BUCKET_LIST);
     });
 
@@ -230,6 +238,7 @@ App::get('/v1/storage/buckets/:bucketId')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'buckets',
         name: 'getBucket',
         description: '/docs/references/storage/get-bucket.md',
         auth: [AuthType::KEY],
@@ -264,6 +273,7 @@ App::put('/v1/storage/buckets/:bucketId')
     ->label('audits.resource', 'bucket/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'buckets',
         name: 'updateBucket',
         description: '/docs/references/storage/update-bucket.md',
         auth: [AuthType::KEY],
@@ -334,6 +344,7 @@ App::delete('/v1/storage/buckets/:bucketId')
     ->label('audits.resource', 'bucket/{request.bucketId}')
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'buckets',
         name: 'deleteBucket',
         description: '/docs/references/storage/delete-bucket.md',
         auth: [AuthType::KEY],
@@ -387,17 +398,18 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'createFile',
         description: '/docs/references/storage/create-file.md',
-        type: MethodType::UPLOAD,
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-        requestType: 'multipart/form-data',
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_CREATED,
                 model: Response::MODEL_FILE,
             )
-        ]
+        ],
+        type: MethodType::UPLOAD,
+        requestType: ContentType::MULTIPART
     ))
     ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new CustomId(), 'File ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
@@ -756,6 +768,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'listFiles',
         description: '/docs/references/storage/list-files.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -837,6 +850,8 @@ App::get('/v1/storage/buckets/:bucketId/files')
             }
         } catch (NotFoundException) {
             throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
         }
 
         $response->dynamic(new Document([
@@ -853,6 +868,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'getFile',
         description: '/docs/references/storage/get-file.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -909,6 +925,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->label('cache.resource', 'file/{request.fileId}')
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'getFilePreview',
         description: '/docs/references/storage/get-file-preview.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1091,6 +1108,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'getFileDownload',
         description: '/docs/references/storage/get-file-download.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1239,6 +1257,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'getFileView',
         description: '/docs/references/storage/get-file-view.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1396,9 +1415,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
     ->groups(['api', 'storage'])
     ->label('scope', 'public')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', '*/*')
-    ->label('sdk.methodType', 'location')
     ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->param('jwt', '', new Text(2048, 0), 'JSON Web Token to validate', true)
@@ -1559,6 +1575,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'updateFile',
         description: '/docs/references/storage/update-file.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1673,6 +1690,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: 'files',
         name: 'deleteFile',
         description: '/docs/references/storage/delete-file.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1772,6 +1790,7 @@ App::get('/v1/storage/usage')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: null,
         name: 'getUsage',
         description: '/docs/references/storage/get-usage.md',
         auth: [AuthType::ADMIN],
@@ -1858,6 +1877,7 @@ App::get('/v1/storage/:bucketId/usage')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
+        group: null,
         name: 'getBucketUsage',
         description: '/docs/references/storage/get-bucket-usage.md',
         auth: [AuthType::ADMIN],

app/controllers/api/teams.php

@@ -33,6 +33,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -62,6 +63,7 @@ App::post('/v1/teams')
     ->label('audits.resource', 'team/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'create',
         description: '/docs/references/teams/create-team.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -152,6 +154,7 @@ App::get('/v1/teams')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'list',
         description: '/docs/references/teams/list-teams.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -204,9 +207,12 @@ App::get('/v1/teams')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('teams', $queries);
-        $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
+        try {
+            $results = $dbForProject->find('teams', $queries);
+            $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
 
         $response->dynamic(new Document([
             'teams' => $results,
@@ -220,6 +226,7 @@ App::get('/v1/teams/:teamId')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'get',
         description: '/docs/references/teams/get-team.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -250,6 +257,7 @@ App::get('/v1/teams/:teamId/prefs')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'getPrefs',
         description: '/docs/references/teams/get-team-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -285,6 +293,7 @@ App::put('/v1/teams/:teamId')
     ->label('audits.resource', 'team/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'updateName',
         description: '/docs/references/teams/update-team-name.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -313,9 +322,7 @@ App::put('/v1/teams/:teamId')
             ->setAttribute('name', $name)
             ->setAttribute('search', implode(' ', [$teamId, $name]));
 
-        $team = $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $team) {
-            return $dbForProject->updateDocument('teams', $team->getId(), $team);
-        });
+        $team = $dbForProject->updateDocument('teams', $team->getId(), $team);
 
         $queueForEvents->setParam('teamId', $team->getId());
 
@@ -332,6 +339,7 @@ App::put('/v1/teams/:teamId/prefs')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'updatePrefs',
         description: '/docs/references/teams/update-team-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -371,6 +379,7 @@ App::delete('/v1/teams/:teamId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'teams',
         name: 'delete',
         description: '/docs/references/teams/delete-team.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -429,6 +438,7 @@ App::post('/v1/teams/:teamId/memberships')
     ->label('audits.userId', '{request.userId}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'memberships',
         name: 'createMembership',
         description: '/docs/references/teams/create-team-membership.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -615,7 +625,10 @@ App::post('/v1/teams/:teamId/memberships')
             $membership = ($isPrivilegedUser || $isAppUser) ?
                 Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
                 $dbForProject->createDocument('memberships', $membership);
-            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
+
+            if ($isPrivilegedUser || $isAppUser) {
+                Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
+            }
 
         } elseif ($membership->getAttribute('confirm') === false) {
             $membership->setAttribute('secret', Auth::hash($secret));
@@ -793,6 +806,7 @@ App::get('/v1/teams/:teamId/memberships')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'memberships',
         name: 'listMemberships',
         description: '/docs/references/teams/list-team-members.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -856,17 +870,20 @@ App::get('/v1/teams/:teamId/memberships')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
+        try {
+            $memberships = $dbForProject->find(
+                collection: 'memberships',
+                queries: $queries,
+            );
+            $total = $dbForProject->count(
+                collection: 'memberships',
+                queries: $filterQueries,
+                max: APP_LIMIT_COUNT
+            );
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
 
-        $memberships = $dbForProject->find(
-            collection: 'memberships',
-            queries: $queries,
-        );
-
-        $total = $dbForProject->count(
-            collection: 'memberships',
-            queries: $filterQueries,
-            max: APP_LIMIT_COUNT
-        );
 
         $memberships = array_filter($memberships, fn (Document $membership) => !empty($membership->getAttribute('userId')));
 
@@ -931,6 +948,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'memberships',
         name: 'getMembership',
         description: '/docs/references/teams/get-team-member.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1017,6 +1035,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'memberships',
         name: 'updateMembership',
         description: '/docs/references/teams/update-team-membership.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1031,7 +1050,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->param('membershipId', '', new UID(), 'Membership ID.')
     ->param('roles', [], function (Document $project) {
         if ($project->getId() === 'console') {
-            ;
             $roles = array_keys(Config::getParam('roles', []));
             array_filter($roles, function ($role) {
                 return !in_array($role, [Auth::USER_ROLE_APPS, Auth::USER_ROLE_GUESTS, Auth::USER_ROLE_USERS]);
@@ -1043,9 +1061,10 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->inject('request')
     ->inject('response')
     ->inject('user')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
         if ($team->isEmpty()) {
@@ -1066,6 +1085,21 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
         $isAppUser = Auth::isAppUser(Authorization::getRoles());
         $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');
 
+        if ($project->getId() === 'console') {
+            // Quick check: fetch up to 2 owners to determine if only one exists
+            $ownersCount = $dbForProject->count(
+                collection: 'memberships',
+                queries: [Query::contains('roles', ['owner'])],
+                max: 2
+            );
+
+            // Prevent role change if there's only one owner left,
+            // the requester is that owner, and the new `$roles` no longer include 'owner'!
+            if ($ownersCount === 1 && $isOwner && !\in_array('owner', $roles)) {
+                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'There must be at least one owner in the organization.');
+            }
+        }
+
         if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
             throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to modify roles');
         }
@@ -1105,6 +1139,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->label('audits.userId', '{request.userId}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'memberships',
         name: 'updateMembershipStatus',
         description: '/docs/references/teams/update-team-membership-status.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -1262,6 +1297,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'memberships',
         name: 'deleteMembership',
         description: '/docs/references/teams/delete-team-membership.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1332,6 +1368,7 @@ App::get('/v1/teams/:teamId/logs')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
+        group: 'logs',
         name: 'listLogs',
         description: '/docs/references/teams/get-team-logs.md',
         auth: [AuthType::ADMIN],

app/controllers/api/users.php

@@ -9,6 +9,8 @@ use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PasswordHistory;
 use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
+use Appwrite\Deletes\Identities as DeleteIdentities;
+use Appwrite\Deletes\Targets as DeleteTargets;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
@@ -33,6 +35,7 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -191,6 +194,7 @@ App::post('/v1/users')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'create',
         description: '/docs/references/users/create-user.md',
         auth: [AuthType::KEY],
@@ -225,6 +229,7 @@ App::post('/v1/users/bcrypt')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createBcryptUser',
         description: '/docs/references/users/create-bcrypt-user.md',
         auth: [AuthType::KEY],
@@ -259,6 +264,7 @@ App::post('/v1/users/md5')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createMD5User',
         description: '/docs/references/users/create-md5-user.md',
         auth: [AuthType::KEY],
@@ -293,6 +299,7 @@ App::post('/v1/users/argon2')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createArgon2User',
         description: '/docs/references/users/create-argon2-user.md',
         auth: [AuthType::KEY],
@@ -327,6 +334,7 @@ App::post('/v1/users/sha')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createSHAUser',
         description: '/docs/references/users/create-sha-user.md',
         auth: [AuthType::KEY],
@@ -368,6 +376,7 @@ App::post('/v1/users/phpass')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createPHPassUser',
         description: '/docs/references/users/create-phpass-user.md',
         auth: [AuthType::KEY],
@@ -402,6 +411,7 @@ App::post('/v1/users/scrypt')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createScryptUser',
         description: '/docs/references/users/create-scrypt-user.md',
         auth: [AuthType::KEY],
@@ -449,6 +459,7 @@ App::post('/v1/users/scrypt-modified')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'createScryptModifiedUser',
         description: '/docs/references/users/create-scrypt-modified-user.md',
         auth: [AuthType::KEY],
@@ -487,6 +498,7 @@ App::post('/v1/users/:userId/targets')
     ->label('scope', 'targets.write')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'targets',
         name: 'createTarget',
         description: '/docs/references/users/create-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -578,6 +590,7 @@ App::get('/v1/users')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'list',
         description: '/docs/references/users/list-users.md',
         auth: [AuthType::KEY],
@@ -630,10 +643,15 @@ App::get('/v1/users')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $users = $dbForProject->find('users', $queries);
+            $total = $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'users' => $dbForProject->find('users', $queries),
-            'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT),
+            'users' => $users,
+            'total' => $total,
         ]), Response::MODEL_USER_LIST);
     });
 
@@ -643,6 +661,7 @@ App::get('/v1/users/:userId')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'get',
         description: '/docs/references/users/get-user.md',
         auth: [AuthType::KEY],
@@ -673,6 +692,7 @@ App::get('/v1/users/:userId/prefs')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'getPrefs',
         description: '/docs/references/users/get-user-prefs.md',
         auth: [AuthType::KEY],
@@ -705,6 +725,7 @@ App::get('/v1/users/:userId/targets/:targetId')
     ->label('scope', 'targets.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'targets',
         name: 'getTarget',
         description: '/docs/references/users/get-user-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -742,6 +763,7 @@ App::get('/v1/users/:userId/sessions')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'sessions',
         name: 'listSessions',
         description: '/docs/references/users/list-user-sessions.md',
         auth: [AuthType::KEY],
@@ -788,6 +810,7 @@ App::get('/v1/users/:userId/memberships')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'memberships',
         name: 'listMemberships',
         description: '/docs/references/users/list-user-memberships.md',
         auth: [AuthType::KEY],
@@ -832,6 +855,7 @@ App::get('/v1/users/:userId/logs')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'logs',
         name: 'listLogs',
         description: '/docs/references/users/list-user-logs.md',
         auth: [AuthType::KEY],
@@ -928,6 +952,7 @@ App::get('/v1/users/:userId/targets')
     ->label('scope', 'targets.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'targets',
         name: 'listTargets',
         description: '/docs/references/users/list-user-targets.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -980,10 +1005,15 @@ App::get('/v1/users/:userId/targets')
 
             $cursor->setValue($cursorDocument);
         }
-
+        try {
+            $targets = $dbForProject->find('targets', $queries);
+            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'targets' => $dbForProject->find('targets', $queries),
-            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
+            'targets' => $targets,
+            'total' => $total,
         ]), Response::MODEL_TARGET_LIST);
     });
 
@@ -993,6 +1023,7 @@ App::get('/v1/users/identities')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'identities',
         name: 'listIdentities',
         description: '/docs/references/users/list-identities.md',
         auth: [AuthType::KEY],
@@ -1045,10 +1076,15 @@ App::get('/v1/users/identities')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
+        try {
+            $identities = $dbForProject->find('identities', $queries);
+            $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
         $response->dynamic(new Document([
-            'identities' => $dbForProject->find('identities', $queries),
-            'total' => $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT),
+            'identities' => $identities,
+            'total' => $total,
         ]), Response::MODEL_IDENTITY_LIST);
     });
 
@@ -1062,6 +1098,7 @@ App::patch('/v1/users/:userId/status')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updateStatus',
         description: '/docs/references/users/update-user-status.md',
         auth: [AuthType::KEY],
@@ -1102,6 +1139,7 @@ App::put('/v1/users/:userId/labels')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updateLabels',
         description: '/docs/references/users/update-user-labels.md',
         auth: [AuthType::KEY],
@@ -1144,6 +1182,7 @@ App::patch('/v1/users/:userId/verification/phone')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updatePhoneVerification',
         description: '/docs/references/users/update-user-phone-verification.md',
         auth: [AuthType::KEY],
@@ -1185,6 +1224,7 @@ App::patch('/v1/users/:userId/name')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updateName',
         description: '/docs/references/users/update-user-name.md',
         auth: [AuthType::KEY],
@@ -1227,6 +1267,7 @@ App::patch('/v1/users/:userId/password')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updatePassword',
         description: '/docs/references/users/update-user-password.md',
         auth: [AuthType::KEY],
@@ -1309,6 +1350,7 @@ App::patch('/v1/users/:userId/email')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updateEmail',
         description: '/docs/references/users/update-user-email.md',
         auth: [AuthType::KEY],
@@ -1408,6 +1450,7 @@ App::patch('/v1/users/:userId/phone')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updatePhone',
         description: '/docs/references/users/update-user-phone.md',
         auth: [AuthType::KEY],
@@ -1497,6 +1540,7 @@ App::patch('/v1/users/:userId/verification')
     ->label('audits.userId', '{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updateEmailVerification',
         description: '/docs/references/users/update-user-email-verification.md',
         auth: [AuthType::KEY],
@@ -1534,6 +1578,7 @@ App::patch('/v1/users/:userId/prefs')
     ->label('scope', 'users.write')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updatePrefs',
         description: '/docs/references/users/update-user-prefs.md',
         auth: [AuthType::KEY],
@@ -1574,6 +1619,7 @@ App::patch('/v1/users/:userId/targets/:targetId')
     ->label('scope', 'targets.write')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'targets',
         name: 'updateTarget',
         description: '/docs/references/users/update-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -1678,6 +1724,7 @@ App::patch('/v1/users/:userId/mfa')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'updateMfa',
         description: '/docs/references/users/update-user-mfa.md',
         auth: [AuthType::KEY],
@@ -1717,6 +1764,7 @@ App::get('/v1/users/:userId/mfa/factors')
     ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'mfa',
         name: 'listMfaFactors',
         description: '/docs/references/users/list-mfa-factors.md',
         auth: [AuthType::KEY],
@@ -1755,6 +1803,7 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
     ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'mfa',
         name: 'getMfaRecoveryCodes',
         description: '/docs/references/users/get-mfa-recovery-codes.md',
         auth: [AuthType::KEY],
@@ -1799,6 +1848,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'mfa',
         name: 'createMfaRecoveryCodes',
         description: '/docs/references/users/create-mfa-recovery-codes.md',
         auth: [AuthType::KEY],
@@ -1840,7 +1890,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
     });
 
 App::put('/v1/users/:userId/mfa/recovery-codes')
-    ->desc('Regenerate MFA recovery codes')
+    ->desc('Update MFA recovery codes (regenerate)')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.mfa.recovery-codes')
     ->label('scope', 'users.write')
@@ -1850,6 +1900,7 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'mfa',
         name: 'updateMfaRecoveryCodes',
         description: '/docs/references/users/update-mfa-recovery-codes.md',
         auth: [AuthType::KEY],
@@ -1900,6 +1951,7 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'mfa',
         name: 'deleteMfaAuthenticator',
         description: '/docs/references/users/delete-mfa-authenticator.md',
         auth: [AuthType::KEY],
@@ -1947,6 +1999,7 @@ App::post('/v1/users/:userId/sessions')
     ->label('usage.metric', 'sessions.{scope}.requests.create')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'sessions',
         name: 'createSession',
         description: '/docs/references/users/create-session.md',
         auth: [AuthType::KEY],
@@ -2031,6 +2084,7 @@ App::post('/v1/users/:userId/tokens')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'sessions',
         name: 'createToken',
         description: '/docs/references/users/create-token.md',
         auth: [AuthType::KEY],
@@ -2093,6 +2147,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'sessions',
         name: 'deleteSession',
         description: '/docs/references/users/delete-user-session.md',
         auth: [AuthType::KEY],
@@ -2143,6 +2198,7 @@ App::delete('/v1/users/:userId/sessions')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'sessions',
         name: 'deleteSessions',
         description: '/docs/references/users/delete-user-sessions.md',
         auth: [AuthType::KEY],
@@ -2192,6 +2248,7 @@ App::delete('/v1/users/:userId')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'users',
         name: 'delete',
         description: '/docs/references/users/delete.md',
         auth: [AuthType::KEY],
@@ -2220,6 +2277,8 @@ App::delete('/v1/users/:userId')
         $clone = clone $user;
 
         $dbForProject->deleteDocument('users', $userId);
+        DeleteIdentities::delete($dbForProject, Query::equal('userInternalId', [$user->getInternalId()]));
+        DeleteTargets::delete($dbForProject, Query::equal('userInternalId', [$user->getInternalId()]));
 
         $queueForDeletes
             ->setType(DELETE_TYPE_DOCUMENT)
@@ -2241,6 +2300,7 @@ App::delete('/v1/users/:userId/targets/:targetId')
     ->label('scope', 'targets.write')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'targets',
         name: 'deleteTarget',
         description: '/docs/references/users/delete-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -2298,6 +2358,7 @@ App::delete('/v1/users/identities/:identityId')
     ->label('audits.resource', 'identity/{request.$identityId}')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'identities',
         name: 'deleteIdentity',
         description: '/docs/references/users/delete-identity.md',
         auth: [AuthType::KEY],
@@ -2337,6 +2398,7 @@ App::post('/v1/users/:userId/jwts')
     ->label('scope', 'users.write')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: 'sessions',
         name: 'createJWT',
         description: '/docs/references/users/create-user-jwt.md',
         auth: [AuthType::KEY],
@@ -2392,6 +2454,7 @@ App::get('/v1/users/usage')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
+        group: null,
         name: 'getUsage',
         description: '/docs/references/users/get-usage.md',
         auth: [AuthType::ADMIN],

app/controllers/api/vcs.php

@@ -19,6 +19,7 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -269,12 +270,13 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 };
 
 App::get('/v1/vcs/github/authorize')
-    ->desc('Install GitHub app')
+    ->desc('Create GitHub app installation')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.read')
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'installations',
         name: 'createGitHubInstallation',
         description: '/docs/references/vcs/create-github-installation.md',
         auth: [AuthType::ADMIN],
@@ -318,7 +320,7 @@ App::get('/v1/vcs/github/authorize')
     });
 
 App::get('/v1/vcs/github/callback')
-    ->desc('Capture installation and authorization from GitHub app')
+    ->desc('Get installation and authorization from GitHub app')
     ->groups(['api', 'vcs'])
     ->label('scope', 'public')
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
@@ -456,6 +458,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'getRepositoryContents',
         description: '/docs/references/vcs/get-repository-contents.md',
         auth: [AuthType::ADMIN],
@@ -517,11 +520,12 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     });
 
 App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
-    ->desc('Detect runtime settings from source code')
+    ->desc('Create runtime settings detection')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'createRepositoryDetection',
         description: '/docs/references/vcs/create-repository-detection.md',
         auth: [AuthType::ADMIN],
@@ -599,6 +603,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'listRepositories',
         description: '/docs/references/vcs/list-repositories.md',
         auth: [AuthType::ADMIN],
@@ -699,6 +704,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'createRepository',
         description: '/docs/references/vcs/create-repository.md',
         auth: [AuthType::ADMIN],
@@ -811,6 +817,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'getRepository',
         description: '/docs/references/vcs/get-repository.md',
         auth: [AuthType::ADMIN],
@@ -865,6 +872,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'listRepositoryBranches',
         description: '/docs/references/vcs/list-repository-branches.md',
         auth: [AuthType::ADMIN],
@@ -1058,6 +1066,7 @@ App::get('/v1/vcs/installations')
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'installations',
         name: 'listInstallations',
         description: '/docs/references/vcs/list-installations.md',
         auth: [AuthType::ADMIN],
@@ -1113,9 +1122,12 @@ App::get('/v1/vcs/installations')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForPlatform->find('installations', $queries);
-        $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
+        try {
+            $results = $dbForPlatform->find('installations', $queries);
+            $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
+        } catch (OrderException $e) {
+            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
+        }
 
         $response->dynamic(new Document([
             'installations' => $results,
@@ -1129,6 +1141,7 @@ App::get('/v1/vcs/installations/:installationId')
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'installations',
         name: 'getInstallation',
         description: '/docs/references/vcs/get-installation.md',
         auth: [AuthType::ADMIN],
@@ -1163,6 +1176,7 @@ App::delete('/v1/vcs/installations/:installationId')
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'installations',
         name: 'deleteInstallation',
         description: '/docs/references/vcs/delete-installation.md',
         auth: [AuthType::ADMIN],
@@ -1198,11 +1212,12 @@ App::delete('/v1/vcs/installations/:installationId')
     });
 
 App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
-    ->desc('Authorize external deployment')
+    ->desc('Update external deployment (authorize)')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
+        group: 'repositories',
         name: 'updateExternalDeployments',
         description: '/docs/references/vcs/update-external-deployments.md',
         auth: [AuthType::ADMIN],

app/controllers/general.php

@@ -50,7 +50,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
 {
     $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');
 
@@ -72,11 +72,19 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
     }
 
     if ($route->isEmpty()) {
-        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
+
+        $appDomainFunctionsFallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
+        $appDomainFunctions =  System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+
+        if (!empty($appDomainFunctionsFallback) && \str_ends_with($host, $appDomainFunctionsFallback)) {
+            $appDomainFunctions =  $appDomainFunctionsFallback;
+        }
+
+        if ($host === $appDomainFunctions) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.');
         }
 
-        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', ''))) {
+        if (\str_ends_with($host, $appDomainFunctions)) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain is not connected to any Appwrite resource yet. Please configure custom domain or function domain to allow this request.');
         }
 
@@ -125,6 +133,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         if (empty($method)) {
             $utopia->getRoute()?->label('sdk', new Method(
                 namespace: 'functions',
+                group: 'executions',
                 name: 'createExecution',
                 description: '/docs/references/functions/create-execution.md',
                 auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -135,7 +144,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                     )
                 ],
                 contentType: ContentType::MULTIPART,
-                requestType: 'application/json',
             ));
         } else {
             /** @var Method $method */
@@ -339,7 +347,6 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         ]);
 
         /** Execute function */
-        $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
         try {
             $version = $function->getAttribute('version', 'v2');
             $command = $runtime['startCommand'];
@@ -503,9 +510,10 @@ App::init()
     ->inject('queueForEvents')
     ->inject('queueForCertificates')
     ->inject('queueForFunctions')
+    ->inject('executor')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, Executor $executor, callable $isResourceBlocked, string $previewHostname) {
         /*
         * Appwrite Router
         */
@@ -513,7 +521,7 @@ App::init()
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
         if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname)) {
                 return;
             }
         }
@@ -582,6 +590,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
@@ -589,8 +603,10 @@ App::init()
                             'domain' => $domain->get(),
                             'resourceType' => 'api',
                             'status' => 'verifying',
-                            'projectId' => 'console',
-                            'projectInternalId' => 'console'
+                            'projectId' => $console->getId(),
+                            'projectInternalId' => $console->getInternalId(),
+                            'owner' => $owner,
+                            'region' => $console->getAttribute('region')
                         ]);
 
                         $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);
@@ -734,11 +750,12 @@ App::options()
     ->inject('queueForEvents')
     ->inject('queueForStatsUsage')
     ->inject('queueForFunctions')
+    ->inject('executor')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
     ->inject('project')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project) {
         /*
         * Appwrite Router
         */
@@ -746,7 +763,7 @@ App::options()
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
         if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname)) {
                 return;
             }
         }
@@ -859,23 +876,22 @@ App::error()
             $publish = $error->getCode() === 0 || $error->getCode() >= 500;
         }
 
-        if ($error->getCode() >= 400 && $error->getCode() < 500) {
+        $providerConfig = System::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');
+        if (!empty($providerConfig) && $error->getCode() >= 400 && $error->getCode() < 500) {
             // Register error logger
-            $providerName = System::getEnv('_APP_EXPERIMENT_LOGGING_PROVIDER', '');
-            $providerConfig = System::getEnv('_APP_EXPERIMENT_LOGGING_CONFIG', '');
-
             try {
-                $loggingProvider = new DSN($providerConfig ?? '');
+                $loggingProvider = new DSN($providerConfig);
                 $providerName = $loggingProvider->getScheme();
 
                 if (!empty($providerName) && $providerName === 'sentry') {
                     $key = $loggingProvider->getPassword();
                     $projectId = $loggingProvider->getUser() ?? '';
                     $host = 'https://' . $loggingProvider->getHost();
+                    $sampleRate = $loggingProvider->getParam('sample', 0.01);
 
                     $adapter = new Sentry($projectId, $key, $host);
                     $logger = new Logger($adapter);
-                    $logger->setSample(0.01);
+                    $logger->setSample($sampleRate);
                     $publish = true;
                 } else {
                     throw new \Exception('Invalid experimental logging provider');
@@ -1055,10 +1071,11 @@ App::get('/robots.txt')
     ->inject('queueForEvents')
     ->inject('queueForStatsUsage')
     ->inject('queueForFunctions')
+    ->inject('executor')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
 
@@ -1066,7 +1083,7 @@ App::get('/robots.txt')
             $template = new View(__DIR__ . '/../views/general/robots.phtml');
             $response->text($template->render(false));
         } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname);
         }
     });
 
@@ -1083,10 +1100,11 @@ App::get('/humans.txt')
     ->inject('queueForEvents')
     ->inject('queueForStatsUsage')
     ->inject('queueForFunctions')
+    ->inject('executor')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
 
@@ -1094,7 +1112,7 @@ App::get('/humans.txt')
             $template = new View(__DIR__ . '/../views/general/humans.phtml');
             $response->text($template->render(false));
         } else {
-            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
+            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname);
         }
     });
 

app/controllers/shared/api.php

@@ -92,8 +92,20 @@ $eventDatabaseListener = function (Document $project, Document $document, Respon
 
 $usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
     $value = 1;
-    if ($event === Database::EVENT_DOCUMENT_DELETE) {
-        $value = -1;
+
+    switch ($event) {
+        case Database::EVENT_DOCUMENT_DELETE:
+            $value = -1;
+            break;
+        case Database::EVENT_DOCUMENTS_DELETE:
+            $value = -1 * $document->getAttribute('modified', 0);
+            break;
+        case Database::EVENT_DOCUMENTS_CREATE:
+            $value = $document->getAttribute('modified', 0);
+            break;
+        case Database::EVENT_DOCUMENTS_UPSERT:
+            $value = $document->getAttribute('created', 0);
+            break;
     }
 
     switch (true) {
@@ -238,34 +250,36 @@ App::init()
                     subject: 'keys'
                 );
 
-                if ($dbKey) {
-                    $accessedAt = $dbKey->getAttribute('accessedAt', '');
+                if (!$dbKey) {
+                    throw new Exception(Exception::USER_UNAUTHORIZED);
+                }
 
-                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-                        $dbKey->setAttribute('accessedAt', DateTime::now());
+                $accessedAt = $dbKey->getAttribute('accessedAt', '');
+
+                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
+                    $dbKey->setAttribute('accessedAt', DateTime::now());
+                    $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
+                    $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                }
+
+                $sdkValidator = new WhiteList($servers, true);
+                $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+
+                if ($sdkValidator->isValid($sdk)) {
+                    $sdks = $dbKey->getAttribute('sdks', []);
+
+                    if (!in_array($sdk, $sdks)) {
+                        $sdks[] = $sdk;
+                        $dbKey->setAttribute('sdks', $sdks);
+
+                        /** Update access time as well */
+                        $dbKey->setAttribute('accessedAt', Datetime::now());
                         $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
                         $dbForPlatform->purgeCachedDocument('projects', $project->getId());
                     }
-
-                    $sdkValidator = new WhiteList($servers, true);
-                    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
-
-                    if ($sdkValidator->isValid($sdk)) {
-                        $sdks = $dbKey->getAttribute('sdks', []);
-
-                        if (!in_array($sdk, $sdks)) {
-                            $sdks[] = $sdk;
-                            $dbKey->setAttribute('sdks', $sdks);
-
-                            /** Update access time as well */
-                            $dbKey->setAttribute('accessedAt', Datetime::now());
-                            $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
-                            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-                        }
-                    }
-
-                    $queueForAudits->setUser($user);
                 }
+
+                $queueForAudits->setUser($user);
             }
         } // Admin User Authentication
         elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
@@ -326,6 +340,8 @@ App::init()
          */
         $method = $route->getLabel('sdk', false);
 
+        // Take the first method if there's more than one,
+        // namespace can not differ between methods on the same route
         if (\is_array($method)) {
             $method = $method[0];
         }
@@ -390,7 +406,8 @@ App::init()
     ->inject('timelimit')
     ->inject('mode')
     ->inject('apiKey')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, ?Key $apiKey) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->inject('plan')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, ?Key $apiKey, array $plan) use ($usageDatabaseListener, $eventDatabaseListener) {
 
         $route = $utopia->getRoute();
 
@@ -508,6 +525,9 @@ App::init()
         $dbForProject
             ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
             ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
+            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
             ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
                 $project,
                 $document,
@@ -520,6 +540,10 @@ App::init()
 
         $useCache = $route->getLabel('cache', false);
         if ($useCache) {
+            $route = $utopia->match($request);
+            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
+            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !Auth::isPrivilegedUser(Authorization::getRoles());
+
             $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
             $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
             $cache = new Cache(
@@ -529,10 +553,10 @@ App::init()
             $data = $cache->load($key, $timestamp);
 
             if (!empty($data) && !$cacheLog->isEmpty()) {
-                $parts = explode('/', $cacheLog->getAttribute('resourceType'));
+                $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
                 $type = $parts[0] ?? null;
 
-                if ($type === 'bucket') {
+                if ($type === 'bucket' && (!$isImageTransformation || !$isDisabled)) {
                     $bucketId = $parts[1] ?? null;
                     $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -573,8 +597,10 @@ App::init()
                 $response
                     ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                     ->addHeader('X-Appwrite-Cache', 'hit')
-                    ->setContentType($cacheLog->getAttribute('mimeType'))
-                    ->send($data);
+                    ->setContentType($cacheLog->getAttribute('mimeType'));
+                if (!$isImageTransformation || !$isDisabled) {
+                    $response->send($data);
+                }
             } else {
                 $response
                     ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')

app/http.php

@@ -43,29 +43,6 @@ $http = new Server(
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 
-$http
-    ->set([
-        'worker_num' => $totalWorkers,
-        'dispatch_func' => 'dispatch',
-        'open_http2_protocol' => true,
-        'http_compression' => false,
-        'package_max_length' => $payloadSize,
-        'buffer_output_size' => $payloadSize,
-        'task_worker_num' => 1, // required for the task to fetch domains background
-    ]);
-
-$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
-    Console::success('Worker ' . ++$workerId . ' started successfully');
-});
-
-$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
-    Console::success('Starting reload...');
-});
-
-$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
-    Console::success('Reload completed...');
-});
-
 /**
  * Assigns HTTP requests to worker threads by analyzing its payload/content.
  *
@@ -83,76 +60,105 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
  */
 function dispatch(Server $server, int $fd, int $type, $data = null): int
 {
-    global $totalWorkers, $domains;
+    $resolveWorkerId = function (Server $server, $data = null) {
+        global $totalWorkers, $domains;
 
-    // If data is not set we can send request to any worker
-    // first we try to pick idle worker, if not we randomly pick a worker
-    if ($data === null) {
+        // If data is not set we can send request to any worker
+        // first we try to pick idle worker, if not we randomly pick a worker
+        if ($data === null) {
+            for ($i = 0; $i < $totalWorkers; $i++) {
+                if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
+                    return $i;
+                }
+            }
+            return rand(0, $totalWorkers - 1);
+        }
+
+        $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
+
+        // Each worker has numeric ID, starting from 0 and incrementing
+        // From 0 to riskyWorkers, we consider safe workers
+        // From riskyWorkers to totalWorkers, we consider risky workers
+        $riskyWorkers = (int)floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
+
+        $domain = '';
+        // max up to 3 as first line has request details and second line has host
+        $lines = explode("\n", $data, 3);
+        $request = $lines[0];
+        if (count($lines) > 1) {
+            $domain = trim(explode('Host: ', $lines[1])[1]);
+        }
+
+        // Sync executions are considered risky
+        $risky = false;
+        if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
+            $risky = true;
+        } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+            $risky = true;
+        } elseif ($domains->get(md5($domain), 'value') === 1) {
+            // executions request coming from custom domain
+            $risky = true;
+        }
+
+        if ($risky) {
+            // If risky request, only consider risky workers
+            for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
+                /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
+                if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
+                    // If idle worker found, give to him
+                    return $j;
+                }
+            }
+
+            // If no idle workers, give to random risky worker
+            $worker = rand($riskyWorkers, $totalWorkers - 1);
+            Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
+            return $worker;
+        }
+
+        // If safe request, give to any idle worker
+        // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
         for ($i = 0; $i < $totalWorkers; $i++) {
             if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
                 return $i;
             }
         }
-        return rand(0, $totalWorkers - 1);
-    }
 
-    $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
-
-    // Each worker has numeric ID, starting from 0 and incrementing
-    // From 0 to riskyWorkers, we consider safe workers
-    // From riskyWorkers to totalWorkers, we consider risky workers
-    $riskyWorkers = (int) floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
-
-    $domain = '';
-    // max up to 3 as first line has request details and second line has host
-    $lines = explode("\n", $data, 3);
-    $request = $lines[0];
-    if (count($lines) > 1) {
-        $domain = trim(explode('Host: ', $lines[1])[1]);
-    }
-
-    // Sync executions are considered risky
-    $risky = false;
-    if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
-        $risky = true;
-    } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
-        $risky = true;
-    } elseif ($domains->get(md5($domain), 'value') === 1) {
-        // executions request coming from custom domain
-        $risky = true;
-    }
-
-    if ($risky) {
-        // If risky request, only consider risky workers
-        for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
-            /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
-            if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
-                // If idle worker found, give to him
-                return $j;
-            }
-        }
-
-        // If no idle workers, give to random risky worker
-        $worker = rand($riskyWorkers, $totalWorkers - 1);
-        Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
+        // If no idle worker found, give to random safe worker
+        // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
+        $worker = rand(0, $riskyWorkers - 1);
+        Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
         return $worker;
-    }
-
-    // If safe request, give to any idle worker
-    // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
-    for ($i = 0; $i < $totalWorkers; $i++) {
-        if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
-            return $i;
-        }
-    }
-
-    // If no idle worker found, give to random safe worker
-    // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
-    $worker = rand(0, $riskyWorkers - 1);
-    Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
-    return $worker;
+    };
+    $workerId = $resolveWorkerId($server, $data);
+    $server->bind($fd, $workerId);
+    return $workerId;
 }
 
+
+$http
+    ->set([
+        Constant::OPTION_WORKER_NUM => $totalWorkers,
+        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
+        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
+        Constant::OPTION_HTTP_COMPRESSION => false,
+        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
+        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
+        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
+    ]);
+
+$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
+    Console::success('Worker ' . ++$workerId . ' started successfully');
+});
+
+$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
+    Console::success('Starting reload...');
+});
+
+$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
+    Console::success('Reload completed...');
+});
+
 include __DIR__ . '/controllers/general.php';
 
 function createDatabase(App $app, string $resourceKey, string $dbName, array $collections, mixed $pools, callable $extraSetup = null): void
@@ -490,7 +496,7 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
 });
 
 // Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on('Task', function () use ($register, $domains) {
+$http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
     $lastSyncUpdate = null;
     $pools = $register->get('pools');
     App::setResource('pools', fn () => $pools);

app/init/configs.php

@@ -0,0 +1,37 @@
+<?php
+
+use Utopia\Config\Config;
+
+Config::load('events', __DIR__ . '/../config/events.php');
+Config::load('auth', __DIR__ . '/../config/auth.php');
+Config::load('apis', __DIR__ . '/../config/apis.php');  // List of APIs
+Config::load('errors', __DIR__ . '/../config/errors.php');
+Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php');
+Config::load('platforms', __DIR__ . '/../config/platforms.php');
+Config::load('console', __DIR__ . '/../config/console.php');
+Config::load('collections', __DIR__ . '/../config/collections.php');
+Config::load('runtimes', __DIR__ . '/../config/runtimes.php');
+Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php');
+Config::load('usage', __DIR__ . '/../config/usage.php');
+Config::load('roles', __DIR__ . '/../config/roles.php');  // User roles and scopes
+Config::load('scopes', __DIR__ . '/../config/scopes.php');  // User roles and scopes
+Config::load('services', __DIR__ . '/../config/services.php');  // List of services
+Config::load('variables', __DIR__ . '/../config/variables.php');  // List of env variables
+Config::load('regions', __DIR__ . '/../config/regions.php'); // List of available regions
+Config::load('avatar-browsers', __DIR__ . '/../config/avatars/browsers.php');
+Config::load('avatar-credit-cards', __DIR__ . '/../config/avatars/credit-cards.php');
+Config::load('avatar-flags', __DIR__ . '/../config/avatars/flags.php');
+Config::load('locale-codes', __DIR__ . '/../config/locale/codes.php');
+Config::load('locale-currencies', __DIR__ . '/../config/locale/currencies.php');
+Config::load('locale-eu', __DIR__ . '/../config/locale/eu.php');
+Config::load('locale-languages', __DIR__ . '/../config/locale/languages.php');
+Config::load('locale-phones', __DIR__ . '/../config/locale/phones.php');
+Config::load('locale-countries', __DIR__ . '/../config/locale/countries.php');
+Config::load('locale-continents', __DIR__ . '/../config/locale/continents.php');
+Config::load('locale-templates', __DIR__ . '/../config/locale/templates.php');
+Config::load('storage-logos', __DIR__ . '/../config/storage/logos.php');
+Config::load('storage-mimes', __DIR__ . '/../config/storage/mimes.php');
+Config::load('storage-inputs', __DIR__ . '/../config/storage/inputs.php');
+Config::load('storage-outputs', __DIR__ . '/../config/storage/outputs.php');
+Config::load('runtime-specifications', __DIR__ . '/../config/runtimes/specifications.php');
+Config::load('function-templates', __DIR__ . '/../config/function-templates.php');

app/init/constants.php

@@ -0,0 +1,240 @@
+<?php
+
+use Appwrite\Functions\Specification;
+
+const APP_NAME = 'Appwrite';
+const APP_DOMAIN = 'appwrite.io';
+const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
+const APP_EMAIL_SECURITY = ''; // Default security email address
+const APP_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
+const APP_MODE_DEFAULT = 'default';
+const APP_MODE_ADMIN = 'admin';
+const APP_PAGING_LIMIT = 12;
+const APP_LIMIT_COUNT = 5000;
+const APP_LIMIT_USERS = 10_000;
+const APP_LIMIT_USER_PASSWORD_HISTORY = 20;
+const APP_LIMIT_USER_SESSIONS_MAX = 100;
+const APP_LIMIT_USER_SESSIONS_DEFAULT = 10;
+const APP_LIMIT_ANTIVIRUS = 20_000_000; //20MB
+const APP_LIMIT_ENCRYPTION = 20_000_000; //20MB
+const APP_LIMIT_COMPRESSION = 20_000_000; //20MB
+const APP_LIMIT_ARRAY_PARAMS_SIZE = 100; // Default maximum of how many elements can there be in API parameter that expects array value
+const APP_LIMIT_ARRAY_LABELS_SIZE = 1000; // Default maximum of how many labels elements can there be in API parameter that expects array value
+const APP_LIMIT_ARRAY_ELEMENT_SIZE = 4096; // Default maximum length of element in array parameter represented by maximum URL length.
+const APP_LIMIT_SUBQUERY = 1000;
+const APP_LIMIT_SUBSCRIBERS_SUBQUERY = 1_000_000;
+const APP_LIMIT_WRITE_RATE_DEFAULT = 60; // Default maximum write rate per rate period
+const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate period in seconds
+const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
+const APP_LIMIT_DATABASE_BATCH = 100; // Default maximum batch size for database operations
+const APP_KEY_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
+const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
+const APP_CACHE_BUSTER = 4318;
+const APP_VERSION_STABLE = '1.6.2';
+const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
+const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
+const APP_DATABASE_ATTRIBUTE_IP = 'ip';
+const APP_DATABASE_ATTRIBUTE_DATETIME = 'datetime';
+const APP_DATABASE_ATTRIBUTE_URL = 'url';
+const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
+const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
+const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4 bits per char
+const APP_DATABASE_TIMEOUT_MILLISECONDS_API = 15 * 1000; // 15 seconds
+const APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER = 300 * 1000; // 5 minutes
+const APP_DATABASE_TIMEOUT_MILLISECONDS_TASK = 300 * 1000; // 5 minutes
+const APP_DATABASE_QUERY_MAX_VALUES = 500;
+const APP_STORAGE_UPLOADS = '/storage/uploads';
+const APP_STORAGE_FUNCTIONS = '/storage/functions';
+const APP_STORAGE_BUILDS = '/storage/builds';
+const APP_STORAGE_CACHE = '/storage/cache';
+const APP_STORAGE_CERTIFICATES = '/storage/certificates';
+const APP_STORAGE_CONFIG = '/storage/config';
+const APP_STORAGE_READ_BUFFER = 20 * (1000 * 1000); //20MB other names `APP_STORAGE_MEMORY_LIMIT`, `APP_STORAGE_MEMORY_BUFFER`, `APP_STORAGE_READ_LIMIT`, `APP_STORAGE_BUFFER_LIMIT`
+const APP_SOCIAL_TWITTER = 'https://twitter.com/appwrite';
+const APP_SOCIAL_TWITTER_HANDLE = 'appwrite';
+const APP_SOCIAL_FACEBOOK = 'https://www.facebook.com/appwrite.io';
+const APP_SOCIAL_LINKEDIN = 'https://www.linkedin.com/company/appwrite';
+const APP_SOCIAL_INSTAGRAM = 'https://www.instagram.com/appwrite.io';
+const APP_SOCIAL_GITHUB = 'https://github.com/appwrite';
+const APP_SOCIAL_DISCORD = 'https://appwrite.io/discord';
+const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
+const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
+const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
+const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
+const APP_HOSTNAME_INTERNAL = 'appwrite';
+const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
+const APP_FUNCTION_CPUS_DEFAULT = 0.5;
+const APP_FUNCTION_MEMORY_DEFAULT = 512;
+const APP_PLATFORM_SERVER = 'server';
+const APP_PLATFORM_CLIENT = 'client';
+const APP_PLATFORM_CONSOLE = 'console';
+
+// Database Reconnect
+const DATABASE_RECONNECT_SLEEP = 2;
+const DATABASE_RECONNECT_MAX_ATTEMPTS = 10;
+
+// Database Worker Types
+const DATABASE_TYPE_CREATE_ATTRIBUTE = 'createAttribute';
+const DATABASE_TYPE_CREATE_INDEX = 'createIndex';
+const DATABASE_TYPE_DELETE_ATTRIBUTE = 'deleteAttribute';
+const DATABASE_TYPE_DELETE_INDEX = 'deleteIndex';
+const DATABASE_TYPE_DELETE_COLLECTION = 'deleteCollection';
+const DATABASE_TYPE_DELETE_DATABASE = 'deleteDatabase';
+
+// Build Worker Types
+const BUILD_TYPE_DEPLOYMENT = 'deployment';
+const BUILD_TYPE_RETRY = 'retry';
+
+// Deletion Types
+const DELETE_TYPE_DATABASES = 'databases';
+const DELETE_TYPE_DOCUMENT = 'document';
+const DELETE_TYPE_COLLECTIONS = 'collections';
+const DELETE_TYPE_PROJECTS = 'projects';
+const DELETE_TYPE_FUNCTIONS = 'functions';
+const DELETE_TYPE_DEPLOYMENTS = 'deployments';
+const DELETE_TYPE_USERS = 'users';
+const DELETE_TYPE_TEAM_PROJECTS = 'teams_projects';
+const DELETE_TYPE_EXECUTIONS = 'executions';
+const DELETE_TYPE_AUDIT = 'audit';
+const DELETE_TYPE_ABUSE = 'abuse';
+const DELETE_TYPE_USAGE = 'usage';
+const DELETE_TYPE_REALTIME = 'realtime';
+const DELETE_TYPE_BUCKETS = 'buckets';
+const DELETE_TYPE_INSTALLATIONS = 'installations';
+const DELETE_TYPE_RULES = 'rules';
+const DELETE_TYPE_SESSIONS = 'sessions';
+const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp';
+const DELETE_TYPE_CACHE_BY_RESOURCE  = 'cacheByResource';
+const DELETE_TYPE_SCHEDULES = 'schedules';
+const DELETE_TYPE_TOPIC = 'topic';
+const DELETE_TYPE_TARGET = 'target';
+const DELETE_TYPE_EXPIRED_TARGETS = 'invalid_targets';
+const DELETE_TYPE_SESSION_TARGETS = 'session_targets';
+const DELETE_TYPE_MAINTENANCE = 'maintenance';
+
+// Message types
+const MESSAGE_SEND_TYPE_INTERNAL = 'internal';
+const MESSAGE_SEND_TYPE_EXTERNAL = 'external';
+// Mail Types
+const MAIL_TYPE_VERIFICATION = 'verification';
+const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
+const MAIL_TYPE_RECOVERY = 'recovery';
+const MAIL_TYPE_INVITATION = 'invitation';
+const MAIL_TYPE_CERTIFICATE = 'certificate';
+// Auth Types
+const APP_AUTH_TYPE_SESSION = 'Session';
+const APP_AUTH_TYPE_JWT = 'JWT';
+const APP_AUTH_TYPE_KEY = 'Key';
+const APP_AUTH_TYPE_ADMIN = 'Admin';
+// Response related
+const MAX_OUTPUT_CHUNK_SIZE = 10 * 1024 * 1024; // 10MB
+// Function headers
+const FUNCTION_ALLOWLIST_HEADERS_REQUEST = ['content-type', 'agent', 'content-length', 'host'];
+const FUNCTION_ALLOWLIST_HEADERS_RESPONSE = ['content-type', 'content-length'];
+// Message types
+const MESSAGE_TYPE_EMAIL = 'email';
+const MESSAGE_TYPE_SMS = 'sms';
+const MESSAGE_TYPE_PUSH = 'push';
+// API key types
+const API_KEY_STANDARD = 'standard';
+const API_KEY_DYNAMIC = 'dynamic';
+// Usage metrics
+const METRIC_TEAMS = 'teams';
+const METRIC_USERS = 'users';
+const METRIC_WEBHOOKS_SENT  = 'webhooks.events.sent';
+const METRIC_WEBHOOKS_FAILED  = 'webhooks.events.failed';
+const METRIC_WEBHOOK_ID_SENT = '{webhookInternalId}.webhooks.events.sent';
+const METRIC_WEBHOOK_ID_FAILED = '{webhookInternalId}.webhooks.events.failed';
+const METRIC_AUTH_METHOD_PHONE  = 'auth.method.phone';
+const METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE  = METRIC_AUTH_METHOD_PHONE . '.{countryCode}';
+const METRIC_MESSAGES = 'messages';
+const METRIC_MESSAGES_SENT = METRIC_MESSAGES . '.sent';
+const METRIC_MESSAGES_FAILED = METRIC_MESSAGES . '.failed';
+const METRIC_MESSAGES_TYPE = METRIC_MESSAGES . '.{type}';
+const METRIC_MESSAGES_TYPE_SENT  = METRIC_MESSAGES . '.{type}.sent';
+const METRIC_MESSAGES_TYPE_FAILED  = METRIC_MESSAGES . '.{type}.failed';
+const METRIC_MESSAGES_TYPE_PROVIDER = METRIC_MESSAGES . '.{type}.{provider}';
+const METRIC_MESSAGES_TYPE_PROVIDER_SENT  = METRIC_MESSAGES . '.{type}.{provider}.sent';
+const METRIC_MESSAGES_TYPE_PROVIDER_FAILED  = METRIC_MESSAGES . '.{type}.{provider}.failed';
+const METRIC_SESSIONS  = 'sessions';
+const METRIC_DATABASES = 'databases';
+const METRIC_COLLECTIONS = 'collections';
+const METRIC_DATABASES_STORAGE = 'databases.storage';
+const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections';
+const METRIC_DATABASE_ID_STORAGE = '{databaseInternalId}.databases.storage';
+const METRIC_DOCUMENTS = 'documents';
+const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE = '{databaseInternalId}.{collectionInternalId}.databases.storage';
+const METRIC_DATABASES_OPERATIONS_READS  = 'databases.operations.reads';
+const METRIC_DATABASE_ID_OPERATIONS_READS = '{databaseInternalId}.databases.operations.reads';
+const METRIC_DATABASES_OPERATIONS_WRITES  = 'databases.operations.writes';
+const METRIC_DATABASE_ID_OPERATIONS_WRITES = '{databaseInternalId}.databases.operations.writes';
+const METRIC_BUCKETS = 'buckets';
+const METRIC_FILES  = 'files';
+const METRIC_FILES_STORAGE  = 'files.storage';
+const METRIC_FILES_TRANSFORMATIONS  = 'files.transformations';
+const METRIC_BUCKET_ID_FILES_TRANSFORMATIONS  = '{bucketInternalId}.files.transformations';
+const METRIC_FILES_IMAGES_TRANSFORMED = 'files.imagesTransformed';
+const METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED = '{bucketInternalId}.files.imagesTransformed';
+const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files';
+const METRIC_BUCKET_ID_FILES_STORAGE  = '{bucketInternalId}.files.storage';
+const METRIC_FUNCTIONS  = 'functions';
+const METRIC_DEPLOYMENTS  = 'deployments';
+const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
+const METRIC_BUILDS  = 'builds';
+const METRIC_BUILDS_SUCCESS  = 'builds.success';
+const METRIC_BUILDS_FAILED  = 'builds.failed';
+const METRIC_BUILDS_STORAGE  = 'builds.storage';
+const METRIC_BUILDS_COMPUTE  = 'builds.compute';
+const METRIC_BUILDS_COMPUTE_SUCCESS  = 'builds.compute.success';
+const METRIC_BUILDS_COMPUTE_FAILED  = 'builds.compute.failed';
+const METRIC_BUILDS_MB_SECONDS = 'builds.mbSeconds';
+const METRIC_FUNCTION_ID_BUILDS  = '{functionInternalId}.builds';
+const METRIC_FUNCTION_ID_BUILDS_SUCCESS  = '{functionInternalId}.builds.success';
+const METRIC_FUNCTION_ID_BUILDS_FAILED  = '{functionInternalId}.builds.failed';
+const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage';
+const METRIC_FUNCTION_ID_BUILDS_COMPUTE  = '{functionInternalId}.builds.compute';
+const METRIC_FUNCTION_ID_BUILDS_COMPUTE_SUCCESS  = '{functionInternalId}.builds.compute.success';
+const METRIC_FUNCTION_ID_BUILDS_COMPUTE_FAILED  = '{functionInternalId}.builds.compute.failed';
+const METRIC_FUNCTION_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
+const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
+const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
+const METRIC_EXECUTIONS  = 'executions';
+const METRIC_EXECUTIONS_COMPUTE  = 'executions.compute';
+const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
+const METRIC_FUNCTION_ID_EXECUTIONS  = '{functionInternalId}.executions';
+const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE  = '{functionInternalId}.executions.compute';
+const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds';
+const METRIC_NETWORK_REQUESTS  = 'network.requests';
+const METRIC_NETWORK_INBOUND  = 'network.inbound';
+const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
+const METRIC_MAU = 'users.mau';
+const METRIC_DAU = 'users.dau';
+const METRIC_WAU = 'users.wau';
+const METRIC_WEBHOOKS = 'webhooks';
+const METRIC_PLATFORMS = 'platforms';
+const METRIC_PROVIDERS = 'providers';
+const METRIC_TOPICS = 'topics';
+const METRIC_TARGETS = 'targets';
+const METRIC_PROVIDER_TYPE_TARGETS = '{providerType}.targets';
+const METRIC_KEYS = 'keys';
+const METRIC_DOMAINS = 'domains';
+const METRIC_RESOURCE_TYPE_ID_BUILDS  = '{resourceType}.{resourceInternalId}.builds';
+const METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE = '{resourceType}.{resourceInternalId}.builds.storage';
+const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
+const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
+
+// Resource types
+
+const RESOURCE_TYPE_PROJECTS = 'projects';
+const RESOURCE_TYPE_FUNCTIONS = 'functions';
+const RESOURCE_TYPE_DATABASES = 'databases';
+const RESOURCE_TYPE_BUCKETS = 'buckets';
+const RESOURCE_TYPE_PROVIDERS = 'providers';
+const RESOURCE_TYPE_TOPICS = 'topics';
+const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
+const RESOURCE_TYPE_MESSAGES = 'messages';

app/init/database/filters.php

@@ -0,0 +1,404 @@
+<?php
+
+use Appwrite\OpenSSL\OpenSSL;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
+use Utopia\System\System;
+
+Database::addFilter(
+    'casting',
+    function (mixed $value) {
+        return json_encode(['value' => $value], JSON_PRESERVE_ZERO_FRACTION);
+    },
+    function (mixed $value) {
+        if (is_null($value)) {
+            return;
+        }
+
+        return json_decode($value, true)['value'];
+    }
+);
+
+Database::addFilter(
+    'enum',
+    function (mixed $value, Document $attribute) {
+        if ($attribute->isSet('elements')) {
+            $attribute->removeAttribute('elements');
+        }
+
+        return $value;
+    },
+    function (mixed $value, Document $attribute) {
+        $formatOptions = \json_decode($attribute->getAttribute('formatOptions', '[]'), true);
+        if (isset($formatOptions['elements'])) {
+            $attribute->setAttribute('elements', $formatOptions['elements']);
+        }
+
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'range',
+    function (mixed $value, Document $attribute) {
+        if ($attribute->isSet('min')) {
+            $attribute->removeAttribute('min');
+        }
+        if ($attribute->isSet('max')) {
+            $attribute->removeAttribute('max');
+        }
+
+        return $value;
+    },
+    function (mixed $value, Document $attribute) {
+        $formatOptions = json_decode($attribute->getAttribute('formatOptions', '[]'), true);
+        if (isset($formatOptions['min']) || isset($formatOptions['max'])) {
+            $attribute
+                ->setAttribute('min', $formatOptions['min'])
+                ->setAttribute('max', $formatOptions['max']);
+        }
+
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'subQueryAttributes',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        $attributes = $database->find('attributes', [
+            Query::equal('collectionInternalId', [$document->getInternalId()]),
+            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
+            Query::limit($database->getLimitForAttributes()),
+        ]);
+
+        foreach ($attributes as $attribute) {
+            if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
+                $options = $attribute->getAttribute('options');
+                foreach ($options as $key => $value) {
+                    $attribute->setAttribute($key, $value);
+                }
+                $attribute->removeAttribute('options');
+            }
+        }
+
+        return $attributes;
+    }
+);
+
+Database::addFilter(
+    'subQueryIndexes',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('indexes', [
+                Query::equal('collectionInternalId', [$document->getInternalId()]),
+                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
+                Query::limit($database->getLimitForIndexes()),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQueryPlatforms',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('platforms', [
+                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQueryKeys',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('keys', [
+                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQueryWebhooks',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('webhooks', [
+                Query::equal('projectInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'subQuerySessions',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return Authorization::skip(fn () => $database->find('sessions', [
+            Query::equal('userInternalId', [$document->getInternalId()]),
+            Query::limit(APP_LIMIT_SUBQUERY),
+        ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryTokens',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return Authorization::skip(fn () => $database
+            ->find('tokens', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryChallenges',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return Authorization::skip(fn () => $database
+            ->find('challenges', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryAuthenticators',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return Authorization::skip(fn () => $database
+            ->find('authenticators', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryMemberships',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return Authorization::skip(fn () => $database
+            ->find('memberships', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryVariables',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('variables', [
+                Query::equal('resourceInternalId', [$document->getInternalId()]),
+                Query::equal('resourceType', ['function']),
+                Query::limit(APP_LIMIT_SUBQUERY),
+            ]);
+    }
+);
+
+Database::addFilter(
+    'encrypt',
+    function (mixed $value) {
+        $key = System::getEnv('_APP_OPENSSL_KEY_V1');
+        $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
+        $tag = null;
+
+        return json_encode([
+            'data' => OpenSSL::encrypt($value, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag),
+            'method' => OpenSSL::CIPHER_AES_128_GCM,
+            'iv' => \bin2hex($iv),
+            'tag' => \bin2hex($tag ?? ''),
+            'version' => '1',
+        ]);
+    },
+    function (mixed $value) {
+        if (is_null($value)) {
+            return;
+        }
+        $value = json_decode($value, true);
+        $key = System::getEnv('_APP_OPENSSL_KEY_V' . $value['version']);
+
+        return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
+    }
+);
+
+Database::addFilter(
+    'subQueryProjectVariables',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return $database
+            ->find('variables', [
+                Query::equal('resourceType', ['project']),
+                Query::limit(APP_LIMIT_SUBQUERY)
+            ]);
+    }
+);
+
+Database::addFilter(
+    'userSearch',
+    function (mixed $value, Document $user) {
+        $searchValues = [
+            $user->getId(),
+            $user->getAttribute('email', ''),
+            $user->getAttribute('name', ''),
+            $user->getAttribute('phone', '')
+        ];
+
+        foreach ($user->getAttribute('labels', []) as $label) {
+            $searchValues[] = 'label:' . $label;
+        }
+
+        $search = implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'subQueryTargets',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        return Authorization::skip(fn () => $database
+            ->find('targets', [
+                Query::equal('userInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBQUERY)
+            ]));
+    }
+);
+
+Database::addFilter(
+    'subQueryTopicTargets',
+    function (mixed $value) {
+        return;
+    },
+    function (mixed $value, Document $document, Database $database) {
+        $targetIds = Authorization::skip(fn () => \array_map(
+            fn ($document) => $document->getAttribute('targetInternalId'),
+            $database->find('subscribers', [
+                Query::equal('topicInternalId', [$document->getInternalId()]),
+                Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY)
+            ])
+        ));
+        if (\count($targetIds) > 0) {
+            return $database->skipValidation(fn () => $database->find('targets', [
+                Query::equal('$internalId', $targetIds)
+            ]));
+        }
+        return [];
+    }
+);
+
+Database::addFilter(
+    'providerSearch',
+    function (mixed $value, Document $provider) {
+        $searchValues = [
+            $provider->getId(),
+            $provider->getAttribute('name', ''),
+            $provider->getAttribute('provider', ''),
+            $provider->getAttribute('type', '')
+        ];
+
+        $search = \implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'topicSearch',
+    function (mixed $value, Document $topic) {
+        $searchValues = [
+            $topic->getId(),
+            $topic->getAttribute('name', ''),
+            $topic->getAttribute('description', ''),
+        ];
+
+        $search = \implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);
+
+Database::addFilter(
+    'messageSearch',
+    function (mixed $value, Document $message) {
+        $searchValues = [
+            $message->getId(),
+            $message->getAttribute('description', ''),
+            $message->getAttribute('status', ''),
+        ];
+
+        $data = \json_decode($message->getAttribute('data', []), true);
+        $providerType = $message->getAttribute('providerType', '');
+
+        switch ($providerType) {
+            case MESSAGE_TYPE_EMAIL:
+                $searchValues[] = $data['subject'];
+                $searchValues[] = MESSAGE_TYPE_EMAIL;
+                break;
+            case MESSAGE_TYPE_SMS:
+                $searchValues[] = $data['content'];
+                $searchValues[] = MESSAGE_TYPE_SMS;
+                break;
+            case MESSAGE_TYPE_PUSH:
+                $searchValues[] = $data['title'] ?? '';
+                $searchValues[] = MESSAGE_TYPE_PUSH;
+                break;
+        }
+
+        $search = \implode(' ', \array_filter($searchValues));
+
+        return $search;
+    },
+    function (mixed $value) {
+        return $value;
+    }
+);

app/init/database/formats.php

@@ -0,0 +1,43 @@
+<?php
+
+use Appwrite\Network\Validator\Email;
+use Utopia\Database\Database;
+use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\Structure;
+use Utopia\Validator\IP;
+use Utopia\Validator\Range;
+use Utopia\Validator\URL;
+use Utopia\Validator\WhiteList;
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_EMAIL, function () {
+    return new Email();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_DATETIME, function () {
+    return new DatetimeValidator();
+}, Database::VAR_DATETIME);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) {
+    $elements = $attribute['formatOptions']['elements'] ?? [];
+    return new WhiteList($elements, true);
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_IP, function () {
+    return new IP();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_URL, function () {
+    return new URL();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_INTEGER);
+}, Database::VAR_INTEGER);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_FLOAT);
+}, Database::VAR_FLOAT);

app/init/locales.php

@@ -0,0 +1,23 @@
+<?php
+
+use Utopia\Config\Config;
+use Utopia\Locale\Locale;
+
+Locale::$exceptions = false;
+
+$locales = Config::getParam('locale-codes', []);
+
+foreach ($locales as $locale) {
+    $code = $locale['code'];
+
+    $path = __DIR__ . '/../config/locale/translations/' . $code . '.json';
+
+    if (!\file_exists($path)) {
+        $path = __DIR__ . '/../config/locale/translations/' . \substr($code, 0, 2) . '.json'; // if `ar-ae` doesn't exist, look for `ar`
+        if (!\file_exists($path)) {
+            $path = __DIR__ . '/../config/locale/translations/en.json'; // if none translation exists, use default from `en.json`
+        }
+    }
+
+    Locale::setLanguageFromJSON($code, $path);
+}

app/init/registers.php

@@ -0,0 +1,341 @@
+<?php
+
+use Appwrite\Extend\Exception;
+use Appwrite\GraphQL\Promises\Adapter\Swoole;
+use Appwrite\Hooks\Hooks;
+use Appwrite\PubSub\Adapter\Redis as PubSub;
+use Appwrite\URL\URL as AppwriteURL;
+use MaxMind\Db\Reader;
+use PHPMailer\PHPMailer\PHPMailer;
+use Swoole\Database\PDOProxy;
+use Utopia\App;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Adapter\MySQL;
+use Utopia\Database\Adapter\SQL;
+use Utopia\Database\PDO;
+use Utopia\Domains\Validator\PublicDomain;
+use Utopia\DSN\DSN;
+use Utopia\Logger\Adapter\AppSignal;
+use Utopia\Logger\Adapter\LogOwl;
+use Utopia\Logger\Adapter\Raygun;
+use Utopia\Logger\Adapter\Sentry;
+use Utopia\Logger\Logger;
+use Utopia\Pools\Group;
+use Utopia\Pools\Pool;
+use Utopia\Queue;
+use Utopia\Registry\Registry;
+use Utopia\System\System;
+
+$register = new Registry();
+
+App::setMode(System::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
+
+if (!App::isProduction()) {
+    // Allow specific domains to skip public domain validation in dev environment
+    // Useful for existing tests involving webhooks
+    PublicDomain::allow(['request-catcher']);
+}
+$register->set('logger', function () {
+    // Register error logger
+    $providerName = System::getEnv('_APP_LOGGING_PROVIDER', '');
+    $providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');
+
+    if (empty($providerConfig)) {
+        return;
+    }
+
+    try {
+        $loggingProvider = new DSN($providerConfig ?? '');
+
+        $providerName = $loggingProvider->getScheme();
+        $providerConfig = match ($providerName) {
+            'sentry' => ['key' => $loggingProvider->getPassword(), 'projectId' => $loggingProvider->getUser() ?? '', 'host' => 'https://' . $loggingProvider->getHost()],
+            'logowl' => ['ticket' => $loggingProvider->getUser() ?? '', 'host' => $loggingProvider->getHost()],
+            default => ['key' => $loggingProvider->getHost()],
+        };
+    } catch (Throwable $th) {
+        // Fallback for older Appwrite versions up to 1.5.x that use _APP_LOGGING_PROVIDER and _APP_LOGGING_CONFIG environment variables
+        Console::warning('Using deprecated logging configuration. Please update your configuration to use DSN format.' . $th->getMessage());
+        $configChunks = \explode(";", $providerConfig);
+
+        $providerConfig = match ($providerName) {
+            'sentry' => [ 'key' => $configChunks[0], 'projectId' => $configChunks[1] ?? '', 'host' => '',],
+            'logowl' => ['ticket' => $configChunks[0] ?? '', 'host' => ''],
+            default => ['key' => $providerConfig],
+        };
+    }
+
+    if (empty($providerName) || empty($providerConfig)) {
+        return;
+    }
+
+    if (!Logger::hasProvider($providerName)) {
+        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
+    }
+
+    try {
+        $adapter = match ($providerName) {
+            'sentry' => new Sentry($providerConfig['projectId'], $providerConfig['key'], $providerConfig['host']),
+            'logowl' => new LogOwl($providerConfig['ticket'], $providerConfig['host']),
+            'raygun' => new Raygun($providerConfig['key']),
+            'appsignal' => new AppSignal($providerConfig['key']),
+            default => null
+        };
+    } catch (Throwable $th) {
+        $adapter = null;
+    }
+
+    if ($adapter === null) {
+        Console::error("Logging provider not supported. Logging is disabled");
+        return;
+    }
+
+    return new Logger($adapter);
+});
+
+$register->set('pools', function () {
+    $group = new Group();
+
+    $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
+        'scheme' => 'mariadb',
+        'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
+        'port' => System::getEnv('_APP_DB_PORT', '3306'),
+        'user' => System::getEnv('_APP_DB_USER', ''),
+        'pass' => System::getEnv('_APP_DB_PASS', ''),
+        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
+    ]);
+    $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
+        'scheme' => 'redis',
+        'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
+        'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
+        'user' => System::getEnv('_APP_REDIS_USER', ''),
+        'pass' => System::getEnv('_APP_REDIS_PASS', ''),
+    ]);
+
+    $connections = [
+        'console' => [
+            'type' => 'database',
+            'dsns' => $fallbackForDB,
+            'multiple' => false,
+            'schemes' => ['mariadb', 'mysql'],
+        ],
+        'database' => [
+            'type' => 'database',
+            'dsns' => $fallbackForDB,
+            'multiple' => true,
+            'schemes' => ['mariadb', 'mysql'],
+        ],
+        'logs' => [
+            'type' => 'database',
+            'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
+            'multiple' => false,
+            'schemes' => ['mariadb', 'mysql'],
+        ],
+        'publisher' => [
+            'type' => 'publisher',
+            'dsns' => $fallbackForRedis,
+            'multiple' => false,
+            'schemes' => ['redis'],
+        ],
+        'consumer' => [
+            'type' => 'consumer',
+            'dsns' => $fallbackForRedis,
+            'multiple' => false,
+            'schemes' => ['redis'],
+        ],
+        'pubsub' => [
+            'type' => 'pubsub',
+            'dsns' => $fallbackForRedis,
+            'multiple' => false,
+            'schemes' => ['redis'],
+        ],
+        'cache' => [
+            'type' => 'cache',
+            'dsns' => $fallbackForRedis,
+            'multiple' => true,
+            'schemes' => ['redis'],
+        ],
+    ];
+
+    $maxConnections = System::getEnv('_APP_CONNECTIONS_MAX', 151);
+    $instanceConnections = $maxConnections / System::getEnv('_APP_POOL_CLIENTS', 14);
+
+    $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
+
+    if ($multiprocessing) {
+        $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+    } else {
+        $workerCount = 1;
+    }
+
+    if ($workerCount > $instanceConnections) {
+        throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500);
+    }
+
+    $poolSize = (int)($instanceConnections / $workerCount);
+
+    foreach ($connections as $key => $connection) {
+        $type = $connection['type'] ?? '';
+        $multiple = $connection['multiple'] ?? false;
+        $schemes = $connection['schemes'] ?? [];
+        $config = [];
+        $dsns = explode(',', $connection['dsns'] ?? '');
+        foreach ($dsns as &$dsn) {
+            $dsn = explode('=', $dsn);
+            $name = ($multiple) ? $key . '_' . $dsn[0] : $key;
+            $dsn = $dsn[1] ?? '';
+            $config[] = $name;
+            if (empty($dsn)) {
+                //throw new Exception(Exception::GENERAL_SERVER_ERROR, "Missing value for DSN connection in {$key}");
+                continue;
+            }
+
+            $dsn = new DSN($dsn);
+            $dsnHost = $dsn->getHost();
+            $dsnPort = $dsn->getPort();
+            $dsnUser = $dsn->getUser();
+            $dsnPass = $dsn->getPassword();
+            $dsnScheme = $dsn->getScheme();
+            $dsnDatabase = $dsn->getPath();
+
+            if (!in_array($dsnScheme, $schemes)) {
+                throw new Exception(Exception::GENERAL_SERVER_ERROR, "Invalid console database scheme");
+            }
+
+            /**
+             * Get Resource
+             *
+             * Creation could be reused across connection types like database, cache, queue, etc.
+             *
+             * Resource assignment to an adapter will happen below.
+             */
+            $resource = match ($dsnScheme) {
+                'mysql',
+                'mariadb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
+                    return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
+                        return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, array(
+                            \PDO::ATTR_TIMEOUT => 3, // Seconds
+                            \PDO::ATTR_PERSISTENT => false,
+                            \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
+                            \PDO::ATTR_EMULATE_PREPARES => true,
+                            \PDO::ATTR_STRINGIFY_FETCHES => true
+                        ));
+                    });
+                },
+                'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
+                    $redis = new \Redis();
+                    @$redis->pconnect($dsnHost, (int)$dsnPort);
+                    if ($dsnPass) {
+                        $redis->auth($dsnPass);
+                    }
+                    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
+
+                    return $redis;
+                },
+                default => throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid scheme'),
+            };
+
+            $pool = new Pool($name, $poolSize, function () use ($type, $resource, $dsn) {
+                // Get Adapter
+                switch ($type) {
+                    case 'database':
+                        $adapter = match ($dsn->getScheme()) {
+                            'mariadb' => new MariaDB($resource()),
+                            'mysql' => new MySQL($resource()),
+                            default => null
+                        };
+
+                        $adapter->setDatabase($dsn->getPath());
+                        return $adapter;
+                    case 'pubsub':
+                        return match ($dsn->getScheme()) {
+                            'redis' => new PubSub($resource()),
+                            default => null
+                        };
+                    case 'publisher':
+                    case 'consumer':
+                        return match ($dsn->getScheme()) {
+                            'redis' => new Queue\Broker\Redis(new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort())),
+                            default => null
+                        };
+                    case 'cache':
+                        return match ($dsn->getScheme()) {
+                            'redis' => new RedisCache($resource()),
+                            default => null
+                        };
+                    default:
+                        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Server error: Missing adapter implementation.");
+                }
+            });
+
+            $group->add($pool);
+        }
+
+        Config::setParam('pools-' . $key, $config);
+    }
+
+    return $group;
+});
+
+$register->set('db', function () {
+    // This is usually for our workers or CLI commands scope
+    $dbHost = System::getEnv('_APP_DB_HOST', '');
+    $dbPort = System::getEnv('_APP_DB_PORT', '');
+    $dbUser = System::getEnv('_APP_DB_USER', '');
+    $dbPass = System::getEnv('_APP_DB_PASS', '');
+    $dbScheme = System::getEnv('_APP_DB_SCHEMA', '');
+
+    return new PDO(
+        "mysql:host={$dbHost};port={$dbPort};dbname={$dbScheme};charset=utf8mb4",
+        $dbUser,
+        $dbPass,
+        SQL::getPDOAttributes()
+    );
+});
+
+$register->set('smtp', function () {
+    $mail = new PHPMailer(true);
+
+    $mail->isSMTP();
+
+    $username = System::getEnv('_APP_SMTP_USERNAME');
+    $password = System::getEnv('_APP_SMTP_PASSWORD');
+
+    $mail->XMailer = 'Appwrite Mailer';
+    $mail->Host = System::getEnv('_APP_SMTP_HOST', 'smtp');
+    $mail->Port = System::getEnv('_APP_SMTP_PORT', 25);
+    $mail->SMTPAuth = !empty($username) && !empty($password);
+    $mail->Username = $username;
+    $mail->Password = $password;
+    $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
+    $mail->SMTPAutoTLS = false;
+    $mail->CharSet = 'UTF-8';
+
+    $from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
+    $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+
+    $mail->setFrom($email, $from);
+    $mail->addReplyTo($email, $from);
+
+    $mail->isHTML(true);
+
+    return $mail;
+});
+$register->set('geodb', function () {
+    return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2024-09.mmdb');
+});
+$register->set('passwordsDictionary', function () {
+    $content = \file_get_contents(__DIR__ . '/../assets/security/10k-common-passwords');
+    $content = explode("\n", $content);
+    $content = array_flip($content);
+    return $content;
+});
+$register->set('promiseAdapter', function () {
+    return new Swoole();
+});
+$register->set('hooks', function () {
+    return new Hooks();
+});

app/init/resources.php

@@ -0,0 +1,845 @@
+<?php
+
+use Ahc\Jwt\JWT;
+use Ahc\Jwt\JWTException;
+use Appwrite\Auth\Auth;
+use Appwrite\Auth\Key;
+use Appwrite\Event\Audit;
+use Appwrite\Event\Build;
+use Appwrite\Event\Certificate;
+use Appwrite\Event\Database as EventDatabase;
+use Appwrite\Event\Delete;
+use Appwrite\Event\Event;
+use Appwrite\Event\Func;
+use Appwrite\Event\Mail;
+use Appwrite\Event\Messaging;
+use Appwrite\Event\Migration;
+use Appwrite\Event\Realtime;
+use Appwrite\Event\StatsUsage;
+use Appwrite\Event\Webhook;
+use Appwrite\Extend\Exception;
+use Appwrite\GraphQL\Schema;
+use Appwrite\Network\Validator\Origin;
+use Appwrite\Utopia\Request;
+use Executor\Executor;
+use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\App;
+use Utopia\Cache\Adapter\Sharding;
+use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
+use Utopia\DSN\DSN;
+use Utopia\Locale\Locale;
+use Utopia\Logger\Log;
+use Utopia\Pools\Group;
+use Utopia\Queue\Publisher;
+use Utopia\Storage\Device;
+use Utopia\Storage\Device\AWS;
+use Utopia\Storage\Device\Backblaze;
+use Utopia\Storage\Device\DOSpaces;
+use Utopia\Storage\Device\Linode;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Device\S3;
+use Utopia\Storage\Device\Wasabi;
+use Utopia\Storage\Storage;
+use Utopia\System\System;
+use Utopia\Telemetry\Adapter as Telemetry;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
+use Utopia\Validator\Hostname;
+use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
+
+// Runtime Execution
+App::setResource('log', fn () => new Log());
+App::setResource('logger', function ($register) {
+    return $register->get('logger');
+}, ['register']);
+
+App::setResource('hooks', function ($register) {
+    return $register->get('hooks');
+}, ['register']);
+
+App::setResource('register', fn () => $register);
+App::setResource('locale', fn () => new Locale(System::getEnv('_APP_LOCALE', 'en')));
+
+App::setResource('localeCodes', function () {
+    return array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', []));
+});
+
+// Queues
+App::setResource('publisher', function (Group $pools) {
+    return $pools->get('publisher')->pop()->getResource();
+}, ['pools']);
+App::setResource('consumer', function (Group $pools) {
+    return $pools->get('consumer')->pop()->getResource();
+}, ['pools']);
+App::setResource('queueForMessaging', function (Publisher $publisher) {
+    return new Messaging($publisher);
+}, ['publisher']);
+App::setResource('queueForMails', function (Publisher $publisher) {
+    return new Mail($publisher);
+}, ['publisher']);
+App::setResource('queueForBuilds', function (Publisher $publisher) {
+    return new Build($publisher);
+}, ['publisher']);
+App::setResource('queueForDatabase', function (Publisher $publisher) {
+    return new EventDatabase($publisher);
+}, ['publisher']);
+App::setResource('queueForDeletes', function (Publisher $publisher) {
+    return new Delete($publisher);
+}, ['publisher']);
+App::setResource('queueForEvents', function (Publisher $publisher) {
+    return new Event($publisher);
+}, ['publisher']);
+App::setResource('queueForWebhooks', function (Publisher $publisher) {
+    return new Webhook($publisher);
+}, ['publisher']);
+App::setResource('queueForRealtime', function () {
+    return new Realtime();
+}, []);
+App::setResource('queueForStatsUsage', function (Publisher $publisher) {
+    return new StatsUsage($publisher);
+}, ['publisher']);
+App::setResource('queueForAudits', function (Publisher $publisher) {
+    return new Audit($publisher);
+}, ['publisher']);
+App::setResource('queueForFunctions', function (Publisher $publisher) {
+    return new Func($publisher);
+}, ['publisher']);
+App::setResource('queueForCertificates', function (Publisher $publisher) {
+    return new Certificate($publisher);
+}, ['publisher']);
+App::setResource('queueForMigrations', function (Publisher $publisher) {
+    return new Migration($publisher);
+}, ['publisher']);
+App::setResource('clients', function ($request, $console, $project) {
+    $console->setAttribute('platforms', [ // Always allow current host
+        '$collection' => ID::custom('platforms'),
+        'name' => 'Current Host',
+        'type' => Origin::CLIENT_TYPE_WEB,
+        'hostname' => $request->getHostname(),
+    ], Document::SET_TYPE_APPEND);
+
+    $hostnames = explode(',', System::getEnv('_APP_CONSOLE_HOSTNAMES', ''));
+    $validator = new Hostname();
+    foreach ($hostnames as $hostname) {
+        $hostname = trim($hostname);
+        if (!$validator->isValid($hostname)) {
+            continue;
+        }
+        $console->setAttribute('platforms', [
+            '$collection' => ID::custom('platforms'),
+            'type' => Origin::CLIENT_TYPE_WEB,
+            'name' => $hostname,
+            'hostname' => $hostname,
+        ], Document::SET_TYPE_APPEND);
+    }
+
+    /**
+     * Get All verified client URLs for both console and current projects
+     * + Filter for duplicated entries
+     */
+    $clientsConsole = \array_map(
+        fn ($node) => $node['hostname'],
+        \array_filter(
+            $console->getAttribute('platforms', []),
+            fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB) && !empty($node['hostname']))
+        )
+    );
+
+    $clients = $clientsConsole;
+    $platforms = $project->getAttribute('platforms', []);
+
+    foreach ($platforms as $node) {
+        if (
+            isset($node['type']) &&
+            ($node['type'] === Origin::CLIENT_TYPE_WEB ||
+            $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) &&
+            !empty($node['hostname'])
+        ) {
+            $clients[] = $node['hostname'];
+        }
+    }
+
+    return \array_unique($clients);
+}, ['request', 'console', 'project']);
+
+App::setResource('user', function ($mode, $project, $console, $request, $response, $dbForProject, $dbForPlatform) {
+    /** @var Appwrite\Utopia\Request $request */
+    /** @var Appwrite\Utopia\Response $response */
+    /** @var Utopia\Database\Document $project */
+    /** @var Utopia\Database\Database $dbForProject */
+    /** @var Utopia\Database\Database $dbForPlatform */
+    /** @var string $mode */
+
+    Authorization::setDefaultStatus(true);
+
+    Auth::setCookieName('a_session_' . $project->getId());
+
+    if (APP_MODE_ADMIN === $mode) {
+        Auth::setCookieName('a_session_' . $console->getId());
+    }
+
+    $session = Auth::decodeSession(
+        $request->getCookie(
+            Auth::$cookieName, // Get sessions
+            $request->getCookie(Auth::$cookieName . '_legacy', '')
+        )
+    );
+
+    // Get session from header for SSR clients
+    if (empty($session['id']) && empty($session['secret'])) {
+        $sessionHeader = $request->getHeader('x-appwrite-session', '');
+
+        if (!empty($sessionHeader)) {
+            $session = Auth::decodeSession($sessionHeader);
+        }
+    }
+
+    // Get fallback session from old clients (no SameSite support) or clients who block 3rd-party cookies
+    if ($response) {
+        $response->addHeader('X-Debug-Fallback', 'false');
+    }
+
+    if (empty($session['id']) && empty($session['secret'])) {
+        if ($response) {
+            $response->addHeader('X-Debug-Fallback', 'true');
+        }
+        $fallback = $request->getHeader('x-fallback-cookies', '');
+        $fallback = \json_decode($fallback, true);
+        $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
+    }
+
+    Auth::$unique = $session['id'] ?? '';
+    Auth::$secret = $session['secret'] ?? '';
+
+    if (APP_MODE_ADMIN !== $mode) {
+        if ($project->isEmpty()) {
+            $user = new Document([]);
+        } else {
+            if ($project->getId() === 'console') {
+                $user = $dbForPlatform->getDocument('users', Auth::$unique);
+            } else {
+                $user = $dbForProject->getDocument('users', Auth::$unique);
+            }
+        }
+    } else {
+        $user = $dbForPlatform->getDocument('users', Auth::$unique);
+    }
+
+    if (
+        $user->isEmpty() // Check a document has been found in the DB
+        || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret)
+    ) { // Validate user has valid login token
+        $user = new Document([]);
+    }
+
+    // if (APP_MODE_ADMIN === $mode) {
+    //     if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
+    //         Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
+    //     } else {
+    //         $user = new Document([]);
+    //     }
+    // }
+
+    $authJWT = $request->getHeader('x-appwrite-jwt', '');
+
+    if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
+        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
+
+        try {
+            $payload = $jwt->decode($authJWT);
+        } catch (JWTException $error) {
+            throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
+        }
+
+        $jwtUserId = $payload['userId'] ?? '';
+        if (!empty($jwtUserId)) {
+            $user = $dbForProject->getDocument('users', $jwtUserId);
+        }
+
+        $jwtSessionId = $payload['sessionId'] ?? '';
+        if (!empty($jwtSessionId)) {
+            if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
+                $user = new Document([]);
+            }
+        }
+    }
+
+    $dbForProject->setMetadata('user', $user->getId());
+    $dbForPlatform->setMetadata('user', $user->getId());
+
+    return $user;
+}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform']);
+
+App::setResource('project', function ($dbForPlatform, $request, $console) {
+    /** @var Appwrite\Utopia\Request $request */
+    /** @var Utopia\Database\Database $dbForPlatform */
+    /** @var Utopia\Database\Document $console */
+
+    $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
+
+    if (empty($projectId) || $projectId === 'console') {
+        return $console;
+    }
+
+    $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+
+    return $project;
+}, ['dbForPlatform', 'request', 'console']);
+
+App::setResource('session', function (Document $user) {
+    if ($user->isEmpty()) {
+        return;
+    }
+
+    $sessions = $user->getAttribute('sessions', []);
+    $sessionId = Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret);
+
+    if (!$sessionId) {
+        return;
+    }
+
+    foreach ($sessions as $session) {/** @var Document $session */
+        if ($sessionId === $session->getId()) {
+            return $session;
+        }
+    }
+
+    return;
+}, ['user']);
+
+App::setResource('console', function () {
+    return new Document(Config::getParam('console'));
+}, []);
+
+App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project) {
+    if ($project->isEmpty() || $project->getId() === 'console') {
+        return $dbForPlatform;
+    }
+
+    try {
+        $dsn = new DSN($project->getAttribute('database'));
+    } catch (\InvalidArgumentException) {
+        // TODO: Temporary until all projects are using shared tables
+        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+    }
+
+    $dbAdapter = $pools
+        ->get($dsn->getHost())
+        ->pop()
+        ->getResource();
+
+    $database = new Database($dbAdapter, $cache);
+
+    $database
+        ->setMetadata('host', \gethostname())
+        ->setMetadata('project', $project->getId())
+        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
+        ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+    if (\in_array($dsn->getHost(), $sharedTables)) {
+        $database
+            ->setSharedTables(true)
+            ->setTenant($project->getInternalId())
+            ->setNamespace($dsn->getParam('namespace'));
+    } else {
+        $database
+            ->setSharedTables(false)
+            ->setTenant(null)
+            ->setNamespace('_' . $project->getInternalId());
+    }
+
+    return $database;
+}, ['pools', 'dbForPlatform', 'cache', 'project']);
+
+App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
+    $dbAdapter = $pools
+        ->get('console')
+        ->pop()
+        ->getResource();
+
+    $database = new Database($dbAdapter, $cache);
+
+    $database
+        ->setNamespace('_console')
+        ->setMetadata('host', \gethostname())
+        ->setMetadata('project', 'console')
+        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
+        ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+    return $database;
+}, ['pools', 'cache']);
+
+App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
+    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
+
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            return $dbForPlatform;
+        }
+
+        try {
+            $dsn = new DSN($project->getAttribute('database'));
+        } catch (\InvalidArgumentException) {
+            // TODO: Temporary until all projects are using shared tables
+            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+        }
+
+        $configure = (function (Database $database) use ($project, $dsn) {
+            $database
+                ->setMetadata('host', \gethostname())
+                ->setMetadata('project', $project->getId())
+                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
+                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+            if (\in_array($dsn->getHost(), $sharedTables)) {
+                $database
+                    ->setSharedTables(true)
+                    ->setTenant($project->getInternalId())
+                    ->setNamespace($dsn->getParam('namespace'));
+            } else {
+                $database
+                    ->setSharedTables(false)
+                    ->setTenant(null)
+                    ->setNamespace('_' . $project->getInternalId());
+            }
+        });
+
+        if (isset($databases[$dsn->getHost()])) {
+            $database = $databases[$dsn->getHost()];
+            $configure($database);
+            return $database;
+        }
+
+        $dbAdapter = $pools
+            ->get($dsn->getHost())
+            ->pop()
+            ->getResource();
+
+        $database = new Database($dbAdapter, $cache);
+        $databases[$dsn->getHost()] = $database;
+        $configure($database);
+
+        return $database;
+    };
+}, ['pools', 'dbForPlatform', 'cache']);
+
+App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
+    $database = null;
+    return function (?Document $project = null) use ($pools, $cache, $database) {
+        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant($project->getInternalId());
+            return $database;
+        }
+
+        $dbAdapter = $pools
+            ->get('logs')
+            ->pop()
+            ->getResource();
+
+        $database = new Database(
+            $dbAdapter,
+            $cache
+        );
+
+        $database
+            ->setSharedTables(true)
+            ->setNamespace('logsV1')
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+
+        // set tenant
+        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant($project->getInternalId());
+        }
+
+        return $database;
+    };
+}, ['pools', 'cache']);
+
+App::setResource('telemetry', fn () => new NoTelemetry());
+
+App::setResource('cache', function (Group $pools, Telemetry $telemetry) {
+    $list = Config::getParam('pools-cache', []);
+    $adapters = [];
+
+    foreach ($list as $value) {
+        $adapters[] = $pools
+            ->get($value)
+            ->pop()
+            ->getResource();
+    }
+
+    $cache = new Cache(new Sharding($adapters));
+
+    $cache->setTelemetry($telemetry);
+
+    return $cache;
+}, ['pools', 'telemetry']);
+
+App::setResource('redis', function () {
+    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
+    $port = System::getEnv('_APP_REDIS_PORT', 6379);
+    $pass = System::getEnv('_APP_REDIS_PASS', '');
+
+    $redis = new \Redis();
+    @$redis->pconnect($host, (int)$port);
+    if ($pass) {
+        $redis->auth($pass);
+    }
+    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
+
+    return $redis;
+});
+
+App::setResource('timelimit', function (\Redis $redis) {
+    return function (string $key, int $limit, int $time) use ($redis) {
+        return new TimeLimitRedis($key, $limit, $time, $redis);
+    };
+}, ['redis']);
+
+App::setResource('deviceForLocal', function () {
+    return new Local();
+});
+
+App::setResource('deviceForFiles', function ($project) {
+    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
+}, ['project']);
+
+App::setResource('deviceForFunctions', function ($project) {
+    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
+}, ['project']);
+
+App::setResource('deviceForBuilds', function ($project) {
+    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
+}, ['project']);
+
+function getDevice(string $root, string $connection = ''): Device
+{
+    $connection = !empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
+
+    if (!empty($connection)) {
+        $acl = 'private';
+        $device = Storage::DEVICE_LOCAL;
+        $accessKey = '';
+        $accessSecret = '';
+        $bucket = '';
+        $region = '';
+        $url = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
+
+        try {
+            $dsn = new DSN($connection);
+            $device = $dsn->getScheme();
+            $accessKey = $dsn->getUser() ?? '';
+            $accessSecret = $dsn->getPassword() ?? '';
+            $bucket = $dsn->getPath() ?? '';
+            $region = $dsn->getParam('region');
+        } catch (\Throwable $e) {
+            Console::warning($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
+        }
+
+        switch ($device) {
+            case Storage::DEVICE_S3:
+                if (!empty($url)) {
+                    return new S3($root, $accessKey, $accessSecret, $url, $region, $acl);
+                } else {
+                    return new AWS($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+                }
+                // no break
+            case STORAGE::DEVICE_DO_SPACES:
+                $device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
+                return $device;
+            case Storage::DEVICE_BACKBLAZE:
+                return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+            case Storage::DEVICE_LINODE:
+                return new Linode($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+            case Storage::DEVICE_WASABI:
+                return new Wasabi($root, $accessKey, $accessSecret, $bucket, $region, $acl);
+            case Storage::DEVICE_LOCAL:
+            default:
+                return new Local($root);
+        }
+    } else {
+        switch (strtolower(System::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL) ?? '')) {
+            case Storage::DEVICE_LOCAL:
+            default:
+                return new Local($root);
+            case Storage::DEVICE_S3:
+                $s3AccessKey = System::getEnv('_APP_STORAGE_S3_ACCESS_KEY', '');
+                $s3SecretKey = System::getEnv('_APP_STORAGE_S3_SECRET', '');
+                $s3Region = System::getEnv('_APP_STORAGE_S3_REGION', '');
+                $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
+                $s3Acl = 'private';
+                $s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
+                if (!empty($s3EndpointUrl)) {
+                    return new S3($root, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
+                } else {
+                    return new AWS($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
+                }
+                // no break
+            case Storage::DEVICE_DO_SPACES:
+                $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
+                $doSpacesSecretKey = System::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
+                $doSpacesRegion = System::getEnv('_APP_STORAGE_DO_SPACES_REGION', '');
+                $doSpacesBucket = System::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', '');
+                $doSpacesAcl = 'private';
+                $device = new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl);
+                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
+                return $device;
+            case Storage::DEVICE_BACKBLAZE:
+                $backblazeAccessKey = System::getEnv('_APP_STORAGE_BACKBLAZE_ACCESS_KEY', '');
+                $backblazeSecretKey = System::getEnv('_APP_STORAGE_BACKBLAZE_SECRET', '');
+                $backblazeRegion = System::getEnv('_APP_STORAGE_BACKBLAZE_REGION', '');
+                $backblazeBucket = System::getEnv('_APP_STORAGE_BACKBLAZE_BUCKET', '');
+                $backblazeAcl = 'private';
+                return new Backblaze($root, $backblazeAccessKey, $backblazeSecretKey, $backblazeBucket, $backblazeRegion, $backblazeAcl);
+            case Storage::DEVICE_LINODE:
+                $linodeAccessKey = System::getEnv('_APP_STORAGE_LINODE_ACCESS_KEY', '');
+                $linodeSecretKey = System::getEnv('_APP_STORAGE_LINODE_SECRET', '');
+                $linodeRegion = System::getEnv('_APP_STORAGE_LINODE_REGION', '');
+                $linodeBucket = System::getEnv('_APP_STORAGE_LINODE_BUCKET', '');
+                $linodeAcl = 'private';
+                return new Linode($root, $linodeAccessKey, $linodeSecretKey, $linodeBucket, $linodeRegion, $linodeAcl);
+            case Storage::DEVICE_WASABI:
+                $wasabiAccessKey = System::getEnv('_APP_STORAGE_WASABI_ACCESS_KEY', '');
+                $wasabiSecretKey = System::getEnv('_APP_STORAGE_WASABI_SECRET', '');
+                $wasabiRegion = System::getEnv('_APP_STORAGE_WASABI_REGION', '');
+                $wasabiBucket = System::getEnv('_APP_STORAGE_WASABI_BUCKET', '');
+                $wasabiAcl = 'private';
+                return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl);
+        }
+    }
+}
+
+App::setResource('mode', function ($request) {
+    /** @var Appwrite\Utopia\Request $request */
+
+    /**
+     * Defines the mode for the request:
+     * - 'default' => Requests for Client and Server Side
+     * - 'admin' => Request from the Console on non-console projects
+     */
+    return $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
+}, ['request']);
+
+App::setResource('geodb', function ($register) {
+    /** @var Utopia\Registry\Registry $register */
+    return $register->get('geodb');
+}, ['register']);
+
+App::setResource('passwordsDictionary', function ($register) {
+    /** @var Utopia\Registry\Registry $register */
+    return $register->get('passwordsDictionary');
+}, ['register']);
+
+
+App::setResource('servers', function () {
+    $platforms = Config::getParam('platforms');
+    $server = $platforms[APP_PLATFORM_SERVER];
+
+    $languages = array_map(function ($language) {
+        return strtolower($language['name']);
+    }, $server['sdks']);
+
+    return $languages;
+});
+
+App::setResource('promiseAdapter', function ($register) {
+    return $register->get('promiseAdapter');
+}, ['register']);
+
+App::setResource('schema', function ($utopia, $dbForProject) {
+
+    $complexity = function (int $complexity, array $args) {
+        $queries = Query::parseQueries($args['queries'] ?? []);
+        $query = Query::getByType($queries, [Query::TYPE_LIMIT])[0] ?? null;
+        $limit = $query ? $query->getValue() : APP_LIMIT_LIST_DEFAULT;
+
+        return $complexity * $limit;
+    };
+
+    $attributes = function (int $limit, int $offset) use ($dbForProject) {
+        $attrs = Authorization::skip(fn () => $dbForProject->find('attributes', [
+            Query::limit($limit),
+            Query::offset($offset),
+        ]));
+
+        return \array_map(function ($attr) {
+            return $attr->getArrayCopy();
+        }, $attrs);
+    };
+
+    $urls = [
+        'list' => function (string $databaseId, string $collectionId, array $args) {
+            return "/v1/databases/$databaseId/collections/$collectionId/documents";
+        },
+        'create' => function (string $databaseId, string $collectionId, array $args) {
+            return "/v1/databases/$databaseId/collections/$collectionId/documents";
+        },
+        'read' => function (string $databaseId, string $collectionId, array $args) {
+            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
+        },
+        'update' => function (string $databaseId, string $collectionId, array $args) {
+            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
+        },
+        'delete' => function (string $databaseId, string $collectionId, array $args) {
+            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
+        },
+    ];
+
+    $params = [
+        'list' => function (string $databaseId, string $collectionId, array $args) {
+            return [ 'queries' => $args['queries']];
+        },
+        'create' => function (string $databaseId, string $collectionId, array $args) {
+            $id = $args['id'] ?? 'unique()';
+            $permissions = $args['permissions'] ?? null;
+
+            unset($args['id']);
+            unset($args['permissions']);
+
+            // Order must be the same as the route params
+            return [
+                'databaseId' => $databaseId,
+                'documentId' => $id,
+                'collectionId' => $collectionId,
+                'data' => $args,
+                'permissions' => $permissions,
+            ];
+        },
+        'update' => function (string $databaseId, string $collectionId, array $args) {
+            $documentId = $args['id'];
+            $permissions = $args['permissions'] ?? null;
+
+            unset($args['id']);
+            unset($args['permissions']);
+
+            // Order must be the same as the route params
+            return [
+                'databaseId' => $databaseId,
+                'collectionId' => $collectionId,
+                'documentId' => $documentId,
+                'data' => $args,
+                'permissions' => $permissions,
+            ];
+        },
+    ];
+
+    return Schema::build(
+        $utopia,
+        $complexity,
+        $attributes,
+        $urls,
+        $params,
+    );
+}, ['utopia', 'dbForProject']);
+
+App::setResource('contributors', function () {
+    $path = 'app/config/contributors.json';
+    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+    return $list;
+});
+
+App::setResource('employees', function () {
+    $path = 'app/config/employees.json';
+    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+    return $list;
+});
+
+App::setResource('heroes', function () {
+    $path = 'app/config/heroes.json';
+    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+    return $list;
+});
+
+App::setResource('gitHub', function (Cache $cache) {
+    return new VcsGitHub($cache);
+}, ['cache']);
+
+App::setResource('requestTimestamp', function ($request) {
+    //TODO: Move this to the Request class itself
+    $timestampHeader = $request->getHeader('x-appwrite-timestamp');
+    $requestTimestamp = null;
+    if (!empty($timestampHeader)) {
+        try {
+            $requestTimestamp = new \DateTime($timestampHeader);
+        } catch (\Throwable $e) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
+        }
+    }
+    return $requestTimestamp;
+}, ['request']);
+
+App::setResource('plan', function (array $plan = []) {
+    return [];
+});
+
+App::setResource('smsRates', function () {
+    return [];
+});
+
+App::setResource('team', function (Document $project, Database $dbForPlatform, App $utopia, Request $request) {
+    $teamInternalId = '';
+    if ($project->getId() !== 'console') {
+        $teamInternalId = $project->getAttribute('teamInternalId', '');
+    } else {
+        $route = $utopia->match($request);
+        $path = $route->getPath();
+        if (str_starts_with($path, '/v1/projects/:projectId')) {
+            $uri = $request->getURI();
+            $pid = explode('/', $uri)[3];
+            $p = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $pid));
+            $teamInternalId = $p->getAttribute('teamInternalId', '');
+        } elseif ($path === '/v1/projects') {
+            $teamId = $request->getParam('teamId', '');
+            $team = Authorization::skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
+            return $team;
+        }
+    }
+
+    $team = Authorization::skip(function () use ($dbForPlatform, $teamInternalId) {
+        return $dbForPlatform->findOne('teams', [
+            Query::equal('$internalId', [$teamInternalId]),
+        ]);
+    });
+
+    return $team;
+}, ['project', 'dbForPlatform', 'utopia', 'request']);
+
+App::setResource(
+    'isResourceBlocked',
+    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
+);
+
+App::setResource('previewHostname', function (Request $request) {
+    if (App::isDevelopment()) {
+        $host = $request->getQuery('appwrite-hostname') ?? '';
+        if (!empty($host)) {
+            return $host;
+        }
+    }
+
+    return '';
+}, ['request']);
+
+App::setResource('apiKey', function (Request $request, Document $project): ?Key {
+    $key = $request->getHeader('x-appwrite-key');
+
+    if (empty($key)) {
+        return null;
+    }
+
+    return Key::decode($project, $key);
+}, ['request', 'project']);
+
+App::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));

app/views/install/compose.phtml

@@ -144,10 +144,12 @@ $image = $this->getParam('image', '');
       - _APP_LOGGING_CONFIG
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_DELAY
+      - _APP_MAINTENANCE_START_TIME
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -164,11 +166,10 @@ $image = $this->getParam('image', '');
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
       - _APP_ASSISTANT_OPENAI_API_KEY
-
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:5.2.27
+    image: <?php echo $organization; ?>/console:5.2.58
     restart: unless-stopped
     networks:
       - appwrite
@@ -341,7 +342,10 @@ $image = $this->getParam('image', '');
       - _APP_EXECUTOR_HOST
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_EMAIL_CERTIFICATES
 
   appwrite-worker-databases:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -650,6 +654,7 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
@@ -740,34 +745,6 @@ $image = $this->getParam('image', '');
       - _APP_LOGGING_CONFIG
       - _APP_USAGE_AGGREGATION_INTERVAL
 
-  appwrite-worker-stats-usage-dump:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-stats-usage-dump
-    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
-
   appwrite-task-scheduler-functions:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: schedule-functions

app/worker.php

@@ -15,11 +15,9 @@ use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
-use Appwrite\Event\StatsUsageDump;
-/** remove */
-/** /remove */
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
+use Executor\Executor;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\Cache\Adapter\Sharding;
@@ -112,6 +110,8 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
             ->setNamespace('_' . $project->getInternalId());
     }
 
+    $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+
     return $database;
 }, ['cache', 'register', 'message', 'project', 'dbForPlatform']);
 
@@ -173,6 +173,8 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
                 ->setNamespace('_' . $project->getInternalId());
         }
 
+        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+
         return $database;
     };
 }, ['pools', 'dbForPlatform', 'cache']);
@@ -198,7 +200,7 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
         $database
             ->setSharedTables(true)
             ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
             ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
 
         // set tenant
@@ -211,15 +213,18 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
 }, ['pools', 'cache']);
 
 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
 });
 
-Server::setResource('auditRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
-});
+Server::setResource('auditRetention', function (Document $project) {
+    if ($project->getId() === 'console') {
+        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
+    }
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
+}, ['project']);
 
 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
 });
 
 Server::setResource('cache', function (Registry $register) {
@@ -273,10 +278,6 @@ Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
     return new StatsUsage($publisher);
 }, ['publisher']);
 
-Server::setResource('queueForStatsUsageDump', function (Publisher $publisher) {
-    return new StatsUsageDump($publisher);
-}, ['publisher']);
-
 Server::setResource('queueForDatabase', function (Publisher $publisher) {
     return new EventDatabase($publisher);
 }, ['publisher']);
@@ -408,6 +409,8 @@ Server::setResource('logError', function (Registry $register, Document $project)
     };
 }, ['register', 'project']);
 
+Server::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
+
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');

bin/worker-stats-usage-dump

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php stats-usage-dump $@

composer.json

@@ -30,7 +30,7 @@
         }
     },
     "require": {
-        "php": ">=8.0.0",
+        "php": ">=8.3.0",
         "ext-curl": "*",
         "ext-imagick": "*",
         "ext-mbstring": "*",
@@ -45,34 +45,34 @@
         "ext-sockets": "*",
         "appwrite/php-runtimes": "0.16.*",
         "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.51.*",
+        "utopia-php/abuse": "0.52.*",
         "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.54.0",
-        "utopia-php/cache": "0.11.*",
+        "utopia-php/audit": "0.55.*",
+        "utopia-php/cache": "0.13.*",
         "utopia-php/cli": "0.15.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.60.*",
+        "utopia-php/database": "0.69.*",
         "utopia-php/domains": "0.5.*",
         "utopia-php/dsn": "0.2.1",
         "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.3.*",
+        "utopia-php/fetch": "0.4.*",
         "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.16.*",
-        "utopia-php/migration": "0.6.*",
+        "utopia-php/messaging": "0.17.*",
+        "utopia-php/migration": "0.9.*",
         "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.3",
-        "utopia-php/pools": "0.5.*",
+        "utopia-php/platform": "0.7.*",
+        "utopia-php/pools": "0.8.*",
         "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.8.*",
+        "utopia-php/queue": "0.9.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.18.*",
         "utopia-php/swoole": "0.8.*",
         "utopia-php/system": "0.9.*",
         "utopia-php/telemetry": "0.1.*",
-        "utopia-php/vcs": "0.8.*",
-        "utopia-php/websocket": "0.1.*",
+        "utopia-php/vcs": "0.9.*",
+        "utopia-php/websocket": "0.3.*",
         "matomo/device-detector": "6.1.*",
         "dragonmantank/cron-expression": "3.3.2",
         "phpmailer/phpmailer": "6.9.1",
@@ -99,8 +99,8 @@
             "php": "8.3"
         },
         "allow-plugins": {
-            "php-http/discovery": false,
-            "tbachert/spi": false
+            "php-http/discovery": true,
+            "tbachert/spi": true
         }
     }
 }

docker-compose.yml

@@ -171,6 +171,7 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -197,11 +198,14 @@ services:
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_DATABASE_SHARED_NAMESPACE
       - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
+      - _APP_CUSTOM_DOMAIN_DENY_LIST
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:5.2.27
+    image: appwrite/console:5.2.58
     restart: unless-stopped
     networks:
       - appwrite
@@ -389,6 +393,8 @@ services:
       - _APP_DATABASE_SHARED_TABLES
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_EMAIL_CERTIFICATES
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
 
   appwrite-worker-databases:
     entrypoint: worker-databases
@@ -486,6 +492,8 @@ services:
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
       - _APP_DATABASE_SHARED_TABLES
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   appwrite-worker-certificates:
     entrypoint: worker-certificates
@@ -721,9 +729,10 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
+      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
-      - _APP_MAINTENANCE_DELAY
+      - _APP_MAINTENANCE_START_TIME
       - _APP_DATABASE_SHARED_TABLES
 
   appwrite-task-stats-resources:
@@ -756,7 +765,7 @@ services:
       - _APP_LOGGING_CONFIG
       - _APP_DATABASE_SHARED_TABLES
       - _APP_STATS_RESOURCES_INTERVAL
-  
+
   appwrite-worker-stats-resources:
     entrypoint: worker-stats-resources
     <<: *x-logging
@@ -787,7 +796,7 @@ services:
       - _APP_LOGGING_CONFIG
       - _APP_USAGE_AGGREGATION_INTERVAL
       - _APP_DATABASE_SHARED_TABLES
-  
+
   appwrite-worker-stats-usage:
     entrypoint: worker-stats-usage
     <<: *x-logging
@@ -819,38 +828,6 @@ services:
       - _APP_USAGE_AGGREGATION_INTERVAL
       - _APP_DATABASE_SHARED_TABLES
 
-  appwrite-worker-stats-usage-dump:
-    entrypoint: worker-stats-usage-dump
-    <<: *x-logging
-    container_name: appwrite-worker-stats-usage-dump
-    image: appwrite-dev
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_OPENSSL_KEY_V1
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_USAGE_STATS
-      - _APP_LOGGING_CONFIG
-      - _APP_USAGE_AGGREGATION_INTERVAL
-      - _APP_DATABASE_SHARED_TABLES
-      - _APP_STATS_USAGE_DUAL_WRITING_DBS
-  
   appwrite-task-scheduler-functions:
     entrypoint: schedule-functions
     <<: *x-logging
@@ -1127,4 +1104,4 @@ volumes:
   appwrite-certificates:
   appwrite-functions:
   appwrite-builds:
-  appwrite-config:
+  appwrite-config:

docs/examples/1.1.x/client-android/java/account/create-anonymous-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-email-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-j-w-t.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-magic-u-r-l-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-o-auth2session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-phone-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-phone-verification.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-recovery.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create-verification.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/create.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/delete-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/delete-sessions.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/get-prefs.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/get-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/get.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/list-logs.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/list-sessions.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-email.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-magic-u-r-l-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-name.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-password.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-phone-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-phone-verification.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-phone.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-prefs.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-recovery.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-status.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/account/update-verification.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);

docs/examples/1.1.x/client-android/java/avatars/get-browser.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Avatars avatars = new Avatars(client);

docs/examples/1.1.x/client-android/java/avatars/get-credit-card.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Avatars avatars = new Avatars(client);

docs/examples/1.1.x/client-android/java/avatars/get-favicon.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Avatars avatars = new Avatars(client);

docs/examples/1.1.x/client-android/java/avatars/get-flag.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Avatars avatars = new Avatars(client);

docs/examples/1.1.x/client-android/java/avatars/get-image.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Avatars avatars = new Avatars(client);