Fix size of function return value

2026-05-26 13:51:13 +00:00 · 2023-02-17 22:12:26 +00:00
6805 changed files with 5586 additions and 74347 deletions
@@ -23,15 +23,15 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_STORAGE_DEVICE=local
+_APP_STORAGE_DEVICE=Local
 _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=
-_APP_STORAGE_S3_REGION=
+_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=fra1
-_APP_STORAGE_DO_SPACES_BUCKET=videos-test
+_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
@@ -58,10 +58,8 @@ _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
 _APP_SMS_PROVIDER=sms://username:password@mock
 _APP_SMS_FROM=+123456789
-_APP_STORAGE_LIMIT=30000000000000
+_APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_PHONE_PROVIDER=phone://mock
-_APP_PHONE_FROM=+123456789
 _APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_BUILD_TIMEOUT=900
@@ -1,9 +1,5 @@
 name: "CodeQL"

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on:
  push:
    branches: [master]
@@ -1,9 +1,5 @@
 name: "Linter"

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on: [pull_request]
 jobs:
  lint:
@@ -1,53 +0,0 @@
-name: "Release"
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  tests:
-    name: Release
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-        # Fetch submodules
-        submodules: recursive
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-    - name: Extract metadata (tags, labels) for Docker
-      id: meta
-      uses: docker/metadata-action@v4
-      with:
-        images: appwrite/appwrite
-        tags: |
-          type=semver,pattern={{major}}.{{minor}}.{{patch}}
-          type=semver,pattern={{major}}.{{minor}}
-          type=semver,pattern={{major}}
-
-    - name: Build and push
-      uses: docker/build-push-action@v4
-      with:
-        context: .
-        platforms: linux/amd64,linux/arm64
-        build-args: |
-          VERSION=${{ steps.meta.outputs.version }}
-        push: true
-        tags: ${{ steps.meta.outputs.tags }}
-        labels: ${{ steps.meta.outputs.labels }}
@@ -1,9 +1,5 @@
 name: "Tests"

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 on: [pull_request]
 jobs:
  tests:
@@ -13,7 +13,3 @@ debug/
 app/sdks
 dev/yasd_init.php
 .phpunit.result.cache
-/tests/tmp/
-/tests/resources/disk-a/very-large-file-1.mov
-/tests/resources/disk-a/very-big-file-2.mov
-/tests/resources/disk-a/video-srt.*
@@ -1,4 +1,4 @@
 [submodule "app/console"]
 	path = app/console
 	url = https://github.com/appwrite/console
