Merge branch '1.9.x' into chore/remove-utopia-logger

2026-05-26 13:51:13 +00:00 · 2026-04-30 16:37:02 +05:30
parent f2b058e612 fbbab0f7e1
commit cb4a1242df
12 changed files with 167 additions and 58 deletions
@@ -47,6 +47,8 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
+_APP_DATABASE_SHARED_TABLES=
+_APP_DATABASE_SHARED_NAMESPACE=
 _APP_DB_ADAPTER_DOCUMENTSDB=mongodb
 _APP_DB_HOST_DOCUMENTSDB=mongodb
 _APP_DB_PORT_DOCUMENTSDB=27017
@@ -158,12 +158,19 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
        }

        if (isset($databases[$dsn->getHost()])) {
+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database = $databases[$dsn->getHost()];
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
+                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -183,9 +190,16 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setSharedTables(true)
                ->setTenant($project->getSequence())
+                ->setGlobalCollections($projectsGlobalCollections)
                ->setNamespace($dsn->getParam('namespace'));
        } else {
            $database
@@ -213,6 +227,11 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
            return $database;
        }

+        /** @var array $collections */
+        $collections = Config::getParam('collections', []);
+        $logsCollections = $collections['logs'] ?? [];
+        $logsCollections = array_keys($logsCollections);
+
        $adapter = new DatabasePool($pools->get('logs'));
        $database = new Database($adapter, $cache);

@@ -221,6 +240,7 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
+            ->setGlobalCollections($logsCollections)
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);

@@ -28,6 +28,16 @@
    "emails.invitation.thanks": "Gracias.,",
    "emails.invitation.buttonText": "Aceptar invitación a {{team}}",
    "emails.invitation.signature": "El equipo de {{project}}",
+    "emails.sessionAlert.subject": "Alerta de seguridad: nueva sesión en tu cuenta de {{project}}",
+    "emails.sessionAlert.preview": "Nuevo inicio de sesión detectado en {{project}} a las {{time}} UTC.",
+    "emails.sessionAlert.hello": "Hola {{user}},",
+    "emails.sessionAlert.body": "Se ha creado una nueva sesión en tu cuenta de {{b}}{{project}}{{/b}}, {{b}}el {{date}} de {{year}} a las {{time}} UTC{{/b}}.\nEstos son los detalles de la nueva sesión:",
+    "emails.sessionAlert.listDevice": "Dispositivo: {{b}}{{device}}{{/b}}",
+    "emails.sessionAlert.listIpAddress": "Dirección IP: {{b}}{{ipAddress}}{{/b}}",
+    "emails.sessionAlert.listCountry": "País: {{b}}{{country}}{{/b}}",
+    "emails.sessionAlert.footer": "Si has sido tú, no tienes que hacer nada más.\nSi no has iniciado esta sesión o sospechas actividad no autorizada, protege tu cuenta.",
+    "emails.sessionAlert.thanks": "Gracias,",
+    "emails.sessionAlert.signature": "El equipo de {{project}}",
    "locale.country.unknown": "Desconocido",
    "countries.af": "Afganistán",
    "countries.ao": "Angola",
@@ -155,10 +155,16 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
        $adapter = new DatabasePool($pools->get('logs'));
        $database = new Database($adapter, $cache);

+        /** @var array $collections */
+        $collections = Config::getParam('collections', []);
+        $logsCollections = $collections['logs'] ?? [];
+        $logsCollections = array_keys($logsCollections);
+
        $database
            ->setDatabase(APP_DATABASE)
            ->setAuthorization($authorization)
            ->setSharedTables(true)
