fix: tests and generate specs

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

@@ -18,7 +18,7 @@ public class MainActivity extends AppCompatActivity {
 
         Account account = new Account(client);
 
-        account.delete(new Continuation<Object>() {
+        account.updateStatus(new Continuation<Object>() {
             @NotNull
             @Override
             public CoroutineContext getContext() {

docs/examples/0.14.x/client-android/kotlin/account/update-status.md

@@ -17,7 +17,7 @@ class MainActivity : AppCompatActivity() {
         val account = Account(client)
 
         GlobalScope.launch {
-            val response = account.delete()
+            val response = account.updateStatus()
             val json = response.body?.string()        
         }
     }

docs/examples/0.14.x/client-apple/examples/account/update-status.md

@@ -5,7 +5,7 @@ func main() async throws {
       .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
       .setProject("5df5acd0d48c2") // Your project ID
     let account = Account(client)
-    let result = try await account.delete()
+    let user = try await account.updateStatus()
 
-    print(String(describing: result)
+    print(String(describing: user)
 }

docs/examples/0.14.x/client-flutter/examples/account/update-status.md

@@ -8,7 +8,7 @@ void main() { // Init SDK
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
   ;
-  Future result = account.delete();
+  Future result = account.updateStatus();
 
   result
     .then((response) {

docs/examples/0.14.x/client-web/examples/account/update-status.md

@@ -0,0 +1,14 @@
+const sdk = new Appwrite();
+
+sdk
+    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setProject('5df5acd0d48c2') // Your project ID
+;
+
+let promise = sdk.account.updateStatus();
+
+promise.then(function (response) {
+    console.log(response); // Success
+}, function (error) {
+    console.log(error); // Failure
+});

docs/examples/0.14.x/console-cli/examples/account/delete.md

@@ -1 +0,0 @@
-appwrite account delete

docs/examples/0.14.x/console-cli/examples/account/update-status.md

@@ -0,0 +1 @@
+appwrite account updateStatus

docs/examples/0.14.x/console-web/examples/account/update-status.md

@@ -0,0 +1,14 @@
+const sdk = new Appwrite();
+
+sdk
+    .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
+    .setProject('5df5acd0d48c2') // Your project ID
+;
+
+let promise = sdk.account.updateStatus();
+
+promise.then(function (response) {
+    console.log(response); // Success
+}, function (error) {
+    console.log(error); // Failure
+});

docs/examples/0.14.x/server-dart/examples/account/update-status.md

@@ -10,7 +10,7 @@ void main() { // Init SDK
     .setJWT('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') // Your secret JSON Web Token
   ;
 
-  Future result = account.delete();
+  Future result = account.updateStatus();
 
   result
     .then((response) {

docs/examples/0.14.x/server-deno/examples/account/update-status.md

@@ -12,7 +12,7 @@ client
 ;
 
 
-let promise = account.delete();
+let promise = account.updateStatus();
 
 promise.then(function (response) {
     console.log(response);

docs/examples/0.14.x/server-kotlin/java/account/update-status.md

@@ -8,7 +8,7 @@ public void main() {
         .setJWT("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ..."); // Your secret JSON Web Token
 
     Account account = new Account(client);
-    account.delete(new Continuation<Response>() {
+    account.updateStatus(new Continuation<Response>() {
         @NotNull
         @Override
         public CoroutineContext getContext() {

docs/examples/0.14.x/server-kotlin/kotlin/account/update-status.md

@@ -8,6 +8,6 @@ suspend fun main() {
       .setJWT("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...") // Your secret JSON Web Token
 
     val account = Account(client)
-    val response = account.delete()
+    val response = account.updateStatus()
     val json = response.body?.string()
 }

docs/examples/0.14.x/server-nodejs/examples/account/update-status.md

@@ -11,7 +11,7 @@ client
     .setJWT('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') // Your secret JSON Web Token
 ;
 
-let promise = account.delete();
+let promise = account.updateStatus();
 
 promise.then(function (response) {
     console.log(response);

docs/examples/0.14.x/server-php/examples/account/update-status.md

@@ -13,4 +13,4 @@ $client
 
 $account = new Account($client);
 
-$result = $account->delete();
+$result = $account->updateStatus();

docs/examples/0.14.x/server-python/examples/account/update-status.md

@@ -11,4 +11,4 @@ client = Client()
 
 account = Account(client)
 
-result = account.delete()
+result = account.update_status()

docs/examples/0.14.x/server-ruby/examples/account/update-status.md

@@ -9,6 +9,6 @@ client
 
 account = Appwrite::Account.new(client)
 
-response = account.delete()
+response = account.update_status()
 
 puts response.inspect

docs/examples/0.14.x/server-swift/examples/account/update-status.md

@@ -6,7 +6,7 @@ func main() async throws {
       .setProject("5df5acd0d48c2") // Your project ID
       .setJWT("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...") // Your secret JSON Web Token
     let account = Account(client)
-    let result = try await account.delete()
+    let user = try await account.updateStatus()
 
-    print(String(describing: result)
+    print(String(describing: user)
 }

docs/references/account/delete.md

@@ -1 +0,0 @@
-Delete a currently logged in user account. Behind the scene, the user record is not deleted but permanently blocked from any access. This is done to avoid deleted accounts being overtaken by new users with the same email address. Any user-related resources like documents or storage files should be deleted separately.

docs/references/account/update-status.md

@@ -0,0 +1 @@
+Block the currently logged in user account. Behind the scene, the user record is not deleted but permanently blocked from any access. To completely delete a user, use the Users API instead.

docs/references/users/delete.md

@@ -1 +1 @@
-Delete a user by its unique ID.
+Delete a user by its unique ID, thereby releasing it's ID. Since ID is released and can be reused, all user-related resources like documents or storage files should be deleted before user deletion. If you want to keep ID reserved, use the [updateStatus](/docs/server/users#usersUpdateStatus) endpoint instead.

docs/references/users/update-user-status.md

@@ -1 +1 @@
-Update the user status by its unique ID.
+Update the user status by its unique ID. Use this endpoint as an alternative to deleting a user if you want to keep user's ID reserved.

phpunit.xml

@@ -6,7 +6,7 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false"
+         stopOnFailure="true"
         >
     <extensions>
         <extension class="Appwrite\Tests\TestHook" />

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -17,7 +17,7 @@ class AccountCustomClientTest extends Scope
     /**
      * @depends testCreateAccountSession
      */
-    public function testCreateOAuth2AccountSession():array
+    public function testCreateOAuth2AccountSession(): array
     {
         $provider = 'mock';
         $appId = '1';
@@ -26,7 +26,7 @@ class AccountCustomClientTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $response = $this->client->call(Client::METHOD_PATCH, '/projects/'.$this->getProject()['$id'].'/oauth2', array_merge([
+        $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $this->getProject()['$id'] . '/oauth2', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => 'console',
@@ -39,7 +39,7 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals($response['headers']['status-code'], 200);
 
-        $response = $this->client->call(Client::METHOD_GET, '/account/sessions/oauth2/'.$provider, array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/account/sessions/oauth2/' . $provider, array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
@@ -54,9 +54,9 @@ class AccountCustomClientTest extends Scope
         return [];
     }
 
-    public function testBlockedAccount():array
+    public function testBlockedAccount(): array
     {
-        $email = uniqid().'user@localhost.test';
+        $email = uniqid() . 'user@localhost.test';
         $password = 'password';
         $name = 'User Name (blocked)';
 
@@ -77,7 +77,7 @@ class AccountCustomClientTest extends Scope
         $id = $response['body']['$id'];
 
         $this->assertEquals($response['headers']['status-code'], 201);
-    
+
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
@@ -90,13 +90,13 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals($response['headers']['status-code'], 201);
 
         $sessionId = $response['body']['$id'];
-        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_'.$this->getProject()['$id']];
+        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_' . $this->getProject()['$id']];
 
         $response = $this->client->call(Client::METHOD_GET, '/account', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -115,7 +115,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 401);
@@ -134,9 +134,89 @@ class AccountCustomClientTest extends Scope
         return [];
     }
 
-    public function testCreateJWT():array
+
+    public function testSelfBlockedAccount(): array
     {
-        $email = uniqid().'user@localhost.test';
+        $email = uniqid() . 'user55@localhost.test';
+        $password = 'password';
+        $name = 'User Name (self blocked)';
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_POST, '/account', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ]), [
+            'userId' => 'unique()',
+            'email' => $email,
+            'password' => $password,
+            'name' => $name,
+        ]);
+
+        $id = $response['body']['$id'];
+
+        $this->assertEquals($response['headers']['status-code'], 201);
+
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ]), [
+            'email' => $email,
+            'password' => $password,
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 201);
+
+        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_' . $this->getProject()['$id']];
+
+        $response = $this->client->call(Client::METHOD_GET, '/account', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ]));
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+
+        $response = $this->client->call(Client::METHOD_PATCH, '/account/status', [
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ], [
+            'status' => false,
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+
+        $response = $this->client->call(Client::METHOD_GET, '/account', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+        ]));
+
+        $this->assertEquals($response['headers']['status-code'], 401);
+
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ]), [
+            'email' => $email,
+            'password' => $password,
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 401);
+
+        return [];
+    }
+
+    public function testCreateJWT(): array
+    {
+        $email = uniqid() . 'user@localhost.test';
         $password = 'password';
         $name = 'User Name (JWT)';
 
@@ -157,7 +237,7 @@ class AccountCustomClientTest extends Scope
         $id = $response['body']['$id'];
 
         $this->assertEquals($response['headers']['status-code'], 201);
-    
+
         $response = $this->client->call(Client::METHOD_POST, '/account/sessions', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
@@ -170,13 +250,13 @@ class AccountCustomClientTest extends Scope
         $this->assertEquals($response['headers']['status-code'], 201);
 
         $sessionId = $response['body']['$id'];
-        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_'.$this->getProject()['$id']];
+        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_' . $this->getProject()['$id']];
 
         $response = $this->client->call(Client::METHOD_GET, '/account', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -185,7 +265,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 201);
@@ -212,11 +292,11 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals($response['headers']['status-code'], 200);
 
-        $response = $this->client->call(Client::METHOD_DELETE, '/account/sessions/'.$sessionId, array_merge([
+        $response = $this->client->call(Client::METHOD_DELETE, '/account/sessions/' . $sessionId, array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 204);
@@ -249,7 +329,7 @@ class AccountCustomClientTest extends Scope
         $this->assertNotEmpty($response['body']);
         $this->assertNotEmpty($response['body']['$id']);
 
-        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_'.$this->getProject()['$id']];
+        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_' . $this->getProject()['$id']];
 
         /**
          * Test for FAILURE
@@ -258,7 +338,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]);
 
         $this->assertEquals(401, $response['headers']['status-code']);
@@ -278,7 +358,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'oldPassword' => '',
         ]);
@@ -293,7 +373,7 @@ class AccountCustomClientTest extends Scope
      */
     public function testUpdateAnonymousAccountEmail($session)
     {
-        $email = uniqid().'new@localhost.test';
+        $email = uniqid() . 'new@localhost.test';
 
         /**
          * Test for FAILURE
@@ -302,7 +382,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'email' => $email,
             'password' => '',
@@ -316,7 +396,7 @@ class AccountCustomClientTest extends Scope
     public function testConvertAnonymousAccount()
     {
         $session = $this->testCreateAnonymousAccount();
-        $email = uniqid().'new@localhost.test';
+        $email = uniqid() . 'new@localhost.test';
         $password = 'new-password';
 
         /**
@@ -336,7 +416,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'email' => $email,
             'password' => $password,
@@ -347,13 +427,13 @@ class AccountCustomClientTest extends Scope
         /**
          * Test for SUCCESS
          */
-        $email = uniqid().'new@localhost.test';
+        $email = uniqid() . 'new@localhost.test';
 
         $response = $this->client->call(Client::METHOD_PATCH, '/account/email', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'email' => $email,
             'password' => $password,
@@ -394,14 +474,14 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 200);
 
         $userId = $response['body']['$id'] ?? '';
-        
-        $response = $this->client->call(Client::METHOD_PATCH, '/projects/'.$this->getProject()['$id'].'/oauth2', array_merge([
+
+        $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $this->getProject()['$id'] . '/oauth2', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => 'console',
@@ -414,26 +494,26 @@ class AccountCustomClientTest extends Scope
 
         $this->assertEquals($response['headers']['status-code'], 200);
 
-        $response = $this->client->call(Client::METHOD_GET, '/account/sessions/oauth2/'.$provider, array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/account/sessions/oauth2/' . $provider, array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]), [
             'success' => 'http://localhost/v1/mock/tests/general/oauth2/success',
             'failure' => 'http://localhost/v1/mock/tests/general/oauth2/failure',
         ]);
 
-        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_'.$this->getProject()['$id']];
+        $session = $this->client->parseCookie((string)$response['headers']['set-cookie'])['a_session_' . $this->getProject()['$id']];
 
         $this->assertEquals(200, $response['headers']['status-code']);
         $this->assertEquals('success', $response['body']['result']);
-        
+
         $response = $this->client->call(Client::METHOD_GET, '/account', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -449,7 +529,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -458,14 +538,14 @@ class AccountCustomClientTest extends Scope
         $this->assertGreaterThan(\time() + 14400 - 5, $response['body']['providerAccessTokenExpiry']); // 5 seconds allowed networking delay
 
         $initialExpiry = $response['body']['providerAccessTokenExpiry'];
-        
+
         sleep(3);
 
         $response = $this->client->call(Client::METHOD_PATCH, '/account/sessions/current', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals(200, $response['headers']['status-code']);
@@ -476,14 +556,15 @@ class AccountCustomClientTest extends Scope
         return [];
     }
 
-    public function testGetSessionByID() {
+    public function testGetSessionByID()
+    {
         $session = $this->testCreateAnonymousAccount();
 
         $response = $this->client->call(Client::METHOD_GET, '/account/sessions/current', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -491,11 +572,11 @@ class AccountCustomClientTest extends Scope
 
         $sessionID = $response['body']['$id'];
 
-        $response = $this->client->call(Client::METHOD_GET, '/account/sessions/'.$sessionID, array_merge([
+        $response = $this->client->call(Client::METHOD_GET, '/account/sessions/' . $sessionID, array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 200);
@@ -505,7 +586,7 @@ class AccountCustomClientTest extends Scope
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
-            'cookie' => 'a_session_'.$this->getProject()['$id'].'=' . $session,
+            'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
         $this->assertEquals($response['headers']['status-code'], 404);

tests/e2e/Services/Users/UsersCustomServerTest.php

@@ -12,49 +12,4 @@ class UsersCustomServerTest extends Scope
     use UsersBase;
     use ProjectCustom;
     use SideServer;
-
-    public function testDeprecatedUsers():array
-    {
-        /**
-         * Test for FAILURE (don't allow recreating account with same custom ID)
-         */
-
-        // Create user with custom ID 'meldiron'
-        $response = $this->client->call(Client::METHOD_POST, '/users', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'userId' => 'meldiron',
-            'email' => 'matej@appwrite.io',
-            'password' => 'my-superstr0ng-password',
-            'name' => 'Matej Bačo'
-        ]);
-
-        $this->assertEquals(201, $response['headers']['status-code']);
-
-        // Delete user with custom ID 'meldiron'
-        $response = $this->client->call(Client::METHOD_DELETE, '/users/meldiron', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()));
-
-        $this->assertEquals(204, $response['headers']['status-code']);
-
-        // Try to create user with custom ID 'meldiron' again, but now it should fail
-        $response1 = $this->client->call(Client::METHOD_POST, '/users', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'userId' => 'meldiron',
-            'email' => 'matej2@appwrite.io',
-            'password' => 'someones-superstr0ng-password',
-            'name' => 'Matej Bačo Second'
-        ]);
-
-        $this->assertEquals(409, $response1['headers']['status-code']);
-        $this->assertEquals('Account already exists', $response1['body']['message']);
-
-        return [];
-    }
-
 }

tests/e2e/Services/Webhooks/WebhooksCustomClientTest.php

@@ -101,15 +101,14 @@ class WebhooksCustomClientTest extends Scope
         $id = $account['body']['$id'];
         $session = $this->client->parseCookie((string)$accountSession['headers']['set-cookie'])['a_session_' . $this->getProject()['$id']];
 
-        $account = $this->client->call(Client::METHOD_DELETE, '/account', array_merge([
+        $account = $this->client->call(Client::METHOD_PATCH, '/account/status', array_merge([
             'origin' => 'http://localhost',
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
         ]));
 
-        $this->assertEquals($account['headers']['status-code'], 204);
-        $this->assertEmpty($account['body']);
+        $this->assertEquals($account['headers']['status-code'], 200);
 
         $webhook = $this->getLastRequest();
 
@@ -117,9 +116,9 @@ class WebhooksCustomClientTest extends Scope
         $this->assertEquals($webhook['headers']['Content-Type'], 'application/json');
         $this->assertEquals($webhook['headers']['User-Agent'], 'Appwrite-Server vdev. Please report abuse at security@appwrite.io');
         $this->assertStringContainsString('users.*', $webhook['headers']['X-Appwrite-Webhook-Events']);
-        $this->assertStringContainsString('users.*.delete', $webhook['headers']['X-Appwrite-Webhook-Events']);
+        $this->assertStringContainsString('users.*.update.status', $webhook['headers']['X-Appwrite-Webhook-Events']);
         $this->assertStringContainsString("users.{$id}", $webhook['headers']['X-Appwrite-Webhook-Events']);
-        $this->assertStringContainsString("users.{$id}.delete", $webhook['headers']['X-Appwrite-Webhook-Events']);
+        $this->assertStringContainsString("users.{$id}.update.status", $webhook['headers']['X-Appwrite-Webhook-Events']);
         $this->assertEquals($webhook['headers']['X-Appwrite-Webhook-Signature'], 'not-yet-implemented');
         $this->assertEquals($webhook['headers']['X-Appwrite-Webhook-Id'] ?? '', $this->getProject()['webhookId']);
         $this->assertEquals($webhook['headers']['X-Appwrite-Webhook-Project-Id'] ?? '', $this->getProject()['$id']);