-	branch = video-scopes-support
+	branch = 2.2.0
@@ -1,68 +1,3 @@
-# Version 1.3.7
-
-## Bugs
- Fix the routing for the default OAuth2 pages [#5640](https://github.com/appwrite/appwrite/pull/5640) [#5648](https://github.com/appwrite/appwrite/pull/5648)
- Add support for trailing slashes in Routes and URLs [#5647](https://github.com/appwrite/appwrite/pull/5647) [#5648](https://github.com/appwrite/appwrite/pull/5648)
-
-# Version 1.3.6
-
-## Bugs
-
- Fix Console deep linking to result in a 404 [#5632](https://github.com/appwrite/appwrite/pull/5632)
- Fix ACME HTTP Challenge [#5632](https://github.com/appwrite/appwrite/pull/5632)
-
-# Version 1.3.5
-
-## Bugs
-
- Fix minimum length for string attribute default values [#5606](https://github.com/appwrite/appwrite/pull/5606), [#5602](https://github.com/appwrite/appwrite/pull/5602)
- Update framework to fix route mismatches [#5603](https://github.com/appwrite/appwrite/pull/5603)
-
-# Version 1.3.4
-
-## Bugs
-
- Update migration to properly migrate bucket permissions [#5497](https://github.com/appwrite/appwrite/pull/5497)
-
-# Version 1.3.3
-
-## Bugs
- Fixed migration resetting some data [#5455](https://github.com/appwrite/appwrite/pull/5455)
-
-# Version 1.3.2
-
-## Bugs
- Fixed auto-setting custom ID on nested documents [#5363](https://github.com/appwrite/appwrite/pull/5363)
- Fixed listDocuments not returning all the documents [#5395](https://github.com/appwrite/appwrite/pull/5395)
- Fixed deleting keys, webhooks, platforms and domains after deleting project [#5395](https://github.com/appwrite/appwrite/pull/5395)
- Fixed empty team prefs returning as JSON object rather array [#5361](https://github.com/appwrite/appwrite/pull/5361)
-
-# Version 1.3.1
-
-## Bugs
- Fixed Migration issue regarding 500 error [#5356](https://github.com/appwrite/appwrite/pull/5356)
-
-# Version 1.3.0
-
-## Features
- Password dictionary setting allows to compare user's password against command password database [#4906](https://github.com/appwrite/appwrite/pull/4906)
- Password history setting allows to save user's last used password so that it may not be used again.  Maximum number of history saved is 20, which can be configured. Minimum is 0 which means disabled. [#4866](https://github.com/appwrite/appwrite/pull/4866)
- Update APIs to check X-Appwrite-Timestamp header [#5024](https://github.com/appwrite/appwrite/pull/5024)
- Database relationships [#5238](https://github.com/appwrite/appwrite/pull/5238)
- New query operators [#5238](https://github.com/appwrite/appwrite/pull/5238)
- Team preferences [#5196](https://github.com/appwrite/appwrite/pull/5196)
- Update attribute metadata [#5164](https://github.com/appwrite/appwrite/pull/5164)
-
-## Bugs
- Fix not storing function's response on response codes 5xx [#4610](https://github.com/appwrite/appwrite/pull/4610)
- Fix expire to formatTz in create account session [#4985](https://github.com/appwrite/appwrite/pull/4985)
- Fix deleting projects when organization is deleted [#5335](https://github.com/appwrite/appwrite/pull/5335)
- Fix deleting collections from a project [#4983](https://github.com/appwrite/appwrite/pull/4983)
- Fix cleaning up project databases [#4984](https://github.com/appwrite/appwrite/pull/4984)
- Fix creating documents with attributes with special characters [#246](https://github.com/utopia-php/database/pull/246)
- Fix deleting attribute not deleting metadata index [#246](https://github.com/utopia-php/database/pull/246)
- Fix create attribute event payload [#246](https://github.com/utopia-php/database/pull/246)
-
 # Version 1.2.1
 ## Changes
 - Upgrade Console to [2.2.0](https://github.com/appwrite/console/releases/tag/2.2.0)
@@ -321,7 +321,7 @@ The Runtimes for all supported cloud functions (multicore builds) can be found a

 The following steps are used to generate a new console SDK:

-1. Update the console spec file located at `app/config/specs/swagger2-<version-number>.console.json` using Appwrite Tasks. Run the `php app/cli.php specs version=<version-number> mode=normal` command in a running `appwrite/appwrite` container.
+1. Update the console spec file located at `app/config/specs/swagger2-<version-number>.console.json` using Appwrite Tasks. Run the `php app/cli.php specs <version-number> normal` command in a running `appwrite/appwrite` container.
 2. Generate a new SDK using the command `php app/cli.php sdks`.
 3. Change your working dir using `cd app/sdks/console-web`.
 4. Build the new SDK `npm run build`.
@@ -346,7 +346,8 @@ If you are in PHP Storm you don't need any plugin. Below are the settings requir

 1. Create an init file. 
 2. Duplicate **dev/yasd_init.php.stub** file and name it **dev/yasd_init.php**.
-3. Set **DEBUG** build arg in **appwrite** service in **docker-compose.yml** file.
+3. Change the IP address to your development machine's IP. Without the proper IP address, the debugger won't connect. 
+4. Set **DEBUG** build arg in **appwrite** service in **docker-compose.yml** file.

 ### VS Code Launch Configuration

@@ -435,14 +436,6 @@ composer lint
 composer lint <your file path>
 ```

-## Clearing the Cache
-
-If you need to clear the cache, you can do so by running the following command:
-
-```bash
-docker compose exec redis redis-cli FLUSHALL
-```
-
 ## Tutorials

 From time to time, our team will add tutorials that will help contributors find their way in the Appwrite source code. Below is a list of currently available tutorials:
@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
    --no-plugins --no-scripts --prefer-dist \
    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

-FROM --platform=$BUILDPLATFORM node:16.14.2-alpine3.15 as node
+FROM node:16.14.2-alpine3.15 as node

 COPY app/console /usr/local/src/console

@@ -29,7 +29,7 @@ ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
 RUN npm ci
 RUN npm run build

-FROM appwrite/base:0.2.2 as final
+FROM appwrite/base:0.1.0 as final

 LABEL maintainer="team@appwrite.io"

@@ -124,13 +124,6 @@ ENV _APP_SERVER=swoole \
    _APP_LOGGING_PROVIDER= \
    _APP_LOGGING_CONFIG=

-RUN \
-  apk update \
-  && apk add --no-cache\
-  mediainfo \
-  ffmpeg \
-  && rm -rf /var/cache/apk/*
-
 RUN \
  if [ "$DEBUG" == "true" ]; then \
    apk add boost boost-dev; \
@@ -149,14 +142,12 @@ COPY ./src /usr/src/code/src

 # Set Volumes
 RUN mkdir -p /storage/uploads && \
-    mkdir -p /storage/videos && \
    mkdir -p /storage/cache && \
    mkdir -p /storage/config && \
    mkdir -p /storage/certificates && \
    mkdir -p /storage/functions && \
    mkdir -p /storage/debug && \
    chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads && \
-    chown -Rf www-data.www-data /storage/videos && chmod -Rf 0755 /storage/videos && \
    chown -Rf www-data.www-data /storage/cache && chmod -Rf 0755 /storage/cache && \
    chown -Rf www-data.www-data /storage/config && chmod -Rf 0755 /storage/config && \
    chown -Rf www-data.www-data /storage/certificates && chmod -Rf 0755 /storage/certificates && \
@@ -185,14 +176,13 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/worker-builds && \
    chmod +x /usr/local/bin/worker-mails && \
    chmod +x /usr/local/bin/worker-messaging && \
-    chmod +x /usr/local/bin/worker-videos && \
    chmod +x /usr/local/bin/worker-webhooks

 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/

 # Enable Extensions
-RUN if [ "$DEBUG" == "true" ]; then printf "zend_extension=yasd \nyasd.debug_mode=remote \nyasd.init_file=/usr/src/code/dev/yasd_init.php \nyasd.remote_port=9005 \nyasd.log_level=-1" >> /usr/local/etc/php/conf.d/yasd.ini; fi
+RUN if [ "$DEBUG" == "true" ]; then printf "zend_extension=yasd \nyasd.debug_mode=remote \nyasd.init_file=/usr/local/dev/yasd_init.php \nyasd.remote_port=9005 \nyasd.log_level=-1" >> /usr/local/etc/php/conf.d/yasd.ini; fi

 RUN if [ "$DEBUG" == "true" ]; then echo "opcache.enable=0" >> /usr/local/etc/php/conf.d/appwrite.ini; fi
 RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini
@@ -1,4 +1,5 @@
-> 好消息！Appwrite 云现已进入公开测试版！立即访问 cloud.appwrite.io 注册，体验无忧的托管服务。今天就加入我们的云端吧！☁️🎉
+> 准备好迎接狂风暴'云'了吗? 🌩 ☂️
+> Appwrite Cloud即将到来!你能够通过https://appwrite.io/cloud了解更多的资讯, 注册即可领取试用额度哦

 <br />
 <p align="center">
@@ -11,7 +12,7 @@
 </p>

 <!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
-[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
+
 [![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
@@ -23,7 +24,7 @@

 [English](README.md) | 简体中文

-[**Appwrite 云公开测试版！立即注册！**](https://cloud.appwrite.io)
+[**我们发布了 Appwrite Console 2.0 版本，点击这里了解更多！**](https://medium.com/appwrite-io/announcing-console-2-0-2e0e96891cb0?source=friends_link&sk=7a82b4069778e3adc165dc026e960fe1)

 Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面简化了从零开始编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。

@@ -66,7 +67,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.7
+    appwrite/appwrite:1.2.1
 ```

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

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

 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -1,10 +1,12 @@
-> Great news! Appwrite Cloud is now in public beta! Sign up at [cloud.appwrite.io](https://cloud.appwrite.io) for a hassle-free, hosted experience. Join us in the Cloud today! ☁️🎉
+> It's going to get cloudy! 🌩 ☂️
+> The Appwrite Cloud is coming soon! You can learn more about our upcoming hosted solution and signup for free credits at: https://appwrite.io/cloud

 <br />
 <p align="center">
    <a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></a>
    <br />
-    <b>Appwrite is a backend platform for developing Web, Mobile, and Flutter applications. Built with the open source community and optimized for developer experience in the coding languages you love.</b>
+    <br />
+    <b>A complete backend solution for your [Flutter / Vue / Angular / React / iOS / Android / *ANY OTHER*] app</b>
    <br />
    <br />
 </p>
@@ -12,7 +14,6 @@

 <!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->

-[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
 [![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
@@ -24,7 +25,7 @@

 English | [简体中文](README-CN.md)

-[**Announcing Appwrite Cloud Public Beta! Sign up today!**](https://cloud.appwrite.io)
+[**Announcing Appwrite 1.2 with GraphQL support! Learn what's new!**](https://appwrite.io/graphql)

 Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker<nobr> microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster.

@@ -49,7 +50,6 @@ Table of Contents:
    - [CMD](#cmd)
    - [PowerShell](#powershell)
  - [Upgrade from an Older Version](#upgrade-from-an-older-version)
- [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
  - [Services](#services)
  - [SDKs](#sdks)
@@ -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.7
+    appwrite/appwrite:1.2.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.7
+    appwrite/appwrite:1.2.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.7
+    appwrite/appwrite:1.2.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.
@@ -4,11 +4,11 @@

 | Version   | Supported          |
 | --------- | ------------------ |
-| <= 0.15.x | :x:                |
+| <= 0.14.x | :x:                |
+| 0.15.x    | :white_check_mark: |
 | 1.0.x     | :white_check_mark: |
 | 1.1.x     | :white_check_mark: |
 | 1.2.x     | :white_check_mark: |
-| 1.3.x     | :white_check_mark: |

 ## Reporting a Vulnerability

@@ -88,11 +88,6 @@ return [
        'description' => 'The request cannot be fulfilled with the current protocol. Please check the value of the _APP_OPTIONS_FORCE_HTTPS environment variable.',
        'code' => 500,
    ],
-    Exception::GENERAL_USAGE_DISABLED => [
-        'name' => Exception::GENERAL_USAGE_DISABLED,
-        'description' => 'Usage stats is not configured. Please check the value of the _APP_USAGE_STATS environment variable of your Appwrite server.',
-        'code' => 501,
-    ],

    /** User Errors */
    Exception::USER_COUNT_EXCEEDED => [
@@ -107,12 +102,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 email already exists in your 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 from the Appwrite console.',
        'code' => 401,
    ],
    Exception::USER_INVALID_TOKEN => [
@@ -403,14 +398,9 @@ return [
        'description' => 'The document structure is invalid. Please ensure the attributes match the collection definition.',
        'code' => 400,
    ],
-    Exception::DOCUMENT_MISSING_DATA => [
-        'name' => Exception::DOCUMENT_MISSING_DATA,
-        'description' => 'The document data is missing. You must provide the document data.',
-        '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 payload is missing.',
        'code' => 400,
    ],
    Exception::DOCUMENT_ALREADY_EXISTS => [
@@ -418,16 +408,6 @@ return [
        'description' => 'Document with the requested ID already exists.',
        'code' => 409,
    ],
-    Exception::DOCUMENT_UPDATE_CONFLICT => [
-        'name' => Exception::DOCUMENT_UPDATE_CONFLICT,
-        'description' => 'Remote document is newer than local.',
-        'code' => 409,
-    ],
-    Exception::DOCUMENT_DELETE_RESTRICTED => [
-        'name' => Exception::DOCUMENT_DELETE_RESTRICTED,
-        'description' => 'Document cannot be deleted because it is referenced by another document.',
-        'code' => 403,
-    ],

    /** Attributes */
    Exception::ATTRIBUTE_NOT_FOUND => [
@@ -437,12 +417,12 @@ return [
    ],
    Exception::ATTRIBUTE_UNKNOWN => [
        'name' => Exception::ATTRIBUTE_UNKNOWN,
-        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the available state.',
+        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the <span class="tag">available</span> state.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_NOT_AVAILABLE => [
        'name' => Exception::ATTRIBUTE_NOT_AVAILABLE,
-        'description' => 'The requested attribute is not yet available. Please try again later.',
+        'description' => 'The requested attribute is not yet <span class="tag">available</span>. Please try again later.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_FORMAT_UNSUPPORTED => [
@@ -452,7 +432,7 @@ return [
    ],
    Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED => [
        'name' => Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED,
-        'description' => 'Default values cannot be set for array or required attributes.',
+        'description' => 'Default values cannot be set for <span class="tag">array</span> and <span class="tag">required</span> attributes.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_ALREADY_EXISTS => [
@@ -470,11 +450,6 @@ return [
        'description' => 'The attribute value is invalid. Please check the type, range and value of the attribute.',
        'code' => 400,
    ],
-    Exception::ATTRIBUTE_TYPE_INVALID => [
-        'name' => Exception::ATTRIBUTE_TYPE_INVALID,
-        'description' => 'The attribute type is invalid.',
-        'code' => 400,
-    ],

    /** Indexes */
    Exception::INDEX_NOT_FOUND => [
@@ -499,11 +474,6 @@ return [
        'description' => 'Project with the requested ID could not be found. Please check the value of the X-Appwrite-Project header to ensure the correct project ID is being used.',
        'code' => 404,
    ],
-    Exception::PROJECT_ALREADY_EXISTS => [
-        'name' => Exception::PROJECT_ALREADY_EXISTS,
-        'description' => 'Project with the requested ID already exists.',
-        'code' => 409,
-    ],
    Exception::PROJECT_UNKNOWN => [
        'name' => Exception::PROJECT_UNKNOWN,
        'description' => 'The project ID is either missing or not valid. Please check the value of the X-Appwrite-Project header to ensure the correct project ID is being used.',
@@ -579,71 +549,6 @@ return [
        'description' => 'Domain verification for the requested domain has failed.',
        'code' => 401,
    ],
-    Exception::VIDEO_PROFILE_NOT_FOUND => [
-        'name' => Exception::VIDEO_PROFILE_NOT_FOUND,
-        'description' => 'Video profile not found.',
-        'code' => 404,
-    ],
-    Exception::VIDEO_NOT_VALID => [
-        'name' => Exception::VIDEO_NOT_VALID,
-        'description' => 'Video not valid.',
-        'code' => 400,
-    ],
-    Exception::VIDEO_RENDITION_NOT_FOUND => [
-        'name' => Exception::VIDEO_RENDITION_NOT_FOUND,
-        'description' => 'Video rendition not found.',
-        'code' => 404,
-    ],
-    Exception::VIDEO_SUBTITLE_NOT_FOUND => [
-        'name' => Exception::VIDEO_SUBTITLE_NOT_FOUND,
-        'description' => 'Video subtitle not found.',
-        'code' => 404,
-    ],
-    Exception::VIDEO_LANGUAGE_CODE_NOT_VALID => [
-        'name' => Exception::VIDEO_LANGUAGE_CODE_NOT_VALID,
-        'description' => 'Video language code not valid.',
-        'code' => 400,
-    ],
-    Exception::VIDEO_SUBTITLE_NOT_VALID => [
-        'name' => Exception::VIDEO_SUBTITLE_NOT_VALID,
-        'description' => 'Video subtitle not valid.',
-        'code' => 400,
-    ],
-    Exception::VIDEO_SECOND_OUT_OF_RANGE => [
-        'name' => Exception::VIDEO_SECOND_OUT_OF_RANGE,
-        'description' => 'Video second out of duration range.',
-        'code' => 400,
-    ],
-    Exception::VIDEO_NOT_FOUND => [
-        'name' => Exception::VIDEO_NOT_FOUND,
-        'description' => 'Video not found.',
-        'code' => 404,
-    ],
-    Exception::VIDEO_PREVIEW_NOT_FOUND => [
-        'name' => Exception::VIDEO_PREVIEW_NOT_FOUND,
-        'description' => 'Video preview not found.',
-        'code' => 404,
-    ],
-    Exception::VIDEO_TIMELINE_NOT_FOUND => [
-        'name' => Exception::VIDEO_TIMELINE_NOT_FOUND,
-        'description' => 'Video timeline not found.',
-        'code' => 404,
-    ],
-    Exception::VIDEO_RENDITION_SEGMENT_NOT_FOUND => [
-        'name' => Exception::VIDEO_RENDITION_SEGMENT_NOT_FOUND,
-        'description' => 'Video rendition segment not found',
-        'code' => 404,
-    ],
-    Exception::VIDEO_SUBTITLE_SEGMENT_NOT_FOUND => [
-        'name' => Exception::VIDEO_SUBTITLE_SEGMENT_NOT_FOUND,
-        'description' => 'Video subtitle segment not found',
-        'code' => 404,
-    ],
-    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.',
@@ -183,16 +183,13 @@ return [
            ],
        ],
        'create' => [
-            '$description' => 'This event triggers when a team is created.'
+            '$description' => 'This event triggers when a bucket is created.'
        ],
        'delete' => [
-            '$description' => 'This event triggers when a team is deleted.',
+            '$description' => 'This event triggers when a bucket is deleted.',
        ],
        'update' => [
-            '$description' => 'This event triggers when a team is updated.',
-            'prefs' => [
-                '$description' => 'This event triggers when a team\'s preferences are updated.',
-            ],
+            '$description' => 'This event triggers when a bucket is updated.',
        ]
    ],
    'functions' => [
@@ -236,33 +233,5 @@ return [
        'update' => [
            '$description' => 'This event triggers when a function is updated.',
        ]
-    ],
-    'videos' => [
-        '$model' => Response::MODEL_VIDEO,
-        '$resource' => true,
-        '$description' => 'This event triggers on any videos event.',
-        'renditions' => [
-            '$model' => Response::MODEL_RENDITION,
-            '$resource' => true,
-            '$description' => 'This event triggers on any renditions event.',
-            'create' => [
-                '$description' => 'This event triggers when a rendition is created.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when a rendition is deleted.'
-            ],
-            'update' => [
-                '$description' => 'This event triggers when a rendition is updated.'
-            ],
-        ],
-        'create' => [
-            '$description' => 'This event triggers when a video is created.'
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a video is deleted.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a video is updated.',
-        ]
-    ],
+    ]
 ];
@@ -11,11 +11,11 @@ return [
        'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](/docs/getting-started-for-web) or [getting started for Flutter](/docs/getting-started-for-flutter) tutorials to start building your first application.',
        'enabled' => true,
        'beta' => false,
-        'sdks' => [
+        'languages' => [ // TODO change key to 'sdks'
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '11.0.0',
+                'version' => '10.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@@ -28,7 +28,7 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-web.git',
                'gitRepoName' => 'sdk-for-web',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
                'demos' => [
                    [
                        'icon' => 'react.svg',
@@ -63,7 +63,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '9.0.0',
+                'version' => '8.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@@ -76,12 +76,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-flutter.git',
                'gitRepoName' => 'sdk-for-flutter',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'apple',
                'name' => 'Apple',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-apple',
                'package' => 'https://github.com/appwrite/sdk-for-apple',
                'enabled' => true,
@@ -94,7 +94,7 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
                'gitRepoName' => 'sdk-for-apple',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'objective-c',
@@ -111,12 +111,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-objective-c.git',
                'gitRepoName' => 'sdk-for-objective-c',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'android',
                'name' => 'Android',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-android',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                'enabled' => true,
@@ -129,7 +129,7 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-android.git',
                'gitRepoName' => 'sdk-for-android',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'main',
                'docDirectories' => [
                    'Kotlin' => 'kotlin',
                    'Java' => 'java',
@@ -181,11 +181,11 @@ return [
        'name' => 'Console',
        'enabled' => false,
        'beta' => false,
-        'sdks' => [
+        'languages' => [
            [
                'key' => 'web',
                'name' => 'Console',
-                'version' => '0.1.0',
+                'version' => '7.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-console',
                'package' => '',
                'enabled' => true,
@@ -193,17 +193,17 @@ return [
                'dev' => false,
                'hidden' => true,
                'family' => APP_PLATFORM_CONSOLE,
-                'prism' => 'javascript',
+                'prism' => 'console',
                'source' => \realpath(__DIR__ . '/../sdks/console-web'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-console.git',
-                'gitBranch' => 'dev',
+                'gitUrl' => '',
+                'gitBranch' => '',
                'gitRepoName' => 'sdk-for-console',
                'gitUserName' => 'appwrite',
            ],
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '2.0.2',
+                'version' => '1.1.1',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://www.npmjs.com/package/appwrite-cli',
                'enabled' => true,
@@ -216,7 +216,7 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-cli.git',
                'gitRepoName' => 'sdk-for-cli',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
        ],
    ],
@@ -227,11 +227,11 @@ return [
        'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](/docs/getting-started-for-server) tutorial to start building your first server integration.',
        'enabled' => true,
        'beta' => false,
-        'sdks' => [
+        'languages' => [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '9.0.0',
+                'version' => '8.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@@ -244,12 +244,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-node.git',
                'gitRepoName' => 'sdk-for-node',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'deno',
                'name' => 'Deno',
-                'version' => '7.0.0',
+                'version' => '6.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-deno',
                'package' => 'https://deno.land/x/appwrite',
                'enabled' => true,
@@ -262,12 +262,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-deno.git',
                'gitRepoName' => 'sdk-for-deno',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '8.0.0',
+                'version' => '7.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
@@ -280,12 +280,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-php.git',
                'gitRepoName' => 'sdk-for-php',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@@ -298,12 +298,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-python.git',
                'gitRepoName' => 'sdk-for-python',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '8.0.0',
+                'version' => '7.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@@ -316,12 +316,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-ruby.git',
                'gitRepoName' => 'sdk-for-ruby',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'go',
                'name' => 'Go',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-go',
                'package' => '',
                'enabled' => false,
@@ -334,12 +334,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-go.git',
                'gitRepoName' => 'sdk-for-go',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'java',
                'name' => 'Java',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-java',
                'package' => '',
                'enabled' => false,
@@ -352,17 +352,17 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-java.git',
                'gitRepoName' => 'sdk-for-java',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.4.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
-                'enabled' => true,
+                'enabled' => false,
                'beta' => true,
-                'dev' => false,
+                'dev' => true,
                'hidden' => false,
                'family' => APP_PLATFORM_SERVER,
                'prism' => 'csharp',
@@ -370,12 +370,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-dotnet.git',
                'gitRepoName' => 'sdk-for-dotnet',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'main',
            ],
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '8.0.0',
+                'version' => '7.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@@ -388,12 +388,12 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-dart.git',
                'gitRepoName' => 'sdk-for-dart',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'master',
            ],
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                'enabled' => true,
@@ -406,7 +406,7 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-kotlin.git',
                'gitRepoName' => 'sdk-for-kotlin',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'main',
                'docDirectories' => [
                    'Kotlin' => 'kotlin',
                    'Java' => 'java',
@@ -415,7 +415,7 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '2.0.0',
+                'version' => '1.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
@@ -428,7 +428,7 @@ return [
                'gitUrl' => 'git@github.com:appwrite/sdk-for-swift.git',
                'gitRepoName' => 'sdk-for-swift',
                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
+                'gitBranch' => 'main',
            ],
            [
                'key' => 'graphql',
@@ -20,8 +20,6 @@ $member = [
    'avatars.read',
    'execution.read',
    'execution.write',
-    'videos.read',
-    'videos.write',
 ];

 $admins = [
@@ -53,8 +51,6 @@ $admins = [
    'functions.write',
    'execution.read',
    'execution.write',
-    'videos.read',
-    'videos.write',
 ];

 return [
@@ -72,7 +68,6 @@ return [
            'locale.read',
            'avatars.read',
            'execution.write',
-            'videos.read',
        ],
    ],
    Auth::USER_ROLE_USERS => [
@@ -76,10 +76,4 @@ return [ // List of publicly visible scopes
    'health.read' => [
        'description' => 'Access to read your project\'s health status',
    ],
-    'videos.read' => [
-        'description' => 'Access to read your project\'s video content',
-    ],
-     'videos.write' => [
-        'description' => 'Access to create, update, and delete your project\'s video content',
-    ]
 ];
@@ -1,9 +1,9 @@
 <?php

 return [
-    'web/home' => [
-        'key' => 'web/home',
-        'name' => 'Home',
+    '/' => [
+        'key' => 'homepage',
+        'name' => 'Homepage',
        'subtitle' => '',
        'description' => '',
        'controller' => 'web/home.php',
@@ -14,8 +14,8 @@ return [
        'optional' => false,
        'icon' => '',
    ],
-    'web/console' => [
-        'key' => 'web/console',
+    'console' => [
+        'key' => 'console',
        'name' => 'Console',
        'subtitle' => '',
        'description' => '',
@@ -186,30 +186,4 @@ return [
        'optional' => true,
        'icon' => '/images/services/graphql.png',
    ],
-    'console' => [
-        'key' => 'console',
-        'name' => 'Console',
-        'subtitle' => 'The Console service allows you to interact with console relevant informations.',
-        'description' => '',
-        'controller' => 'api/console.php',
-        'sdk' => true,
-        'docs' => true,
-        'docsUrl' => '',
-        'tests' => false,
-        'optional' => false,
-        'icon' => '',
-    ],
-    'videos' => [
-        'key' => 'videos',
-        'name' => 'Videos',
-        'subtitle' => 'Appwrite\'s Videos Endpoint',
-        'description' => 'Videos Endpoint',
-        'controller' => 'api/videos.php',
-        'sdk' => false,
-        'docs' => false,
-        'docsUrl' => '',
-        'tests' => true,
-        'optional' => false,
-        'icon' => '',
-    ],
 ];
@@ -152,7 +152,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, to enable the logger set the value to one of \'sentry\', \'raygun\', \'appsignal\', \'logowl\'',
                'introduction' => '0.12.0',
                'default' => '',
                'required' => false,
@@ -764,7 +764,7 @@ return [
            ],
            [
                'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'The minimum time a function must be inactive before it can be shut down and cleaned up. This feature is intended to clean up unused containers. Containers may remain active for longer than the interval before being shut down, as Appwrite only cleans up unused containers every hour. If no value is provided, the default is 60 seconds.',
+                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value is 60 seconds',
                'introduction' => '0.13.0',
                'default' => '60',
                'required' => false,
@@ -1,48 +0,0 @@
-<?php
-
-return [
-    [
-
-        'name' => '360p',
-        'videoBitRate' => 890, //video BitRate in Kbps
-        'audioBitRate' => 64, //audio BitRate in Kbps
-        'width' =>  640, //width resolution in px
-        'height' => 360, //height resolution in px
-    ],
-    [
-
-        'name' => '480p',
-        'videoBitRate' => 2100,
-        'audioBitRate' => 64,
-        'width' =>  854,
-        'height' => 480,
-    ],
-    [
-        'name' => '576p',
-        'videoBitRate' => 2538,
-        'audioBitRate' => 128,
-        'width' => 1024,
-        'height' => 576,
-    ],
-    [
-        'name' => '720p',
-        'videoBitRate' => 3551,
-        'audioBitRate' => 128,
-        'width' => 1280,
-        'height' => 720,
-    ],
-    [
-        'name' => '1080p',
-        'videoBitRate' => 4800,
-        'audioBitRate' => 128,
-        'width' => 1920,
-        'height' => 1080,
-    ],
-    [
-        'name' => '2160p',
-        'videoBitRate' => 16000,
-        'audioBitRate' => 356,
-        'width' => 4096,
-        'height' => 2160,
-    ],
-];
@@ -10,8 +10,8 @@ use Appwrite\Event\Mail;
 use Appwrite\Event\Phone as EventPhone;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Network\Validator\Host;
-use Appwrite\Network\Validator\URL;
+use Utopia\Validator\Host;
+use Utopia\Validator\URL;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Template\Template;
 use Appwrite\URL\URL as URLParser;
@@ -40,8 +40,6 @@ use Utopia\Validator\ArrayList;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
-use Appwrite\Auth\Validator\PasswordHistory;
-use Appwrite\Auth\Validator\PasswordDictionary;

 $oauthDefaultSuccess = '/auth/oauth2/success';
 $oauthDefaultFailure = '/auth/oauth2/failure';
@@ -62,11 +60,11 @@ App::post('/v1/account')
    ->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_USER)
+    ->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('userId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. 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', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
+    ->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('request')
    ->inject('response')
@@ -74,6 +72,7 @@ App::post('/v1/account')
    ->inject('dbForProject')
    ->inject('events')
    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $project, Database $dbForProject, Event $events) {
+
        $email = \strtolower($email);
        if ('console' === $project->getId()) {
            $whitelistEmails = $project->getAttribute('authWhitelistEmails');
@@ -98,8 +97,6 @@ App::post('/v1/account')
            }
        }

-        $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
-        $password = Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS);
        try {
            $userId = $userId == 'unique()' ? ID::unique() : $userId;
            $user = Authorization::skip(fn() => $dbForProject->createDocument('users', new Document([
@@ -112,11 +109,10 @@ App::post('/v1/account')
                'email' => $email,
                'emailVerification' => false,
                'status' => true,
-                'password' => $password,
-                'passwordHistory' => $passwordHistory > 0 ? [$password] : [],
-                'passwordUpdate' => DateTime::now(),
+                '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,
@@ -144,7 +140,7 @@ App::post('/v1/account')
 App::post('/v1/account/sessions/email')
    ->alias('/v1/account/sessions')
    ->desc('Create Email Session')
-    ->groups(['api', 'account', 'auth'])
+    ->groups(['api', 'account', 'auth', 'session'])
    ->label('event', 'users.[userId].sessions.[sessionId].create')
    ->label('scope', 'public')
    ->label('auth.type', 'emailPassword')
@@ -192,7 +188,7 @@ App::post('/v1/account/sessions/email')

        $detector = new Detector($request->getUserAgent('UNKNOWN'));
        $record = $geodb->get($request->getIP());
-        $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
+        $expire = DateTime::addSeconds(new \DateTime(), $duration);
        $secret = Auth::tokenGenerator();
        $session = new Document(array_merge(
            [
@@ -284,12 +280,6 @@ App::get('/v1/account/sessions/oauth2/:provider')

        $protocol = $request->getProtocol();
        $callback = $protocol . '://' . $request->getHostname() . '/v1/account/sessions/oauth2/callback/' . $provider . '/' . $project->getId();
-        $providerEnabled = $project->getAttribute('authProviders', [])[$provider . 'Enabled'] ?? false;
-
-        if (!$providerEnabled) {
-            throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please enable the provider from your ' . APP_NAME . ' console to continue.');
-        }
-
        $appId = $project->getAttribute('authProviders', [])[$provider . 'Appid'] ?? '';
        $appSecret = $project->getAttribute('authProviders', [])[$provider . 'Secret'] ?? '{}';

@@ -375,13 +365,12 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')

 App::get('/v1/account/sessions/oauth2/:provider/redirect')
    ->desc('OAuth2 Redirect')
-    ->groups(['api', 'account'])
+    ->groups(['api', 'account', 'session'])
    ->label('error', __DIR__ . '/../../views/general/error.phtml')
    ->label('event', 'users.[userId].sessions.[sessionId].create')
    ->label('scope', 'public')
    ->label('audits.event', 'session.create')
    ->label('audits.resource', 'user/{user.$id}')
-    ->label('audits.userId', '{user.$id}')
    ->label('abuse-limit', 50)
    ->label('abuse-key', 'ip:{ip}')
    ->label('docs', false)
@@ -405,11 +394,6 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
        $validateURL = new URL();
        $appId = $project->getAttribute('authProviders', [])[$provider . 'Appid'] ?? '';
        $appSecret = $project->getAttribute('authProviders', [])[$provider . 'Secret'] ?? '{}';
-        $providerEnabled = $project->getAttribute('authProviders', [])[$provider . 'Enabled'] ?? false;
-
-        if (!$providerEnabled) {
-            throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please enable the provider from your ' . APP_NAME . ' console to continue.');
-        }

        if (!empty($appSecret) && isset($appSecret['version'])) {
            $key = App::getEnv('_APP_OPENSSL_KEY_V' . $appSecret['version']);
@@ -505,11 +489,8 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                    }
                }

-                $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
-
                try {
                    $userId = ID::unique();
-                    $password = Auth::passwordHash(Auth::passwordGenerator(), Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS);
                    $user = Authorization::skip(fn() => $dbForProject->createDocument('users', new Document([
                        '$id' => $userId,
                        '$permissions' => [
@@ -520,8 +501,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                        'email' => $email,
                        'emailVerification' => true,
                        'status' => true, // Email should already be authenticated by OAuth2 provider
-                        'passwordHistory' => $passwordHistory > 0 ? [$password] : null,
-                        'password' => $password,
+                        'password' => Auth::passwordHash(Auth::passwordGenerator(), Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS),
                        'hash' => Auth::DEFAULT_ALGO,
                        'hashOptions' => Auth::DEFAULT_ALGO_OPTIONS,
                        'passwordUpdate' => null,
@@ -641,7 +621,7 @@ App::post('/v1/account/sessions/magic-url')
    ->label('sdk.response.model', Response::MODEL_TOKEN)
    ->label('abuse-limit', 10)
    ->label('abuse-key', 'url:{url},email:{param-email}')
-    ->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('userId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. 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('url', '', fn($clients) => new Host($clients), 'URL to redirect the user back to your app from the magic URL login. 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'])
    ->inject('request')
@@ -733,11 +713,33 @@ 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');
+        $subject = $locale->getText("emails.magicSession.subject");
+
+        $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();
+
        $mails
-            ->setType(MAIL_TYPE_MAGIC_SESSION)
+            ->setSubject($subject)
+            ->setBody($body)
+            ->setFrom($from)
            ->setRecipient($user->getAttribute('email'))
-            ->setUrl($url)
-            ->setLocale($locale->default)
            ->trigger()
        ;

@@ -759,7 +761,7 @@ App::post('/v1/account/sessions/magic-url')

 App::put('/v1/account/sessions/magic-url')
    ->desc('Create Magic URL session (confirmation)')
-    ->groups(['api', 'account'])
+    ->groups(['api', 'account', 'session'])
    ->label('scope', 'public')
    ->label('event', 'users.[userId].sessions.[sessionId].create')
    ->label('audits.event', 'session.update')
@@ -896,7 +898,7 @@ App::post('/v1/account/sessions/phone')
    ->label('sdk.response.model', Response::MODEL_TOKEN)
    ->label('abuse-limit', 10)
    ->label('abuse-key', 'url:{url},email:{param-email}')
-    ->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('userId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. 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('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.')
    ->inject('request')
    ->inject('response')
@@ -1001,7 +1003,7 @@ App::post('/v1/account/sessions/phone')

 App::put('/v1/account/sessions/phone')
    ->desc('Create Phone Session (confirmation)')
-    ->groups(['api', 'account'])
+    ->groups(['api', 'account', 'session'])
    ->label('scope', 'public')
    ->label('event', 'users.[userId].sessions.[sessionId].create')
    ->label('usage.metric', 'sessions.{scope}.requests.create')
@@ -1116,7 +1118,7 @@ App::put('/v1/account/sessions/phone')

 App::post('/v1/account/sessions/anonymous')
    ->desc('Create Anonymous Session')
-    ->groups(['api', 'account', 'auth'])
+    ->groups(['api', 'account', 'auth', 'session'])
    ->label('event', 'users.[userId].sessions.[sessionId].create')
    ->label('scope', 'public')
    ->label('auth.type', 'anonymous')
@@ -1306,9 +1308,7 @@ App::get('/v1/account')
    ->label('sdk.description', '/docs/references/account/get.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->label('sdk.offline.model', '/account')
-    ->label('sdk.offline.key', 'current')
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
    ->inject('response')
    ->inject('user')
    ->action(function (Response $response, Document $user) {
@@ -1328,13 +1328,11 @@ App::get('/v1/account/prefs')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
-    ->label('sdk.offline.model', '/account/prefs')
-    ->label('sdk.offline.key', 'current')
    ->inject('response')
    ->inject('user')
    ->action(function (Response $response, Document $user) {

-        $prefs = $user->getAttribute('prefs', []);
+        $prefs = $user->getAttribute('prefs', new \stdClass());

        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });
@@ -1351,7 +1349,6 @@ App::get('/v1/account/sessions')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_SESSION_LIST)
-    ->label('sdk.offline.model', '/account/sessions')
    ->inject('response')
    ->inject('user')
    ->inject('locale')
@@ -1389,7 +1386,7 @@ App::get('/v1/account/logs')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('user')
    ->inject('locale')
@@ -1450,8 +1447,6 @@ App::get('/v1/account/sessions/:sessionId')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_SESSION)
-    ->label('sdk.offline.model', '/account/sessions')
-    ->label('sdk.offline.key', '{sessionId}')
    ->param('sessionId', '', new UID(), 'Session ID. Use the string \'current\' to get the current device session.')
    ->inject('response')
    ->inject('user')
@@ -1490,7 +1485,6 @@ App::patch('/v1/account/name')
    ->label('scope', 'account')
    ->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')
@@ -1498,22 +1492,17 @@ App::patch('/v1/account/name')
    ->label('sdk.description', '/docs/references/account/update-name.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->label('sdk.offline.model', '/account')
-    ->label('sdk.offline.key', 'current')
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.')
-    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $name, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->action(function (string $name, Response $response, Document $user, Database $dbForProject, Event $events) {

-        $user
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user
            ->setAttribute('name', $name)
-            ->setAttribute('search', implode(' ', [$user->getId(), $name, $user->getAttribute('email', ''), $user->getAttribute('phone', '')]));
-
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            ->setAttribute('search', implode(' ', [$user->getId(), $name, $user->getAttribute('email', ''), $user->getAttribute('phone', '')])));

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

@@ -1535,46 +1524,25 @@ App::patch('/v1/account/password')
    ->label('sdk.description', '/docs/references/account/update-password.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->label('sdk.offline.model', '/account')
-    ->label('sdk.offline.key', 'current')
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
+    ->param('password', '', new Password(), 'New user password. Must be at least 8 chars.')
    ->param('oldPassword', '', new Password(), 'Current user password. Must be at least 8 chars.', true)
-    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('user')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $password, string $oldPassword, ?\DateTime $requestTimestamp, Response $response, Document $user, Document $project, Database $dbForProject, Event $events) {
+    ->action(function (string $password, string $oldPassword, Response $response, Document $user, Database $dbForProject, Event $events) {

        // Check old password only if its an existing user.
        if (!empty($user->getAttribute('passwordUpdate')) && !Auth::passwordVerify($oldPassword, $user->getAttribute('password'), $user->getAttribute('hash'), $user->getAttribute('hashOptions'))) { // Double check user password
            throw new Exception(Exception::USER_INVALID_CREDENTIALS);
        }

-        $newPassword = Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS);
-        $historyLimit = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
-        $history = [];
-        if ($historyLimit > 0) {
-            $history = $user->getAttribute('passwordHistory', []);
-            $validator = new PasswordHistory($history, $user->getAttribute('hash'), $user->getAttribute('hashOptions'));
-            if (!$validator->isValid($password)) {
-                throw new Exception(Exception::USER_PASSWORD_RECENTLY_USED, 'The password was recently used', 409);
-            }
-
-            $history[] = $newPassword;
-            array_slice($history, (count($history) - $historyLimit), $historyLimit);
-        }
-
-        $user
-            ->setAttribute('password', $newPassword)
-            ->setAttribute('passwordHistory', $history)
-            ->setAttribute('passwordUpdate', DateTime::now())
-            ->setAttribute('hash', Auth::DEFAULT_ALGO)
-            ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS);
-
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user
+                ->setAttribute('password', Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS))
+                ->setAttribute('hash', Auth::DEFAULT_ALGO)
+                ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS)
+                ->setAttribute('passwordUpdate', DateTime::now()));

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

@@ -1588,7 +1556,6 @@ App::patch('/v1/account/email')
    ->label('scope', 'account')
    ->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')
@@ -1596,17 +1563,14 @@ App::patch('/v1/account/email')
    ->label('sdk.description', '/docs/references/account/update-email.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->label('sdk.offline.model', '/account')
-    ->label('sdk.offline.key', 'current')
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
    ->param('email', '', new Email(), 'User email.')
    ->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
-    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->action(function (string $email, string $password, Response $response, Document $user, Database $dbForProject, Event $events) {
        $isAnonymousUser = Auth::isAnonymousUser($user); // Check if request is from an anonymous account for converting

        if (
@@ -1627,7 +1591,7 @@ App::patch('/v1/account/email')
            ->setAttribute('search', implode(' ', [$user->getId(), $user->getAttribute('name', ''), $email, $user->getAttribute('phone', '')]));

        try {
-            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
        } catch (Duplicate $th) {
            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
        }
@@ -1644,7 +1608,6 @@ App::patch('/v1/account/phone')
    ->label('scope', 'account')
    ->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')
@@ -1652,17 +1615,14 @@ App::patch('/v1/account/phone')
    ->label('sdk.description', '/docs/references/account/update-phone.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->label('sdk.offline.model', '/account')
-    ->label('sdk.offline.key', 'current')
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
    ->param('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.')
    ->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
-    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $phone, string $password, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->action(function (string $phone, string $password, Response $response, Document $user, Database $dbForProject, Event $events) {

        $isAnonymousUser = Auth::isAnonymousUser($user); // Check if request is from an anonymous account for converting

@@ -1679,7 +1639,7 @@ App::patch('/v1/account/phone')
            ->setAttribute('search', implode(' ', [$user->getId(), $user->getAttribute('name', ''), $user->getAttribute('email', ''), $phone]));

        try {
-            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
        } catch (Duplicate $th) {
            throw new Exception(Exception::USER_PHONE_ALREADY_EXISTS);
        }
@@ -1696,7 +1656,6 @@ App::patch('/v1/account/prefs')
    ->label('scope', 'account')
    ->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')
@@ -1704,20 +1663,15 @@ App::patch('/v1/account/prefs')
    ->label('sdk.description', '/docs/references/account/update-prefs.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->label('sdk.offline.model', '/account/prefs')
-    ->label('sdk.offline.key', 'current')
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
    ->param('prefs', [], new Assoc(), 'Prefs key-value JSON object.')
-    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (array $prefs, ?\DateTime $requestTimestamp, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->action(function (array $prefs, Response $response, Document $user, Database $dbForProject, Event $events) {

-        $user->setAttribute('prefs', $prefs);
-
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('prefs', $prefs));

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

@@ -1731,7 +1685,6 @@ App::patch('/v1/account/status')
    ->label('scope', 'account')
    ->label('audits.event', 'user.update')
    ->label('audits.resource', 'user/{response.$id}')
-    ->label('audits.userId', '{response.$id}')
    ->label('usage.metric', 'users.{scope}.requests.delete')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
@@ -1739,18 +1692,15 @@ App::patch('/v1/account/status')
    ->label('sdk.description', '/docs/references/account/update-status.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_USER)
-    ->inject('requestTimestamp')
+    ->label('sdk.response.model', Response::MODEL_ACCOUNT)
    ->inject('request')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $events) {

-        $user->setAttribute('status', false);
-
-        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('status', false));

        $events
            ->setParam('userId', $user->getId())
@@ -1760,12 +1710,6 @@ App::patch('/v1/account/status')
            $response->addHeader('X-Fallback-Cookies', \json_encode([]));
        }

-        $protocol = $request->getProtocol();
-        $response
-            ->addCookie(Auth::$cookieName . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
-            ->addCookie(Auth::$cookieName, '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
-        ;
-
        $response->dynamic($user, Response::MODEL_ACCOUNT);
    });

@@ -1776,7 +1720,6 @@ 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('audits.userId', '{user.$id}')
    ->label('usage.metric', 'sessions.{scope}.requests.delete')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
@@ -1786,7 +1729,6 @@ App::delete('/v1/account/sessions/:sessionId')
    ->label('sdk.response.model', Response::MODEL_NONE)
    ->label('abuse-limit', 100)
    ->param('sessionId', '', new UID(), 'Session ID. Use the string \'current\' to delete the current device session.')
-    ->inject('requestTimestamp')
    ->inject('request')
    ->inject('response')
    ->inject('user')
@@ -1794,7 +1736,7 @@ App::delete('/v1/account/sessions/:sessionId')
    ->inject('locale')
    ->inject('events')
    ->inject('project')
-    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, Document $user, Database $dbForProject, Locale $locale, Event $events, Document $project) {
+    ->action(function (?string $sessionId, Request $request, Response $response, Document $user, Database $dbForProject, Locale $locale, Event $events, Document $project) {

        $protocol = $request->getProtocol();
        $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
@@ -1806,12 +1748,10 @@ App::delete('/v1/account/sessions/:sessionId')

        foreach ($sessions as $key => $session) {/** @var Document $session */
            if ($sessionId == $session->getId()) {
-                $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $session) {
-                    return $dbForProject->deleteDocument('sessions', $session->getId());
-                });
-
                unset($sessions[$key]);

+                $dbForProject->deleteDocument('sessions', $session->getId());
+
                $session->setAttribute('current', false);

                if ($session->getAttribute('secret') == Auth::hash(Auth::$secret)) { // If current session delete the cookies too
@@ -1939,7 +1879,6 @@ App::delete('/v1/account/sessions')
    ->label('event', 'users.[userId].sessions.[sessionId].delete')
    ->label('audits.event', 'session.delete')
    ->label('audits.resource', 'user/{user.$id}')
-    ->label('audits.userId', '{user.$id}')
    ->label('usage.metric', 'sessions.{scope}.requests.delete')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
@@ -2074,12 +2013,35 @@ App::post('/v1/account/recovery')
        $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $profile->getId(), 'secret' => $secret, 'expire' => $expire]);
        $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');
+        $subject = $locale->getText("emails.recovery.subject");
+
+        $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();
+
+
        $mails
-            ->setType(MAIL_TYPE_RECOVERY)
            ->setRecipient($profile->getAttribute('email', ''))
-            ->setUrl($url)
-            ->setLocale($locale->default)
            ->setName($profile->getAttribute('name'))
+            ->setBody($body)
+            ->setFrom($from)
+            ->setSubject($subject)
            ->trigger();
        ;

@@ -2148,9 +2110,9 @@ App::put('/v1/account/recovery')

        $profile = $dbForProject->updateDocument('users', $profile->getId(), $profile
                ->setAttribute('password', Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS))
-                ->setAttribute('passwordUpdate', DateTime::now())
                ->setAttribute('hash', Auth::DEFAULT_ALGO)
                ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS)
+                ->setAttribute('passwordUpdate', DateTime::now())
                ->setAttribute('emailVerification', true));

        $recoveryDocument = $dbForProject->getDocument('tokens', $recovery);
@@ -2177,7 +2139,6 @@ App::post('/v1/account/verification')
    ->label('event', 'users.[userId].verification.[tokenId].create')
    ->label('audits.event', 'verification.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')
@@ -2235,11 +2196,32 @@ App::post('/v1/account/verification')
        $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['userId' => $user->getId(), 'secret' => $verificationSecret, 'expire' => $expire]);
        $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');
+        $subject = $locale->getText("emails.verification.subject");
+        $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();
+
        $mails
-            ->setType(MAIL_TYPE_VERIFICATION)
+            ->setSubject($subject)
+            ->setBody($body)
+            ->setFrom($from)
            ->setRecipient($user->getAttribute('email'))
-            ->setUrl($url)
-            ->setLocale($locale->default)
            ->setName($user->getAttribute('name'))
            ->trigger()
        ;
@@ -2268,7 +2250,6 @@ App::put('/v1/account/verification')
    ->label('event', 'users.[userId].verification.[tokenId].update')
    ->label('audits.event', 'verification.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')
@@ -2328,7 +2309,6 @@ 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('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')
@@ -2414,7 +2394,6 @@ 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('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')
@@ -1,7 +1,7 @@
 <?php

 use Appwrite\Extend\Exception;
-use Appwrite\Network\Validator\URL;
+use Utopia\Validator\URL;
 use Appwrite\URL\URL as URLParse;
 use Appwrite\Utopia\Response;
 use chillerlan\QRCode\QRCode;
@@ -242,8 +242,8 @@ App::get('/v1/avatars/favicon')
                        case 'jpeg':
                            $size = \explode('x', \strtolower($sizes));

-                            $sizeWidth = (int) $size[0] ?? 0;
-                            $sizeHeight = (int) $size[1] ?? 0;
+                            $sizeWidth = (int) ($size[0] ?? 0);
+                            $sizeHeight = (int) ($size[1] ?? 0);

                            if (($sizeWidth * $sizeHeight) >= $space) {
                                $space = $sizeWidth * $sizeHeight;
@@ -1,40 +0,0 @@
-<?php
-
-use Appwrite\Extend\Exception;
-use Appwrite\Utopia\Response;
-use Utopia\App;
-use Utopia\Database\Document;
-
-App::init()
-    ->groups(['console'])
-    ->inject('project')
-    ->action(function (Document $project) {
-        if ($project->getId() !== 'console') {
-            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN);
-        }
-    });
-
-
-App::get('/v1/console/variables')
-    ->desc('Get Variables')
-    ->groups(['api', 'projects'])
-    ->label('scope', 'projects.read')
-    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-    ->label('sdk.namespace', 'console')
-    ->label('sdk.method', 'variables')
-    ->label('sdk.description', '/docs/references/console/variables.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_CONSOLE_VARIABLES)
-    ->inject('response')
-    ->action(function (Response $response) {
-
-        $variables = new Document([
-            '_APP_DOMAIN_TARGET' => App::getEnv('_APP_DOMAIN_TARGET'),
-            '_APP_STORAGE_LIMIT' => +App::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_FUNCTIONS_SIZE_LIMIT' => +App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
-            '_APP_USAGE_STATS' => App::getEnv('_APP_USAGE_STATS'),
-        ]);
-
-        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
-    });
@@ -25,6 +25,7 @@ use Appwrite\Task\Validator\Cron;
 use Appwrite\Utopia\Database\Validator\Queries\Deployments;
 use Appwrite\Utopia\Database\Validator\Queries\Executions;
 use Appwrite\Utopia\Database\Validator\Queries\Functions;
+use Appwrite\Utopia\Database\Validator\Queries\Variables;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -32,6 +33,7 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\ArrayList;
+use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
@@ -61,7 +63,7 @@ App::post('/v1/functions')
    ->label('sdk.response.model', Response::MODEL_FUNCTION)
    ->param('functionId', '', new CustomId(), 'Function ID. Choose a custom ID or generate a random ID with `ID.unique()`. 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('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
+    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.')
    ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.')
    ->param('events', [], new ArrayList(new ValidatorEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
    ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
@@ -123,7 +125,7 @@ App::get('/v1/functions')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_FUNCTION_LIST)
-    ->param('queries', [], new Functions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Functions::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Functions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Functions::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -211,7 +213,7 @@ App::get('/v1/functions/:functionId')

 App::get('/v1/functions/:functionId/usage')
    ->desc('Get Function Usage')
-    ->groups(['api', 'functions', 'usage'])
+    ->groups(['api', 'functions'])
    ->label('scope', 'functions.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'functions')
@@ -321,7 +323,7 @@ App::get('/v1/functions/:functionId/usage')

 App::get('/v1/functions/usage')
    ->desc('Get Functions Usage')
-    ->groups(['api', 'functions', 'usage'])
+    ->groups(['api', 'functions'])
    ->label('scope', 'functions.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'functions')
@@ -438,7 +440,7 @@ App::put('/v1/functions/:functionId')
    ->label('sdk.response.model', Response::MODEL_FUNCTION)
    ->param('functionId', '', new UID(), 'Function ID.')
    ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
+    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.')
    ->param('events', [], new ArrayList(new ValidatorEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
    ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
    ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Maximum execution time in seconds.', true)
@@ -599,8 +601,8 @@ App::post('/v1/functions/:functionId/deployments')
    ->label('sdk.response.model', Response::MODEL_DEPLOYMENT)
    ->param('functionId', '', new UID(), 'Function ID.')
    ->param('entrypoint', '', new Text('1028'), 'Entrypoint File.')
-    ->param('code', [], new File(), 'Gzip file with your code package. When used with the Appwrite CLI, pass the path to your code directory, and the CLI will automatically package your code. Use a path that is within the current directory.', skipValidation: true)
-    ->param('activate', false, new Boolean(true), 'Automatically activate the deployment when it is finished building.')
+    ->param('code', [], new File(), 'Gzip file with your code package. When used with the Appwrite CLI, pass the path to your code directory, and the CLI will automatically package your code. Use a path that is within the current directory.', false)
+    ->param('activate', false, new Boolean(true), 'Automatically activate the deployment when it is finished building.', false)
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
@@ -789,7 +791,7 @@ App::get('/v1/functions/:functionId/deployments')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_DEPLOYMENT_LIST)
    ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('queries', [], new Deployments(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Deployments::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Deployments(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Deployments::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -1221,7 +1223,7 @@ App::get('/v1/functions/:functionId/executions')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_EXECUTION_LIST)
    ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('queries', [], new Executions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Executions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -1346,7 +1348,7 @@ App::post('/v1/functions/:functionId/variables')
    ->label('sdk.response.model', Response::MODEL_VARIABLE)
    ->param('functionId', '', new UID(), 'Function unique ID.', false)
    ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
-    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
+    ->param('value', null, new Text(8192), 'Variable value. Max length: 8192 chars.', false)
    ->inject('response')
    ->inject('dbForProject')
    ->action(function (string $functionId, string $key, string $value, Response $response, Database $dbForProject) {
@@ -1462,7 +1464,7 @@ App::put('/v1/functions/:functionId/variables/:variableId')
    ->param('functionId', '', new UID(), 'Function unique ID.', false)
    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
    ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
-    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
+    ->param('value', null, new Text(8192), 'Variable value. Max length: 8192 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
    ->action(function (string $functionId, string $variableId, string $key, ?string $value, Response $response, Database $dbForProject) {
@@ -30,7 +30,7 @@ App::get('/v1/graphql')
    ->label('sdk.response.model', Response::MODEL_ANY)
    ->label('abuse-limit', 60)
    ->label('abuse-time', 60)
-    ->param('query', '', new Text(0, 0), 'The query to execute.')
+    ->param('query', '', new Text(0), 'The query to execute.')
    ->param('operationName', '', new Text(256), 'The name of the operation to execute.', true)
    ->param('variables', '', new Text(0), 'The JSON encoded variables to use in the query.', true)
    ->inject('request')
@@ -19,8 +19,6 @@ App::get('/v1/locale')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOCALE)
-    ->label('sdk.offline.model', '/locale')
-    ->label('sdk.offline.key', 'current')
    ->inject('request')
    ->inject('response')
    ->inject('locale')
@@ -79,8 +77,6 @@ App::get('/v1/locale/countries')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
-    ->label('sdk.offline.model', '/locale/countries')
-    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
@@ -112,8 +108,6 @@ App::get('/v1/locale/countries/eu')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
-    ->label('sdk.offline.model', '/locale/countries/eu')
-    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
@@ -147,8 +141,6 @@ App::get('/v1/locale/countries/phones')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_PHONE_LIST)
-    ->label('sdk.offline.model', '/locale/countries/phones')
-    ->label('sdk.offline.response.key', 'countryCode')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
@@ -181,8 +173,6 @@ App::get('/v1/locale/continents')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST)
-    ->label('sdk.offline.model', '/locale/continents')
-    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->inject('locale')
    ->action(function (Response $response, Locale $locale) {
@@ -213,8 +203,6 @@ App::get('/v1/locale/currencies')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_CURRENCY_LIST)
-    ->label('sdk.offline.model', '/locale/currencies')
-    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->action(function (Response $response) {
        $list = Config::getParam('locale-currencies');
@@ -236,8 +224,6 @@ App::get('/v1/locale/languages')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LANGUAGE_LIST)
-    ->label('sdk.offline.model', '/locale/languages')
-    ->label('sdk.offline.response.key', 'code')
    ->inject('response')
    ->action(function (Response $response) {
        $list = Config::getParam('locale-languages');
@@ -23,13 +23,12 @@ use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Query;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\DatetimeValidator;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
 use Utopia\Registry\Registry;
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Database\Validator\Queries\Projects;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Hostname;
@@ -81,7 +80,7 @@ App::post('/v1/projects')
        }

        $auth = Config::getParam('auth', []);
-        $auths = ['limit' => 0, 'maxSessions' => APP_LIMIT_USER_SESSIONS_DEFAULT, 'passwordHistory' => 0, 'passwordDictionary' => false, 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG];
+        $auths = ['limit' => 0, 'maxSessions' => APP_LIMIT_USER_SESSIONS_DEFAULT, 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG];
        foreach ($auth as $index => $method) {
            $auths[$method['key'] ?? ''] = true;
        }
@@ -92,43 +91,38 @@ App::post('/v1/projects')
            throw new Exception(Exception::PROJECT_RESERVED_PROJECT, "'console' is a reserved project.");
        }

-        try {
-            $project = $dbForConsole->createDocument('projects', new Document([
-                '$id' => $projectId,
-                '$permissions' => [
-                    Permission::read(Role::team(ID::custom($teamId))),
-                    Permission::update(Role::team(ID::custom($teamId), 'owner')),
-                    Permission::update(Role::team(ID::custom($teamId), 'developer')),
-                    Permission::delete(Role::team(ID::custom($teamId), 'owner')),
-                    Permission::delete(Role::team(ID::custom($teamId), 'developer')),
-                ],
-                'name' => $name,
-                'teamInternalId' => $team->getInternalId(),
-                'teamId' => $team->getId(),
-                'region' => $region,
-                'description' => $description,
-                'logo' => $logo,
-                'url' => $url,
-                'version' => APP_VERSION_STABLE,
-                'legalName' => $legalName,
-                'legalCountry' => $legalCountry,
-                'legalState' => $legalState,
-                'legalCity' => $legalCity,
-                'legalAddress' => $legalAddress,
-                'legalTaxId' => ID::custom($legalTaxId),
-                'services' => new stdClass(),
-                'platforms' => null,
-                'authProviders' => [],
-                'webhooks' => null,
-                'keys' => null,
-                'domains' => null,
-                'auths' => $auths,
-                'search' => implode(' ', [$projectId, $name]),
-            ]));
-        } catch (Duplicate $th) {
-            throw new Exception(Exception::PROJECT_ALREADY_EXISTS);
-        }
-
+        $project = $dbForConsole->createDocument('projects', new Document([
+            '$id' => $projectId,
+            '$permissions' => [
+                Permission::read(Role::team(ID::custom($teamId))),
+                Permission::update(Role::team(ID::custom($teamId), 'owner')),
+                Permission::update(Role::team(ID::custom($teamId), 'developer')),
+                Permission::delete(Role::team(ID::custom($teamId), 'owner')),
+                Permission::delete(Role::team(ID::custom($teamId), 'developer')),
+            ],
+            'name' => $name,
+            'teamInternalId' => $team->getInternalId(),
+            'teamId' => $team->getId(),
+            'region' => $region,
+            'description' => $description,
+            'logo' => $logo,
+            'url' => $url,
+            'version' => APP_VERSION_STABLE,
+            'legalName' => $legalName,
+            'legalCountry' => $legalCountry,
+            'legalState' => $legalState,
+            'legalCity' => $legalCity,
+            'legalAddress' => $legalAddress,
+            'legalTaxId' => ID::custom($legalTaxId),
+            'services' => new stdClass(),
+            'platforms' => null,
+            'authProviders' => [],
+            'webhooks' => null,
+            'keys' => null,
+            'domains' => null,
+            'auths' => $auths,
+            'search' => implode(' ', [$projectId, $name]),
+        ]));
        /** @var array $collections */
        $collections = Config::getParam('collections', []);

@@ -175,22 +169,9 @@ App::post('/v1/projects')
            $dbForProject->createCollection($key, $attributes, $indexes);
        }

-        if ($dbForProject->exists($dbForProject->getDefaultDatabase(), 'videos_profiles')) {
-            foreach (Config::getParam('videos-profiles', []) as $profile) {
-                Authorization::skip(function () use ($project, $profile, $dbForProject) {
-                    return $dbForProject->createDocument('videos_profiles', new Document([
-                        'name' => $profile['name'],
-                        'videoBitRate' => $profile['videoBitRate'],
-                        'audioBitRate' => $profile['audioBitRate'],
-                        'width'  => $profile['width'],
-                        'height' => $profile['height']
-                    ]));
-                });
-            }
-        }
-
-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($project, Response::MODEL_PROJECT);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($project, Response::MODEL_PROJECT);
    });

 App::get('/v1/projects')
@@ -203,7 +184,7 @@ App::get('/v1/projects')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_PROJECT_LIST)
-    ->param('queries', [], new Projects(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Projects::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Projects(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Projects::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForConsole')
@@ -264,7 +245,7 @@ App::get('/v1/projects/:projectId')

 App::get('/v1/projects/:projectId/usage')
    ->desc('Get usage stats for a project')
-    ->groups(['api', 'projects', 'usage'])
+    ->groups(['api', 'projects'])
    ->label('scope', 'projects.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'projects')
@@ -594,68 +575,6 @@ App::patch('/v1/projects/:projectId/auth/:method')
        $response->dynamic($project, Response::MODEL_PROJECT);
    });

-App::patch('/v1/projects/:projectId/auth/password-history')
-    ->desc('Update authentication password history. Use this endpoint to set the number of password history to save and 0 to disable password history.')
-    ->groups(['api', 'projects'])
-    ->label('scope', 'projects.write')
-    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-    ->label('sdk.namespace', 'projects')
-    ->label('sdk.method', 'updateAuthPasswordHistory')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_PROJECT)
-    ->param('projectId', '', new UID(), 'Project unique ID.')
-    ->param('limit', 0, new Range(0, APP_LIMIT_USER_PASSWORD_HISTORY), 'Set the max number of passwords to store in user history. User can\'t choose a new password that is already stored in the password history list.  Max number of passwords allowed in history is' . APP_LIMIT_USER_PASSWORD_HISTORY . '. Default value is 0')
-    ->inject('response')
-    ->inject('dbForConsole')
-    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
-
-        $project = $dbForConsole->getDocument('projects', $projectId);
-
-        if ($project->isEmpty()) {
-            throw new Exception(Exception::PROJECT_NOT_FOUND);
-        }
-
-        $auths = $project->getAttribute('auths', []);
-        $auths['passwordHistory'] = $limit;
-
-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
-
-        $response->dynamic($project, Response::MODEL_PROJECT);
-    });
-
-App::patch('/v1/projects/:projectId/auth/password-dictionary')
-    ->desc('Update authentication password disctionary status. Use this endpoint to enable or disable the dicitonary check for user password')
-    ->groups(['api', 'projects'])
-    ->label('scope', 'projects.write')
-    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-    ->label('sdk.namespace', 'projects')
-    ->label('sdk.method', 'updateAuthPasswordDictionary')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_PROJECT)
-    ->param('projectId', '', new UID(), 'Project unique ID.')
-    ->param('enabled', false, new Boolean(false), 'Set whether or not to enable checking user\'s password against most commonly used passwords. Default is false.')
-    ->inject('response')
-    ->inject('dbForConsole')
-    ->action(function (string $projectId, bool $enabled, Response $response, Database $dbForConsole) {
-
-        $project = $dbForConsole->getDocument('projects', $projectId);
-
-        if ($project->isEmpty()) {
-            throw new Exception(Exception::PROJECT_NOT_FOUND);
-        }
-
-        $auths = $project->getAttribute('auths', []);
-        $auths['passwordDictionary'] = $enabled;
-
-        $dbForConsole->updateDocument('projects', $project->getId(), $project
-            ->setAttribute('auths', $auths));
-
-        $response->dynamic($project, Response::MODEL_PROJECT);
-    });
-
 App::patch('/v1/projects/:projectId/auth/max-sessions')
    ->desc('Update Project user sessions limit')
    ->groups(['api', 'projects'])
@@ -1256,7 +1175,7 @@ App::get('/v1/projects/:projectId/platforms')
        }

        $platforms = $dbForConsole->find('platforms', [
-            Query::equal('projectInternalId', [$project->getInternalId()]),
+            Query::equal('projectId', [$project->getId()]),
            Query::limit(5000),
        ]);

@@ -1421,7 +1340,7 @@ App::post('/v1/projects/:projectId/domains')
        $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));

        if (!$target->isKnown() || $target->isTest()) {
-            throw new Exception(Exception::DOMAIN_TARGET_INVALID, 'Unreachable CNAME target (' . $target->get() . '). Please check the _APP_DOMAIN_TARGET environment variable of your Appwrite server.');
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Unreachable CNAME target (' . $target->get() . '), please use a domain with a public suffix.');
        }

        $domain = new Domain($domain);
@@ -63,7 +63,7 @@ App::post('/v1/storage/buckets')
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, no user is granted with any permissions. [Learn more about permissions](/docs/permissions).', true)
    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](/docs/permissions).', true)
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled?', true)
-    ->param('maximumFileSize', (int) App::getEnv('_APP_STORAGE_LIMIT', 0), new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self-hosted setups you can change the max limit by changing the `_APP_STORAGE_LIMIT` environment variable. [Learn more about storage environment variables](/docs/environment-variables#storage)', true)
+    ->param('maximumFileSize', (int) App::getEnv('_APP_STORAGE_LIMIT', 0), new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self-hosted setups you can change the max limit by changing the `_APP_STORAGE_LIMIT` environment variable. [Learn more about storage environment variables](docs/environment-variables#storage)', true)
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
    ->param('compression', COMPRESSION_TYPE_NONE, new WhiteList([COMPRESSION_TYPE_NONE, COMPRESSION_TYPE_GZIP, COMPRESSION_TYPE_ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . COMPRESSION_TYPE_NONE . ',  [' . COMPRESSION_TYPE_GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . COMPRESSION_TYPE_ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
    ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
@@ -128,7 +128,7 @@ App::post('/v1/storage/buckets')

            $bucket = $dbForProject->getDocument('buckets', $bucketId);

-            $dbForProject->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes, permissions: $permissions ?? [], documentSecurity: $fileSecurity);
+            $dbForProject->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
        } catch (Duplicate) {
            throw new Exception(Exception::STORAGE_BUCKET_ALREADY_EXISTS);
        }
@@ -154,7 +154,7 @@ App::get('/v1/storage/buckets')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_BUCKET_LIST)
-    ->param('queries', [], new Buckets(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Buckets::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Buckets(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Buckets::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -235,7 +235,7 @@ App::put('/v1/storage/buckets/:bucketId')
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
    ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](/docs/permissions).', true)
    ->param('enabled', true, new Boolean(true), 'Is bucket enabled?', true)
-    ->param('maximumFileSize', null, new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human((int)App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self hosted version you can change the limit by changing _APP_STORAGE_LIMIT environment variable. [Learn more about storage environment variables](/docs/environment-variables#storage)', true)
+    ->param('maximumFileSize', null, new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human((int)App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self hosted version you can change the limit by changing _APP_STORAGE_LIMIT environment variable. [Learn more about storage environment variables](docs/environment-variables#storage)', true)
    ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
    ->param('compression', COMPRESSION_TYPE_NONE, new WhiteList([COMPRESSION_TYPE_NONE, COMPRESSION_TYPE_GZIP, COMPRESSION_TYPE_ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . COMPRESSION_TYPE_NONE . ', [' . COMPRESSION_TYPE_GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . COMPRESSION_TYPE_ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
    ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
@@ -274,7 +274,6 @@ App::put('/v1/storage/buckets/:bucketId')
                ->setAttribute('encryption', $encryption)
                ->setAttribute('compression', $compression)
                ->setAttribute('antivirus', $antivirus));
-        $dbForProject->updateCollection('bucket_' . $bucket->getInternalId(), $permissions, $fileSecurity);

        $events
            ->setParam('bucketId', $bucket->getId())
@@ -349,7 +348,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->label('sdk.response.model', Response::MODEL_FILE)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
    ->param('fileId', '', new CustomId(), 'File ID. Choose a custom ID or generate a random ID with `ID.unique()`. 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('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](/docs/storage#file-input).', skipValidation: true)
+    ->param('file', [], new File(), 'Binary file.', false)
    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission strings. By default, only the current user is granted all permissions. [Learn more about permissions](/docs/permissions).', true)
    ->inject('request')
    ->inject('response')
@@ -515,7 +514,6 @@ App::post('/v1/storage/buckets/:bucketId/files')
            }

            $mimeType = $deviceFiles->getFileMimeType($path); // Get mime-type before compression and encryption
-            $fileHash = $deviceFiles->getFileHash($path); // Get file hash before compression and encryption
            $data = '';
            // Compression
            $algorithm = $bucket->getAttribute('compression', COMPRESSION_TYPE_NONE);
@@ -549,6 +547,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
            }

            $sizeActual = $deviceFiles->getFileSize($path);
+            $fileHash = $deviceFiles->getFileHash($path);

            $openSSLVersion = null;
            $openSSLCipher = null;
@@ -568,7 +567,6 @@ App::post('/v1/storage/buckets/:bucketId/files')
                        '$id' => $fileId,
                        '$permissions' => $permissions,
                        'bucketId' => $bucket->getId(),
-                        'bucketInternalId' => $bucket->getInternalId(),
                        'name' => $fileName,
                        'path' => $path,
                        'signature' => $fileHash,
@@ -618,7 +616,6 @@ App::post('/v1/storage/buckets/:bucketId/files')
                        '$id' => ID::custom($fileId),
                        '$permissions' => $permissions,
                        'bucketId' => $bucket->getId(),
-                        'bucketInternalId' => $bucket->getInternalId(),
                        'name' => $fileName,
                        'path' => $path,
                        'signature' => '',
@@ -683,7 +680,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_FILE_LIST)
    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
-    ->param('queries', [], new Files(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Files::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Files(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Files::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -1450,7 +1447,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')

 App::get('/v1/storage/usage')
    ->desc('Get usage stats for storage')
-    ->groups(['api', 'storage', 'usage'])
+    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'storage')
@@ -1560,7 +1557,7 @@ App::get('/v1/storage/usage')

 App::get('/v1/storage/:bucketId/usage')
    ->desc('Get usage stats for a storage bucket')
-    ->groups(['api', 'storage', 'usage'])
+    ->groups(['api', 'storage'])
    ->label('scope', 'files.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'storage')
@@ -1,12 +1,10 @@
 <?php

 use Appwrite\Auth\Auth;
-use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
-use Appwrite\Event\Phone as EventPhone;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
 use Utopia\Validator\Host;
@@ -22,6 +20,7 @@ use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
 use Utopia\App;
 use Utopia\Audit\Audit;
+use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -36,9 +35,10 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\UID;
 use Utopia\Locale\Locale;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
+use Utopia\Validator\Range;
+use Utopia\Validator\ArrayList;
+use Utopia\Validator\WhiteList;

 App::post('/v1/teams')
    ->desc('Create Team')
@@ -76,7 +76,6 @@ App::post('/v1/teams')
            ],
            'name' => $name,
            'total' => ($isPrivilegedUser || $isAppUser) ? 0 : 1,
-            'prefs' => new \stdClass(),
            'search' => implode(' ', [$teamId, $name]),
        ])));

@@ -134,8 +133,7 @@ App::get('/v1/teams')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_TEAM_LIST)
-    ->label('sdk.offline.model', '/teams')
-    ->param('queries', [], new Teams(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Teams::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Teams(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Teams::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -184,8 +182,6 @@ App::get('/v1/teams/:teamId')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_TEAM)
-    ->label('sdk.offline.model', '/teams')
-    ->label('sdk.offline.key', '{teamId}')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->inject('response')
    ->inject('dbForProject')
@@ -200,36 +196,8 @@ App::get('/v1/teams/:teamId')
        $response->dynamic($team, Response::MODEL_TEAM);
    });

-App::get('/v1/teams/:teamId/prefs')
-    ->desc('Get Team Preferences')
-    ->groups(['api', 'teams'])
-    ->label('scope', 'teams.read')
-    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
-    ->label('sdk.namespace', 'teams')
-    ->label('sdk.method', 'getPrefs')
-    ->label('sdk.description', '/docs/references/teams/get-team-prefs.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
-    ->label('sdk.offline.model', '/teams/{teamId}/prefs')
-    ->param('teamId', '', new UID(), 'Team ID.')
-    ->inject('response')
-    ->inject('dbForProject')
-    ->action(function (string $teamId, Response $response, Database $dbForProject) {
-
-        $team = $dbForProject->getDocument('teams', $teamId);
-
-        if ($team->isEmpty()) {
-            throw new Exception(Exception::TEAM_NOT_FOUND);
-        }
-
-        $prefs = $team->getAttribute('prefs', []);
-
-        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
-    });
-
 App::put('/v1/teams/:teamId')
-    ->desc('Update Name')
+    ->desc('Update Team')
    ->groups(['api', 'teams'])
    ->label('event', 'teams.[teamId].update')
    ->label('scope', 'teams.write')
@@ -237,20 +205,17 @@ App::put('/v1/teams/:teamId')
    ->label('audits.resource', 'team/{response.$id}')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'teams')
-    ->label('sdk.method', 'updateName')
-    ->label('sdk.description', '/docs/references/teams/update-team-name.md')
+    ->label('sdk.method', 'update')
+    ->label('sdk.description', '/docs/references/teams/update-team.md')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_TEAM)
-    ->label('sdk.offline.model', '/teams')
-    ->label('sdk.offline.key', '{teamId}')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
-    ->inject('requestTimestamp')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $teamId, string $name, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $events) {
+    ->action(function (string $teamId, string $name, Response $response, Database $dbForProject, Event $events) {

        $team = $dbForProject->getDocument('teams', $teamId);

@@ -258,55 +223,15 @@ App::put('/v1/teams/:teamId')
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }

-        $team
+        $team = $dbForProject->updateDocument('teams', $team->getId(), $team
            ->setAttribute('name', $name)
-            ->setAttribute('search', implode(' ', [$teamId, $name]));
-
-        $team = $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $team) {
-            return $dbForProject->updateDocument('teams', $team->getId(), $team);
-        });
+            ->setAttribute('search', implode(' ', [$teamId, $name])));

        $events->setParam('teamId', $team->getId());

        $response->dynamic($team, Response::MODEL_TEAM);
    });

-App::put('/v1/teams/:teamId/prefs')
-    ->desc('Update Preferences')
-    ->groups(['api', 'teams'])
-    ->label('event', 'teams.[teamId].update.prefs')
-    ->label('scope', 'teams.write')
-    ->label('audits.event', 'team.update')
-    ->label('audits.resource', 'team/{response.$id}')
-    ->label('audits.userId', '{response.$id}')
-    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
-    ->label('sdk.namespace', 'teams')
-    ->label('sdk.method', 'updatePrefs')
-    ->label('sdk.description', '/docs/references/teams/update-team-prefs.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_OK)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
-    ->label('sdk.offline.model', '/teams/{teamId}/prefs')
-    ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
-    ->inject('response')
-    ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, array $prefs, Response $response, Database $dbForProject, Event $events) {
-
-        $team = $dbForProject->getDocument('teams', $teamId);
-
-        if ($team->isEmpty()) {
-            throw new Exception(Exception::TEAM_NOT_FOUND);
-        }
-
-        $team = $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('prefs', $prefs));
-
-        $events->setParam('teamId', $team->getId());
-
-        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
-    });
-
 App::delete('/v1/teams/:teamId')
    ->desc('Delete Team')
    ->groups(['api', 'teams'])
@@ -379,9 +304,7 @@ App::post('/v1/teams/:teamId/memberships')
    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
    ->label('abuse-limit', 10)
    ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('email', '', new Email(), 'Email of the new team member.', true)
-    ->param('userId', '', new UID(), 'ID of the user to be added to a team.', true)
-    ->param('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
+    ->param('email', '', new Email(), 'Email of the new team member.')
    ->param('roles', [], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
    ->param('url', '', fn($clients) => new Host($clients), 'URL to redirect the user back to your app from the invitation email.  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.', false, ['clients']) // TODO add our own built-in confirm page
    ->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
@@ -391,13 +314,9 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('dbForProject')
    ->inject('locale')
    ->inject('mails')
-    ->inject('messaging')
    ->inject('events')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $mails, EventPhone $messaging, Event $events) {
+    ->action(function (string $teamId, string $email, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $mails, Event $events) {

-        if (empty($userId) && empty($email) && empty($phone)) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'At least one of userId, email, or phone is required');
-        }
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
        $isAppUser = Auth::isAppUser(Authorization::getRoles());

@@ -412,31 +331,8 @@ App::post('/v1/teams/:teamId/memberships')
        if ($team->isEmpty()) {
            throw new Exception(Exception::TEAM_NOT_FOUND);
        }
-        if (!empty($userId)) {
-            $invitee = $dbForProject->getDocument('users', $userId);
-            if ($invitee->isEmpty()) {
-                throw new Exception(Exception::USER_NOT_FOUND, 'User with given userId doesn\'t exist.', 404);
-            }
-            if (!empty($email) && $invitee->getAttribute('email', '') !== $email) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given userId and email doesn\'t match', 409);
-            }
-            if (!empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given userId and phone doesn\'t match', 409);
-            }
-            $email = $invitee->getAttribute('email', '');
-            $phone = $invitee->getAttribute('phone', '');
-            $name = empty($name) ? $invitee->getAttribute('name', '') : $name;
-        } elseif (!empty($email)) {
-            $invitee = $dbForProject->findOne('users', [Query::equal('email', [$email])]); // Get user by email address
-            if (!empty($invitee) && !empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given email and phone doesn\'t match', 409);
-            }
-        } elseif (!empty($phone)) {
-            $invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
-            if (!empty($invitee) && !empty($email) && $invitee->getAttribute('email', '') !== $email) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
-            }
-        }
+
+        $invitee = $dbForProject->findOne('users', [Query::equal('email', [$email])]); // Get user by email address

        if (empty($invitee)) { // Create new user if no user with same email found
            $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -459,8 +355,7 @@ App::post('/v1/teams/:teamId/memberships')
                        Permission::update(Role::user($userId)),
                        Permission::delete(Role::user($userId)),
                    ],
-                    'email' => empty($email) ? null : $email,
-                    'phone' => empty($phone) ? null : $phone,
+                    'email' => $email,
                    'emailVerification' => false,
                    'status' => true,
                    'password' => Auth::passwordHash(Auth::passwordGenerator(), Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS),
@@ -532,50 +427,46 @@ App::post('/v1/teams/:teamId/memberships')
            } catch (Duplicate $th) {
                throw new Exception(Exception::TEAM_INVITE_ALREADY_EXISTS);
            }
+        }

-            $url = Template::parseURL($url);
-            $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
-            $url = Template::unParseURL($url);
-            if (!empty($email)) {
-                $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
+        $url = Template::parseURL($url);
+        $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
+        $url = Template::unParseURL($url);

-                $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
-                $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
-                $subject = \sprintf($locale->getText("emails.invitation.subject"), $team->getAttribute('name'), $projectName);
-                $body->setParam('{{owner}}', $user->getAttribute('name'));
-                $body->setParam('{{team}}', $team->getAttribute('name'));
+        if (!$isPrivilegedUser && !$isAppUser) { // No need of confirmation when in admin or app mode
+            $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');

-                $body
-                    ->setParam('{{subject}}', $subject)
-                    ->setParam('{{hello}}', $locale->getText("emails.invitation.hello"))
-                    ->setParam('{{name}}', $user->getAttribute('name'))
-                    ->setParam('{{body}}', $locale->getText("emails.invitation.body"))
-                    ->setParam('{{redirect}}', $url)
-                    ->setParam('{{footer}}', $locale->getText("emails.invitation.footer"))
-                    ->setParam('{{thanks}}', $locale->getText("emails.invitation.thanks"))
-                    ->setParam('{{signature}}', $locale->getText("emails.invitation.signature"))
-                    ->setParam('{{project}}', $projectName)
-                    ->setParam('{{direction}}', $locale->getText('settings.direction'))
-                    ->setParam('{{bg-body}}', '#f7f7f7')
-                    ->setParam('{{bg-content}}', '#ffffff')
-                    ->setParam('{{text-content}}', '#000000');
+            $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
+            $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
+            $subject = \sprintf($locale->getText("emails.invitation.subject"), $team->getAttribute('name'), $projectName);
+            $body->setParam('{{owner}}', $user->getAttribute('name'));
+            $body->setParam('{{team}}', $team->getAttribute('name'));

-                $body = $body->render();
+            $body
+                ->setParam('{{subject}}', $subject)
+                ->setParam('{{hello}}', $locale->getText("emails.invitation.hello"))
+                ->setParam('{{name}}', $user->getAttribute('name'))
+                ->setParam('{{body}}', $locale->getText("emails.invitation.body"))
+                ->setParam('{{redirect}}', $url)
+                ->setParam('{{footer}}', $locale->getText("emails.invitation.footer"))
+                ->setParam('{{thanks}}', $locale->getText("emails.invitation.thanks"))
+                ->setParam('{{signature}}', $locale->getText("emails.invitation.signature"))
+                ->setParam('{{project}}', $projectName)
+                ->setParam('{{direction}}', $locale->getText('settings.direction'))
+                ->setParam('{{bg-body}}', '#f7f7f7')
+                ->setParam('{{bg-content}}', '#ffffff')
+                ->setParam('{{text-content}}', '#000000');

-                $mails
-                    ->setSubject($subject)
-                    ->setBody($body)
-                    ->setFrom($from)
-                    ->setRecipient($invitee->getAttribute('email'))
-                    ->setName($invitee->getAttribute('name'))
-                    ->trigger()
-                ;
-            } elseif (!empty($phone)) {
-                $messaging
-                    ->setRecipient($phone)
-                    ->setMessage($url)
-                    ->trigger();
-            }
+            $body = $body->render();
+
+            $mails
+                ->setSubject($subject)
+                ->setBody($body)
+                ->setFrom($from)
+                ->setRecipient($invitee->getAttribute('email'))
+                ->setName($invitee->getAttribute('name'))
+                ->trigger()
+            ;
        }

        $events
@@ -605,9 +496,8 @@ App::get('/v1/teams/:teamId/memberships')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
-    ->label('sdk.offline.model', '/teams/{teamId}/memberships')
    ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('queries', [], new Memberships(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Memberships::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Memberships(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Memberships::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -687,8 +577,6 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
-    ->label('sdk.offline.model', '/teams/{teamId}/memberships')
-    ->label('sdk.offline.key', '{membershipId}')
    ->param('teamId', '', new UID(), 'Team ID.')
    ->param('membershipId', '', new UID(), 'Membership ID.')
    ->inject('response')
@@ -1002,7 +890,7 @@ App::get('/v1/teams/:teamId/logs')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
@@ -34,14 +34,11 @@ use Utopia\Validator\Text;
 use Utopia\Validator\Boolean;
 use MaxMind\Db\Reader;
 use Utopia\Validator\Integer;
-use Appwrite\Auth\Validator\PasswordHistory;
-use Appwrite\Auth\Validator\PasswordDictionary;

 /** TODO: Remove function when we move to using utopia/platform */
-function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Event $events): Document
+function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Database $dbForProject, Event $events): Document
 {
    $hashOptionsObject = (\is_string($hashOptions)) ? \json_decode($hashOptions, true) : $hashOptions; // Cast to JSON array
-    $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;

    if (!empty($email)) {
        $email = \strtolower($email);
@@ -52,7 +49,6 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
            ? ID::unique()
            : ID::custom($userId);

-        $password = (!empty($password)) ? ($hash === 'plaintext' ? Auth::passwordHash($password, $hash, $hashOptionsObject) : $password) : null;
        $user = $dbForProject->createDocument('users', new Document([
            '$id' => $userId,
            '$permissions' => [
@@ -65,11 +61,10 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
            'phone' => $phone,
            'phoneVerification' => false,
            'status' => true,
-            'password' => $password,
-            'passwordHistory' => is_null($password) && $passwordHistory === 0 ? [] : [$password],
-            'passwordUpdate' => (!empty($password)) ? DateTime::now() : null,
+            'password' => (!empty($password)) ? ($hash === 'plaintext' ? Auth::passwordHash($password, $hash, $hashOptionsObject) : $password) : null,
            'hash' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO : $hash,
            'hashOptions' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO_OPTIONS : $hashOptionsObject + ['type' => $hash],
+            'passwordUpdate' => (!empty($password)) ? DateTime::now() : null,
            'registration' => DateTime::now(),
            'reset' => false,
            'name' => $name,
@@ -106,15 +101,13 @@ App::post('/v1/users')
    ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. 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', null, new Email(), 'User email.', true)
    ->param('phone', null, new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'Plain text user password. Must be at least 8 chars.', true, ['project', 'passwordsDictionary'])
+    ->param('password', null, new Password(), 'Plain text user password. Must be at least 8 chars.', true)
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-
-        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $events);
+    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Database $dbForProject, Event $events) {
+        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -141,11 +134,10 @@ App::post('/v1/users/bcrypt')
    ->param('password', '', new Password(), 'User password hashed using Bcrypt.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
+        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -172,11 +164,10 @@ App::post('/v1/users/md5')
    ->param('password', '', new Password(), 'User password hashed using MD5.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
+        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -203,11 +194,10 @@ App::post('/v1/users/argon2')
    ->param('password', '', new Password(), 'User password hashed using Argon2.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
+        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -235,17 +225,16 @@ App::post('/v1/users/sha')
    ->param('passwordVersion', '', new WhiteList(['sha1', 'sha224', 'sha256', 'sha384', 'sha512/224', 'sha512/256', 'sha512', 'sha3-224', 'sha3-256', 'sha3-384', 'sha3-512']), "Optional SHA version used to hash password. Allowed values are: 'sha1', 'sha224', 'sha256', 'sha384', 'sha512/224', 'sha512/256', 'sha512', 'sha3-224', 'sha3-256', 'sha3-384', 'sha3-512'", true)
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Database $dbForProject, Event $events) {
        $options = '{}';

        if (!empty($passwordVersion)) {
            $options = '{"version":"' . $passwordVersion . '"}';
        }

-        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -272,11 +261,10 @@ App::post('/v1/users/phpass')
    ->param('password', '', new Password(), 'User password hashed using PHPass.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
+        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -308,10 +296,9 @@ App::post('/v1/users/scrypt')
    ->param('passwordLength', 64, new Integer(), 'Optional hash length used to hash password.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Database $dbForProject, Event $events) {
        $options = [
            'salt' => $passwordSalt,
            'costCpu' => $passwordCpu,
@@ -320,7 +307,7 @@ App::post('/v1/users/scrypt')
            'length' => $passwordLength
        ];

-        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -350,11 +337,10 @@ App::post('/v1/users/scrypt-modified')
    ->param('passwordSignerKey', '', new Text(128), 'Signer key used to hash password.')
    ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
-        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Database $dbForProject, Event $events) {
+        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $dbForProject, $events);

        $response
            ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -373,7 +359,7 @@ App::get('/v1/users')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_USER_LIST)
-    ->param('queries', [], new Users(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Users::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Users(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Users::ALLOWED_ATTRIBUTES), true)
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->inject('response')
    ->inject('dbForProject')
@@ -457,7 +443,7 @@ App::get('/v1/users/:userId/prefs')
            throw new Exception(Exception::USER_NOT_FOUND);
        }

-        $prefs = $user->getAttribute('prefs', []);
+        $prefs = $user->getAttribute('prefs', new \stdClass());

        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
    });
@@ -557,7 +543,7 @@ App::get('/v1/users/:userId/logs')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_LOG_LIST)
    ->param('userId', '', new UID(), 'User ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
    ->inject('response')
    ->inject('dbForProject')
    ->inject('locale')
@@ -793,12 +779,11 @@ App::patch('/v1/users/:userId/password')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_USER)
    ->param('userId', '', new UID(), 'User ID.')
-    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
+    ->param('password', '', new Password(), 'New user password. Must be at least 8 chars.')
    ->inject('response')
-    ->inject('project')
    ->inject('dbForProject')
    ->inject('events')
-    ->action(function (string $userId, string $password, Response $response, Document $project, Database $dbForProject, Event $events) {
+    ->action(function (string $userId, string $password, Response $response, Database $dbForProject, Event $events) {

        $user = $dbForProject->getDocument('users', $userId);

@@ -806,27 +791,11 @@ App::patch('/v1/users/:userId/password')
            throw new Exception(Exception::USER_NOT_FOUND);
        }

-        $newPassword = Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS);
-
-        $historyLimit = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
-        $history = [];
-        if ($historyLimit > 0) {
-            $history = $user->getAttribute('passwordHistory', []);
-            $validator = new PasswordHistory($history, $user->getAttribute('hash'), $user->getAttribute('hashOptions'));
-            if (!$validator->isValid($password)) {
-                throw new Exception(Exception::USER_PASSWORD_RECENTLY_USED, 'The password was recently used', 409);
-            }
-
-            $history[] = $newPassword;
-            array_slice($history, (count($history) - $historyLimit), $historyLimit);
-        }
-
        $user
-            ->setAttribute('password', $newPassword)
-            ->setAttribute('passwordHistory', $history)
-            ->setAttribute('passwordUpdate', DateTime::now())
+            ->setAttribute('password', Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS))
            ->setAttribute('hash', Auth::DEFAULT_ALGO)
-            ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS);
+            ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS)
+            ->setAttribute('passwordUpdate', DateTime::now());

        $user = $dbForProject->updateDocument('users', $user->getId(), $user);

@@ -1129,7 +1098,7 @@ App::delete('/v1/users/:userId')

 App::get('/v1/users/usage')
    ->desc('Get usage stats for the users API')
-    ->groups(['api', 'users', 'usage'])
+    ->groups(['api', 'users'])
    ->label('scope', 'users.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
    ->label('sdk.namespace', 'users')
@@ -233,7 +233,7 @@ App::init()
            ->addHeader('Server', 'Appwrite')
            ->addHeader('X-Content-Type-Options', 'nosniff')
            ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma')
            ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
            ->addHeader('Access-Control-Allow-Origin', $refDomain)
            ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -262,6 +262,7 @@ App::init()
        $role = ($user->isEmpty())
            ? Role::guests()->toString()
            : Role::users()->toString();
+
        // Add user roles
        $memberships = $user->find('teamId', $project->getAttribute('teamId', null), 'memberships');

@@ -383,7 +384,7 @@ App::options()
        $response
            ->addHeader('Server', 'Appwrite')
            ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
            ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
            ->addHeader('Access-Control-Allow-Origin', $origin)
            ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -436,7 +437,7 @@ App::error()
                $log->addExtra('line', $error->getLine());
                $log->addExtra('trace', $error->getTraceAsString());
                $log->addExtra('detailedTrace', $error->getTrace());
-                $log->addExtra('roles', Authorization::getRoles());
+                $log->addExtra('roles', Authorization::$roles);

                $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
                $log->setAction($action);
@@ -484,10 +485,6 @@ App::error()
                    $error->setType(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
                    break;
            }
-        } elseif ($error instanceof Utopia\Database\Exception\Conflict) {
-            $error = new AppwriteException(AppwriteException::DOCUMENT_UPDATE_CONFLICT, null, null, $error);
-            $code = $error->getCode();
-            $message = $error->getMessage();
        }

        /** Wrap all exceptions inside Appwrite\Extend\Exception */
@@ -583,7 +580,7 @@ App::get('/humans.txt')
        $response->text($template->render(false));
    });

-App::get('/.well-known/acme-challenge/*')
+App::get('/.well-known/acme-challenge')
    ->desc('SSL Verification')
    ->label('scope', 'public')
    ->label('docs', false)
@@ -593,7 +590,7 @@ App::get('/.well-known/acme-challenge/*')
        $uriChunks = \explode('/', $request->getURI());
        $token = $uriChunks[\count($uriChunks) - 1];

-        $validator = new Text(100, allowList: [
+        $validator = new Text(100, [
            ...Text::NUMBERS,
            ...Text::ALPHABET_LOWER,
            ...Text::ALPHABET_UPPER,
@@ -4,7 +4,7 @@ global $utopia, $request, $response;

 use Appwrite\Extend\Exception;
 use Utopia\Database\Document;
-use Appwrite\Network\Validator\Host;
+use Utopia\Validator\Host;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
@@ -15,7 +15,6 @@ use Utopia\Validator\Text;
 use Utopia\Storage\Validator\File;
 use Utopia\Validator\WhiteList;
 use Utopia\Database\Helpers\ID;
-use Utopia\Validator\Nullable;

 App::get('/v1/mock/tests/foo')
    ->desc('Get Foo')
@@ -136,8 +135,6 @@ App::post('/v1/mock/tests/bar')
    ->label('sdk.response.code', Response::STATUS_CODE_OK)
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_MOCK)
-    ->label('sdk.offline.model', '/mock/tests/bar')
-    ->label('sdk.offline.key', '{required}')
    ->label('sdk.mock', true)
    ->param('required', '', new Text(100), 'Sample string param')
    ->param('default', '', new Integer(true), 'Sample numeric param')
@@ -268,7 +265,7 @@ App::post('/v1/mock/tests/general/upload')
    ->param('x', '', new Text(100), 'Sample string param')
    ->param('y', '', new Integer(true), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Sample array param')
-    ->param('file', [], new File(), 'Sample file param', skipValidation: true)
+    ->param('file', [], new File(), 'Sample file param', false)
    ->inject('request')
    ->inject('response')
    ->action(function (string $x, int $y, array $z, mixed $file, Request $request, Response $response) {
@@ -429,21 +426,6 @@ App::get('/v1/mock/tests/general/empty')
        $response->noContent();
    });

-App::post('/v1/mock/tests/general/nullable')
-    ->desc('Nullable Test')
-    ->groups(['mock'])
-    ->label('scope', 'public')
-    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
-    ->label('sdk.namespace', 'general')
-    ->label('sdk.method', 'nullable')
-    ->label('sdk.description', 'Mock a nullable parameter.')
-    ->label('sdk.mock', true)
-    ->param('required', '', new Text(100), 'Sample string param')
-    ->param('nullable', '', new Nullable(new Text(100)), 'Sample string param')
-    ->param('optional', '', new Text(100), 'Sample string param', true)
-    ->action(function (string $required, string $nullable, ?string $optional) {
-    });
-
 /** Endpoint to test if required headers are sent from the SDK */
 App::get('/v1/mock/tests/general/headers')
    ->desc('Get headers')
@@ -5,6 +5,7 @@ use Appwrite\Event\Audit;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
+use Appwrite\Event\Mail;
 use Appwrite\Extend\Exception;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Usage\Stats;
@@ -15,6 +16,7 @@ use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\Cache\Adapter\Filesystem;
 use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -195,25 +197,28 @@ App::init()
        $database->setProject($project);

        $dbForProject->on(Database::EVENT_DOCUMENT_CREATE, fn ($event, Document $document) => $databaseListener($event, $document, $usage));
+
        $dbForProject->on(Database::EVENT_DOCUMENT_DELETE, fn ($event, Document $document) => $databaseListener($event, $document, $usage));

        $useCache = $route->getLabel('cache', false);
+
        if ($useCache) {
            $key = md5($request->getURI() . implode('*', $request->getParams())) . '*' . APP_CACHE_BUSTER;
-            $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
            $cache = new Cache(
                new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
            );
            $timestamp = 60 * 60 * 24 * 30;
            $data = $cache->load($key, $timestamp);

-            if (!empty($data) && !$cacheLog->isEmpty()) {
-                $parts = explode('/', $cacheLog->getAttribute('resourceType'));
+            if (!empty($data)) {
+                $data = json_decode($data, true);
+                $parts = explode('/', $data['resourceType']);
                $type = $parts[0] ?? null;

                if ($type === 'bucket') {
                    $bucketId = $parts[1] ?? null;
-                    $bucket   = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+
+                    $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

                    if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && $mode !== APP_MODE_ADMIN)) {
                        throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -222,12 +227,11 @@ App::init()
                    $fileSecurity = $bucket->getAttribute('fileSecurity', false);
                    $validator = new Authorization(Database::PERMISSION_READ);
                    $valid = $validator->isValid($bucket->getRead());
-
                    if (!$fileSecurity && !$valid) {
                        throw new Exception(Exception::USER_UNAUTHORIZED);
                    }

-                    $parts = explode('/', $cacheLog->getAttribute('resource'));
+                    $parts = explode('/', $data['resource']);
                    $fileId = $parts[1] ?? null;

                    if ($fileSecurity && !$valid) {
@@ -244,8 +248,8 @@ App::init()
                $response
                    ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $timestamp) . ' GMT')
                    ->addHeader('X-Appwrite-Cache', 'hit')
-                    ->setContentType($cacheLog->getAttribute('mimeType'))
-                    ->send($data)
+                    ->setContentType($data['contentType'])
+                    ->send(base64_decode($data['payload']))
                ;

                $route->setIsActive(false);
@@ -473,6 +477,7 @@ App::shutdown()
        if ($useCache) {
            $resource = $resourceType = null;
            $data = $response->getPayload();
+
            if (!empty($data['payload'])) {
                $pattern = $route->getLabel('cache.resource', null);
                if (!empty($pattern)) {
@@ -485,17 +490,21 @@ App::shutdown()
                }

                $key = md5($request->getURI() . implode('*', $request->getParams())) . '*' . APP_CACHE_BUSTER;
+                $data = json_encode([
+                'resourceType' => $resourceType,
+                'resource' => $resource,
+                'contentType' => $response->getContentType(),
+                'payload' => base64_encode($data['payload']),
+                ]) ;

-                $signature = md5($data['payload']);
-                $cacheLog  =  Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
+                $signature = md5($data);
+                $cacheLog  = $dbForProject->getDocument('cache', $key);
                $accessedAt = $cacheLog->getAttribute('accessedAt', '');
                $now = DateTime::now();
                if ($cacheLog->isEmpty()) {
                    Authorization::skip(fn () => $dbForProject->createDocument('cache', new Document([
                    '$id' => $key,
                    'resource' => $resource,
-                    'resourceType' => $resourceType,
-                    'mimeType' => $response->getContentType(),
                    'accessedAt' => $now,
                    'signature' => $signature,
                    ])));
@@ -508,7 +517,7 @@ App::shutdown()
                    $cache = new Cache(
                        new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
                    );
-                    $cache->save($key, $data['payload']);
+                    $cache->save($key, $data);
                }
            }
        }
@@ -545,11 +554,3 @@ App::shutdown()
                ->submit();
        }
    });
-
-App::init()
-    ->groups(['usage'])
-    ->action(function () {
-        if (App::getEnv('_APP_USAGE_STATS', 'enabled') !== 'enabled') {
-            throw new Exception(Exception::GENERAL_USAGE_DISABLED);
-        }
-    });
@@ -3,13 +3,12 @@
 use Appwrite\Utopia\Response;
 use Utopia\App;

-App::get('/console/*')
+App::get('/console')
    ->alias('/')
-    ->alias('auth/*')
    ->alias('/invite')
    ->alias('/login')
    ->alias('/recover')
-    ->alias('/register/*')
+    ->alias('/register')
    ->groups(['web'])
    ->label('permission', 'public')
    ->label('scope', 'home')
@@ -17,7 +17,7 @@ App::get('/versions')
        ];

        foreach ($platforms as $platform) {
-            $languages = $platform['sdks'] ?? [];
+            $languages = $platform['languages'] ?? [];

            foreach ($languages as $key => $language) {
                if (isset($language['dev']) && $language['dev']) {
@@ -165,14 +165,14 @@ App::post('/v1/runtimes')
    ->desc("Create a new runtime server")
    ->param('runtimeId', '', new Text(64), 'Unique runtime ID.')
    ->param('source', '', new Text(0), 'Path to source files.')
-    ->param('destination', '', new Text(0, 0), 'Destination folder to store build files into.', true)
+    ->param('destination', '', new Text(0), 'Destination folder to store build files into.', true)
    ->param('vars', [], new Assoc(), 'Environment Variables required for the build.')
    ->param('commands', [], new ArrayList(new Text(1024), 100), 'Commands required to build the container. Maximum of 100 commands are allowed, each 1024 characters long.')
    ->param('runtime', '', new Text(128), 'Runtime for the cloud function.')
    ->param('baseImage', '', new Text(128), 'Base image name of the runtime.')
    ->param('entrypoint', '', new Text(256), 'Entrypoint of the code file.', true)
    ->param('remove', false, new Boolean(), 'Remove a runtime after execution.')
-    ->param('workdir', '', new Text(256, 0), 'Working directory.', true)
+    ->param('workdir', '', new Text(256), 'Working directory.', true)
    ->inject('orchestrationPool')
    ->inject('activeRuntimes')
    ->inject('response')
@@ -459,7 +459,7 @@ App::post('/v1/execution')
    ->desc('Create an execution')
    ->param('runtimeId', '', new Text(64), 'The runtimeID to execute.')
    ->param('vars', [], new Assoc(), 'Environment variables required for the build.')
-    ->param('data', '', new Text(8192, 0), 'Data to be forwarded to the function, this is user specified.', true)
+    ->param('data', '', new Text(8192), 'Data to be forwarded to the function, this is user specified.', true)
    ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Function maximum execution time in seconds.')
    ->inject('activeRuntimes')
    ->inject('response')
@@ -548,10 +548,6 @@ App::post('/v1/execution')
                case $statusCode >= 500:
                    $stderr = ($executorResponse ?? [])['stderr'] ?? 'Internal Runtime error.';
                    $stdout = ($executorResponse ?? [])['stdout'] ?? 'Internal Runtime error.';
-                    $res = ($executorResponse ?? [])['response'] ?? '';
-                    if (is_array($res)) {
-                        $res = json_encode($res, JSON_UNESCAPED_UNICODE);
-                    }
                    break;
                case $statusCode >= 100:
                    $stdout = $executorResponse['stdout'];
@@ -92,6 +92,7 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
        $collections = Config::getParam('collections', []);

        try {
+            $redis->flushAll();
            Console::success('[Setup] - Creating database: appwrite...');
            $dbForConsole->create();
        } catch (\Exception $e) {
@@ -115,6 +116,12 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
            if (!$dbForConsole->getCollection($key)->isEmpty()) {
                continue;
            }
+            /**
+             * Skip to prevent 0.16 migration issues.
+             */
+            if (in_array($key, ['cache', 'variables']) && $dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'), 'bucket_1')) {
+                continue;
+            }

            Console::success('[Setup] - Creating collection: ' . $collection['$id'] . '...');

@@ -289,7 +296,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
            $log->addExtra('line', $th->getLine());
            $log->addExtra('trace', $th->getTraceAsString());
            $log->addExtra('detailedTrace', $th->getTrace());
-            $log->addExtra('roles', Authorization::getRoles());
+            $log->addExtra('roles', Authorization::$roles);

            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
            $log->setAction($action);
@@ -53,7 +53,7 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\DatetimeValidator;
 use Utopia\Database\Validator\Structure;
 use Utopia\Locale\Locale;
 use Utopia\Messaging\Adapters\SMS\Mock;
@@ -86,7 +86,6 @@ const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 12;
 const APP_LIMIT_COUNT = 5000;
 const APP_LIMIT_USERS = 10000;
-const APP_LIMIT_USER_PASSWORD_HISTORY = 20;
 const APP_LIMIT_USER_SESSIONS_MAX = 100;
 const APP_LIMIT_USER_SESSIONS_DEFAULT = 10;
 const APP_LIMIT_ANTIVIRUS = 20000000; //20MB
@@ -100,8 +99,8 @@ const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate pe
 const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
 const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 506;
-const APP_VERSION_STABLE = '1.3.7';
+const APP_CACHE_BUSTER = 501;
+const APP_VERSION_STABLE = '1.2.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -114,7 +113,6 @@ const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_BUILDS = '/storage/builds';
 const APP_STORAGE_CACHE = '/storage/cache';
-const APP_STORAGE_VIDEOS = '/storage/videos';
 const APP_STORAGE_CERTIFICATES = '/storage/certificates';
 const APP_STORAGE_CONFIG = '/storage/config';
 const APP_STORAGE_READ_BUFFER = 20 * (1000 * 1000); //20MB other names `APP_STORAGE_MEMORY_LIMIT`, `APP_STORAGE_MEMORY_BUFFER`, `APP_STORAGE_READ_LIMIT`, `APP_STORAGE_BUFFER_LIMIT`
@@ -163,7 +161,6 @@ const DELETE_TYPE_CACHE_BY_RESOURCE  = 'cacheByResource';
 const COMPRESSION_TYPE_NONE = 'none';
 const COMPRESSION_TYPE_GZIP = 'gzip';
 const COMPRESSION_TYPE_ZSTD = 'zstd';
-const DELETE_TYPE_VIDEOS = 'videos';
 // Mail Types
 const MAIL_TYPE_VERIFICATION = 'verification';
 const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
@@ -177,7 +174,7 @@ const APP_AUTH_TYPE_KEY = 'Key';
 const APP_AUTH_TYPE_ADMIN = 'Admin';
 // Response related
 const MAX_OUTPUT_CHUNK_SIZE = 2 * 1024 * 1024; // 2MB
-const TMP_HOST = 'http://127.0.0.1/';
+
 $register = new Registry();

 App::setMode(App::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
@@ -211,7 +208,6 @@ Config::load('storage-logos', __DIR__ . '/config/storage/logos.php');
 Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
 Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
 Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
-Config::load('videos-profiles', __DIR__ . '/config/videos-profiles.php');

 $user = App::getEnv('_APP_REDIS_USER', '');
 $pass = App::getEnv('_APP_REDIS_PASS', '');
@@ -288,23 +284,12 @@ Database::addFilter(
        return null;
    },
    function (mixed $value, Document $document, Database $database) {
-        $attributes = $database->find('attributes', [
-            Query::equal('collectionInternalId', [$document->getInternalId()]),
-            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-            Query::limit($database->getLimitForAttributes()),
-        ]);
-
-        foreach ($attributes as $attribute) {
-            if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
-                $options = $attribute->getAttribute('options');
-                foreach ($options as $key => $value) {
-                    $attribute->setAttribute($key, $value);
-                }
-                $attribute->removeAttribute('options');
-            }
-        }
-
-        return $attributes;
+        return $database
+            ->find('attributes', [
+                Query::equal('collectionInternalId', [$document->getInternalId()]),
+                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
+                Query::limit($database->getLimitForAttributes()),
+            ]);
    }
 );

@@ -517,7 +502,7 @@ $register->set('logger', function () {
    return new Logger($adapter);
 });
 $register->set('dbPool', function () {
-    // Register DB connection
+ // Register DB connection
    $dbHost = App::getEnv('_APP_DB_HOST', '');
    $dbPort = App::getEnv('_APP_DB_PORT', '');
    $dbUser = App::getEnv('_APP_DB_USER', '');
@@ -526,20 +511,20 @@ $register->set('dbPool', function () {

    $pool = new PDOPool(
        (new PDOConfig())
-            ->withHost($dbHost)
-            ->withPort($dbPort)
-            ->withDbName($dbScheme)
-            ->withCharset('utf8mb4')
-            ->withUsername($dbUser)
-            ->withPassword($dbPass)
-            ->withOptions([
-                PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
-                PDO::ATTR_TIMEOUT => 3, // Seconds
-                PDO::ATTR_PERSISTENT => true,
-                PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
-                PDO::ATTR_EMULATE_PREPARES => true,
-                PDO::ATTR_STRINGIFY_FETCHES => true,
-            ]),
+        ->withHost($dbHost)
+        ->withPort($dbPort)
+        ->withDbName($dbScheme)
+        ->withCharset('utf8mb4')
+        ->withUsername($dbUser)
+        ->withPassword($dbPass)
+        ->withOptions([
+            PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
+            PDO::ATTR_TIMEOUT => 3, // Seconds
+            PDO::ATTR_PERSISTENT => true,
+            PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+            PDO::ATTR_EMULATE_PREPARES => true,
+            PDO::ATTR_STRINGIFY_FETCHES => true,
+        ]),
        64
    );

@@ -558,17 +543,17 @@ $register->set('redisPool', function () {

    $pool = new RedisPool(
        (new RedisConfig())
-            ->withHost($redisHost)
-            ->withPort($redisPort)
-            ->withAuth($redisAuth)
-            ->withDbIndex(0),
+        ->withHost($redisHost)
+        ->withPort($redisPort)
+        ->withAuth($redisAuth)
+        ->withDbIndex(0),
        64
    );

    return $pool;
 });
 $register->set('influxdb', function () {
-    // Register DB connection
+ // Register DB connection
    $host = App::getEnv('_APP_INFLUXDB_HOST', '');
    $port = App::getEnv('_APP_INFLUXDB_PORT', '');

@@ -582,7 +567,7 @@ $register->set('influxdb', function () {
    return $client;
 });
 $register->set('statsd', function () {
-    // Register DB connection
+ // Register DB connection
    $host = App::getEnv('_APP_STATSD_HOST', 'telegraf');
    $port = App::getEnv('_APP_STATSD_PORT', 8125);

@@ -622,14 +607,8 @@ $register->set('smtp', function () {
 $register->set('geodb', function () {
    return new Reader(__DIR__ . '/assets/dbip/dbip-country-lite-2023-01.mmdb');
 });
-$register->set('passwordsDictionary', function () {
-    $content = \file_get_contents(__DIR__ . '/assets/security/10k-common-passwords');
-    $content = explode("\n", $content);
-    $content = array_flip($content);
-    return $content;
-});
 $register->set('db', function () {
-    // This is usually for our workers or CLI commands scope
+ // This is usually for our workers or CLI commands scope
    $dbHost = App::getEnv('_APP_DB_HOST', '');
    $dbPort = App::getEnv('_APP_DB_PORT', '');
    $dbUser = App::getEnv('_APP_DB_USER', '');
@@ -648,7 +627,7 @@ $register->set('db', function () {
    return $pdo;
 });
 $register->set('cache', function () {
-    // This is usually for our workers or CLI commands scope
+ // This is usually for our workers or CLI commands scope
    $redis = new Redis();
    $redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''));
    $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
@@ -907,7 +886,6 @@ App::setResource('project', function ($dbForConsole, $request, $console) {
    /** @var Utopia\Database\Document $console */

    $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', 'console'));
-    //$projectId = '64635cdd5f809d98d3ad';

    if ($projectId === 'console') {
        return $console;
@@ -954,6 +932,7 @@ App::setResource('console', function () {

 App::setResource('dbForProject', function ($db, $cache, Document $project) {
    $cache = new Cache(new RedisCache($cache));
+
    $database = new Database(new MariaDB($db), $cache);
    $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
    $database->setNamespace("_{$project->getInternalId()}");
@@ -980,10 +959,6 @@ App::setResource('deviceFiles', function ($project) {
    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
 }, ['project']);

-App::setResource('deviceVideos', function ($project) {
-    return getDevice(APP_STORAGE_VIDEOS . '/app-' . $project->getId());
-}, ['project']);
-
 App::setResource('deviceFunctions', function ($project) {
    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -1052,11 +1027,6 @@ App::setResource('geodb', function ($register) {
    return $register->get('geodb');
 }, ['register']);

-App::setResource('passwordsDictionary', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('passwordsDictionary');
-}, ['register']);
-
 App::setResource('sms', function () {
    $dsn = new DSN(App::getEnv('_APP_SMS_PROVIDER'));
    $user = $dsn->getUser();
@@ -1079,7 +1049,7 @@ App::setResource('servers', function () {

    $languages = array_map(function ($language) {
        return strtolower($language['name']);
-    }, $server['sdks']);
+    }, $server['languages']);

    return $languages;
 });
@@ -1173,17 +1143,3 @@ App::setResource('schema', function ($utopia, $dbForProject) {
        $params,
    );
 }, ['utopia', 'dbForProject']);
-
-App::setResource('requestTimestamp', function ($request) {
-    //TODO: Move this to the Request class itself
-    $timestampHeader = $request->getHeader('x-appwrite-timestamp');
-    $requestTimestamp = null;
-    if (!empty($timestampHeader)) {
-        try {
-            $requestTimestamp = new \DateTime($timestampHeader);
-        } catch (\Throwable $e) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
-        }
-    }
-    return $requestTimestamp;
-}, ['request']);
@@ -34,11 +34,8 @@ foreach (
    realpath(__DIR__ . '/../vendor/matomo'),
    realpath(__DIR__ . '/../vendor/symfony'),
    realpath(__DIR__ . '/../vendor/mongodb'),
-    realpath(__DIR__ . '/../vendor/utopia-php/websocket'),
-    realpath(__DIR__ . '/../vendor/utopia-php/cache'),
-    realpath(__DIR__ . '/../vendor/alchemy'),
-    realpath(__DIR__ . '/../vendor/php-ffmpeg'),
-        realpath(__DIR__ . '/../vendor/utopia-php/storage'),
+    realpath(__DIR__ . '/../vendor/utopia-php/websocket'), // TODO: remove workerman autoload
+    realpath(__DIR__ . '/../vendor/utopia-php/cache'), // TODO: remove memcache autoload
    ] as $key => $value
 ) {
    if ($value !== false) {
@@ -95,9 +95,9 @@ $cli
                        if (is_null($value)) {
                            continue;
                        }
-                        foreach ($vars as $i => $var) {
+                        foreach ($vars as &$var) {
                            if ($var['name'] === $key) {
-                                $vars[$i]['default'] = $value;
+                                $var['default'] = $value;
                            }
                        }
                    }
@@ -114,9 +114,9 @@ $cli
                        if (is_null($value)) {
                            continue;
                        }
-                        foreach ($vars as $i => $var) {
+                        foreach ($vars as &$var) {
                            if ($var['name'] === $key) {
-                                $vars[$i]['default'] = $value;
+                                $var['default'] = $value;
                            }
                        }
                    }
@@ -146,7 +146,7 @@ $cli

        $input = [];

-        foreach ($vars as $var) {
+        foreach ($vars as $key => $var) {
            if (!empty($var['filter']) && ($interactive !== 'Y' || !Console::isInteractive())) {
                if ($data && $var['default'] !== null) {
                    $input[$var['name']] = $var['default'];
@@ -224,9 +224,9 @@ $cli
            }
        }

-        Console::log("Running \"docker compose up -d --remove-orphans --renew-anon-volumes\"");
+        Console::log("Running \"docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");

-        $exit = Console::execute("${env} docker compose --project-directory {$path} up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
+        $exit = Console::execute("${env} docker compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);

        if ($exit !== 0) {
            $message = 'Failed to install Appwrite dockers';
@@ -85,11 +85,10 @@ $cli
                try {
                    $migration
                        ->setProject($project, $projectDB, $consoleDB)
-                        ->setPDO($register->get('db'))
                        ->execute();
                } catch (\Throwable $th) {
-                    Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
                    throw $th;
+                    Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
                }

                clearProjectsCache($redis, $project);
@@ -26,24 +26,19 @@ $cli
    ->task('sdks')
    ->action(function () {
        $platforms = Config::getParam('platforms');
-        $selectedPlatform = Console::confirm('Choose Platform ("' . APP_PLATFORM_CLIENT . '", "' . APP_PLATFORM_SERVER . '", "' . APP_PLATFORM_CONSOLE . '" or "*" for all):');
-        $selectedSDK = \strtolower(Console::confirm('Choose SDK ("*" for all):'));
+        $selected = \strtolower(Console::confirm('Choose SDK ("*" for all):'));
        $version = Console::confirm('Choose an Appwrite version');
        $git = (Console::confirm('Should we use git push? (yes/no)') == 'yes');
        $production = ($git) ? (Console::confirm('Type "Appwrite" to push code to production git repos') == 'Appwrite') : false;
        $message = ($git) ? Console::confirm('Please enter your commit message:') : '';

-        if (!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', '1.0.x', '1.1.x', '1.2.x', '1.3.x', 'latest'])) {
+        if (!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', '1.0.x', '1.1.x', '1.2.x', 'latest'])) {
            throw new Exception('Unknown version given');
        }

        foreach ($platforms as $key => $platform) {
-            if ($selectedPlatform !== $key && $selectedPlatform !== '*') {
-                continue;
-            }
-
-            foreach ($platform['sdks'] as $language) {
-                if ($selectedSDK !== $language['key'] && $selectedSDK !== '*') {
+            foreach ($platform['languages'] as $language) {
+                if ($selected !== $language['key'] && $selected !== '*') {
                    continue;
                }

@@ -86,13 +81,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                switch ($language['key']) {
                    case 'web':
                        $config = new Web();
-                        if ($platform['key'] === APP_PLATFORM_CONSOLE) {
-                            $config->setNPMPackage('@appwrite.io/console');
-                            $config->setBowerPackage('@appwrite.io/console');
-                        } else {
-                            $config->setNPMPackage('appwrite');
-                            $config->setBowerPackage('appwrite');
-                        }
+                        $config->setNPMPackage('appwrite');
+                        $config->setBowerPackage('appwrite');
                        break;
                    case 'cli':
                        $config = new CLI();
@@ -239,8 +229,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                        cd ' . $target . ' && \
                        git init --initial-branch=' . $gitBranch . ' && \
                        git remote add origin ' . $gitUrl . ' && \
-                        git fetch origin ' . $gitBranch . ' && \
-                        git pull origin ' . $gitBranch . ' && \
+                        git fetch && \
+                        git pull ' . $gitUrl . ' && \
                        rm -rf ' . $target . '/* && \
                        cp -r ' . $result . '/* ' . $target . '/ && \
                        git add . && \
@@ -1,39 +0,0 @@
-<?php
-$mpd = $this->getParam('mpd', []);
-echo '<?xml version="1.0" encoding="utf-8"?>'; ?>
-<MPD xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:mpeg:dash:schema:mpd:2011" xmlns:xlink="http://www.w3.org/1999/xlink"
-     xsi:schemaLocation="urn:mpeg:DASH:schema:MPD:2011 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-DASH_schema_files/DASH-MPD.xsd"
-     profiles="<?php if (isset($mpd['profiles'])): echo ($mpd['profiles']); endif;?>" type="<?php if (isset($mpd['type'])): echo ($mpd['type']); endif;?>" mediaPresentationDuration="<?php if (isset($mpd['maxSegmentDuration'])): echo ($mpd['mediaPresentationDuration']); endif;?>" maxSegmentDuration="<?php if (isset($mpd['maxSegmentDuration'])): echo ($mpd['maxSegmentDuration']); endif;?>" minBufferTime="<?php if (isset($mpd['minBufferTime'])): echo ($mpd['minBufferTime']); endif;?>">
-    <ProgramInformation></ProgramInformation>
-    <ServiceDescription id="0"></ServiceDescription>
-    <Period id="0" start="PT0.0S">
-    <?php foreach ($this->getParam('renditions', []) as $adaptation):
-        $representation = $adaptation['representation'];
-    ?>
-    <AdaptationSet <?php  if (isset($adaptation['id'])):?> id="<?php echo ($adaptation['id']); endif;?>"<?php if (isset($adaptation['attributes']['contentType'])): ?> contentType="<?php echo $adaptation['attributes']['contentType']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['startWithSAP'])): ?> startWithSAP="<?php echo $adaptation['attributes']['startWithSAP']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['segmentAlignment'])): ?> segmentAlignment="<?php echo $adaptation['attributes']['segmentAlignment']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['bitstreamSwitching'])): ?> bitstreamSwitching="<?php echo $adaptation['attributes']['bitstreamSwitching']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['frameRate'])): ?> frameRate="<?php echo $adaptation['attributes']['frameRate']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['maxWidth'])): ?> maxWidth="<?php echo $adaptation['attributes']['maxWidth']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['par'])): ?> par="<?php echo $adaptation['attributes']['par']; ?>"<?php endif;?><?php if (isset($adaptation['attributes']['lang'])): ?> lang="<?php echo $adaptation['attributes']['lang']; ?>"<?php endif;?>>
-        <Representation <?php if (isset($representation['attributes']['id'])):?> id="<?php echo $representation['attributes']['id']; ?>"<?php endif;?><?php if (isset($representation['attributes']['mimeType'])):?> mimeType="<?php echo $representation['attributes']['mimeType']; ?>"<?php endif;?><?php if (isset($representation['attributes']['codecs'])):?> codecs="<?php echo $representation['attributes']['codecs']; ?>"<?php endif;?><?php if (isset($representation['attributes']['bandwidth'])):?> bandwidth="<?php echo $representation['attributes']['bandwidth']; ?>"<?php endif;?><?php if (isset($representation['attributes']['width'])):?> width="<?php echo $representation['attributes']['width']; ?>"<?php endif;?><?php if (isset($representation['attributes']['height'])):?> height="<?php echo $representation['attributes']['height']; ?>"<?php endif;?><?php if (isset($representation['attributes']['sar'])):?> sar="<?php echo $representation['attributes']['sar']; ?>"<?php endif;?><?php if (isset($representation['attributes']['audioSamplingRate'])):?> audioSamplingRate="<?php echo $representation['attributes']['audioSamplingRate']; ?>"<?php endif;?>>
-            <BaseURL><?php if (isset($adaptation['baseUrl'])): echo $this->escape($adaptation['baseUrl']);  endif;?></BaseURL>
-            <?php if (isset($adaptation['attributes']['contentType']) && $adaptation['attributes']['contentType'] === 'audio' ):?>
-               <AudioChannelConfiguration schemeIdUri="urn:mpeg:dash:23003:3:audio_channel_configuration:2011" value="2" />
-             <?php endif;?>
-            <SegmentList<?php if (isset($representation['segmentList']['attributes']['timescale'])): ?> timescale="<?php echo $representation['segmentList']['attributes']['timescale']; ?>"<?php endif;?><?php if (isset($representation['segmentList']['attributes']['duration'])): ?> duration="<?php echo $representation['segmentList']['attributes']['duration']; ?>"<?php endif;?><?php if (isset($representation['segmentList']['attributes']['startNumber'])): ?> startNumber="<?php echo $representation['segmentList']['attributes']['startNumber']; ?>"<?php endif;?>>
-            <Initialization sourceURL="<?php if (isset($representation['segmentList']['init'])):?><?php echo $representation['segmentList']['init']; ?><?php endif;?>"/>
-            <?php if (isset($representation['segmentList']['media'])):?>
-                <?php foreach ($representation['segmentList']['media'] as $segment): ?>
-                    <SegmentURL media="<?php if (isset($segment)):?><?php echo $segment; ?><?php endif;?>"/>
-                <?php endforeach; ?>
-            <?php endif;?>
-            </SegmentList>
-        </Representation>
-    </AdaptationSet>
-    <?php endforeach; ?>
-     <?php foreach ($this->getParam('subtitles', []) as $subtitle):?>
-         <AdaptationSet id="<?php if (isset($subtitle['id'])): echo $subtitle['id'];  endif;?>"  lang="<?php if (isset($subtitle['name'])): echo $this->escape($subtitle['name']);  endif;?>" mimeType="text/vtt">
-             <Role schemeIdUri="urn:mpeg:dash:role:2011" value="subtitle" />
-             <Representation>
-                <BaseURL><?php if (isset($subtitle['baseUrl'])): echo $this->escape($subtitle['baseUrl']); endif;?></BaseURL>
-            </Representation>
-        </AdaptationSet>
-        <?php endforeach; ?>
-    </Period>
-</MPD>
@@ -1,12 +0,0 @@
-#EXTM3U
-#EXT-X-VERSION:4
-<?php foreach ($this->getParam('audios', []) as $audio):?>
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="group_audio"<?php if($audio['name'] !== null):?>,NAME="<?php echo $audio['name'];?>"<?php endif;?>,AUTOSELECT=YES<?php if($audio['language'] !== null):?>,LANGUAGE="<?php echo $audio['language'];?>"<?php endif;?><?php if($audio['uri'] !== null):?>,URI="<?php echo $audio['uri'];?>"<?php endif;?><?php echo PHP_EOL?>
-<?php endforeach;?><?php echo PHP_EOL?>
-<?php foreach ($this->getParam('subtitles', []) as $subtitle):?>
-#EXT-X-MEDIA:TYPE=SUBTITLES,GROUP-ID="subs",NAME="<?php echo $this->escape($subtitle['name']); ?>",DEFAULT=<?php echo $subtitle['default']; ?>,AUTOSELECT=YES,FORCED=NO,LANGUAGE="<?php echo $this->escape($subtitle['code']); ?>",URI="<?php echo $subtitle['uri']; ?>"<?php echo PHP_EOL?>
-<?php endforeach;?><?php echo PHP_EOL?>
-<?php foreach ($this->getParam('renditions', []) as $rendition):?>
-#EXT-X-STREAM-INF:BANDWIDTH="<?php echo $rendition['bandwidth']; ?>",RESOLUTION="<?php echo $rendition['resolution']; ?>",NAME="<?php echo $rendition['name']; ?>"<?php if($rendition['codecs'] !== null):?>,CODECS="<?php echo $rendition['codecs']; ?>"<?php endif;?><?php if($rendition['subs'] !== null):?>,SUBTITLES="<?php echo $rendition['subs'];?>"<?php endif;?><?php if($rendition['audio'] !== null):?>,AUDIO="<?php echo $rendition['audio'];?>"<?php endif;?> <?php echo PHP_EOL?>
-<?php echo $rendition['uri'];?><?php echo PHP_EOL?>
-<?php endforeach;?>
@@ -1,10 +0,0 @@
-#EXTM3U
-#EXT-X-VERSION:3
-#EXT-X-MEDIA-SEQUENCE:1
-#EXT-X-PLAYLIST-TYPE:VOD
-#EXT-X-TARGETDURATION:<?php echo $this->getParam('targetDuration', 0)?><?php echo PHP_EOL?>
-#EXT-X-MEDIA-SEQUENCE:0
-<?php foreach ($this->getParam('segments', []) as $segment): ?>
-#EXTINF:<?php echo $segment['duration']; ?><?php echo PHP_EOL?>
-<?php echo $segment['url']; ?><?php echo PHP_EOL?>
-<?php endforeach; ?>
@@ -1,10 +0,0 @@
-#EXTM3U
-#EXT-X-VERSION:4
-#EXT-X-ALLOW-CACHE:YES
-#EXT-X-TARGETDURATION:<?php echo $this->getParam('targetDuration', 0)?><?php echo PHP_EOL?>
-#EXT-X-MEDIA-SEQUENCE:0
-<?php foreach ($this->getParam('segments', []) as $segment): ?>
-#EXTINF:<?php echo $segment['duration']; ?>,<?php echo PHP_EOL?>
-<?php echo $segment['url']; ?><?php echo PHP_EOL?>
-<?php endforeach; ?>
-#EXT-X-ENDLIST
@@ -383,7 +383,7 @@ class CertificatesV1 extends Worker
            $locale->setDefault('en');
        }

-        $body = Template::fromFile(__DIR__ . '/../config/locale/templates/email-base.tpl');
+        $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');

            $subject = \sprintf($locale->getText("emails.certificate.subject"), $domain);
            $body->setParam('{{domain}}', $domain);
@@ -1,13 +1,10 @@
 <?php

 use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Resque\Worker;
 use Utopia\CLI\Console;
-use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;

 require_once __DIR__ . '/../init.php';

@@ -92,51 +89,16 @@ class DatabaseV1 extends Worker
        $format = $attribute->getAttribute('format', '');
        $formatOptions = $attribute->getAttribute('formatOptions', []);
        $filters = $attribute->getAttribute('filters', []);
-        $options = $attribute->getAttribute('options', []);
        $project = $dbForConsole->getDocument('projects', $projectId);

        try {
-            switch ($type) {
-                case Database::VAR_RELATIONSHIP:
-                    $relatedCollection = $dbForProject->getDocument('database_' . $database->getInternalId(), $options['relatedCollection']);
-                    if ($relatedCollection->isEmpty()) {
-                        throw new Exception('Collection not found');
-                    }
-
-                    if (
-                        !$dbForProject->createRelationship(
-                            collection: 'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
-                            relatedCollection: 'database_' . $database->getInternalId() . '_collection_' . $relatedCollection->getInternalId(),
-                            type: $options['relationType'],
-                            twoWay: $options['twoWay'],
-                            id: $key,
-                            twoWayKey: $options['twoWayKey'],
-                            onDelete: $options['onDelete'],
-                        )
-                    ) {
-                        throw new Exception('Failed to create Attribute');
-                    }
-
-                    if ($options['twoWay']) {
-                        $relatedAttribute = $dbForProject->getDocument('attributes', $database->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey']);
-                        $dbForProject->updateDocument('attributes', $relatedAttribute->getId(), $relatedAttribute->setAttribute('status', 'available'));
-                    }
-                    break;
-                default:
-                    if (!$dbForProject->createAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters)) {
-                        throw new Exception('Failed to create Attribute');
-                    }
+            if (!$dbForProject->createAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters)) {
+                throw new Exception('Failed to create Attribute');
            }
-
            $dbForProject->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'available'));
        } catch (\Throwable $th) {
            Console::error($th->getMessage());
            $dbForProject->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'failed'));
-
-            if ($type === Database::VAR_RELATIONSHIP && $options['twoWay']) {
-                $relatedAttribute = $dbForProject->getDocument('attributes', $database->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey']);
-                $dbForProject->updateDocument('attributes', $relatedAttribute->getId(), $relatedAttribute->setAttribute('status', 'failed'));
-            }
        } finally {
            $target = Realtime::fromPayload(
                // Pass first, most verbose event pattern
@@ -159,10 +121,6 @@ class DatabaseV1 extends Worker
            );
        }

-        if ($type === Database::VAR_RELATIONSHIP && $options['twoWay']) {
-            $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
-        }
-
        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
    }

@@ -171,7 +129,6 @@ class DatabaseV1 extends Worker
     * @param Document $collection
     * @param Document $attribute
     * @param string $projectId
-     * @throws Throwable
     */
    protected function deleteAttribute(Document $database, Document $collection, Document $attribute, string $projectId): void
    {
@@ -186,43 +143,19 @@ class DatabaseV1 extends Worker
        $collectionId = $collection->getId();
        $key = $attribute->getAttribute('key', '');
        $status = $attribute->getAttribute('status', '');
-        $type = $attribute->getAttribute('type', '');
        $project = $dbForConsole->getDocument('projects', $projectId);
-        $options = $attribute->getAttribute('options', []);
-        $relatedAttribute = new Document();
-        $relatedCollection = new Document();
+
        // possible states at this point:
        // - available: should not land in queue; controller flips these to 'deleting'
        // - processing: hasn't finished creating
        // - deleting: was available, in deletion queue for first time
        // - failed: attribute was never created
        // - stuck: attribute was available but cannot be removed
-
        try {
-            if ($status !== 'failed') {
-                if ($type ===  Database::VAR_RELATIONSHIP) {
-                    if ($options['twoWay']) {
-                        $relatedCollection = $dbForProject->getDocument('database_' . $database->getInternalId(), $options['relatedCollection']);
-                        if ($relatedCollection->isEmpty()) {
-                            throw new Exception(Exception::COLLECTION_NOT_FOUND);
-                        }
-                        $relatedAttribute = $dbForProject->getDocument('attributes', $database->getInternalId() . '_' . $relatedCollection->getInternalId() . '_' . $options['twoWayKey']);
-                    }
-
-                    if (!$dbForProject->deleteRelationship('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
-                        $dbForProject->updateDocument('attributes', $relatedAttribute->getId(), $relatedAttribute->setAttribute('status', 'stuck'));
-                        throw new Exception('Failed to delete Relationship');
-                    }
-                } elseif (!$dbForProject->deleteAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
-                    throw new Exception('Failed to delete Attribute');
-                }
+            if ($status !== 'failed' && !$dbForProject->deleteAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
+                throw new Exception('Failed to delete Attribute');
            }
-
            $dbForProject->deleteDocument('attributes', $attribute->getId());
-
-            if (!$relatedAttribute->isEmpty()) {
-                $dbForProject->deleteDocument('attributes', $relatedAttribute->getId());
-            }
        } catch (\Throwable $th) {
            Console::error($th->getMessage());
            $dbForProject->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'stuck'));
@@ -266,8 +199,8 @@ class DatabaseV1 extends Worker
                // array_values wraps array_diff to reindex array keys
                // when found attribute is removed from array
                $attributes = \array_values(\array_diff($attributes, [$attributes[$found]]));
-                $lengths = \array_values(\array_diff($lengths, isset($lengths[$found]) ? [$lengths[$found]] : []));
-                $orders = \array_values(\array_diff($orders, isset($orders[$found]) ? [$orders[$found]] : []));
+                $lengths = \array_values(\array_diff($lengths, [$lengths[$found]]));
+                $orders = \array_values(\array_diff($orders, [$orders[$found]]));

                if (empty($attributes)) {
                    $dbForProject->deleteDocument('indexes', $index->getId());
@@ -302,11 +235,6 @@ class DatabaseV1 extends Worker

        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
        $dbForProject->deleteCachedCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
-
-        if (!$relatedCollection->isEmpty() && !$relatedAttribute->isEmpty()) {
-            $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
-            $dbForProject->deleteCachedCollection('database_' . $database->getInternalId() . '_collection_' . $relatedCollection->getInternalId());
-        }
    }

    /**
@@ -9,6 +9,7 @@ use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Appwrite\Resque\Worker;
 use Executor\Executor;
+use Utopia\Storage\Device\Local;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\CLI\Console;
@@ -57,16 +58,10 @@ class DeletesV1 extends Worker
                        break;
                    case DELETE_TYPE_TEAMS:
                        $this->deleteMemberships($document, $project->getId());
-                        if ($project->getId() === 'console') {
-                            $this->deleteProjectsByTeam($document);
-                        }
                        break;
                    case DELETE_TYPE_BUCKETS:
                        $this->deleteBucket($document, $project->getId());
                        break;
-                    case DELETE_TYPE_VIDEOS:
-                        $this->deleteVideo($document, $project->getId());
-                        break;
                    default:
                        if (\str_starts_with($document->getCollection(), 'database_')) {
                            $this->deleteCollection($document, $project->getId());
@@ -208,21 +203,6 @@ class DeletesV1 extends Worker

        $dbForProject = $this->getProjectDB($projectId);

-        $relationships = \array_filter(
-            $document->getAttribute('attributes'),
-            fn ($attribute) => $attribute['type'] === Database::VAR_RELATIONSHIP
-        );
-
-        foreach ($relationships as $relationship) {
-            if (!$relationship['twoWay']) {
-                continue;
-            }
-            $relatedCollection = $dbForProject->getDocument('database_' . $databaseInternalId, $relationship['relatedCollection']);
-            $dbForProject->deleteDocument('attributes', $databaseInternalId . '_' . $relatedCollection->getInternalId() . '_' . $relationship['twoWayKey']);
-            $dbForProject->deleteCachedDocument('database_' . $databaseInternalId, $relatedCollection->getId());
-            $dbForProject->deleteCachedCollection('database_' . $databaseInternalId . '_collection_' . $relatedCollection->getInternalId());
-        }
-
        $dbForProject->deleteCollection('database_' . $databaseInternalId . '_collection_' . $document->getInternalId());

        $this->deleteByGroup('attributes', [
@@ -268,24 +248,6 @@ class DeletesV1 extends Worker
        ], $this->getProjectDB($projectId));
    }

-    /**
-     * @param \Utopia\Database\Document $document
-     * @return void
-     * @throws \Exception
-     */
-    protected function deleteProjectsByTeam(Document $document): void
-    {
-        $dbForConsole = $this->getConsoleDB();
-
-        $projects = $dbForConsole->find('projects', [
-            Query::equal('teamInternalId', [$document->getInternalId()])
-        ]);
-
-        foreach ($projects as $project) {
-            $this->deleteProject($project);
-        }
-    }
-
    /**
     * @param Document $document project document
     * @throws Exception
@@ -293,13 +255,12 @@ class DeletesV1 extends Worker
    protected function deleteProject(Document $document): void
    {
        $projectId = $document->getId();
-        $projectInternalId = $document->getInternalId();

-        // Delete project certificates
+        // Delete project domains and certificates
        $dbForConsole = $this->getConsoleDB();

        $domains = $dbForConsole->find('domains', [
-            Query::equal('projectInternalId', [$projectInternalId])
+            Query::equal('projectInternalId', [$document->getInternalId()])
        ]);

        foreach ($domains as $domain) {
@@ -321,26 +282,6 @@ class DeletesV1 extends Worker
            }
        }

-        // Delete Platforms
-        $this->deleteByGroup('platforms', [
-            Query::equal('projectInternalId', [$projectInternalId])
-        ], $dbForConsole);
-
-        // Delete Domains
-        $this->deleteByGroup('domains', [
-            Query::equal('projectInternalId', [$projectInternalId])
-        ], $dbForConsole);
-
-        // Delete Keys
-        $this->deleteByGroup('keys', [
-            Query::equal('projectInternalId', [$projectInternalId])
-        ], $dbForConsole);
-
-        // Delete Webhooks
-        $this->deleteByGroup('webhooks', [
-            Query::equal('projectInternalId', [$projectInternalId])
-        ], $dbForConsole);
-
        // Delete metadata tables
        try {
            $dbForProject->deleteCollection('_metadata');
@@ -779,58 +720,9 @@ class DeletesV1 extends Worker
    {
        $dbForProject = $this->getProjectDB($projectId);
        $dbForProject->deleteCollection('bucket_' . $document->getInternalId());
+
        $device = $this->getFilesDevice($projectId);
+
        $device->deletePath($document->getId());
    }
-
-    /**
-     * @param Document $document database document
-     * @param string $projectId
-     */
-    protected function deleteVideo(Document $document, string $projectId): void
-    {
-
-        $videoId = $document->getId();
-        $dbForProject = $this->getProjectDB($projectId);
-
-        $previews = $dbForProject->find('videos_previews', [
-            new Query('videoId', Query::TYPE_EQUAL, [$videoId])
-        ]);
-        foreach ($previews as $preview) {
-            $dbForProject->deleteDocument('videos_previews', $preview->getId());
-        }
-
-        $renditions = $dbForProject->find('videos_renditions', [
-            new Query('videoId', Query::TYPE_EQUAL, [$videoId])
-        ]);
-        foreach ($renditions as $rendition) {
-            $this->deleteByGroup('videos_renditions_segments', [
-                new Query('renditionId', Query::TYPE_EQUAL, [$rendition->getId()])
-            ], $dbForProject);
-
-            $dbForProject->deleteDocument('videos_renditions', $rendition->getId());
-        }
-
-        $subtitles = $dbForProject->find('videos_subtitles', [
-            new Query('videoId', Query::TYPE_EQUAL, [$videoId])
-        ]);
-
-        foreach ($subtitles as $subtitle) {
-            $segments = $dbForProject->find('videos_subtitles_segments', [
-                new Query('subtitleId', Query::TYPE_EQUAL, [$subtitle->getId()])
-            ]);
-            foreach ($segments as $segment) {
-                $dbForProject->deleteDocument('videos_subtitles_segments', $segment->getId());
-            }
-            $dbForProject->deleteDocument('videos_subtitles', $subtitle->getId());
-        }
-
-        $videosDevice = $this->getVideoDevice($projectId);
-        $videosPath   = $videosDevice->getPath($videoId);
-        if ($videosDevice->deletePath($videosPath)) {
-            Console::success('Deleted video directory: ' . $videosPath);
-        } else {
-            Console::error('Failed to delete video directory: ' . $videosPath);
-        }
-    }
 }
@@ -82,22 +82,18 @@ class FunctionsV1 extends Worker

                    Console::success('Iterating function: ' . $function->getAttribute('name'));

-                    try {
-                        $this->execute(
-                            project: $project,
-                            function: $function,
-                            dbForProject: $database,
-                            trigger: 'event',
-                            // Pass first, most verbose event pattern
-                            event: $events[0],
-                            eventData: $payload,
-                            user: $user
-                        );
+                    $this->execute(
+                        project: $project,
+                        function: $function,
+                        dbForProject: $database,
+                        trigger: 'event',
+                        // Pass first, most verbose event pattern
+                        event: $events[0],
+                        eventData: $payload,
+                        user: $user
+                    );

-                        Console::success('Triggered function: ' . $events[0]);
-                    } catch (\Throwable $th) {
-                        Console::error("Failed to execute " . $function->getId() . " with error: " . $th->getMessage());
-                    }
+                    Console::success('Triggered function: ' . $events[0]);
                }
            }

@@ -1,820 +0,0 @@
-<?php
-
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\Messaging\Adapter\Realtime;
-use Appwrite\OpenSSL\OpenSSL;
-use Appwrite\Resque\Worker;
-use Streaming\FFMpeg;
-use FFMpeg\FFProbe;
-use Streaming\Format\StreamFormat;
-use Streaming\HLSSubtitle;
-use Streaming\Media;
-use Streaming\Representation;
-use Mhor\MediaInfo\MediaInfo;
-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Authorization;
-use Utopia\Database\Exception\Structure;
-use Utopia\Database\Query;
-use Utopia\Storage\Compression\Algorithms\GZIP;
-use Utopia\Storage\Compression\Algorithms\Zstd;
-use Captioning\Format\SubripFile;
-use Utopia\Storage\Device\Local;
-
-require_once __DIR__ . '/../init.php';
-
-Console::title('Video V1 Worker');
-Console::success(APP_NAME . ' video worker v1 has started');
-
-class VideosV1 extends Worker
-{
-    /**
-     * Rendition Status
-     */
-    private const STATUS_START     = 'started';
-    private const STATUS_END       = 'ended';
-    private const STATUS_UPLOADING = 'uploading';
-    private const STATUS_READY     = 'ready';
-    private const STATUS_ERROR     = 'error';
-
-    private const OUTPUT_HLS  = 'hls';
-    private const OUTPUT_DASH = 'dash';
-
-    private string $basePath = '/tmp/';
-    //private string $basePath = '/usr/src/code/tests/tmp/';
-    private string $inDir;
-    private string $inPath;
-    private string $outDir;
-    private string $outPath;
-    private string $renditionName;
-    private Database $database;
-    private Document $video;
-    private Document $subtitle;
-    private string $action;
-    private Document $profile;
-    private Document $project;
-    private Document $file;
-    private Document $bucket;
-    private FFProbe $ffprobe;
-    private FFMpeg $ffmpeg;
-
-
-    public function getName(): string
-    {
-        return "Video v1";
-    }
-
-    public function init(): void
-    {
-        $this->video     =  new Document($this->args['video'] ?? []);
-        $this->profile   =  new Document($this->args['profile'] ?? []);
-        $this->project   =  new Document($this->args['project'] ?? []);
-        $this->subtitle  =  new Document($this->args['subtitle'] ?? []);
-
-        $this->action   =  $this->args['action'];
-        $this->basePath .= uniqid();
-        $this->inDir    =  $this->basePath . '/in/';
-        $this->outDir   =  $this->basePath . '/out/';
-        @mkdir($this->inDir, 0755, true);
-        @mkdir($this->outDir, 0755, true);
-        $this->outPath = $this->outDir . $this->video->getId();
-    }
-
-
-    public function run(): void
-    {
-
-        $this->database = $this->getProjectDB($this->project->getId());
-        $this->bucket = $this->database->getDocument('buckets', $this->video->getAttribute('bucketId'));
-        $this->file = $this->database->getDocument('bucket_' . $this->bucket->getInternalId(), $this->video->getAttribute('fileId'));
-        $path = basename($this->file->getAttribute('path'));
-        $this->inPath = $this->inDir . $path;
-
-        match ($this->action) {
-            'timeline'  => $this->createTimeLine(),
-            'subtitle'  => $this->createSubtitle(),
-            default     => $this->createOutput(),
-        };
-    }
-
-
-    /**
-     * Create timeline
-     *
-     * @throws Authorization
-     * @throws Structure
-     * @throws Throwable
-     */
-    private function createTimeLine(): void
-    {
-
-        /*
-         * Title:             PlayerJS Thumbnails & WebVTT Creator
-         * URI:               https://playerjs.com/docs/q=thumbnailsphpwebvtt
-         * Version:           1.0
-         * Author:            Playerjs.com
-         * Author URI:        https://playerjs.com
-         * License:           GPL-2.0+
-         * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
-         * Text Domain:       playerjs
-        */
-
-        $this->download($this->project, $this->file);
-
-        if (empty($this->video->getAttribute('duration'))) {
-            $this->createInfo();
-        }
-
-        if (empty($this->video->getAttribute('videoBitRate'))) {
-            return;
-        }
-
-        $interval = 2;
-        $ranges = [
-            ['from' => 120, 'to' => 600, 'interval' => 5],
-            ['from' => 600, 'to' => 1800, 'interval' => 10],
-            ['from' => 1800, 'to' => 3600, 'interval' => 20],
-            ['from' => 3600, 'to' => 99999, 'interval' => 30],
-        ];
-
-        foreach ($ranges as $range) {
-            if (
-                $this->video->getAttribute('duration') > $range['from'] &&
-                $this->video->getAttribute('duration') <= $range['to']
-            ) {
-                $interval = $range['interval'];
-                break;
-            }
-        }
-
-        $timeline['aspect'] = $this->video->getAttribute('width') / $this->video->getAttribute('height');
-        $timeline['width'] = 160;
-        $timeline['height'] = round($timeline['width'] / $timeline['aspect']);
-        $timeline['size'] = '5x5';
-
-        $cmd = [
-            '/usr/bin/ffmpeg',
-            '-i ' .  $this->inPath,
-            '-hide_banner',
-            '-loglevel error',
-            '-vsync vfr',
-            '-vf \'select=isnan(prev_selected_t)+gte(t-prev_selected_t\,' . $interval . '),scale=' . $timeline['width'] . ':' . $timeline['height'] . ',tile=' . $timeline['size'] . '\'',
-            '-qscale:v 3',
-            $this->outDir . 'sprite%d.jpg',
-        ];
-        $result = shell_exec(implode(" ", $cmd));
-
-        /**
-         * Vtt creation*
-         */
-        if ($result !== false) {
-            $size = explode('x', $timeline['size']);
-            $counter = 0;
-            $images = ceil((($this->video->getAttribute('duration') / 1000) / $interval) / ($size[0] * $size[1]));
-            $data = "WEBVTT";
-            $path = $this->getVideoDevice($this->project->getId())->getPath($this->video->getId()) . '/timeline/';
-            for ($image = 1; $image <= $images; $image++) {
-                $sprite = $this->database->createDocument('videos_previews', new Document([
-                    'videoId' => $this->video->getId(),
-                    'videoInternalId' => $this->video->getInternalId(),
-                    'type' => 'sprite',
-                    'name' => 'sprite' . $image . '.jpg',
-                    'path' => $path,
-                ]));
-
-                $url = TMP_HOST . 'v1/videos/' . $this->video->getId() . '/preview/' . $sprite->getId() . '/';
-                for ($col = 0; $col < $size[0]; $col++) {
-                    for ($row = 0; $row < $size[1]; $row++) {
-                        $data .= "\n" . gmdate("H:i:s", $counter * $interval) . " --> " . gmdate("H:i:s", ($counter + 1) * $interval) . "\n" . $url . "#xywh=" . ($row * $timeline['width']) . "," . ($col * $timeline['height']) . "," . $timeline['width'] . "," . $timeline['height'];
-                        $counter++;
-                    }
-                }
-            }
-
-            if ($counter > 0) {
-                /**
-                 * Upload vtt
-                 */
-                $this->getVideoDevice($this->project->getId())->write(
-                    $this->getVideoDevice($this->project->getId())->getPath($this->video->getId() . '/timeline/timeline.vtt'),
-                    $data,
-                    'text/vtt'
-                );
-
-                console::info('Uploading timeline vtt');
-
-                /**
-                 * Upload sprites
-                 */
-                $dir = new DirectoryIterator($this->outDir);
-                foreach ($dir as $fileinfo) {
-                    if (!$fileinfo->isDot()) {
-                        console::info('Uploading ' . $fileinfo->getFilename());
-                        $this->getVideoDevice($this->project->getId())->write(
-                            $path . $fileinfo->getFilename(),
-                            (new Local('/'))->read($this->outDir . $fileinfo->getFilename()),
-                            mime_content_type($this->outDir . $fileinfo->getFilename())
-                        );
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Create subtitle
-     *
-     * @throws Authorization
-     * @throws Structure
-     * @throws Throwable
-     */
-    private function createSubtitle(): void
-    {
-
-        if (empty($this->video->getAttribute('duration'))) {
-            $this->download($this->project, $this->file);
-            $this->createInfo();
-        }
-
-        $segments = $this->database->find('videos_subtitles_segments', [
-            Query::equal('subtitleInternalId', [$this->subtitle->getInternalId()]),
-        ]);
-
-        foreach ($segments as $segment) {
-            $this->database->deleteDocument('videos_subtitles_segments', $segment->getId());
-        }
-
-        $this->subtitle->setAttribute('status', self::STATUS_START);
-        $this->database->updateDocument('videos_subtitles', $this->subtitle->getId(), $this->subtitle);
-
-        $bucket = $this->database->getDocument('buckets', $this->subtitle->getAttribute('bucketId'));
-        $file = $this->database->getDocument('bucket_' . $bucket->getInternalId(), $this->subtitle->getAttribute('fileId'));
-        $path = basename($file->getAttribute('path'));
-
-        $this->download($this->project, $file);
-
-        $ext = pathinfo($path, PATHINFO_EXTENSION);
-        $subtitlePath = $this->inDir . $this->subtitle->getId() . '.vtt';
-
-        if ($ext === 'srt') {
-            $srt = new SubripFile($this->inDir . $path);
-            $srt->convertTo('webvtt')->save($subtitlePath);
-        }
-
-        $path = $this->getVideoDevice($this->project->getId())->getPath($this->video->getId()) . '/subtitles/';
-        $this->database->createDocument('videos_subtitles_segments', new Document([
-                'subtitleId' => $this->subtitle->getId(),
-                'subtitleInternalId' => $this->subtitle->getInternalId(),
-                'fileName' => $this->subtitle->getId() . '.vtt',
-                'path' => $path,
-                'duration' => (string)number_format(($this->video->getAttribute('duration') / 1000), 1),
-            ]));
-
-        /**
-         * Upload subtitle
-         */
-        console::info('Uploading ' . $this->subtitle->getId() . '.vtt');
-        $this->getVideoDevice($this->project->getId())->write(
-            $path . $this->subtitle->getId() . '.vtt',
-            (new Local('/'))->read($this->inDir . $this->subtitle->getId() . '.vtt'),
-            'text/vtt'
-        );
-
-        $this->subtitle->setAttribute('targetDuration', (string)number_format(($this->video->getAttribute('duration') / 1000), 1));
-        $this->subtitle->setAttribute('status', self::STATUS_READY);
-        $this->subtitle->setAttribute('path', $path);
-        $this->database->updateDocument('videos_subtitles', $this->subtitle->getId(), $this->subtitle);
-    }
-
-    /**
-     * Create output
-     *
-     * @throws Authorization
-     * @throws Exception
-     * @throws Throwable
-     * @throws Structure
-     */
-    private function createOutput(): void
-    {
-
-        $this->download($this->project, $this->file);
-        if (empty($this->video->getAttribute('duration'))) {
-            $this->createInfo();
-        }
-
-        /**
-         * FFMpeg init
-         */
-        $this->ffprobe = FFProbe::create();
-        $this->ffmpeg = FFMpeg::create([
-            'timeout' => 0,
-            'ffmpeg.threads' => 4
-        ]);
-
-        if (!$this->ffprobe->isValid($this->inPath)) {
-            console::error('Not an valid Video file "' .  $this->inPath . '"');
-        }
-
-        $media = $this->ffmpeg->open($this->inPath);
-
-        $this->renditionName = $this->profile->getAttribute('width')
-            . 'X' . $this->profile->getAttribute('height')
-            . '@' . ($this->profile->getAttribute('videoBitRate') + $this->profile->getAttribute('audioBitRate'));
-
-
-        $query = $this->database->createDocument('videos_renditions', new Document([
-            'videoId' => $this->video->getId(),
-            'videoInternalId' => $this->video->getInternalId(),
-            'profileId' => $this->profile->getId(),
-            'profileInternalId' => $this->profile->getInternalId(),
-            'name' => $this->renditionName,
-            'startedAt' => DateTime::now(),
-            'status' => self::STATUS_START,
-            'width' => $this->profile->getAttribute('width'),
-            'height' => $this->profile->getAttribute('height'),
-            'videoBitRate' => $this->profile->getAttribute('videoBitRate'),
-            'audioBitRate' => $this->profile->getAttribute('audioBitRate'),
-            'output' => $this->args['output'],
-        ]));
-
-        $this->send($query);
-
-        try {
-            $representation = (new Representation())
-                ->setKiloBitRate($this->profile->getAttribute('videoBitRate'))
-                ->setAudioKiloBitRate($this->profile->getAttribute('audioBitRate'))
-                ->setResize($this->profile->getAttribute('width'), $this->profile->getAttribute('height'));
-
-            console::info('Output video id:' . $this->video->getId() . PHP_EOL .
-                'Output name: ' . $this->file->getAttribute('name') . PHP_EOL .
-                'Output width: ' . $this->profile->getAttribute('width') . PHP_EOL .
-                'Output height: ' . $this->profile->getAttribute('height') . PHP_EOL .
-                'Output video BitRate:' . $this->profile->getAttribute('videoBitRate') . PHP_EOL .
-                'Output audio BitRate:' . $this->profile->getAttribute('audioBitRate') . PHP_EOL .
-                'Output:' . $this->args['output'] . PHP_EOL);
-
-            $format = new Streaming\Format\X264();
-            $format->on('progress', function ($media, $format, $percentage) use ($query) {
-                if ($percentage % 3 === 0) {
-                    $query->setAttribute('progress', (string)$percentage);
-                    $this->database->updateDocument('videos_renditions', $query->getId(), $query);
-                    $this->send($query, 'update');
-                }
-            });
-
-            $this->transcode($media, $format, $representation);
-
-            unset($media);
-
-            //exec('/usr/bin/ffmpeg -y -i /usr/src/code/tests/tmp/637f59c88f9ff0fe3b1f/637e1b82aeab8980400e/in/637f59ab5bce0e36d05e.mp4 -c:v libx264 -c:a aac -bf 1 -keyint_min 25 -g 250 -sc_threshold 40 -use_timeline 0 -use_template 0 -seg_duration 10 -hls_playlist 0 -f dash -dn -sn -vf scale=iw:-2:force_original_aspect_ratio=increase,setsar=1:1 -b_strategy 1 -bf 3 -force_key_frames "expr:gte(t,n_forced*2)" -map 0 -s:v:0 1024x576 -b:v:0 2538k -b:a:0 128k -strict -2 -threads 12 /usr/src/code/tests/tmp/637f59c88f9ff0fe3b1f/637e1b82aeab8980400e/out/637f59c88f9ff0fe3b1f.mpd2>&1', $o, $v);
-            //var_dump($o);
-            //var_dump($v);
-
-            $path = $this->getVideoDevice($this->project->getId())->getPath($this->video->getId()) . '/' . $this->renditionName . '-' . $query->getId() . '/';
-
-            if ($this->args['output'] === self::OUTPUT_HLS) {
-                $streams = $this->getHlsSegmentsUrls($this->outDir . 'master.m3u8');
-                foreach ($streams as $stream) {
-                    $m3u8 = $this->getSegments($this->outDir . $stream['path']);
-                    if (!empty($m3u8['segments'])) {
-                        foreach ($m3u8['segments'] as $segment) {
-                            $this->database->createDocument('videos_renditions_segments', new Document([
-                                'renditionId' => $query->getId(),
-                                'renditionInternalId' => $query->getInternalId(),
-                                'streamId' => (int)$stream['id'],
-                                'fileName' => $segment['fileName'],
-                                'path' => $path,
-                                'duration' => $segment['duration'],
-                            ]));
-                        }
-                    }
-
-                    $query->setAttribute('metadata', json_encode(['hls' => $streams]));
-                    $query->setAttribute('targetDuration', $m3u8['targetDuration']);
-                }
-            } else {
-                $mpd = $this->getSegments($this->outPath . '.mpd');
-
-                if (!empty($mpd['segments'])) {
-                    foreach ($mpd['segments'] as $segment) {
-                        $this->database->createDocument('videos_renditions_segments', new Document([
-                            'renditionId' => $query->getId(),
-                            'renditionInternalId' => $query->getInternalId(),
-                            'streamId' => $segment['streamId'],
-                            'fileName' => $segment['fileName'],
-                            'path' => $path,
-                            'isInit' => $segment['isInit'],
-                        ]));
-                    }
-                }
-
-                if (!empty($mpd['metadata'])) {
-                    $query->setAttribute('metadata', json_encode(['mpd' => $mpd['metadata']]));
-                }
-            }
-
-            $query->setAttribute('status', self::STATUS_END);
-            $query->setAttribute('endedAt', DateTime::now());
-            $this->database->updateDocument('videos_renditions', $query->getId(), $query);
-            $this->send($query, 'update');
-
-            console::info('Rendition ' . $query->getId() . ' conversion, done');
-
-            /**
-             * Upload
-             */
-            $dir = new DirectoryIterator($this->outDir);
-            foreach ($dir as $fileinfo) {
-                if (!$fileinfo->isDot()) {
-                    $data = (new Local('/'))->read($this->outDir . $fileinfo->getFilename());
-
-                    console::info('Uploading ' . $fileinfo->getFilename());
-
-                    $this->getVideoDevice($this->project->getId())->write(
-                        $path . $fileinfo->getFilename(),
-                        $data,
-                        mime_content_type($this->outDir . $fileinfo->getFilename())
-                    );
-
-                    if ($fileinfo->key() === 0) {
-                        $query->setAttribute('progress', '100');
-                        $query->setAttribute('status', self::STATUS_UPLOADING);
-                        $query->setAttribute('path', $path);
-                        $this->database->updateDocument('videos_renditions', $query->getId(), $query);
-                        $this->send($query, 'update');
-                    }
-                }
-            }
-
-            $query->setAttribute('status', self::STATUS_READY);
-            $this->database->updateDocument('videos_renditions', $query->getId(), $query);
-            $this->send($query, 'update');
-        } catch (\Throwable $th) {
-            $query->setAttribute('metadata', json_encode([
-                'code' => $th->getCode(),
-                'message' => substr($th->getMessage(), 0, 255),
-            ]));
-
-            $query->setAttribute('status', self::STATUS_ERROR);
-            $this->database->updateDocument('videos_renditions', $query->getId(), $query);
-            $this->send($query, 'update');
-
-            console::error('Error video id:' . $this->video->getId() . PHP_EOL
-                . 'Message: ' . $th->getMessage() . PHP_EOL
-                . 'File: ' . $th->getFile() . PHP_EOL
-                . 'line: ' . $th->getLine() . PHP_EOL);
-        }
-    }
-
-
-    /**
-     * Create media Info
-     *
-     * @throws Authorization
-     * @throws Structure
-     * @throws Throwable
-     */
-    private function createInfo(): void
-    {
-
-        $mediaInfo = new MediaInfo();
-        $mediaInfoContainer = $mediaInfo->getInfo($this->inPath);
-        $general = $mediaInfoContainer->getGeneral();
-        $this->video
-            ->setAttribute('duration', $general->has('duration') ? $general->get('duration')->getMilliseconds() : 0)
-            ->setAttribute('format', $general->has('format') ? $general->get('format')->getShortName() : '');
-
-        foreach ($mediaInfoContainer->getVideos() ?? [] as $video) {
-            $this->video
-                ->setAttribute('height', $video->has('height') ? $video->get('height')->getAbsoluteValue() : 0)
-                ->setAttribute('width', $video->has('width') ? $video->get('width')->getAbsoluteValue() : 0)
-                ->setAttribute('aspectRatio', $video->has('display_aspect_ratio') ? $video->get('display_aspect_ratio')->getTextValue() : '')
-                ->setAttribute('videoFormat', $video->has('format') ? $video->get('format')->getShortName() : '')
-                ->setAttribute('videoFormatProfile', $video->has('format_profile') ? $video->get('format_profile') : '')
-                ->setAttribute('videoFrameRate', $video->has('frame_rate') ? strval($video->get('frame_rate')->getAbsoluteValue()) : '')
-                ->setAttribute('videoFrameRateMode', $video->has('frame_rate_mode') ? $video->get('frame_rate_mode')->getFullName() : '')
-                ->setAttribute('videoBitRate', $video->has('bit_rate') ? $video->get('bit_rate')->getAbsoluteValue() : 0);
-        }
-
-        foreach ($mediaInfoContainer->getAudios() ?? [] as $audio) {
-            $this->video
-                ->setAttribute('audioFormat', $audio->has('format') ? strval($audio->get('format')->getShortName()) : '')
-                ->setAttribute('audioSampleRate', $audio->has('sampling_rate') ? strval($audio->get('sampling_rate')->getAbsoluteValue()) : '')
-                ->setAttribute('audioBitRate', $audio->has('bit_rate') ? $audio->get('bit_rate')->getAbsoluteValue() : 0);
-        }
-
-        console::info('Input video id: ' . $this->video->getId() . PHP_EOL .
-            'Input name: ' . $this->file->getAttribute('name') . PHP_EOL .
-            'Input width: ' . $this->video->getAttribute('width') . ' px' . PHP_EOL .
-            'Input height: ' . $this->video->getAttribute('height') . ' px' . PHP_EOL .
-            'Input duration: ' . ($this->video->getAttribute('duration') / 1000) . ' Sec' . PHP_EOL .
-            'Input size: ' . ($this->video->getAttribute('size') / 1024 / 1024) . ' MiB' . PHP_EOL .
-            'Input videoBitRate: ' . ($this->video->getAttribute('videoBitRate') / 1000) . ' kb/s' . PHP_EOL .
-            'Input audioBitRate: ' . ($this->video->getAttribute('audioBitRate') / 1000) . ' kb/s' . PHP_EOL);
-
-        $this->database->updateDocument(
-            'videos',
-            $this->video->getId(),
-            new document(
-                array_filter((array)$this->video, fn($value) => !is_null($value))
-            ),
-        );
-    }
-
-    /**
-     * Transcode
-     *
-     * @param $media Media
-     * @param $format StreamFormat
-     * @param $representation Representation
-     * @return void
-     */
-    private function transcode(Media $media, StreamFormat $format, Representation $representation): void
-    {
-
-        $additionalParams = [
-            '-dn',
-            '-sn',
-            '-vf', 'scale=iw:-2:force_original_aspect_ratio=increase,setsar=1:1', //keep frame size
-            '-crf',  '22', // constant rate factor
-            '-bf', '3', // bframe
-            '-force_key_frames', 'expr:gte(t,n_forced*2)' //enforce strict key frame
-        ];
-
-        $segmentSize = 6;
-        if ($this->args['output'] === self::OUTPUT_DASH) {
-               $media->dash()
-                ->setFormat($format)
-                ->setSegDuration($segmentSize)
-                ->addRepresentation($representation)
-                ->setAdditionalParams($additionalParams)
-                ->save($this->outPath);
-               return;
-        }
-
-        $media->hls()
-            ->setFormat($format)
-            ->setHlsTime($segmentSize)
-            ->addRepresentation($representation)
-            ->setAdditionalParams($additionalParams)
-            ->save($this->outPath);
-    }
-
-    /**
-     * Get HLS|DASH segments
-     *
-     * @param string $path
-     * @return array
-     */
-    private function getSegments(string $path): array
-    {
-
-        $segments = [];
-        if ($this->args['output'] === self::OUTPUT_DASH) {
-            $metadata = null;
-            $handle = fopen($path, "r");
-            if ($handle) {
-                $streamId = -1;
-                while (($line = fgets($handle)) !== false) {
-                    $line = str_replace([",", "\r", "\n"], "", $line);
-                    if (str_contains($line, "<AdaptationSet")) {
-                        $streamId++;
-                    }
-
-                    if (!str_contains($line, "SegmentURL") && !str_contains($line, "Initialization")) {
-                        $metadata .= $line . PHP_EOL;
-                    } else {
-                        $segments[] = [
-                            'isInit' => str_contains($line, "Initialization") ? 1 : 0,
-                            'streamId' => $streamId,
-                            'fileName' => trim(str_replace(["<SegmentURL media=\"", "<Initialization sourceURL=\"", "\"/>", "\" />"], "", $line)),
-                        ];
-                    }
-                }
-                fclose($handle);
-            }
-
-            return [
-                'metadata' => $metadata,
-                'segments' => $segments
-            ];
-        }
-
-        $targetDuration = 0;
-        $handle = fopen($path, "r");
-        if ($handle) {
-            while (($line = fgets($handle)) !== false) {
-                $line =  str_replace([",","\r","\n"], "", $line);
-                if (str_contains($line, "#EXT-X-TARGETDURATION")) {
-                    $targetDuration = str_replace(["#EXT-X-TARGETDURATION:"], "", $line);
-                }
-                if (str_contains($line, "#EXTINF")) {
-                    $duration = str_replace(["#EXTINF:"], "", $line);
-                }
-                if (str_contains($line, ".ts") || str_contains($line, ".vtt")) {
-                    if (!empty($duration)) {
-                        $segments[] = [
-                            'fileName' => $line,
-                            'duration' => $duration
-                        ];
-                        $duration = null;
-                    }
-                }
-            }
-            fclose($handle);
-        }
-        return [
-            'targetDuration' => $targetDuration,
-            'segments' => $segments
-        ];
-    }
-
-
-    /**
-     * Get HLS segments urls
-     *
-     * @param string $path
-     * @return array
-     */
-    private function getHlsSegmentsUrls(string $path): array
-    {
-
-        $files = [];
-        $handle = fopen($path, "r");
-        if ($handle) {
-            while (($line = fgets($handle)) !== false) {
-                $tmp = [];
-                $line = str_replace(['"'], '', $line);
-                $attributes = explode(',', $line);
-                foreach ($attributes as $key => $attribute) {
-                    $parts = explode('=', $attribute);
-                    switch (true) {
-                        case str_contains($parts[0], 'LANGUAGE'):
-                            $attr['language'] = $parts[1];
-                            break;
-                        case str_contains($parts[0], 'BANDWIDTH'):
-                            $attr['bandwidth'] = $parts[1];
-                            break;
-                        case str_contains($parts[0], 'RESOLUTION'):
-                            $attr['resolution'] = $parts[1];
-                            break;
-                        case str_contains($parts[0], 'CODECS'):
-                            $attr['codecs'] = trim($parts[1], " \n\r\t\v\x00");
-
-                            if (!empty($attributes[$key + 1])) {
-                                $attr['codecs'] .= ',' . trim($attributes[$key + 1], " \n\r\t\v\x00");
-                            }
-                            break;
-                    }
-                }
-
-                $end = strpos($line, 'm3u8');
-                if ($end !== false) {
-                    $start = strpos($line, $this->video->getId());
-                    if ($start !== false) {
-                        $path = substr($line, $start, ($end - $start) + 4);
-                        $parts = explode('_', $path);
-                        $tmp = [
-                            'id' => $parts[1],
-                            'path' => $path
-                        ];
-                        if (str_contains($line, "TYPE=AUDIO")) {
-                            $tmp['type'] = 'audio';
-                            if (!empty($attr['language'])) {
-                                $tmp['language'] = $attr['language'];
-                            }
-                        } else {
-                            $tmp['type'] = 'video';
-                            if (!empty($attr['resolution'])) {
-                                $tmp['resolution'] = $attr['resolution'];
-                            }
-                            if (!empty($attr['bandwidth'])) {
-                                $tmp['bandwidth'] = $attr['bandwidth'];
-                            }
-                            if (!empty($attr['codecs'])) {
-                                $tmp['codecs'] = $attr['codecs'];
-                            }
-                        }
-                    }
-                    $files[] = $tmp;
-                }
-            }
-            fclose($handle);
-        }
-        return $files;
-    }
-
-    /**
-     * Send
-     *
-     * @param string $action
-     * @param Document $payload
-     * @throws Exception|\Exception
-     */
-    private function send(Document $payload, string $action = 'create')
-    {
-        unset($payload['metadata']);
-
-        $allEvents = Event::generateEvents('videos.[videoId].renditions.[renditionId].' . $action, [
-            'videoId'     => $payload['videoId'],
-            'renditionId' => $payload->getId()
-        ]);
-
-        $payload->setAttribute('$permissions', $this->bucket->getAttribute('fileSecurity', false)
-            ? \array_merge($this->bucket->getAttribute('$permissions'), $this->file->getAttribute('$permissions'))
-            : $this->bucket->getAttribute('$permissions'));
-
-        $target = Realtime::fromPayload(
-            event: $allEvents[0],
-            payload: $payload
-        );
-
-        Realtime::send(
-            projectId: 'console',
-            payload: $payload->getArrayCopy(),
-            events: $allEvents,
-            channels: $target['channels'],
-            roles: $target['roles']
-        );
-    }
-
-
-    /**
-     * Download
-     *
-     * @param $project Document
-     * @param $file Document
-     * @throws \Exception
-     */
-    private function download(Document $project, Document $file)
-    {
-
-        $fullPath = $file->getAttribute('path');
-        $path = basename($file->getAttribute('path'));
-
-        console::info('Downloading file: ' . $path . ' to local storage ' . $this->inDir);
-
-        $local = new Local('/');
-        try {
-            if (
-                !empty($file->getAttribute('openSSLCipher')) ||
-                $file->getAttribute('algorithm', 'none') !== 'none'
-            ) {
-                $data = $this->getFilesDevice($project->getId())->read($fullPath);
-                if (!empty($file->getAttribute('openSSLCipher'))) {
-                    $data = OpenSSL::decrypt(
-                        $data,
-                        $file->getAttribute('openSSLCipher'),
-                        App::getEnv('_APP_OPENSSL_KEY_V' . $file->getAttribute('openSSLVersion')),
-                        0,
-                        \hex2bin($file->getAttribute('openSSLIV')),
-                        \hex2bin($file->getAttribute('openSSLTag'))
-                    );
-                }
-
-                $algorithm = $file->getAttribute('algorithm', 'none');
-                switch ($algorithm) {
-                    case 'zstd':
-                        $compressor = new Zstd();
-                        $data = $compressor->decompress($data);
-                        break;
-                    case 'gzip':
-                        $compressor = new GZIP();
-                        $data = $compressor->decompress($data);
-                        break;
-                }
-                $local->
-                    write($this->inDir . $path, $data, $file->getAttribute('mimeType'));
-            } else {
-                $this->getFilesDevice(
-                    $project->getId()
-                )->transfer($fullPath, $this->inDir . $path, $local);
-            }
-        } catch (\Throwable $th) {
-            console::error($th->getMessage() . ' on file: ' . $th->getFile() . ' line: ' . $th->getLine);
-        }
-    }
-
-    private function cleanup(): bool
-    {
-        $stdout = '';
-        $stderr = '';
-        $stdin = '';
-
-        return Console::execute("rm -rf {$this->basePath}", $stdin, $stdout, $stderr, 3) === 0;
-    }
-
-    public function shutdown(): void
-    {
-        $result = $this->cleanup();
-        if (!$result) {
-            Console::error('Failed Removing files from [' . $this->basePath . ']');
-        }
-        Console::info('Removing files from [' . $this->basePath . ']');
-    }
-}
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z "$_APP_REDIS_USER" ] && [ -z "$_APP_REDIS_PASS" ]
-then
-    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
-else
-    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
-fi
-
-INTERVAL=0.1 QUEUE='v1-videos' APP_INCLUDE='/usr/src/code/app/workers/videos.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
@@ -41,54 +41,46 @@
        "ext-openssl": "*",
        "ext-zlib": "*",
        "ext-sockets": "*",
-        "ext-fileinfo": "*",
        "appwrite/php-clamav": "1.1.*",
        "appwrite/php-runtimes": "0.11.*",
-        "utopia-php/abuse": "0.25.*",
+        "utopia-php/abuse": "0.18.*",
        "utopia-php/analytics": "0.2.*",
-        "utopia-php/audit": "0.26.*",
+        "utopia-php/audit": "0.20.*",
        "utopia-php/cache": "0.8.*",
        "utopia-php/cli": "0.13.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.36.*",
+        "utopia-php/database": "0.30.*",
+        "utopia-php/preloader": "0.2.*",
        "utopia-php/domains": "1.1.*",
-        "utopia-php/framework": "0.28.*",
+        "utopia-php/framework": "0.26.*",
        "utopia-php/image": "0.5.*",
        "utopia-php/locale": "0.4.*",
        "utopia-php/logger": "0.3.*",
        "utopia-php/messaging": "0.1.*",
        "utopia-php/orchestration": "0.6.*",
-        "utopia-php/preloader": "0.2.*",
        "utopia-php/registry": "0.5.*",
-        "utopia-php/storage": "dev-feat-transfer as 0.13.2",
+        "utopia-php/storage": "0.13.*",
        "utopia-php/swoole": "0.5.*",
        "utopia-php/websocket": "0.1.*",
        "resque/php-resque": "1.3.6",
-        "matomo/device-detector": "6.0.*",
+        "matomo/device-detector": "6.0.0",
        "dragonmantank/cron-expression": "3.3.1",
        "influxdb/influxdb-php": "1.15.2",
        "phpmailer/phpmailer": "6.6.0",
        "chillerlan/php-qrcode": "4.3.3",
        "adhocore/jwt": "1.1.2",
        "slickdeals/statsd": "3.1.0",
-        "aminyazdanpanah/php-ffmpeg-video-streaming": "dev-master",
-        "captioning/captioning": "2.*",
-        "ext-simplexml": "*",
-        "webonyx/graphql-php": "14.11.*",
-        "mhor/php-mediainfo": "5.4.3"
+        "webonyx/graphql-php": "14.11.*"
    },
    "repositories": [
        {
            "url": "https://github.com/appwrite/runtimes.git",
            "type": "git"
-        },
-        {
-            "url": "https://github.com/shimonewman/PHP-FFmpeg-video-streaming.git",
-            "type": "git"
        }
    ],
    "require-dev": {
-        "appwrite/sdk-generator": "dev-shimon-video-test",
+        "appwrite/sdk-generator": "0.29.*",
+        "ext-fileinfo": "*",
        "phpunit/phpunit": "9.5.20",
        "squizlabs/php_codesniffer": "^3.6",
        "swoole/ide-helper": "4.8.9",
@@ -1,4 +1,4 @@
 <?php

 echo 'execute init_file success' . PHP_EOL;
-Yasd\Api\setRemoteHost('host.docker.internal'); //Set your development machine's IP
+Yasd\Api\setRemoteHost('127.0.0.1'); //Set your development machine's IP
@@ -73,7 +73,6 @@ services:
      - traefik.http.routers.appwrite_api_https.tls=true
    volumes:
      - appwrite-uploads:/storage/uploads:rw
-      - appwrite-videos:/storage/videos:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-config:/storage/config:rw
      - appwrite-certificates:/storage/certificates:rw
@@ -84,10 +83,6 @@ services:
      - ./docs:/usr/src/code/docs
      - ./public:/usr/src/code/public
      - ./src:/usr/src/code/src
-      - ./dev:/usr/src/code/dev
-      - ./dev:/usr/local/dev
-      - ./tests/tmp:/tmp
-      - ./vendor/utopia-php/storage:/usr/src/code/vendor/utopia-php/storage
    depends_on:
      - mariadb
      - redis
@@ -229,65 +224,6 @@ services:
      - _APP_LOGGING_PROVIDER
      - _APP_LOGGING_CONFIG

-  appwrite-worker-videos:
-    entrypoint: worker-videos
-    <<: *x-logging
-    container_name: appwrite-worker-videos
-    build:
-      context: .
-    networks:
-      - appwrite
-    volumes:
-      - ./app:/usr/src/code/app
-      - ./src:/usr/src/code/src
-      - appwrite-uploads:/storage/uploads:rw
-      - appwrite-videos:/storage/videos:rw
-      #- ./tests:/usr/src/code/tests #TODO remove when done!!
-      - ./vendor/aminyazdanpanah/php-ffmpeg-video-streaming:/usr/src/code/vendor/aminyazdanpanah/php-ffmpeg-video-streaming #TODO remove when done!!
-      - ./vendor/php-ffmpeg/php-ffmpeg:/usr/src/code/vendor/php-ffmpeg/php-ffmpeg #TODO remove when done!!
-      - ./vendor/alchemy/binary-driver:/usr/src/code/vendor/alchemy/binary-driver
-      - ./vendor/utopia-php/storage:/usr/src/code/vendor/utopia-php/storage
-      #- ./vendor/symfony/process:/usr/src/code/vendor/symfony/process
-
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_OPENSSL_KEY_V1
-      - _APP_STORAGE_DEVICE
-      - _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
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_LOGGING_PROVIDER
-      - _APP_LOGGING_CONFIG
-
  appwrite-worker-audits:
    entrypoint: worker-audits
    <<: *x-logging
@@ -353,7 +289,6 @@ services:
      - mariadb
    volumes: 
      - appwrite-uploads:/storage/uploads:rw
-      - appwrite-videos:/storage/videos:rw
      - appwrite-cache:/storage/cache:rw
      - appwrite-functions:/storage/functions:rw
      - appwrite-builds:/storage/builds:rw
@@ -408,6 +343,7 @@ services:
    volumes: 
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
+      #- ./vendor/utopia-php/database:/usr/src/code/vendor/utopia-php/database
    depends_on:
      - redis
      - mariadb
@@ -537,7 +473,6 @@ services:
      - /var/run/docker.sock:/var/run/docker.sock
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
-      - ./dev:/usr/src/code/dev
      - appwrite-functions:/storage/functions:rw
      - appwrite-builds:/storage/builds:rw
      - /tmp:/tmp:rw
@@ -910,7 +845,6 @@ volumes:
  appwrite-redis:
  appwrite-cache:
  appwrite-uploads:
-  appwrite-videos:
  appwrite-certificates:
  appwrite-functions:
  appwrite-builds:
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
        setContentView(R.layout.activity_main);

        Client client = new Client(getApplicationContext())
-            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
            .setProject("5df5acd0d48c2"); // Your project ID

        Account account = new Account(client);
--- a/Show More
+++ b/Show More