Merge remote-tracking branch 'origin/1.5.x' into feat-smtp-test

app/config/locale/templates/email-base-styled.tpl

@@ -126,7 +126,7 @@
                     <td>
                         <img
                             height="32px"
-                            src="https://appwrite.io/assets/logotype/white.png"
+                            src="https://cloud.appwrite.io/images/mails/logo.png"
                         />
                     </td>
                 </tr>
@@ -168,7 +168,7 @@
                             class="social-icon"
                             title="Twitter"
                         >
-                            <img src="https://appwrite.io/email/x.png" height="24" width="24" />
+                            <img src="https://cloud.appwrite.io/images/mails/x.png" height="24" width="24" />
                         </a>
                     </td>
                     <td style="padding-left: 4px; padding-right: 4px">
@@ -176,7 +176,7 @@
                             href="https://appwrite.io/discord"
                             class="social-icon"
                         >
-                            <img src="https://appwrite.io/email/discord.png" height="24" width="24" />
+                            <img src="https://cloud.appwrite.io/images/mails/discord.png" height="24" width="24" />
                         </a>
                     </td>
                     <td style="padding-left: 4px; padding-right: 4px">
@@ -184,7 +184,7 @@
                             href="https://github.com/appwrite/appwrite"
                             class="social-icon"
                         >
-                            <img src="https://appwrite.io/email/github.png" height="24" width="24" />
+                            <img src="https://cloud.appwrite.io/images/mails/github.png" height="24" width="24" />
                         </a>
                     </td>
                 </tr>

app/controllers/api/account.php

@@ -46,6 +46,7 @@ use Utopia\Validator\WhiteList;
 use Appwrite\Auth\Validator\PasswordHistory;
 use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PersonalData;
+use Appwrite\Event\Delete;
 use Appwrite\Event\Messaging;
 
 $oauthDefaultSuccess = '/auth/oauth2/success';
@@ -3466,3 +3467,40 @@ App::put('/v1/account/targets/:targetId/push')
         $response
             ->dynamic($target, Response::MODEL_TARGET);
     });
+
+App::delete('/v1/account')
+    ->desc('Delete account')
+    ->groups(['api', 'account'])
+    ->label('event', 'users.[userId].delete')
+    ->label('scope', 'accounts.write')
+    ->label('audits.event', 'user.delete')
+    ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.delete')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'account')
+    ->label('sdk.method', 'delete')
+    ->label('sdk.description', '/docs/references/account/delete.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
+    ->inject('user')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('queueForEvents')
+    ->inject('queueForDeletes')
+    ->action(function (Document $user, Response $response, Database $dbForProject, Event $queueForEvents, Delete $queueForDeletes) {
+        if ($user->isEmpty()) {
+            throw new Exception(Exception::USER_NOT_FOUND);
+        }
+
+        $dbForProject->deleteDocument('users', $user->getId());
+
+        $queueForDeletes
+            ->setType(DELETE_TYPE_DOCUMENT)
+            ->setDocument($user);
+
+        $queueForEvents
+            ->setParam('userId', $user->getId())
+            ->setPayload($response->output($user, Response::MODEL_USER));
+
+        $response->noContent();
+    });

docs/references/account/delete.md

@@ -0,0 +1 @@
+Delete the currently logged in user.

tests/e2e/Services/Account/AccountBase.php

@@ -130,6 +130,48 @@ trait AccountBase
         ];
     }
 
+    public function testDeleteAccount(): void
+    {
+        $email = uniqid() . 'user@localhost.test';
+        $password = 'password';
+        $name = 'User Name';
+
+        $response = $this->client->call(Client::METHOD_POST, '/account', array_merge([
+            'origin' => 'http://localhost',
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ]), [
+            'userId' => ID::unique(),
+            'email' => $email,
+            'password' => $password,
+            'name' => $name,
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 201);
+
+        $response = $this->client->call(Client::METHOD_POST, '/account/sessions/email', 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 = $response['cookies']['a_session_' . $this->getProject()['$id']];
+
+        $response = $this->client->call(Client::METHOD_DELETE, '/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'], 204);
+    }
+
     public function testEmailOTPSession(): void
     {
         $response = $this->client->call(Client::METHOD_POST, '/account/tokens/email', array_merge([

tests/e2e/Services/Account/AccountCustomClientTest.php

@@ -7,11 +7,9 @@ use Tests\E2E\Client;
 use Tests\E2E\Scopes\Scope;
 use Tests\E2E\Scopes\ProjectCustom;
 use Tests\E2E\Scopes\SideClient;
-use Utopia\App;
 use Utopia\Database\DateTime;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
-use Utopia\DSN\DSN;
 
 use function sleep;