Merge pull request #6092 from appwrite/sync-master-into-1.5.x

Sync master into 1.5.x
2026-05-23 00:49:02 +00:00 · 2023-08-31 16:31:49 +03:00 · 2023-08-31 16:31:49 +03:00 · 0a289bce43
commit 0a289bce43
parent 145b0f586d 2e89837c13
3337 changed files with 61081 additions and 6188 deletions
--- a/.env
+++ b/.env
@ -1,12 +1,9 @@
 _APP_ENV=development
 _APP_LOCALE=en
-_APP_WORKER_PER_CORE=2
+_APP_WORKER_PER_CORE=6
 _APP_CONSOLE_WHITELIST_ROOT=disabled
 _APP_CONSOLE_WHITELIST_EMAILS=
-_APP_CONSOLE_WHITELIST_CODES=code-zero,code-one
 _APP_CONSOLE_WHITELIST_IPS=
-_APP_CONSOLE_INVITES=enabled
-_APP_CONSOLE_ROOT_SESSION=disabled
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
 _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
@ -14,8 +11,9 @@ _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
-_APP_DOMAIN=demo.appwrite.io
-_APP_DOMAIN_TARGET=demo.appwrite.io
+_APP_DOMAIN=localhost
+_APP_DOMAIN_FUNCTIONS=functions.localhost
+_APP_DOMAIN_TARGET=localhost
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
@ -26,26 +24,39 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_CONNECTIONS_MAX=3100
-_APP_POOL_CLIENTS=14
-_APP_CONNECTIONS_DB_PROJECT=db_fra1_02=mariadb://user:password@mariadb:3306/appwrite
-_APP_CONNECTIONS_DB_CONSOLE=db_fra1_01=mariadb://user:password@mariadb:3306/appwrite
-_APP_CONNECTIONS_CACHE=redis_fra1_01=redis://redis:6379
-_APP_CONNECTIONS_QUEUE=redis_fra1_01=redis://redis:6379
-_APP_CONNECTIONS_PUBSUB=redis_fra1_01=redis://redis:6379
-_APP_CONNECTIONS_STORAGE=local://localhost
+_APP_STORAGE_DEVICE=Local
+_APP_STORAGE_S3_ACCESS_KEY=
+_APP_STORAGE_S3_SECRET=
+_APP_STORAGE_S3_REGION=us-east-1
+_APP_STORAGE_S3_BUCKET=
+_APP_STORAGE_DO_SPACES_ACCESS_KEY=
+_APP_STORAGE_DO_SPACES_SECRET=
+_APP_STORAGE_DO_SPACES_REGION=us-east-1
+_APP_STORAGE_DO_SPACES_BUCKET=
+_APP_STORAGE_BACKBLAZE_ACCESS_KEY=
+_APP_STORAGE_BACKBLAZE_SECRET=
+_APP_STORAGE_BACKBLAZE_REGION=us-west-004
+_APP_STORAGE_BACKBLAZE_BUCKET=
+_APP_STORAGE_LINODE_ACCESS_KEY=
+_APP_STORAGE_LINODE_SECRET=
+_APP_STORAGE_LINODE_REGION=eu-central-1
+_APP_STORAGE_LINODE_BUCKET=
+_APP_STORAGE_WASABI_ACCESS_KEY=
+_APP_STORAGE_WASABI_SECRET=
+_APP_STORAGE_WASABI_REGION=eu-central-1
+_APP_STORAGE_WASABI_BUCKET=
 _APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
+_APP_INFLUXDB_HOST=influxdb
+_APP_INFLUXDB_PORT=8086
+_APP_STATSD_HOST=telegraf
+_APP_STATSD_PORT=8125
 _APP_SMTP_HOST=maildev
 _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
 _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
-_APP_USERS_STATS_RECIPIENTS=
-_APP_HAMSTER_INTERVAL=86400
-_APP_HAMSTER_TIME=21:00
-_APP_MIXPANEL_TOKEN=
 _APP_SMS_PROVIDER=sms://username:password@mock
 _APP_SMS_FROM=+123456789
 _APP_STORAGE_LIMIT=30000000
@ -54,32 +65,35 @@ _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
 _APP_FUNCTIONS_CPUS=1
-_APP_FUNCTIONS_MEMORY=512
+_APP_FUNCTIONS_MEMORY=1024
 _APP_FUNCTIONS_INACTIVE_THRESHOLD=600
 _APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
 _APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
+_APP_USAGE_AGGREGATION_INTERVAL=5
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
+_APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled
-_APP_USAGE_AGGREGATION_INTERVAL=30
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
 _APP_GRAPHQL_MAX_BATCH_SIZE=10
 _APP_GRAPHQL_MAX_COMPLEXITY=250
 _APP_GRAPHQL_MAX_DEPTH=3
-_APP_REGION=default
 _APP_DOCKER_HUB_USERNAME=
 _APP_DOCKER_HUB_PASSWORD=
-_APP_CONSOLE_GITHUB_SECRET=
-_APP_CONSOLE_GITHUB_APP_ID=
+_APP_VCS_GITHUB_APP_NAME=
+_APP_VCS_GITHUB_PRIVATE_KEY=""
+_APP_VCS_GITHUB_APP_ID=
+_APP_VCS_GITHUB_CLIENT_ID=
+_APP_VCS_GITHUB_CLIENT_SECRET=
+_APP_VCS_GITHUB_WEBHOOK_SECRET=
 _APP_MIGRATIONS_FIREBASE_CLIENT_ID=
 _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET=
-OPENAI_API_KEY=YOUR_OPENAI_API_KEY
+_APP_ASSISTANT_OPENAI_API_KEY=
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -49,7 +49,9 @@ jobs:
        sleep 30

    - name: Doctor
-      run: docker compose exec -T appwrite doctor
+      run:  |
+        docker compose logs appwrite
+        docker compose exec -T appwrite doctor

    - name: Environment Variables
      run:  docker compose exec -T appwrite vars
