Fix flakyness of account tests

app/init/registers.php

@@ -36,7 +36,8 @@ 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']);
+    PublicDomain::allow(['request-catcher-sms']);
+    PublicDomain::allow(['request-catcher-webhook']);
 }
 $register->set('logger', function () {
     // Register error logger

docker-compose.yml

@@ -323,7 +323,8 @@ services:
     depends_on:
       - redis
       - mariadb
-      - request-catcher
+      - request-catcher-sms
+      - request-catcher-webhook
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1075,15 +1076,24 @@ services:
     networks:
       - appwrite
 
-  request-catcher: # used mainly for dev tests
+  request-catcher-webhook: # used mainly for dev tests (mock HTTP webhook)
     image: appwrite/requestcatcher:1.0.0
-    container_name: appwrite-requestcatcher
+    container_name: appwrite-requestcatcher-webhook
     <<: *x-logging
     ports:
       - "9504:5000"
     networks:
       - appwrite
 
+  request-catcher-sms: # used mainly for dev tests (mock SMS auth secret)
+    image: appwrite/requestcatcher:1.0.0
+    container_name: appwrite-requestcatcher-sms
+    <<: *x-logging
+    ports:
+      - "9507:5000"
+    networks:
+      - appwrite
+
   adminer:
     image: adminer
     container_name: appwrite-adminer

tests/e2e/Scopes/ProjectCustom.php

@@ -140,7 +140,7 @@ trait ProjectCustom
                 'teams.*',
                 'users.*'
             ],
-            'url' => 'http://request-catcher:5000/webhook',
+            'url' => 'http://request-catcher-webhook:5000/',
             'security' => false,
         ]);
 

tests/e2e/Scopes/Scope.php

@@ -13,6 +13,9 @@ abstract class Scope extends TestCase
     use Retryable;
     use Async;
 
+    public const REQUEST_TYPE_WEBHOOK = 'webhook';
+    public const REQUEST_TYPE_SMS = 'sms';
+
     protected ?Client $client = null;
     protected string $endpoint = 'http://localhost/v1';
 
@@ -76,10 +79,16 @@ abstract class Scope extends TestCase
         return [];
     }
 
-    protected function assertLastRequest(callable $probe, $timeoutMs = 20_000, $waitMs = 500): array
+    protected function assertLastRequest(callable $probe, string $type, $timeoutMs = 20_000, $waitMs = 500): array
     {
-        $this->assertEventually(function () use (&$request, $probe) {
-            $request = json_decode(file_get_contents('http://request-catcher:5000/__last_request__'), true);
+        $hostname = match ($type) {
+            'webhook' => 'request-catcher-webhook',
+            'api' => 'request-catcher-api',
+            default => throw new \Exception('Invalid request catcher type.'),
+        };
+
+        $this->assertEventually(function () use (&$request, $probe, $hostname) {
+            $request = json_decode(file_get_contents('http://' . $hostname . ':5000/__last_request__'), true);
             $request['data'] = json_decode($request['data'], true);
 
             call_user_func($probe, $request);
@@ -88,11 +97,16 @@ abstract class Scope extends TestCase
         return $request;
     }
 
+    /**
+     * @deprecated Use assertLastRequest instead. Used only historically in webhook tests
+     */
     protected function getLastRequest(): array
     {
+        $hostname = 'request-catcher-webhook';
+
         sleep(2);
 
-        $request = json_decode(file_get_contents('http://request-catcher:5000/__last_request__'), true);
+        $request = json_decode(file_get_contents('http://' . $hostname . ':5000/__last_request__'), true);
         $request['data'] = json_decode($request['data'], true);
 
         return $request;

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -2065,14 +2065,13 @@ class AccountCustomClientTest extends Scope
         $userId = $response['body']['userId'];
 
         $smsRequest = $this->assertLastRequest(function (array $request) use ($number) {
-            $this->assertEquals('http://request-catcher:5000/mock-sms', $request['url']);
             $this->assertEquals('Appwrite Mock Message Sender', $request['headers']['User-Agent']);
             $this->assertEquals('username', $request['headers']['X-Username']);
             $this->assertEquals('password', $request['headers']['X-Key']);
             $this->assertEquals('POST', $request['method']);
             $this->assertEquals('+123456789', $request['data']['from']);
             $this->assertEquals($number, $request['data']['to']);
-        });
+        }, Scope::REQUEST_TYPE_SMS);
 
         $data['token'] = $smsRequest['data']['message'];
         $data['id'] = $userId;
@@ -2422,7 +2421,7 @@ class AccountCustomClientTest extends Scope
         $smsRequest = $this->assertLastRequest(function ($request) {
             $this->assertArrayHasKey('data', $request);
             $this->assertArrayHasKey('message', $request['data'], "Last request missing message: " . \json_encode($request));
-        });
+        }, Scope::REQUEST_TYPE_SMS);
 
         /**
          * Test for FAILURE