+            ->setGlobalCollections($logsCollections)
            ->setNamespace('logsV1')
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
@@ -197,9 +197,16 @@ return function (Container $container): void {
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
+                /** @var array $collections */
+                $collections = Config::getParam('collections', []);
+                $projectCollections = $collections['projects'] ?? [];
+                $projectsGlobalCollections = array_keys($projectCollections);
+                $projectsGlobalCollections[] = 'audit';
+
                $database
                    ->setSharedTables(true)
                    ->setTenant($project->getSequence())
+                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
                $database
@@ -216,6 +223,11 @@ return function (Container $container): void {
        $adapter = null;

        return function (?Document $project = null) use ($pools, $cache, $authorization, &$adapter) {
+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $logsCollections = $collections['logs'] ?? [];
+            $logsCollections = array_keys($logsCollections);
+
            $adapter ??= new DatabasePool($pools->get('logs'));
            $database = new Database($adapter, $cache);

@@ -223,6 +235,7 @@ return function (Container $container): void {
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setSharedTables(true)
+                ->setGlobalCollections($logsCollections)
                ->setNamespace('logsV1')
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
@@ -683,8 +696,15 @@ return function (Container $container): void {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setSharedTables(true)
+                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -1285,6 +1305,12 @@ return function (Container $container): void {
            $database = new Database($adapter, $cache);
            $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));

+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
@@ -1307,6 +1333,7 @@ return function (Container $container): void {
                if (\in_array($databaseHost, $dbTypeSharedTables)) {
                    $database
                        ->setSharedTables(true)
+                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($project->getSequence())
                        ->setNamespace($databaseDSN->getParam('namespace'));
                } else {
@@ -1318,6 +1345,7 @@ return function (Container $container): void {
            } elseif (\in_array($dsn->getHost(), $sharedTables)) {
                $database
                    ->setSharedTables(true)
+                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -14,6 +14,7 @@ use Appwrite\Utopia\Database\Documents\User;
 use Utopia\Audit\Adapter\Database as AdapterDatabase;
 use Utopia\Audit\Audit as UtopiaAudit;
 use Utopia\Cache\Cache;
+use Utopia\Config\Config;
 use Utopia\Console;
 use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
@@ -89,8 +90,15 @@ return function (Container $container): void {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setSharedTables(true)
+                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -129,8 +137,15 @@ return function (Container $container): void {
                $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

                if (\in_array($dsn->getHost(), $sharedTables)) {
+                    /** @var array $collections */
+                    $collections = Config::getParam('collections', []);
+                    $projectCollections = $collections['projects'] ?? [];
+                    $projectsGlobalCollections = array_keys($projectCollections);
+                    $projectsGlobalCollections[] = 'audit';
+
                    $database
                        ->setSharedTables(true)
+                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($project->getSequence())
                        ->setNamespace($dsn->getParam('namespace'));
                } else {
@@ -151,8 +166,15 @@ return function (Container $container): void {
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
+                /** @var array $collections */
+                $collections = Config::getParam('collections', []);
+                $projectCollections = $collections['projects'] ?? [];
+                $projectsGlobalCollections = array_keys($projectCollections);
+                $projectsGlobalCollections[] = 'audit';
+
                $database
                    ->setSharedTables(true)
+                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($project->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -209,6 +231,14 @@ return function (Container $container): void {

            $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));

+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
+            $database->setGlobalCollections($projectsGlobalCollections);
+
            // For separate pools (documentsdb/vectorsdb), check their own shared tables config.
            // If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
            if ($databaseHost !== $dsn->getHost()) {
@@ -221,6 +251,7 @@ return function (Container $container): void {
                if (\in_array($databaseHost, $dbTypeSharedTables)) {
                    $database
                        ->setSharedTables(true)
+                        ->setGlobalCollections($projectsGlobalCollections)
                        ->setTenant($projectDocument->getSequence())
                        ->setNamespace($databaseDSN->getParam('namespace'));
                } else {
@@ -232,6 +263,7 @@ return function (Container $container): void {
            } elseif (\in_array($dsn->getHost(), $sharedTables, true)) {
                $database
                    ->setSharedTables(true)
+                    ->setGlobalCollections($projectsGlobalCollections)
                    ->setTenant($projectDocument->getSequence())
                    ->setNamespace($dsn->getParam('namespace'));
            } else {
@@ -256,6 +288,11 @@ return function (Container $container): void {
                return $database;
            }

+            /** @var array $collections */
+            $collections = Config::getParam('collections', []);
+            $logsCollections = $collections['logs'] ?? [];
+            $logsCollections = array_keys($logsCollections);
+
            $adapter = new DatabasePool($pools->get('logs'));
            $database = new Database($adapter, $cache);

@@ -263,6 +300,7 @@ return function (Container $container): void {
                ->setDatabase(APP_DATABASE)
                ->setAuthorization($authorization)
                ->setSharedTables(true)
+                ->setGlobalCollections($logsCollections)
                ->setNamespace('logsV1')
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
@@ -130,8 +130,14 @@ if (!function_exists('getProjectDB')) {
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

        if (\in_array($dsn->getHost(), $sharedTables)) {
+            $collections = Config::getParam('collections', []);
+            $projectCollections = $collections['projects'] ?? [];
+            $projectsGlobalCollections = array_keys($projectCollections);
+            $projectsGlobalCollections[] = 'audit';
+
            $database
                ->setSharedTables(true)
+                ->setGlobalCollections($projectsGlobalCollections)
                ->setTenant($project->getSequence())
                ->setNamespace($dsn->getParam('namespace'));
        } else {
@@ -3351,16 +3351,16 @@
        },
        {
            "name": "utopia-php/abuse",
-            "version": "1.2.2",
+            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "20bee84fd14dbe81d50ecabf1ffd81cceca06152"
+                "reference": "53f4274939353522ba331f55bcff6e6011ffc56c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/20bee84fd14dbe81d50ecabf1ffd81cceca06152",
-                "reference": "20bee84fd14dbe81d50ecabf1ffd81cceca06152",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/53f4274939353522ba331f55bcff6e6011ffc56c",
+                "reference": "53f4274939353522ba331f55bcff6e6011ffc56c",
                "shasum": ""
            },
            "require": {
@@ -3397,9 +3397,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/1.2.2"
+                "source": "https://github.com/utopia-php/abuse/tree/1.2.3"
            },
-            "time": "2026-02-02T10:43:10+00:00"
+            "time": "2026-04-29T11:19:08+00:00"
        },
        {
            "name": "utopia-php/agents",
@@ -3850,16 +3850,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "5.3.22",
+            "version": "5.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "d765945da6b3141852014b2f96ecf1fe7e3d6ba7"
+                "reference": "688d9422b5ff42ac2ecc29397d94891cfd772e93"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/d765945da6b3141852014b2f96ecf1fe7e3d6ba7",
-                "reference": "d765945da6b3141852014b2f96ecf1fe7e3d6ba7",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/688d9422b5ff42ac2ecc29397d94891cfd772e93",
+                "reference": "688d9422b5ff42ac2ecc29397d94891cfd772e93",
                "shasum": ""
            },
            "require": {
@@ -3903,9 +3903,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/5.3.22"
+                "source": "https://github.com/utopia-php/database/tree/5.4.1"
            },
-            "time": "2026-04-20T07:12:46+00:00"
+            "time": "2026-04-29T07:32:59+00:00"
        },
        {
            "name": "utopia-php/detector",
@@ -4062,16 +4062,16 @@
        },
        {
            "name": "utopia-php/domains",
-            "version": "1.0.5",
+            "version": "1.0.6",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/domains.git",
-                "reference": "0edf6bb2b07f30db849a267027077bf5abb994c6"
+                "reference": "c87ba0a1da4cbf75d2cff9d3ea0262b78f1d86f6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/domains/zipball/0edf6bb2b07f30db849a267027077bf5abb994c6",
-                "reference": "0edf6bb2b07f30db849a267027077bf5abb994c6",
+                "url": "https://api.github.com/repos/utopia-php/domains/zipball/c87ba0a1da4cbf75d2cff9d3ea0262b78f1d86f6",
+                "reference": "c87ba0a1da4cbf75d2cff9d3ea0262b78f1d86f6",
                "shasum": ""
            },
            "require": {
@@ -4118,9 +4118,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/domains/issues",
-                "source": "https://github.com/utopia-php/domains/tree/1.0.5"
+                "source": "https://github.com/utopia-php/domains/tree/1.0.6"
            },
-            "time": "2026-03-03T09:20:50+00:00"
+            "time": "2026-04-29T11:08:10+00:00"
        },
        {
            "name": "utopia-php/dsn",
@@ -4476,16 +4476,16 @@
        },
        {
            "name": "utopia-php/migration",
-            "version": "1.9.4",
+            "version": "1.9.5",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/migration.git",
-                "reference": "969dc9477ea962f16da9254facdbd8944cf13477"
+                "reference": "952a4dfe232702f80e45c35129466a8d8cb4c599"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/969dc9477ea962f16da9254facdbd8944cf13477",
-                "reference": "969dc9477ea962f16da9254facdbd8944cf13477",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/952a4dfe232702f80e45c35129466a8d8cb4c599",
+                "reference": "952a4dfe232702f80e45c35129466a8d8cb4c599",
                "shasum": ""
            },
            "require": {
@@ -4525,9 +4525,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/1.9.4"
+                "source": "https://github.com/utopia-php/migration/tree/1.9.5"
            },
-            "time": "2026-04-27T12:42:51+00:00"
+            "time": "2026-04-29T11:19:13+00:00"
        },
        {
            "name": "utopia-php/mongo",
@@ -4966,16 +4966,16 @@
        },
        {
            "name": "utopia-php/storage",
-            "version": "2.0.0",
+            "version": "2.0.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/storage.git",
-                "reference": "52d1f89a47165ef0d3deff63043cda182175adfb"
+                "reference": "8a2e3a86fd01aaed675884146665308c2122264e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/52d1f89a47165ef0d3deff63043cda182175adfb",
-                "reference": "52d1f89a47165ef0d3deff63043cda182175adfb",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/8a2e3a86fd01aaed675884146665308c2122264e",
+                "reference": "8a2e3a86fd01aaed675884146665308c2122264e",
                "shasum": ""
            },
            "require": {
@@ -5012,9 +5012,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/2.0.0"
+                "source": "https://github.com/utopia-php/storage/tree/2.0.1"
            },
-            "time": "2026-04-27T11:39:32+00:00"
+            "time": "2026-04-29T09:05:48+00:00"
        },
        {
            "name": "utopia-php/system",
@@ -6167,11 +6167,11 @@
        },
        {
            "name": "phpstan/phpstan",
-            "version": "2.1.52",
+            "version": "2.1.54",
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/08a34f8db7ca4daabff74a474fe13c0e56e2b4e5",
-                "reference": "08a34f8db7ca4daabff74a474fe13c0e56e2b4e5",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
+                "reference": "8be50c3992107dc837b17da4d140fbbdf9a5c5bd",
                "shasum": ""
            },
            "require": {
@@ -6216,7 +6216,7 @@
                    "type": "github"
                }
            ],
-            "time": "2026-04-28T12:17:53+00:00"
+            "time": "2026-04-29T13:31:09+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
@@ -8390,7 +8390,7 @@
    ],
    "aliases": [],
    "minimum-stability": "dev",
-    "stability-flags": {},
+    "stability-flags": [],
    "prefer-stable": true,
    "prefer-lowest": false,
    "platform": {
@@ -8411,5 +8411,5 @@
    "platform-dev": {
        "ext-fileinfo": "*"
    },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }
@@ -54,9 +54,9 @@ class XList extends Action
        $actions = OAuth2Base::getProviderActions();

        $providers = [];
-        foreach ($actions as $providerId => $updateClass) {
-            $config = $providersConfig[$providerId] ?? null;
-            if ($config === null) {
+        foreach ($providersConfig as $providerId => $config) {
+            $updateClass = $actions[$providerId] ?? null;
+            if ($updateClass === null) {
                continue;
            }
            if (!($config['enabled'] ?? false)) {
@@ -146,13 +146,14 @@ class Update extends Base
    {
        $providerId = static::getProviderId();
        $oAuthProviders = $project->getAttribute('oAuthProviders', []);
+        $storedSecret = $this->decodeStoredSecret($project);

        return new Document([
            '$id' => $providerId,
            'enabled' => $oAuthProviders[$providerId . 'Enabled'] ?? false,
            static::getClientIdParamName() => $oAuthProviders[$providerId . 'Appid'] ?? '',
-            'keyId' => '',
-            'teamId' => '',
+            'keyId' => $storedSecret['keyID'] ?? '',
+            'teamId' => $storedSecret['teamID'] ?? '',
            'p8File' => '',
        ]);
    }
@@ -56,6 +56,8 @@ class ConsoleConsoleClientTest extends Scope
        $this->assertEquals($response['body']['total'], \count($response['body']['oAuth2Providers']));

        $providerIds = \array_column($response['body']['oAuth2Providers'], '$id');
+        $this->assertEquals('amazon', $providerIds[0]);
+        $this->assertEquals('zoom', $providerIds[\count($providerIds) - 1]);

        // Well-known providers must be present
        $this->assertContains('github', $providerIds);
@@ -478,9 +478,8 @@ trait OAuth2Base
        $this->assertSame(200, $response['headers']['status-code']);
        $this->assertSame('apple', $response['body']['$id']);
        $this->assertSame('ip.appwrite.app.web', $response['body']['serviceId']);
-        // keyId / teamId / p8File are write-only — PATCH response must not echo them back.
-        $this->assertSame('', $response['body']['keyId']);
-        $this->assertSame('', $response['body']['teamId']);
+        $this->assertSame('P4000000N8', $response['body']['keyId']);
+        $this->assertSame('D4000000R6', $response['body']['teamId']);
        $this->assertSame('', $response['body']['p8File']);
        $this->assertSame(false, $response['body']['enabled']);

@@ -511,12 +510,10 @@ trait OAuth2Base
        ]);

        $this->assertSame(200, $response['headers']['status-code']);
-        // serviceId is the (non-secret) clientId; keyId/teamId are write-only
-        // and must not surface in the response. Persistence of the merged
-        // values is verified separately via the enable-after-merge tests.
        $this->assertSame('ip.appwrite.app.seed', $response['body']['serviceId']);
-        $this->assertSame('', $response['body']['keyId']);
-        $this->assertSame('', $response['body']['teamId']);
+        $this->assertSame('KEYUPDATED', $response['body']['keyId']);
+        $this->assertSame('TEAMSEED01', $response['body']['teamId']);
+        $this->assertSame('', $response['body']['p8File']);

        // Cleanup
        $this->updateOAuth2('apple', [
@@ -546,9 +543,9 @@ trait OAuth2Base
            'teamId' => 'TEAMROTATED',
        ]);
        $this->assertSame(200, $teamOnly['headers']['status-code']);
-        // teamId is write-only; verify only the non-secret serviceId echo.
-        // The actual merge is validated by the enable-after-merge call below.
-        $this->assertSame('', $teamOnly['body']['teamId']);
+        $this->assertSame('TEAMROTATED', $teamOnly['body']['teamId']);
+        $this->assertSame('KEYMERGE01', $teamOnly['body']['keyId']);
+        $this->assertSame('', $teamOnly['body']['p8File']);
        $this->assertSame('ip.appwrite.app.merge', $teamOnly['body']['serviceId']);

        // Patch only `serviceId` — keyId/teamId/p8File live in the JSON blob
@@ -669,9 +666,8 @@ trait OAuth2Base

        $this->assertSame(200, $response['headers']['status-code']);
        $this->assertSame('ip.appwrite.app.read', $response['body']['serviceId']);
-        // All three secret-bearing fields must be hidden on read.
-        $this->assertSame('', $response['body']['keyId']);
-        $this->assertSame('', $response['body']['teamId']);
+        $this->assertSame('KEYREAD', $response['body']['keyId']);
+        $this->assertSame('TEAMREAD', $response['body']['teamId']);
        $this->assertSame('', $response['body']['p8File']);

        // Cleanup
@@ -699,13 +695,13 @@ trait OAuth2Base
        $this->assertSame(200, $update['headers']['status-code']);
        $this->assertTrue($update['body']['enabled']);

-        // GET must hide all three secret-bearing fields while keeping serviceId.
+        // GET must hide p8File while keeping the non-secret fields.
        $get = $this->getOAuth2Provider('apple');
        $this->assertSame(200, $get['headers']['status-code']);
        $this->assertTrue($get['body']['enabled']);
        $this->assertSame('ip.appwrite.app.enable', $get['body']['serviceId']);
-        $this->assertSame('', $get['body']['keyId']);
-        $this->assertSame('', $get['body']['teamId']);
+        $this->assertSame('ENABLEKEY', $get['body']['keyId']);
+        $this->assertSame('ENABLETEAM', $get['body']['teamId']);
        $this->assertSame('', $get['body']['p8File']);

        // Cleanup