--- a/.gitmodules
+++ b/.gitmodules
@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = disallow-personal-data
+	branch = 3.0.2
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,19 @@
+# Version 1.4.1
+
+## Features
+
+- Add upgrade task [#6068](https://github.com/appwrite/appwrite/pull/6068)
+
+## Fixes
+
+- Fix VCS/migration/assistant scopes [#6071](https://github.com/appwrite/appwrite/pull/6071)
+- Add missing parameters required for custom email templates [#6077](https://github.com/appwrite/appwrite/pull/6077)
+- Fix `Call to a member function label() on null` error when using a custom domain [#6079](https://github.com/appwrite/appwrite/pull/6079)
+
+## Changes
+
+- Update console to 3.0.2 [#6071](https://github.com/appwrite/appwrite/pull/6071)
+
 # Version 1.4.0

 ## Features
@ -121,41 +137,6 @@
 - Get default region from environment on project create [#4780](https://github.com/appwrite/appwrite/pull/4780)
 - Fix french translation [#4782](https://github.com/appwrite/appwrite/pull/4782)
 - Fix max mimetype size [#4814](https://github.com/appwrite/appwrite/pull/4814)
- New usage metrics collection flow [#4770](https://github.com/appwrite/appwrite/pull/4770)
-  - Deprecated influxdb, telegraf containers and removed all of their occurrences from the code.
-  - Removed _APP_INFLUXDB_HOST, _APP_INFLUXDB_PORT, _APP_STATSD_HOST, _APP_STATSD_PORT env variables.
-  - Removed usage labels dependency.
-  - Dropped type attribute from stats collection.
-  - Usage metrics are processed via new usage worker.
-  - Metrics changes: 
-    - Storage
-      - deprecated
-        - filesCreate, filesRead, filesUpdate, filesDelete, bucketsCreate, bucketsRead, bucketsUpdate, bucketsDelete.
-      - renamed
-        - filesCount to filesTotal, storage to filesStorage, bucketsCount to bucketsTotal.
-    - Auth 
-        - deprecated
-          - usersCreate, usersRead, usersUpdate, usersDelete, sessionsCreate sessionsProviderCreate, sessionsDelete.
-        - renamed
-          - usersCount to usersTotal.
-        - added
-          - sessionsTotal.
-    - Databases
-      - deprecated
-        - databasesCreate, databasesRead, databasesDelete, documentsCreate, documentsRead, documentsUpdate, documentsDelete, collectionsCreate, collectionsRead, collectionsUpdate, collectionsDelete.
-      - renamed
-        - databasesCount to databasesTotal, collectionsCount to collectionsTotal, documentsCount to documentsTotal.
-    - Functions
-      - deprecated 
-        - executionsFailure, executionsSuccess, buildsFailure, buildsSuccess, executionsFailure, executionsSuccess.
-      - renamed
-        - executionsTime to executionsCompute, buildsTime to buildsCompute, documentsCount to documentsTotal.
-      - added
-        - functionsTotal, buildsStorage, deploymentsTotal, deploymentsStorage.
-    - Project
-      - renamed
-        - executions to executionsTotal, builds to buildsTotal, requests to requestsTotal, storage to filesStorage, buckets to bucketsTotal, users to usersTotal, documents to documentsTotal, collections to collectionsTotal, databases to databasesTotal.
-
 ## Bugs
 - Fix invited account verified status [#4776](https://github.com/appwrite/appwrite/pull/4776)

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -109,7 +109,9 @@ docker run --rm --interactive --tty \

 ### User Interface

-Appwrite uses an internal micro-framework called Litespeed.js to build simple UI components in vanilla JS and [less](http://lesscss.org/) for compiling CSS code. To apply any of your changes to the UI, use the `gulp build` or `gulp less` commands, and restart the Appwrite main container to load the new static files to memory using `docker compose restart appwrite`.
+Appwrite's UI is built with [Svelte](https://svelte.dev/), [Svelte Kit](https://kit.svelte.dev/), and the [Pink Design](https://github.com/appwrite/pink) component library. You can find the source code in the [Appwrite Console](https://github.com/appwrite/console) repository.
+
+To contribute to the UI, head to the [Contribution Guide](https://github.com/appwrite/console/blob/main/CONTRIBUTING.md) of Appwrite Console.

 ### Get Started

@ -238,6 +240,8 @@ Appwrite stack is a combination of a variety of open-source technologies and too

 - Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data).
 - MariaDB - for database storage and queries.
+- InfluxDB - for managing stats and time-series based data
+- Statsd - for sending data over UDP protocol (using Telegraf)
 - ClamAV - for validating and scanning storage files.
 - Imagemagick - for manipulating and managing image media files.
 - Webp - for better compression of images on supporting clients.
--- a/74
+++ b/74
@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
 RUN npm ci
 RUN npm run build

-FROM appwrite/base:0.4.2 as final
+FROM appwrite/base:0.4.3 as final

 LABEL maintainer="team@appwrite.io"

@ -43,14 +43,15 @@ ENV DOCKER_COMPOSE_VERSION=v2.5.0
 ENV _APP_SERVER=swoole \
    _APP_ENV=production \
    _APP_LOCALE=en \
+    _APP_WORKER_PER_CORE= \
    _APP_DOMAIN=localhost \
+    _APP_DOMAIN_FUNCTIONS=functions.localhost \
    _APP_DOMAIN_TARGET=localhost \
    _APP_HOME=https://appwrite.io \
    _APP_EDITION=community \
    _APP_CONSOLE_WHITELIST_ROOT=enabled \
    _APP_CONSOLE_WHITELIST_EMAILS= \
    _APP_CONSOLE_WHITELIST_IPS= \
-    _APP_CONSOLE_ROOT_SESSION= \
    _APP_SYSTEM_EMAIL_NAME= \
    _APP_SYSTEM_EMAIL_ADDRESS= \
    _APP_SYSTEM_RESPONSE_FORMAT= \
@ -62,6 +63,27 @@ ENV _APP_SERVER=swoole \
    _APP_STORAGE_ANTIVIRUS=enabled \
    _APP_STORAGE_ANTIVIRUS_HOST=clamav \
    _APP_STORAGE_ANTIVIRUS_PORT=3310 \
+    _APP_STORAGE_DEVICE=Local \
+    _APP_STORAGE_S3_ACCESS_KEY= \
+    _APP_STORAGE_S3_SECRET= \
+    _APP_STORAGE_S3_REGION= \
+    _APP_STORAGE_S3_BUCKET= \
+    _APP_STORAGE_DO_SPACES_ACCESS_KEY= \
+    _APP_STORAGE_DO_SPACES_SECRET= \
+    _APP_STORAGE_DO_SPACES_REGION= \
+    _APP_STORAGE_DO_SPACES_BUCKET= \
+    _APP_STORAGE_BACKBLAZE_ACCESS_KEY= \
+    _APP_STORAGE_BACKBLAZE_SECRET= \
+    _APP_STORAGE_BACKBLAZE_REGION= \
+    _APP_STORAGE_BACKBLAZE_BUCKET= \
+    _APP_STORAGE_LINODE_ACCESS_KEY= \
+    _APP_STORAGE_LINODE_SECRET= \
+    _APP_STORAGE_LINODE_REGION= \
+    _APP_STORAGE_LINODE_BUCKET= \
+    _APP_STORAGE_WASABI_ACCESS_KEY= \
+    _APP_STORAGE_WASABI_SECRET= \
+    _APP_STORAGE_WASABI_REGION= \
+    _APP_STORAGE_WASABI_BUCKET= \
    _APP_REDIS_HOST=redis \
    _APP_REDIS_PORT=6379 \
    _APP_DB_HOST=mariadb \
@ -69,22 +91,45 @@ ENV _APP_SERVER=swoole \
    _APP_DB_USER=root \
    _APP_DB_PASS=password \
    _APP_DB_SCHEMA=appwrite \
+    _APP_INFLUXDB_HOST=influxdb \
+    _APP_INFLUXDB_PORT=8086 \
+    _APP_STATSD_HOST=telegraf \
+    _APP_STATSD_PORT=8125 \
+    _APP_SMTP_HOST= \
+    _APP_SMTP_PORT= \
+    _APP_SMTP_SECURE= \
+    _APP_SMTP_USERNAME= \
+    _APP_SMTP_PASSWORD= \
+    _APP_SMS_PROVIDER= \
+    _APP_SMS_FROM= \
    _APP_FUNCTIONS_SIZE_LIMIT=30000000 \
    _APP_FUNCTIONS_TIMEOUT=900 \
+    _APP_FUNCTIONS_CONTAINERS=10 \
    _APP_FUNCTIONS_CPUS=1 \
    _APP_FUNCTIONS_MEMORY=128 \
+    _APP_FUNCTIONS_MEMORY_SWAP=128 \
    _APP_EXECUTOR_SECRET=a-random-secret \
-    _APP_EXECUTOR_HOST=http://exc1/v1 \
+    _APP_EXECUTOR_HOST=http://appwrite-executor/v1 \
+    _APP_EXECUTOR_RUNTIME_NETWORK=appwrite_runtimes \
    _APP_SETUP=self-hosted \
    _APP_VERSION=$VERSION \
    _APP_USAGE_STATS=enabled \
+    _APP_USAGE_AGGREGATION_INTERVAL=30 \
    # 14 Days = 1209600 s
    _APP_MAINTENANCE_RETENTION_EXECUTION=1209600 \
    _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
    # 1 Day = 86400 s
    _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
    _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000 \
-    _APP_MAINTENANCE_INTERVAL=86400
+    _APP_MAINTENANCE_INTERVAL=86400 \
+    _APP_LOGGING_PROVIDER= \
+    _APP_LOGGING_CONFIG= \
+    _APP_VCS_GITHUB_APP_NAME= \
+    _APP_VCS_GITHUB_PRIVATE_KEY= \
+    _APP_VCS_GITHUB_APP_ID= \
+    _APP_VCS_GITHUB_CLIENT_ID= \
+    _APP_VCS_GITHUB_CLIENT_SECRET= \
+    _APP_VCS_GITHUB_WEBHOOK_SECRET=

 RUN \
  if [ "$DEBUG" == "true" ]; then \
@ -119,21 +164,16 @@ RUN mkdir -p /storage/uploads && \

 # Executables
 RUN chmod +x /usr/local/bin/doctor && \
-    chmod +x /usr/local/bin/patch-delete-schedule-updated-at-attribute && \
-    chmod +x /usr/local/bin/clear-card-cache && \
-    chmod +x /usr/local/bin/calc-users-stats && \
-    chmod +x /usr/local/bin/calc-tier-stats && \
-    chmod +x /usr/local/bin/patch-delete-project-collections && \
    chmod +x /usr/local/bin/maintenance &&  \
-    chmod +x /usr/local/bin/volume-sync && \
+    chmod +x /usr/local/bin/usage && \
    chmod +x /usr/local/bin/install && \
+    chmod +x /usr/local/bin/upgrade && \
    chmod +x /usr/local/bin/migrate && \
    chmod +x /usr/local/bin/realtime && \
    chmod +x /usr/local/bin/schedule && \
    chmod +x /usr/local/bin/sdks && \
    chmod +x /usr/local/bin/specs && \
    chmod +x /usr/local/bin/ssl && \
-    chmod +x /usr/local/bin/hamster && \
    chmod +x /usr/local/bin/test && \
    chmod +x /usr/local/bin/vars && \
    chmod +x /usr/local/bin/worker-audits && \
@ -145,8 +185,16 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/worker-mails && \
    chmod +x /usr/local/bin/worker-messaging && \
    chmod +x /usr/local/bin/worker-webhooks && \
-    chmod +x /usr/local/bin/worker-migrations && \
-    chmod +x /usr/local/bin/worker-usage
+    chmod +x /usr/local/bin/worker-migrations
+
+# Cloud Executabless
+RUN chmod +x /usr/local/bin/hamster && \
+    chmod +x /usr/local/bin/volume-sync && \
+    chmod +x /usr/local/bin/patch-delete-schedule-updated-at-attribute && \
+    chmod +x /usr/local/bin/patch-delete-project-collections && \
+    chmod +x /usr/local/bin/clear-card-cache && \
+    chmod +x /usr/local/bin/calc-users-stats && \
+    chmod +x /usr/local/bin/calc-tier-stats

 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
--- a/README-CN.md
+++ b/README-CN.md
@ -66,7 +66,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.3.8
+    appwrite/appwrite:1.4.1
 ```

 ### Windows
@ -78,7 +78,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.3.8
+    appwrite/appwrite:1.4.1
 ```

 #### PowerShell
@ -88,7 +88,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.3.8
+    appwrite/appwrite:1.4.1
 ```

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
--- a/README.md
+++ b/README.md
@ -75,7 +75,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.3.8
+    appwrite/appwrite:1.4.1
 ```

 ### Windows
@ -87,7 +87,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.3.8
+    appwrite/appwrite:1.4.1
 ```

 #### PowerShell
@ -97,7 +97,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.3.8
+    appwrite/appwrite:1.4.1
 ```

 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.
@ -131,7 +131,7 @@ Choose from one of the providers below:
    <td align="center" width="100" height="100">
      <a href="https://www.linode.com/marketplace/apps/appwrite/appwrite/">
        <img width="50" height="39" src="public/images/integrations/akamai-logo.svg" alt="Akamai Logo" />
-          <br /><sub><b>Akamai</b></sub></a>    
+          <br /><sub><b>Akamai Compute</b></sub></a>    
      </a>
    </td>
  </tr>
--- a/SECURITY.md
+++ b/SECURITY.md
@ -9,6 +9,7 @@
 | 1.1.x     | :white_check_mark: |
 | 1.2.x     | :white_check_mark: |
 | 1.3.x     | :white_check_mark: |
+| 1.4.x     | :white_check_mark: |

 ## Reporting a Vulnerability

--- a/app/cli.php
+++ b/app/cli.php
@ -58,7 +58,7 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
                ->getResource();

            $dbForConsole = new Database($dbAdapter, $cache);
-            $dbForConsole->setNamespace('console');
+            $dbForConsole->setNamespace('_console');

            // Ensure tables exist
            $collections = Config::getParam('collections', [])['console'];
@ -74,7 +74,7 @@ CLI::setResource('dbForConsole', function ($pools, $cache) {
            $pools->get('console')->reclaim();
            sleep($sleep);
        }
-    } while ($attempts < $maxAttempts);
+    } while ($attempts < $maxAttempts && !$ready);

    if (!$ready) {
        throw new Exception("Console is not ready yet. Please try again later.");
@ -116,6 +116,29 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
    return $getProjectDB;
 }, ['pools', 'dbForConsole', 'cache']);

+CLI::setResource('influxdb', function (Registry $register) {
+    $client = $register->get('influxdb'); /** @var InfluxDB\Client $client */
+    $attempts = 0;
+    $max = 10;
+    $sleep = 1;
+
+    do { // check if telegraf database is ready
+        try {
+            $attempts++;
+            $database = $client->selectDB('telegraf');
+            if (in_array('telegraf', $client->listDatabases())) {
+                break; // leave the do-while if successful
+            }
+        } catch (\Throwable $th) {
+            Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+            if ($attempts >= $max) {
+                throw new \Exception('InfluxDB database not ready yet');
+            }
+            sleep($sleep);
+        }
+    } while ($attempts < $max);
+    return $database;
+}, ['register']);

 CLI::setResource('queueForFunctions', function (Group $pools) {
    return new Func($pools->get('queue')->pop()->getResource());
--- a/app/config/cloud/contributors.json
+++ b/app/config/cloud/contributors.json
@ -1 +0,0 @@
-[1297371,1759475,6360216,20852629,5857008,19310830,9708641,26739219,23742426,22174310,77877486,1477010,29069505,62933155,45863583,42211,176163,58045728,7091609,31401437,1911066,66096031,22432834,43054051,79051850,22895284,100597998,91385411,49699333,7818620,11004008,54898623,27856297,33250853,49375670,30630364,50206,47822499,7481165,52557347,13681567,20492520,51369094,51821861,50256986,28431370,13692220,24373771,15938422,27148250,14805534,36137226,36071208,40193621,56179878,53281158,48085134,19358691,32528768,19733683,37348419,13719696,18309412,42106787,53618500,5306011,4408379,35486736,18586611,15062564,27011453,56090587,44623032,25107942,81188,33922418,16717633,32809211,69401139,25815659,4104127,20889958,3102249,12476526,2635185,28495651,50957556,2791280,31023616,20955511,835733,471907,69008866,44906587,45271396,76054330,45748739,41908747,23402178,47356149,8921,36632821,3668741,71702982,29725587,26303198,785830,51410502,60089135,2847349,43172716,48546075,8216525,41161981,51828039,4334997,80918302,38534289,47860497,80036766,41341387,49818988,58487637,29237374,46913894,5148229,4377199,29686102,26272249,75117692,4090256,27357868,33062368,38664231,46695441,743291,22633385,6368283,11593067,45097959,43381712,3284228,1972717,33012425,61755381,25405707,3144291,44156359,5497267,7423905,20716175,28586681,5975506,23518097,22187384,24191952,7768078,971530,51240166,55633427,34207400,77061285,11719476,35950229,66742927,34406802,802933,50047839,39148877,26602940,9693472,44273767,19362725,31209978,30521594,686298,6237394,35039730,42580581,36671793,8502129,8466918,81866614,54903252,28373606,13381361,72331432,30694270,5355510,8209163,86675510,9453522,42496309,56145786,2149381,393945,22084723,52621436,8872447,5575392,29619660,5547479,8852116,11151445,4717349,17725274,65615065,18537755,29292618,53044263,26597930,10313411,55998629,77529288,17404636,33729848,19422168,17916404,66111735,10329006,33502846,398230,81643826,105039167,47522632,91655303,9774614,10603631,284924,60857954,22885912,116552306,36103454,794606,27729549,1754457,36594527,13899668,78664749,47406531,27698189,5305654,53345517,6756412,29176704,77790497,47504894,37251540,52361778,52200375,1351177,66022861,73975409,25745396,31433638,37118134,43210805,20317665,11923975,47187468,16362381,36751163,14959876,32362757,65529384,52352285,74085816,3628535,43902034,75667593,26132902,466713,617558,96806061,33605526,11290524,43621940,12446314,17146935,55018955,56096559,79797000,40014186,34449936,58387964,23368207,42414965,44056349,33743031,12294525,58251592,33755729,9021747,932084,11428067,97121933,80122730,60894542,58583793,56051809,32243289,9934371,90936802,74638775,65399526,77604,64524822,47782249,43633955,42793632,55969597,72334601,82395440,92818577,60866204,65016769,23725091,45892107,55308895,86314140,82756460,47685349,63562160,73419211,1613216,50882624,91469717,46166258,60927324,41763158,83607556,2171717,50497814,39427312,61322830,40076195,39419448,29397545,55090719,53259730,20885012,64558515,69677883,55741087,72426535,46033036,68477507,30376878,73700530,25518600,29922887,36229969,47573417,40424087,49054503,16880385,22801227,72848513,64347914,814402,49149679,55017867,49481876,67067955,31439735,63878173,80322286,43746210,17332970,22702905,62476876,89888292,75736952,54059881,90782137,63588969,57111920,63330165,70258211,46371923,17837758,59364507,52203828,60147326,18481195,74822422,9803078,67309607,60410049,47360939,19922556,90848252,24698014,58886915,63579762,96648934,68523530,60518745,37345795,3929651,54993657,52061363,43019989,5787917,94674993,71593494,17143469,10288548,1830380,71510505,59124772,2335145,70798495,46474346,49263351,52062536,63151043,65248303,26071571,53626355,43992469,60785452,63467479,71837281,19490891,58628586,38250310,7271718,1110414,57227290,11625672,85063520,88965873,70096901,42029519,85363195,64471630,69353350,66922161,2221746,100430077,12299813,62690310,68282006,99184676,2450,22989561,22212661,59973863,11232940,76688923,22321353,77732479,84286404,32268377,34828782,23068019,57074509,24620969,20735983,26173690,75809937,49760818,86646105,52617262]
--- a/app/config/cloud/employees.json
+++ b/app/config/cloud/employees.json
@ -1,33 +0,0 @@
-{
-  "eldad@appwrite.io": { "memberSince": "2020-10-15", "spot": "0", "gitHub": "eldadfux" },
-  "christy@appwrite.io": { "memberSince": "2020-12-01", "spot": "1", "gitHub": "christyjacob4" },
-  "torsten@appwrite.io": { "memberSince": "2020-12-28", "spot": "2", "gitHub": "torstendittmann" },
-  "damodar@appwrite.io": { "memberSince": "2021-01-02", "spot": "3", "gitHub": "lohanidamodar" },
-  "bradley@appwrite.io": { "memberSince": "2021-05-21", "spot": "5", "gitHub": "PineappleIOnic" },
-  "jake@appwrite.io": { "memberSince": "2021-06-28", "spot": "6", "gitHub": "abnegate" },
-  "sara@appwrite.io": { "memberSince": "2021-08-16", "spot": "7", "gitHub": "sarakaandorp" },
-  "matej@appwrite.io": { "memberSince": "2021-08-23", "spot": "8", "gitHub": "meldiron" },
-  "aditya@appwrite.io": { "memberSince": "2021-09-01", "spot": "9", "gitHub": "adityaoberai" },
-  "wess@appwrite.io": { "memberSince": "2021-11-08", "spot": "12", "gitHub": "wess" },
-  "may@appwrite.io": { "memberSince": "2021-11-28", "spot": "14", "gitHub": "MayEnder" },
-  "elad@appwrite.io": { "memberSince": "2021-12-19", "spot": "15", "gitHub": "elad2412" },
-  "vincent@appwrite.io": { "memberSince": "2022-01-01", "spot": "16", "gitHub": "gewenyu99" },
-  "haimantika@appwrite.io": { "memberSince": "2022-04-01", "spot": "18", "gitHub": "Haimantika" },
-  "chen@appwrite.io": { "memberSince": "2022-01-24", "spot": "19", "gitHub": "chenparnasa" },
-  "tessa@appwrite.io": { "memberSince": "2022-04-21", "spot": "20", "gitHub": "tessamero" },
-  "shimon@appwrite.io": { "memberSince": "2022-05-01", "spot": "23", "gitHub": "shimonewman" },
-  "shmuel@appwrite.io": { "memberSince": "2022-03-20", "spot": "24", "gitHub": "fogelito" },
-  "arman@appwrite.io": { "memberSince": "2022-04-04", "spot": "25", "gitHub": "ArmanNik" },
-  "carla@appwrite.io": { "memberSince": "2022-04-04", "spot": "26", "gitHub": "heyCarla" },
-  "emma@appwrite.io": { "memberSince": "2022-05-08", "spot": "27", "gitHub": "emmacarpagnano1" },
-  "dylan@appwrite.io": { "memberSince": "2022-05-09", "spot": "28", "gitHub": "DylanG-64" },
-  "steven@appwrite.io": { "memberSince": "2022-07-01", "spot": "30", "gitHub": "stnguyen90" },
-  "jyoti@appwrite.io": { "memberSince": "2022-10-24", "spot": "31", "gitHub": "joeyouss" },
-  "jade@appwrite.io": { "memberSince": "2022-10-31", "spot": "32", "gitHub": "dajebp" },
-  "khushboo@appwrite.io": { "memberSince": "2021-11-08", "spot": "13", "gitHub": "vermakhushboo" },
-  "thomas@appwrite.io": { "memberSince": "2022-11-03", "spot": "34", "gitHub": "TGlide" },
-  "holly@appwrite.io": { "memberSince": "2022-12-05", "spot": "35", "gitHub": "HollyBarclay" },
-  "laura@appwrite.io": { "memberSince": "2023-01-25", "spot": "36", "gitHub": "LauraDuRy" },
-  "caio@appwrite.io": { "memberSince": "2023-03-27", "spot": "37", "gitHub": "ariascaio" },
-  "luke@appwrite.io": { "memberSince": "2023-05-04", "spot": "38", "gitHub": "loks0n" }
-}
--- a/app/config/cloud/heroes.json
+++ b/app/config/cloud/heroes.json
@ -1,9 +0,0 @@
-{
-  "bishwajeet.techmaster@gmail.com": { "memberSince": "2023-02-07" },
-  "lucasaudart@gmail.com": { "memberSince": "2023-02-07" },
-  "tkarmakar27112000@gmail.com": { "memberSince": "2023-02-07" },
-  "alves.mckl@gmail.com": { "memberSince": "2023-02-07" },
-  "dpns_nampula@rnlay.com": { "memberSince": "2023-02-07" },
-  "a.stephensimon@outlook.com": { "memberSince": "2023-02-07" },
-  "hidianapham@gmail.com": { "memberSince": "2023-02-07" }
-}
--- a/app/config/collections.php
+++ b/app/config/collections.php
--- a/app/config/errors.php
+++ b/app/config/errors.php
@ -98,6 +98,11 @@ return [
        'description' => 'Usage stats is not configured. Please check the value of the _APP_USAGE_STATS environment variable of your Appwrite server.',
        'code' => 501,
    ],
+    Exception::GENERAL_NOT_IMPLEMENTED => [
+        'name' => Exception::GENERAL_NOT_IMPLEMENTED,
+        'description' => 'This method was not fully implemented yet. If you believe this is a mistake, please upgrade your Appwrite server version.',
+        'code' => 405,
+    ],

    /** User Errors */
    Exception::USER_COUNT_EXCEEDED => [
@ -112,12 +117,12 @@ return [
    ],
    Exception::USER_ALREADY_EXISTS => [
        'name' => Exception::USER_ALREADY_EXISTS,
-        'description' => 'A user with the same id, email, or phone already exists in your project.',
+        'description' => 'A user with the same id, email, or phone already exists in this project.',
        'code' => 409,
    ],
    Exception::USER_BLOCKED => [
        'name' => Exception::USER_BLOCKED,
-        'description' => 'The current user has been blocked.',
+        'description' => 'The current user has been blocked. You can unblock the user by making a request to the User API\'s "Update User Status" endpoint or in the Appwrite Console\'s Auth section.',
        'code' => 401,
    ],
    Exception::USER_INVALID_TOKEN => [
@ -177,12 +182,12 @@ return [
    ],
    Exception::USER_PASSWORD_RECENTLY_USED => [
        'name' => Exception::USER_PASSWORD_RECENTLY_USED,
-        'description' => 'The password you are trying to use is similar to your previous password. Please choose a stronger password.',
+        'description' => 'The password you are trying to use is similar to your previous password. For your security, please choose a different password and try again.',
        'code' => 400,
    ],
    Exception::USER_PASSWORD_PERSONAL_DATA => [
        'name' => Exception::USER_PASSWORD_PERSONAL_DATA,
-        'description' => 'The password you are trying to use contains references to your name, email, phone or userID. Please choose a different password and try again.',
+        'description' => 'The password you are trying to use contains references to your name, email, phone or userID. For your security, please choose a different password and try again.',
        'code' => 400,
    ],
    Exception::USER_SESSION_NOT_FOUND => [
@ -192,7 +197,7 @@ return [
    ],
    Exception::USER_IDENTITY_NOT_FOUND => [
        'name' => Exception::USER_IDENTITY_NOT_FOUND,
-        'description' => 'The identity could not be found.',
+        'description' => 'The identity could not be found. Please sign in with OAuth provider to create identity first.',
        'code' => 404,
    ],
    Exception::USER_UNAUTHORIZED => [
@ -254,7 +259,7 @@ return [
    ],
    Exception::TEAM_INVALID_SECRET => [
        'name' => Exception::TEAM_INVALID_SECRET,
-        'description' => 'The team invitation secret is invalid.',
+        'description' => 'The team invitation secret is invalid. Please request  a new invitation and try again.',
        'code' => 401,
    ],
    Exception::TEAM_MEMBERSHIP_MISMATCH => [
@ -269,7 +274,7 @@ return [
    ],
    Exception::TEAM_ALREADY_EXISTS => [
        'name' => Exception::TEAM_ALREADY_EXISTS,
-        'description' => 'Team with requested ID already exists.',
+        'description' => 'Team with requested ID already exists. Please choose a different ID and try again.',
        'code' => 409,
    ],

@ -281,7 +286,7 @@ return [
    ],
    Exception::MEMBERSHIP_ALREADY_CONFIRMED => [
        'name' => Exception::MEMBERSHIP_ALREADY_CONFIRMED,
-        'description' => 'Membership already confirmed',
+        'description' => 'Membership is already confirmed.',
        'code' => 409,
    ],

@ -350,7 +355,7 @@ return [
    ],
    Exception::STORAGE_BUCKET_ALREADY_EXISTS => [
        'name' => Exception::STORAGE_BUCKET_ALREADY_EXISTS,
-        'description' => 'A storage bucket with the requested ID already exists.',
+        'description' => 'A storage bucket with the requested ID already exists. Try again with a different ID or use "unique()" to generate a unique ID.',
        'code' => 409,
    ],
    Exception::STORAGE_BUCKET_NOT_FOUND => [
@ -370,7 +375,34 @@ return [
    ],
    Exception::STORAGE_INVALID_APPWRITE_ID => [
        'name' => Exception::STORAGE_INVALID_APPWRITE_ID,
-        'description' => 'The value for x-appwrite-id header is invalid. Please check the value of the x-appwrite-id header is valid id and not unique().',
+        'description' => 'The value for x-appwrite-id header is invalid. Please check the value of the x-appwrite-id header is a valid id and not unique().',
+        'code' => 400,
+    ],
+
+    /** VCS */
+    Exception::INSTALLATION_NOT_FOUND => [
+        'name' => Exception::INSTALLATION_NOT_FOUND,
+        'description' => 'Installation with the requested ID could not be found. Check to see if the ID is correct, or create the installation.',
+        'code' => 404,
+    ],
+    Exception::PROVIDER_REPOSITORY_NOT_FOUND => [
+        'name' => Exception::PROVIDER_REPOSITORY_NOT_FOUND,
+        'description' => 'VCS (Version Control System) repository with the requested ID could not be found. Check to see if the ID is correct, and if it belongs to installationId you provided.',
+        'code' => 404,
+    ],
+    Exception::REPOSITORY_NOT_FOUND => [
+        'name' => Exception::REPOSITORY_NOT_FOUND,
+        'description' => 'Repository with the requested ID could not be found. Check to see if the ID is correct, or create the respository.',
+        'code' => 404,
+    ],
+    Exception::PROVIDER_CONTRIBUTION_CONFLICT => [
+        'name' => Exception::PROVIDER_CONTRIBUTION_CONFLICT,
+        'description' => 'External contribution is already authorized.',
+        'code' => 409,
+    ],
+    Exception::GENERAL_PROVIDER_FAILURE => [
+        'name' => Exception::GENERAL_PROVIDER_FAILURE,
+        'description' => 'VCS (Version Control System) provider failed to proccess the request. We believe this is an error with the VCS provider. Try again, or contact support for more information.',
        'code' => 400,
    ],

@ -385,6 +417,11 @@ return [
        'description' => 'The requested runtime is either inactive or unsupported. Please check the value of the _APP_FUNCTIONS_RUNTIMES environment variable.',
        'code' => 404,
    ],
+    Exception::FUNCTION_ENTRYPOINT_MISSING => [
+        'name' => Exception::FUNCTION_RUNTIME_UNSUPPORTED,
+        'description' => 'Entrypoint for your Appwrite Function is missing. Please specify it when making deployment or update the entrypoint under your function\'s "Settings" > "Configuration" > "Entrypoint".',
+        'code' => 404,
+    ],

    /** Builds  */
    Exception::BUILD_NOT_FOUND => [
@ -438,7 +475,7 @@ return [
    ],
    Exception::COLLECTION_ALREADY_EXISTS => [
        'name' => Exception::COLLECTION_ALREADY_EXISTS,
-        'description' => 'A collection with the requested ID already exists.',
+        'description' => 'A collection with the requested ID already exists. Try again with a different ID or use "unique()" to generate a unique ID.',
        'code' => 409,
    ],
    Exception::COLLECTION_LIMIT_EXCEEDED => [
@ -460,17 +497,17 @@ return [
    ],
    Exception::DOCUMENT_MISSING_DATA => [
        'name' => Exception::DOCUMENT_MISSING_DATA,
-        'description' => 'The document data is missing. You must provide the document data.',
+        'description' => 'The document data is missing. Try again with document data populated',
        'code' => 400,
    ],
    Exception::DOCUMENT_MISSING_PAYLOAD => [
        'name' => Exception::DOCUMENT_MISSING_PAYLOAD,
-        'description' => 'The document data and permissions are missing. You must provide either the document data or permissions to be updated.',
+        'description' => 'The document data and permissions are missing. You must provide either document data or permissions to be updated.',
        'code' => 400,
    ],
    Exception::DOCUMENT_ALREADY_EXISTS => [
        'name' => Exception::DOCUMENT_ALREADY_EXISTS,
-        'description' => 'Document with the requested ID already exists.',
+        'description' => 'Document with the requested ID already exists. Try again with a different ID or use "unique()" to generate a unique ID.',
        'code' => 409,
    ],
    Exception::DOCUMENT_UPDATE_CONFLICT => [
@ -512,7 +549,7 @@ return [
    ],
    Exception::ATTRIBUTE_ALREADY_EXISTS => [
        'name' => Exception::ATTRIBUTE_ALREADY_EXISTS,
-        'description' => 'Attribute with the requested ID already exists.',
+        'description' => 'Attribute with the requested ID already exists. Try again with a different ID or use "unique()" to generate a unique ID.',
        'code' => 409,
    ],
    Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
@ -544,7 +581,7 @@ return [
    ],
    Exception::INDEX_ALREADY_EXISTS => [
        'name' => Exception::INDEX_ALREADY_EXISTS,
-        'description' => 'Index with the requested ID already exists.',
+        'description' => 'Index with the requested ID already exists. Try again with a different ID or use "unique()" to generate a unique ID.',
        'code' => 409,
    ],
    Exception::INDEX_INVALID => [
@ -561,7 +598,7 @@ return [
    ],
    Exception::PROJECT_ALREADY_EXISTS => [
        'name' => Exception::PROJECT_ALREADY_EXISTS,
-        'description' => 'Project with the requested ID already exists.',
+        'description' => 'Project with the requested ID already exists. Try again with a different ID or use "unique()" to generate a unique ID.',
        'code' => 409,
    ],
    Exception::PROJECT_UNKNOWN => [
@ -599,14 +636,44 @@ return [
        'description' => 'The project key has expired. Please generate a new key using the Appwrite console.',
        'code' => 401,
    ],
+    Exception::ROUTER_HOST_NOT_FOUND => [
+        'name' => Exception::ROUTER_HOST_NOT_FOUND,
+        'description' => 'Host is not trusted. This could occur because you have not configured a custom domain. Add a custom domain to your project first and try again.',
+        'code' => 404,
+    ],
+    Exception::ROUTER_DOMAIN_NOT_CONFIGURED => [
+        'name' => Exception::ROUTER_DOMAIN_NOT_CONFIGURED,
+        'description' => 'Domain environment variables not configured. Please configure domain environment variables before using Appwrite outside of localhost.',
+        'code' => 500,
+    ],
+    Exception::RULE_RESOURCE_NOT_FOUND => [
+        'name' => Exception::RULE_RESOURCE_NOT_FOUND,
+        'description' => 'Resource could not be found. Please check if the resourceId and resourceType are correct, or if the resource actually exists.',
+        'code' => 404,
+    ],
+    Exception::RULE_NOT_FOUND => [
+        'name' => Exception::RULE_NOT_FOUND,
+        'description' => 'Rule with the requested ID could not be found. Please check if the ID provided is correct or if the rule actually exists.',
+        'code' => 404,
+    ],
+    Exception::RULE_ALREADY_EXISTS => [
+        'name' => Exception::RULE_ALREADY_EXISTS,
+        'description' => 'Domain is already used. Please try again with a different domain.',
+        'code' => 409,
+    ],
+    Exception::RULE_VERIFICATION_FAILED => [
+        'name' => Exception::RULE_VERIFICATION_FAILED,
+        'description' => 'Domain verification failed. Please check if your DNS records are correct and try again.',
+        'code' => 401,
+    ],
    Exception::PROJECT_SMTP_CONFIG_INVALID => [
        'name' => Exception::PROJECT_SMTP_CONFIG_INVALID,
-        'description' => 'Provided SMTP config is invalid.',
+        'description' => 'Provided SMTP config is invalid. Please check the configured values and try again.',
        'code' => 400,
    ],
    Exception::PROJECT_TEMPLATE_DEFAULT_DELETION => [
        'name' => Exception::PROJECT_TEMPLATE_DEFAULT_DELETION,
-        'description' => 'The default template for the project cannot be deleted.',
+        'description' => 'You can\'t delete default template. If you are trying to reset your template changes, you can ignore this error as it\'s already been reset.',
        'code' => 401,
    ],
    Exception::WEBHOOK_NOT_FOUND => [
@ -624,21 +691,6 @@ return [
        'description' => 'Platform with the requested ID could not be found.',
        'code' => 404,
    ],
-    Exception::DOMAIN_NOT_FOUND => [
-        'name' => Exception::DOMAIN_NOT_FOUND,
-        'description' => 'Domain with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::DOMAIN_ALREADY_EXISTS => [
-        'name' => Exception::DOMAIN_ALREADY_EXISTS,
-        'description' => 'The requested domain is currently in use by a project.',
-        'code' => 409,
-    ],
-    Exception::DOMAIN_FORBIDDEN => [
-        'name' => Exception::DOMAIN_FORBIDDEN,
-        'description' => 'The requested domain cannot be used as a custom domain.',
-        'code' => 403,
-    ],
    Exception::VARIABLE_NOT_FOUND => [
        'name' => Exception::VARIABLE_NOT_FOUND,
        'description' => 'Variable with the requested ID could not be found.',
@ -646,19 +698,9 @@ return [
    ],
    Exception::VARIABLE_ALREADY_EXISTS => [
        'name' => Exception::VARIABLE_ALREADY_EXISTS,
-        'description' => 'Variable with the same ID already exists in your project.',
+        'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
        'code' => 409,
    ],
-    Exception::DOMAIN_VERIFICATION_FAILED => [
-        'name' => Exception::DOMAIN_VERIFICATION_FAILED,
-        'description' => 'Domain verification for the requested domain has failed.',
-        'code' => 401,
-    ],
-    Exception::DOMAIN_TARGET_INVALID => [
-        'name' => Exception::DOMAIN_TARGET_INVALID,
-        'description' => 'Your Appwrite instance is not publicly accessible. Please check the _APP_DOMAIN_TARGET environment variable of your Appwrite server.',
-        'code' => 501,
-    ],
    Exception::GRAPHQL_NO_QUERY => [
        'name' => Exception::GRAPHQL_NO_QUERY,
        'description' => 'Param "query" is not optional.',
@ -673,17 +715,17 @@ return [
    /** Migrations */
    Exception::MIGRATION_NOT_FOUND => [
        'name' => Exception::MIGRATION_NOT_FOUND,
-        'description' => 'Migration with the requested ID could not be found.',
+        'description' => 'Migration with the requested ID could not be found. Please verify that the provided ID is correct and try again.',
        'code' => 404,
    ],
    Exception::MIGRATION_ALREADY_EXISTS => [
        'name' => Exception::MIGRATION_ALREADY_EXISTS,
-        'description' => 'Migration with the requested ID already exists.',
+        'description' => 'Migration with the requested ID already exists. Try again with a different ID.',
        'code' => 409,
    ],
    Exception::MIGRATION_IN_PROGRESS => [
        'name' => Exception::MIGRATION_IN_PROGRESS,
-        'description' => 'Migration is already in progress.',
+        'description' => 'Migration is already in progress. You can check the status of the migration in your Appwrite Console\'s "Settings" > "Migrations".',
        'code' => 409,
    ],
 ];
--- a/app/config/events.php
+++ b/app/config/events.php
@ -236,5 +236,19 @@ return [
        'update' => [
            '$description' => 'This event triggers when a function is updated.',
        ]
+    ],
+    'rules' => [
+        '$model' => Response::MODEL_PROXY_RULE,
+        '$resource' => true,
+        '$description' => 'This event triggers on any proxy rule event.',
+        'create' => [
+            '$description' => 'This event triggers when a proxy rule is created.'
+        ],
+        'delete' => [
+            '$description' => 'This event triggers when a proxy rule is deleted.',
+        ],
+        'update' => [
+            '$description' => 'This event triggers when a proxy rule is updated.',
+        ]
    ]
 ];
--- a/app/config/locale/templates/email-base.tpl
+++ b/app/config/locale/templates/email-base.tpl
@ -42,39 +42,21 @@
            border: none;
            border-top: 1px solid #E8E9F0;
        }
+
+        p {
+            margin-bottom: 10px;
+        }
    </style>
 </head>

 <body style="direction: {{direction}}">

-<div style="max-width:650px; word-wrap: break-wrod; overflow-wrap: break-word;
+<div style="max-width:650px; word-wrap: break-word; overflow-wrap: break-word;
  word-break: break-all; margin:0 auto;">
    <table style="margin-top: 32px">
        <tr>
            <td>
-                <h1>
-                    {{subject}}
-                </h1>
-            </td>
-        </tr>
-    </table>
-
-    <table style="margin-top: 40px">
-        <tr>
-            <td>
-                <p>{{hello}}</p>
-
-                <p>{{body}}</p>
-
-                <a href="{{redirect}}" target="_blank">{{redirect}}</a>
-
-                <p><br />{{footer}}</p>
-                <br />
-
-                <p>{{thanks}}
-                <br />
-                {{signature}}
-                </p>
+                {{body}}
            </td>
        </tr>
    </table>
--- a/app/config/locale/templates/email-inner-base.tpl
+++ b/app/config/locale/templates/email-inner-base.tpl
@ -0,0 +1,15 @@
+<p>{{hello}}</p>
+
+<br>
+
+<p>{{body}}</p>
+
+<a href="{{redirect}}" target="_blank">{{redirect}}</a>
+
+<p>{{footer}}</p>
+
+<br>
+
+<p>{{thanks}}</p>
+
+<p>{{signature}}</p>
--- a/app/config/locale/translations/af.json
+++ b/app/config/locale/translations/af.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s span",
    "emails.verification.subject": "Rekening Bevestiging",
-    "emails.verification.hello": "Goeie dag {{name}}",
+    "emails.verification.hello": "Goeie dag {{user}}",
    "emails.verification.body": "Volg hierdie skakel om u e-pos adres te bevestig.",
    "emails.verification.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u adres te bevestig nie.",
    "emails.verification.thanks": "Baie dankie",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Baie dankie",
    "emails.magicSession.signature": "Die {{project}} span",
    "emails.recovery.subject": "Herstel Wagwoord",
-    "emails.recovery.hello": "Goeie dag {{name}}",
+    "emails.recovery.hello": "Goeie dag {{user}}",
    "emails.recovery.body": "Volg hierdie skakel om u {{project}} wagwoord te herstel.",
    "emails.recovery.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u wagwoord te herstel nie.",
    "emails.recovery.thanks": "Baie dankie",
--- a/app/config/locale/translations/ar.json
+++ b/app/config/locale/translations/ar.json
@ -4,7 +4,7 @@
    "settings.direction": "rtl",
    "emails.sender": "فريق %s",
    "emails.verification.subject": "تأكيد الحساب",
-    "emails.verification.hello": "مرحبا {{name}}",
+    "emails.verification.hello": "مرحبا {{user}}",
    "emails.verification.body": "برجاء اتباع الرابط التالي لتأكيد بريدك الإلكتروني",
    "emails.verification.footer": "لو لم تطلب تأكيد هذا البريد الإلكتروني، يمكنك تجاهل هذه الرسالة",
    "emails.verification.thanks": "شكرا",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "شكرا",
    "emails.magicSession.signature": "فريق {{project}}",
    "emails.recovery.subject": "تغيير كلمة السر",
-    "emails.recovery.hello": "أهلا {{name}}",
+    "emails.recovery.hello": "أهلا {{user}}",
    "emails.recovery.body": "برجاء اتباع الراط التالي لتغيير كلمة السر الخاصة بـ{{project}}",
    "emails.recovery.footer": "لولم تطلب تغيير كلمة السر، يمكنك تجاهل هذه الرسالة",
    "emails.recovery.thanks": "شكرا",
--- a/app/config/locale/translations/as.json
+++ b/app/config/locale/translations/as.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s দল",
    "emails.verification.subject": "একাউণ্ট প্ৰমাণীকৰণ",
-    "emails.verification.hello": "নমস্কাৰ {{name}}",
+    "emails.verification.hello": "নমস্কাৰ {{user}}",
    "emails.verification.body": "আপোনাৰ ইমেইল ঠিকনা প্ৰমাণিত কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
    "emails.verification.footer": "যদি আপুনি এই ঠিকনাটো সত্যাপিত কৰিবলৈ কোৱা নাই, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
    "emails.verification.thanks": "ধন্যবাদ",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ধন্যবাদ",
    "emails.magicSession.signature": "{{project}} দল",
    "emails.recovery.subject": "পাছৱাৰ্ড ৰিছেট",
-    "emails.recovery.hello": "ধন্যবাদ {{name}}",
+    "emails.recovery.hello": "ধন্যবাদ {{user}}",
    "emails.recovery.body": "আপোনাৰ {{project}} পাছৱৰ্ড ৰিছেট কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।.",
    "emails.recovery.footer": "যদি আপুনি আপোনাৰ পাছৱৰ্ড ৰিছেট কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
    "emails.recovery.thanks": "ধন্যবাদ",
--- a/app/config/locale/translations/az.json
+++ b/app/config/locale/translations/az.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Komandası",
    "emails.verification.subject": "Hesab Doğrulama",
-    "emails.verification.hello": "Salam {{name}}",
+    "emails.verification.hello": "Salam {{user}}",
    "emails.verification.body": "E-poçt ünvanınızı təsdiq etmək üçün bu linki izləyin.",
    "emails.verification.footer": "Bu ünvanı doğrulamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
    "emails.verification.thanks": "Təşəkkürlər",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Təşəkkürlər",
    "emails.magicSession.signature": "{{project}} komandası",
    "emails.recovery.subject": "Şifrə Sıfırlanması",
-    "emails.recovery.hello": "Salam {{name}}",
+    "emails.recovery.hello": "Salam {{user}}",
    "emails.recovery.body": "{{project}} şifrənizi sıfırlamaq üçün bu linki izləyin.",
    "emails.recovery.footer": "Şifrənizi sıfırlamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
    "emails.recovery.thanks": "Təşəkkürlər",
--- a/app/config/locale/translations/be.json
+++ b/app/config/locale/translations/be.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Каманда %s",
    "emails.verification.subject": "Верыфікацыя акаўнта",
-    "emails.verification.hello": "Прывітанне {{name}}",
+    "emails.verification.hello": "Прывітанне {{user}}",
    "emails.verification.body": "Перайдзіце па гэтай спасылцы, каб пацвердзіць свой адрас электроннай пошты",
    "emails.verification.footer": "Калі вы не запытвалі пацвярджэнне гэтага адрасу, праігнаруйце гэтае паведамленне.",
    "emails.verification.thanks": "Дзякуем",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Дзякуем",
    "emails.magicSession.signature": "каманда {{project}}",
    "emails.recovery.subject": "Скід пароля",
-    "emails.recovery.hello": "Прывітанне, {{name}}",
+    "emails.recovery.hello": "Прывітанне, {{user}}",
    "emails.recovery.body": "Перайдзіце па гэтай спасылцы, каб скінуць пароль для праекта {{project}}.",
    "emails.recovery.footer": "Калі вы не прасілі скінуць пароль, вы можаце праігнараваць гэта паведамленне.",
    "emails.recovery.thanks": "Дзякуем",
--- a/app/config/locale/translations/bh.json
+++ b/app/config/locale/translations/bh.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s टीम",
    "emails.verification.subject": "खाता प्रमाणिकरण",
-    "emails.verification.hello": "नमस्ते {{name}}",
+    "emails.verification.hello": "नमस्ते {{user}}",
    "emails.verification.body": "ईमेल प्रमाणिकरण करे क लेल दिहल गइल लिंक फॉलो करें|",
    "emails.verification.footer": "अगर ई पता को सत्यापित करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
    "emails.verification.thanks": "धन्यवाद",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "धन्यवाद",
    "emails.magicSession.signature": "{{project}} टीम",
    "emails.recovery.subject": "पासवर्ड बदल क लेल|",
-    "emails.recovery.hello": "प्रणाम {{name}}",
+    "emails.recovery.hello": "प्रणाम {{user}}",
    "emails.recovery.body": "पासवर्ड बदल क लेल दिहल गइल लिंक फॉलो करें|",
    "emails.recovery.footer": "अगर पासवर्ड बदल क लेल ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
    "emails.recovery.thanks": "धन्यवाद",
--- a/app/config/locale/translations/bn.json
+++ b/app/config/locale/translations/bn.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s টীম",
    "emails.verification.subject": "বিষয়",
-    "emails.verification.hello": "নমস্কার {{name}}",
+    "emails.verification.hello": "নমস্কার {{user}}",
    "emails.verification.body": "এই লিঙ্কের মাধ্যমে ইমেইল যাচাই করুন।",
    "emails.verification.footer": "আপনি যদি এই ঠিকানা যাচাই করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
    "emails.verification.thanks": "ধন্যবাদ",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ধন্যবাদ",
    "emails.magicSession.signature": "{{project}} টীম",
    "emails.recovery.subject": "পাসওয়ার্ড রিসেট",
-    "emails.recovery.hello": "নমস্কার {{name}}",
+    "emails.recovery.hello": "নমস্কার {{user}}",
    "emails.recovery.body": "এই লিঙ্কের মাধ্যমে আপনার {{project}} পাসওয়ার্ড পুনরায় সেট করুন।",
    "emails.recovery.footer": "আপনি যদি আপনার পাসওয়ার্ড পুনরায় সেট করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
    "emails.recovery.thanks": "ধন্যবাদ",
--- a/app/config/locale/translations/ca.json
+++ b/app/config/locale/translations/ca.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Equip",
    "emails.verification.subject": "Verificació del compte",
-    "emails.verification.hello": "Hola {{name}}",
+    "emails.verification.hello": "Hola {{user}}",
    "emails.verification.body": "Accedeix a aquest enllaç per tal de verificar la teva adreça electrònica.",
    "emails.verification.footer": "Si no has sol·licitat la verificació d'aquesta adreça electrònica, pots ignorar aquest missatge.",
    "emails.verification.thanks": "Gràcies",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Gràcies",
    "emails.magicSession.signature": "Equip {{project}}",
    "emails.recovery.subject": "Reinicialitzar contrasenya",
-    "emails.recovery.hello": "Hola {{name}}",
+    "emails.recovery.hello": "Hola {{user}}",
    "emails.recovery.body": "Accedeix a aquest enllaç per a reinicialitzar la teva contrasenya de {{project}}.",
    "emails.recovery.footer": "Si no has sol·licitat reinicialitzar la teva contrasenya, pots ignorar aquest missatge.",
    "emails.recovery.thanks": "Gràcies",
--- a/app/config/locale/translations/da.json
+++ b/app/config/locale/translations/da.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Konto Verifikation",
-    "emails.verification.hello": "Hej {{name}}",
+    "emails.verification.hello": "Hej {{user}}",
    "emails.verification.body": "Følg dette link, for at verificere din email adresse.",
    "emails.verification.footer": "Hvis du ikke har bedt om at verificere denne adresse, ignorer venligst denne besked.",
    "emails.verification.thanks": "Tak",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Tak",
    "emails.magicSession.signature": "{{project}} team",
    "emails.recovery.subject": "Nulstil Password",
-    "emails.recovery.hello": "Hej {{name}}",
+    "emails.recovery.hello": "Hej {{user}}",
    "emails.recovery.body": "Følg dette link for at nulstille koden til {{project}}.",
    "emails.recovery.footer": "Hvis du ikke har bedt om at nulstille dit password, ignorer venligst denne besked.",
    "emails.recovery.thanks": "Tak",
--- a/app/config/locale/translations/de.json
+++ b/app/config/locale/translations/de.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Kontoverifizierung",
-    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.hello": "Hey {{user}}",
    "emails.verification.body": "Folge diesem Link, um deine E-Mail-Adresse zu bestätigen.",
    "emails.verification.footer": "Solltest du keine Verifizierung dieser E-Mail-Adresse angefordert haben, kannst du diese Nachricht ignorieren.",
    "emails.verification.thanks": "Danke",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Danke",
    "emails.magicSession.signature": "{{project}}-Team",
    "emails.recovery.subject": "Kennwort zurücksetzen",
-    "emails.recovery.hello": "Hallo {{name}}",
+    "emails.recovery.hello": "Hallo {{user}}",
    "emails.recovery.body": "Folge diesem Link, um dein {{project}}-Kennwort zurückzusetzen.",
    "emails.recovery.footer": "Solltest du keine Kennwort-Zurücksetzung angefordert haben, kannst du diese Nachricht ignorieren.",
    "emails.recovery.thanks": "Danke",
--- a/app/config/locale/translations/el.json
+++ b/app/config/locale/translations/el.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Ομάδα %s",
    "emails.verification.subject": "Επαλήθευση Λογαριασμού",
-    "emails.verification.hello": "Γεια σου {{name}}",
+    "emails.verification.hello": "Γεια σου {{user}}",
    "emails.verification.body": "Ακολουθήστε αυτό το link για να επαληθεύσετε τη δ/νση του email σας",
    "emails.verification.footer": "Εάν δεν ζητήσατε επαλήθευση αυτής της δ/νσης email, μπορείτε να αγνοήσετε αυτό το μήνυμα",
    "emails.verification.thanks": "Ευχαριστούμε",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Ευχαριστούμε",
    "emails.magicSession.signature": "Η ομάδα του {{project}}",
    "emails.recovery.subject": "Αλλαγή κωδικού πρόσβασης",
-    "emails.recovery.hello": "Γεια σου {{name}}",
+    "emails.recovery.hello": "Γεια σου {{user}}",
    "emails.recovery.body": "Ακολουθήστε αυτό το link για να αλλάξετε τον {{project}} κωδικό σας",
    "emails.recovery.footer": "Εάν δεν ζητήσατε αλλαγή του κωδικού σας πρόσβασης, μπορείτε να αγνοήσετε αυτό το μήνυμα",
    "emails.recovery.thanks": "Ευχαριστούμε",
--- a/app/config/locale/translations/en.json
+++ b/app/config/locale/translations/en.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Account Verification",
-    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.hello": "Hey {{user}}",
    "emails.verification.body": "Follow this link to verify your email address.",
    "emails.verification.footer": "If you didn’t ask to verify this address, you can ignore this message.",
    "emails.verification.thanks": "Thanks",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Thanks",
    "emails.magicSession.signature": "{{project}} team",
    "emails.recovery.subject": "Password Reset",
-    "emails.recovery.hello": "Hello {{name}}",
+    "emails.recovery.hello": "Hello {{user}}",
    "emails.recovery.body": "Follow this link to reset your {{project}} password.",
    "emails.recovery.footer": "If you didn’t ask to reset your password, you can ignore this message.",
    "emails.recovery.thanks": "Thanks",
--- a/app/config/locale/translations/eo.json
+++ b/app/config/locale/translations/eo.json
@ -3,7 +3,7 @@
     "settings.direction": "ltr",
     "emails.sender": "Teamo %s",
     "emails.verification.subject": "Konta Konfirmo",
-     "emails.verification.hello": "Saluton {{name}}",
+     "emails.verification.hello": "Saluton {{user}}",
     "emails.verification.body": "Alklaku ĉi tiun ligon por kontroli vian retpoŝtan adreson.",
     "emails.verification.footer": "Se vi ne petis ĉi tiun konfirmon de ĉi tiu retpoŝto, vi povas ignori ĉi tiun mesaĝon.",
     "emails.verification.thanks": "Dankegon.",
@ -15,7 +15,7 @@
     "emails.magicSession.thanks": "Dankegon",
     "emails.magicSession.signature": "Teamo {{project}}",
     "emails.recovery.subject": "Parsvorta Restarigo",
-     "emails.recovery.hello": "Saluton {{name}}",
+     "emails.recovery.hello": "Saluton {{user}}",
     "emails.recovery.body": "Alklaku ĉi tiun ligon por reagordi vian pasvorton. {{project}}",
     "emails.recovery.footer": "Se vi ne petis reagordi vian pasvorton, vi povas ignori ĉi tiun mesaĝon.",
     "emails.recovery.thanks": "Dankegon",
--- a/app/config/locale/translations/es.json
+++ b/app/config/locale/translations/es.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Equipo %s",
    "emails.verification.subject": "Verificación de cuenta",
-    "emails.verification.hello": "Hola {{name}}",
+    "emails.verification.hello": "Hola {{user}}",
    "emails.verification.body": "Haz clic en este enlace para verificar tu correo.",
    "emails.verification.footer": "Si no has solicitado verificar este correo, puedes ignorar este mensaje.",
    "emails.verification.thanks": "Gracias",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Gracias",
    "emails.magicSession.signature": "Equipo de {{project}}",
    "emails.recovery.subject": "Restablecer contraseña",
-    "emails.recovery.hello": "Hola {{name}}",
+    "emails.recovery.hello": "Hola {{user}}",
    "emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}.",
    "emails.recovery.footer": "Si no has solicitado restablecer la contraseña, puedes ignorar este mensaje.",
    "emails.recovery.thanks": "Gracias",
--- a/app/config/locale/translations/fa.json
+++ b/app/config/locale/translations/fa.json
@ -4,29 +4,29 @@
    "settings.direction": "rtl",
    "emails.sender": "تیم %s",
    "emails.verification.subject": "تأیید حساب",
-    "emails.verification.hello": "سلام {{name}}",
+    "emails.verification.hello": "سلام {{user}}",
    "emails.verification.body": "برای تأیید ایمیل‌تان پیوند زیر را دنبال کنید.",
    "emails.verification.footer": "اگر شما درخواست تأیید حساب نداده‌اید، می‌توانید این پیام را نادیده بگیرید.",
    "emails.verification.thanks": "سپاس فراوان",
-    "emails.verification.signature": "تیم {{name}}",
+    "emails.verification.signature": "تیم {{user}}",
    "emails.magicSession.subject": "ورود به حساب کاربری",
    "emails.magicSession.hello": "سلام،",
    "emails.magicSession.body": "برای ورود به حساب‌تان پیوند زیر را دنبال کنید.",
    "emails.magicSession.footer": "اگر شما درخواست ورود به حساب کاربری با استفاده از این ایمیل را نداد‌ه‌اید، می‌توانید این پیام را نادیده بگیرید.",
    "emails.magicSession.thanks": "سپاس فراوان",
-    "emails.magicSession.signature": "تیم {{name}}",
+    "emails.magicSession.signature": "تیم {{user}}",
    "emails.recovery.subject": "بازیابی گذرواژه",
-    "emails.recovery.hello": "سلام {{name}}",
+    "emails.recovery.hello": "سلام {{user}}",
    "emails.recovery.body": "برای بازیابی گذرواژه‌تان پیوند زیر را دنبال کنید.",
    "emails.recovery.footer": "اگر شما درخواست بازیابی گذرواژه نداده‌اید، می‌توانید این پیام را نادیده بگیرید.",
    "emails.recovery.thanks": "سپاس فراوان",
-    "emails.recovery.signature": "تیم {{name}}",
+    "emails.recovery.signature": "تیم {{user}}",
    "emails.invitation.subject": "دعوت به تیم %s در %s",
    "emails.invitation.hello": "سلام",
    "emails.invitation.body": "این ایمیل برای شما فرستاده شده‌است زیرا {{owner}} می‌خواهد شما را به تیم {{team}} در پروژه‌ی {{project}} بیفزاید.",
    "emails.invitation.footer": "اگر علاقه ندارید، می‌توانید این پیام را نادیده بگیرید.",
    "emails.invitation.thanks": "سپاس فراوان",
-    "emails.invitation.signature": "تیم {{name}}",
+    "emails.invitation.signature": "تیم {{user}}",
    "locale.country.unknown": "ناشناخته",
    "countries.af": "افغانستان",
    "countries.ao": "آنگولا",
--- a/app/config/locale/translations/fr.json
+++ b/app/config/locale/translations/fr.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Équipe %s",
    "emails.verification.subject": "Vérification du compte",
-    "emails.verification.hello": "Bonjour {{name}}",
+    "emails.verification.hello": "Bonjour {{user}}",
    "emails.verification.body": "Suivez ce lien pour vérifier votre adresse e-mail.",
    "emails.verification.footer": "Si vous n'avez pas demandé à vérifier cette adresse, vous pouvez ignorer ce message.",
    "emails.verification.thanks": "Merci",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Merci",
    "emails.magicSession.signature": "L'équipe {{project}}",
    "emails.recovery.subject": "Réinitialisation du mot de passe",
-    "emails.recovery.hello": "Bonjour {{name}}",
+    "emails.recovery.hello": "Bonjour {{user}}",
    "emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{project}}.",
    "emails.recovery.footer": "Si vous n'avez pas demandé à réinitialiser votre mot de passe, vous pouvez ignorer ce message.",
    "emails.recovery.thanks": "Merci",
--- a/app/config/locale/translations/ga.json
+++ b/app/config/locale/translations/ga.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Foireann",
    "emails.verification.subject": "Fíoraithe cuntais",
-    "emails.verification.hello": "Haigh {{name}}",
+    "emails.verification.hello": "Haigh {{user}}",
    "emails.verification.body": "Lean an nasc seo chun do ríomhphost a fhíorú.",
    "emails.verification.footer": "Mura ndearna tú iarratas an seoladh seo a fhíoru, déan neamhaird den teachtaireacht seo.",
    "emails.verification.thanks": "Go raibh maith agat",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Go raibh maith agat",
    "emails.magicSession.signature": "{{project}} foireann",
    "emails.recovery.subject": "Athshocrú pasfhocail",
-    "emails.recovery.hello": "Haigh {{name}}",
+    "emails.recovery.hello": "Haigh {{user}}",
    "emails.recovery.body": "Lean an nasc seo chun do pasfhocal {{project}} a athshocrú.",
    "emails.recovery.footer": "Mura ndearna tú iarratas do pasfhocal a athshocrú, déan neamhaird den teachtaireacht seo.",
    "emails.recovery.thanks": "Go raibh maith agat",
--- a/app/config/locale/translations/gu.json
+++ b/app/config/locale/translations/gu.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s ટીમ",
    "emails.verification.subject": "ખાતાની ચકાસણી",
-    "emails.verification.hello": "નમસ્કાર {{name}}",
+    "emails.verification.hello": "નમસ્કાર {{user}}",
    "emails.verification.body": "તમારું ઇમેઇલ સરનામું ચકાસવા માટે આ લિંકને અનુસરો.",
    "emails.verification.footer": "જો તમે આ સરનામાંની ચકાસણી કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
    "emails.verification.thanks": "આભાર",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "આભાર",
    "emails.magicSession.signature": "{{project}} ટીમ",
    "emails.recovery.subject": "પાસવર્ડ ફરીથી સેટ કરો",
-    "emails.recovery.hello": "નમસ્કાર {{name}}",
+    "emails.recovery.hello": "નમસ્કાર {{user}}",
    "emails.recovery.body": "તમારો {{project}} પાસવર્ડ ફરીથી સેટ કરવા માટે આ લિંકને અનુસરો.",
    "emails.recovery.footer": "જો તમે તમારો પાસવર્ડ ફરીથી સેટ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
    "emails.recovery.thanks": "આભાર",
--- a/app/config/locale/translations/he.json
+++ b/app/config/locale/translations/he.json
@ -4,7 +4,7 @@
    "settings.direction": "rtl",
    "emails.sender": "צוות %s",
    "emails.verification.subject": "אימות חשבון",
-    "emails.verification.hello": "שלום {{name}}",
+    "emails.verification.hello": "שלום {{user}}",
    "emails.verification.body": "לחץ על קישור זה כדי לאמת את כתובת הדוא\"ל שלך.",
    "emails.verification.footer": "אם לא ביקשת לאמת כתובת זו, תוכל להתעלם מהודעה זו.",
    "emails.verification.thanks": "תודה",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "תודה",
    "emails.magicSession.signature": "צוות {{project}}",
    "emails.recovery.subject": "איפוס סיסמא",
-    "emails.recovery.hello": "שלום {{name}}",
+    "emails.recovery.hello": "שלום {{user}}",
    "emails.recovery.body": "עקוב אחר קישור זה כדי לאפס את סיסמתך ב-{{project}}.",
    "emails.recovery.footer": "אם לא ביקשת לאפס את הסיסמה, תוכל להתעלם מהודעה זו.",
    "emails.recovery.thanks": "תודה",
--- a/app/config/locale/translations/hi.json
+++ b/app/config/locale/translations/hi.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s टीम",
    "emails.verification.subject": "अकाउंट वेरिफिकेशन ",
-    "emails.verification.hello": "नमस्ते {{name}}",
+    "emails.verification.hello": "नमस्ते {{user}}",
    "emails.verification.body": "इस लिंक के माध्यम से अपने ईमेल को सत्यापित कीजिये।",
    "emails.verification.footer": "यदि आप इस पते को सत्यापित नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
    "emails.verification.thanks": "धन्यवाद",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "धन्यवाद",
    "emails.magicSession.signature": "{{project}} टीम",
    "emails.recovery.subject": "पासवर्ड रीसेट",
-    "emails.recovery.hello": "नमस्ते {{name}}",
+    "emails.recovery.hello": "नमस्ते {{user}}",
    "emails.recovery.body": "इस लिंक के माध्यम से अपना {{project}} पासवर्ड रीसेट करें।",
    "emails.recovery.footer": "यदि आप अपना पासवर्ड रीसेट नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
    "emails.recovery.thanks": "धन्यवाद",
--- a/app/config/locale/translations/hr.json
+++ b/app/config/locale/translations/hr.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Tim",
    "emails.verification.subject": "Verifikacija računa",
-    "emails.verification.hello": "Pozdrav {{name}}",
+    "emails.verification.hello": "Pozdrav {{user}}",
    "emails.verification.body": "Slijedite ovu poveznicu da biste potvrdili svoju adresu e-pošte.",
    "emails.verification.footer": "Ukoliko niste zatražili potvrdu ove adrese, možete zanemariti ovu poruku.",
    "emails.verification.thanks": "Hvala",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Hvala",
    "emails.magicSession.signature": "{{project}} tim",
    "emails.recovery.subject": "Ponovno postavljanje lozinke",
-    "emails.recovery.hello": "Pozdrav {{name}}",
+    "emails.recovery.hello": "Pozdrav {{user}}",
    "emails.recovery.body": "Slijedite ovu poveznicu za ponovno postavljanje {{project}} lozinke.",
    "emails.recovery.footer": "Ako niste zatražili ponovno postavljanje Vaše lozinke, možete zanemariti ovu poruku.",
    "emails.recovery.thanks": "Hvala",
--- a/app/config/locale/translations/hu.json
+++ b/app/config/locale/translations/hu.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Csapat",
    "emails.verification.subject": "Fiók Megerősítése",
-    "emails.verification.hello": "Szia {{name}}",
+    "emails.verification.hello": "Szia {{user}}",
    "emails.verification.body": "Kattints a linkre, hogy megerősítsd az email címedet.",
    "emails.verification.footer": "Ha nem te kérted a címed megerősítését, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
    "emails.verification.thanks": "Köszönettel",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Köszönettel",
    "emails.magicSession.signature": "a {{project}} csapat",
    "emails.recovery.subject": "Jelszó Visszaállítása",
-    "emails.recovery.hello": "Hahó, {{name}}",
+    "emails.recovery.hello": "Hahó, {{user}}",
    "emails.recovery.body": "Kattints a linkre a {{project}} jelszavad visszaállításához.",
    "emails.recovery.footer": "Ha nem te kezdeményezted a jelszavad visszaállítását, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
    "emails.recovery.thanks": "Köszönettel",
--- a/app/config/locale/translations/id.json
+++ b/app/config/locale/translations/id.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Tim %s",
    "emails.verification.subject": "Verifikasi Akun",
-    "emails.verification.hello": "Hai {{name}}",
+    "emails.verification.hello": "Hai {{user}}",
    "emails.verification.body": "Ikuti tautan ini untuk memverifikasi alamat email Anda.",
    "emails.verification.footer": "Jika Anda tidak meminta untuk memverifikasi alamat email ini, Anda dapat mengabaikan pesan ini.",
    "emails.verification.thanks": "Terima kasih",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Terima kasih",
    "emails.magicSession.signature": "Tim {{project}}",
    "emails.recovery.subject": "Atur Ulang Kata Sandi",
-    "emails.recovery.hello": "Halo {{name}}",
+    "emails.recovery.hello": "Halo {{user}}",
    "emails.recovery.body": "Ikuti tautan ini untuk menyetel ulang kata sandi {{project}} Anda.",
    "emails.recovery.footer": "Jika Anda tidak meminta untuk menyetel ulang kata sandi, Anda dapat mengabaikan pesan ini.",
    "emails.recovery.thanks": "Terima kasih",
--- a/app/config/locale/translations/it.json
+++ b/app/config/locale/translations/it.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Team %s",
    "emails.verification.subject": "Verifica account",
-    "emails.verification.hello": "Ciao {{name}}",
+    "emails.verification.hello": "Ciao {{user}}",
    "emails.verification.body": "Clicca questo link per verificare il tuo indirizzo email.",
    "emails.verification.footer": "Se non hai richiesto la verifica dell’indirizzo email, puoi ignorare questo messaggio.",
    "emails.verification.thanks": "Grazie",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Grazie",
    "emails.magicSession.signature": "Il team {{project}}",
    "emails.recovery.subject": "Reimpostazione password",
-    "emails.recovery.hello": "Ciao {{name}}",
+    "emails.recovery.hello": "Ciao {{user}}",
    "emails.recovery.body": "Clicca questo link per reimpostare la tua password di {{project}}.",
    "emails.recovery.footer": "Se non hai richiesto la reimpostazione della password, puoi ignorare questo messaggio.",
    "emails.recovery.thanks": "Grazie",
--- a/app/config/locale/translations/ja.json
+++ b/app/config/locale/translations/ja.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s チーム",
    "emails.verification.subject": "アカウント認証",
-    "emails.verification.hello": "こんにちは{{name}}さん",
+    "emails.verification.hello": "こんにちは{{user}}さん",
    "emails.verification.body": "メールアドレスを有効化するためには下記リンクをクリックして下さい。",
    "emails.verification.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
    "emails.verification.thanks": "ご利用いただきありがとうございます。",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ご利用いただきありがとうございます。",
    "emails.magicSession.signature": "{{project}}チーム",
    "emails.recovery.subject": "パスワードリセット",
-    "emails.recovery.hello": "こんにちは{{name}}さん",
+    "emails.recovery.hello": "こんにちは{{user}}さん",
    "emails.recovery.body": "パスワードをリセットするためには下記リンクをクリックしてください。",
    "emails.recovery.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
    "emails.recovery.thanks": "ご利用いただきありがとうございます。",
--- a/app/config/locale/translations/jv.json
+++ b/app/config/locale/translations/jv.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Tim %s",
    "emails.verification.subject": "Verifikasi Akun",
-    "emails.verification.hello": "Hai {{name}}",
+    "emails.verification.hello": "Hai {{user}}",
    "emails.verification.body": "Klik link iki kanggo verifikasi alamat email sampeyan.",
    "emails.verification.footer": "Yen sampeyan ora njaluk verifikasi alamat iki, sampeyan iso nglirwakake pesen iki.",
    "emails.verification.thanks": "Matur nuwun",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Matur nuwun",
    "emails.magicSession.signature": "Tim {{project}}",
    "emails.recovery.subject": "Setel ulang sandi",
-    "emails.recovery.hello": "Halo {{name}}",
+    "emails.recovery.hello": "Halo {{user}}",
    "emails.recovery.body": "Klik link iki kanggo setel ulang sandi {{project}}.",
    "emails.recovery.footer": "Yen sampeyan ora njaluk setel ulang sandi, sampeyan iso nglirwakake pesen iki.",
    "emails.recovery.thanks": "Matur nuwun",
--- a/app/config/locale/translations/kn.json
+++ b/app/config/locale/translations/kn.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s ತಂಡ",
    "emails.verification.subject": "ಖಾತೆ ಪರಿಶೀಲನೆ",
-    "emails.verification.hello": "ನಮಸ್ಕಾರ {{name}}",
+    "emails.verification.hello": "ನಮಸ್ಕಾರ {{user}}",
    "emails.verification.body": "ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗೆ ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
    "emails.verification.footer": "ನೀವು ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗೆ ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
    "emails.verification.thanks": "ಧನ್ಯವಾದಗಳು",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ಧನ್ಯವಾದಗಳು",
    "emails.magicSession.signature": "{{project}} ತಂಡ",
    "emails.recovery.subject": "ಗುಪ್ತಪದ ಮರುಹೊಂದಿಸಿ",
-    "emails.recovery.hello": "ನಮಸ್ಕಾರ {{name}}",
+    "emails.recovery.hello": "ನಮಸ್ಕಾರ {{user}}",
    "emails.recovery.body": "ನಿಮ್ಮ {{project}} ಗುಪ್ತಪದವನ್ನು ಮರುಹೊಂದಿಸಲು ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
    "emails.recovery.footer": "ನೀವು ಗುಪ್ತಪದವನ್ನು ಮರುಹೊಂದಿಸಲು ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
    "emails.recovery.thanks": "ಧನ್ಯವಾದಗಳು",
--- a/app/config/locale/translations/ko.json
+++ b/app/config/locale/translations/ko.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s 팀",
    "emails.verification.subject": "계정 인증",
-    "emails.verification.hello": "안녕하세요 {{name}}님",
+    "emails.verification.hello": "안녕하세요 {{user}}님",
    "emails.verification.body": "이메일 인증을 위해 링크를 클릭하여주세요.",
    "emails.verification.footer": "이메일 인증을 부탁하지 않으셨다면 이 메시지를 무시하여주세요.",
    "emails.verification.thanks": "감사합니다",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "감사합니다",
    "emails.magicSession.signature": "{{project}} 팀",
    "emails.recovery.subject": "비밀번호 재설정",
-    "emails.recovery.hello": "안녕하세요 {{name}}님",
+    "emails.recovery.hello": "안녕하세요 {{user}}님",
    "emails.recovery.body": "{{project}}의 비밀번호 재설정을 위해 링크를 클릭하여주세요.",
    "emails.recovery.footer": "비밀번호 재설정 신청을 하지 않으셨다면 이 메세지를 무시하여주세요.",
    "emails.recovery.thanks": "감사합니다",
--- a/app/config/locale/translations/la.json
+++ b/app/config/locale/translations/la.json
@ -4,7 +4,7 @@
  "settings.direction": "ltr*",
  "emails.sender": "%s team",
  "emails.verification.subject": "Ratio comprobatio",
-  "emails.verification.hello": "Salve ibi {{name}}",
+  "emails.verification.hello": "Salve ibi {{user}}",
  "emails.verification.body": "Sequere hanc nexum ut quin inscriptionem tuum.",
  "emails.verification.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.",
  "emails.verification.thanks": "Gratias",
@ -16,7 +16,7 @@
  "emails.magicSession.thanks": "Gratias",
  "emails.magicSession.signature": "{{project}} team",
  "emails.recovery.subject": "Recuperet password",
-  "emails.recovery.hello": "Salve ibi {{name}}",
+  "emails.recovery.hello": "Salve ibi {{user}}",
  "emails.recovery.body": "Sequere hanc conjunctionem ut recipias project password {{project}}",
  "emails.recovery.footer": "Si tesseram tuam recuperare non petis, nuntium hunc ignorare potes",
  "emails.recovery.thanks": "Gratias",
--- a/app/config/locale/translations/lb.json
+++ b/app/config/locale/translations/lb.json
@ -4,7 +4,7 @@
  "settings.direction": "ltr",
  "emails.sender": "%s Team",
  "emails.verification.subject": "Kont Verifikatioun",
-  "emails.verification.hello": "Hey {{name}}",
+  "emails.verification.hello": "Hey {{user}}",
  "emails.verification.body": "Follegt dëse Link fir Är E -Mail Adress z'iwwerpréiwen.",
  "emails.verification.footer": "Wann Dir net gefrot hutt dës Adress z'iwwerpréiwen, kënnt Dir dëse Message ignoréieren.",
  "emails.verification.thanks": "Merci",
@ -16,7 +16,7 @@
  "emails.magicSession.thanks": "Merci",
  "emails.magicSession.signature": "{{project}} équipe",
  "emails.recovery.subject": "Password Reset",
-  "emails.recovery.hello": "Hello {{name}}",
+  "emails.recovery.hello": "Hello {{user}}",
  "emails.recovery.body": "Follegt dëse Link fir Äert {{project}} Passwuert zréckzesetzen.",
  "emails.recovery.footer": "Wann Dir net gefrot hutt Äert Passwuert zréckzesetzen, kënnt Dir dëse Message ignoréieren.",
  "emails.recovery.thanks": "Merci",
--- a/app/config/locale/translations/lt.json
+++ b/app/config/locale/translations/lt.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s komanda",
    "emails.verification.subject": "Paskyros Patvirtinimas",
-    "emails.verification.hello": "Labas {{name}}",
+    "emails.verification.hello": "Labas {{user}}",
    "emails.verification.body": "Spauskite šią nuorodą, kad patvirtintumėte savo el. paštą.",
    "emails.verification.footer": "Jei neprašėte patvirtinti šio el. pašto, galite ignoruoti šį pranešimą.",
    "emails.verification.thanks": "Ačiū",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Ačiū",
    "emails.magicSession.signature": "{{project}} komanda",
    "emails.recovery.subject": "Slaptažodžio Atkūrimas",
-    "emails.recovery.hello": "Labas {{name}}",
+    "emails.recovery.hello": "Labas {{user}}",
    "emails.recovery.body": "Spauskite šią nuorodą, kad atkurtumėte projekto {{project}} slaptažodį.",
    "emails.recovery.footer": "Jei neprašėte atkurti savo slaptažodzio, galite ignoruoti šį pranešimą.",
    "emails.recovery.thanks": "Ačiū",
--- a/app/config/locale/translations/lv.json
+++ b/app/config/locale/translations/lv.json
@ -4,7 +4,7 @@
 	"settings.direction": "ltr",
 	"emails.sender": "%s komanda",
 	"emails.verification.subject": "Konta verifikācija",
-	"emails.verification.hello": "Sveicināti, {{name}}",
+	"emails.verification.hello": "Sveicināti, {{user}}",
 	"emails.verification.body": "Sekojiet saitei, lai apstiprinātu savu e-pasta adresi.",
 	"emails.verification.footer": "Ja Jūs nepieprasījāt šīs adreses apstiprinājumu, lūdzu, ignorējiet šo ziņu.",
 	"emails.verification.thanks": "Paldies",
@ -16,7 +16,7 @@
 	"emails.magicSession.thanks": "Paldies",
 	"emails.magicSession.signature": "{{project}} komanda",
 	"emails.recovery.subject": "Paroles atjaunināšana",
-	"emails.recovery.hello": "Labdien, {{name}}",
+	"emails.recovery.hello": "Labdien, {{user}}",
 	"emails.recovery.body": "Sekojiet saitei, lai atjauninātu {{project}} paroli.",
 	"emails.recovery.footer": "Ja Jūs nepieprasījāt paroles atjaunināšanu, lūdzu, ignorējiet šo ziņu.",
 	"emails.recovery.thanks": "Paldies",
--- a/app/config/locale/translations/ml.json
+++ b/app/config/locale/translations/ml.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s ടീം",
    "emails.verification.subject": "അക്കൗണ്ട് സ്ഥിരീകരണം",
-    "emails.verification.hello": "നമസ്കാരം {{name}}",
+    "emails.verification.hello": "നമസ്കാരം {{user}}",
    "emails.verification.body": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം സ്ഥിരീകരിക്കുന്നതിനായി ഈ ലിങ്ക് പിന്തുടരുക.",
    "emails.verification.footer": "ഈ വിലാസം സ്ഥിരീകരിക്കാന്‍ നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, നിങ്ങൾക്ക് ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
    "emails.verification.thanks": "നന്ദി",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "നന്ദി",
    "emails.magicSession.signature": "{{project}} ടീം",
    "emails.recovery.subject": "രഹസ്യവാക്ക് പുനക്രമീകരണം",
-    "emails.recovery.hello": "നമസ്കാരം {{name}}",
+    "emails.recovery.hello": "നമസ്കാരം {{user}}",
    "emails.recovery.body": "നിങ്ങളുടെ {{Project}} രഹസ്യവാക്ക് പുനക്രമീകരിക്കുന്നതിന് ഈ ലിങ്ക് പിന്തുടരുക.",
    "emails.recovery.footer": "നിങ്ങളുടെ രഹസ്യവാക്ക് പുനക്രമീകരിക്കാന്‍ നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
    "emails.recovery.thanks": "നന്ദി",
--- a/app/config/locale/translations/mr.json
+++ b/app/config/locale/translations/mr.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s टीम",
    "emails.verification.subject": "खाते सत्यापन",
-    "emails.verification.hello": "नमस्कार {{name}}",
+    "emails.verification.hello": "नमस्कार {{user}}",
    "emails.verification.body": "आपला ईमेल पत्ता सत्यापित करण्यासाठी या दुव्याचे अनुसरण करा.",
    "emails.verification.footer": "आपण या पत्त्याची पडताळणी करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
    "emails.verification.thanks": "धन्यवाद",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "धन्यवाद",
    "emails.magicSession.signature": "{{project}} संघ",
    "emails.recovery.subject": "पासवर्ड रीसेट",
-    "emails.recovery.hello": "नमस्कार {{name}}",
+    "emails.recovery.hello": "नमस्कार {{user}}",
    "emails.recovery.body": "आपला {{project}}चे पासवर्ड रीसेट करण्यासाठी या लिंकचे अनुसरण करा",
    "emails.recovery.footer": "आपण आपला पासवर्ड रीसेट करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
    "emails.recovery.thanks": "धन्यवाद",
--- a/app/config/locale/translations/ms.json
+++ b/app/config/locale/translations/ms.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Pengesahan Akaun",
-    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.hello": "Hey {{user}}",
    "emails.verification.body": "Tekan pautan ini untuk mengesahkan alamat email anda.",
    "emails.verification.footer": "Sekiranya anda tidak membuat permintaan untuk mengesahkan email ini, sila abaikan mesej ini.",
    "emails.verification.thanks": "Terima kasih",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Terima kasih",
    "emails.magicSession.signature": "{{project}} team",
    "emails.recovery.subject": "Menetap semula Kata Laluan",
-    "emails.recovery.hello": "Hello {{name}}",
+    "emails.recovery.hello": "Hello {{user}}",
    "emails.recovery.body": "Tekan pautan ini untuk menetapkan semula kata laluan {{project}}.",
    "emails.recovery.footer": "Sekiranya anda tidak membuat permintaan menetap semula kata laluan, sila abaikan mesej ini.",
    "emails.recovery.thanks": "Terima kasih",
--- a/app/config/locale/translations/nb.json
+++ b/app/config/locale/translations/nb.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Kontobekreftelse",
-    "emails.verification.hello": "Hei {{name}}",
+    "emails.verification.hello": "Hei {{user}}",
    "emails.verification.body": "Følg denne lenken for å bekrefte din e-postadresse.",
    "emails.verification.footer": "Dersom du ikke ba om å bekrefte e-postadressen, kan du se bort fra denne meldingen.",
    "emails.verification.thanks": "Takk",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Takk",
    "emails.magicSession.signature": "{{project}} team",
    "emails.recovery.subject": "Nullstille passord",
-    "emails.recovery.hello": "Hei {{name}}",
+    "emails.recovery.hello": "Hei {{user}}",
    "emails.recovery.body": "Følg denne lenken for å nullstille ditt {{project}} passord.",
    "emails.recovery.footer": "Dersom du ikke ba om å nullstille passordet ditt, kan du se bort fra denne meldingen.",
    "emails.recovery.thanks": "Takk",
--- a/app/config/locale/translations/ne.json
+++ b/app/config/locale/translations/ne.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s समूह",
    "emails.verification.subject": "खाता प्रमाणिकरण",
-    "emails.verification.hello": "नमस्ते {{name}}",
+    "emails.verification.hello": "नमस्ते {{user}}",
    "emails.verification.body": "इमेल ठेगाना प्रमाणित गर्नको लागी यो लिंकमा जानुहोस।",
    "emails.verification.footer": "यदि तपाइँले आफ्नो खाता प्रमाणित गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
    "emails.verification.thanks": "धन्यवाद",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "धन्यवाद",
    "emails.magicSession.signature": "{{project}} समूह",
    "emails.recovery.subject": "पासवर्ड रिसेट",
-    "emails.recovery.hello": "नमस्ते {{name}}",
+    "emails.recovery.hello": "नमस्ते {{user}}",
    "emails.recovery.body": "{{project}}को पासवर्ड रिसेट गर्नको लागी यो लिंकमा जानुहोस।",
    "emails.recovery.footer": "यदि तपाइँले आफ्नो पासवर्ड रिसेट गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
    "emails.recovery.thanks": "धन्यवाद",
--- a/app/config/locale/translations/nl.json
+++ b/app/config/locale/translations/nl.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Account Verificatie",
-    "emails.verification.hello": "Hoi {{name}}",
+    "emails.verification.hello": "Hoi {{user}}",
    "emails.verification.body": "Volg deze link om uw e-mail te verifieren",
    "emails.verification.footer": "Als u geen aanvraag voor verificatie heeft gemaakt, kan u deze mail negeren",
    "emails.verification.thanks": "Bedankt",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Bedankt",
    "emails.magicSession.signature": "{{project}} team",
    "emails.recovery.subject": "Wachtwoord Herinstellen",
-    "emails.recovery.hello": "Hallo {{name}}",
+    "emails.recovery.hello": "Hallo {{user}}",
    "emails.recovery.body": "Volg deze link om het wachtwoord van uw project {{project}} te wijzigen",
    "emails.recovery.footer": "Als u geen aanvraag heeft gemaakt om uw wachtwoord te wijzigen, kan u deze mail negeren",
    "emails.recovery.thanks": "Bedankt",
--- a/app/config/locale/translations/nn.json
+++ b/app/config/locale/translations/nn.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Team",
    "emails.verification.subject": "Kontostadfesting",
-    "emails.verification.hello": "Hallo {{name}}",
+    "emails.verification.hello": "Hallo {{user}}",
    "emails.verification.body": "Følg denne lenkja for å bekrefta din e-postadresse.",
    "emails.verification.footer": "Om du ikkje bad om å bekrefta e-postadressa, kan du ignorera denne meldinga.",
    "emails.verification.thanks": "Takk",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Takk",
    "emails.magicSession.signature": "{{project}} team",
    "emails.recovery.subject": "Nullstilla passord",
-    "emails.recovery.hello": "Hallo {{name}}",
+    "emails.recovery.hello": "Hallo {{user}}",
    "emails.recovery.body": "Følg denne lenkja for å nullstilla ditt {{project}} passord.",
    "emails.recovery.footer": "Om du ikkje ba om å nullstilla passordet ditt, kan du ignorera denne meldinga.",
    "emails.recovery.thanks": "Takk",
--- a/app/config/locale/translations/or.json
+++ b/app/config/locale/translations/or.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s ଦଳ",
    "emails.verification.subject": "ଖାତା ଯାଞ୍ଚ",
-    "emails.verification.hello": "ନମସ୍କାର {{name}}",
+    "emails.verification.hello": "ନମସ୍କାର {{user}}",
    "emails.verification.body": "ଆପଣଙ୍କର ଇମେଲ୍ ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଅନୁସରଣ କରନ୍ତୁ |",
    "emails.verification.footer": "ଯଦି ଆପଣ ଏହି ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
    "emails.verification.thanks": "ଧନ୍ୟବାଦ",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ଧନ୍ୟବାଦ",
    "emails.magicSession.signature": "{{project}} ଦଳ",
    "emails.recovery.subject": "ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରନ୍ତୁ |",
-    "emails.recovery.hello": "ନମସ୍କାର {{name}}",
+    "emails.recovery.hello": "ନମସ୍କାର {{user}}",
    "emails.recovery.body": "ଆପଣଙ୍କର {{project}} ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରିବାକୁ ଏହି ଲିଙ୍କକୁ ଅନୁସରଣ କରନ୍ତୁ |",
    "emails.recovery.footer": "ଯଦି ଆପଣ ଆପଣଙ୍କର ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
    "emails.recovery.thanks": "ଧନ୍ୟବାଦ",
--- a/app/config/locale/translations/pl.json
+++ b/app/config/locale/translations/pl.json
@ -4,7 +4,7 @@
  "settings.direction": "ltr",
  "emails.sender": "Zespół %s",
  "emails.verification.subject": "Weryfikacja konta",
-  "emails.verification.hello": "Cześć {{name}}",
+  "emails.verification.hello": "Cześć {{user}}",
  "emails.verification.body": "Przejdź do tego linku, aby zweryfikować swój adres e-mail.",
  "emails.verification.footer": "Jeśli to nie Ty prosiłeś o zweryfikowanie tego adresu, zignoruj tę wiadomość.",
  "emails.verification.thanks": "Dziękujemy",
@ -16,7 +16,7 @@
  "emails.magicSession.thanks": "Dziękujemy",
  "emails.magicSession.signature": "Zespół {{project}}",
  "emails.recovery.subject": "Resetowanie hasła",
-  "emails.recovery.hello": "Cześć {{name}}",
+  "emails.recovery.hello": "Cześć {{user}}",
  "emails.recovery.body": "Przejdź do tego linku, aby zresetować hasło dla {{project}}.",
  "emails.recovery.footer": "Jeśli to nie Ty prosiłeś o zresetowanie swojego hasła, zignoruj tę wiadomość.",
  "emails.recovery.thanks": "Dziękujemy",
--- a/app/config/locale/translations/pt-br.json
+++ b/app/config/locale/translations/pt-br.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Time %s",
    "emails.verification.subject": "Verificação da Conta",
-    "emails.verification.hello": "Olá {{name}}",
+    "emails.verification.hello": "Olá {{user}}",
    "emails.verification.body": "Clique neste link para verificar o seu endereço de e-mail.",
    "emails.verification.footer": "Se você não solicitou a verificação deste e-mail, ignore essa mensagem.",
    "emails.verification.thanks": "Muito obrigado",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Muito obrigado",
    "emails.magicSession.signature": "Time {{project}}",
    "emails.recovery.subject": "Redefinição de senha",
-    "emails.recovery.hello": "Olá {{name}}",
+    "emails.recovery.hello": "Olá {{user}}",
    "emails.recovery.body": "Clique neste link para redefinir sua senha do {{project}}.",
    "emails.recovery.footer": "Se você não solicitou a redefinição da sua senha, você pode ignorar essa mensagem.",
    "emails.recovery.thanks": "Muito obrigado",
--- a/app/config/locale/translations/pt-pt.json
+++ b/app/config/locale/translations/pt-pt.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Equipa %s",
    "emails.verification.subject": "Verificação de contas",
-    "emails.verification.hello": "Hey {{name}}",
+    "emails.verification.hello": "Hey {{user}}",
    "emails.verification.body": "Siga esta ligação para verificar o seu endereço de correio electrónico.",
    "emails.verification.footer": "Se não pediu para verificar este endereço, pode ignorar esta mensagem.",
    "emails.verification.thanks": "Obrigado",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Obrigado",
    "emails.magicSession.signature": "Equipa {{project}}",
    "emails.recovery.subject": "Redefinição de senha",
-    "emails.recovery.hello": "Olá {{name}}",
+    "emails.recovery.hello": "Olá {{user}}",
    "emails.recovery.body": "Utilize este link para redefinir a palavra-passe do seu projecto {{project}}",
    "emails.recovery.footer": "Se não pediu para redefinir a sua palavra-passe, pode ignorar esta mensagem.",
    "emails.recovery.thanks": "Obrigado",
--- a/app/config/locale/translations/ro.json
+++ b/app/config/locale/translations/ro.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Echipa",
    "emails.verification.subject": "Verificare cont",
-    "emails.verification.hello": "Bună ziua, {{name}}",
+    "emails.verification.hello": "Bună ziua, {{user}}",
    "emails.verification.body": "Click pe acest link pentru a valida adresa de email.",
    "emails.verification.footer": "Dacă nu ai cerut validarea adresei de email, poți ignora acest mesaj.",
    "emails.verification.thanks": "Mulțumim",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Mulțumim",
    "emails.magicSession.signature": "Echipa {{project}}",
    "emails.recovery.subject": "Resetare parolă",
-    "emails.recovery.hello": "Bună ziua, {{name}}",
+    "emails.recovery.hello": "Bună ziua, {{user}}",
    "emails.recovery.body": "Click aici pentru a reseta parola pentru {{project}}",
    "emails.recovery.footer": "Dacă nu ai cerut să îți schimbi parola, ignoră acest mesaj.",
    "emails.recovery.thanks": "Mulțumim",
--- a/app/config/locale/translations/ru.json
+++ b/app/config/locale/translations/ru.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Команда %s",
    "emails.verification.subject": "Верификация аккаунта",
-    "emails.verification.hello": "Здравствуйте, {{name}}",
+    "emails.verification.hello": "Здравствуйте, {{user}}",
    "emails.verification.body": "Перейдите по ссылке, чтобы подтвердить свой адрес электронной почты.",
    "emails.verification.footer": "Если вы не запрашивали подтверждение этого адреса, проигнорируйте это сообщение.",
    "emails.verification.thanks": "Спасибо",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Спасибо",
    "emails.magicSession.signature": "команда {{project}}",
    "emails.recovery.subject": "Сброс пароля",
-    "emails.recovery.hello": "Здравствуйте, {{name}}",
+    "emails.recovery.hello": "Здравствуйте, {{user}}",
    "emails.recovery.body": "Перейдите по этой ссылке для того чтобы сбросить свой пароль для проекта {{project}}",
    "emails.recovery.footer": "Если вы не запрашивали сброс пароля, проигнорируйте это сообщение.",
    "emails.recovery.thanks": "Спасибо",
--- a/app/config/locale/translations/sa.json
+++ b/app/config/locale/translations/sa.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s गणः",
    "emails.verification.subject": "पञ्जिकानिर्णायनम्‌",
-    "emails.verification.hello": "अयि {{name}}",
+    "emails.verification.hello": "अयि {{user}}",
    "emails.verification.body": "ई-पत्रनिर्णायनार्थमिदं संयोगसूत्रमनुसरतु।",
    "emails.verification.footer": "यदि अस्य संकेतस्य निर्णायनं नेष्यते तर्हि वात्र्तामिमामुपेक्षताम्‌।",
    "emails.verification.thanks": "धन्यवादः",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "धन्यवादः",
    "emails.magicSession.signature": "{{project}} गणः",
    "emails.recovery.subject": "कूटशब्दपुनयाेजनम्‌",
-    "emails.recovery.hello": "अयि भो {{name}}",
+    "emails.recovery.hello": "अयि भो {{user}}",
    "emails.recovery.body": "{{project}} कूटशब्दपुनयाेजनाय संयोगमेनमनुसरतु।",
    "emails.recovery.footer": "यदि कूटशब्दस्य पुनयाेजनं नेष्यते तर्हि वात्र्तामिमामुपेक्षताम्‌।",
    "emails.recovery.thanks": "धन्यवादः",
--- a/app/config/locale/translations/sd.json
+++ b/app/config/locale/translations/sd.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s ٽيم",
    "emails.verification.subject": " اڪائونٽ جي تصديق",
-    "emails.verification.hello": "سلام {{name}}",
+    "emails.verification.hello": "سلام {{user}}",
    "emails.verification.body": "پنھنجي اي ميل ايڊريس جي تصديق ڪرڻ لاءِ ھن لنڪ تي عمل ڪريو.",
    "emails.verification.footer": "جيڪڏھن توھان نه پ askيا ھئا ھن ايڊريس جي تصديق ڪرڻ لاءِ ، توھان نظر انداز ڪري سگھوٿا ھن پيغام کي.",
    "emails.verification.thanks": "مهرباني",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "مهرباني",
    "emails.magicSession.signature": "{{project}} ٽيم",
    "emails.recovery.subject": "پاسورڊ ري سيٽ",
-    "emails.recovery.hello": "هيلو {{name}}",
+    "emails.recovery.hello": "هيلو {{user}}",
    "emails.recovery.body": "ھن لنڪ تي عمل ڪريو پنھنجو {{project}} پاسورڊ ري سيٽ ڪرڻ لاءِ.",
    "emails.recovery.footer": "جيڪڏھن توھان نه پ پيو ھو پنھنجي پاسورڊ کي ري سيٽ ڪرڻ لاءِ ، توھان نظر انداز ڪري سگھوٿا ھن پيغام کي.",
    "emails.recovery.thanks": "مهرباني",
--- a/app/config/locale/translations/si.json
+++ b/app/config/locale/translations/si.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s කණ්ඩායම",
    "emails.verification.subject": "ගිණුම් සත්‍යාපනය",
-    "emails.verification.hello": "හේයි {{name}}",
+    "emails.verification.hello": "හේයි {{user}}",
    "emails.verification.body": "ඔබගේ විද්‍යුත් තැපැල් ලිපිනය සත්‍යාපනය කිරීමට මෙම සම්බන්ධකය අනුගමනය කරන්න.",
    "emails.verification.footer": "මෙම ලිපිනය සත්‍යාපනය කරන ලෙස ඔබ ඉල්ලුවේ නැත්නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.",
    "emails.verification.thanks": "ස්තුතියි",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ස්තුතියි",
    "emails.magicSession.signature": "{{project}} කණ්ඩායම",
    "emails.recovery.subject": "මුරපද යළි පිහිටුවීම",
-    "emails.recovery.hello": "ආයුබෝවන් {{name}}",
+    "emails.recovery.hello": "ආයුබෝවන් {{user}}",
    "emails.recovery.body": "ඔබගේ {{project}} මුරපදය නැවත සැකසීමට මෙම සම්බන්ධකය අනුගමනය කරන්න.",
    "emails.recovery.footer": "ඔබගේ මුරපදය නැවත සකසන ලෙස ඔබ ඉල්ලුවේ නැත්නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.",
    "emails.recovery.thanks": "ස්තුතියි",
--- a/app/config/locale/translations/sk.json
+++ b/app/config/locale/translations/sk.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s Tím",
    "emails.verification.subject": "Overenie účtu",
-    "emails.verification.hello": "Ahoj {{name}}",
+    "emails.verification.hello": "Ahoj {{user}}",
    "emails.verification.body": "Použi tento link pre overenie svojej emailovej adresy.",
    "emails.verification.footer": "Ak si nepožiadal o overenie tejto adresy, môžeš túto správu ignorovať.",
    "emails.verification.thanks": "Ďakujeme.",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Ďakujeme",
    "emails.magicSession.signature": "{{project}} tím",
    "emails.recovery.subject": "Obnovenie hesla",
-    "emails.recovery.hello": "Ahoj {{name}}",
+    "emails.recovery.hello": "Ahoj {{user}}",
    "emails.recovery.body": "Použi tento link pre obnovenie svojho {{project}} hesla.",
    "emails.recovery.footer": "Ak si nepožiadal o obnovu svojho hesla, túto správu môžeš ignorovať.",
    "emails.recovery.thanks": "Ďakujeme",
--- a/app/config/locale/translations/sn.json
+++ b/app/config/locale/translations/sn.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Chikwata che%s",
    "emails.verification.subject": "Kuratidzi kuti ndiwe muridzi weakaundi",
-    "emails.verification.hello": "Hesi {{name}}",
+    "emails.verification.hello": "Hesi {{user}}",
    "emails.verification.body": "Tevedza chinongedzo ichi kuti uratidze kuti kero iyi ndeyako.",
    "emails.verification.footer": "Kana usina kukumbira kuti uratidze kuti kero iyi ndeyako, unogona kufuratira meseji iyi.",
    "emails.verification.thanks": "Ndatenda",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Ndatenda",
    "emails.magicSession.signature": "Chikwata che{{project}}",
    "emails.recovery.subject": "Kuchinja pasiwedhi",
-    "emails.recovery.hello": "Mhoro {{name}}",
+    "emails.recovery.hello": "Mhoro {{user}}",
    "emails.recovery.body": "Baya chinongedzo ichi kuti uchinje pasiwedhi yako ye{{project}}.",
    "emails.recovery.footer": "Kana usina kukumbira kuchinja pasiwedhi yako, unogona kufuratira meseji iyi.",
    "emails.recovery.thanks": "Ndatenda",
--- a/app/config/locale/translations/sv.json
+++ b/app/config/locale/translations/sv.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s-teamet",
    "emails.verification.subject": "Verifiera konto",
-    "emails.verification.hello": "Hej {{name}}",
+    "emails.verification.hello": "Hej {{user}}",
    "emails.verification.body": "Klicka på denna länk för att verifiera din email",
    "emails.verification.footer": "Om du inte bad om att verifiera den här e-postadressen kan du ignorera detta mail.",
    "emails.verification.thanks": "Tack",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Tack",
    "emails.magicSession.signature": "{{project}} teamet",
    "emails.recovery.subject": "Återställ lösenord",
-    "emails.recovery.hello": "Hej {{name}}",
+    "emails.recovery.hello": "Hej {{user}}",
    "emails.recovery.body": "Klicka på denna länk för att återställa lösenordet på {{project}}",
    "emails.recovery.footer": "Om du inte bad om att återställa ditt lösenord kan du ignorera detta mail.",
    "emails.recovery.thanks": "Tack",
--- a/app/config/locale/translations/ta.json
+++ b/app/config/locale/translations/ta.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s குழு",
    "emails.verification.subject": "கணக்கு சரிபார்ப்பு",
-    "emails.verification.hello": "ஏய் {{name}}",
+    "emails.verification.hello": "ஏய் {{user}}",
    "emails.verification.body": "உங்கள் மின்னஞ்சல் முகவரியைச் சரிபார்க்க இந்த இணைப்பைப் பின்தொடரவும்.",
    "emails.verification.footer": "இந்த முகவரியைச் சரிபார்க்கும்படி உங்களிடம் கேட்கப்படவில்லை என்றால், இந்தச் செய்தியை நீங்கள் புறக்கணிக்கலாம்.",
    "emails.verification.thanks": "நன்றி",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "நன்றி",
    "emails.magicSession.signature": "{{project}} குழு",
    "emails.recovery.subject": "கடவுச்சொல் மீட்டமைப்பு",
-    "emails.recovery.hello": "வணக்கம் {{name}}",
+    "emails.recovery.hello": "வணக்கம் {{user}}",
    "emails.recovery.body": "மீட்டமைக்க இந்த இணைப்பைப் பின்தொடரவும் {{project}} கடவுச்சொல்.",
    "emails.recovery.footer": "உங்கள் கடவுச்சொல்லை மீட்டமைக்கும்படி உங்களிடம் கேட்கப்படவில்லை என்றால், இந்தச் செய்தியை நீங்கள் புறக்கணிக்கலாம்.",
    "emails.recovery.thanks": "நன்றி",
--- a/app/config/locale/translations/te.json
+++ b/app/config/locale/translations/te.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s జట్టు",
    "emails.verification.subject": "ఖాతా ధృవీకరణ",
-    "emails.verification.hello": "నమస్కారము {{name}}",
+    "emails.verification.hello": "నమస్కారము {{user}}",
    "emails.verification.body": "ఈ లింక్ ద్వారా ఇమెయిల్ ని ధృవీకరించండి",
    "emails.verification.footer": "మీరు ఈ చిరునామాను ధృవీకరించమని అడగనట్లయితే, మీరు ఈ సందేశాన్ని విస్మరించవచ్చు",
    "emails.verification.thanks": "ధన్యవాదాలు",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ధన్యవాదాలు",
    "emails.magicSession.signature": "{{project}} జట్",
    "emails.recovery.subject": "పాస్వర్డ్ రీసెట్",
-    "emails.recovery.hello": "నమస్కారమ {{name}}",
+    "emails.recovery.hello": "నమస్కారమ {{user}}",
    "emails.recovery.body": "మీ {{project}} పాస్వర్డ్ ని రీసెట్ చేయడానికి ఈ లింక్ ని అనుసరించండి",
    "emails.recovery.footer": "మీరు మీ పాస్వర్డ్ ని రీసెట్ చేయమని అడగనట్లయితే, మీరు ఈ సందేశాన్ని విస్మరించవచ్చు",
    "emails.recovery.thanks": "ధన్యవాదాల",
--- a/app/config/locale/translations/th.json
+++ b/app/config/locale/translations/th.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "ทีม %s",
    "emails.verification.subject": "การยืนยันบัญชีผู้ใช้",
-    "emails.verification.hello": "เรียนคุณ {{name}}",
+    "emails.verification.hello": "เรียนคุณ {{user}}",
    "emails.verification.body": "กดเข้าไปที่ลิงก์นี้เพื่อยืนยันอีเมลของท่าน",
    "emails.verification.footer": "หากท่านไม่ได้ต้องการที่จะยืนยันอีเมลนี้ ท่านสามารถเพิกเฉยข้อความนี้ได้",
    "emails.verification.thanks": "ขอบคุณ",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "ขอบคุณ",
    "emails.magicSession.signature": "ทีม {{project}}",
    "emails.recovery.subject": "รีเซ็ตรหัสผ่าน",
-    "emails.recovery.hello": "เรียนคุณ {{name}}",
+    "emails.recovery.hello": "เรียนคุณ {{user}}",
    "emails.recovery.body": "กดเข้าไปที่ลิงก์นี้เพื่อรีเซ็ตรหัสผ่านสำหรับโปรเจกต์ {{project}} ของท่าน",
    "emails.recovery.footer": "หากท่านไม่ได้ต้องการที่จะรีเซ็ตรหัสผ่านของท่าน ท่านสามารถเพิกเฉยข้อความนี้ได้",
    "emails.recovery.thanks": "ขอบคุณ",
--- a/app/config/locale/translations/tl.json
+++ b/app/config/locale/translations/tl.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Pangkat ng %s",
    "emails.verification.subject": "Pagpapatunay ng account",
-    "emails.verification.hello": "Kamusta {{name}}",
+    "emails.verification.hello": "Kamusta {{user}}",
    "emails.verification.body": "Sundin ang link na ito upang ma-verify ang iyong email address.",
    "emails.verification.footer": "Kung hindi mo hiningi na i-verify ang address na ito, maaari mong balewalain ang mensahe na ito.",
    "emails.verification.thanks": "Salamat",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Salamat",
    "emails.magicSession.signature": "Pangkat ng {{project}}",
    "emails.recovery.subject": "I-reset ang password",
-    "emails.recovery.hello": "Kamusta {{name}}",
+    "emails.recovery.hello": "Kamusta {{user}}",
    "emails.recovery.body": "Sundin ang link na ito upang i-reset ang password ng iyong {{project}}.",
    "emails.recovery.footer": "Kung hindi mo hiningi na i-reset ang iyong password, maaari mong balewalain ang mensahe na ito.",
    "emails.recovery.thanks": "Salamat",
--- a/app/config/locale/translations/uk.json
+++ b/app/config/locale/translations/uk.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Команда %s",
    "emails.verification.subject": "Верифікація акаунта",
-    "emails.verification.hello": "Вітаємо, {{name}}",
+    "emails.verification.hello": "Вітаємо, {{user}}",
    "emails.verification.body": "Перейдіть за цим посиланням, щоб підтвердити свою електронну адресу.",
    "emails.verification.footer": "Якщо ви не запитували підтвердження цієї адреси, ви можете ігнорувати це повідомлення.",
    "emails.verification.thanks": "Дякуємо",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Дякуємо",
    "emails.magicSession.signature": "команда {{project}}",
    "emails.recovery.subject": "Скидання пароля",
-    "emails.recovery.hello": "Вітаємо, {{name}}",
+    "emails.recovery.hello": "Вітаємо, {{user}}",
    "emails.recovery.body": "Перейдіть за цим посиланням для того щоб скинути свій пароль для проекту {{project}}",
    "emails.recovery.footer": "Якщо ви не запитували скидання паролю, проігноруйте це повідомлення.",
    "emails.recovery.thanks": "Дякуємо",
--- a/app/config/locale/translations/ur.json
+++ b/app/config/locale/translations/ur.json
@ -4,7 +4,7 @@
    "settings.direction": "rtl",
    "emails.sender": "%s ٹیم",
    "emails.verification.subject": "اکاؤنٹ کی تصدیق",
-    "emails.verification.hello": "خوش آمدید {{name}}",
+    "emails.verification.hello": "خوش آمدید {{user}}",
    "emails.verification.body": "براہ کرم اپنے ای میل کی تصدیق کے لیے درج ذیل لنک پر عمل کریں۔",
    "emails.verification.footer": "اگر آپ نے اس پتے کی تصدیق کے لیے نہیں کہا تو آپ اس پیغام کو نظر انداز کر سکتے ہیں۔",
    "emails.verification.thanks": "شکریہ",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "شکریہ",
    "emails.magicSession.signature": "ٹیم۔ {{project}}",
    "emails.recovery.subject": "پاس ورڈ ری سیٹ۔",
-    "emails.recovery.hello": "ہیلو {{name}}",
+    "emails.recovery.hello": "ہیلو {{user}}",
    "emails.recovery.body": "{{project}} کا پاس ورڈ تبدیل کرنے کے لیے درج ذیل لنک پر عمل کریں",
    "emails.recovery.footer": "اگر آپ نے اپنا پاس ورڈ دوبارہ ترتیب دینے کے لیے نہیں کہا تو آپ اس پیغام کو نظر انداز کر سکتے ہیں۔",
    "emails.recovery.thanks": "شکریہ",
--- a/app/config/locale/translations/vi.json
+++ b/app/config/locale/translations/vi.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "Nhóm %s",
    "emails.verification.subject": "Xác minh tài khoản",
-    "emails.verification.hello": "Chào {{name}}",
+    "emails.verification.hello": "Chào {{user}}",
    "emails.verification.body": "Nhấn vào đường dẫn sau để xác minh địa chỉ email của bạn.",
    "emails.verification.footer": "Nếu bạn không yêu cầu xác minh tài khoản, bạn có thể bỏ qua email này.",
    "emails.verification.thanks": "Cảm ơn",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "Cảm ơn",
    "emails.magicSession.signature": "Nhóm {{project}}",
    "emails.recovery.subject": "Thiết lập lại mật khẩu",
-    "emails.recovery.hello": "Chào {{name}}",
+    "emails.recovery.hello": "Chào {{user}}",
    "emails.recovery.body": "Nhấn vào đường dẫn sau để thiết lập lại mật khẩu {{project}} của bạn.",
    "emails.recovery.footer": "Nếu bạn không yêu cầu thiết lập lại mật khẩu, bạn có thể bỏ qua email này.",
    "emails.recovery.thanks": "Cảm ơn",
--- a/app/config/locale/translations/zh-cn.json
+++ b/app/config/locale/translations/zh-cn.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s 小组",
    "emails.verification.subject": "帐户验证",
-    "emails.verification.hello": "你好 {{name}}",
+    "emails.verification.hello": "你好 {{user}}",
    "emails.verification.body": "点此链接验证您的电子邮件地址。",
    "emails.verification.footer": "如果您没有要求验证此地址，则可忽略此消息。",
    "emails.verification.thanks": "谢谢",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "谢谢",
    "emails.magicSession.signature": "{{project}} 团队",
    "emails.recovery.subject": "重设密码",
-    "emails.recovery.hello": "你好 {{name}}",
+    "emails.recovery.hello": "你好 {{user}}",
    "emails.recovery.body": "点此链接重置您的 {{project}} 密码。",
    "emails.recovery.footer": "如果您没有要求重置密码，则可以忽略此消息。",
    "emails.recovery.thanks": "谢谢",
--- a/app/config/locale/translations/zh-tw.json
+++ b/app/config/locale/translations/zh-tw.json
@ -4,7 +4,7 @@
    "settings.direction": "ltr",
    "emails.sender": "%s 小組",
    "emails.verification.subject": "帳戶驗證",
-    "emails.verification.hello": "嗨 {{name}}",
+    "emails.verification.hello": "嗨 {{user}}",
    "emails.verification.body": "按照此連結驗證您的電子郵件地址。",
    "emails.verification.footer": "如果您沒有要求驗證此地址，則可以忽略此消息。",
    "emails.verification.thanks": "謝謝",
@ -16,7 +16,7 @@
    "emails.magicSession.thanks": "謝謝",
    "emails.magicSession.signature": "{{project}} 團隊",
    "emails.recovery.subject": "重設密碼",
-    "emails.recovery.hello": "您好 {{name}}",
+    "emails.recovery.hello": "您好 {{user}}",
    "emails.recovery.body": "按照此連結重置您的 {{project}} 密碼。",
    "emails.recovery.footer": "如果您沒有要求重置密碼，則可以忽略此消息。",
    "emails.recovery.thanks": "謝謝",
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@ -15,7 +15,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '11.0.0',
+                'version' => '12.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@ -63,7 +63,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '9.0.0',
+                'version' => '10.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@ -81,7 +81,7 @@ return [
            [
                'key' => 'apple',
                'name' => 'Apple',
-                'version' => '2.0.0',
+                'version' => '3.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-apple',
                'package' => 'https://github.com/appwrite/sdk-for-apple',
                'enabled' => true,
@ -116,7 +116,7 @@ return [
            [
                'key' => 'android',
                'name' => 'Android',
-                'version' => '2.0.0',
+                'version' => '3.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-android',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                'enabled' => true,
@ -185,7 +185,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Console',
-                'version' => '0.1.0',
+                'version' => '0.3.0',
                'url' => 'https://github.com/appwrite/sdk-for-console',
                'package' => '',
                'enabled' => true,
@ -203,7 +203,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '2.0.2',
+                'version' => '3.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@ -231,7 +231,7 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '9.0.0',
+                'version' => '10.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@ -249,7 +249,7 @@ return [
            [
                'key' => 'deno',
                'name' => 'Deno',
-                'version' => '7.0.0',
+                'version' => '8.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-deno',
                'package' => 'https://deno.land/x/appwrite',
                'enabled' => true,
@ -267,7 +267,7 @@ return [
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '8.0.0',
+                'version' => '9.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
@ -285,7 +285,7 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '2.0.2',
+                'version' => '3.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@ -303,7 +303,7 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '8.0.0',
+                'version' => '9.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@ -357,7 +357,7 @@ return [
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.4.2',
+                'version' => '0.5.0',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
                'enabled' => true,
@ -375,7 +375,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '8.0.0',
+                'version' => '9.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@ -393,7 +393,7 @@ return [
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
-                'version' => '2.0.0',
+                'version' => '3.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                'enabled' => true,
@ -415,7 +415,7 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '2.0.0',
+                'version' => '3.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
--- a/app/config/providers.php
+++ b/app/config/providers.php
@ -1,6 +1,7 @@
 <?php

-return [ // Ordered by ABC.
+// Ordered by ABC.
+return [
    'amazon' => [
        'name' => 'Amazon',
        'developers' => 'https://developer.amazon.com/apps-and-games/services-and-apis',
--- a/app/config/roles.php
+++ b/app/config/roles.php
@ -3,6 +3,7 @@
 use Appwrite\Auth\Auth;

 $member = [
+    'global',
    'public',
    'home',
    'console',
@ -23,6 +24,7 @@ $member = [
 ];

 $admins = [
+    'global',
    'graphql',
    'teams.read',
    'teams.write',
@ -51,8 +53,13 @@ $admins = [
    'functions.write',
    'execution.read',
    'execution.write',
+    'rules.read',
+    'rules.write',
    'migrations.read',
    'migrations.write',
+    'vcs.read',
+    'vcs.write',
+    'assistant.read',
 ];

 return [
@ -74,22 +81,22 @@ return [
    ],
    Auth::USER_ROLE_USERS => [
        'label' => 'Users',
-        'scopes' => \array_merge($member, []),
+        'scopes' => \array_merge($member),
    ],
    Auth::USER_ROLE_ADMIN => [
        'label' => 'Admin',
-        'scopes' => \array_merge($admins, []),
+        'scopes' => \array_merge($admins),
    ],
    Auth::USER_ROLE_DEVELOPER => [
        'label' => 'Developer',
-        'scopes' => \array_merge($admins, []),
+        'scopes' => \array_merge($admins),
    ],
    Auth::USER_ROLE_OWNER => [
        'label' => 'Owner',
-        'scopes' => \array_merge($member, $admins, []),
+        'scopes' => \array_merge($member, $admins),
    ],
    Auth::USER_ROLE_APPS => [
        'label' => 'Applications',
-        'scopes' => ['health.read', 'graphql'],
+        'scopes' => ['global', 'health.read', 'graphql'],
    ],
 ];
--- a/app/config/runtimes.php
+++ b/app/config/runtimes.php
@ -7,7 +7,7 @@
 use Utopia\App;
 use Appwrite\Runtimes\Runtimes;

-$runtimes = new Runtimes('v2');
+$runtimes = new Runtimes('v3');

 $allowList = empty(App::getEnv('_APP_FUNCTIONS_RUNTIMES')) ? [] : \explode(',', App::getEnv('_APP_FUNCTIONS_RUNTIMES'));

--- a/app/config/scopes.php
+++ b/app/config/scopes.php
@ -76,10 +76,25 @@ return [ // List of publicly visible scopes
    'health.read' => [
        'description' => 'Access to read your project\'s health status',
    ],
+    'rules.read' => [
+        'description' => 'Access to read your project\'s proxy rules',
+    ],
+    'rules.write' => [
+        'description' => 'Access to create, update, and delete your project\'s proxy rules',
+    ],
    'migrations.read' => [
        'description' => 'Access to read your project\'s migrations',
    ],
    'migrations.write' => [
        'description' => 'Access to create, update, and delete your project\'s migrations.',
-    ]
+    ],
+    'vcs.read' => [
+        'description' => 'Access to read your project\'s VCS repositories',
+    ],
+    'vcs.write' => [
+        'description' => 'Access to create, update, and delete your project\'s VCS repositories',
+    ],
+    'assistant.read' => [
+        'description' => 'Access to read the Assistant service',
+    ],
 ];
--- a/app/config/services.php
+++ b/app/config/services.php
@ -160,6 +160,19 @@ return [
        'optional' => true,
        'icon' => '/images/services/users.png',
    ],
+    'vcs' => [
+        'key' => 'vcs',
+        'name' => 'VCS',
+        'subtitle' => 'The VCS service allows you to interact with providers like GitHub, GitLab etc.',
+        'description' => '',
+        'controller' => 'api/vcs.php',
+        'sdk' => false,
+        'docs' => false,
+        'docsUrl' => '',
+        'tests' => false,
+        'optional' => true,
+        'icon' => '',
+    ],
    'functions' => [
        'key' => 'functions',
        'name' => 'Functions',
@ -173,6 +186,19 @@ return [
        'optional' => true,
        'icon' => '/images/services/functions.png',
    ],
+    'proxy' => [
+        'key' => 'proxy',
+        'name' => 'Proxy',
+        'subtitle' => 'The Proxy Service allows you to configure actions for your domains beyond DNS configuration.',
+        'description' => '/docs/services/proxy.md',
+        'controller' => 'api/proxy.php',
+        'sdk' => true,
+        'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/proxy',
+        'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/proxy.png',
+    ],
    'mock' => [
        'key' => 'mock',
        'name' => 'Mock',
@ -215,7 +241,7 @@ return [
    'migrations' => [
        'key' => 'migrations',
        'name' => 'Migrations',
-        'subtitle' => 'The Migrations service allows you to migrate third-party data to your Appwrite server.',
+        'subtitle' => 'The Migrations service allows you to migrate third-party data to your Appwrite project.',
        'description' => '/docs/services/migrations.md',
        'controller' => 'api/migrations.php',
        'sdk' => true,
--- a/app/config/specs/open-api3-1.4.x-client.json
+++ b/app/config/specs/open-api3-1.4.x-client.json
--- a/app/config/specs/open-api3-1.4.x-console.json
+++ b/app/config/specs/open-api3-1.4.x-console.json
--- a/app/config/specs/open-api3-1.4.x-server.json
+++ b/app/config/specs/open-api3-1.4.x-server.json
--- a/app/config/specs/open-api3-latest-client.json
+++ b/app/config/specs/open-api3-latest-client.json
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
--- a/app/config/specs/swagger2-1.4.x-client.json
+++ b/app/config/specs/swagger2-1.4.x-client.json
--- a/app/config/specs/swagger2-1.4.x-console.json
+++ b/app/config/specs/swagger2-1.4.x-console.json
--- a/app/config/specs/swagger2-1.4.x-server.json
+++ b/app/config/specs/swagger2-1.4.x-server.json
--- a/app/config/specs/swagger2-latest-client.json
+++ b/app/config/specs/swagger2-latest-client.json
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -61,6 +61,15 @@ return [
                'question' => 'Enter your Appwrite hostname',
                'filter' => ''
            ],
+            [
+                'name' => '_APP_DOMAIN_FUNCTIONS',
+                'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
+                'introduction' => '',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
            [
                'name' => '_APP_DOMAIN_TARGET',
                'description' => 'A DNS A record hostname to serve as a CNAME target for your Appwrite custom domains. You can use the same value as used for the Appwrite \'_APP_DOMAIN\' variable. The default value is \'localhost\'.',
@ -105,15 +114,6 @@ return [
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_CONSOLE_ROOT_SESSION',
-                'description' => 'Domain policy for the Appwrite console session cookie. By default, set to \'disabled\', meaning the session cookie will be set to the domain of the Appwrite console (e.g. cloud.appwrite.io). When set to \'enabled\', the session cookie will be set to the registerable domain of the Appwrite server (e.g. appwrite.io).',
-                'introduction' => '',
-                'default' => 'disabled',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
            [
                'name' => '_APP_SYSTEM_EMAIL_NAME',
                'description' => 'This is the sender name value that will appear on email messages sent to developers from the Appwrite console. The default value is: \'Appwrite\'. You can use url encoded strings for spaces and special chars.',
@ -152,7 +152,7 @@ return [
            ],
            [
                'name' => '_APP_USAGE_STATS',
-                'description' => 'This variable allows you to disable the collection and displaying of usage stats. This value is set to \'enabled\' by default, to disable the usage stats set the value to \'disabled\'. When disabled, it\'s recommended to turn off the Worker Usage container for better resource usage.',
+                'description' => 'This variable allows you to disable the collection and displaying of usage stats. This value is set to \'enabled\' by default, to disable the usage stats set the value to \'disabled\'. When disabled, it\'s recommended to turn off the Worker Usage container to reduce resource usage.',
                'introduction' => '0.7.0',
                'default' => 'enabled',
                'required' => false,
@ -161,7 +161,7 @@ return [
            ],
            [
                'name' => '_APP_LOGGING_PROVIDER',
-                'description' => 'This variable allows you to enable logging errors to 3rd party providers. This value is empty by default, to enable the logger set the value to one of \'sentry\', \'raygun\', \'appSignal\', \'logOwl\'',
+                'description' => 'This variable allows you to enable logging errors to 3rd party providers. This value is empty by default, set the value to one of \'sentry\', \'raygun\', \'appSignal\', \'logOwl\' to enable the logger.',
                'introduction' => '0.12.0',
                'default' => '',
                'required' => false,
@ -213,15 +213,6 @@ return [
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_CONSOLE_INVITES',
-                'description' => 'This option allows you to disable the invitation of new users to the Appwrite console. When enabled, console users are allowed to invite new users to a project. By default this option is enabled.',
-                'introduction' => '1.2.0',
-                'default' => 'enabled',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
        ],
    ],
    [
@ -324,33 +315,54 @@ return [
                'question' => '',
                'filter' => 'password'
            ],
+        ],
+    ],
+    [
+        'category' => 'InfluxDB',
+        'description' => 'Appwrite uses an InfluxDB server for managing time-series data and server stats. The InfluxDB env vars are used to allow Appwrite server to connect to the InfluxDB container.',
+        'variables' => [
            [
-                'name' => '_APP_CONNECTIONS_MAX',
-                'description' => 'MariaDB server maximum connections.',
-                'introduction' => 'TBD',
-                'default' => 251,
+                'name' => '_APP_INFLUXDB_HOST',
+                'description' => 'InfluxDB server host name address. Default value is: \'influxdb\'.',
+                'introduction' => '',
+                'default' => 'influxdb',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_INFLUXDB_PORT',
+                'description' => 'InfluxDB server TCP port. Default value is: \'8086\'.',
+                'introduction' => '',
+                'default' => '8086',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+        ],
+    ],
+    [
+        'category' => 'StatsD',
+        'description' => 'Appwrite uses a StatsD server for aggregating and sending stats data over a fast UDP connection. The StatsD env vars are used to allow Appwrite server to connect to the StatsD container.',
+        'variables' => [
+            [
+                'name' => '_APP_STATSD_HOST',
+                'description' => 'StatsD server host name address. Default value is: \'telegraf\'.',
+                'introduction' => '',
+                'default' => 'telegraf',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_STATSD_PORT',
+                'description' => 'StatsD server TCP port. Default value is: \'8125\'.',
+                'introduction' => '',
+                'default' => '8125',
                'required' => false,
                'question' => '',
                'filter' => ''
            ],
-//             [
-//                 'name' => '_APP_CONNECTIONS_DB_PROJECT',
-//                 'description' => 'A list of comma-separated key value pairs representing Project DBs where key is the database name and value is the DSN connection string.',
-//                 'introduction' => 'TBD',
-//                 'default' => 'db_fra1_01=mysql://user:password@mariadb:3306/appwrite',
-//                 'required' => true,
-//                 'question' => '',
-//                 'filter' => ''
-//             ],
-//             [
-//                 'name' => '_APP_CONNECTIONS_DB_CONSOLE',
-//                 'description' => 'A key value pair representing the Console DB where key is the database name and value is the DSN connection string.',
-//                 'introduction' => 'TBD',
-//                 'default' => 'db_fra1_01=mysql://user:password@mariadb:3306/appwrite',
-//                 'required' => true,
-//                 'question' => '',
-//                 'filter' => ''
-//             ]
        ],
    ],
    [
@ -477,17 +489,9 @@ return [
                'question' => '',
                'filter' => ''
            ],
-            [
-                'name' => '_APP_CONNECTIONS_STORAGE',
-                'description' => 'A DSN representing the storage device to connect to. The DSN takes the following format <device>://<access_key>:<access_secret>@<host>:<port>/<bucket>?region=<region>. For example, for S3: \'s3://access_key:access_secret@host:port/bucket?region=us-east-1\'. To use the local filesystem, you can leave this variable empty. Available devices are local, s3, dospaces, linode, backblaze and wasabi.',
-                'introduction' => '1.1.0',
-                'default' => '',
-                'required' => false,
-                'question' => '',
-            ],
            [
                'name' => '_APP_STORAGE_DEVICE',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Select default storage device. The default value is \'local\'. List of supported adapters are \'local\', \'s3\', \'dospaces\', \'backblaze\', \'linode\' and \'wasabi\'.',
                'introduction' => '0.13.0',
                'default' => 'local',
                'required' => false,
@ -495,7 +499,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_ACCESS_KEY',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'AWS S3 storage access key. Required when the storage adapter is set to S3. You can get your access key from your AWS console',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@ -503,7 +507,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_SECRET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'AWS S3 storage secret key. Required when the storage adapter is set to S3. You can get your secret key from your AWS console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@ -511,7 +515,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_REGION',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'AWS S3 storage region. Required when storage adapter is set to S3. You can find your region info for your bucket from AWS console.',
                'introduction' => '0.13.0',
                'default' => 'us-east-1',
                'required' => false,
@ -519,7 +523,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_S3_BUCKET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'AWS S3 storage bucket. Required when storage adapter is set to S3. You can create buckets in your AWS console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@ -527,7 +531,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_DO_SPACES_ACCESS_KEY',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'DigitalOcean spaces access key. Required when the storage adapter is set to DOSpaces. You can get your access key from your DigitalOcean console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@ -535,7 +539,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_DO_SPACES_SECRET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'DigitalOcean spaces secret key. Required when the storage adapter is set to DOSpaces. You can get your secret key from your DigitalOcean console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@ -543,7 +547,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_DO_SPACES_REGION',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'DigitalOcean spaces region. Required when storage adapter is set to DOSpaces. You can find your region info for your space from DigitalOcean console.',
                'introduction' => '0.13.0',
                'default' => 'us-east-1',
                'required' => false,
@ -551,7 +555,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_DO_SPACES_BUCKET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'DigitalOcean spaces bucket. Required when storage adapter is set to DOSpaces. You can create spaces in your DigitalOcean console.',
                'introduction' => '0.13.0',
                'default' => '',
                'required' => false,
@ -559,7 +563,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_BACKBLAZE_ACCESS_KEY',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Backblaze access key. Required when the storage adapter is set to Backblaze. Your Backblaze keyID will be your access key. You can get your keyID from your Backblaze console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -567,7 +571,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_BACKBLAZE_SECRET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Backblaze secret key. Required when the storage adapter is set to Backblaze. Your Backblaze applicationKey will be your secret key. You can get your applicationKey from your Backblaze console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -575,7 +579,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_BACKBLAZE_REGION',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Backblaze region. Required when storage adapter is set to Backblaze. You can find your region info from your Backblaze console.',
                'introduction' => '0.14.2',
                'default' => 'us-west-004',
                'required' => false,
@ -583,7 +587,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_BACKBLAZE_BUCKET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Backblaze bucket. Required when storage adapter is set to Backblaze. You can create your bucket from your Backblaze console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -591,7 +595,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_LINODE_ACCESS_KEY',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Linode object storage access key. Required when the storage adapter is set to Linode. You can get your access key from your Linode console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -599,7 +603,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_LINODE_SECRET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Linode object storage secret key. Required when the storage adapter is set to Linode. You can get your secret key from your Linode console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -607,7 +611,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_LINODE_REGION',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Linode object storage region. Required when storage adapter is set to Linode. You can find your region info from your Linode console.',
                'introduction' => '0.14.2',
                'default' => 'eu-central-1',
                'required' => false,
@ -615,7 +619,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_LINODE_BUCKET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Linode object storage bucket. Required when storage adapter is set to Linode. You can create buckets in your Linode console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -623,7 +627,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_WASABI_ACCESS_KEY',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Wasabi access key. Required when the storage adapter is set to Wasabi. You can get your access key from your Wasabi console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -631,7 +635,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_WASABI_SECRET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Wasabi secret key. Required when the storage adapter is set to Wasabi. You can get your secret key from your Wasabi console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -639,7 +643,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_WASABI_REGION',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Wasabi region. Required when storage adapter is set to Wasabi. You can find your region info from your Wasabi console.',
                'introduction' => '0.14.2',
                'default' => 'eu-central-1',
                'required' => false,
@ -647,7 +651,7 @@ return [
            ],
            [
                'name' => '_APP_STORAGE_WASABI_BUCKET',
-                'description' => 'Deprecated since 1.2.0. Use _APP_CONNECTIONS_STORAGE instead.',
+                'description' => 'Wasabi bucket. Required when storage adapter is set to Wasabi. You can create buckets in your Wasabi console.',
                'introduction' => '0.14.2',
                'default' => '',
                'required' => false,
@ -814,7 +818,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_RUNTIMES_NETWORK',
-                'description' => 'The docker network used for communication between the executor and runtimes. Change this if you have altered the default network names.',
+                'description' => 'The docker network used for communication between the executor and runtimes.',
                'introduction' => '1.2.0',
                'default' => 'runtimes',
                'required' => false,
@ -850,6 +854,66 @@ return [
            ],
        ],
    ],
+    [
+        'category' => 'VCS (Version Control System)',
+        'description' => '',
+        'variables' => [
+            [
+                'name' => '_APP_VCS_GITHUB_APP_NAME',
+                'description' => 'Name of your GitHub app. This value should be set to your GitHub application\'s URL.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_VCS_GITHUB_PRIVATE_KEY',
+                'description' => 'GitHub app RSA private key. You can generate private keys from GitHub application settings.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_VCS_GITHUB_APP_ID',
+                'description' => 'GitHub application ID. You can find it in your GitHub application details.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_VCS_GITHUB_CLIENT_ID',
+                'description' => 'GitHub client ID. You can find it in your GitHub application details.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_VCS_GITHUB_CLIENT_SECRET',
+                'description' => 'GitHub client secret. You can generate secrets in your GitHub application settings.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_VCS_GITHUB_WEBHOOK_SECRET',
+                'description' => 'GitHub webhook secret. You can configure it in your GitHub application settings under webhook section.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+        ],
+    ],
    [
        'category' => 'Maintenance',
        'description' => '',
@ -952,4 +1016,43 @@ return [
            ],
        ],
    ],
+    [
+        'category' => 'Migrations',
+        'description' => '',
+        'variables' => [
+            [
+                'name' => '_APP_MIGRATIONS_FIREBASE_CLIENT_ID',
+                'description' => 'Google OAuth client ID. You can find it in your GCP application settings.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_MIGRATIONS_FIREBASE_CLIENT_SECRET',
+                'description' => 'Google OAuth client secret. You can generate secrets in your GCP application settings.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ]
+        ]
+    ],
+    [
+        'category' => 'Assistant',
+        'description' => '',
+        'variables' => [
+            [
+                'name' => '_APP_ASSISTANT_OPENAI_API_KEY',
+                'description' => 'OpenAI API key. You can find it in your OpenAI application settings.',
+                'introduction' => '1.4.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ]
+        ]
+    ]
 ];
--- a/app/console
+++ b/app/console
@ -1 +1 @@
-Subproject commit 9174d8f8cb584744dd7a53f69d324f490ee82ee3
+Subproject commit 88b6d59051992ed86183ee83d77bf678d1cb73bf
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -49,101 +49,6 @@ use Appwrite\Auth\Validator\PersonalData;
 $oauthDefaultSuccess = '/auth/oauth2/success';
 $oauthDefaultFailure = '/auth/oauth2/failure';

-App::post('/v1/account/invite')
-    ->desc('Create account using an invite code')
-    ->groups(['api', 'account', 'auth'])
-    ->label('event', 'users.[userId].create')
-    ->label('scope', 'public')
-    ->label('auth.type', 'emailPassword')
-    ->label('audits.event', 'user.create')
-    ->label('audits.resource', 'user/{response.$id}')
-    ->label('audits.userId', '{response.$id}')
-    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-    ->label('sdk.namespace', 'account')
-    ->label('sdk.method', 'createWithInviteCode')
-    ->label('sdk.description', '/docs/references/account/create.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
-    ->label('abuse-limit', 10)
-    ->param('userId', '', new CustomId(), 'Unique Id. Choose your own unique ID or pass the string `ID.unique()` to auto generate it. 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('password', '', new Password(), 'User password. Must be at least 8 chars.')
-    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
-    ->param('code', '', new Text(128), 'An invite code to restrict user signups on the Appwrite console. Users with an invite code will be able to create accounts irrespective of email and IP whitelists.', true)
-    ->inject('request')
-    ->inject('response')
-    ->inject('project')
-    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, string $code, Request $request, Response $response, Document $project, Database $dbForProject, Event $events) {
-
-        if ($project->getId() !== 'console') {
-            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN);
-        }
-
-        $email = \strtolower($email);
-
-        $whitelistCodes = (!empty(App::getEnv('_APP_CONSOLE_WHITELIST_CODES', null))) ? \explode(',', App::getEnv('_APP_CONSOLE_WHITELIST_CODES', null)) : [];
-
-        if (empty($whitelistCodes)) {
-            throw new Exception(Exception::GENERAL_CODES_DISABLED);
-        }
-
-        if (!empty($whitelistCodes) && !\in_array($code, $whitelistCodes)) {
-            throw new Exception(Exception::USER_INVALID_CODE);
-        }
-
-        $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
-
-        if ($limit !== 0) {
-            $total = $dbForProject->count('users', max: APP_LIMIT_USERS);
-
-            if ($total >= $limit) {
-                throw new Exception(Exception::USER_COUNT_EXCEEDED);
-            }
-        }
-
-        try {
-            $userId = $userId == 'unique()' ? ID::unique() : $userId;
-            $user = Authorization::skip(fn() => $dbForProject->createDocument('users', new Document([
-                '$id' => $userId,
-                '$permissions' => [
-                    Permission::read(Role::any()),
-                    Permission::update(Role::user($userId)),
-                    Permission::delete(Role::user($userId)),
-                ],
-                'email' => $email,
-                'emailVerification' => false,
-                'status' => true,
-                'password' => Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS),
-                'hash' => Auth::DEFAULT_ALGO,
-                'hashOptions' => Auth::DEFAULT_ALGO_OPTIONS,
-                'passwordUpdate' => DateTime::now(),
-                'registration' => DateTime::now(),
-                'reset' => false,
-                'name' => $name,
-                'prefs' => new \stdClass(),
-                'sessions' => null,
-                'tokens' => null,
-                'memberships' => null,
-                'search' => implode(' ', [$userId, $email, $name])
-            ])));
-        } catch (Duplicate $th) {
-            throw new Exception(Exception::USER_ALREADY_EXISTS);
-        }
-
-        Authorization::unsetRole(Role::guests()->toString());
-        Authorization::setRole(Role::user($user->getId())->toString());
-        Authorization::setRole(Role::users()->toString());
-
-        $events->setParam('userId', $user->getId());
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($user, Response::MODEL_ACCOUNT);
-    });
-
 App::post('/v1/account')
    ->desc('Create Account')
    ->groups(['api', 'account', 'auth'])
@ -153,6 +58,7 @@ App::post('/v1/account')
    ->label('audits.event', 'user.create')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.create')
    ->label('sdk.auth', [])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'create')
@ -238,10 +144,10 @@ App::post('/v1/account')
                'tokens' => null,
                'memberships' => null,
                'search' => implode(' ', [$userId, $email, $name]),
-                'accessedAt' => DateTime::now(), // Add this here to make sure it's returned in the response
+                'accessedAt' => DateTime::now(),
            ]);
            Authorization::skip(fn() => $dbForProject->createDocument('users', $user));
-        } catch (Duplicate $th) {
+        } catch (Duplicate) {
            throw new Exception(Exception::USER_ALREADY_EXISTS);
        }

@ -266,6 +172,8 @@ App::post('/v1/account/sessions/email')
    ->label('audits.event', 'session.create')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:email'])
    ->label('sdk.auth', [])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'createEmailSession')
@ -390,8 +298,8 @@ App::get('/v1/account/sessions/oauth2/:provider')
    ->label('abuse-limit', 50)
    ->label('abuse-key', 'ip:{ip}')
    ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'OAuth2 Provider. Currently, supported providers are: ' . \implode(', ', \array_keys(\array_filter(Config::getParam('providers'), fn($node) => (!$node['mock'])))) . '.')
-    ->param('success', '', fn($clients) => new Host($clients), 'URL to redirect back to your app after a successful login attempt.  Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients'])
-    ->param('failure', '', fn($clients) => new Host($clients), 'URL to redirect back to your app after a failed login attempt.  Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients'])
+    ->param('success', '', fn($clients) => new Host($clients), 'URL to redirect back to your app after a successful login attempt.  Only URLs from hostnames in your project\'s platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients'])
+    ->param('failure', '', fn($clients) => new Host($clients), 'URL to redirect back to your app after a failed login attempt.  Only URLs from hostnames in your project\'s platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients'])
    ->param('scopes', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'A list of custom OAuth2 scopes. Check each provider internal docs for a list of supported scopes. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
    ->inject('request')
    ->inject('response')
@ -449,7 +357,7 @@ App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
    ->label('docs', false)
    ->param('projectId', '', new Text(1024), 'Project ID.')
    ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'OAuth2 provider.')
-    ->param('code', '', new Text(2048, 0), 'OAuth2 code.', true)
+    ->param('code', '', new Text(2048, 0), 'OAuth2 code. This is a temporary code that the will be later exchanged for an access token.', true)
    ->param('state', '', new Text(2048), 'Login state params.', true)
    ->param('error', '', new Text(2048, 0), 'Error code returned from the OAuth2 provider.', true)
    ->param('error_description', '', new Text(2048, 0), 'Human-readable text providing additional information about the error returned from the OAuth2 provider.', true)
@ -482,7 +390,7 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
    ->label('docs', false)
    ->param('projectId', '', new Text(1024), 'Project ID.')
    ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'OAuth2 provider.')
-    ->param('code', '', new Text(2048, 0), 'OAuth2 code.', true)
+    ->param('code', '', new Text(2048, 0), 'OAuth2 code. This is a temporary code that the will be later exchanged for an access token.', true)
    ->param('state', '', new Text(2048), 'Login state params.', true)
    ->param('error', '', new Text(2048, 0), 'Error code returned from the OAuth2 provider.', true)
    ->param('error_description', '', new Text(2048, 0), 'Human-readable text providing additional information about the error returned from the OAuth2 provider.', true)
@ -518,8 +426,10 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
    ->label('abuse-limit', 50)
    ->label('abuse-key', 'ip:{ip}')
    ->label('docs', false)
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:{request.provider}'])
    ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'OAuth2 provider.')
-    ->param('code', '', new Text(2048, 0), 'OAuth2 code.', true)
+    ->param('code', '', new Text(2048, 0), 'OAuth2 code. This is a temporary code that the will be later exchanged for an access token.', true)
    ->param('state', '', new Text(2048), 'OAuth2 state params.', true)
    ->param('error', '', new Text(2048, 0), 'Error code returned from the OAuth2 provider.', true)
    ->param('error_description', '', new Text(2048, 0), 'Human-readable text providing additional information about the error returned from the OAuth2 provider.', true)
@ -740,10 +650,11 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                        'sessions' => null,
                        'tokens' => null,
                        'memberships' => null,
-                        'search' => implode(' ', [$userId, $email, $name])
+                        'search' => implode(' ', [$userId, $email, $name]),
+                        'accessedAt' => DateTime::now(),
                    ]);
                    Authorization::skip(fn() => $dbForProject->createDocument('users', $user));
-                } catch (Duplicate $th) {
+                } catch (Duplicate) {
                    $failureRedirect(Exception::USER_ALREADY_EXISTS);
                }
            }
@ -1040,7 +951,8 @@ App::post('/v1/account/sessions/magic-url')
                'sessions' => null,
                'tokens' => null,
                'memberships' => null,
-                'search' => implode(' ', [$userId, $email])
+                'search' => implode(' ', [$userId, $email]),
+                'accessedAt' => DateTime::now(),
            ]);

            Authorization::skip(fn () => $dbForProject->createDocument('users', $user));
@ -1079,42 +991,84 @@ App::post('/v1/account/sessions/magic-url')
        $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $user->getId(), 'secret' => $loginSecret, 'expire' => $expire, 'project' => $project->getId()]);
        $url = Template::unParseURL($url);

-        $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $project->getAttribute('name'));
-        $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
+        $body = $locale->getText("emails.magicSession.body");
        $subject = $locale->getText("emails.magicSession.subject");
-
-        $smtpEnabled = $project->getAttribute('smtp', [])['enabled'] ?? false;
        $customTemplate = $project->getAttribute('templates', [])['email.magicSession-' . $locale->default] ?? [];
-        if ($smtpEnabled && !empty($customTemplate)) {
-            $body = $customTemplate['message'] ?? $body;
-            $subject = $customTemplate['subject'] ?? $subject;
-            $from = $customTemplate['senderName'] ?? $from;
+
+        $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl');
+        $message->setParam('{{body}}', $body);
+        $body = $message->render();
+
+        $smtp = $project->getAttribute('smtp', []);
+        $smtpEnabled = $smtp['enabled'] ?? false;
+
+        $senderEmail = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+        $senderName = App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+        $replyTo = "";
+
+        if ($smtpEnabled) {
+            if (!empty($smtp['senderEmail'])) {
+                $senderEmail = $smtp['senderEmail'];
+            }
+            if (!empty($smtp['senderName'])) {
+                $senderName = $smtp['senderName'];
+            }
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
+            }
+
+            $mails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
+            if (!empty($customTemplate)) {
+                if (!empty($customTemplate['senderEmail'])) {
+                    $senderEmail = $customTemplate['senderEmail'];
+                }
+                if (!empty($customTemplate['senderName'])) {
+                    $senderName = $customTemplate['senderName'];
+                }
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
+                }
+
+                $body = $customTemplate['message'] ?? '';
+                $subject = $customTemplate['subject'] ?? $subject;
+            }
+
+            $mails
+                ->setSmtpReplyTo($replyTo)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

-        $body
-            ->setParam('{{subject}}', $subject)
-            ->setParam('{{hello}}', $locale->getText("emails.magicSession.hello"))
-            ->setParam('{{name}}', '')
-            ->setParam('{{body}}', $locale->getText("emails.magicSession.body"))
-            ->setParam('{{redirect}}', $url)
-            ->setParam('{{footer}}', $locale->getText("emails.magicSession.footer"))
-            ->setParam('{{thanks}}', $locale->getText("emails.magicSession.thanks"))
-            ->setParam('{{signature}}', $locale->getText("emails.magicSession.signature"))
-            ->setParam('{{project}}', $project->getAttribute('name'))
-            ->setParam('{{direction}}', $locale->getText('settings.direction'))
-            ->setParam('{{bg-body}}', '#f7f7f7')
-            ->setParam('{{bg-content}}', '#ffffff')
-            ->setParam('{{text-content}}', '#000000');
-
-        $body = $body->render();
+        $emailVariables = [
+            'subject' => $subject,
+            'hello' => $locale->getText("emails.magicSession.hello"),
+            'body' => $body,
+            'footer' => $locale->getText("emails.magicSession.footer"),
+            'thanks' => $locale->getText("emails.magicSession.thanks"),
+            'signature' => $locale->getText("emails.magicSession.signature"),
+            'direction' => $locale->getText('settings.direction'),
+            'bg-body' => '#f7f7f7',
+            'bg-content' => '#ffffff',
+            'text-content' => '#000000',
+            /* {{user}} ,{{team}}, {{project}} and {{redirect}} are required in the templates */
+            'user' => '',
+            'team' => '',
+            'project' => $project->getAttribute('name'),
+            'redirect' => $url
+        ];

        $mails
            ->setSubject($subject)
            ->setBody($body)
-            ->setFrom($from)
-            ->setRecipient($user->getAttribute('email'))
-            ->trigger()
-        ;
+            ->setVariables($emailVariables)
+            ->setRecipient($email)
+            ->trigger();

        $events->setPayload(
            $response->output(
@ -1140,6 +1094,8 @@ App::put('/v1/account/sessions/magic-url')
    ->label('audits.event', 'session.update')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:magic-url'])
    ->label('sdk.auth', [])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateMagicURLSession')
@ -1229,8 +1185,7 @@ App::put('/v1/account/sessions/magic-url')

        $events
            ->setParam('userId', $user->getId())
-            ->setParam('sessionId', $session->getId())
-        ;
+            ->setParam('sessionId', $session->getId());

        if (!Config::getParam('domainVerification')) {
            $response->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]));
@ -1241,16 +1196,14 @@ App::put('/v1/account/sessions/magic-url')
        $response
            ->addCookie(Auth::$cookieName . '_legacy', Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
            ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-        ;
+            ->setStatusCode(Response::STATUS_CODE_CREATED);

        $countryName = $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown'));

        $session
            ->setAttribute('current', true)
            ->setAttribute('countryName', $countryName)
-            ->setAttribute('expire', $expire)
-        ;
+            ->setAttribute('expire', $expire);

        $response->dynamic($session, Response::MODEL_SESSION);
    });
@ -1327,7 +1280,8 @@ App::post('/v1/account/sessions/phone')
                'sessions' => null,
                'tokens' => null,
                'memberships' => null,
-                'search' => implode(' ', [$userId, $phone])
+                'search' => implode(' ', [$userId, $phone]),
+                'accessedAt' => DateTime::now(),
            ]);

            Authorization::skip(fn () => $dbForProject->createDocument('users', $user));
@ -1514,6 +1468,8 @@ App::post('/v1/account/sessions/anonymous')
    ->label('audits.event', 'session.create')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.create')
+    ->label('usage.params', ['provider:anonymous'])
    ->label('sdk.auth', [])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'createAnonymousSession')
@ -1576,6 +1532,7 @@ App::post('/v1/account/sessions/anonymous')
            'tokens' => null,
            'memberships' => null,
            'search' => $userId,
+            'accessedAt' => DateTime::now(),
        ]);
        Authorization::skip(fn() => $dbForProject->createDocument('users', $user));

@ -1689,6 +1646,7 @@ App::get('/v1/account')
    ->desc('Get Account')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'get')
@ -1709,6 +1667,7 @@ App::get('/v1/account/prefs')
    ->desc('Get Account Preferences')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'getPrefs')
@ -1731,6 +1690,7 @@ App::get('/v1/account/sessions')
    ->desc('List Sessions')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'listSessions')
@ -1769,6 +1729,7 @@ App::get('/v1/account/logs')
    ->desc('List Logs')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'listLogs')
@ -1829,6 +1790,7 @@ App::get('/v1/account/sessions/:sessionId')
    ->desc('Get Session')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
+    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'getSession')
@ -1876,6 +1838,7 @@ App::patch('/v1/account/name')
    ->label('scope', 'account')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateName')
@ -1910,6 +1873,7 @@ App::patch('/v1/account/password')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('audits.userId', '{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updatePassword')
@ -1975,6 +1939,7 @@ App::patch('/v1/account/email')
    ->label('scope', 'account')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateEmail')
@ -2044,6 +2009,7 @@ App::patch('/v1/account/phone')
    ->label('scope', 'account')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updatePhone')
@ -2102,6 +2068,7 @@ App::patch('/v1/account/prefs')
    ->label('scope', 'account')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updatePrefs')
@ -2135,6 +2102,7 @@ App::patch('/v1/account/status')
    ->label('scope', 'account')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
+    ->label('usage.metric', 'users.{scope}.requests.delete')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateStatus')
@ -2178,6 +2146,7 @@ App::delete('/v1/account/sessions/:sessionId')
    ->label('event', 'users.[userId].sessions.[sessionId].delete')
    ->label('audits.event', 'session.delete')
    ->label('audits.resource', 'user/{user.$id}')
+    ->label('usage.metric', 'sessions.{scope}.requests.delete')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'deleteSession')
@ -2254,6 +2223,7 @@ App::patch('/v1/account/sessions/:sessionId')
    ->label('audits.event', 'session.update')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'sessions.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateSession')
@ -2338,6 +2308,7 @@ App::delete('/v1/account/sessions')
    ->label('event', 'users.[userId].sessions.[sessionId].delete')
    ->label('audits.event', 'session.delete')
    ->label('audits.resource', 'user/{user.$id}')
+    ->label('usage.metric', 'sessions.{scope}.requests.delete')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'deleteSessions')
@ -2399,6 +2370,7 @@ App::post('/v1/account/recovery')
    ->label('audits.event', 'recovery.create')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'createRecovery')
@ -2474,44 +2446,86 @@ App::post('/v1/account/recovery')
        $url = Template::unParseURL($url);

        $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
-        $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
-        $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
+        $body = $locale->getText("emails.recovery.body");
        $subject = $locale->getText("emails.recovery.subject");
-
-        $smtpEnabled = $project->getAttribute('smtp', [])['enabled'] ?? false;
        $customTemplate = $project->getAttribute('templates', [])['email.recovery-' . $locale->default] ?? [];
-        if ($smtpEnabled && !empty($customTemplate)) {
-            $body = $customTemplate['message'] ?? $body;
-            $subject = $customTemplate['subject'] ?? $subject;
-            $from = $customTemplate['senderName'] ?? $from;
+
+        $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl');
+        $message->setParam('{{body}}', $body);
+        $body = $message->render();
+
+        $smtp = $project->getAttribute('smtp', []);
+        $smtpEnabled = $smtp['enabled'] ?? false;
+
+        $senderEmail = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+        $senderName = App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+        $replyTo = "";
+
+        if ($smtpEnabled) {
+            if (!empty($smtp['senderEmail'])) {
+                $senderEmail = $smtp['senderEmail'];
+            }
+            if (!empty($smtp['senderName'])) {
+                $senderName = $smtp['senderName'];
+            }
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
+            }
+
+            $mails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
+            if (!empty($customTemplate)) {
+                if (!empty($customTemplate['senderEmail'])) {
+                    $senderEmail = $customTemplate['senderEmail'];
+                }
+                if (!empty($customTemplate['senderName'])) {
+                    $senderName = $customTemplate['senderName'];
+                }
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
+                }
+
+                $body = $customTemplate['message'] ?? '';
+                $subject = $customTemplate['subject'] ?? $subject;
+            }
+
+            $mails
+                ->setSmtpReplyTo($replyTo)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

-        $body
-            ->setParam('{{subject}}', $subject)
-            ->setParam('{{hello}}', $locale->getText("emails.recovery.hello"))
-            ->setParam('{{name}}', $profile->getAttribute('name'))
-            ->setParam('{{body}}', $locale->getText("emails.recovery.body"))
-            ->setParam('{{redirect}}', $url)
-            ->setParam('{{footer}}', $locale->getText("emails.recovery.footer"))
-            ->setParam('{{thanks}}', $locale->getText("emails.recovery.thanks"))
-            ->setParam('{{signature}}', $locale->getText("emails.recovery.signature"))
-            ->setParam('{{project}}', $projectName)
-            ->setParam('{{direction}}', $locale->getText('settings.direction'))
-            ->setParam('{{bg-body}}', '#f7f7f7')
-            ->setParam('{{bg-content}}', '#ffffff')
-            ->setParam('{{text-content}}', '#000000');
-
-        $body = $body->render();
+        $emailVariables = [
+            'subject' => $subject,
+            'hello' => $locale->getText("emails.recovery.hello"),
+            'body' => $body,
+            'footer' => $locale->getText("emails.recovery.footer"),
+            'thanks' => $locale->getText("emails.recovery.thanks"),
+            'signature' => $locale->getText("emails.recovery.signature"),
+            'direction' => $locale->getText('settings.direction'),
+            'bg-body' => '#f7f7f7',
+            'bg-content' => '#ffffff',
+            'text-content' => '#000000',
+            /* {{user}} ,{{team}}, {{project}} and {{redirect}} are required in the templates */
+            'user' => $profile->getAttribute('name'),
+            'team' => '',
+            'project' => $projectName,
+            'redirect' => $url
+        ];


        $mails
            ->setRecipient($profile->getAttribute('email', ''))
            ->setName($profile->getAttribute('name'))
            ->setBody($body)
-            ->setFrom($from)
+            ->setVariables($emailVariables)
            ->setSubject($subject)
            ->trigger();
-        ;

        $events
            ->setParam('userId', $profile->getId())
@ -2539,6 +2553,7 @@ App::put('/v1/account/recovery')
    ->label('audits.event', 'recovery.update')
    ->label('audits.resource', 'user/{response.userId}')
    ->label('audits.userId', '{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateRecovery')
@ -2625,6 +2640,7 @@ App::post('/v1/account/verification')
    ->label('event', 'users.[userId].verification.[tokenId].create')
    ->label('audits.event', 'verification.create')
    ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'createVerification')
@ -2682,43 +2698,85 @@ App::post('/v1/account/verification')
        $url = Template::unParseURL($url);

        $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
-        $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
-        $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
+        $body = $locale->getText("emails.verification.body");
        $subject = $locale->getText("emails.verification.subject");
-
-        $smtpEnabled = $project->getAttribute('smtp', [])['enabled'] ?? false;
        $customTemplate = $project->getAttribute('templates', [])['email.verification-' . $locale->default] ?? [];
-        if ($smtpEnabled && !empty($customTemplate)) {
-            $body = $customTemplate['message'] ?? $body;
-            $subject = $customTemplate['subject'] ?? $subject;
-            $from = $customTemplate['senderName'] ?? $from;
+
+        $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-inner-base.tpl');
+        $message->setParam('{{body}}', $body);
+        $body = $message->render();
+
+        $smtp = $project->getAttribute('smtp', []);
+        $smtpEnabled = $smtp['enabled'] ?? false;
+
+        $senderEmail = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+        $senderName = App::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+        $replyTo = "";
+
+        if ($smtpEnabled) {
+            if (!empty($smtp['senderEmail'])) {
+                $senderEmail = $smtp['senderEmail'];
+            }
+            if (!empty($smtp['senderName'])) {
+                $senderName = $smtp['senderName'];
+            }
+            if (!empty($smtp['replyTo'])) {
+                $replyTo = $smtp['replyTo'];
+            }
+
+            $mails
+                ->setSmtpHost($smtp['host'] ?? '')
+                ->setSmtpPort($smtp['port'] ?? '')
+                ->setSmtpUsername($smtp['username'] ?? '')
+                ->setSmtpPassword($smtp['password'] ?? '')
+                ->setSmtpSecure($smtp['secure'] ?? '');
+
+            if (!empty($customTemplate)) {
+                if (!empty($customTemplate['senderEmail'])) {
+                    $senderEmail = $customTemplate['senderEmail'];
+                }
+                if (!empty($customTemplate['senderName'])) {
+                    $senderName = $customTemplate['senderName'];
+                }
+                if (!empty($customTemplate['replyTo'])) {
+                    $replyTo = $customTemplate['replyTo'];
+                }
+
+                $body = $customTemplate['message'] ?? '';
+                $subject = $customTemplate['subject'] ?? $subject;
+            }
+
+            $mails
+                ->setSmtpReplyTo($replyTo)
+                ->setSmtpSenderEmail($senderEmail)
+                ->setSmtpSenderName($senderName);
        }

-        $body
-            ->setParam('{{subject}}', $subject)
-            ->setParam('{{hello}}', $locale->getText("emails.verification.hello"))
-            ->setParam('{{name}}', $user->getAttribute('name'))
-            ->setParam('{{body}}', $locale->getText("emails.verification.body"))
-            ->setParam('{{redirect}}', $url)
-            ->setParam('{{footer}}', $locale->getText("emails.verification.footer"))
-            ->setParam('{{thanks}}', $locale->getText("emails.verification.thanks"))
-            ->setParam('{{signature}}', $locale->getText("emails.verification.signature"))
-            ->setParam('{{project}}', $projectName)
-            ->setParam('{{direction}}', $locale->getText('settings.direction'))
-            ->setParam('{{bg-body}}', '#f7f7f7')
-            ->setParam('{{bg-content}}', '#ffffff')
-            ->setParam('{{text-content}}', '#000000');
-
-        $body = $body->render();
+        $emailVariables = [
+            'subject' => $subject,
+            'hello' => $locale->getText("emails.verification.hello"),
+            'body' => $body,
+            'footer' => $locale->getText("emails.verification.footer"),
+            'thanks' => $locale->getText("emails.verification.thanks"),
+            'signature' => $locale->getText("emails.verification.signature"),
+            'direction' => $locale->getText('settings.direction'),
+            'bg-body' => '#f7f7f7',
+            'bg-content' => '#ffffff',
+            'text-content' => '#000000',
+            /* {{user}} ,{{team}}, {{project}} and {{redirect}} are required in the templates */
+            'user' => $user->getAttribute('name'),
+            'team' => '',
+            'project' => $projectName,
+            'redirect' => $url
+        ];

        $mails
            ->setSubject($subject)
            ->setBody($body)
-            ->setFrom($from)
+            ->setVariables($emailVariables)
            ->setRecipient($user->getAttribute('email'))
            ->setName($user->getAttribute('name') ?? '')
-            ->trigger()
-        ;
+            ->trigger();

        $events
            ->setParam('userId', $user->getId())
@ -2726,8 +2784,7 @@ App::post('/v1/account/verification')
            ->setPayload($response->output(
                $verification->setAttribute('secret', $verificationSecret),
                Response::MODEL_TOKEN
-            ))
-        ;
+            ));

        // Hide secret for clients
        $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : '');
@ -2744,6 +2801,7 @@ App::put('/v1/account/verification')
    ->label('event', 'users.[userId].verification.[tokenId].update')
    ->label('audits.event', 'verification.update')
    ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updateVerification')
@ -2804,6 +2862,7 @@ App::post('/v1/account/verification/phone')
    ->label('event', 'users.[userId].verification.[tokenId].create')
    ->label('audits.event', 'verification.create')
    ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'createPhoneVerification')
@ -2899,6 +2958,7 @@ App::put('/v1/account/verification/phone')
    ->label('event', 'users.[userId].verification.[tokenId].update')
    ->label('audits.event', 'verification.update')
    ->label('audits.resource', 'user/{response.userId}')
+    ->label('usage.metric', 'users.{scope}.requests.update')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'updatePhoneVerification')
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@ -1,11 +1,8 @@
 <?php

 use Appwrite\Extend\Exception;
-use Utopia\Validator\URL;
 use Appwrite\URL\URL as URLParse;
 use Appwrite\Utopia\Response;
-use chillerlan\QRCode\QRCode;
-use chillerlan\QRCode\QROptions;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
@ -14,6 +11,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
+use Utopia\Domains\Domain;
 use Utopia\Image\Image;
 use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
@ -21,7 +19,10 @@ use Utopia\Validator\Boolean;
 use Utopia\Validator\HexColor;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
+use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;
+use chillerlan\QRCode\QRCode;
+use chillerlan\QRCode\QROptions;

 $avatarCallback = function (string $type, string $code, int $width, int $height, int $quality, Response $response) {

@ -276,7 +277,13 @@ App::get('/v1/avatars/image')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
        }

-        $fetch = @\file_get_contents($url, false);
+        $domain = new Domain(\parse_url($url, PHP_URL_HOST));
+
+        if (!$domain->isKnown()) {
+            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
+        }
+
+        $fetch = @\file_get_contents($url);

        if (!$fetch) {
            throw new Exception(Exception::AVATAR_IMAGE_NOT_FOUND);
@ -326,6 +333,12 @@ App::get('/v1/avatars/favicon')
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
        }

+        $domain = new Domain(\parse_url($url, PHP_URL_HOST));
+
+        if (!$domain->isKnown()) {
+            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
+        }
+
        $curl = \curl_init();

        \curl_setopt_array($curl, [
@ -399,6 +412,12 @@ App::get('/v1/avatars/favicon')
            $outputExt = 'ico';
        }

+        $domain = new Domain(\parse_url($outputHref, PHP_URL_HOST));
+
+        if (!$domain->isKnown()) {
+            throw new Exception(Exception::AVATAR_REMOTE_URL_FAILED);
+        }
+
        if ('ico' == $outputExt) { // Skip crop, Imagick isn\'t supporting icon files
            $data = @\file_get_contents($outputHref, false);

@ -545,8 +564,6 @@ App::get('/v1/avatars/initials')
        $image->setImageFormat("png");
        $image->compositeImage($punch, Imagick::COMPOSITE_COPYOPACITY, 0, 0);

-        //$image->setImageCompressionQuality(9 - round(($quality / 100) * 9));
-
        $response
            ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
            ->setContentType('image/png')
--- a/Show more
+++ b/Show more
				`@ -1 +0,0 @@`
				[1297371,1759475,6360216,20852629,5857008,19310830,9708641,26739219,23742426,22174310,77877486,1477010,29069505,62933155,45863583,42211,176163,58045728,7091609,31401437,1911066,66096031,22432834,43054051,79051850,22895284,100597998,91385411,49699333,7818620,11004008,54898623,27856297,33250853,49375670,30630364,50206,47822499,7481165,52557347,13681567,20492520,51369094,51821861,50256986,28431370,13692220,24373771,15938422,27148250,14805534,36137226,36071208,40193621,56179878,53281158,48085134,19358691,32528768,19733683,37348419,13719696,18309412,42106787,53618500,5306011,4408379,35486736,18586611,15062564,27011453,56090587,44623032,25107942,81188,33922418,16717633,32809211,69401139,25815659,4104127,20889958,3102249,12476526,2635185,28495651,50957556,2791280,31023616,20955511,835733,471907,69008866,44906587,45271396,76054330,45748739,41908747,23402178,47356149,8921,36632821,3668741,71702982,29725587,26303198,785830,51410502,60089135,2847349,43172716,48546075,8216525,41161981,51828039,4334997,80918302,38534289,47860497,80036766,41341387,49818988,58487637,29237374,46913894,5148229,4377199,29686102,26272249,75117692,4090256,27357868,33062368,38664231,46695441,743291,22633385,6368283,11593067,45097959,43381712,3284228,1972717,33012425,61755381,25405707,3144291,44156359,5497267,7423905,20716175,28586681,5975506,23518097,22187384,24191952,7768078,971530,51240166,55633427,34207400,77061285,11719476,35950229,66742927,34406802,802933,50047839,39148877,26602940,9693472,44273767,19362725,31209978,30521594,686298,6237394,35039730,42580581,36671793,8502129,8466918,81866614,54903252,28373606,13381361,72331432,30694270,5355510,8209163,86675510,9453522,42496309,56145786,2149381,393945,22084723,52621436,8872447,5575392,29619660,5547479,8852116,11151445,4717349,17725274,65615065,18537755,29292618,53044263,26597930,10313411,55998629,77529288,17404636,33729848,19422168,17916404,66111735,10329006,33502846,398230,81643826,105039167,47522632,91655303,9774614,10603631,284924,60857954,22885912,116552306,36103454,794606,27729549,1754457,36594527,13899668,78664749,47406531,27698189,5305654,53345517,6756412,29176704,77790497,47504894,37251540,52361778,52200375,1351177,66022861,73975409,25745396,31433638,37118134,43210805,20317665,11923975,47187468,16362381,36751163,14959876,32362757,65529384,52352285,74085816,3628535,43902034,75667593,26132902,466713,617558,96806061,33605526,11290524,43621940,12446314,17146935,55018955,56096559,79797000,40014186,34449936,58387964,23368207,42414965,44056349,33743031,12294525,58251592,33755729,9021747,932084,11428067,97121933,80122730,60894542,58583793,56051809,32243289,9934371,90936802,74638775,65399526,77604,64524822,47782249,43633955,42793632,55969597,72334601,82395440,92818577,60866204,65016769,23725091,45892107,55308895,86314140,82756460,47685349,63562160,73419211,1613216,50882624,91469717,46166258,60927324,41763158,83607556,2171717,50497814,39427312,61322830,40076195,39419448,29397545,55090719,53259730,20885012,64558515,69677883,55741087,72426535,46033036,68477507,30376878,73700530,25518600,29922887,36229969,47573417,40424087,49054503,16880385,22801227,72848513,64347914,814402,49149679,55017867,49481876,67067955,31439735,63878173,80322286,43746210,17332970,22702905,62476876,89888292,75736952,54059881,90782137,63588969,57111920,63330165,70258211,46371923,17837758,59364507,52203828,60147326,18481195,74822422,9803078,67309607,60410049,47360939,19922556,90848252,24698014,58886915,63579762,96648934,68523530,60518745,37345795,3929651,54993657,52061363,43019989,5787917,94674993,71593494,17143469,10288548,1830380,71510505,59124772,2335145,70798495,46474346,49263351,52062536,63151043,65248303,26071571,53626355,43992469,60785452,63467479,71837281,19490891,58628586,38250310,7271718,1110414,57227290,11625672,85063520,88965873,70096901,42029519,85363195,64471630,69353350,66922161,2221746,100430077,12299813,62690310,68282006,99184676,2450,22989561,22212661,59973863,11232940,76688923,22321353,77732479,84286404,32268377,34828782,23068019,57074509,24620969,20735983,26173690,75809937,49760818,86646105,52617262]