fix installer wizard for dev images

.claude/skills/patch-release-checklist/SKILL.md

@@ -1,29 +0,0 @@
-# Patch Release Checklist for Appwrite
-
-When bumping a patch version (e.g., `1.9.0` -> `1.9.1`), follow this checklist.
-
-## Checklist
-
-### Bump console image
-
-Update the console Docker image tag in both files:
-- [ ] `docker-compose.yml` -- update `image: appwrite/console:X.Y.Z`
-- [ ] `app/views/install/compose.phtml` -- update `image: <?php echo $organization; ?>/console:X.Y.Z`
-
-### Bump Appwrite version
-
-- [ ] **`app/init/constants.php`** -- update `APP_VERSION_STABLE` to the new version (e.g., `'1.9.1'`). In same file, increment `APP_CACHE_BUSTER` by 1.
-- [ ] **`README.md`** -- update the Docker image tag `appwrite/appwrite:X.Y.Z` in all 3 install code blocks (Unix, Windows CMD, PowerShell).
-- [ ] **`README-CN.md`** -- same Docker image tag update in all 3 install code blocks.
-- [ ] **`src/Appwrite/Migration/Migration.php`** -- add the new version to the `$versions` array, mapping it to a migration class. If new class exists, use that, otherwise use sle same class as previous version
-
-### Update CHANGES.md
-
-- [ ] Add a new `# Version X.Y.Z` section at the top of `CHANGES.md` with subsections: `### Notable changes`, `### Fixes`, `### Miscellaneous`
-
-## Final review
-
-- [ ] Ask user to review changes before commiting
-- [ ] Ask user to update `CHANGES.md` with PRs
-- [ ] Ask user to generate specs, if needed
-- [ ] Ask user to add request and response filters, if needed

.env

@@ -39,7 +39,7 @@ _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
 _APP_REDIS_PASS=
 _APP_REDIS_USER=
-COMPOSE_PROFILES=mariadb,mongodb,postgresql
+COMPOSE_PROFILES=mongodb
 _APP_DB_ADAPTER=mongodb
 _APP_DB_HOST=mongodb
 _APP_DB_PORT=27017
@@ -47,15 +47,6 @@ _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
 _APP_DB_ROOT_PASS=rootsecretpassword
-_APP_DB_ADAPTER_DOCUMENTSDB=mongodb
-_APP_DB_HOST_DOCUMENTSDB=mongodb
-_APP_DB_PORT_DOCUMENTSDB=27017
-_APP_DB_ADAPTER_VECTORSDB=postgresql
-_APP_DB_HOST_VECTORSDB=postgresql
-_APP_DB_PORT_VECTORSDB=5432
-_APP_EMBEDDING_MODELS=embeddinggemma
-_APP_EMBEDDING_ENDPOINT='http://ollama:11434/api/embed'
-_APP_EMBEDDING_TIMEOUT=30000
 _APP_STORAGE_DEVICE=Local
 _APP_STORAGE_S3_ACCESS_KEY=
 _APP_STORAGE_S3_SECRET=

.github/workflows/ci.yml

@@ -150,37 +150,8 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --ignore-platform-reqs
 
-      - name: Cache PHPStan result cache
-        uses: actions/cache@v4
-        with:
-          path: .phpstan-cache
-          key: phpstan-${{ github.sha }}
-          restore-keys: |
-            phpstan-
-
       - name: Run PHPStan
-        run: composer analyze -- --no-progress
-
-  specs:
-    name: Checks / Specs
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v6
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: '8.3'
-          extensions: swoole
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --ignore-platform-reqs
-
-      - name: Generate specs
-        run: _APP_STORAGE_LIMIT=5368709120 php app/cli.php specs --version=latest --git=no
+        run: composer analyze
 
   locale:
     name: Checks / Locale
@@ -423,8 +394,7 @@ jobs:
           Webhooks,
           VCS,
           Messaging,
-          Migrations,
-          Project
+          Migrations
         ]
         include:
           - service: Databases
@@ -480,10 +450,6 @@ jobs:
           _APP_BROWSER_HOST: http://invalid-browser/v1
           _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
           _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'vectorsdb_db_main' || '' }}
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
@@ -512,7 +478,7 @@ jobs:
             # Services that rely on sequential test method execution (shared static state)
             FUNCTIONAL_FLAG="--functional"
             case "${{ matrix.service }}" in
-              Databases|TablesDB|Functions|Realtime|GraphQL) FUNCTIONAL_FLAG="" ;;
+              Databases|TablesDB|Functions|Realtime) FUNCTIONAL_FLAG="" ;;
             esac
 
             docker compose exec -T \
@@ -558,10 +524,6 @@ jobs:
           _APP_OPTIONS_ABUSE: enabled
           _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
           _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'vectorsdb_db_main' || '' }}
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable
@@ -619,10 +581,6 @@ jobs:
         env:
           _APP_DATABASE_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'database_db_main' || '' }}
           _APP_DATABASE_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'database_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'documentsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES: ${{ matrix.mode != 'dedicated' && 'vectorsdb_db_main' || '' }}
-          _APP_DATABASE_VECTORSDB_SHARED_TABLES_V1: ${{ matrix.mode == 'shared_v1' && 'vectorsdb_db_main' || '' }}
         run: |
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose pull --quiet --ignore-buildable

.github/workflows/nightly.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Build the Docker image
         run: DOCKER_BUILDKIT=1 docker build . --target production -t appwrite_image:latest
       - name: Run Trivy vulnerability scanner on image
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@0.20.0
         with:
           image-ref: 'appwrite_image:latest'
           format: 'sarif'
@@ -35,7 +35,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v6
       - name: Run Trivy vulnerability scanner on filesystem
-        uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
+        uses: aquasecurity/trivy-action@0.20.0
         with:
           scan-type: 'fs'
           format: 'sarif'

.gitignore

@@ -21,7 +21,6 @@ appwrite.config.json
 /app/config/specs/
 /docs/examples/
 .phpunit.cache
-.phpstan-cache
 playwright-report
 test-results
 docker-compose.web-installer.yml

AGENTS.md

@@ -1,124 +1,107 @@
-# Appwrite
+# AGENTS.md
 
-Self-hosted Backend-as-a-Service platform. Hybrid monolithic-microservice architecture built with PHP 8.3+ on Swoole, delivered as Docker containers.
+Appwrite is an end-to-end backend server for web, mobile, native, and backend apps. This guide provides context and instructions for AI coding agents working on the Appwrite codebase.
 
-## Commands
+## Project Overview
 
-| Command | Purpose |
-|---------|---------|
-| `docker compose up -d --force-recreate --build` | Build and start all services |
-| `docker compose exec appwrite test tests/e2e/Services/[Service]` | Run E2E tests for a service |
-| `docker compose exec appwrite test tests/e2e/Services/[Service] --filter=[Method]` | Run a single test method |
-| `docker compose exec appwrite test tests/unit/` | Run unit tests |
-| `composer format` | Auto-format code (Pint, PSR-12) |
-| `composer format <file>` | Format a specific file |
-| `composer lint <file>` | Check formatting of a file |
-| `composer analyze` | Static analysis (PHPStan level 3) |
-| `composer check` | Same as `analyze` |
+Appwrite is a self-hosted Backend-as-a-Service (BaaS) platform that provides developers with a set of APIs and tools to build secure, scalable applications. The project uses a hybrid monolithic-microservice architecture built with PHP, running on Swoole for high performance.
 
-## Stack
+**Key Technologies:**
+- **Backend:** PHP 8.3+, Swoole
+- **Libraries:** Utopia PHP
+- **Database:** MariaDB, Redis
+- **Cache:** Redis
+- **Queue:** Redis
+- **Containers:** Docker
 
-- PHP 8.3+, Swoole 6.x (async runtime, replaces PHP-FPM)
-- Utopia PHP framework (HTTP routing, CLI, DI, queue)
-- MongoDB (default), MariaDB, MySQL, PostgreSQL (adapters via utopia-php/database)
-- Redis (cache, queue, pub/sub)
-- Docker + Traefik (reverse proxy)
-- PHPUnit 12, Pint (PSR-12), PHPStan level 3
+## Development Commands
 
-## Project layout
+```bash
+# Run Appwrite
+docker compose up -d --force-recreate --build
 
-- **src/Appwrite/Platform/Modules/** -- feature modules (Account, Avatars, Compute, Console, Databases, Functions, Health, Project, Projects, Proxy, Sites, Storage, Teams, Tokens, VCS, Webhooks)
-- **src/Appwrite/Platform/Workers/** -- background job workers
-- **src/Appwrite/Platform/Tasks/** -- CLI tasks
-- **app/init.php** -- bootstrap (registers services, resources, listeners)
-- **app/init/** -- configs, constants, locales, models, registers, resources, span, database filters/formats
-- **bin/** -- CLI entry points: `worker-*` (14 workers), `schedule-*`, `queue-*`, plus `doctor`, `install`, `migrate`, `realtime`, `upgrade`, `ssl`, `vars`, `maintenance`, `interval`, `specs`, `sdks`, etc.
-- **tests/e2e/** -- end-to-end tests per service
-- **tests/unit/** -- unit tests
-- **public/** -- static assets and generated SDKs
+# Run specific test
+docker compose exec appwrite test /usr/src/code/tests/e2e/Services/[ServiceName] --filter=[FunctionName]
 
-## Module structure
-
-Each module under `src/Appwrite/Platform/Modules/{Name}/` contains:
-
-```
-Module.php           -- registers all services for the module
-Services/Http.php    -- registers HTTP endpoints
-Services/Workers.php -- registers background workers
-Services/Tasks.php   -- registers CLI tasks
-Http/{Service}/      -- endpoint actions (Create.php, Get.php, Update.php, Delete.php, XList.php)
-Workers/             -- worker implementations
-Tasks/               -- CLI task implementations
+# Format code
+composer format
 ```
 
-HTTP endpoint nesting reflects the URL path. Sub-resources get subdirectories. For example, within the Functions module:
-`Http/Deployments/Template/Create.php` -> `POST /v1/functions/:functionId/deployments/template`
+## Code Style Guidelines
 
-File names in Http directories must only be `Get.php`, `Create.php`, `Update.php`, `Delete.php`, or `XList.php`. For non-CRUD operations, model the endpoint as a property update. For example, updating a team membership status lives at `Teams/Http/Memberships/Status/Update.php` (`PATCH /v1/teams/:teamId/memberships/:membershipId/status`).
+- Follow [PSR-12](https://www.php-fig.org/psr/psr-12/) coding standard
+- Use PSR-4 autoloading
+- Strict type declarations where applicable
+- Comprehensive PHPDoc comments
 
-Register new modules in `src/Appwrite/Platform/Appwrite.php`. Detailed module guide: `src/Appwrite/Platform/AGENTS.md`.
+### Naming Conventions
 
-## Action pattern (HTTP endpoints)
+#### `resourceType` Naming Rule
 
+When a collection has a combination of `resourceType`, `resourceId`, and/or `resourceInternalId`, the value of `resourceType` MUST always be **plural** - for example: `functions`, `sites`, `deployments`.
+
+Examples:
 ```php
-class Create extends Action
-{
-    public static function getName(): string { return 'createTeam'; }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/teams')
-            ->desc('Create team')
-            ->groups(['api', 'teams'])
-            ->label('event', 'teams.[teamId].create')
-            ->label('scope', 'teams.write')
-            ->param('teamId', '', new CustomId(), 'Team ID.')
-            ->param('name', null, new Text(128), 'Team name.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForEvents')
-            ->callback($this->action(...));
-    }
-
-    public function action(
-        string $teamId,
-        string $name,
-        Response $response,
-        Database $dbForProject,
-        Event $queueForEvents,
-    ): void {
-        // implementation
-    }
-}
+'resourceType' => 'functions'
+'resourceType' => 'sites'
+'resourceType' => 'deployments'
 ```
 
-Common injections: `$response`, `$request`, `$dbForProject`, `$dbForPlatform`, `$user`, `$project`, `$queueForEvents`, `$queueForMails`, `$queueForDeletes`.
+## Performance Patterns
 
-## Conventions
+### Document Update Optimization
 
-- PSR-12 formatting enforced by Pint. PSR-4 autoloading.
-- `resourceType` values are always **plural**: `'functions'`, `'sites'`, `'deployments'`.
-- When updating documents, pass only changed attributes as a sparse Document:
-  ```php
-  // correct
-  $dbForProject->updateDocument('users', $user->getId(), new Document([
-      'name' => $name,
-  ]));
-  // incorrect -- passing full document is inefficient
-  $user->setAttribute('name', $name);
-  $dbForProject->updateDocument('users', $user->getId(), $user);
-  ```
-  Exceptions: migrations, `array_merge()` with `getArrayCopy()`, updates where nearly all attributes change, complex nested relationship logic requiring full document state.
-- Avoid introducing dependencies outside the `utopia-php` ecosystem.
-- Never hardcode credentials -- use environment variables.
-- Code changes may require container restart. No central log location -- check relevant containers.
+When updating documents, always pass only the changed attributes as a sparse `Document` rather than the full document. This is more efficient because `updateDocument()` internally performs `array_merge($old, $new)`.
 
-## Patch release process
+**Correct Pattern:**
+```php
+// Good: Pass only changed attributes directly
+$user = $dbForProject->updateDocument('users', $user->getId(), new Document([
+    'name' => $name,
+    'email' => $email,
+]));
+```
 
-For bumping patch versions (e.g., `1.9.0` -> `1.9.1`), follow the checklist in `.claude/skills/patch-release-checklist/SKILL.md`. It covers the 4 files that must be updated, console image bumps, CHANGES.md updates, and common pitfalls to avoid.
+**Incorrect Pattern:**
+```php
+$user->setAttribute('name', $name);
+$user->setAttribute('email', $email);
 
-## Cross-repo context
+// Bad: Passing full document is inefficient
+$user = $dbForProject->updateDocument('users', $user->getId(), $user);
+```
 
-Appwrite is the base server for `appwrite/cloud`. Changes to the Action pattern, module structure, DI system, or response models affect cloud. The `feat-dedicated-db` feature spans cloud, edge, and console.
+**Exceptions:**
+- Migration files (need full document updates by design)
+- Cases already using `array_merge()` with `getArrayCopy()`
+- Updates where almost all attributes of the document change at once (sparse update provides little benefit compared to passing the full document)
+- Complex nested relationship logic where full document state is required
+
+## Security Considerations
+
+### Critical Security Practices
+
+- **Never hardcode credentials** - Use environment variables
+- **Rate limiting** - Respect abuse prevention mechanisms
+
+## Dependencies
+
+Avoid introducing new dependencies other than utopia-php.
+
+## Adding new endpoints
+
+When adding new endpoints, make sure to use modules and follow its patterns. Find instruction in [Modules AGENTS.md](src/Appwrite/Platform/AGENTS.md) file.
+
+## Pull Request Guidelines
+### Before Submitting
+
+-  Run `composer format`
+- Update documentation if adding features
+- Add/update tests for your changes
+- Check that Docker build succeeds
+`docs/specs/authentication.drawio.svg`
+
+## Known Issues and Gotchas
+
+- **Hot Reload:** Code changes require container restart in some cases
+- **Logging:** There is no central place for logs, so when debugging, ensure to check all possibly relevant containers

README-CN.md

@@ -72,7 +72,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.9.1
+    appwrite/appwrite:1.9.0
 ```
 
 ### Windows
@@ -84,7 +84,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.9.1
+    appwrite/appwrite:1.9.0
 ```
 
 #### PowerShell
@@ -94,7 +94,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.9.1
+    appwrite/appwrite:1.9.0
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -1,28 +1,43 @@
-<img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/55a81268-4ecc-46cd-bdf5-73f7e8662fee" />
+> We just announced DB operators for Appwrite Databases - [Learn more](https://appwrite.io/blog/post/announcing-db-operators)
+
+> Appwrite Cloud is now Generally Available - [Learn more](https://appwrite.io/cloud-ga)
+
+> [Get started with Appwrite](https://apwr.dev/appcloud)
 
 <br />
 <p align="center">
-    <h1>Appwrite</h1>
-    <b>Appwrite is an open-source, all-in-one development platform. Use built-in backend infrastructure and web hosting, all from a single place.</b>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner, with logo and text saying "The Developer's Cloud"></a>
+    <br />
+    <br />
+    <b>Appwrite is a best-in-class, developer-first platform that gives builders everything they need to create scalable, stable, and production-ready software, fast.</b>
     <br />
     <br />
 </p>
 
-[![Discord](https://img.shields.io/badge/chat-5865F2?style=flat-square&logo=discord&logoColor=white)](https://appwrite.io/discord)
-[![X](https://img.shields.io/badge/follow-000000?style=flat-square&logo=x&logoColor=white)](https://x.com/appwrite)
-[![Appwrite Cloud](https://img.shields.io/badge/Cloud-F02E65?style=flat-square&logo=icloud&logoColor=white)](https://cloud.appwrite.io)
+<!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
+
+[![We're Hiring label](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
+[![Hacktoberfest label](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
+[![Discord label](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
+[![Build Status label](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)
+[![X Account label](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
+
+<!-- [![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite) -->
+<!-- [![Translate](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md) -->
+<!-- [![Swag Store](https://img.shields.io/badge/swag%20store-f02e65?style=flat-square)](https://store.appwrite.io) -->
 
 English | [简体中文](README-CN.md)
 
-Appwrite is an open-source development platform for building web, mobile, and AI applications. It brings together backend infrastructure and web hosting in one place, so teams can build, ship, and scale without stitching together a fragmented stack. Appwrite is available as a managed cloud platform and can also be self-hosted on infrastructure you control.
+Appwrite is an end-to-end platform for building Web, Mobile, Native, or Backend apps, packaged as a set of Docker microservices. It includes both a backend server and a fully integrated hosting solution for deploying static and server-side rendered frontends. Appwrite abstracts the complexity and repetitiveness required to build modern apps from scratch and allows you to build secure, full-stack applications faster.
 
-With Appwrite, you can add authentication, databases, storage, functions, messaging, realtime capabilities, and integrated web app hosting through Sites. It is designed to reduce the repetitive backend work required to launch modern products while giving developers secure primitives and flexible APIs to build production-ready applications faster.
+Using Appwrite, you can easily integrate your app with user authentication and multiple sign-in methods, a database for storing and querying users and team data, storage and file management, image manipulation, Cloud Functions, messaging, and [more services](https://appwrite.io/docs).
 
-Find out more at [https://appwrite.io](https://appwrite.io).
+![Appwrite project dashboard showing various Appwrite features](public/images/github.png)
+
+Find out more at: [https://appwrite.io](https://appwrite.io).
 
 Table of Contents:
 
-- [Products](#products)
 - [Installation \& Setup](#installation--setup)
 - [Self-Hosting](#self-hosting)
   - [Unix](#unix)
@@ -32,31 +47,17 @@ Table of Contents:
   - [Upgrade from an Older Version](#upgrade-from-an-older-version)
 - [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
+  - [Products](#products)
   - [SDKs](#sdks)
     - [Client](#client)
     - [Server](#server)
+    - [Community](#community)
 - [Architecture](#architecture)
 - [Contributing](#contributing)
 - [Security](#security)
 - [Follow Us](#follow-us)
 - [License](#license)
 
-
-## Products
-
-- **[Appwrite Auth](https://appwrite.io/docs/products/auth)** - Secure user authentication with multiple login methods including email/password, SMS, OAuth, anonymous sessions, and magic links. Includes session management, multi-factor authentication, and user verification flows.
-
-- **[Appwrite Databases](https://appwrite.io/docs/products/databases)** - Scalable structured data storage with support for databases, tables, and rows. Includes querying, pagination, indexing, and relationships to model complex application data.
-
-- **[Appwrite Storage](https://appwrite.io/docs/products/storage)** - Secure file storage with support for uploads, downloads, encryption, compression, and file transformations for media and assets.
-
-- **[Appwrite Functions](https://appwrite.io/docs/products/functions)** - Serverless compute platform to run custom backend logic in isolated runtimes, triggered by events or scheduled jobs.15 runtimes supported.
-
-- **[Appwrite Messaging](https://appwrite.io/docs/products/messaging)** - Multi-channel messaging system for sending emails, SMS, and push notifications to users for engagement, alerts, and transactional workflows.
-
-- **[Appwrite Sites](https://appwrite.io/docs/products/sites)** - Integrated hosting platform to deploy and scale web applications with support for custom domains, SSR, and seamless backend integration. Git integration and previews are supported.
-
-
 ## Installation & Setup
 
 The easiest way to get started with Appwrite is by [signing up for Appwrite Cloud](https://cloud.appwrite.io/). While Appwrite Cloud is in public beta, you can build with Appwrite completely free, and we won't collect your credit card information.
@@ -71,11 +72,10 @@ Before running the installation command, make sure you have [Docker](https://www
 
 ```bash
 docker run -it --rm \
-    --publish 20080:20080 \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.9.1
+    appwrite/appwrite:1.9.0
 ```
 
 ### Windows
@@ -84,22 +84,20 @@ docker run -it --rm \
 
 ```cmd
 docker run -it --rm ^
-    --publish 20080:20080 ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.9.1
+    appwrite/appwrite:1.9.0
 ```
 
 #### PowerShell
 
 ```powershell
 docker run -it --rm `
-    --publish 20080:20080 `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.9.1
+    appwrite/appwrite:1.9.0
 ```
 
 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.
@@ -167,29 +165,51 @@ Getting started with Appwrite is as easy as creating a new project, choosing you
 |                       | [Quick start for Kotlin](https://appwrite.io/docs/quick-starts/kotlin)             |
 |                       | [Quick start for Swift](https://appwrite.io/docs/quick-starts/swift)               |
 
+### Products
+
+- [**Account**](https://appwrite.io/docs/references/cloud/client-web/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
+- [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when building backend integrations with Server SDKs.
+- [**Teams**](https://appwrite.io/docs/references/cloud/client-web/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
+- [**Databases**](https://appwrite.io/docs/references/cloud/client-web/databases) - Manage databases, collections, and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
+- [**Storage**](https://appwrite.io/docs/references/cloud/client-web/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to perfectly fit your app. All files are scanned by ClamAV and stored in a secure and encrypted way.
+- [**Functions**](https://appwrite.io/docs/references/cloud/server-nodejs/functions) - Customize your Appwrite project by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event either manually or using a CRON schedule.
+- [**Messaging**](https://appwrite.io/docs/references/cloud/client-web/messaging) - Communicate with your users through push notifications, emails, and SMS text messages using Appwrite Messaging.
+- [**Realtime**](https://appwrite.io/docs/realtime) - Listen to real-time events for any of your Appwrite services including users, storage, functions, databases, and more.
+- [**Locale**](https://appwrite.io/docs/references/cloud/client-web/locale) - Track your user's location and manage your app locale-based data.
+- [**Avatars**](https://appwrite.io/docs/references/cloud/client-web/avatars) - Manage your users' avatars, countries' flags, browser icons, and credit card symbols. Generate QR codes from links or plaintext strings.
+- [**MCP**](https://appwrite.io/docs/tooling/mcp) - Use Appwrite's Model Context Protocol (MCP) server to allow LLMs and AI tools like Claude Desktop, Cursor, and Windsurf Editor to directly interact with your Appwrite project through natural language.
+- [**Sites**](https://appwrite.io/docs/products/sites) - Develop, deploy, and scale your web applications directly from Appwrite, alongside your backend.
+
+For the complete API documentation, visit [https://appwrite.io/docs](https://appwrite.io/docs). For more tutorials, news and announcements check out our [blog](https://medium.com/appwrite-io) and [Discord Server](https://discord.gg/GSeTUeA).
+
 ### SDKs
 
 Below is a list of currently supported platforms and languages. If you would like to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
 
 #### Client
 
-- :white_check_mark: &nbsp; [Web](https://github.com/appwrite/sdk-for-web)
-- :white_check_mark: &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter)
-- :white_check_mark: &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple)
-- :white_check_mark: &nbsp; [Android](https://github.com/appwrite/sdk-for-android)
-- :white_check_mark: &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native)
+- :white_check_mark: &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [React Native](https://github.com/appwrite/sdk-for-react-native) - **Beta** (Maintained by the Appwrite Team)
 
 #### Server
 
-- :white_check_mark: &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node)
-- :white_check_mark: &nbsp; [PHP](https://github.com/appwrite/sdk-for-php)
-- :white_check_mark: &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart)
-- :white_check_mark: &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno)
-- :white_check_mark: &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby)
-- :white_check_mark: &nbsp; [Python](https://github.com/appwrite/sdk-for-python)
-- :white_check_mark: &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin)
-- :white_check_mark: &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift)
-- :white_check_mark: &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet)
+- :white_check_mark: &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [Swift](https://github.com/appwrite/sdk-for-swift) (Maintained by the Appwrite Team)
+- :white_check_mark: &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Beta** (Maintained by the Appwrite Team)
+
+#### Community
+
+- :white_check_mark: &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
+- :white_check_mark: &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
 
 Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)!
 

app/cli.php

@@ -6,8 +6,8 @@ use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\Publisher\StatsResources as StatsResourcesPublisher;
 use Appwrite\Event\Publisher\Usage as UsagePublisher;
+use Appwrite\Event\StatsResources;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
 use Appwrite\Usage\Context as UsageContext;
@@ -18,15 +18,13 @@ use Swoole\Timer;
 use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
-use Utopia\CLI\Adapters\Generic;
-use Utopia\CLI\CLI;
 use Utopia\Config\Config;
 use Utopia\Console;
 use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
+use Utopia\DI\Dependency;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
@@ -49,7 +47,7 @@ require_once __DIR__ . '/controllers/general.php';
 global $register;
 
 $platform = new Appwrite();
-$args = $_SERVER['argv'] ?? [];
+$args = $platform->getEnv('argv');
 
 \array_shift($args);
 if (! isset($args[0])) {
@@ -58,15 +56,21 @@ if (! isset($args[0])) {
 }
 
 $taskName = $args[0];
-$container = new Container();
-$cli = new CLI(new Generic(), $_SERVER['argv'] ?? [], $container);
-
-$platform->setCli($cli);
 $platform->init(Service::TYPE_TASK);
+$cli = $platform->getCli();
 
-$container->set('register', fn () => $register, []);
+$setResource = function (string $name, callable $callback, array $injections = []) use ($cli) {
+    $dependency = new Dependency();
+    $dependency->setName($name)->setCallback($callback);
+    foreach ($injections as $injection) {
+        $dependency->inject($injection);
+    }
+    $cli->setResource($dependency);
+};
 
-$container->set('cache', function ($pools) {
+$setResource('register', fn () => $register, []);
+
+$setResource('cache', function ($pools) {
     $list = Config::getParam('pools-cache', []);
     $adapters = [];
 
@@ -77,18 +81,18 @@ $container->set('cache', function ($pools) {
     return new Cache(new Sharding($adapters));
 }, ['pools']);
 
-$container->set('pools', function (Registry $register) {
+$setResource('pools', function (Registry $register) {
     return $register->get('pools');
 }, ['register']);
 
-$container->set('authorization', function () {
+$setResource('authorization', function () {
     $authorization = new Authorization();
     $authorization->disable();
 
     return $authorization;
 }, []);
 
-$container->set('dbForPlatform', function ($pools, $cache, $authorization) {
+$setResource('dbForPlatform', function ($pools, $cache, $authorization) {
     $sleep = 3;
     $maxAttempts = 5;
     $attempts = 0;
@@ -131,17 +135,17 @@ $container->set('dbForPlatform', function ($pools, $cache, $authorization) {
     return $dbForPlatform;
 }, ['pools', 'cache', 'authorization']);
 
-$container->set('console', function () {
+$setResource('console', function () {
     return new Document(Config::getParam('console'));
 }, []);
 
-$container->set(
+$setResource(
     'isResourceBlocked',
     fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false,
     []
 );
 
-$container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
+$setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
     return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases) {
@@ -203,10 +207,10 @@ $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform,
     };
 }, ['pools', 'dbForPlatform', 'cache', 'authorization']);
 
-$container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+$setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
     $database = null;
 
-    return function (?Document $project = null) use ($pools, $cache, &$database, $authorization) {
+    return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
         if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
             $database->setTenant($project->getSequence());
             return $database;
@@ -231,42 +235,41 @@ $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization
         return $database;
     };
 }, ['pools', 'cache', 'authorization']);
-$container->set('publisher', function (Group $pools) {
+$setResource('publisher', function (Group $pools) {
     return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
-$container->set('publisherDatabases', function (BrokerPool $publisher) {
+$setResource('publisherDatabases', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('publisherFunctions', function (BrokerPool $publisher) {
+$setResource('publisherFunctions', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('publisherMigrations', function (BrokerPool $publisher) {
+$setResource('publisherMigrations', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('publisherMessaging', function (BrokerPool $publisher) {
+$setResource('publisherMessaging', function (BrokerPool $publisher) {
     return $publisher;
 }, ['publisher']);
-$container->set('usage', function () {
+$setResource('usage', function () {
     return new UsageContext();
 }, []);
-$container->set('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
+$setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
     $publisher,
     new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
 ), ['publisher']);
-$container->set('publisherForStatsResources', fn (Publisher $publisher) => new StatsResourcesPublisher(
-    $publisher,
-    new Queue(System::getEnv('_APP_STATS_RESOURCES_QUEUE_NAME', Event::STATS_RESOURCES_QUEUE_NAME))
-), ['publisher']);
-$container->set('queueForFunctions', function (Publisher $publisher) {
+$setResource('queueForStatsResources', function (Publisher $publisher) {
+    return new StatsResources($publisher);
+}, ['publisher']);
+$setResource('queueForFunctions', function (Publisher $publisher) {
     return new Func($publisher);
 }, ['publisher']);
-$container->set('queueForDeletes', function (Publisher $publisher) {
+$setResource('queueForDeletes', function (Publisher $publisher) {
     return new Delete($publisher);
 }, ['publisher']);
-$container->set('queueForCertificates', function (Publisher $publisher) {
+$setResource('queueForCertificates', function (Publisher $publisher) {
     return new Certificate($publisher);
 }, ['publisher']);
-$container->set('logError', function (Registry $register) {
+$setResource('logError', function (Registry $register) {
     return function (Throwable $error, string $namespace, string $action) use ($register) {
         Console::error('[Error] Timestamp: ' . date('c', time()));
         Console::error('[Error] Type: ' . get_class($error));
@@ -318,28 +321,25 @@ $container->set('logError', function (Registry $register) {
     };
 }, ['register']);
 
-$container->set('executor', fn () => new Executor(), []);
+$setResource('executor', fn () => new Executor(), []);
 
-$container->set('bus', function (Registry $register) use ($container) {
-    return $register->get('bus')->setResolver(fn (string $name) => $container->get($name));
+$setResource('bus', function (Registry $register) use ($cli) {
+    return $register->get('bus')->setResolver(fn (string $name) => $cli->getResource($name));
 }, ['register']);
 
-$container->set('telemetry', fn () => new NoTelemetry(), []);
-
-$exitCode = 0;
+$setResource('telemetry', fn () => new NoTelemetry(), []);
 
 $cli
     ->error()
     ->inject('error')
     ->inject('logError')
-    ->action(function (Throwable $error, callable $logError) use ($taskName, &$exitCode) {
+    ->action(function (Throwable $error, callable $logError) use ($taskName) {
         call_user_func_array($logError, [
             $error,
             'Task',
             $taskName,
         ]);
 
-        $exitCode = 1;
         Timer::clearAll();
     });
 
@@ -348,4 +348,3 @@ $cli->shutdown()->action(fn () => Timer::clearAll());
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 require_once __DIR__ . '/init/span.php';
 run($cli->run(...));
-Console::exit($exitCode);

app/config/apis.php

@@ -9,8 +9,8 @@ return [
         'key' => 'graphql',
         'name' => 'GraphQL',
     ],
-    'websocket' => [
-        'key' => 'websocket',
-        'name' => 'Websocket',
+    'realtime' => [
+        'key' => 'realtime',
+        'name' => 'Realtime',
     ],
 ];

app/config/collections.php

@@ -4,7 +4,6 @@
 $common = include __DIR__ . '/collections/common.php';
 $projects = include __DIR__ . '/collections/projects.php';
 $databases = include __DIR__ . '/collections/databases.php';
-$vectorsdb = include __DIR__ . '/collections/vectorsdb.php';
 $platform = include __DIR__ . '/collections/platform.php';
 $logs = include __DIR__ . '/collections/logs.php';
 
@@ -27,7 +26,6 @@ unset($common['files']);
 $collections = [
     'buckets' => $buckets,
     'databases' => $databases,
-    'vectorsdb' => $vectorsdb,
     'projects' => array_merge_recursive($projects, $common),
     'console' => array_merge_recursive($platform, $common),
     'logs' => $logs,

app/config/collections/platform.php

@@ -594,7 +594,7 @@ $platformCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('key'), // For app platforms
+                '$id' => ID::custom('key'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
@@ -605,7 +605,7 @@ $platformCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('store'), // Unused at the moment
+                '$id' => ID::custom('store'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => 256,
@@ -616,7 +616,7 @@ $platformCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('hostname'), // For web platforms
+                '$id' => ID::custom('hostname'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => 256,

app/config/collections/projects.php

@@ -61,15 +61,6 @@ return [
                 'array' => false,
                 'filters' => [],
             ],
-            [
-                '$id' => ID::custom('database'),
-                'type' => Database::VAR_STRING,
-                'size' => 2000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => [],
-            ]
         ],
         'indexes' => [
             [

app/config/collections/vectorsdb.php

@@ -1,165 +0,0 @@
-<?php
-
-use Utopia\Database\Database;
-use Utopia\Database\Helpers\ID;
-
-return [
-    'collections' => [
-        '$collection' => ID::custom('databases'),
-        '$id' => ID::custom('collections'),
-        'name' => 'Collections',
-        'attributes' => [
-            [
-                '$id' => ID::custom('databaseInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('databaseId'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('name'),
-                'type' => Database::VAR_STRING,
-                'size' => 256,
-                'required' => true,
-                'signed' => true,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('dimension'),
-                'type' => Database::VAR_INTEGER,
-                'size' => 0,
-                'required' => true,
-                'signed' => false,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('enabled'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('documentSecurity'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'default' => null,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('attributes'),
-                'type' => Database::VAR_STRING,
-                'size' => 1000000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => ['subQueryAttributes'],
-            ],
-            [
-                '$id' => ID::custom('indexes'),
-                'type' => Database::VAR_STRING,
-                'size' => 1000000,
-                'required' => false,
-                'signed' => true,
-                'array' => false,
-                'filters' => ['subQueryIndexes'],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'defaultAttributes' => [
-            [
-                '$id' => ID::custom('embeddings'),
-                'type' => Database::VAR_VECTOR,
-                'required' => true,
-                'signed' => false,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('metadata'),
-                'type' => Database::VAR_OBJECT,
-                'default' => [],
-                'required' => false,
-                'size' => 0,
-                'signed' => false,
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_fulltext_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_name'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['name'],
-                'lengths' => [256],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_enabled'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['enabled'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_documentSecurity'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['documentSecurity'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-        ],
-        'defaultIndexes' => [
-            // not creating default indexes on the embeddings as it depends on the type of query users using the most
-            [
-                '$id' => ID::custom('_key_metadata'),
-                'type' => Database::INDEX_OBJECT,
-                'attributes' => ['metadata'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-        ]
-    ]
-];

app/config/console.php

@@ -39,10 +39,6 @@ $console = [
         'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
         'duration' => TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
         'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled',
-        // For email configuration, false means feature is disabled; false means these emails are allowed during sign-ups
-        'disposableEmails' => false,
-        'canonicalEmails' => false,
-        'freeEmails' => false,
         'invalidateSessions' => true
     ],
     'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],

app/config/errors.php

@@ -226,21 +226,6 @@ return [
         'description' => 'A user with the same email already exists in the current project.',
         'code' => 409,
     ],
-    Exception::USER_EMAIL_DISPOSABLE => [
-        'name' => Exception::USER_EMAIL_DISPOSABLE,
-        'description' => 'Disposable email addresses are not allowed. Please use a permanent email address.',
-        'code' => 400,
-    ],
-    Exception::USER_EMAIL_FREE => [
-        'name' => Exception::USER_EMAIL_FREE,
-        'description' => 'Free email addresses are not allowed. Please use a business or custom-domain email address.',
-        'code' => 400,
-    ],
-    Exception::USER_EMAIL_NOT_CANONICAL => [
-        'name' => Exception::USER_EMAIL_NOT_CANONICAL,
-        'description' => 'This email address must already be in its canonical form. Please remove aliases, tags, or provider-specific variations and try again.',
-        'code' => 400,
-    ],
     Exception::USER_PASSWORD_MISMATCH => [
         'name' => Exception::USER_PASSWORD_MISMATCH,
         'description' => 'Passwords do not match. Please check the password and confirm password.',
@@ -1179,16 +1164,6 @@ return [
         'description' => 'Platform with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::PLATFORM_METHOD_UNSUPPORTED => [
-        'name' => Exception::PLATFORM_METHOD_UNSUPPORTED,
-        'description' => 'The requested platform has invalid type. Please use corresponding update method for the platform type.',
-        'code' => 400,
-    ],
-    Exception::PLATFORM_ALREADY_EXISTS => [
-        'name' => Exception::PLATFORM_ALREADY_EXISTS,
-        'description' => 'Platform with the same ID already exists in this project. Try again with a different ID.',
-        'code' => 409,
-    ],
     Exception::VARIABLE_NOT_FOUND => [
         'name' => Exception::VARIABLE_NOT_FOUND,
         'description' => 'Variable with the requested ID could not be found.',
@@ -1231,11 +1206,6 @@ return [
         'description' => 'Migration is already in progress. You can check the status of the migration in your Appwrite Console\'s "Settings" > "Migrations".',
         'code' => 409,
     ],
-    Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED => [
-        'name' => Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED,
-        'description' => 'The specified database type is not supported for CSV import or export operations.',
-        'code' => 400,
-    ],
 
     /** Realtime */
     Exception::REALTIME_MESSAGE_FORMAT_INVALID => [

app/config/locale/translations/en.json

@@ -57,21 +57,21 @@
     "emails.recovery.thanks": "Thanks,",
     "emails.recovery.buttonText": "Reset password",
     "emails.recovery.signature": "{{project}} team",
-    "emails.dataExport.success.subject": "Your {{type}} export is ready",
-    "emails.dataExport.success.preview": "Your data export has been completed successfully.",
-    "emails.dataExport.success.hello": "Hello {{user}},",
-    "emails.dataExport.success.body": "Your {{type}} export is ready to download. Click the button below to download your data export.",
-    "emails.dataExport.success.footer": "This download link will expire in 1 hour.",
-    "emails.dataExport.success.thanks": "Thanks,",
-    "emails.dataExport.success.buttonText": "Download {{type}}",
-    "emails.dataExport.success.signature": "Appwrite team",
-    "emails.dataExport.failure.subject": "Your {{type}} export failed - file too large",
-    "emails.dataExport.failure.preview": "Your data export failed because the file size exceeds your plan limit.",
-    "emails.dataExport.failure.hello": "Hello {{user}},",
-    "emails.dataExport.failure.body": "Your {{type}} export could not be completed because the export file size ({{size}}MB) exceeds your plan limit. Please consider upgrading your plan or exporting a smaller dataset.",
-    "emails.dataExport.failure.footer": "If you have any questions, please contact our support team.",
-    "emails.dataExport.failure.thanks": "Thanks,",
-    "emails.dataExport.failure.signature": "{{project}} team",
+    "emails.csvExport.success.subject": "Your CSV export is ready",
+    "emails.csvExport.success.preview": "Your data export has been completed successfully.",
+    "emails.csvExport.success.hello": "Hello {{user}},",
+    "emails.csvExport.success.body": "Your CSV export is ready to download. Click the button below to download your data export.",
+    "emails.csvExport.success.footer": "This download link will expire in 1 hour.",
+    "emails.csvExport.success.thanks": "Thanks,",
+    "emails.csvExport.success.buttonText": "Download CSV",
+    "emails.csvExport.success.signature": "Appwrite team",
+    "emails.csvExport.failure.subject": "Your CSV export failed - file too large",
+    "emails.csvExport.failure.preview": "Your data export failed because the file size exceeds your plan limit.",
+    "emails.csvExport.failure.hello": "Hello {{user}},",
+    "emails.csvExport.failure.body": "Your CSV export could not be completed because the export file size ({{size}}MB) exceeds your plan limit. Please consider upgrading your plan or exporting a smaller dataset.",
+    "emails.csvExport.failure.footer": "If you have any questions, please contact our support team.",
+    "emails.csvExport.failure.thanks": "Thanks,",
+    "emails.csvExport.failure.signature": "{{project}} team",
     "emails.invitation.subject": "Invitation to {{team}} Team at {{project}}",
     "emails.invitation.preview": "{{owner}} invited you to join {{team}} at {{project}}",
     "emails.invitation.hello": "Hello {{user}},",

app/config/oAuthProviders.php

@@ -376,17 +376,6 @@ return [
         'mock' => false,
         'class' => 'Appwrite\\Auth\\OAuth2\\Wordpress',
     ],
-    'x' => [
-        'name' => 'X',
-        'developers' => 'https://docs.x.com/fundamentals/authentication/oauth-2-0/authorization-code',
-        'icon' => 'icon-twitter',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => false,
-        'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\X',
-    ],
     'yahoo' => [
         'name' => 'Yahoo',
         'developers' => 'https://developer.yahoo.com/oauth2/guide/flows_authcode/',

app/config/roles.php

@@ -62,8 +62,6 @@ $admins = [
     'devKeys.write',
     'webhooks.read',
     'webhooks.write',
-    'project.read',
-    'project.write',
     'locale.read',
     'avatars.read',
     'health.read',

app/config/scopes/organization.php

@@ -3,6 +3,13 @@
 // List of scopes for organization (teams) API keys
 
 return [
+    "platforms.read" => [
+        "description" => 'Access to read project\'s platforms',
+    ],
+    "platforms.write" => [
+        "description" =>
+            'Access to create, update, and delete project\'s platforms',
+    ],
     "projects.read" => [
         "description" => 'Access to read organization\'s projects',
     ],
@@ -10,6 +17,13 @@ return [
         "description" =>
             "Access to create, update, and delete projects in organization",
     ],
+    "keys.read" => [
+        "description" => 'Access to read project\'s API keys',
+    ],
+    "keys.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s API keys",
+    ],
     "devKeys.read" => [
         "description" => 'Access to read project\'s development keys',
     ],
@@ -17,4 +31,12 @@ return [
         "description" =>
             "Access to create, update, and delete project\'s development keys",
     ],
+    "webhooks.read" => [
+        "description" =>
+            "Access to read project\'s webhooks",
+    ],
+    "webhooks.write" => [
+        "description" =>
+            "Access to create, update, and delete project\'s webhooks",
+    ],
 ];

app/config/scopes/project.php

@@ -180,28 +180,4 @@ return [ // List of publicly visible scopes
         "description" =>
             "Access to create, update, and delete project\'s webhooks",
     ],
-    "project.read" => [
-        "description" =>
-            "Access to read project\'s information",
-    ],
-    "project.write" => [
-        "description" =>
-            "Access to update project\'s information",
-    ],
-    "keys.read" => [
-        "description" =>
-            "Access to read project\'s keys",
-    ],
-    "keys.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s keys",
-    ],
-    "platforms.read" => [
-        "description" =>
-            "Access to read project\'s platforms",
-    ],
-    "platforms.write" => [
-        "description" =>
-            "Access to create, update, and delete project\'s platforms",
-    ],
 ];

app/config/sdks.php

@@ -250,16 +250,26 @@ return [
                     ],
                 ],
             ],
-        ],
-    ],
-
-    APP_SDK_PLATFORM_STATIC => [
-        'key' => APP_SDK_PLATFORM_STATIC,
-        'name' => 'Static',
-        'description' => 'SDK artifacts for Appwrite integrations that do not require a generated platform API specification.',
-        'enabled' => true,
-        'beta' => false,
-        'sdks' => [
+            [
+                'key' => 'markdown',
+                'name' => 'Markdown',
+                'version' => '0.3.0',
+                'url' => 'https://github.com/appwrite/sdk-for-md.git',
+                'package' => 'https://www.npmjs.com/package/@appwrite.io/docs',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => false,
+                'hidden' => false,
+                'family' => APP_SDK_PLATFORM_CONSOLE,
+                'prism' => 'markdown',
+                'source' => \realpath(__DIR__ . '/../sdks/console-md'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-md.git',
+                'gitRepoName' => 'sdk-for-md',
+                'gitUserName' => 'appwrite',
+                'gitBranch' => 'dev',
+                'repoBranch' => 'main',
+                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/md/CHANGELOG.md'),
+            ],
             [
                 'key' => 'agent-skills',
                 'name' => 'AgentSkills',
@@ -269,10 +279,9 @@ return [
                 'beta' => false,
                 'dev' => false,
                 'hidden' => false,
-                'spec' => 'static',
-                'family' => APP_SDK_PLATFORM_STATIC,
+                'family' => APP_SDK_PLATFORM_CONSOLE,
                 'prism' => 'agent-skills',
-                'source' => \realpath(__DIR__ . '/../sdks/static-agent-skills'),
+                'source' => \realpath(__DIR__ . '/../sdks/console-agent-skills'),
                 'gitUrl' => 'git@github.com:appwrite/agent-skills.git',
                 'gitRepoName' => 'agent-skills',
                 'gitUserName' => 'appwrite',
@@ -289,10 +298,9 @@ return [
                 'beta' => false,
                 'dev' => false,
                 'hidden' => false,
-                'spec' => 'static',
-                'family' => APP_SDK_PLATFORM_STATIC,
+                'family' => APP_SDK_PLATFORM_CONSOLE,
                 'prism' => 'cursor-plugin',
-                'source' => \realpath(__DIR__ . '/../sdks/static-cursor-plugin'),
+                'source' => \realpath(__DIR__ . '/../sdks/console-cursor-plugin'),
                 'gitUrl' => 'git@github.com:appwrite/cursor-plugin.git',
                 'gitRepoName' => 'cursor-plugin',
                 'gitUserName' => 'appwrite',
@@ -486,25 +494,6 @@ return [
                 'gitBranch' => 'dev',
                 'changelog' => \realpath(__DIR__ . '/../../docs/sdks/swift/CHANGELOG.md'),
             ],
-            [
-                'key' => 'rust',
-                'name' => 'Rust',
-                'version' => '0.1.0',
-                'url' => 'https://github.com/appwrite/sdk-for-rust',
-                'package' => 'https://crates.io/crates/appwrite',
-                'enabled' => true,
-                'beta' => true,
-                'dev' => true,
-                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
-                'prism' => 'rust',
-                'source' => \realpath(__DIR__ . '/../sdks/server-rust'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-rust.git',
-                'gitRepoName' => 'sdk-for-rust',
-                'gitUserName' => 'appwrite',
-                'gitBranch' => 'dev',
-                'changelog' => \realpath(__DIR__ . '/../../docs/sdks/rust/CHANGELOG.md'),
-            ],
             [
                 'key' => 'graphql',
                 'name' => 'GraphQL',

app/config/services.php

@@ -137,7 +137,7 @@ return [
         'docs' => true,
         'docsUrl' => '',
         'tests' => false,
-        'optional' => true,
+        'optional' => false,
         'icon' => '',
         'platforms' => ['client', 'server', 'console'],
     ],
@@ -193,7 +193,7 @@ return [
         'docs' => false,
         'docsUrl' => '',
         'tests' => false,
-        'optional' => true,
+        'optional' => false,
         'icon' => '',
         'platforms' => ['client', 'server', 'console'],
     ],
@@ -235,7 +235,7 @@ return [
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/proxy',
         'tests' => false,
-        'optional' => true,
+        'optional' => false,
         'icon' => '/images/services/proxy.png',
         'platforms' => ['client', 'server', 'console'],
     ],
@@ -291,7 +291,7 @@ return [
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/migrations',
         'tests' => true,
-        'optional' => true,
+        'optional' => false,
         'icon' => '/images/services/migrations.png',
         'platforms' => ['client', 'server', 'console'],
     ],

app/config/templates/function.php

@@ -31,6 +31,9 @@ class FunctionUseCases
     public const DEV_TOOLS = 'dev-tools';
     public const AUTH = 'auth';
 
+    /**
+     * @var array<string>
+     */
     public static function getAll(): array
     {
         return [

app/config/templates/site.php

@@ -25,6 +25,9 @@ class SiteUseCases
     public const FORMS = 'forms';
     public const DASHBOARD = 'dashboard';
 
+    /**
+     * @var array<string>
+     */
     public static function getAll(): array
     {
         return [
@@ -249,7 +252,7 @@ return [
         'frameworks' => [
             getFramework('VITE', [
                 'providerRootDirectory' => './vite/vitepress',
-                'fallbackFile' => '404.html',
+                'outputDirectory' => '404.html',
                 'installCommand' => 'npm i vitepress && npm install',
                 'buildCommand' => 'npm run docs:build',
                 'outputDirectory' => './.vitepress/dist',
@@ -272,7 +275,7 @@ return [
         'frameworks' => [
             getFramework('VUE', [
                 'providerRootDirectory' => './vue/vuepress',
-                'fallbackFile' => '404.html',
+                'outputDirectory' => '404.html',
                 'installCommand' => 'npm install',
                 'buildCommand' => 'npm run build',
                 'outputDirectory' => './src/.vuepress/dist',
@@ -295,7 +298,7 @@ return [
         'frameworks' => [
             getFramework('REACT', [
                 'providerRootDirectory' => './react/docusaurus',
-                'fallbackFile' => '404.html',
+                'outputDirectory' => '404.html',
                 'installCommand' => 'npm install',
                 'buildCommand' => 'npm run build',
                 'outputDirectory' => './build',

app/config/variables.php

@@ -872,18 +872,18 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_BUILD_TIMEOUT',
-                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 2700 seconds.',
+                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 900 seconds.',
                 'introduction' => '0.13.0',
-                'default' => '2700',
+                'default' => '900',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
             [
                 'name' => '_APP_COMPUTE_BUILD_TIMEOUT',
-                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 2700 seconds.',
+                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 900 seconds.',
                 'introduction' => '1.7.0',
-                'default' => '2700',
+                'default' => '900',
                 'required' => false,
                 'question' => '',
                 'filter' => ''

app/controllers/api/account.php

@@ -9,7 +9,6 @@ use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PasswordHistory;
 use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
-use Appwrite\Bus\Events\SessionCreated;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
@@ -42,7 +41,6 @@ use Utopia\Auth\Proofs\Code as ProofsCode;
 use Utopia\Auth\Proofs\Password as ProofsPassword;
 use Utopia\Auth\Proofs\Token as ProofsToken;
 use Utopia\Auth\Store;
-use Utopia\Bus\Bus;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -77,25 +75,140 @@ use Utopia\Validator\WhiteList;
 $oauthDefaultSuccess = '/console/auth/oauth2/success';
 $oauthDefaultFailure = '/console/auth/oauth2/failure';
 
+function sendSessionAlert(Locale $locale, Document $user, Document $project, array $platform, Document $session, Mail $queueForMails)
+{
+    $subject = $locale->getText("emails.sessionAlert.subject");
+    $preview = $locale->getText("emails.sessionAlert.preview");
+    $customTemplate = $project->getAttribute('templates', [])['email.sessionAlert-' . $locale->default] ?? [];
+    $smtpBaseTemplate = $project->getAttribute('smtpBaseTemplate', 'email-base');
 
-$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Bus $bus, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
+    $validator = new FileName();
+    if (!$validator->isValid($smtpBaseTemplate)) {
+        throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Invalid template path');
+    }
 
-    // Attempt to decode secret as a JWT (used by OAuth2 token flow to carry provider info)
-    $oauthProvider = null;
-    try {
-        $jwtDecoder = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 60, 0);
-        $payload = $jwtDecoder->decode($secret);
+    $bodyTemplate = __DIR__ . '/../../config/locale/templates/' . $smtpBaseTemplate . '.tpl';
 
-        if (empty($payload['provider'])) {
-            throw new Exception(Exception::USER_INVALID_TOKEN);
+    $message = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-session-alert.tpl');
+    $message
+        ->setParam('{{hello}}', $locale->getText("emails.sessionAlert.hello"))
+        ->setParam('{{body}}', $locale->getText("emails.sessionAlert.body"))
+        ->setParam('{{listDevice}}', $locale->getText("emails.sessionAlert.listDevice"))
+        ->setParam('{{listIpAddress}}', $locale->getText("emails.sessionAlert.listIpAddress"))
+        ->setParam('{{listCountry}}', $locale->getText("emails.sessionAlert.listCountry"))
+        ->setParam('{{footer}}', $locale->getText("emails.sessionAlert.footer"))
+        ->setParam('{{thanks}}', $locale->getText("emails.sessionAlert.thanks"))
+        ->setParam('{{signature}}', $locale->getText("emails.sessionAlert.signature"));
+
+    $body = $message->render();
+
+    $smtp = $project->getAttribute('smtp', []);
+    $smtpEnabled = $smtp['enabled'] ?? false;
+
+    $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+    $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
+    $replyTo = "";
+
+    if ($smtpEnabled) {
+        if (!empty($smtp['senderEmail'])) {
+            $senderEmail = $smtp['senderEmail'];
+        }
+        if (!empty($smtp['senderName'])) {
+            $senderName = $smtp['senderName'];
+        }
+        if (!empty($smtp['replyTo'])) {
+            $replyTo = $smtp['replyTo'];
         }
 
-        $oauthProvider = $payload['provider'];
-        $secret = $payload['secret'];
-    } catch (\Ahc\Jwt\JWTException) {
-        // Not a JWT — use secret as-is (non-OAuth flows)
+        $queueForMails
+            ->setSmtpHost($smtp['host'] ?? '')
+            ->setSmtpPort($smtp['port'] ?? '')
+            ->setSmtpUsername($smtp['username'] ?? '')
+            ->setSmtpPassword($smtp['password'] ?? '')
+            ->setSmtpSecure($smtp['secure'] ?? '');
+
+        if (!empty($customTemplate)) {
+            if (!empty($customTemplate['senderEmail'])) {
+                $senderEmail = $customTemplate['senderEmail'];
+            }
+            if (!empty($customTemplate['senderName'])) {
+                $senderName = $customTemplate['senderName'];
+            }
+            if (!empty($customTemplate['replyTo'])) {
+                $replyTo = $customTemplate['replyTo'];
+            }
+
+            $body = $customTemplate['message'] ?? '';
+            $subject = $customTemplate['subject'] ?? $subject;
+        }
+
+        $queueForMails
+            ->setSmtpReplyTo($replyTo)
+            ->setSmtpSenderEmail($senderEmail)
+            ->setSmtpSenderName($senderName);
     }
 
+    // session alerts should always have a client name!
+    $clientName = $session->getAttribute('clientName');
+    if (empty($clientName)) {
+        // fallback to the user agent and then unknown!
+        $userAgent = $session->getAttribute('userAgent');
+        $clientName = !empty($userAgent) ? $userAgent : 'UNKNOWN';
+
+        $session->setAttribute('clientName', $clientName);
+    }
+
+    $projectName = $project->getAttribute('name');
+    if ($project->getId() === 'console') {
+        $projectName = $platform['platformName'];
+    }
+
+    $emailVariables = [
+        'direction' => $locale->getText('settings.direction'),
+        'date' => (new \DateTime())->format('F j'),
+        'year' => (new \DateTime())->format('YYYY'),
+        'time' => (new \DateTime())->format('H:i:s'),
+        'user' => $user->getAttribute('name'),
+        'project' => $projectName,
+        'device' => $session->getAttribute('clientName'),
+        'ipAddress' => $session->getAttribute('ip'),
+        'country' => $locale->getText('countries.' . $session->getAttribute('countryCode'), $locale->getText('locale.country.unknown')),
+    ];
+
+    if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
+        $emailVariables = array_merge($emailVariables, [
+            'accentColor' => $platform['accentColor'],
+            'logoUrl' => $platform['logoUrl'],
+            'twitter' => $platform['twitterUrl'],
+            'discord' => $platform['discordUrl'],
+            'github' => $platform['githubUrl'],
+            'terms' => $platform['termsUrl'],
+            'privacy' => $platform['privacyUrl'],
+            'platform' => $platform['platformName'],
+        ]);
+    }
+
+    $email = $user->getAttribute('email');
+
+    $queueForMails
+        ->setSubject($subject)
+        ->setPreview($preview)
+        ->setBody($body)
+        ->setBodyTemplate($bodyTemplate)
+        ->appendVariables($emailVariables)
+        ->setRecipient($email);
+
+    // since this is console project, set email sender name!
+    if ($smtpBaseTemplate === APP_BRANDED_EMAIL_BASE_TEMPLATE) {
+        $queueForMails->setSenderName($platform['emailSenderName']);
+    }
+
+    $queueForMails->trigger();
+}
+
+
+$createSession = function (string $userId, string $secret, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Store $store, ProofsToken $proofForToken, ProofsCode $proofForCode, Authorization $authorization) {
+
     /** @var Appwrite\Utopia\Database\Documents\User $userFromRequest */
     $userFromRequest = $authorization->skip(fn () => $dbForProject->getDocument('users', $userId));
 
@@ -107,12 +220,6 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         ?: $userFromRequest->tokenVerify(null, $secret, $proofForCode);
 
     if (!$verifiedToken) {
-        // Could mean invalid/expired JWT, or expired secret
-        throw new Exception(Exception::USER_INVALID_TOKEN);
-    }
-
-    // OAuth2 tokens must have a provider from the JWT
-    if ($verifiedToken->getAttribute('type') === TOKEN_TYPE_OAUTH2 && $oauthProvider === null) {
         throw new Exception(Exception::USER_INVALID_TOKEN);
     }
 
@@ -138,7 +245,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         TOKEN_TYPE_INVITE => SESSION_PROVIDER_EMAIL,
         TOKEN_TYPE_MAGIC_URL => SESSION_PROVIDER_MAGIC_URL,
         TOKEN_TYPE_PHONE => SESSION_PROVIDER_PHONE,
-        TOKEN_TYPE_OAUTH2 => $oauthProvider,
+        TOKEN_TYPE_OAUTH2 => SESSION_PROVIDER_OAUTH2,
         default => SESSION_PROVIDER_TOKEN,
     };
     $session = new Document(array_merge(
@@ -189,12 +296,23 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed saving user to DB');
     }
 
-    $bus->dispatch(new SessionCreated(
-        user: $user->getArrayCopy(),
-        project: $project->getArrayCopy(),
-        session: $session->getArrayCopy(),
-        locale: $locale->default,
-    ));
+    $isAllowedTokenType = match ($verifiedToken->getAttribute('type')) {
+        TOKEN_TYPE_MAGIC_URL,
+        TOKEN_TYPE_EMAIL => false,
+        default => true
+    };
+
+    $hasUserEmail = $user->getAttribute('email', false) !== false;
+
+    $isSessionAlertsEnabled = $project->getAttribute('auths', [])['sessionAlerts'] ?? false;
+
+    $isNotFirstSession = $dbForProject->count('sessions', [
+        Query::equal('userId', [$user->getId()]),
+    ]) !== 1;
+
+    if ($isAllowedTokenType && $hasUserEmail && $isSessionAlertsEnabled && $isNotFirstSession) {
+        sendSessionAlert($locale, $user, $project, $platform, $session, $queueForMails);
+    }
 
     $queueForEvents
         ->setParam('userId', $user->getId())
@@ -205,7 +323,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         ->setProperty('secret', $sessionSecret)
         ->encode();
 
-    if (!$domainVerification) {
+    if (!Config::getParam('domainVerification')) {
         $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
     }
 
@@ -213,8 +331,8 @@ $createSession = function (string $userId, string $secret, Request $request, Res
     $protocol = $request->getProtocol();
 
     $response
-        ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-        ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+        ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+        ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
         ->setStatusCode(Response::STATUS_CODE_CREATED);
 
     $countryName = $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown'));
@@ -263,8 +381,7 @@ Http::post('/v1/account')
     ->inject('dbForProject')
     ->inject('authorization')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Authorization $authorization, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Authorization $authorization, Hooks $hooks) {
 
         $email = \strtolower($email);
         if ('console' === $project->getId()) {
@@ -313,38 +430,11 @@ Http::post('/v1/account')
         $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
         $proof = new ProofsPassword();
         $hash = $proof->hash($password);
-        $emailMetadata = [
-            'emailCanonical' => null,
-            'emailIsCanonical' => null,
-            'emailIsCorporate' => null,
-            'emailIsDisposable' => null,
-            'emailIsFree' => null,
-        ];
 
         try {
-            $parsedEmail = new Email($email);
-            $canonical = $parsedEmail->getCanonical();
-            $emailMetadata = [
-                'emailCanonical' => $canonical,
-                'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                'emailIsCorporate' => $parsedEmail->isCorporate(),
-                'emailIsDisposable' => $parsedEmail->isDisposable(),
-                'emailIsFree' => $parsedEmail->isFree(),
-            ];
-        } catch (\Throwable) {
-            throw new Exception(Exception::GENERAL_INVALID_EMAIL);
-        }
-
-        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
-        }
-
-        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
-        }
-
-        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_FREE);
+            $emailCanonical = new Email($email);
+        } catch (Throwable) {
+            $emailCanonical = null;
         }
 
         try {
@@ -375,11 +465,11 @@ Http::post('/v1/account')
                 'authenticators' => null,
                 'search' => implode(' ', [$userId, $email, $name]),
                 'accessedAt' => DateTime::now(),
-                'emailCanonical' => $emailMetadata['emailCanonical'],
-                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
-                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
-                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
-                'emailIsFree' => $emailMetadata['emailIsFree'],
+                'emailCanonical' => $emailCanonical?->getCanonical(),
+                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
+                'emailIsCorporate' => $emailCanonical?->isCorporate(),
+                'emailIsDisposable' => $emailCanonical?->isDisposable(),
+                'emailIsFree' => $emailCanonical?->isFree(),
             ]);
 
             $user->removeAttribute('$sequence');
@@ -579,18 +669,15 @@ Http::delete('/v1/account/sessions')
     ->inject('queueForDeletes')
     ->inject('store')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken) {
 
         $protocol = $request->getProtocol();
         $sessions = $user->getAttribute('sessions', []);
-        $currentSession = null;
 
         foreach ($sessions as $session) {/** @var Document $session */
             $dbForProject->deleteDocument('sessions', $session->getId());
 
-            if (!$domainVerification) {
+            if (!Config::getParam('domainVerification')) {
                 $response->addHeader('X-Fallback-Cookies', \json_encode([]));
             }
 
@@ -603,11 +690,10 @@ Http::delete('/v1/account/sessions')
 
                 // If current session delete the cookies too
                 $response
-                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
-                    ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+                    ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
 
                 // Use current session for events.
-                $currentSession = $session;
                 $queueForEvents
                     ->setPayload($response->output($session, Response::MODEL_SESSION));
 
@@ -620,11 +706,9 @@ Http::delete('/v1/account/sessions')
 
         $dbForProject->purgeCachedDocument('users', $user->getId());
 
-        if ($currentSession instanceof Document) {
-            $queueForEvents
-                ->setParam('userId', $user->getId())
-                ->setParam('sessionId', $currentSession->getId());
-        }
+        $queueForEvents
+            ->setParam('userId', $user->getId())
+            ->setParam('sessionId', $session->getId());
 
         $response->noContent();
     });
@@ -670,8 +754,7 @@ Http::get('/v1/account/sessions/:sessionId')
                     ->setAttribute('secret', $session->getAttribute('secret', ''))
                 ;
 
-                $response->dynamic($session, Response::MODEL_SESSION);
-                return;
+                return $response->dynamic($session, Response::MODEL_SESSION);
             }
         }
 
@@ -711,9 +794,7 @@ Http::delete('/v1/account/sessions/:sessionId')
     ->inject('queueForDeletes')
     ->inject('store')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (?string $sessionId, ?\DateTime $requestTimestamp, Request $request, Response $response, User $user, Database $dbForProject, Locale $locale, Event $queueForEvents, Delete $queueForDeletes, Store $store, ProofsToken $proofForToken) {
 
         $protocol = $request->getProtocol();
         $sessionId = ($sessionId === 'current')
@@ -739,13 +820,13 @@ Http::delete('/v1/account/sessions/:sessionId')
                     ->setAttribute('current', true)
                     ->setAttribute('countryName', $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown')));
 
-                if (!$domainVerification) {
+                if (!Config::getParam('domainVerification')) {
                     $response->addHeader('X-Fallback-Cookies', \json_encode([]));
                 }
 
                 $response
-                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
-                    ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+                    ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+                    ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
             }
 
             $dbForProject->purgeCachedDocument('users', $user->getId());
@@ -853,7 +934,7 @@ Http::patch('/v1/account/sessions/:sessionId')
             ->setPayload($response->output($session, Response::MODEL_SESSION))
         ;
 
-        $response->dynamic($session, Response::MODEL_SESSION);
+        return $response->dynamic($session, Response::MODEL_SESSION);
     });
 
 Http::post('/v1/account/sessions/email')
@@ -894,15 +975,13 @@ Http::post('/v1/account/sessions/email')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('hooks')
     ->inject('store')
     ->inject('proofForPassword')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Bus $bus, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
+    ->action(function (string $email, string $password, Request $request, Response $response, User $user, Database $dbForProject, Document $project, array $platform, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails, Hooks $hooks, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) {
         $email = \strtolower($email);
         $protocol = $request->getProtocol();
 
@@ -963,28 +1042,28 @@ Http::post('/v1/account/sessions/email')
             ]));
         }
 
+        $dbForProject->purgeCachedDocument('users', $user->getId());
+
         $session = $dbForProject->createDocument('sessions', $session->setAttribute('$permissions', [
             Permission::read(Role::user($user->getId())),
             Permission::update(Role::user($user->getId())),
             Permission::delete(Role::user($user->getId())),
         ]));
 
-        $dbForProject->purgeCachedDocument('users', $user->getId());
-
         $encoded = $store
             ->setProperty('id', $user->getId())
             ->setProperty('secret', $secret)
             ->encode();
 
-        if (!$domainVerification) {
+        if (!Config::getParam('domainVerification')) {
             $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
         }
 
         $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
 
         $response
-            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
             ->setStatusCode(Response::STATUS_CODE_CREATED)
         ;
 
@@ -1001,12 +1080,15 @@ Http::post('/v1/account/sessions/email')
             ->setParam('sessionId', $session->getId())
         ;
 
-        $bus->dispatch(new SessionCreated(
-            user: $user->getArrayCopy(),
-            project: $project->getArrayCopy(),
-            session: $session->getArrayCopy(),
-            locale: $locale->default,
-        ));
+        if ($project->getAttribute('auths', [])['sessionAlerts'] ?? false) {
+            if (
+                $dbForProject->count('sessions', [
+                    Query::equal('userId', [$user->getId()]),
+                ]) !== 1
+            ) {
+                sendSessionAlert($locale, $user, $project, $platform, $session, $queueForMails);
+            }
+        }
 
         $response->dynamic($session, Response::MODEL_SESSION);
     });
@@ -1047,10 +1129,8 @@ Http::post('/v1/account/sessions/anonymous')
     ->inject('store')
     ->inject('proofForPassword')
     ->inject('proofForToken')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) {
+    ->action(function (Request $request, Response $response, Locale $locale, User $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) {
         $protocol = $request->getProtocol();
 
         if ('console' === $project->getId()) {
@@ -1141,15 +1221,15 @@ Http::post('/v1/account/sessions/anonymous')
             ->setProperty('secret', $secret)
             ->encode();
 
-        if (!$domainVerification) {
+        if (!Config::getParam('domainVerification')) {
             $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
         }
 
         $expire = DateTime::formatTz(DateTime::addSeconds(new \DateTime(), $duration));
 
         $response
-            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
             ->setStatusCode(Response::STATUS_CODE_CREATED)
         ;
 
@@ -1200,13 +1280,11 @@ Http::post('/v1/account/sessions/token')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('store')
     ->inject('proofForToken')
     ->inject('proofForCode')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->inject('authorization')
+->inject('authorization')
     ->action($createSession);
 
 Http::get('/v1/account/sessions/oauth2/:provider')
@@ -1404,11 +1482,8 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->inject('store')
     ->inject('proofForPassword')
     ->inject('proofForToken')
-    ->inject('plan')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Database $dbForPlatform, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, array $plan, bool $domainVerification, ?string $cookieDomain, Authorization $authorization) use ($oauthDefaultSuccess) {
+    ->action(function (string $provider, string $code, string $state, string $error, string $error_description, Request $request, Response $response, Document $project, Validator $redirectValidator, Document $devKey, User $user, Database $dbForProject, Database $dbForPlatform, Reader $geodb, Event $queueForEvents, Store $store, ProofsPassword $proofForPassword, ProofsToken $proofForToken, Authorization $authorization) use ($oauthDefaultSuccess) {
         $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
         $port = $request->getPort();
         $callbackBase = $protocol . '://' . $request->getHostname();
@@ -1650,38 +1725,10 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                     }
                 }
 
-                $emailMetadata = [
-                    'emailCanonical' => null,
-                    'emailIsCanonical' => null,
-                    'emailIsCorporate' => null,
-                    'emailIsDisposable' => null,
-                    'emailIsFree' => null,
-                ];
-
                 try {
-                    $parsedEmail = new Email($email);
-                    $canonical = $parsedEmail->getCanonical();
-                    $emailMetadata = [
-                        'emailCanonical' => $canonical,
-                        'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                        'emailIsCorporate' => $parsedEmail->isCorporate(),
-                        'emailIsDisposable' => $parsedEmail->isDisposable(),
-                        'emailIsFree' => $parsedEmail->isFree(),
-                    ];
-                } catch (\Throwable) {
-                    $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
-                }
-
-                if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-                    $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
-                }
-
-                if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-                    $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
-                }
-
-                if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-                    $failureRedirect(Exception::USER_EMAIL_FREE);
+                    $emailCanonical = new Email($email);
+                } catch (Throwable) {
+                    $emailCanonical = null;
                 }
 
                 try {
@@ -1711,11 +1758,11 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                         'authenticators' => null,
                         'search' => implode(' ', [$userId, $email, $name]),
                         'accessedAt' => DateTime::now(),
-                        'emailCanonical' => $emailMetadata['emailCanonical'],
-                        'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
-                        'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
-                        'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
-                        'emailIsFree' => $emailMetadata['emailIsFree'],
+                        'emailCanonical' => $emailCanonical?->getCanonical(),
+                        'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
+                        'emailIsCorporate' => $emailCanonical?->isCorporate(),
+                        'emailIsDisposable' => $emailCanonical?->isDisposable(),
+                        'emailIsFree' => $emailCanonical?->isFree(),
                     ]);
 
                     $user->removeAttribute('$sequence');
@@ -1790,47 +1837,19 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
         }
 
         if (empty($user->getAttribute('email'))) {
-            $email = $oauth2->getUserEmail($accessToken);
-            $emailMetadata = [
-                'emailCanonical' => null,
-                'emailIsCanonical' => null,
-                'emailIsCorporate' => null,
-                'emailIsDisposable' => null,
-                'emailIsFree' => null,
-            ];
+            $user->setAttribute('email', $oauth2->getUserEmail($accessToken));
 
             try {
-                $parsedEmail = new Email($email);
-                $canonical = $parsedEmail->getCanonical();
-                $emailMetadata = [
-                    'emailCanonical' => $canonical,
-                    'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                    'emailIsCorporate' => $parsedEmail->isCorporate(),
-                    'emailIsDisposable' => $parsedEmail->isDisposable(),
-                    'emailIsFree' => $parsedEmail->isFree(),
-                ];
-            } catch (\Throwable) {
-                $failureRedirect(Exception::GENERAL_INVALID_EMAIL);
+                $emailCanonical = new Email($user->getAttribute('email'));
+            } catch (Throwable) {
+                $emailCanonical = null;
             }
 
-            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-                $failureRedirect(Exception::USER_EMAIL_DISPOSABLE);
-            }
-
-            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-                $failureRedirect(Exception::USER_EMAIL_NOT_CANONICAL);
-            }
-
-            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-                $failureRedirect(Exception::USER_EMAIL_FREE);
-            }
-
-            $user->setAttribute('email', $email);
-            $user->setAttribute('emailCanonical', $emailMetadata['emailCanonical']);
-            $user->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical']);
-            $user->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate']);
-            $user->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable']);
-            $user->setAttribute('emailIsFree', $emailMetadata['emailIsFree']);
+            $user->setAttribute('emailCanonical', $emailCanonical?->getCanonical());
+            $user->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported());
+            $user->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate());
+            $user->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable());
+            $user->setAttribute('emailIsFree', $emailCanonical?->isFree());
         }
 
         if (empty($user->getAttribute('name'))) {
@@ -1880,12 +1899,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->setParam('tokenId', $token->getId())
             ;
 
-            // Wrap secret in a JWT that also carries the provider name
-            $jwtEncoder = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 60, 0);
-            $query['secret'] = $jwtEncoder->encode([
-                'secret' => $secret,
-                'provider' => $provider,
-            ]);
+            $query['secret'] = $secret;
             $query['userId'] = $user->getId();
 
             // If the `token` param is not set, we persist the session in a cookie
@@ -1924,7 +1938,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->setProperty('secret', $secret)
                 ->encode();
 
-            if (!$domainVerification) {
+            if (!Config::getParam('domainVerification')) {
                 $response->addHeader('X-Fallback-Cookies', \json_encode([$store->getKey() => $encoded]));
             }
 
@@ -1937,17 +1951,17 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
             // TODO: Remove this deprecated workaround - support only token
             if ($state['success']['path'] == $oauthDefaultSuccess) {
                 $query['project'] = $project->getId();
-                $query['domain'] = $cookieDomain;
+                $query['domain'] = Config::getParam('cookieDomain');
                 $query['key'] = $store->getKey();
                 $query['secret'] = $encoded;
             }
 
             $response
-                ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, null)
-                ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'));
+                ->addCookie($store->getKey() . '_legacy', $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+                ->addCookie($store->getKey(), $encoded, (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'));
         }
 
-        if (isset($sessionUpgrade) && $sessionUpgrade && isset($session)) {
+        if (isset($sessionUpgrade) && $sessionUpgrade) {
             foreach ($user->getAttribute('targets', []) as $target) {
                 if ($target->getAttribute('providerType') !== MESSAGE_TYPE_PUSH) {
                     continue;
@@ -2042,7 +2056,7 @@ Http::get('/v1/account/tokens/oauth2/:provider')
         }
 
         $host = $platform['consoleHostname'] ?? '';
-        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
         $port = $request->getPort();
         $redirectBase = $protocol . '://' . $host;
         if ($protocol === 'https' && $port !== '443') {
@@ -2065,12 +2079,10 @@ Http::get('/v1/account/tokens/oauth2/:provider')
             'token' => true,
         ], $scopes);
 
-        $loginURL = $oauth2->getLoginURL();
-
         $response
             ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
             ->addHeader('Pragma', 'no-cache')
-            ->redirect($loginURL);
+            ->redirect($oauth2->getLoginURL());
     });
 
 Http::post('/v1/account/tokens/magic-url')
@@ -2110,11 +2122,10 @@ Http::post('/v1/account/tokens/magic-url')
     ->inject('locale')
     ->inject('queueForEvents')
     ->inject('queueForMails')
-    ->inject('plan')
     ->inject('proofForPassword')
     ->inject('platform')
     ->inject('authorization')
-    ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
+    ->action(function (string $userId, string $email, string $url, bool $phrase, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
         if (empty(System::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
         }
@@ -2149,38 +2160,10 @@ Http::post('/v1/account/tokens/magic-url')
 
             $userId = $userId === 'unique()' ? ID::unique() : $userId;
 
-            $emailMetadata = [
-                'emailCanonical' => null,
-                'emailIsCanonical' => null,
-                'emailIsCorporate' => null,
-                'emailIsDisposable' => null,
-                'emailIsFree' => null,
-            ];
-
             try {
-                $parsedEmail = new Email($email);
-                $canonical = $parsedEmail->getCanonical();
-                $emailMetadata = [
-                    'emailCanonical' => $canonical,
-                    'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                    'emailIsCorporate' => $parsedEmail->isCorporate(),
-                    'emailIsDisposable' => $parsedEmail->isDisposable(),
-                    'emailIsFree' => $parsedEmail->isFree(),
-                ];
-            } catch (\Throwable) {
-                throw new Exception(Exception::GENERAL_INVALID_EMAIL);
-            }
-
-            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-                throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
-            }
-
-            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-                throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
-            }
-
-            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-                throw new Exception(Exception::USER_EMAIL_FREE);
+                $emailCanonical = new Email($email);
+            } catch (Throwable) {
+                $emailCanonical = null;
             }
 
             $user->setAttributes([
@@ -2207,11 +2190,11 @@ Http::post('/v1/account/tokens/magic-url')
                 'authenticators' => null,
                 'search' => implode(' ', [$userId, $email]),
                 'accessedAt' => DateTime::now(),
-                'emailCanonical' => $emailMetadata['emailCanonical'],
-                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
-                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
-                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
-                'emailIsFree' => $emailMetadata['emailIsFree'],
+                'emailCanonical' => $emailCanonical?->getCanonical(),
+                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
+                'emailIsCorporate' => $emailCanonical?->isCorporate(),
+                'emailIsDisposable' => $emailCanonical?->isDisposable(),
+                'emailIsFree' => $emailCanonical?->isFree(),
             ]);
 
             $user->removeAttribute('$sequence');
@@ -2419,11 +2402,10 @@ Http::post('/v1/account/tokens/email')
     ->inject('locale')
     ->inject('queueForEvents')
     ->inject('queueForMails')
-    ->inject('plan')
     ->inject('proofForPassword')
     ->inject('proofForCode')
     ->inject('authorization')
-    ->action(function (string $userId, string $email, bool $phrase, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, array $plan, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
+    ->action(function (string $userId, string $email, bool $phrase, Request $request, Response $response, User $user, Document $project, array $platform, Database $dbForProject, Locale $locale, Event $queueForEvents, Mail $queueForMails, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
         if (empty(System::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
         }
@@ -2456,38 +2438,10 @@ Http::post('/v1/account/tokens/email')
 
             $userId = $userId === 'unique()' ? ID::unique() : $userId;
 
-            $emailMetadata = [
-                'emailCanonical' => null,
-                'emailIsCanonical' => null,
-                'emailIsCorporate' => null,
-                'emailIsDisposable' => null,
-                'emailIsFree' => null,
-            ];
-
             try {
-                $parsedEmail = new Email($email);
-                $canonical = $parsedEmail->getCanonical();
-                $emailMetadata = [
-                    'emailCanonical' => $canonical,
-                    'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                    'emailIsCorporate' => $parsedEmail->isCorporate(),
-                    'emailIsDisposable' => $parsedEmail->isDisposable(),
-                    'emailIsFree' => $parsedEmail->isFree(),
-                ];
-            } catch (\Throwable) {
-                throw new Exception(Exception::GENERAL_INVALID_EMAIL);
-            }
-
-            if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-                throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
-            }
-
-            if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-                throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
-            }
-
-            if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-                throw new Exception(Exception::USER_EMAIL_FREE);
+                $emailCanonical = new Email($email);
+            } catch (Throwable) {
+                $emailCanonical = null;
             }
 
             $user->setAttributes([
@@ -2512,11 +2466,11 @@ Http::post('/v1/account/tokens/email')
                 'memberships' => null,
                 'search' => implode(' ', [$userId, $email]),
                 'accessedAt' => DateTime::now(),
-                'emailCanonical' => $emailMetadata['emailCanonical'],
-                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
-                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
-                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
-                'emailIsFree' => $emailMetadata['emailIsFree'],
+                'emailCanonical' => $emailCanonical?->getCanonical(),
+                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
+                'emailIsCorporate' => $emailCanonical?->isCorporate(),
+                'emailIsDisposable' => $emailCanonical?->isDisposable(),
+                'emailIsFree' => $emailCanonical?->isFree(),
             ]);
 
             $user->removeAttribute('$sequence');
@@ -2754,16 +2708,14 @@ Http::put('/v1/account/sessions/magic-url')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('store')
     ->inject('proofForCode')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
-    ->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $bus, $store, $proofForCode, $domainVerification, $cookieDomain, $authorization) use ($createSession) {
+    ->action(function ($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForCode, $authorization) use ($createSession) {
         $proofForToken = new ProofsToken(TOKEN_LENGTH_MAGIC_URL);
         $proofForToken->setHash(new Sha());
-        $createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $bus, $store, $proofForToken, $proofForCode, $domainVerification, $cookieDomain, $authorization);
+        $createSession($userId, $secret, $request, $response, $user, $dbForProject, $project, $platform, $locale, $geodb, $queueForEvents, $queueForMails, $store, $proofForToken, $proofForCode, $authorization);
     });
 
 Http::put('/v1/account/sessions/phone')
@@ -2805,12 +2757,10 @@ Http::put('/v1/account/sessions/phone')
     ->inject('locale')
     ->inject('geodb')
     ->inject('queueForEvents')
-    ->inject('bus')
+    ->inject('queueForMails')
     ->inject('store')
     ->inject('proofForToken')
     ->inject('proofForCode')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
     ->inject('authorization')
     ->action($createSession);
 
@@ -3337,10 +3287,9 @@ Http::patch('/v1/account/email')
     ->inject('queueForEvents')
     ->inject('project')
     ->inject('hooks')
-    ->inject('plan')
     ->inject('proofForPassword')
-    ->inject('authorization')
-    ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, User $user, Database $dbForProject, Event $queueForEvents, Document $project, Hooks $hooks, array $plan, ProofsPassword $proofForPassword, Authorization $authorization) {
+ ->inject('authorization')
+    ->action(function (string $email, string $password, ?\DateTime $requestTimestamp, Response $response, User $user, Database $dbForProject, Event $queueForEvents, Document $project, Hooks $hooks, ProofsPassword $proofForPassword, Authorization $authorization) {
         // passwordUpdate will be empty if the user has never set a password
         $passwordUpdate = $user->getAttribute('passwordUpdate');
 
@@ -3368,48 +3317,20 @@ Http::patch('/v1/account/email')
             throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
         }
 
-        $emailMetadata = [
-            'emailCanonical' => null,
-            'emailIsCanonical' => null,
-            'emailIsCorporate' => null,
-            'emailIsDisposable' => null,
-            'emailIsFree' => null,
-        ];
-
         try {
-            $parsedEmail = new Email($email);
-            $canonical = $parsedEmail->getCanonical();
-            $emailMetadata = [
-                'emailCanonical' => $canonical,
-                'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                'emailIsCorporate' => $parsedEmail->isCorporate(),
-                'emailIsDisposable' => $parsedEmail->isDisposable(),
-                'emailIsFree' => $parsedEmail->isFree(),
-            ];
-        } catch (\Throwable) {
-            throw new Exception(Exception::GENERAL_INVALID_EMAIL);
-        }
-
-        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
-        }
-
-        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
-        }
-
-        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_FREE);
+            $emailCanonical = new Email($email);
+        } catch (Throwable) {
+            $emailCanonical = null;
         }
 
         $user
             ->setAttribute('email', $email)
             ->setAttribute('emailVerification', false) // After this user needs to confirm mail again
-            ->setAttribute('emailCanonical', $emailMetadata['emailCanonical'])
-            ->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical'])
-            ->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate'])
-            ->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable'])
-            ->setAttribute('emailIsFree', $emailMetadata['emailIsFree'])
+            ->setAttribute('emailCanonical', $emailCanonical?->getCanonical())
+            ->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported())
+            ->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate())
+            ->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable())
+            ->setAttribute('emailIsFree', $emailCanonical?->isFree())
         ;
 
         if (empty($passwordUpdate)) {
@@ -3602,9 +3523,7 @@ Http::patch('/v1/account/status')
     ->inject('dbForProject')
     ->inject('queueForEvents')
     ->inject('store')
-    ->inject('domainVerification')
-    ->inject('cookieDomain')
-    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Store $store, bool $domainVerification, ?string $cookieDomain) {
+    ->action(function (Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents, Store $store) {
 
         $user->setAttribute('status', false);
 
@@ -3614,14 +3533,14 @@ Http::patch('/v1/account/status')
             ->setParam('userId', $user->getId())
             ->setPayload($response->output($user, Response::MODEL_ACCOUNT));
 
-        if (!$domainVerification) {
+        if (!Config::getParam('domainVerification')) {
             $response->addHeader('X-Fallback-Cookies', \json_encode([]));
         }
 
         $protocol = $request->getProtocol();
         $response
-            ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, null)
-            ->addCookie($store->getKey(), '', \time() - 3600, '/', $cookieDomain, ('https' == $protocol), true, Config::getParam('cookieSamesite'))
+            ->addCookie($store->getKey() . '_legacy', '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
+            ->addCookie($store->getKey(), '', \time() - 3600, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
         ;
 
         $response->dynamic($user, Response::MODEL_ACCOUNT);
@@ -3814,7 +3733,7 @@ Http::post('/v1/account/recovery')
             ->setParam('userId', $profile->getId())
             ->setParam('tokenId', $recovery->getId())
             ->setUser($profile)
-            ->setPayload($response->showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload(Response::showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3915,7 +3834,7 @@ Http::put('/v1/account/recovery')
         $queueForEvents
             ->setParam('userId', $profile->getId())
             ->setParam('tokenId', $recoveryDocument->getId())
-            ->setPayload($response->showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload(Response::showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response->dynamic($recoveryDocument, Response::MODEL_TOKEN);
     });
@@ -4145,7 +4064,7 @@ Http::post('/v1/account/verifications/email')
         $queueForEvents
             ->setParam('userId', $user->getId())
             ->setParam('tokenId', $verification->getId())
-            ->setPayload($response->showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -4237,7 +4156,7 @@ Http::put('/v1/account/verifications/email')
         $queueForEvents
             ->setParam('userId', $userId)
             ->setParam('tokenId', $verification->getId())
-            ->setPayload($response->showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
 
         $response->dynamic($verification, Response::MODEL_TOKEN);
     });
@@ -4769,5 +4688,5 @@ Http::delete('/v1/account/identities/:identityId')
             ->setParam('identityId', $identity->getId())
             ->setPayload($response->output($identity, Response::MODEL_IDENTITY));
 
-        $response->noContent();
+        return $response->noContent();
     });

app/controllers/api/graphql.php

@@ -28,18 +28,12 @@ use Utopia\Validator\Text;
 Http::init()
     ->groups(['graphql'])
     ->inject('project')
-    ->inject('user')
-    ->inject('request')
-    ->inject('response')
     ->inject('authorization')
-    ->action(function (Document $project, User $user, Request $request, Response $response, Authorization $authorization) {
-        $response->setUser($user);
-        $request->setUser($user);
-
+    ->action(function (Document $project, Authorization $authorization) {
         if (
             array_key_exists('graphql', $project->getAttribute('apis', []))
             && !$project->getAttribute('apis', [])['graphql']
-            && !($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
@@ -231,7 +225,7 @@ function execute(
     $validations = GraphQL::getStandardValidationRules();
 
     if (System::getEnv('_APP_GRAPHQL_INTROSPECTION', 'enabled') === 'disabled') {
-        $validations[] = new DisableIntrospection(DisableIntrospection::ENABLED);
+        $validations[] = new DisableIntrospection();
     }
 
     if (System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {

app/controllers/api/locale.php

@@ -231,7 +231,6 @@ Http::get('/v1/locale/continents')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
         $list = array_keys(Config::getParam('locale-continents'));
-        $output = [];
 
         foreach ($list as $value) {
             $output[] = new Document([

app/controllers/api/messaging.php

@@ -1180,7 +1180,6 @@ Http::get('/v1/messaging/providers/:providerId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -2586,7 +2585,6 @@ Http::get('/v1/messaging/topics/:topicId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -3002,7 +3000,6 @@ Http::get('/v1/messaging/subscribers/:subscriberId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -3569,7 +3566,7 @@ Http::post('/v1/messaging/messages/push')
             $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
             $endpoint = "$protocol://{$platform['apiHostname']}/v1";
 
-            $scheduleTime = $scheduledAt;
+            $scheduleTime = $currentScheduledAt ?? $scheduledAt;
             if (!\is_null($scheduleTime)) {
                 $expiry = (new \DateTime($scheduleTime))->add(new \DateInterval('P15D'))->format('U');
             } else {
@@ -3816,7 +3813,6 @@ Http::get('/v1/messaging/messages/:messageId/logs')
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
                 'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],

app/controllers/api/migrations.php

@@ -1,8 +1,7 @@
 <?php
 
 use Appwrite\Event\Event;
-use Appwrite\Event\Message\Migration as MigrationMessage;
-use Appwrite\Event\Publisher\Migration as MigrationPublisher;
+use Appwrite\Event\Migration;
 use Appwrite\Extend\Exception;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\SDK\AuthType;
@@ -30,7 +29,6 @@ use Utopia\Migration\Resource;
 use Utopia\Migration\Sources\Appwrite;
 use Utopia\Migration\Sources\CSV;
 use Utopia\Migration\Sources\Firebase;
-use Utopia\Migration\Sources\JSON;
 use Utopia\Migration\Sources\NHost;
 use Utopia\Migration\Sources\Supabase;
 use Utopia\Migration\Transfer;
@@ -45,25 +43,6 @@ use Utopia\Validator\WhiteList;
 
 include_once __DIR__ . '/../shared/api.php';
 
-function getDatabaseTransferResourceServices(string $databaseType)
-{
-    return match($databaseType) {
-        DATABASE_TYPE_LEGACY,
-        DATABASE_TYPE_TABLESDB => Transfer::GROUP_DATABASES_TABLES_DB,
-        DATABASE_TYPE_VECTORSDB => Transfer::GROUP_DATABASES_VECTOR_DB,
-        DATABASE_TYPE_DOCUMENTSDB => Transfer::GROUP_DATABASES_DOCUMENTS_DB
-    };
-}
-
-function getDatabaseResourceType(string $databaseType): string
-{
-    return match($databaseType) {
-        DATABASE_TYPE_VECTORSDB => Resource::TYPE_DATABASE_VECTORSDB,
-        DATABASE_TYPE_DOCUMENTSDB => Resource::TYPE_DATABASE_DOCUMENTSDB,
-        default => Resource::TYPE_DATABASE,
-    };
-}
-
 Http::post('/v1/migrations/appwrite')
     ->groups(['api', 'migrations'])
     ->desc('Create Appwrite migration')
@@ -91,9 +70,10 @@ Http::post('/v1/migrations/appwrite')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('platform')
+    ->inject('user')
     ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
-    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, array $platform, Event $queueForEvents, MigrationPublisher $publisherForMigrations) {
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -114,11 +94,12 @@ Http::post('/v1/migrations/appwrite')
         $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setPlatform($platform)
+            ->setUser($user)
+            ->trigger();
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -150,9 +131,10 @@ Http::post('/v1/migrations/firebase')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('platform')
+    ->inject('user')
     ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
-    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, array $platform, Event $queueForEvents, MigrationPublisher $publisherForMigrations) {
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $serviceAccountData = json_decode($serviceAccount, true);
 
         if (empty($serviceAccountData)) {
@@ -181,11 +163,12 @@ Http::post('/v1/migrations/firebase')
         $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setPlatform($platform)
+            ->setUser($user)
+            ->trigger();
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -222,9 +205,10 @@ Http::post('/v1/migrations/supabase')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('platform')
+    ->inject('user')
     ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
-    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, array $platform, Event $queueForEvents, MigrationPublisher $publisherForMigrations) {
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -248,11 +232,12 @@ Http::post('/v1/migrations/supabase')
         $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setPlatform($platform)
+            ->setUser($user)
+            ->trigger();
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -290,9 +275,10 @@ Http::post('/v1/migrations/nhost')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('platform')
+    ->inject('user')
     ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
-    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, array $platform, Event $queueForEvents, MigrationPublisher $publisherForMigrations) {
+    ->inject('queueForMigrations')
+    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
@@ -317,11 +303,12 @@ Http::post('/v1/migrations/nhost')
         $queueForEvents->setParam('migrationId', $migration->getId());
 
         // Trigger Transfer
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setPlatform($platform)
+            ->setUser($user)
+            ->trigger();
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -361,7 +348,7 @@ Http::post('/v1/migrations/csv/imports')
     ->inject('deviceForFiles')
     ->inject('deviceForMigrations')
     ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
+    ->inject('queueForMigrations')
     ->action(function (
         string $bucketId,
         string $fileId,
@@ -376,7 +363,7 @@ Http::post('/v1/migrations/csv/imports')
         Device $deviceForFiles,
         Device $deviceForMigrations,
         Event $queueForEvents,
-        MigrationPublisher $publisherForMigrations
+        Migration $queueForMigrations
     ) {
         $bucket = $authorization->skip(function () use ($internalFile, $dbForPlatform, $dbForProject, $bucketId) {
             if ($internalFile) {
@@ -440,17 +427,8 @@ Http::post('/v1/migrations/csv/imports')
             throw new \Exception('Unable to copy file');
         }
 
-        // getting databasetype
-        $resources = explode(':', $resourceId);
-        $databaseId = $resources[0];
-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
-        $databaseType = $database->getAttribute('type');
-        if (!in_array($databaseType, CSV_ALLOWED_DATABASE_TYPES)) {
-            throw new Exception(Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED, 'Database type not supported for csv');
-        }
         $fileSize = $deviceForMigrations->getFileSize($newPath);
-        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
-        $resourceType = getDatabaseResourceType($databaseType);
+        $resources = Transfer::extractServices([Transfer::GROUP_DATABASES]);
 
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => $migrationId,
@@ -460,7 +438,7 @@ Http::post('/v1/migrations/csv/imports')
             'destination' => Appwrite::getName(),
             'resources' => $resources,
             'resourceId' => $resourceId,
-            'resourceType' => $resourceType,
+            'resourceType' => Resource::TYPE_DATABASE,
             'statusCounters' => '{}',
             'resourceData' => '{}',
             'errors' => [],
@@ -472,10 +450,11 @@ Http::post('/v1/migrations/csv/imports')
 
         $queueForEvents->setParam('migrationId', $migration->getId());
 
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setProject($project)
+            ->trigger();
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -518,7 +497,7 @@ Http::post('/v1/migrations/csv/exports')
     ->inject('project')
     ->inject('platform')
     ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
+    ->inject('queueForMigrations')
     ->action(function (
         string $resourceId,
         string $filename,
@@ -537,7 +516,7 @@ Http::post('/v1/migrations/csv/exports')
         Document $project,
         array $platform,
         Event $queueForEvents,
-        MigrationPublisher $publisherForMigrations
+        Migration $queueForMigrations
     ) {
         try {
             $parsedQueries = Query::parseQueries($queries);
@@ -568,41 +547,25 @@ Http::post('/v1/migrations/csv/exports')
             throw new Exception(Exception::COLLECTION_NOT_FOUND);
         }
 
-        // getting databasetype
-        $resources = explode(':', $resourceId);
-        $databaseId = $resources[0];
-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
-        $databaseType = $database->getAttribute('type');
-        if (!in_array($databaseType, CSV_ALLOWED_DATABASE_TYPES)) {
-            throw new Exception(Exception::MIGRATION_DATABASE_TYPE_UNSUPPORTED, 'Database type not supported for csv');
-        }
-
-        // Schemaless databases (DocumentsDB, VectorsDB) allow queries on dynamic fields
-        $isSchemaless = in_array($databaseType, [DATABASE_TYPE_DOCUMENTSDB, DATABASE_TYPE_VECTORSDB]);
-
         $validator = new Documents(
             attributes: $collection->getAttribute('attributes', []),
             indexes: $collection->getAttribute('indexes', []),
             idAttributeType: $dbForProject->getAdapter()->getIdAttributeType(),
-            supportForAttributes: !$isSchemaless,
         );
 
         if (!$validator->isValid($parsedQueries)) {
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
         }
 
-        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
-        $resourceType = getDatabaseResourceType($databaseType);
-
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => ID::unique(),
             'status' => 'pending',
             'stage' => 'init',
             'source' => Appwrite::getName(),
             'destination' => CSV::getName(),
-            'resources' => $resources,
+            'resources' => Transfer::extractServices([Transfer::GROUP_DATABASES]),
             'resourceId' => $resourceId,
-            'resourceType' => $resourceType,
+            'resourceType' => Resource::TYPE_DATABASE,
             'statusCounters' => '{}',
             'resourceData' => '{}',
             'errors' => [],
@@ -622,296 +585,11 @@ Http::post('/v1/migrations/csv/exports')
 
         $queueForEvents->setParam('migrationId', $migration->getId());
 
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($migration, Response::MODEL_MIGRATION);
-    });
-
-Http::post('/v1/migrations/json/imports')
-    ->groups(['api', 'migrations'])
-    ->desc('Import documents from a JSON')
-    ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.[migrationId].create')
-    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createJSONImport',
-        description: '/docs/references/migrations/migration-json-import.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
-    ->param('fileId', '', new UID(), 'File ID.')
-    ->param('resourceId', null, new CompoundUID(), 'Composite ID in the format {databaseId:collectionId}, identifying a collection within a database.')
-    ->param('internalFile', false, new Boolean(), 'Is the file stored in an internal bucket?', true)
-    ->inject('response')
-    ->inject('dbForProject')
-    ->inject('dbForPlatform')
-    ->inject('authorization')
-    ->inject('project')
-    ->inject('platform')
-    ->inject('deviceForFiles')
-    ->inject('deviceForMigrations')
-    ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
-    ->action(function (
-        string $bucketId,
-        string $fileId,
-        string $resourceId,
-        bool $internalFile,
-        Response $response,
-        Database $dbForProject,
-        Database $dbForPlatform,
-        Authorization $authorization,
-        Document $project,
-        array $platform,
-        Device $deviceForFiles,
-        Device $deviceForMigrations,
-        Event $queueForEvents,
-        MigrationPublisher $publisherForMigrations
-    ) {
-        $bucket = $authorization->skip(function () use ($internalFile, $dbForPlatform, $dbForProject, $bucketId) {
-            if ($internalFile) {
-                return $dbForPlatform->getDocument('buckets', 'default');
-            }
-            return $dbForProject->getDocument('buckets', $bucketId);
-        });
-
-        if ($bucket->isEmpty()) {
-            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
-        }
-
-        $file = $authorization->skip(fn () => $internalFile ? $dbForPlatform->getDocument('bucket_' . $bucket->getSequence(), $fileId) : $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
-        if ($file->isEmpty()) {
-            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
-        }
-
-        $path = $file->getAttribute('path', '');
-        if (!$deviceForFiles->exists($path)) {
-            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND, 'File not found in ' . $path);
-        }
-
-        // No encryption or compression on files above 20MB.
-        $hasEncryption = !empty($file->getAttribute('openSSLCipher'));
-        $compression = $file->getAttribute('algorithm', Compression::NONE);
-        $hasCompression = $compression !== Compression::NONE;
-
-        $migrationId = ID::unique();
-        $newPath = $deviceForMigrations->getPath($migrationId . '_' . $fileId . '.json');
-
-        if ($hasEncryption || $hasCompression) {
-            $source = $deviceForFiles->read($path);
-
-            if ($hasEncryption) {
-                $source = OpenSSL::decrypt(
-                    $source,
-                    $file->getAttribute('openSSLCipher'),
-                    System::getEnv('_APP_OPENSSL_KEY_V' . $file->getAttribute('openSSLVersion')),
-                    0,
-                    hex2bin($file->getAttribute('openSSLIV')),
-                    hex2bin($file->getAttribute('openSSLTag'))
-                );
-            }
-
-            if ($hasCompression) {
-                switch ($compression) {
-                    case Compression::ZSTD:
-                        $source = (new Zstd())->decompress($source);
-                        break;
-                    case Compression::GZIP:
-                        $source = (new GZIP())->decompress($source);
-                        break;
-                }
-            }
-
-            // Manual write after decryption and/or decompression
-            if (!$deviceForMigrations->write($newPath, $source, 'application/json')) {
-                throw new \Exception('Unable to copy file');
-            }
-        } elseif (!$deviceForFiles->transfer($path, $newPath, $deviceForMigrations)) {
-            throw new \Exception('Unable to copy file');
-        }
-
-        $fileSize = $deviceForMigrations->getFileSize($newPath);
-
-        [$databaseId] = \explode(':', $resourceId, 2);
-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
-        if ($database->isEmpty()) {
-            throw new Exception(Exception::DATABASE_NOT_FOUND);
-        }
-        $databaseType = $database->getAttribute('type');
-        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
-        $resourceType = getDatabaseResourceType($databaseType);
-
-        $migration = $dbForProject->createDocument('migrations', new Document([
-            '$id' => $migrationId,
-            'status' => 'pending',
-            'stage' => 'init',
-            'source' => JSON::getName(),
-            'destination' => Appwrite::getName(),
-            'resources' => $resources,
-            'resourceId' => $resourceId,
-            'resourceType' => $resourceType,
-            'statusCounters' => '{}',
-            'resourceData' => '{}',
-            'errors' => [],
-            'options' => [
-                'path' => $newPath,
-                'size' => $fileSize,
-            ],
-        ]));
-
-        $queueForEvents->setParam('migrationId', $migration->getId());
-
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($migration, Response::MODEL_MIGRATION);
-    });
-
-Http::post('/v1/migrations/json/exports')
-    ->groups(['api', 'migrations'])
-    ->desc('Export documents to JSON')
-    ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.[migrationId].create')
-    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createJSONExport',
-        description: '/docs/references/migrations/migration-json-export.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
-    ->param('resourceId', null, new CompoundUID(), 'Composite ID in the format {databaseId:collectionId}, identifying a collection within a database to export.')
-    ->param('filename', '', new Text(255), 'The name of the file to be created for the export, excluding the .json extension.')
-    ->param('columns', [], new ArrayList(new Text(Database::LENGTH_KEY)), 'List of attributes to export. If empty, all attributes will be exported. You can use the `*` wildcard to export all attributes from the collection.', true)
-    ->param('queries', [], new ArrayList(new Text(0)), 'Array of query strings generated using the Query class provided by the SDK to filter documents to export. [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.', true)
-    ->param('notify', true, new Boolean(), 'Set to true to receive an email when the export is complete. Default is true.', true)
-    ->inject('user')
-    ->inject('response')
-    ->inject('dbForProject')
-    ->inject('dbForPlatform')
-    ->inject('authorization')
-    ->inject('project')
-    ->inject('platform')
-    ->inject('queueForEvents')
-    ->inject('publisherForMigrations')
-    ->action(function (
-        string $resourceId,
-        string $filename,
-        array $columns,
-        array $queries,
-        bool $notify,
-        Document $user,
-        Response $response,
-        Database $dbForProject,
-        Database $dbForPlatform,
-        Authorization $authorization,
-        Document $project,
-        array $platform,
-        Event $queueForEvents,
-        MigrationPublisher $publisherForMigrations
-    ) {
-        try {
-            $parsedQueries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        $bucket = $authorization->skip(fn () => $dbForPlatform->getDocument('buckets', 'default'));
-        if ($bucket->isEmpty()) {
-            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
-        }
-
-        [$databaseId, $collectionId] = \explode(':', $resourceId, 2);
-        if (empty($databaseId)) {
-            throw new Exception(Exception::DATABASE_NOT_FOUND);
-        }
-        if (empty($collectionId)) {
-            throw new Exception(Exception::COLLECTION_NOT_FOUND);
-        }
-
-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
-        if ($database->isEmpty()) {
-            throw new Exception(Exception::DATABASE_NOT_FOUND);
-        }
-
-        $collection = $authorization->skip(fn () => $dbForProject->getDocument('database_' . $database->getSequence(), $collectionId));
-        if ($collection->isEmpty()) {
-            throw new Exception(Exception::COLLECTION_NOT_FOUND);
-        }
-
-        $databaseType = $database->getAttribute('type');
-
-        // Schemaless databases (DocumentsDB, VectorsDB) allow queries on dynamic fields
-        $isSchemaless = in_array($databaseType, [DATABASE_TYPE_DOCUMENTSDB, DATABASE_TYPE_VECTORSDB]);
-
-        $validator = new Documents(
-            attributes: $collection->getAttribute('attributes', []),
-            indexes: $collection->getAttribute('indexes', []),
-            idAttributeType: $dbForProject->getAdapter()->getIdAttributeType(),
-            supportForAttributes: !$isSchemaless,
-        );
-
-        if (!$validator->isValid($parsedQueries)) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-        }
-
-        $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
-        $resourceType = getDatabaseResourceType($databaseType);
-
-        $migration = $dbForProject->createDocument('migrations', new Document([
-            '$id' => ID::unique(),
-            'status' => 'pending',
-            'stage' => 'init',
-            'source' => Appwrite::getName(),
-            'destination' => JSON::getName(),
-            'resources' => $resources,
-            'resourceId' => $resourceId,
-            'resourceType' => $resourceType,
-            'statusCounters' => '{}',
-            'resourceData' => '{}',
-            'errors' => [],
-            'options' => [
-                'bucketId' => 'default', // Always use internal bucket
-                'filename' => $filename,
-                'columns' => $columns,
-                'queries' => $queries,
-                'notify' => $notify,
-                'userInternalId' => $user->getSequence(),
-            ],
-        ]));
-
-        $queueForEvents->setParam('migrationId', $migration->getId());
-
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setPlatform($platform)
+            ->trigger();
 
         $response
             ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
@@ -1035,11 +713,12 @@ Http::get('/v1/migrations/appwrite/report')
     ->param('projectID', '', new Text(512), "Source's Project ID")
     ->param('key', '', new Text(512), "Source's API Key")
     ->inject('response')
-    ->inject('getDatabasesDB')
-    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response, callable $getDatabasesDB) {
-
+    ->inject('dbForProject')
+    ->inject('project')
+    ->inject('user')
+    ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
         try {
-            $appwrite = new Appwrite($projectID, $endpoint, $key, $getDatabasesDB);
+            $appwrite = new Appwrite($projectID, $endpoint, $key);
             $report = $appwrite->report($resources);
         } catch (\Throwable $e) {
             throw new Exception(
@@ -1208,8 +887,9 @@ Http::patch('/v1/migrations/:migrationId')
     ->inject('dbForProject')
     ->inject('project')
     ->inject('platform')
-    ->inject('publisherForMigrations')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, array $platform, MigrationPublisher $publisherForMigrations) {
+    ->inject('user')
+    ->inject('queueForMigrations')
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Migration $queueForMigrations) {
         $migration = $dbForProject->getDocument('migrations', $migrationId);
 
         if ($migration->isEmpty()) {
@@ -1225,11 +905,12 @@ Http::patch('/v1/migrations/:migrationId')
             ->setAttribute('dateUpdated', \time());
 
         // Trigger Migration
-        $publisherForMigrations->enqueue(new MigrationMessage(
-            project: $project,
-            migration: $migration,
-            platform: $platform,
-        ));
+        $queueForMigrations
+            ->setMigration($migration)
+            ->setProject($project)
+            ->setPlatform($platform)
+            ->setUser($user)
+            ->trigger();
 
         $response->noContent();
     });

app/controllers/api/project.php

@@ -1,15 +1,25 @@
 <?php
 
+use Appwrite\Extend\Exception;
 use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
+use Utopia\Database\Validator\UID;
 use Utopia\Http\Http;
+use Utopia\Validator\Boolean;
+use Utopia\Validator\Nullable;
+use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
 Http::get('/v1/project/usage')
@@ -52,33 +62,16 @@ Http::get('/v1/project/usage')
                 METRIC_EXECUTIONS_MB_SECONDS,
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DOCUMENTS,
-                METRIC_DOCUMENTS_DOCUMENTSDB,
                 METRIC_DATABASES,
-                METRIC_DATABASES_DOCUMENTSDB,
                 METRIC_USERS,
                 METRIC_BUCKETS,
                 METRIC_FILES_STORAGE,
                 METRIC_DATABASES_STORAGE,
-                METRIC_DATABASES_STORAGE_DOCUMENTSDB,
                 METRIC_DEPLOYMENTS_STORAGE,
                 METRIC_BUILDS_STORAGE,
                 METRIC_DATABASES_OPERATIONS_READS,
-                METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
                 METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
                 METRIC_FILES_IMAGES_TRANSFORMED,
-                // VectorsDB totals
-                METRIC_DATABASES_VECTORSDB,
-                METRIC_COLLECTIONS_VECTORSDB,
-                METRIC_DOCUMENTS_VECTORSDB,
-                METRIC_DATABASES_STORAGE_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_READS_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB,
-                // Embeddings totals
-                METRIC_EMBEDDINGS_TEXT,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR
             ],
             'period' => [
                 METRIC_NETWORK_REQUESTS,
@@ -87,26 +80,11 @@ Http::get('/v1/project/usage')
                 METRIC_USERS,
                 METRIC_EXECUTIONS,
                 METRIC_DATABASES_STORAGE,
-                METRIC_DATABASES_STORAGE_DOCUMENTSDB,
                 METRIC_EXECUTIONS_MB_SECONDS,
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DATABASES_OPERATIONS_READS,
-                METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB,
                 METRIC_DATABASES_OPERATIONS_WRITES,
-                METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB,
                 METRIC_FILES_IMAGES_TRANSFORMED,
-                // VectorsDB time series
-                METRIC_DATABASES_VECTORSDB,
-                METRIC_COLLECTIONS_VECTORSDB,
-                METRIC_DOCUMENTS_VECTORSDB,
-                METRIC_DATABASES_STORAGE_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_READS_VECTORSDB,
-                METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB,
-                // Embeddings time series
-                METRIC_EMBEDDINGS_TEXT,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION,
-                METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR
             ]
         ];
 
@@ -379,11 +357,8 @@ Http::get('/v1/project/usage')
             'buildsMbSecondsTotal' => $total[METRIC_BUILDS_MB_SECONDS],
             'documentsTotal' => $total[METRIC_DOCUMENTS],
             'rowsTotal' => $total[METRIC_DOCUMENTS],
-            'documentsdbDocumentsTotal' => $total[METRIC_DOCUMENTS_DOCUMENTSDB],
             'databasesTotal' => $total[METRIC_DATABASES],
-            'documentsdbTotal' => $total[METRIC_DATABASES_DOCUMENTSDB],
             'databasesStorageTotal' => $total[METRIC_DATABASES_STORAGE],
-            'documentsdbDatabasesStorageTotal' => $total[METRIC_DATABASES_STORAGE_DOCUMENTSDB],
             'usersTotal' => $total[METRIC_USERS],
             'bucketsTotal' => $total[METRIC_BUCKETS],
             'filesStorageTotal' => $total[METRIC_FILES_STORAGE],
@@ -392,27 +367,10 @@ Http::get('/v1/project/usage')
             'deploymentsStorageTotal' => $total[METRIC_DEPLOYMENTS_STORAGE],
             'databasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS],
             'databasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES],
-            'documentsdbDatabasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB],
-            'documentsdbDatabasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB],
-            'vectorsdbDatabasesTotal' => $total[METRIC_DATABASES_VECTORSDB] ?? 0,
-            'vectorsdbCollectionsTotal' => $total[METRIC_COLLECTIONS_VECTORSDB] ?? 0,
-            'vectorsdbDocumentsTotal' => $total[METRIC_DOCUMENTS_VECTORSDB] ?? 0,
-            'vectorsdbDatabasesStorageTotal' => $total[METRIC_DATABASES_STORAGE_VECTORSDB] ?? 0,
-            'vectorsdbDatabasesReadsTotal' => $total[METRIC_DATABASES_OPERATIONS_READS_VECTORSDB] ?? 0,
-            'vectorsdbDatabasesWritesTotal' => $total[METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB] ?? 0,
             'executionsBreakdown' => $executionsBreakdown,
             'bucketsBreakdown' => $bucketsBreakdown,
             'databasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS],
             'databasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES],
-            'documentsdbDatabasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB],
-            'documentsdbDatabasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB],
-            'documentsdbDatabasesStorage' => $usage[METRIC_DATABASES_STORAGE_DOCUMENTSDB],
-            'vectorsdbDatabases' => $usage[METRIC_DATABASES_VECTORSDB] ?? [],
-            'vectorsdbCollections' => $usage[METRIC_COLLECTIONS_VECTORSDB] ?? [],
-            'vectorsdbDocuments' => $usage[METRIC_DOCUMENTS_VECTORSDB] ?? [],
-            'vectorsdbDatabasesStorage' => $usage[METRIC_DATABASES_STORAGE_VECTORSDB] ?? [],
-            'vectorsdbDatabasesReads' => $usage[METRIC_DATABASES_OPERATIONS_READS_VECTORSDB] ?? [],
-            'vectorsdbDatabasesWrites' => $usage[METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB] ?? [],
             'databasesStorageBreakdown' => $databasesStorageBreakdown,
             'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
             'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
@@ -422,13 +380,230 @@ Http::get('/v1/project/usage')
             'authPhoneCountryBreakdown' => $authPhoneCountryBreakdown,
             'imageTransformations' => $usage[METRIC_FILES_IMAGES_TRANSFORMED],
             'imageTransformationsTotal' => $total[METRIC_FILES_IMAGES_TRANSFORMED],
-            'embeddingsText' => $usage[METRIC_EMBEDDINGS_TEXT] ?? [],
-            'embeddingsTextTokens' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS] ?? [],
-            'embeddingsTextDuration' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION] ?? [],
-            'embeddingsTextErrors' => $usage[METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR] ?? [],
-            'embeddingsTextTotal' => $total[METRIC_EMBEDDINGS_TEXT] ?? 0,
-            'embeddingsTextTokensTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS] ?? 0,
-            'embeddingsTextDurationTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION] ?? 0,
-            'embeddingsTextErrorsTotal' => $total[METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR] ?? 0,
         ]), Response::MODEL_USAGE_PROJECT);
     });
+
+
+// Variables
+Http::post('/v1/project/variables')
+    ->desc('Create variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.write')
+    ->label('audits.event', 'variable.create')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'createVariable',
+        description: '/docs/references/project/create-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_VARIABLE,
+            )
+        ]
+    ))
+    ->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('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
+    ->inject('project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('dbForPlatform')
+    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+        $variableId = ID::unique();
+
+        $variable = new Document([
+            '$id' => $variableId,
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+            'resourceInternalId' => '',
+            'resourceId' => '',
+            'resourceType' => 'project',
+            'key' => $key,
+            'value' => $value,
+            'secret' => $secret,
+            'search' => implode(' ', [$variableId, $key, 'project']),
+        ]);
+
+        try {
+            $variable = $dbForProject->createDocument('variables', $variable);
+        } catch (DuplicateException $th) {
+            throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
+        }
+
+        $functions = $dbForProject->find('functions', [
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        foreach ($functions as $function) {
+            $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+        }
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($variable, Response::MODEL_VARIABLE);
+    });
+
+Http::get('/v1/project/variables')
+    ->desc('List variables')
+    ->groups(['api'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'listVariables',
+        description: '/docs/references/project/list-variables.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_VARIABLE_LIST,
+            )
+        ]
+    ))
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (Response $response, Database $dbForProject) {
+        $variables = $dbForProject->find('variables', [
+            Query::equal('resourceType', ['project']),
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        $response->dynamic(new Document([
+            'variables' => $variables,
+            'total' => \count($variables),
+        ]), Response::MODEL_VARIABLE_LIST);
+    });
+
+Http::get('/v1/project/variables/:variableId')
+    ->desc('Get variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.read')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'getVariable',
+        description: '/docs/references/project/get-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_VARIABLE,
+            )
+        ]
+    ))
+    ->param('variableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Variable unique ID.', false, ['dbForProject'])
+    ->inject('response')
+    ->inject('project')
+    ->inject('dbForProject')
+    ->action(function (string $variableId, Response $response, Document $project, Database $dbForProject) {
+        $variable = $dbForProject->getDocument('variables', $variableId);
+        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
+            throw new Exception(Exception::VARIABLE_NOT_FOUND);
+        }
+
+        $response->dynamic($variable, Response::MODEL_VARIABLE);
+    });
+
+Http::put('/v1/project/variables/:variableId')
+    ->desc('Update variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'updateVariable',
+        description: '/docs/references/project/update-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_VARIABLE,
+            )
+        ]
+    ))
+    ->param('variableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Variable unique ID.', false, ['dbForProject'])
+    ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
+    ->param('value', null, new Nullable(new Text(8192, 0)), 'Variable value. Max length: 8192 chars.', true)
+    ->param('secret', null, new Nullable(new Boolean()), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
+    ->inject('project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('dbForPlatform')
+    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+        $variable = $dbForProject->getDocument('variables', $variableId);
+        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
+            throw new Exception(Exception::VARIABLE_NOT_FOUND);
+        }
+
+        if ($variable->getAttribute('secret') === true && $secret === false) {
+            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
+        }
+
+        $variable
+            ->setAttribute('key', $key)
+            ->setAttribute('value', $value ?? $variable->getAttribute('value'))
+            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
+            ->setAttribute('search', implode(' ', [$variableId, $key, 'project']));
+
+        try {
+            $dbForProject->updateDocument('variables', $variable->getId(), $variable);
+        } catch (DuplicateException $th) {
+            throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
+        }
+
+        $functions = $dbForProject->find('functions', [
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        foreach ($functions as $function) {
+            $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+        }
+
+        $response->dynamic($variable, Response::MODEL_VARIABLE);
+    });
+
+Http::delete('/v1/project/variables/:variableId')
+    ->desc('Delete variable')
+    ->groups(['api'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'project',
+        group: null,
+        name: 'deleteVariable',
+        description: '/docs/references/project/delete-variable.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ],
+        contentType: ContentType::NONE
+    ))
+    ->param('variableId', '', fn (Database $dbForProject) => new UID($dbForProject->getAdapter()->getMaxUIDLength()), 'Variable unique ID.', false, ['dbForProject'])
+    ->inject('project')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $variableId, Document $project, Response $response, Database $dbForProject) {
+        $variable = $dbForProject->getDocument('variables', $variableId);
+        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
+            throw new Exception(Exception::VARIABLE_NOT_FOUND);
+        }
+
+        $dbForProject->deleteDocument('variables', $variable->getId());
+
+        $functions = $dbForProject->find('functions', [
+            Query::limit(APP_LIMIT_SUBQUERY)
+        ]);
+
+        foreach ($functions as $function) {
+            $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
+        }
+
+        $response->noContent();
+    });

app/controllers/api/projects.php

@@ -5,18 +5,28 @@ use Appwrite\Auth\Validator\MockNumber;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Mail;
 use Appwrite\Extend\Exception;
+use Appwrite\Network\Platform;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Deprecated;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Template\Template;
+use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Keys;
 use Appwrite\Utopia\Response;
 use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Query as QueryException;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\UID;
 use Utopia\Emails\Validator\Email;
 use Utopia\Http\Http;
@@ -71,20 +81,202 @@ Http::get('/v1/projects/:projectId')
         $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
+Http::patch('/v1/projects/:projectId/service')
+    ->desc('Update service status')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'projects',
+        name: 'updateServiceStatus',
+        description: '/docs/references/projects/update-service-status.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PROJECT,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('service', '', new WhiteList(array_keys(array_filter(Config::getParam('services'), fn ($element) => $element['optional'])), true), 'Service name.')
+    ->param('status', null, new Boolean(), 'Service status.')
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $service, bool $status, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $services = $project->getAttribute('services', []);
+        $services[$service] = $status;
+
+        $project = $dbForPlatform->updateDocument('projects', $project->getId(), $project->setAttribute('services', $services));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
 Http::patch('/v1/projects/:projectId/service/all')
     ->desc('Update all service status')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
-    ->action(function () {
-        throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED, 'Bulk API no longer exists for services. Please change status individually.');
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'projects',
+        name: 'updateServiceStatusAll',
+        description: '/docs/references/projects/update-service-status-all.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PROJECT,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('status', null, new Boolean(), 'Service status.')
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, bool $status, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $allServices = array_keys(array_filter(Config::getParam('services'), fn ($element) => $element['optional']));
+
+        $services = [];
+        foreach ($allServices as $service) {
+            $services[$service] = $status;
+        }
+
+        $project = $dbForPlatform->updateDocument('projects', $project->getId(), $project->setAttribute('services', $services));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
+Http::patch('/v1/projects/:projectId/api')
+    ->desc('Update API status')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk', [
+        new Method(
+            namespace: 'projects',
+            group: 'projects',
+            name: 'updateApiStatus',
+            description: '/docs/references/projects/update-api-status.md',
+            auth: [AuthType::ADMIN],
+            responses: [
+                new SDKResponse(
+                    code: Response::STATUS_CODE_OK,
+                    model: Response::MODEL_PROJECT,
+                )
+            ],
+            deprecated: new Deprecated(
+                since: '1.8.0',
+                replaceWith: 'projects.updateAPIStatus',
+            ),
+            public: false,
+        ),
+        new Method(
+            namespace: 'projects',
+            group: 'projects',
+            name: 'updateAPIStatus',
+            description: '/docs/references/projects/update-api-status.md',
+            auth: [AuthType::ADMIN],
+            responses: [
+                new SDKResponse(
+                    code: Response::STATUS_CODE_OK,
+                    model: Response::MODEL_PROJECT,
+                )
+            ]
+        )
+    ])
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('api', '', new WhiteList(array_keys(Config::getParam('apis')), true), 'API name.')
+    ->param('status', null, new Boolean(), 'API status.')
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $api, bool $status, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $apis = $project->getAttribute('apis', []);
+        $apis[$api] = $status;
+
+        $project = $dbForPlatform->updateDocument('projects', $project->getId(), $project->setAttribute('apis', $apis));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 Http::patch('/v1/projects/:projectId/api/all')
     ->desc('Update all API status')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
-    ->action(function () {
-        throw new Exception(Exception::GENERAL_NOT_IMPLEMENTED, 'Bulk API no longer exists for services. Please change status individually.');
+    ->label('sdk', [
+        new Method(
+            namespace: 'projects',
+            group: 'projects',
+            name: 'updateApiStatusAll',
+            description: '/docs/references/projects/update-api-status-all.md',
+            auth: [AuthType::ADMIN],
+            responses: [
+                new SDKResponse(
+                    code: Response::STATUS_CODE_OK,
+                    model: Response::MODEL_PROJECT,
+                )
+            ],
+            deprecated: new Deprecated(
+                since: '1.8.0',
+                replaceWith: 'projects.updateAPIStatusAll',
+            ),
+            public: false,
+        ),
+        new Method(
+            namespace: 'projects',
+            group: 'projects',
+            name: 'updateAPIStatusAll',
+            description: '/docs/references/projects/update-api-status-all.md',
+            auth: [AuthType::ADMIN],
+            responses: [
+                new SDKResponse(
+                    code: Response::STATUS_CODE_OK,
+                    model: Response::MODEL_PROJECT,
+                )
+            ]
+        )
+    ])
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('status', null, new Boolean(), 'API status.')
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, bool $status, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $allApis = array_keys(Config::getParam('apis'));
+
+        $apis = [];
+        foreach ($allApis as $api) {
+            $apis[$api] = $status;
+        }
+
+        $project = $dbForPlatform->updateDocument('projects', $project->getId(), $project->setAttribute('apis', $apis));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
 Http::patch('/v1/projects/:projectId/oauth2')
@@ -577,6 +769,288 @@ Http::delete('/v1/projects/:projectId')
         $response->noContent();
     });
 
+// Keys
+
+Http::post('/v1/projects/:projectId/keys')
+    ->desc('Create key')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'keys.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'keys',
+        name: 'createKey',
+        description: '/docs/references/projects/create-key.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_KEY,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    // TODO: When migrating to Platform API, mark keyId required for consistency
+    ->param('keyId', 'unique()', fn (Database $dbForPlatform) => new CustomId($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key 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.', true, ['dbForPlatform'])->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
+    ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
+    ->param('expire', null, new Nullable(new DatetimeValidator()), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Use null for unlimited expiration.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $keyId, string $name, array $scopes, ?string $expire, Response $response, Database $dbForPlatform) {
+        $keyId = $keyId == 'unique()' ? ID::unique() : $keyId;
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $key = new Document([
+            '$id' => $keyId,
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+            'resourceInternalId' => $project->getSequence(),
+            'resourceId' => $project->getId(),
+            'resourceType' => 'projects',
+            'name' => $name,
+            'scopes' => $scopes,
+            'expire' => $expire,
+            'sdks' => [],
+            'accessedAt' => null,
+            'secret' => API_KEY_STANDARD . '_' . \bin2hex(\random_bytes(128)),
+        ]);
+
+        try {
+            $key = $dbForPlatform->createDocument('keys', $key);
+        } catch (Duplicate) {
+            throw new Exception(Exception::KEY_ALREADY_EXISTS);
+        }
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($key, Response::MODEL_KEY);
+    });
+
+Http::get('/v1/projects/:projectId/keys')
+    ->desc('List keys')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'keys.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'keys',
+        name: 'listKeys',
+        description: '/docs/references/projects/list-keys.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_KEY_LIST,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('queries', [], new Keys(), '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(', ', Keys::ALLOWED_ATTRIBUTES), true)
+    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, array $queries, bool $includeTotal, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        try {
+            $queries = Query::parseQueries($queries);
+        } catch (QueryException $e) {
+            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
+        }
+
+        // Backwards compatibility
+        if (\count(Query::getByType($queries, [Query::TYPE_LIMIT])) === 0) {
+            $queries[] = Query::limit(5000);
+        }
+
+        $queries[] = Query::equal('resourceType', ['projects']);
+        $queries[] = Query::equal('resourceInternalId', [$project->getSequence()]);
+
+        $cursor = Query::getCursorQueries($queries, false);
+        $cursor = \reset($cursor);
+
+        if ($cursor !== false) {
+            $validator = new Cursor();
+            if (!$validator->isValid($cursor)) {
+                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+            }
+
+            $keyId = $cursor->getValue();
+            $cursorDocument = $dbForPlatform->getDocument('keys', $keyId);
+
+            if ($cursorDocument->isEmpty()) {
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Key '{$keyId}' for the 'cursor' value not found.");
+            }
+
+            $cursor->setValue($cursorDocument);
+        }
+
+        $filterQueries = Query::groupByType($queries)['filters'];
+
+        $keys = $dbForPlatform->find('keys', $queries);
+
+        $response->dynamic(new Document([
+            'keys' => $keys,
+            'total' => $includeTotal ? $dbForPlatform->count('keys', $filterQueries, APP_LIMIT_COUNT) : 0,
+        ]), Response::MODEL_KEY_LIST);
+    });
+
+Http::get('/v1/projects/:projectId/keys/:keyId')
+    ->desc('Get key')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'keys.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'keys',
+        name: 'getKey',
+        description: '/docs/references/projects/get-key.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_KEY,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('keyId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $keyId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $key = $dbForPlatform->findOne('keys', [
+            Query::equal('$id', [$keyId]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($key->isEmpty()) {
+            throw new Exception(Exception::KEY_NOT_FOUND);
+        }
+
+        $response->dynamic($key, Response::MODEL_KEY);
+    });
+
+Http::put('/v1/projects/:projectId/keys/:keyId')
+    ->desc('Update key')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'keys.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'keys',
+        name: 'updateKey',
+        description: '/docs/references/projects/update-key.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_KEY,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('keyId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForPlatform'])
+    ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
+    ->param('scopes', null, new Nullable(new ArrayList(new WhiteList(array_keys(Config::getParam('projectScopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE)), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
+    ->param('expire', null, new Nullable(new DatetimeValidator()), 'Expiration time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Use null for unlimited expiration.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $keyId, string $name, array $scopes, ?string $expire, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $key = $dbForPlatform->findOne('keys', [
+            Query::equal('$id', [$keyId]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($key->isEmpty()) {
+            throw new Exception(Exception::KEY_NOT_FOUND);
+        }
+
+        $key
+            ->setAttribute('name', $name)
+            ->setAttribute('scopes', $scopes)
+            ->setAttribute('expire', $expire);
+
+        $dbForPlatform->updateDocument('keys', $key->getId(), $key);
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->dynamic($key, Response::MODEL_KEY);
+    });
+
+Http::delete('/v1/projects/:projectId/keys/:keyId')
+    ->desc('Delete key')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'keys.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'keys',
+        name: 'deleteKey',
+        description: '/docs/references/projects/delete-key.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ],
+        contentType: ContentType::NONE
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('keyId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Key unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $keyId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $key = $dbForPlatform->findOne('keys', [
+            Query::equal('$id', [$keyId]),
+            Query::equal('resourceType', ['projects']),
+            Query::equal('resourceInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($key->isEmpty()) {
+            throw new Exception(Exception::KEY_NOT_FOUND);
+        }
+
+        $dbForPlatform->deleteDocument('keys', $key->getId());
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->noContent();
+    });
+
 // JWT Keys
 
 Http::post('/v1/projects/:projectId/jwts')
@@ -619,6 +1093,272 @@ Http::post('/v1/projects/:projectId/jwts')
             ])]), Response::MODEL_JWT);
     });
 
+// Platforms
+
+Http::post('/v1/projects/:projectId/platforms')
+    ->desc('Create platform')
+    ->groups(['api', 'projects'])
+    ->label('audits.event', 'platforms.create')
+    ->label('audits.resource', 'project/{request.projectId}')
+    ->label('scope', 'platforms.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'platforms',
+        name: 'createPlatform',
+        description: '/docs/references/projects/create-platform.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_PLATFORM,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param(
+        'type',
+        null,
+        new WhiteList([
+            Platform::TYPE_WEB,
+            Platform::TYPE_FLUTTER_WEB,
+            Platform::TYPE_FLUTTER_IOS,
+            Platform::TYPE_FLUTTER_ANDROID,
+            Platform::TYPE_FLUTTER_LINUX,
+            Platform::TYPE_FLUTTER_MACOS,
+            Platform::TYPE_FLUTTER_WINDOWS,
+            Platform::TYPE_APPLE_IOS,
+            Platform::TYPE_APPLE_MACOS,
+            Platform::TYPE_APPLE_WATCHOS,
+            Platform::TYPE_APPLE_TVOS,
+            Platform::TYPE_ANDROID,
+            Platform::TYPE_UNITY,
+            Platform::TYPE_REACT_NATIVE_IOS,
+            Platform::TYPE_REACT_NATIVE_ANDROID,
+        ], true),
+        'Platform type. Possible values are: web, flutter-web, flutter-ios, flutter-android, flutter-linux, flutter-macos, flutter-windows, apple-ios, apple-macos, apple-watchos, apple-tvos, android, unity, react-native-ios, react-native-android.'
+    )
+    ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
+    ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true)
+    ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
+    ->param('hostname', '', new Hostname(), 'Platform client hostname. Max length: 256 chars.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $type, string $name, string $key, string $store, string $hostname, Response $response, Database $dbForPlatform) {
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $platform = new Document([
+            '$id' => ID::unique(),
+            '$permissions' => [
+                Permission::read(Role::any()),
+                Permission::update(Role::any()),
+                Permission::delete(Role::any()),
+            ],
+            'projectInternalId' => $project->getSequence(),
+            'projectId' => $project->getId(),
+            'type' => $type,
+            'name' => $name,
+            'key' => $key,
+            'store' => $store,
+            'hostname' => $hostname
+        ]);
+
+        $platform = $dbForPlatform->createDocument('platforms', $platform);
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($platform, Response::MODEL_PLATFORM);
+    });
+
+Http::get('/v1/projects/:projectId/platforms')
+    ->desc('List platforms')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'platforms.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'platforms',
+        name: 'listPlatforms',
+        description: '/docs/references/projects/list-platforms.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PLATFORM_LIST,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, bool $includeTotal, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $platforms = $dbForPlatform->find('platforms', [
+            Query::equal('projectInternalId', [$project->getSequence()]),
+            Query::limit(5000),
+        ]);
+
+        $response->dynamic(new Document([
+            'platforms' => $platforms,
+            'total' => $includeTotal ? count($platforms) : 0,
+        ]), Response::MODEL_PLATFORM_LIST);
+    });
+
+Http::get('/v1/projects/:projectId/platforms/:platformId')
+    ->desc('Get platform')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'platforms.read')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'platforms',
+        name: 'getPlatform',
+        description: '/docs/references/projects/get-platform.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PLATFORM,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('platformId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $platformId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $platform = $dbForPlatform->findOne('platforms', [
+            Query::equal('$id', [$platformId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($platform->isEmpty()) {
+            throw new Exception(Exception::PLATFORM_NOT_FOUND);
+        }
+
+        $response->dynamic($platform, Response::MODEL_PLATFORM);
+    });
+
+Http::put('/v1/projects/:projectId/platforms/:platformId')
+    ->desc('Update platform')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'platforms.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'platforms',
+        name: 'updatePlatform',
+        description: '/docs/references/projects/update-platform.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_PLATFORM,
+            )
+        ]
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('platformId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForPlatform'])
+    ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
+    ->param('key', '', new Text(256), 'Package name for android or bundle ID for iOS. Max length: 256 chars.', true)
+    ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
+    ->param('hostname', '', new Hostname(), 'Platform client URL. Max length: 256 chars.', true)
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $platformId, string $name, string $key, string $store, string $hostname, Response $response, Database $dbForPlatform) {
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $platform = $dbForPlatform->findOne('platforms', [
+            Query::equal('$id', [$platformId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($platform->isEmpty()) {
+            throw new Exception(Exception::PLATFORM_NOT_FOUND);
+        }
+
+        $platform
+            ->setAttribute('name', $name)
+            ->setAttribute('key', $key)
+            ->setAttribute('store', $store)
+            ->setAttribute('hostname', $hostname);
+
+        $dbForPlatform->updateDocument('platforms', $platform->getId(), $platform);
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->dynamic($platform, Response::MODEL_PLATFORM);
+    });
+
+Http::delete('/v1/projects/:projectId/platforms/:platformId')
+    ->desc('Delete platform')
+    ->groups(['api', 'projects'])
+    ->label('audits.event', 'platforms.delete')
+    ->label('audits.resource', 'project/{request.projectId}/platform/${request.platformId}')
+    ->label('scope', 'platforms.write')
+    ->label('sdk', new Method(
+        namespace: 'projects',
+        group: 'platforms',
+        name: 'deletePlatform',
+        description: '/docs/references/projects/delete-platform.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_NOCONTENT,
+                model: Response::MODEL_NONE,
+            )
+        ],
+        contentType: ContentType::NONE
+    ))
+    ->param('projectId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Project unique ID.', false, ['dbForPlatform'])
+    ->param('platformId', '', fn (Database $dbForPlatform) => new UID($dbForPlatform->getAdapter()->getMaxUIDLength()), 'Platform unique ID.', false, ['dbForPlatform'])
+    ->inject('response')
+    ->inject('dbForPlatform')
+    ->action(function (string $projectId, string $platformId, Response $response, Database $dbForPlatform) {
+
+        $project = $dbForPlatform->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $platform = $dbForPlatform->findOne('platforms', [
+            Query::equal('$id', [$platformId]),
+            Query::equal('projectInternalId', [$project->getSequence()]),
+        ]);
+
+        if ($platform->isEmpty()) {
+            throw new Exception(Exception::PLATFORM_NOT_FOUND);
+        }
+
+        $dbForPlatform->deleteDocument('platforms', $platformId);
+
+        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+
+        $response->noContent();
+    });
+
+
 // CUSTOM SMTP and Templates
 Http::patch('/v1/projects/:projectId/smtp')
     ->desc('Update SMTP')
@@ -830,7 +1570,7 @@ Http::post('/v1/projects/:projectId/smtp/tests')
                 ->trigger();
         }
 
-        $response->noContent();
+        return $response->noContent();
     });
 
 Http::get('/v1/projects/:projectId/templates/sms/:type/:locale')

app/controllers/api/users.php

@@ -73,7 +73,7 @@ use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
 /** TODO: Remove function when we move to using utopia/platform */
-function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, ?string $name, Document $project, Database $dbForProject, Hooks $hooks, array $plan): Document
+function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, ?string $name, Document $project, Database $dbForProject, Hooks $hooks): Document
 {
     $name = $name ?? '';
     $plaintextPassword = $password;
@@ -110,39 +110,11 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
             }
         }
 
-        $emailMetadata = [
-            'emailCanonical' => null,
-            'emailIsCanonical' => null,
-            'emailIsCorporate' => null,
-            'emailIsDisposable' => null,
-            'emailIsFree' => null,
-        ];
-
         try {
-            $parsedEmail = new Email($email ?? '');
-            $canonical = $parsedEmail->getCanonical();
-            $emailMetadata = [
-                'emailCanonical' => $canonical,
-                'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                'emailIsCorporate' => $parsedEmail->isCorporate(),
-                'emailIsDisposable' => $parsedEmail->isDisposable(),
-                'emailIsFree' => $parsedEmail->isFree(),
-            ];
-        } catch (\Throwable) {
+            $emailCanonical = new Email($email);
+        } catch (Throwable) {
+            $emailCanonical = null;
         }
-
-        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
-        }
-
-        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
-        }
-
-        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_FREE);
-        }
-
         $hashedPassword = null;
 
         $isHashed = !$hash instanceof Plaintext;
@@ -187,11 +159,11 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
             'tokens' => null,
             'memberships' => null,
             'search' => implode(' ', [$userId, $email, $phone, $name]),
-            'emailCanonical' => $emailMetadata['emailCanonical'],
-            'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
-            'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
-            'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
-            'emailIsFree' => $emailMetadata['emailIsFree'],
+            'emailCanonical' => $emailCanonical?->getCanonical(),
+            'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
+            'emailIsCorporate' => $emailCanonical?->isCorporate(),
+            'emailIsDisposable' => $emailCanonical?->isDisposable(),
+            'emailIsFree' => $emailCanonical?->isFree(),
         ]);
 
         if (!$isHashed && !empty($password)) {
@@ -284,11 +256,10 @@ Http::post('/v1/users')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $plaintext = new Plaintext();
 
-        $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks);
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($user, Response::MODEL_USER);
@@ -321,12 +292,11 @@ Http::post('/v1/users/bcrypt')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $bcrypt = new Bcrypt();
         $bcrypt->setCost(8); // Default cost
 
-        $user = createUser($bcrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($bcrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -360,11 +330,10 @@ Http::post('/v1/users/md5')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $md5 = new MD5();
 
-        $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -398,11 +367,10 @@ Http::post('/v1/users/argon2')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $argon2 = new Argon2();
 
-        $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -437,14 +405,13 @@ Http::post('/v1/users/sha')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, string $passwordVersion, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, string $passwordVersion, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $sha = new Sha();
         if (!empty($passwordVersion)) {
             $sha->setVersion($passwordVersion);
         }
 
-        $user = createUser($sha, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($sha, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -478,11 +445,10 @@ Http::post('/v1/users/phpass')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $phpass = new PHPass();
 
-        $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -521,8 +487,7 @@ Http::post('/v1/users/scrypt')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->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, Hooks $hooks, array $plan) {
+    ->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, Hooks $hooks) {
         $scrypt = new Scrypt();
         $scrypt
             ->setSalt($passwordSalt)
@@ -531,7 +496,7 @@ Http::post('/v1/users/scrypt')
             ->setParallelCost($passwordParallel)
             ->setLength($passwordLength);
 
-        $user = createUser($scrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($scrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -568,15 +533,14 @@ Http::post('/v1/users/scrypt-modified')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->inject('plan')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
         $scryptModified = new ScryptModified();
         $scryptModified
             ->setSalt($passwordSalt)
             ->setSaltSeparator($passwordSaltSeparator)
             ->setSignerKey($passwordSignerKey);
 
-        $user = createUser($scryptModified, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
+        $user = createUser($scryptModified, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -1008,8 +972,6 @@ Http::get('/v1/users/:userId/logs')
                 'userId' => ID::custom($log['data']['userId']),
                 'userEmail' => $log['data']['userEmail'] ?? null,
                 'userName' => $log['data']['userName'] ?? null,
-                'mode' => $log['data']['mode'] ?? null,
-                'userType' => $log['data']['userType'] ?? null,
                 'ip' => $log['ip'],
                 'time' => $log['time'],
                 'osCode' => $os['osCode'],
@@ -1508,10 +1470,8 @@ Http::patch('/v1/users/:userId/email')
     ->param('email', '', new EmailValidator(allowEmpty: true), 'User email.')
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('project')
-    ->inject('plan')
     ->inject('queueForEvents')
-    ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Document $project, array $plan, Event $queueForEvents) {
+    ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Event $queueForEvents) {
 
         $user = $dbForProject->getDocument('users', $userId);
 
@@ -1542,47 +1502,20 @@ Http::patch('/v1/users/:userId/email')
 
         $oldEmail = $user->getAttribute('email');
 
-        $emailMetadata = [
-            'emailCanonical' => null,
-            'emailIsCanonical' => null,
-            'emailIsCorporate' => null,
-            'emailIsDisposable' => null,
-            'emailIsFree' => null,
-        ];
-
         try {
-            $parsedEmail = new Email($email);
-            $canonical = $parsedEmail->getCanonical();
-            $emailMetadata = [
-                'emailCanonical' => $canonical,
-                'emailIsCanonical' => $parsedEmail->get() === $canonical,
-                'emailIsCorporate' => $parsedEmail->isCorporate(),
-                'emailIsDisposable' => $parsedEmail->isDisposable(),
-                'emailIsFree' => $parsedEmail->isFree(),
-            ];
-        } catch (\Throwable) {
-        }
-
-        if (($plan['supportsDisposableEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['disposableEmails'] ?? false) && ($emailMetadata['emailIsDisposable'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_DISPOSABLE);
-        }
-
-        if (($plan['supportsCanonicalEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['canonicalEmails'] ?? false) && ($emailMetadata['emailIsCanonical'] ?? true) === false) {
-            throw new Exception(Exception::USER_EMAIL_NOT_CANONICAL);
-        }
-
-        if (($plan['supportsFreeEmailValidation'] ?? false) && ($project->getAttribute('auths', [])['freeEmails'] ?? false) && ($emailMetadata['emailIsFree'] ?? false)) {
-            throw new Exception(Exception::USER_EMAIL_FREE);
+            $emailCanonical = new Email($email);
+        } catch (Throwable) {
+            $emailCanonical = null;
         }
 
         $user
             ->setAttribute('email', $email)
             ->setAttribute('emailVerification', false)
-            ->setAttribute('emailCanonical', $emailMetadata['emailCanonical'])
-            ->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical'])
-            ->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate'])
-            ->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable'])
-            ->setAttribute('emailIsFree', $emailMetadata['emailIsFree'])
+            ->setAttribute('emailCanonical', $emailCanonical?->getCanonical())
+            ->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported())
+            ->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate())
+            ->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable())
+            ->setAttribute('emailIsFree', $emailCanonical?->isFree())
         ;
 
         try {
@@ -2404,8 +2337,9 @@ Http::post('/v1/users/:userId/sessions')
             ->setParam('sessionId', $session->getId())
             ->setPayload($response->output($session, Response::MODEL_SESSION));
 
-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($session, Response::MODEL_SESSION);
+        return $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($session, Response::MODEL_SESSION);
     });
 
 Http::post('/v1/users/:userId/tokens')
@@ -2468,8 +2402,9 @@ Http::post('/v1/users/:userId/tokens')
             ->setParam('tokenId', $token->getId())
             ->setPayload($response->output($token, Response::MODEL_TOKEN));
 
-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($token, Response::MODEL_TOKEN);
+        return $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($token, Response::MODEL_TOKEN);
     });
 
 Http::delete('/v1/users/:userId/sessions/:sessionId')
@@ -2723,7 +2658,7 @@ Http::delete('/v1/users/identities/:identityId')
             ->setParam('identityId', $identity->getId())
             ->setPayload($response->output($identity, Response::MODEL_IDENTITY));
 
-        $response->noContent();
+        return $response->noContent();
     });
 
 Http::post('/v1/users/:userId/jwts')

app/controllers/general.php

@@ -25,7 +25,6 @@ use Appwrite\Utopia\Request\Filters\V18 as RequestV18;
 use Appwrite\Utopia\Request\Filters\V19 as RequestV19;
 use Appwrite\Utopia\Request\Filters\V20 as RequestV20;
 use Appwrite\Utopia\Request\Filters\V21 as RequestV21;
-use Appwrite\Utopia\Request\Filters\V22 as RequestV22;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Filters\V16 as ResponseV16;
 use Appwrite\Utopia\Response\Filters\V17 as ResponseV17;
@@ -33,7 +32,6 @@ use Appwrite\Utopia\Response\Filters\V18 as ResponseV18;
 use Appwrite\Utopia\Response\Filters\V19 as ResponseV19;
 use Appwrite\Utopia\Response\Filters\V20 as ResponseV20;
 use Appwrite\Utopia\Response\Filters\V21 as ResponseV21;
-use Appwrite\Utopia\Response\Filters\V22 as ResponseV22;
 use Appwrite\Utopia\View;
 use Executor\Executor;
 use MaxMind\Db\Reader;
@@ -63,6 +61,8 @@ use Utopia\System\System;
 use Utopia\Validator;
 use Utopia\Validator\Text;
 
+Config::setParam('domainVerification', false);
+Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
 function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, Bus $bus, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey, DeleteEvent $queueForDeletes, int $executionsRetentionCount)
@@ -166,14 +166,14 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
                 if ($request->getMethod() !== Request::METHOD_GET) {
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.', view: $errorView);
                 }
-                $response->redirect('https://' . $request->getHostname() . $request->getURI());
-                return false;
+                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
             }
         }
 
         /** @var Database $dbForProject */
         $dbForProject = $getProjectDB($project);
 
+        /** @var Document $deployment */
         if (!empty($rule->getAttribute('deploymentId', ''))) {
             $deployment = $authorization->skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
         } else {
@@ -244,7 +244,6 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         if ($isPreview && $requirePreview) {
             $cookie = $request->getCookie(COOKIE_NAME_PREVIEW, '');
             $authorized = false;
-            $user = new Document();
 
             // Security checks to mark authorized true
             if (!empty($cookie)) {
@@ -274,7 +273,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
 
                 $membershipExists = false;
                 $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-                if (!$project->isEmpty() && !$user->isEmpty()) {
+                if (!$project->isEmpty() && isset($user)) {
                     $teamId = $project->getAttribute('teamId', '');
                     $membership = $user->find('teamId', $teamId, 'memberships');
                     if (!empty($membership)) {
@@ -380,7 +379,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         $executionId = ID::unique();
 
         $headers = \array_merge([], $requestHeaders);
-        $headers['x-appwrite-execution-id'] = $executionId;
+        $headers['x-appwrite-execution-id'] = $executionId ?? '';
         $headers['x-appwrite-user-id'] = '';
         $headers['x-appwrite-country-code'] = '';
         $headers['x-appwrite-continent-code'] = '';
@@ -460,7 +459,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
                 'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body,
+                'APPWRITE_FUNCTION_DATA' => $body ?? '',
                 'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
                 'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
             ]);
@@ -530,11 +529,6 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         }
 
         /** Execute function */
-        $executionResponse = [
-            'headers' => [],
-            'body' => '',
-        ];
-
         try {
             $version = match ($type) {
                 'function' => $resource->getAttribute('version', 'v2'),
@@ -740,7 +734,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         $execution->setAttribute('responseBody', $executionResponse['body'] ?? '');
         $execution->setAttribute('responseHeaders', $headers);
 
-        $body = $execution['responseBody'];
+        $body = $execution['responseBody'] ?? '';
 
         $contentType = 'text/plain';
         foreach ($executionResponse['headers'] as $name => $values) {
@@ -754,8 +748,11 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
             }
 
             if (\is_array($values)) {
+                $count = 0;
                 foreach ($values as $value) {
-                    $response->addHeader($name, $value);
+                    $override = $count === 0;
+                    $response->addHeader($name, $value, override: $override);
+                    $count++;
                 }
             } else {
                 $response->addHeader($name, $values);
@@ -865,12 +862,12 @@ Http::init()
         * Request format
         */
         $route = $utopia->getRoute();
-        $request->setRoute($route);
+        Request::setRoute($route);
 
         if ($route === null) {
-            $response->setStatusCode(404);
-            $response->send('Not Found');
-            return;
+            return $response
+                ->setStatusCode(404)
+                ->send('Not Found');
         }
 
         $requestFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
@@ -894,9 +891,6 @@ Http::init()
             if (version_compare($requestFormat, '1.9.0', '<')) {
                 $request->addFilter(new RequestV21());
             }
-            if (version_compare($requestFormat, '1.9.1', '<')) {
-                $request->addFilter(new RequestV22());
-            }
         }
 
         $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
@@ -904,16 +898,40 @@ Http::init()
             $locale->setDefault($localeParam);
         }
 
+        $origin = \parse_url($request->getOrigin($request->getReferer('')), PHP_URL_HOST);
+        $selfDomain = new Domain($request->getHostname());
+        $endDomain = new Domain((string)$origin);
+        Config::setParam(
+            'domainVerification',
+            ($selfDomain->getRegisterable() === $endDomain->getRegisterable()) &&
+                $endDomain->getRegisterable() !== ''
+        );
+
         $localHosts = ['localhost','localhost:'.$request->getPort()];
 
         $migrationHost = System::getEnv('_APP_MIGRATION_HOST');
         if (!empty($migrationHost)) {
-            // Treat the migration host like localhost because internal migration and
-            // CI traffic may use it before a public domain is configured.
             $localHosts[] = $migrationHost;
             $localHosts[] = $migrationHost.':'.$request->getPort();
         }
 
+        $isLocalHost = in_array($request->getHostname(), $localHosts);
+        $isIpAddress = filter_var($request->getHostname(), FILTER_VALIDATE_IP) !== false;
+
+        $isConsoleProject = $project->getAttribute('$id', '') === 'console';
+        $isConsoleRootSession = System::getEnv('_APP_CONSOLE_ROOT_SESSION', 'disabled') === 'enabled';
+
+        Config::setParam(
+            'cookieDomain',
+            $isLocalHost || $isIpAddress
+                ? null
+                : (
+                    $isConsoleProject && $isConsoleRootSession
+                    ? '.' . $selfDomain->getRegisterable()
+                    : '.' . $request->getHostname()
+                )
+        );
+
         $warnings = [];
 
         /*
@@ -921,9 +939,6 @@ Http::init()
          */
         $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
         if ($responseFormat) {
-            if (version_compare($responseFormat, '1.9.1', '<')) {
-                $response->addFilter(new ResponseV22());
-            }
             if (version_compare($responseFormat, '1.9.0', '<')) {
                 $response->addFilter(new ResponseV21());
             }
@@ -958,8 +973,7 @@ Http::init()
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                 }
 
-                $response->redirect('https://' . $request->getHostname() . $request->getURI());
-                return;
+                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
             }
         }
     });
@@ -998,7 +1012,7 @@ Http::init()
             return;
         }
         $route = $request->getRoute();
-        if ($route?->getLabel('origin', false) === '*') {
+        if ($route->getLabel('origin', false) === '*') {
             return;
         }
         if (!$originValidator->isValid($origin)) {
@@ -1185,7 +1199,9 @@ Http::error()
         $line = $error->getLine();
         $trace = $error->getTrace();
 
-        Span::error($error);
+        if (php_sapi_name() === 'cli') {
+            Span::error($error);
+        }
 
         switch ($class) {
             case Utopia\Http\Exception::class:
@@ -1245,16 +1261,7 @@ Http::error()
          * If not a publishable error, track usage stats. Publishable errors are >= 500 or those explicitly marked as publish=true in errors.php
          */
         if (!$publish && $project->getId() !== 'console') {
-            $errorUser = new DBUser();
-            try {
-                $resolvedUser = $utopia->getResource('user');
-                if ($resolvedUser instanceof DBUser) {
-                    $errorUser = $resolvedUser;
-                }
-            } catch (\Throwable) {
-                // User resource may not be available in error context
-            }
-            if (!$errorUser->isPrivileged($authorization->getRoles())) {
+            if (!DBUser::isPrivileged($authorization->getRoles())) {
                 $bus->dispatch(new RequestCompleted(
                     project: $project->getArrayCopy(),
                     request: $request,
@@ -1427,7 +1434,6 @@ Http::error()
             case 402: // Error allowed publicly
             case 403: // Error allowed publicly
             case 404: // Error allowed publicly
-            case 405: // Error allowed publicly
             case 408: // Error allowed publicly
             case 409: // Error allowed publicly
             case 412: // Error allowed publicly
@@ -1462,21 +1468,6 @@ Http::error()
             'type' => $type,
         ];
 
-        // Add CORS headers to error responses so browsers can read the error.
-        // Wrapped in try-catch: if the error itself is a DB failure, resolving
-        // the cors resource (which depends on rule -> DB) would cascade.
-        // Uses override:true to avoid duplicate headers if init() already set them.
-        try {
-            $cors = $utopia->getResource('cors');
-            foreach ($cors->headers($request->getOrigin()) as $name => $value) {
-                $response
-                    ->removeHeader($name)
-                    ->addHeader($name, $value);
-            }
-        } catch (Throwable) {
-            // Degrade gracefully - error response without CORS is no worse than before.
-        }
-
         $response
             ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
             ->addHeader('Expires', '0')

app/controllers/mock.php

@@ -244,38 +244,36 @@ Http::get('/v1/mock/github/callback')
             throw new Exception(Exception::PROJECT_NOT_FOUND, $error);
         }
 
-        if (empty($providerInstallationId)) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Missing provider installation ID');
+        if (!empty($providerInstallationId)) {
+            $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
+            $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
+            $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
+            $owner = $github->getOwnerName($providerInstallationId) ?? '';
+
+            $projectInternalId = $project->getSequence();
+
+            $teamId = $project->getAttribute('teamId', '');
+
+            $installation = new Document([
+                '$id' => ID::unique(),
+                '$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')),
+                ],
+                'providerInstallationId' => $providerInstallationId,
+                'projectId' => $projectId,
+                'projectInternalId' => $projectInternalId,
+                'provider' => 'github',
+                'organization' => $owner,
+                'personal' => false
+            ]);
+
+            $installation = $dbForPlatform->createDocument('installations', $installation);
         }
 
-        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
-        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
-        $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
-        $owner = $github->getOwnerName($providerInstallationId) ?? '';
-
-        $projectInternalId = $project->getSequence();
-
-        $teamId = $project->getAttribute('teamId', '');
-
-        $installation = new Document([
-            '$id' => ID::unique(),
-            '$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')),
-            ],
-            'providerInstallationId' => $providerInstallationId,
-            'projectId' => $projectId,
-            'projectInternalId' => $projectInternalId,
-            'provider' => 'github',
-            'organization' => $owner,
-            'personal' => false
-        ]);
-
-        $installation = $dbForPlatform->createDocument('installations', $installation);
-
         $response->json([
             'installationId' => $installation->getId(),
         ]);

app/controllers/shared/api.php

@@ -37,7 +37,6 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Database\Validator\Roles;
 use Utopia\Http\Http;
-use Utopia\Span\Span;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Validator\WhiteList;
@@ -97,11 +96,8 @@ Http::init()
     ->inject('team')
     ->inject('apiKey')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
+    ->action(function (Http $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
         $route = $utopia->getRoute();
-        if ($route === null) {
-            throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
-        }
 
         /**
          * Handle user authentication and session validation.
@@ -187,7 +183,7 @@ Http::init()
                 $user = new User([
                     '$id' => '',
                     'status' => true,
-                    'type' => ACTIVITY_TYPE_KEY_PROJECT,
+                    'type' => ACTIVITY_TYPE_APP,
                     'email' => 'app.' . $project->getId() . '@service.' . $request->getHostname(),
                     'password' => '',
                     'name' => $apiKey->getName(),
@@ -257,14 +253,7 @@ Http::init()
                     }
                 }
 
-                $userClone = clone $user;
-                $userClone->setAttribute('type', match ($apiKey->getType()) {
-                    API_KEY_STANDARD => ACTIVITY_TYPE_KEY_PROJECT,
-                    API_KEY_ACCOUNT => ACTIVITY_TYPE_KEY_ACCOUNT,
-                    API_KEY_ORGANIZATION => ACTIVITY_TYPE_KEY_ORGANIZATION,
-                    default => ACTIVITY_TYPE_KEY_PROJECT,
-                });
-                $queueForAudits->setUser($userClone);
+                $queueForAudits->setUser($user);
             }
 
             // Apply permission
@@ -425,26 +414,17 @@ Http::init()
         }
 
         if (! empty($method)) {
-            $namespace = \strtolower($method->getNamespace());
+            $namespace = $method->getNamespace();
 
             if (
                 array_key_exists($namespace, $project->getAttribute('services', []))
                 && ! $project->getAttribute('services', [])[$namespace]
-                && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+                && ! (User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
             ) {
                 throw new Exception(Exception::GENERAL_SERVICE_DISABLED);
             }
         }
 
-        // Step 8b: Check REST protocol status
-        if (
-            array_key_exists('rest', $project->getAttribute('apis', []))
-            && ! $project->getAttribute('apis', [])['rest']
-            && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
-        ) {
-            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
-        }
-
         // Step 9: Validate scope permissions
         $allowed = (array) $route->getLabel('scope', 'none');
         if (empty(\array_intersect($allowed, $scopes))) {
@@ -503,22 +483,17 @@ Http::init()
     ->inject('telemetry')
     ->inject('platform')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Context $usage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {
-
-        $response->setUser($user);
-        $request->setUser($user);
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Context $usage, Func $queueForFunctions, Mail $queueForMails, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) {
 
         $route = $utopia->getRoute();
-        if ($route === null) {
-            throw new AppwriteException(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
-        }
 
-        $path = $route->getMatchedPath();
-        $databaseType = match (true) {
-            str_contains($path, '/documentsdb') => DATABASE_TYPE_DOCUMENTSDB,
-            str_contains($path, '/vectorsdb') => DATABASE_TYPE_VECTORSDB,
-            default => '',
-        };
+        if (
+            array_key_exists('rest', $project->getAttribute('apis', []))
+            && ! $project->getAttribute('apis', [])['rest']
+            && ! (User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
+        ) {
+            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
+        }
 
         /*
         * Abuse Check
@@ -547,8 +522,8 @@ Http::init()
         $closestLimit = null;
 
         $roles = $authorization->getRoles();
-        $isPrivilegedUser = $user->isPrivileged($roles);
-        $isAppUser = $user->isApp($roles);
+        $isPrivilegedUser = User::isPrivileged($roles);
+        $isAppUser = User::isApp($roles);
 
         foreach ($timeLimitArray as $timeLimit) {
             foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys
@@ -608,9 +583,7 @@ Http::init()
         if (! $user->isEmpty()) {
             $userClone = clone $user;
             // $user doesn't support `type` and can cause unintended effects.
-            if (empty($user->getAttribute('type'))) {
-                $userClone->setAttribute('type', $mode === APP_MODE_ADMIN ? ACTIVITY_TYPE_ADMIN : ACTIVITY_TYPE_USER);
-            }
+            $userClone->setAttribute('type', ACTIVITY_TYPE_USER);
             $queueForAudits->setUser($userClone);
         }
 
@@ -632,10 +605,9 @@ Http::init()
         if ($useCache) {
             $route = $utopia->match($request);
             $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! $user->isPrivileged($authorization->getRoles());
+            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && ! User::isPrivileged($authorization->getRoles());
 
             $key = $request->cacheIdentifier();
-            Span::add('storage.cache.key', $key);
             $cacheLog = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
             $cache = new Cache(
                 new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
@@ -652,7 +624,7 @@ Http::init()
                     $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
                     $isToken = ! $resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
-                    $isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
+                    $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
 
                     if ($bucket->isEmpty() || (! $bucket->getAttribute('enabled') && ! $isAppUser && ! $isPrivilegedUser)) {
                         throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -684,10 +656,8 @@ Http::init()
                     if ($file->isEmpty()) {
                         throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                     }
-                    Span::add('storage.bucket.id', $bucketId);
-                    Span::add('storage.file.id', $fileId);
                     // Do not update transformedAt if it's a console user
-                    if (! $user->isPrivileged($authorization->getRoles())) {
+                    if (! User::isPrivileged($authorization->getRoles())) {
                         $transformedAt = $file->getAttribute('transformedAt', '');
                         if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
                             $file->setAttribute('transformedAt', DateTime::now());
@@ -698,27 +668,16 @@ Http::init()
                     }
                 }
 
-                $accessedAt = $cacheLog->getAttribute('accessedAt', '');
-                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
-                    $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), new Document([
-                        'accessedAt' => DateTime::now(),
-                    ])));
-                    // Refresh the filesystem file's mtime so TTL-based expiry in cache->load() stays valid
-                    $cache->save($key, $data);
-                }
-
                 $response
                     ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                     ->addHeader('X-Appwrite-Cache', 'hit')
                     ->setContentType($cacheLog->getAttribute('mimeType'));
                 $storageCacheOperationsCounter->add(1, ['result' => 'hit']);
                 if (! $isImageTransformation || ! $isDisabled) {
-                    Span::add('storage.cache.hit', true);
                     $response->send($data);
                 }
             } else {
                 $storageCacheOperationsCounter->add(1, ['result' => 'miss']);
-                Span::add('storage.cache.hit', false);
                 $response
                     ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
                     ->addHeader('Pragma', 'no-cache')
@@ -732,7 +691,7 @@ Http::init()
     ->groups(['session'])
     ->inject('user')
     ->inject('request')
-    ->action(function (User $user, Request $request) {
+    ->action(function (Document $user, Request $request) {
         if (\str_contains($request->getURI(), 'oauth2')) {
             return;
         }
@@ -806,8 +765,7 @@ Http::shutdown()
     ->inject('eventProcessor')
     ->inject('bus')
     ->inject('apiKey')
-    ->inject('mode')
-    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Audit $queueForAudits, Context $usage, UsagePublisher $publisherForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey, string $mode) use ($parseLabel) {
+    ->action(function (Http $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Audit $queueForAudits, Context $usage, UsagePublisher $publisherForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization, callable $timelimit, EventProcessor $eventProcessor, Bus $bus, ?Key $apiKey) use ($parseLabel) {
 
         $responsePayload = $response->getPayload();
 
@@ -909,9 +867,7 @@ Http::shutdown()
         if (! $user->isEmpty()) {
             $userClone = clone $user;
             // $user doesn't support `type` and can cause unintended effects.
-            if (empty($user->getAttribute('type'))) {
-                $userClone->setAttribute('type', $mode === APP_MODE_ADMIN ? ACTIVITY_TYPE_ADMIN : ACTIVITY_TYPE_USER);
-            }
+            $userClone->setAttribute('type', ACTIVITY_TYPE_USER);
             $queueForAudits->setUser($userClone);
         } elseif ($queueForAudits->getUser() === null || $queueForAudits->getUser()->isEmpty()) {
             /**
@@ -1022,7 +978,7 @@ Http::shutdown()
         }
 
         if ($project->getId() !== 'console') {
-            if (! $user->isPrivileged($authorization->getRoles())) {
+            if (! User::isPrivileged($authorization->getRoles())) {
                 $bus->dispatch(new RequestCompleted(
                     project: $project->getArrayCopy(),
                     request: $request,

app/controllers/shared/api/auth.php

@@ -36,9 +36,8 @@ Http::init()
     ->inject('request')
     ->inject('project')
     ->inject('geodb')
-    ->inject('user')
     ->inject('authorization')
-    ->action(function (Http $utopia, Request $request, Document $project, Reader $geodb, User $user, Authorization $authorization) {
+    ->action(function (Http $utopia, Request $request, Document $project, Reader $geodb, Authorization $authorization) {
         $denylist = System::getEnv('_APP_CONSOLE_COUNTRIES_DENYLIST', '');
         if (!empty($denylist && $project->getId() === 'console')) {
             $countries = explode(',', $denylist);
@@ -51,8 +50,8 @@ Http::init()
 
         $route = $utopia->match($request);
 
-        $isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
-        $isAppUser = $user->isApp($authorization->getRoles());
+        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAppUser = User::isApp($authorization->getRoles());
 
         if ($isAppUser || $isPrivilegedUser) { // Skip limits for app and console devs
             return;

app/http.php

@@ -1,13 +1,14 @@
 <?php
 
-require_once __DIR__ . '/init.php';
+require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/init/span.php';
 
-$registerRequestResources = require __DIR__ . '/init/resources/request.php';
-
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Swoole\Constant;
+use Swoole\Http\Request as SwooleRequest;
+use Swoole\Http\Response as SwooleResponse;
+use Swoole\Http\Server;
 use Swoole\Process;
 use Swoole\Table;
 use Swoole\Timer;
@@ -26,11 +27,11 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
-use Utopia\Http\Adapter\Swoole\Server;
 use Utopia\Http\Files;
 use Utopia\Http\Http;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
+use Utopia\Pools\Group;
 use Utopia\Span\Span;
 use Utopia\System\System;
 
@@ -47,35 +48,18 @@ $certifiedDomains = new Table(100_000);
 $certifiedDomains->column('value', Table::TYPE_INT, 1);
 $certifiedDomains->create();
 
-global $container;
-$container->set('riskyDomains', fn () => $riskyDomains);
-$container->set('certifiedDomains', fn () => $certifiedDomains);
-$container->set('pools', function ($register) {
-    return $register->get('pools');
-}, ['register']);
+Http::setResource('riskyDomains', fn () => $riskyDomains);
+Http::setResource('certifiedDomains', fn () => $certifiedDomains);
+
+$http = new Server(
+    host: "0.0.0.0",
+    port: System::getEnv('PORT', 80),
+    mode: SWOOLE_PROCESS,
+);
 
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 
-$swooleAdapter = new Server(
-    host: "0.0.0.0",
-    port: System::getEnv('PORT', 80),
-    settings: [
-        Constant::OPTION_WORKER_NUM => $totalWorkers,
-        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
-        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
-        Constant::OPTION_HTTP_COMPRESSION => false,
-        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
-        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
-        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
-    ],
-    container: $container,
-);
-
-$container->set('container', fn () => fn () => $swooleAdapter->getContainer());
-
-$http = $swooleAdapter->getServer();
-
 /**
  * Assigns HTTP requests to worker threads by analyzing its payload/content.
  *
@@ -84,16 +68,16 @@ $http = $swooleAdapter->getServer();
  * riskier tasks to a dedicated worker subset. Prefers idle workers, with fallback to random selection if necessary.
  * doc: https://openswoole.com/docs/modules/swoole-server/configuration#dispatch_func
  *
- * @param \Swoole\Http\Server $server Swoole server instance.
+ * @param Server $server Swoole server instance.
  * @param int $fd client ID
  * @param int $type the type of data and its current state
  * @param string|null $data Request content for categorization.
  * @global int $totalThreads Total number of workers.
  * @return int Chosen worker ID for the request.
  */
-function dispatch(\Swoole\Http\Server $server, int $fd, int $type, $data = null): int
+function dispatch(Server $server, int $fd, int $type, $data = null): int
 {
-    $resolveWorkerId = function (\Swoole\Http\Server $server, $data = null) {
+    $resolveWorkerId = function (Server $server, $data = null) {
         global $totalWorkers, $riskyDomains;
 
         // If data is not set we can send request to any worker
@@ -119,7 +103,7 @@ function dispatch(\Swoole\Http\Server $server, int $fd, int $type, $data = null)
         $lines = explode("\n", $data, 3);
         $request = $lines[0];
         if (count($lines) > 1) {
-            $domain = trim(explode('Host: ', $lines[1])[1] ?? '');
+            $domain = trim(explode('Host: ', $lines[1])[1]);
         }
 
         // Sync executions are considered risky
@@ -176,6 +160,18 @@ function dispatch(\Swoole\Http\Server $server, int $fd, int $type, $data = null)
     return $workerId;
 }
 
+
+$http
+    ->set([
+        Constant::OPTION_WORKER_NUM => $totalWorkers,
+        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
+        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
+        Constant::OPTION_HTTP_COMPRESSION => false,
+        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
+        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
+        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
+    ]);
+
 $http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
 });
 
@@ -192,9 +188,9 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server) {
     Console::success('Reload completed...');
 });
 
-$container->set('bus', function ($register) use ($swooleAdapter) {
-    return $register->get('bus')->setResolver(fn (string $name) => $swooleAdapter->getContainer()->get($name));
-}, ['register']);
+Http::setResource('bus', function ($register, $utopia) {
+    return $register->get('bus')->setResolver(fn (string $name) => $utopia->getResource($name));
+}, ['register', 'utopia']);
 
 include __DIR__ . '/controllers/general.php';
 
@@ -290,13 +286,13 @@ function createDatabase(Http $app, string $resourceKey, string $dbName, array $c
     Span::current()?->finish();
 }
 
-$http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorkers, $swooleAdapter) {
-    $app = new Http($swooleAdapter, 'UTC');
+$http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $totalWorkers, $register) {
+    $app = new Http('UTC');
 
-    /** @var \Utopia\Pools\Group $pools */
-    $pools = $app->getResource('pools');
-
-    go(function () use ($app, $pools) {
+    go(function () use ($register, $app) {
+        $pools = $register->get('pools');
+        /** @var Group $pools */
+        Http::setResource('pools', fn () => $pools);
 
         /** @var array $collections */
         $collections = Config::getParam('collections', []);
@@ -413,29 +409,13 @@ $http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorke
         });
 
         $projectCollections = $collections['projects'];
-
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
         $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
         $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
 
-        $documentsSharedTables = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''));
-        $documentsSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES_V1', ''));
-        $documentsSharedTablesV2 = \array_diff($documentsSharedTables, $documentsSharedTablesV1);
-
-        $vectorSharedTables = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''));
-        $vectorSharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES_V1', ''));
-        $vectorSharedTablesV2 = \array_diff($vectorSharedTables, $vectorSharedTablesV1);
-
         $cache = $app->getResource('cache');
 
-        // All shared tables V2 pools that need project metadata collections
-        $sharedTablesV2All = \array_values(\array_unique(\array_filter([
-            ...$sharedTablesV2,
-            ...$documentsSharedTablesV2,
-            ...$vectorSharedTablesV2,
-        ])));
-
-        foreach ($sharedTablesV2All as $hostname) {
+        foreach ($sharedTablesV2 as $hostname) {
             Span::init('database.setup');
             Span::add('database.hostname', $hostname);
 
@@ -512,11 +492,14 @@ $http->on(Constant::EVENT_START, function ($http) use ($payloadSize, $totalWorke
     });
 });
 
-$swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files, $swooleAdapter, $registerRequestResources) {
+$http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register, $files) {
     Span::init('http.request');
 
-    $request = new Request($utopiaRequest->getSwooleRequest());
-    $response = new Response($utopiaResponse->getSwooleResponse());
+    Http::setResource('swooleRequest', fn () => $swooleRequest);
+    Http::setResource('swooleResponse', fn () => $swooleResponse);
+
+    $request = new Request($swooleRequest);
+    $response = new Response($swooleResponse);
 
     Span::add('http.method', $request->getMethod());
 
@@ -532,18 +515,13 @@ $swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files
         return;
     }
 
-    $requestContainer = $swooleAdapter->getContainer();
-    $requestContainer->set('request', fn () => $request);
-    $requestContainer->set('response', fn () => $response);
-
-    $app = new Http($swooleAdapter, 'UTC');
-    $requestContainer->set('utopia', fn () => $app);
-
-    $registerRequestResources($requestContainer);
-
+    $app = new Http('UTC');
     $app->setCompression(System::getEnv('_APP_COMPRESSION_ENABLED', 'enabled') === 'enabled');
     $app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB
 
+    $pools = $register->get('pools');
+    Http::setResource('pools', fn () => $pools);
+
     try {
         $authorization = $app->getResource('authorization');
 
@@ -627,7 +605,6 @@ $swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files
             }
         }
 
-        $swooleResponse = $utopiaResponse->getSwooleResponse();
         $swooleResponse->setStatusCode(500);
 
         $output = ((Http::isDevelopment())) ? [
@@ -651,15 +628,16 @@ $swooleAdapter->onRequest(function ($utopiaRequest, $utopiaResponse) use ($files
 });
 
 // Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on(Constant::EVENT_TASK, function () use ($swooleAdapter) {
+$http->on(Constant::EVENT_TASK, function () use ($register) {
     $lastSyncUpdate = null;
-
-    $app = new Http($swooleAdapter, 'UTC');
+    $pools = $register->get('pools');
+    Http::setResource('pools', fn () => $pools);
+    $app = new Http('UTC');
 
     /** @var Utopia\Database\Database $dbForPlatform */
     $dbForPlatform = $app->getResource('dbForPlatform');
 
-    /** @var \Swoole\Table $riskyDomains */
+    /** @var Table $riskyDomains */
     $riskyDomains = $app->getResource('riskyDomains');
 
     Timer::tick(DOMAIN_SYNC_TIMER * 1000, function () use ($dbForPlatform, $riskyDomains, &$lastSyncUpdate, $app) {
@@ -729,4 +707,4 @@ $http->on(Constant::EVENT_TASK, function () use ($swooleAdapter) {
     });
 });
 
-$swooleAdapter->start();
+$http->start();

app/init/configs.php

@@ -12,7 +12,7 @@ Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php', $configAdapt
 Config::load('template-runtimes', __DIR__ . '/../config/template-runtimes.php', $configAdapter);
 Config::load('events', __DIR__ . '/../config/events.php', $configAdapter);
 Config::load('auth', __DIR__ . '/../config/auth.php', $configAdapter);
-Config::load('protocols', __DIR__ . '/../config/protocols.php', $configAdapter);
+Config::load('apis', __DIR__ . '/../config/apis.php', $configAdapter);  // List of APIs
 Config::load('errors', __DIR__ . '/../config/errors.php', $configAdapter);
 Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php', $configAdapter);
 Config::load('sdks', __DIR__ . '/../config/sdks.php', $configAdapter);

app/init/constants.php

@@ -46,8 +46,8 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_RESOURCE_TOKEN_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 4322;
-const APP_VERSION_STABLE = '1.9.1';
+const APP_CACHE_BUSTER = 4321;
+const APP_VERSION_STABLE = '1.9.0';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -97,7 +97,6 @@ const APP_COMPUTE_DEPLOYMENT_MAX_RETENTION = 100 * 365; // 100 years
 const APP_SDK_PLATFORM_SERVER = 'server';
 const APP_SDK_PLATFORM_CLIENT = 'client';
 const APP_SDK_PLATFORM_CONSOLE = 'console';
-const APP_SDK_PLATFORM_STATIC = 'static';
 const APP_VCS_GITHUB_USERNAME = 'Appwrite';
 const APP_VCS_GITHUB_EMAIL = 'team@appwrite.io';
 const APP_VCS_GITHUB_URL = 'https://github.com/TeamAppwrite';
@@ -156,12 +155,9 @@ const SESSION_PROVIDER_SERVER = 'server';
 /**
  * Activity associated with user or the app.
  */
+const ACTIVITY_TYPE_APP = 'app';
 const ACTIVITY_TYPE_USER = 'user';
-const ACTIVITY_TYPE_ADMIN = 'admin';
 const ACTIVITY_TYPE_GUEST = 'guest';
-const ACTIVITY_TYPE_KEY_PROJECT = 'keyProject';
-const ACTIVITY_TYPE_KEY_ACCOUNT = 'keyAccount';
-const ACTIVITY_TYPE_KEY_ORGANIZATION = 'keyOrganization';
 
 /**
  * MFA
@@ -292,45 +288,6 @@ const METRIC_DATABASES_OPERATIONS_READS  = 'databases.operations.reads';
 const METRIC_DATABASE_ID_OPERATIONS_READS = '{databaseInternalId}.databases.operations.reads';
 const METRIC_DATABASES_OPERATIONS_WRITES  = 'databases.operations.writes';
 const METRIC_DATABASE_ID_OPERATIONS_WRITES = '{databaseInternalId}.databases.operations.writes';
-
-// documentsdb
-const METRIC_DATABASES_DOCUMENTSDB = 'documentsdb.databases';
-const METRIC_COLLECTIONS_DOCUMENTSDB = 'documentsdb.collections';
-const METRIC_DATABASES_STORAGE_DOCUMENTSDB = 'documentsdb.databases.storage';
-const METRIC_DATABASE_ID_COLLECTIONS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.collections';
-const METRIC_DATABASE_ID_STORAGE_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.storage';
-const METRIC_DOCUMENTS_DOCUMENTSDB = 'documentsdb.documents';
-const METRIC_DATABASE_ID_DOCUMENTS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.{collectionInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.{collectionInternalId}.databases.storage';
-const METRIC_DATABASES_OPERATIONS_READS_DOCUMENTSDB  = 'documentsdb.databases.operations.reads';
-const METRIC_DATABASE_ID_OPERATIONS_READS_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.operations.reads';
-const METRIC_DATABASES_OPERATIONS_WRITES_DOCUMENTSDB  = 'documentsdb.databases.operations.writes';
-const METRIC_DATABASE_ID_OPERATIONS_WRITES_DOCUMENTSDB = 'documentsdb.{databaseInternalId}.databases.operations.writes';
-
-// vectorsdb
-const METRIC_DATABASES_VECTORSDB = 'vectorsdb.databases';
-const METRIC_COLLECTIONS_VECTORSDB = 'vectorsdb.collections';
-const METRIC_DATABASES_STORAGE_VECTORSDB = 'vectorsdb.databases.storage';
-const METRIC_DATABASE_ID_COLLECTIONS_VECTORSDB = 'vectorsdb.{databaseInternalId}.collections';
-const METRIC_DATABASE_ID_STORAGE_VECTORSDB = 'vectorsdb.{databaseInternalId}.databases.storage';
-const METRIC_DOCUMENTS_VECTORSDB = 'vectorsdb.documents';
-const METRIC_DATABASE_ID_DOCUMENTS_VECTORSDB = 'vectorsdb.{databaseInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS_VECTORSDB = 'vectorsdb.{databaseInternalId}.{collectionInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE_VECTORSDB = 'vectorsdb.{databaseInternalId}.{collectionInternalId}.databases.storage';
-const METRIC_DATABASES_OPERATIONS_READS_VECTORSDB  = 'vectorsdb.databases.operations.reads';
-const METRIC_DATABASE_ID_OPERATIONS_READS_VECTORSDB = 'vectorsdb.{databaseInternalId}.databases.operations.reads';
-const METRIC_DATABASES_OPERATIONS_WRITES_VECTORSDB  = 'vectorsdb.databases.operations.writes';
-const METRIC_DATABASE_ID_OPERATIONS_WRITES_VECTORSDB = 'vectorsdb.{databaseInternalId}.databases.operations.writes';
-const METRIC_EMBEDDINGS_TEXT = 'embeddings.text';
-const METRIC_EMBEDDINGS_MODEL_TEXT = 'embeddings.text.{embeddingModel}';
-const METRIC_EMBEDDINGS_TEXT_TOTAL_ERROR = 'embeddings.text.totalErrors';
-const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_ERROR = 'embeddings.text.{embeddingModel}.totalErrors';
-const METRIC_EMBEDDINGS_TEXT_TOTAL_DURATION = 'embeddings.text.totalDuration';
-const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_DURATION = 'embeddings.text.{embeddingModel}.totalDuration';
-const METRIC_EMBEDDINGS_TEXT_TOTAL_TOKENS = 'embeddings.text.totalTokens';
-const METRIC_EMBEDDINGS_MODEL_TEXT_TOTAL_TOKENS = 'embeddings.text.{embeddingModel}.totalTokens';
-
 const METRIC_BUCKETS = 'buckets';
 const METRIC_FILES  = 'files';
 const METRIC_FILES_STORAGE  = 'files.storage';
@@ -423,7 +380,6 @@ const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
 const RESOURCE_TYPE_MESSAGES = 'messages';
 const RESOURCE_TYPE_EXECUTIONS = 'executions';
 const RESOURCE_TYPE_VCS = 'vcs';
-const RESOURCE_TYPE_EMBEDDINGS_TEXT = 'embeddingsText';
 
 // Resource types for Tokens
 const TOKENS_RESOURCE_TYPE_FILES = 'files';
@@ -445,16 +401,3 @@ const CACHE_RECONNECT_RETRY_DELAY = 1000;
 
 // Project status
 const PROJECT_STATUS_ACTIVE = 'active';
-
-// Database types
-const DATABASE_TYPE_LEGACY = 'legacy';
-const DATABASE_TYPE_TABLESDB = 'tablesdb';
-const DATABASE_TYPE_DOCUMENTSDB = 'documentsdb';
-const DATABASE_TYPE_VECTORSDB = 'vectorsdb';
-
-// CSV import/export allowed database types
-const CSV_ALLOWED_DATABASE_TYPES = [
-    DATABASE_TYPE_LEGACY,
-    DATABASE_TYPE_TABLESDB,
-    DATABASE_TYPE_VECTORSDB
-];

app/init/database/filters.php

@@ -1,6 +1,5 @@
 <?php
 
-use Appwrite\Network\Platform;
 use Appwrite\OpenSSL\OpenSSL;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -124,17 +123,11 @@ Database::addFilter(
         return;
     },
     function (mixed $value, Document $document, Database $database) {
-        $platforms = $database->getAuthorization()->skip(fn () => $database
+        return $database->getAuthorization()->skip(fn () => $database
             ->find('platforms', [
                 Query::equal('projectInternalId', [$document->getSequence()]),
                 Query::limit(APP_LIMIT_SUBQUERY),
             ]));
-
-        foreach ($platforms as $platform) {
-            $platform->setAttribute('type', Platform::mapDeprecatedType($platform->getAttribute('type')));
-        }
-
-        return $platforms;
     }
 );
 

app/init/models.php

@@ -22,7 +22,6 @@ use Appwrite\Utopia\Response\Model\AttributeLine;
 use Appwrite\Utopia\Response\Model\AttributeList;
 use Appwrite\Utopia\Response\Model\AttributeLongtext;
 use Appwrite\Utopia\Response\Model\AttributeMediumtext;
-use Appwrite\Utopia\Response\Model\AttributeObject;
 use Appwrite\Utopia\Response\Model\AttributePoint;
 use Appwrite\Utopia\Response\Model\AttributePolygon;
 use Appwrite\Utopia\Response\Model\AttributeRelationship;
@@ -30,7 +29,6 @@ use Appwrite\Utopia\Response\Model\AttributeString;
 use Appwrite\Utopia\Response\Model\AttributeText;
 use Appwrite\Utopia\Response\Model\AttributeURL;
 use Appwrite\Utopia\Response\Model\AttributeVarchar;
-use Appwrite\Utopia\Response\Model\AttributeVector;
 use Appwrite\Utopia\Response\Model\AuthProvider;
 use Appwrite\Utopia\Response\Model\BaseList;
 use Appwrite\Utopia\Response\Model\Branch;
@@ -67,7 +65,6 @@ use Appwrite\Utopia\Response\Model\DetectionRuntime;
 use Appwrite\Utopia\Response\Model\DetectionVariable;
 use Appwrite\Utopia\Response\Model\DevKey;
 use Appwrite\Utopia\Response\Model\Document as ModelDocument;
-use Appwrite\Utopia\Response\Model\Embedding;
 use Appwrite\Utopia\Response\Model\Error;
 use Appwrite\Utopia\Response\Model\ErrorDev;
 use Appwrite\Utopia\Response\Model\Execution;
@@ -106,12 +103,7 @@ use Appwrite\Utopia\Response\Model\Mock;
 use Appwrite\Utopia\Response\Model\MockNumber;
 use Appwrite\Utopia\Response\Model\None;
 use Appwrite\Utopia\Response\Model\Phone;
-use Appwrite\Utopia\Response\Model\PlatformAndroid;
-use Appwrite\Utopia\Response\Model\PlatformApple;
-use Appwrite\Utopia\Response\Model\PlatformLinux;
-use Appwrite\Utopia\Response\Model\PlatformList;
-use Appwrite\Utopia\Response\Model\PlatformWeb;
-use Appwrite\Utopia\Response\Model\PlatformWindows;
+use Appwrite\Utopia\Response\Model\Platform;
 use Appwrite\Utopia\Response\Model\Preferences;
 use Appwrite\Utopia\Response\Model\Project;
 use Appwrite\Utopia\Response\Model\Provider;
@@ -144,8 +136,6 @@ use Appwrite\Utopia\Response\Model\UsageBuckets;
 use Appwrite\Utopia\Response\Model\UsageCollection;
 use Appwrite\Utopia\Response\Model\UsageDatabase;
 use Appwrite\Utopia\Response\Model\UsageDatabases;
-use Appwrite\Utopia\Response\Model\UsageDocumentsDB;
-use Appwrite\Utopia\Response\Model\UsageDocumentsDBs;
 use Appwrite\Utopia\Response\Model\UsageFunction;
 use Appwrite\Utopia\Response\Model\UsageFunctions;
 use Appwrite\Utopia\Response\Model\UsageProject;
@@ -154,12 +144,9 @@ use Appwrite\Utopia\Response\Model\UsageSites;
 use Appwrite\Utopia\Response\Model\UsageStorage;
 use Appwrite\Utopia\Response\Model\UsageTable;
 use Appwrite\Utopia\Response\Model\UsageUsers;
-use Appwrite\Utopia\Response\Model\UsageVectorsDB;
-use Appwrite\Utopia\Response\Model\UsageVectorsDBs;
 use Appwrite\Utopia\Response\Model\User;
 use Appwrite\Utopia\Response\Model\Variable;
 use Appwrite\Utopia\Response\Model\VcsContent;
-use Appwrite\Utopia\Response\Model\VectorsDBCollection;
 use Appwrite\Utopia\Response\Model\Webhook;
 
 // General
@@ -202,6 +189,7 @@ Response::setModel(new BaseList('Webhooks List', Response::MODEL_WEBHOOK_LIST, '
 Response::setModel(new BaseList('API Keys List', Response::MODEL_KEY_LIST, 'keys', Response::MODEL_KEY, true, true));
 Response::setModel(new BaseList('Dev Keys List', Response::MODEL_DEV_KEY_LIST, 'devKeys', Response::MODEL_DEV_KEY, true, false));
 Response::setModel(new BaseList('Auth Providers List', Response::MODEL_AUTH_PROVIDER_LIST, 'platforms', Response::MODEL_AUTH_PROVIDER, true, false));
+Response::setModel(new BaseList('Platforms List', Response::MODEL_PLATFORM_LIST, 'platforms', Response::MODEL_PLATFORM, true, false));
 Response::setModel(new BaseList('Countries List', Response::MODEL_COUNTRY_LIST, 'countries', Response::MODEL_COUNTRY));
 Response::setModel(new BaseList('Continents List', Response::MODEL_CONTINENT_LIST, 'continents', Response::MODEL_CONTINENT));
 Response::setModel(new BaseList('Languages List', Response::MODEL_LANGUAGE_LIST, 'languages', Response::MODEL_LANGUAGE));
@@ -223,12 +211,9 @@ Response::setModel(new BaseList('Migrations List', Response::MODEL_MIGRATION_LIS
 Response::setModel(new BaseList('Migrations Firebase Projects List', Response::MODEL_MIGRATION_FIREBASE_PROJECT_LIST, 'projects', Response::MODEL_MIGRATION_FIREBASE_PROJECT));
 Response::setModel(new BaseList('Specifications List', Response::MODEL_SPECIFICATION_LIST, 'specifications', Response::MODEL_SPECIFICATION));
 Response::setModel(new BaseList('VCS Content List', Response::MODEL_VCS_CONTENT_LIST, 'contents', Response::MODEL_VCS_CONTENT));
-Response::setModel(new BaseList('VectorsDB Collections List', Response::MODEL_VECTORSDB_COLLECTION_LIST, 'collections', Response::MODEL_VECTORSDB_COLLECTION));
-Response::setModel(new BaseList('Embedding list', Response::MODEL_EMBEDDING_LIST, 'embeddings', Response::MODEL_EMBEDDING));
 
 // Entities
 Response::setModel(new Database());
-Response::setModel(new Embedding());
 
 // Collection API Models
 Response::setModel(new Collection());
@@ -252,17 +237,6 @@ Response::setModel(new AttributeText());
 Response::setModel(new AttributeMediumtext());
 Response::setModel(new AttributeLongtext());
 
-// DocumentsDB API Models
-Response::setModel(new UsageDocumentsDBs());
-Response::setModel(new UsageDocumentsDB());
-
-// VectorsDB API Models
-Response::setModel(new VectorsDBCollection());
-Response::setModel(new AttributeObject());
-Response::setModel(new AttributeVector());
-Response::setModel(new UsageVectorsDBs());
-Response::setModel(new UsageVectorsDB());
-
 // Table API Models
 Response::setModel(new Table());
 Response::setModel(new Column());
@@ -337,12 +311,7 @@ Response::setModel(new Key());
 Response::setModel(new DevKey());
 Response::setModel(new MockNumber());
 Response::setModel(new AuthProvider());
-Response::setModel(new PlatformWeb());
-Response::setModel(new PlatformApple());
-Response::setModel(new PlatformAndroid());
-Response::setModel(new PlatformWindows());
-Response::setModel(new PlatformLinux());
-Response::setModel(new PlatformList());
+Response::setModel(new Platform());
 Response::setModel(new Variable());
 Response::setModel(new Country());
 Response::setModel(new Continent());

app/init/realtime/connection.php

@@ -1,366 +0,0 @@
-<?php
-
-use Ahc\Jwt\JWT;
-use Ahc\Jwt\JWTException;
-use Appwrite\Extend\Exception;
-use Appwrite\Network\Platform;
-use Appwrite\Network\Validator\Origin;
-use Appwrite\Utopia\Database\Documents\User;
-use Appwrite\Utopia\Request;
-use Utopia\Auth\Hashes\Sha;
-use Utopia\Auth\Proofs\Token;
-use Utopia\Auth\Store;
-use Utopia\Database\DateTime as DatabaseDateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
-use Utopia\System\System;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;
-
-/**
- * Register the minimal per-connection resources required by realtime.
- */
-return function (Container $container): void {
-    $getProjectId = static function (Request $request): string {
-        $projectId = $request->getHeader('x-appwrite-project', '');
-
-        if (!empty($projectId)) {
-            return $projectId;
-        }
-
-        $projectId = $request->getParam('project', '');
-
-        return \is_string($projectId) ? $projectId : '';
-    };
-
-    $getMode = static function (Request $request, Document $project) use ($getProjectId): string {
-        $mode = $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
-        $projectId = $getProjectId($request);
-
-        if (!empty($projectId) && $project->getId() !== $projectId) {
-            $mode = APP_MODE_ADMIN;
-        }
-
-        return $mode;
-    };
-
-    $getDbForPlatform = static function (Authorization $authorization) {
-        $database = getConsoleDB();
-        $database->setAuthorization($authorization);
-
-        return $database;
-    };
-
-    $getDbForProject = static function (Document $project, Authorization $authorization) use ($getDbForPlatform) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $getDbForPlatform($authorization);
-        }
-
-        $database = getProjectDB($project);
-        $database->setAuthorization($authorization);
-
-        return $database;
-    };
-
-    $findRule = static function (Request $request, Document $project, Authorization $authorization) use ($getDbForPlatform): Document {
-        $domain = \parse_url($request->getOrigin(), PHP_URL_HOST);
-
-        if (empty($domain)) {
-            $domain = \parse_url($request->getReferer(), PHP_URL_HOST);
-        }
-
-        if (empty($domain)) {
-            return new Document();
-        }
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-        $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
-
-        $rule = $authorization->skip(function () use ($dbForPlatform, $domain, $isMd5) {
-            if ($isMd5) {
-                return $dbForPlatform->getDocument('rules', md5($domain));
-            }
-
-            return $dbForPlatform->findOne('rules', [
-                Query::equal('domain', [$domain]),
-            ]) ?? new Document();
-        });
-
-        $permitsCurrentProject = $rule->getAttribute('projectInternalId', '') === $project->getSequence();
-
-        if (!$permitsCurrentProject && !$rule->isEmpty() && !empty($rule->getAttribute('projectId', ''))) {
-            $trustedProjects = [];
-            foreach (\explode(',', System::getEnv('_APP_CONSOLE_TRUSTED_PROJECTS', '')) as $trustedProject) {
-                if (empty($trustedProject)) {
-                    continue;
-                }
-
-                $trustedProjects[] = $trustedProject;
-            }
-
-            if (\in_array($rule->getAttribute('projectId', ''), $trustedProjects, true)) {
-                $permitsCurrentProject = true;
-            }
-        }
-
-        if (!$permitsCurrentProject) {
-            return new Document();
-        }
-
-        return $rule;
-    };
-
-    $findDevKey = static function (Request $request, Document $project, array $servers, Authorization $authorization) use ($getDbForPlatform): Document {
-        $devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));
-        $key = $project->find('secret', $devKey, 'devKeys');
-
-        if (!$key) {
-            return new Document([]);
-        }
-
-        $expire = $key->getAttribute('expire');
-        if (!empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
-            return new Document([]);
-        }
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-        $accessedAt = $key->getAttribute('accessedAt', 0);
-
-        if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-            $key->setAttribute('accessedAt', DatabaseDateTime::now());
-            $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
-                'accessedAt' => $key->getAttribute('accessedAt'),
-            ])));
-            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-        }
-
-        $sdkValidator = new WhiteList($servers, true);
-        $sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
-
-        if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
-            $sdks = $key->getAttribute('sdks', []);
-
-            if (!\in_array($sdk, $sdks, true)) {
-                $sdks[] = $sdk;
-                $key->setAttribute('sdks', $sdks);
-                $key->setAttribute('accessedAt', DatabaseDateTime::now());
-
-                $key = $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), new Document([
-                    'sdks' => $key->getAttribute('sdks'),
-                    'accessedAt' => $key->getAttribute('accessedAt'),
-                ])));
-                $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-            }
-        }
-
-        return $key;
-    };
-
-    $container->set('authorization', function () {
-        return new Authorization();
-    }, []);
-
-    $container->set('project', function (Request $request, Document $console, Authorization $authorization) use ($getProjectId, $getDbForPlatform) {
-        $projectId = $getProjectId($request);
-
-        if (empty($projectId) || $projectId === 'console') {
-            return $console;
-        }
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-
-        return $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-    }, ['request', 'console', 'authorization']);
-
-    $container->set('originValidator', function (array $platform, Request $request, Document $project, array $servers, Authorization $authorization) use ($findDevKey, $findRule) {
-        $devKey = $findDevKey($request, $project, $servers, $authorization);
-
-        if (!$devKey->isEmpty()) {
-            return new URL();
-        }
-
-        $allowedHostnames = [...($platform['hostnames'] ?? [])];
-        if (!$project->isEmpty() && $project->getId() !== 'console') {
-            $allowedHostnames = [...$allowedHostnames, ...Platform::getHostnames($project->getAttribute('platforms', []))];
-        }
-
-        $rule = $findRule($request, $project, $authorization);
-        if (!$rule->isEmpty() && !empty($rule->getAttribute('domain', ''))) {
-            $allowedHostnames[] = $rule->getAttribute('domain', '');
-        }
-
-        $originHostname = \parse_url($request->getOrigin(), PHP_URL_HOST);
-        $refererHostname = \parse_url($request->getReferer(), PHP_URL_HOST);
-        $hostname = $originHostname ?: $refererHostname;
-
-        if ($request->getMethod() === 'OPTIONS' && !empty($hostname)) {
-            $allowedHostnames[] = $hostname;
-        }
-
-        $allowedSchemes = [...($platform['schemas'] ?? [])];
-        if (!$project->isEmpty() && $project->getId() !== 'console') {
-            $allowedSchemes[] = 'exp';
-            $allowedSchemes[] = 'appwrite-callback-' . $project->getId();
-            $allowedSchemes = [...$allowedSchemes, ...Platform::getSchemes($project->getAttribute('platforms', []))];
-        }
-
-        return new Origin(\array_unique($allowedHostnames), \array_unique($allowedSchemes));
-    }, ['platform', 'request', 'project', 'servers', 'authorization']);
-
-    $container->set('user', function (Request $request, Document $project, Document $console, Authorization $authorization) use ($getMode, $getDbForPlatform, $getDbForProject) {
-        $mode = $getMode($request, $project);
-        $store = new Store();
-        $proofForToken = new Token();
-        $proofForToken->setHash(new Sha());
-
-        $authorization->setDefaultStatus(true);
-
-        $dbForPlatform = $getDbForPlatform($authorization);
-        $dbForProject = $getDbForProject($project, $authorization);
-
-        $store->setKey('a_session_' . $project->getId());
-        if ($mode === APP_MODE_ADMIN) {
-            $store->setKey('a_session_' . $console->getId());
-        }
-
-        $store->decode(
-            $request->getCookie(
-                $store->getKey(),
-                $request->getCookie($store->getKey() . '_legacy', '')
-            )
-        );
-
-        if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
-            $sessionHeader = $request->getHeader('x-appwrite-session', '');
-
-            if (!empty($sessionHeader)) {
-                $store->decode($sessionHeader);
-            }
-        }
-
-        if (empty($store->getProperty('id', '')) && empty($store->getProperty('secret', ''))) {
-            $fallback = \json_decode($request->getHeader('x-fallback-cookies', ''), true);
-            $store->decode((\is_array($fallback) && isset($fallback[$store->getKey()])) ? $fallback[$store->getKey()] : '');
-        }
-
-        $user = null;
-        if ($mode === APP_MODE_ADMIN) {
-            /** @var User $user */
-            $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
-        } else {
-            if ($project->isEmpty()) {
-                $user = new User([]);
-            } elseif (!empty($store->getProperty('id', ''))) {
-                if ($project->getId() === 'console') {
-                    /** @var User $user */
-                    $user = $dbForPlatform->getDocument('users', $store->getProperty('id', ''));
-                } else {
-                    /** @var User $user */
-                    $user = $dbForProject->getDocument('users', $store->getProperty('id', ''));
-                }
-            }
-        }
-
-        if (
-            !$user
-            || $user->isEmpty()
-            || !$user->sessionVerify($store->getProperty('secret', ''), $proofForToken)
-        ) {
-            $user = new User([]);
-        }
-
-        $authJWT = $request->getHeader('x-appwrite-jwt', '');
-        if (!empty($authJWT) && !$project->isEmpty()) {
-            if (!$user->isEmpty()) {
-                throw new Exception(Exception::USER_JWT_AND_COOKIE_SET);
-            }
-
-            $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
-
-            try {
-                $payload = $jwt->decode($authJWT);
-            } catch (JWTException $error) {
-                throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
-            }
-
-            $jwtUserId = $payload['userId'] ?? '';
-            if (!empty($jwtUserId)) {
-                if ($mode === APP_MODE_ADMIN) {
-                    $user = $dbForPlatform->getDocument('users', $jwtUserId);
-                } else {
-                    $user = $dbForProject->getDocument('users', $jwtUserId);
-                }
-            }
-
-            $jwtSessionId = $payload['sessionId'] ?? '';
-            if (!empty($jwtSessionId) && empty($user->find('$id', $jwtSessionId, 'sessions'))) {
-                $user = new User([]);
-            }
-        }
-
-        $accountKey = $request->getHeader('x-appwrite-key', '');
-        $accountKeyUserId = $request->getHeader('x-appwrite-user', '');
-
-        if (!empty($accountKeyUserId) && !empty($accountKey)) {
-            if (!$user->isEmpty()) {
-                throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
-            }
-
-            $accountKeyUser = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
-            if (!$accountKeyUser->isEmpty()) {
-                $key = $accountKeyUser->find(
-                    key: 'secret',
-                    find: $accountKey,
-                    subject: 'keys'
-                );
-
-                if (!empty($key)) {
-                    $expire = $key->getAttribute('expire');
-                    if (!empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
-                        throw new Exception(Exception::ACCOUNT_KEY_EXPIRED);
-                    }
-
-                    $user = $accountKeyUser;
-                }
-            }
-        }
-
-        $impersonateUserId = $request->getHeader('x-appwrite-impersonate-user-id', '');
-        $impersonateEmail = $request->getHeader('x-appwrite-impersonate-user-email', '');
-        $impersonatePhone = $request->getHeader('x-appwrite-impersonate-user-phone', '');
-
-        if (!$user->isEmpty() && $user->getAttribute('impersonator', false)) {
-            $userDb = ($mode === APP_MODE_ADMIN || $project->getId() === 'console') ? $dbForPlatform : $dbForProject;
-            $targetUser = null;
-
-            if (!empty($impersonateUserId)) {
-                $targetUser = $authorization->skip(fn () => $userDb->getDocument('users', $impersonateUserId));
-            } elseif (!empty($impersonateEmail)) {
-                $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [
-                    Query::equal('email', [\strtolower($impersonateEmail)]),
-                ]));
-            } elseif (!empty($impersonatePhone)) {
-                $targetUser = $authorization->skip(fn () => $userDb->findOne('users', [
-                    Query::equal('phone', [$impersonatePhone]),
-                ]));
-            }
-
-            if ($targetUser !== null && !$targetUser->isEmpty()) {
-                $impersonator = clone $user;
-                $user = clone $targetUser;
-                $user->setAttribute('impersonatorUserId', $impersonator->getId());
-                $user->setAttribute('impersonatorUserInternalId', $impersonator->getSequence());
-                $user->setAttribute('impersonatorUserName', $impersonator->getAttribute('name', ''));
-                $user->setAttribute('impersonatorUserEmail', $impersonator->getAttribute('email', ''));
-                $user->setAttribute('impersonatorAccessedAt', $impersonator->getAttribute('accessedAt', 0));
-            }
-        }
-
-        $dbForPlatform->setMetadata('user', $user->getId());
-        $dbForProject->setMetadata('user', $user->getId());
-
-        return $user;
-    }, ['request', 'project', 'console', 'authorization']);
-};

app/init/registers.php

@@ -6,6 +6,7 @@ use Appwrite\Hooks\Hooks;
 use Appwrite\PubSub\Adapter\Redis as PubSub;
 use Appwrite\URL\URL as AppwriteURL;
 use MaxMind\Db\Reader;
+use PHPMailer\PHPMailer\PHPMailer;
 use Swoole\Database\PDOProxy;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Config\Config;
@@ -24,7 +25,6 @@ use Utopia\Logger\Adapter\LogOwl;
 use Utopia\Logger\Adapter\Raygun;
 use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Logger;
-use Utopia\Messaging\Adapter\Email\SMTP;
 use Utopia\Mongo\Client as MongoClient;
 use Utopia\Pools\Adapter\Stack as StackPool;
 use Utopia\Pools\Adapter\Swoole as SwoolePool;
@@ -56,7 +56,7 @@ $register->set('logger', function () {
     }
 
     try {
-        $loggingProvider = new DSN($providerConfig);
+        $loggingProvider = new DSN($providerConfig ?? '');
 
         $providerName = $loggingProvider->getScheme();
         $providerConfig = match ($providerName) {
@@ -76,7 +76,7 @@ $register->set('logger', function () {
         };
     }
 
-    if (empty($providerName)) {
+    if (empty($providerName) || empty($providerConfig)) {
         return;
     }
 
@@ -121,7 +121,7 @@ $register->set('realtimeLogger', function () {
         default => ['key' => $loggingProvider->getHost()],
     };
 
-    if (empty($providerName)) {
+    if (empty($providerName) || empty($providerConfig)) {
         return;
     }
 
@@ -160,6 +160,7 @@ $register->set('pools', function () {
         'pass' => System::getEnv('_APP_DB_PASS', ''),
         'path' => System::getEnv('_APP_DB_SCHEMA', ''),
     ]);
+
     $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
         'scheme' => 'redis',
         'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
@@ -168,23 +169,6 @@ $register->set('pools', function () {
         'pass' => System::getEnv('_APP_REDIS_PASS', ''),
     ]);
 
-    $fallbackForDocumentsDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => System::getEnv('_APP_DB_ADAPTER_DOCUMENTSDB', 'mongodb'),
-        'host' => System::getEnv('_APP_DB_HOST_DOCUMENTSDB', 'mongodb'),
-        'port' => System::getEnv('_APP_DB_PORT_DOCUMENTSDB', '27017'),
-        'user' => System::getEnv('_APP_DB_USER', ''),
-        'pass' => System::getEnv('_APP_DB_PASS', ''),
-        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
-    ]);
-    $fallbackForVectorsDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => System::getEnv('_APP_DB_ADAPTER_VECTORSDB', 'postgresql'),
-        'host' => System::getEnv('_APP_DB_HOST_VECTORSDB', 'postgresql'),
-        'port' => System::getEnv('_APP_DB_PORT_VECTORSDB', '5432'),
-        'user' => System::getEnv('_APP_DB_USER', ''),
-        'pass' => System::getEnv('_APP_DB_PASS', ''),
-        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
-    ]);
-
     $connections = [
         'console' => [
             'type' => 'database',
@@ -196,25 +180,13 @@ $register->set('pools', function () {
             'type' => 'database',
             'dsns' => $fallbackForDB,
             'multiple' => true,
-            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
-        ],
-        'documentsdb' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DATABASE_DOCUMENTSDB', $fallbackForDocumentsDB),
-            'multiple' => true,
-            'schemes' => ['mongodb'],
-        ],
-        'vectorsdb' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DATABASE_VECTORSDB', $fallbackForVectorsDB),
-            'multiple' => true,
-            'schemes' => ['postgresql'],
+            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
         ],
         'logs' => [
             'type' => 'database',
             'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
             'multiple' => false,
-            'schemes' => ['mongodb','mariadb', 'mysql','postgresql'],
+            'schemes' => ['mariadb', 'mongodb', 'mysql', 'postgresql'],
         ],
         'publisher' => [
             'type' => 'publisher',
@@ -242,11 +214,22 @@ $register->set('pools', function () {
         ],
     ];
 
-    $maxConnections = (int) System::getEnv('_APP_CONNECTIONS_MAX', 151);
-    $instanceConnections = $maxConnections / (int) System::getEnv('_APP_POOL_CLIENTS', 14);
+    $maxConnections = System::getEnv('_APP_CONNECTIONS_MAX', 151);
+    $instanceConnections = $maxConnections / System::getEnv('_APP_POOL_CLIENTS', 14);
 
-    $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
-    $poolSize = max(1, (int)($instanceConnections / $workerCount));
+    $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
+
+    if ($multiprocessing) {
+        $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+    } else {
+        $workerCount = 1;
+    }
+
+    if ($workerCount > $instanceConnections) {
+        throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500);
+    }
+
+    $poolSize = (int)($instanceConnections / $workerCount);
 
     foreach ($connections as $key => $connection) {
         $type = $connection['type'] ?? '';
@@ -297,7 +280,7 @@ $register->set('pools', function () {
                         ]);
                     });
                 },
-                'mongodb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
+                'mongodb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase, $dsn) {
                     try {
                         $mongo = new MongoClient($dsnDatabase, $dsnHost, (int)$dsnPort, $dsnUser, $dsnPass, false);
                         @$mongo->connect();
@@ -422,20 +405,35 @@ $register->set('db', function () {
 });
 
 $register->set('smtp', function () {
-    $username = System::getEnv('_APP_SMTP_USERNAME', '');
-    $password = System::getEnv('_APP_SMTP_PASSWORD', '');
-    return new SMTP(
-        host: System::getEnv('_APP_SMTP_HOST', 'smtp'),
-        port: (int) System::getEnv('_APP_SMTP_PORT', 25),
-        username: $username,
-        password: $password,
-        smtpSecure: System::getEnv('_APP_SMTP_SECURE', ''),
-        smtpAutoTLS: false,
-        xMailer: 'Appwrite Mailer',
-        timeout: 10,
-        keepAlive: true,
-        timelimit: 30,
-    );
+    $mail = new PHPMailer(true);
+
+    $mail->isSMTP();
+
+    $username = System::getEnv('_APP_SMTP_USERNAME');
+    $password = System::getEnv('_APP_SMTP_PASSWORD');
+
+    $mail->XMailer = 'Appwrite Mailer';
+    $mail->Host = System::getEnv('_APP_SMTP_HOST', 'smtp');
+    $mail->Port = System::getEnv('_APP_SMTP_PORT', 25);
+    $mail->SMTPAuth = !empty($username) && !empty($password);
+    $mail->Username = $username;
+    $mail->Password = $password;
+    $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
+    $mail->SMTPAutoTLS = false;
+    $mail->SMTPKeepAlive = true;
+    $mail->CharSet = 'UTF-8';
+    $mail->Timeout = 10; /* Connection timeout */
+    $mail->getSMTPInstance()->Timelimit = 30; /* Timeout for each individual SMTP command (e.g. HELO, EHLO, etc.) */
+
+    $from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
+    $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+
+    $mail->setFrom($email, $from);
+    $mail->addReplyTo($email, $from);
+
+    $mail->isHTML(true);
+
+    return $mail;
 });
 $register->set('geodb', function () {
     return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2025-12.mmdb');

app/init/worker/message.php

@@ -1,451 +0,0 @@
-<?php
-
-use Appwrite\Event\Audit;
-use Appwrite\Event\Build;
-use Appwrite\Event\Certificate;
-use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-use Appwrite\Event\Func;
-use Appwrite\Event\Mail;
-use Appwrite\Event\Messaging;
-use Appwrite\Event\Realtime;
-use Appwrite\Event\Screenshot;
-use Appwrite\Event\Webhook;
-use Appwrite\Usage\Context;
-use Appwrite\Utopia\Database\Documents\User;
-use Utopia\Audit\Adapter\Database as AdapterDatabase;
-use Utopia\Audit\Audit as UtopiaAudit;
-use Utopia\Cache\Cache;
-use Utopia\Console;
-use Utopia\Database\Adapter\Pool as DatabasePool;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
-use Utopia\DSN\DSN;
-use Utopia\Logger\Log;
-use Utopia\Pools\Group;
-use Utopia\Queue\Publisher;
-use Utopia\Registry\Registry;
-use Utopia\Storage\Device\Telemetry as TelemetryDevice;
-use Utopia\System\System;
-use Utopia\Telemetry\Adapter as Telemetry;
-
-/**
- * Register per-job resources on the given container.
- * These resources depend on the queue message or keep mutable state and
- * must be fresh for each worker job.
- */
-return function (Container $container): void {
-    $container->set('log', fn () => new Log(), []);
-
-    $container->set('usage', fn () => new Context(), []);
-
-    $container->set('authorization', function () {
-        $authorization = new Authorization();
-        $authorization->disable();
-
-        return $authorization;
-    }, []);
-
-    $container->set('dbForPlatform', function (Cache $cache, Group $pools, Authorization $authorization) {
-        $adapter = new DatabasePool($pools->get('console'));
-        $dbForPlatform = new Database($adapter, $cache);
-
-        $dbForPlatform
-            ->setDatabase(APP_DATABASE)
-            ->setAuthorization($authorization)
-            ->setNamespace('_console')
-            ->setDocumentType('users', User::class);
-
-        return $dbForPlatform;
-    }, ['cache', 'pools', 'authorization']);
-
-    $container->set('project', function ($message, Database $dbForPlatform) {
-        $payload = $message->getPayload() ?? [];
-        $project = new Document($payload['project'] ?? []);
-
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $project;
-        }
-
-        return $dbForPlatform->getDocument('projects', $project->getId());
-    }, ['message', 'dbForPlatform']);
-
-    $container->set('dbForProject', function (Cache $cache, Group $pools, Document $project, Database $dbForPlatform, Authorization $authorization) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
-        }
-
-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
-
-        $adapter = new DatabasePool($pools->get($dsn->getHost()));
-        $database = new Database($adapter, $cache);
-        $database->setDocumentType('users', User::class);
-
-        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-        if (\in_array($dsn->getHost(), $sharedTables)) {
-            $database
-                ->setSharedTables(true)
-                ->setTenant($project->getSequence())
-                ->setNamespace($dsn->getParam('namespace'));
-        } else {
-            $database
-                ->setSharedTables(false)
-                ->setTenant(null)
-                ->setNamespace('_' . $project->getSequence());
-        }
-
-        $database
-            ->setDatabase(APP_DATABASE)
-            ->setAuthorization($authorization)
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
-        return $database;
-    }, ['cache', 'pools', 'project', 'dbForPlatform', 'authorization']);
-
-    $container->set('getProjectDB', function (Group $pools, Database $dbForPlatform, Cache $cache, Authorization $authorization) {
-        $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
-
-        return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases): Database {
-            if ($project->isEmpty() || $project->getId() === 'console') {
-                return $dbForPlatform;
-            }
-
-            try {
-                $dsn = new DSN($project->getAttribute('database'));
-            } catch (\InvalidArgumentException) {
-                // TODO: Temporary until all projects are using shared tables
-                $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-            }
-
-            if (isset($databases[$dsn->getHost()])) {
-                $database = $databases[$dsn->getHost()];
-                $database->setAuthorization($authorization);
-                $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-                if (\in_array($dsn->getHost(), $sharedTables)) {
-                    $database
-                        ->setSharedTables(true)
-                        ->setTenant($project->getSequence())
-                        ->setNamespace($dsn->getParam('namespace'));
-                } else {
-                    $database
-                        ->setSharedTables(false)
-                        ->setTenant(null)
-                        ->setNamespace('_' . $project->getSequence());
-                }
-
-                return $database;
-            }
-
-            $adapter = new DatabasePool($pools->get($dsn->getHost()));
-            $database = new Database($adapter, $cache);
-
-            $databases[$dsn->getHost()] = $database;
-
-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-            if (\in_array($dsn->getHost(), $sharedTables)) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($project->getSequence())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getSequence());
-            }
-
-            $database
-                ->setDatabase(APP_DATABASE)
-                ->setAuthorization($authorization)
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
-            return $database;
-        };
-    }, ['pools', 'dbForPlatform', 'cache', 'authorization']);
-
-    $container->set('getDatabasesDB', function (Cache $cache, Registry $register, Document $project, Authorization $authorization) {
-        return function (Document $database, ?Document $projectDocument = null) use ($cache, $register, $project, $authorization): Database {
-            $projectDocument ??= $project;
-            $databaseDSN = $database->getAttribute('database', $project->getAttribute('database', ''));
-            $databaseType = $database->getAttribute('type', '');
-
-            // Backwards-compatibility: older or seeded legacy databases may not have a DSN stored
-            // in the "database" attribute. In that case, fall back to the project's database DSN.
-            if ($databaseDSN === '') {
-                $databaseDSN = $projectDocument->getAttribute('database', '');
-            }
-
-            try {
-                $databaseDSN = new DSN($databaseDSN);
-            } catch (\InvalidArgumentException) {
-                $databaseDSN = new DSN('mysql://' . $databaseDSN);
-            }
-
-            try {
-                $dsn = new DSN($projectDocument->getAttribute('database'));
-            } catch (\InvalidArgumentException) {
-                // Temporary fallback until all projects use shared tables
-                $dsn = new DSN('mysql://' . $projectDocument->getAttribute('database'));
-            }
-
-            $pools = $register->get('pools');
-            $databaseHost = $databaseDSN->getHost();
-            $pool = $pools->get($databaseHost);
-
-            $adapter = new DatabasePool($pool);
-            $database = new Database($adapter, $cache);
-            $database
-                ->setDatabase(APP_DATABASE)
-                ->setAuthorization($authorization);
-            $database->getAdapter()->setSupportForAttributes($databaseType !== DOCUMENTSDB);
-
-            $sharedTables = \array_filter(\explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', '')));
-
-            // For separate pools (documentsdb/vectorsdb), check their own shared tables config.
-            // If not configured, use dedicated mode to avoid cross-engine tenant type mismatches.
-            if ($databaseHost !== $dsn->getHost()) {
-                $dbTypeSharedTables = match ($databaseType) {
-                    DOCUMENTSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_DOCUMENTSDB_SHARED_TABLES', ''))),
-                    VECTORSDB => \array_filter(\explode(',', System::getEnv('_APP_DATABASE_VECTORSDB_SHARED_TABLES', ''))),
-                    default => [],
-                };
-
-                if (\in_array($databaseHost, $dbTypeSharedTables)) {
-                    $database
-                        ->setSharedTables(true)
-                        ->setTenant($projectDocument->getSequence())
-                        ->setNamespace($databaseDSN->getParam('namespace'));
-                } else {
-                    $database
-                        ->setSharedTables(false)
-                        ->setTenant(null)
-                        ->setNamespace('_' . $projectDocument->getSequence());
-                }
-            } elseif (\in_array($dsn->getHost(), $sharedTables, true)) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($projectDocument->getSequence())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $projectDocument->getSequence());
-            }
-
-            $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-            return $database;
-        };
-    }, ['cache', 'register', 'project', 'authorization']);
-
-    $container->set('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
-        $database = null;
-
-        return function (?Document $project = null) use ($pools, $cache, $authorization, &$database) {
-            if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-                $database->setTenant($project->getSequence());
-
-                return $database;
-            }
-
-            $adapter = new DatabasePool($pools->get('logs'));
-            $database = new Database($adapter, $cache);
-
-            $database
-                ->setDatabase(APP_DATABASE)
-                ->setAuthorization($authorization)
-                ->setSharedTables(true)
-                ->setNamespace('logsV1')
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
-                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
-
-            if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-                $database->setTenant($project->getSequence());
-            }
-
-            return $database;
-        };
-    }, ['pools', 'cache', 'authorization']);
-
-    $container->set('abuseRetention', function () {
-        return \time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
-    }, []);
-
-    $container->set('auditRetention', function (Document $project) {
-        if ($project->getId() === 'console') {
-            return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
-        }
-
-        return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
-    }, ['project']);
-
-    $container->set('executionRetention', function () {
-        return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
-    }, []);
-
-    $container->set('queueForDatabase', function (Publisher $publisher) {
-        return new EventDatabase($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForMessaging', function (Publisher $publisher) {
-        return new Messaging($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForMails', function (Publisher $publisher) {
-        return new Mail($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForBuilds', function (Publisher $publisher) {
-        return new Build($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForScreenshots', function (Publisher $publisher) {
-        return new Screenshot($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForDeletes', function (Publisher $publisher) {
-        return new Delete($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForEvents', function (Publisher $publisher) {
-        return new Event($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForAudits', function (Publisher $publisher) {
-        return new Audit($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForWebhooks', function (Publisher $publisher) {
-        return new Webhook($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForFunctions', function (Publisher $publisher) {
-        return new Func($publisher);
-    }, ['publisher']);
-
-    $container->set('queueForRealtime', function () {
-        return new Realtime();
-    }, []);
-
-    $container->set('queueForCertificates', function (Publisher $publisher) {
-        return new Certificate($publisher);
-    }, ['publisher']);
-
-    $container->set('deviceForSites', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForMigrations', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForFiles', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('deviceForCache', function (Document $project, Telemetry $telemetry) {
-        return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
-    }, ['project', 'telemetry']);
-
-    $container->set('logError', function (Registry $register, Document $project) {
-        return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
-            $logger = $register->get('logger');
-
-            if ($logger) {
-                $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
-
-                $log = new Log();
-                $log->setNamespace($namespace);
-                $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
-                $log->setVersion($version);
-                $log->setType(Log::TYPE_ERROR);
-                $log->setMessage($error->getMessage());
-
-                $log->addTag('code', $error->getCode());
-                $log->addTag('verboseType', \get_class($error));
-                $log->addTag('projectId', $project->getId() ?? '');
-
-                $log->addExtra('file', $error->getFile());
-                $log->addExtra('line', $error->getLine());
-                $log->addExtra('trace', $error->getTraceAsString());
-
-                if ($error->getPrevious() !== null) {
-                    if ($error->getPrevious()->getMessage() != $error->getMessage()) {
-                        $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
-                    }
-                    $log->addExtra('previousFile', $error->getPrevious()->getFile());
-                    $log->addExtra('previousLine', $error->getPrevious()->getLine());
-                }
-
-                foreach (($extras ?? []) as $key => $value) {
-                    $log->addExtra($key, $value);
-                }
-
-                $log->setAction($action);
-
-                $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
-                $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
-
-                try {
-                    $responseCode = $logger->addLog($log);
-                    Console::info('Error log pushed with status code: ' . $responseCode);
-                } catch (Throwable $th) {
-                    Console::error('Error pushing log: ' . $th->getMessage());
-                }
-            }
-
-            Console::warning("Failed: {$error->getMessage()}");
-            Console::warning($error->getTraceAsString());
-
-            if ($error->getPrevious() !== null) {
-                if ($error->getPrevious()->getMessage() != $error->getMessage()) {
-                    Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
-                }
-                Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
-            }
-        };
-    }, ['register', 'project']);
-
-    $container->set('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
-        return function (Document $project) use ($dbForPlatform, $getProjectDB) {
-            if ($project->isEmpty() || $project->getId() === 'console') {
-                $adapter = new AdapterDatabase($dbForPlatform);
-
-                return new UtopiaAudit($adapter);
-            }
-
-            $dbForProject = $getProjectDB($project);
-            $adapter = new AdapterDatabase($dbForProject);
-
-            return new UtopiaAudit($adapter);
-        };
-    }, ['dbForPlatform', 'getProjectDB']);
-
-    $container->set('executionsRetentionCount', function (Document $project, array $plan) {
-        if ($project->getId() === 'console' || empty($plan)) {
-            return 0;
-        }
-
-        return (int) ($plan['executionsRetentionCount'] ?? 100);
-    }, ['project', 'plan']);
-};

app/listeners.php

@@ -1,11 +1,9 @@
 <?php
 
 use Appwrite\Bus\Listeners\Log;
-use Appwrite\Bus\Listeners\Mails;
 use Appwrite\Bus\Listeners\Usage;
 
 return [
     new Log(),
-    new Mails(),
     new Usage(),
 ];

app/realtime.php

@@ -33,8 +33,8 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
-use Utopia\DI\Container;
 use Utopia\DSN\DSN;
+use Utopia\Http\Http;
 use Utopia\Logger\Log;
 use Utopia\Pools\Group;
 use Utopia\Registry\Registry;
@@ -43,13 +43,11 @@ use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\WebSocket\Adapter;
 use Utopia\WebSocket\Server;
 
+/**
+ * @var Registry $register
+ */
 require_once __DIR__ . '/init.php';
 
-/** @var Registry $register */
-$register = $GLOBALS['register'] ?? throw new \RuntimeException('Registry not initialized');
-
-$registerConnectionResources ??= require __DIR__ . '/init/realtime/connection.php';
-
 Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 
 // Log uncaught exceptions in one line instead of relying on Swoole's full backtrace dump
@@ -239,14 +237,10 @@ if (!function_exists('getTelemetry')) {
 if (!function_exists('triggerStats')) {
     function triggerStats(array $event, string $projectId): void
     {
+        return;
     }
 }
 
-global $container;
-$container->set('pools', function ($register) {
-    return $register->get('pools');
-}, ['register']);
-
 $realtime = getRealtime();
 
 /**
@@ -326,14 +320,14 @@ if (!function_exists('logError')) {
 
 $server->error(logError(...));
 
-$server->onStart(function () use ($stats, $containerId, &$statsDocument) {
+$server->onStart(function () use ($stats, $register, $containerId, &$statsDocument) {
     sleep(5); // wait for the initial database schema to be ready
     Console::success('Server started successfully');
 
     /**
      * Create document for this worker to share stats across Containers.
      */
-    go(function () use ($containerId, &$statsDocument) {
+    go(function () use ($register, $containerId, &$statsDocument) {
         $attempts = 0;
         $database = getConsoleDB();
 
@@ -363,7 +357,7 @@ $server->onStart(function () use ($stats, $containerId, &$statsDocument) {
      */
     // TODO: Remove this if check once it doesn't cause issues for cloud
     if (System::getEnv('_APP_EDITION', 'self-hosted') === 'self-hosted') {
-        Timer::tick(5000, function () use ($stats, &$statsDocument) {
+        Timer::tick(5000, function () use ($register, $stats, &$statsDocument) {
             $payload = [];
             foreach ($stats as $projectId => $value) {
                 $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
@@ -402,7 +396,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     $attempts = 0;
     $start = time();
 
-    Timer::tick(5000, function () use ($server, $realtime, $stats) {
+    Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
         /**
          * Sending current connections to project channels on the console project every 5 seconds.
          */
@@ -448,7 +442,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         ]
                     ];
 
-                    $server->send(array_keys($realtime->getSubscribers($event)), json_encode([
+                    $server->send($realtime->getSubscribers($event), json_encode([
                         'type' => 'event',
                         'data' => $event['data']
                     ]));
@@ -524,7 +518,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         $project = $consoleDatabase->getAuthorization()->skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
                         $database = getProjectDB($project);
 
-                        /** @var User $user */
+                        /** @var Appwrite\Utopia\Database\Documents\User $user */
                         $user = $database->getDocument('users', $userId);
 
                         $roles = $user->getRoles($database->getAuthorization());
@@ -555,7 +549,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
 
                 $receivers = $realtime->getSubscribers($event);
 
-                if (System::getEnv('_APP_ENV', 'production') === 'development' && !empty($receivers)) {
+                if (Http::isDevelopment() && !empty($receivers)) {
                     Console::log("[Debug][Worker {$workerId}] Receivers: " . count($receivers));
                     Console::log("[Debug][Worker {$workerId}] Connection IDs: " . json_encode(array_keys($receivers)));
                     Console::log("[Debug][Worker {$workerId}] Matched: " . json_encode(array_values($receivers)));
@@ -621,17 +615,16 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     Console::error('Failed to restart pub/sub...');
 });
 
-$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $registerConnectionResources) {
-    global $container;
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
+    $app = new Http('UTC');
     $request = new Request($request);
     $response = new Response(new SwooleResponse());
 
     Console::info("Connection open (user: {$connection})");
 
-    $connectionContainer = new Container($container);
-    $connectionContainer->set('request', fn () => $request);
-
-    $registerConnectionResources($connectionContainer);
+    Http::setResource('pools', fn () => $register->get('pools'));
+    Http::setResource('request', fn () => $request);
+    Http::setResource('response', fn () => $response);
 
     $project = null;
     $logUser = null;
@@ -639,8 +632,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 
     try {
         /** @var Document $project */
-        $project = $connectionContainer->get('project');
-        $authorization = $connectionContainer->get('authorization');
+        $project = $app->getResource('project');
+        $authorization = $app->getResource('authorization');
 
         /*
          *  Project Check
@@ -649,16 +642,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing or unknown project ID');
         }
 
-        $timelimit = $connectionContainer->get('timelimit');
-        $user = $connectionContainer->get('user'); /** @var User $user */
-        $logUser = $user;
-
-        $apis = $project->getAttribute('apis', []);
-        // Websocket is what to check, but realtime is checked too for backwards compatibility
-        $websocketEnabled = $apis['websocket'] ?? $apis['realtime'] ?? true;
         if (
-            !$websocketEnabled
-            && !($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            array_key_exists('realtime', $project->getAttribute('apis', []))
+            && !$project->getAttribute('apis', [])['realtime']
+            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
@@ -669,6 +656,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Project is not accessible in this region. Please make sure you are using the correct endpoint');
         }
 
+        $timelimit = $app->getResource('timelimit');
+        $user = $app->getResource('user'); /** @var User $user */
+        $logUser = $user;
+
         /*
          * Abuse Check
          *
@@ -697,7 +688,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
          * Skip this check for non-web platforms which are not required to send an origin header.
          */
         $origin = $request->getOrigin();
-        $originValidator = $connectionContainer->get('originValidator');
+        $originValidator = $app->getResource('originValidator');
 
         if (!empty($origin) && !$originValidator->isValid($origin) && $project->getId() !== 'console') {
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription());
@@ -707,43 +698,11 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 
         $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());
 
-        $updateStats = static function (string $projectId, ?string $teamId, string $payloadJson) use ($register, $stats): void {
-            $register->get('telemetry.connectionCounter')->add(1);
-            $register->get('telemetry.connectionCreatedCounter')->add(1);
-
-            $stats->set($projectId, [
-                'projectId' => $projectId,
-                'teamId' => $teamId
-            ]);
-            $stats->incr($projectId, 'connections');
-            $stats->incr($projectId, 'connectionsTotal');
-
-            triggerStats([
-                METRIC_REALTIME_CONNECTIONS => 1,
-                METRIC_REALTIME_OUTBOUND => \strlen($payloadJson),
-            ], $projectId);
-        };
-
         /**
          * Channels Check
          */
         if (empty($channels)) {
-            // in case of message based 'subscribe' channels will be empty at first and only projectId and roles will be available
-            $sanitizedUser = empty($user->getId()) ? null : $response->output($user, Response::MODEL_ACCOUNT);
-            $connectedPayloadJson = json_encode([
-                'type' => 'connected',
-                'data' => [
-                    'channels' => [],
-                    'subscriptions' => [],
-                    'user' => $sanitizedUser
-                ]
-            ]);
-
-            $realtime->subscribe($project->getId(), $connection, '', $roles, [], [], $user->getId());
-            $realtime->connections[$connection]['authorization'] = $authorization;
-            $server->send([$connection], $connectedPayloadJson);
-            $updateStats($project->getId(), $project->getAttribute('teamId'), $connectedPayloadJson);
-            return;
+            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing channels');
         }
 
         $names = array_keys($channels);
@@ -767,8 +726,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
                 $subscriptionId,
                 $roles,
                 $subscription['channels'],
-                $subscription['queries'],
-                $user->getId()
+                $subscription['queries']
             );
 
             $mapping[$index] = $subscriptionId;
@@ -788,7 +746,20 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         ]);
 
         $server->send([$connection], $connectedPayloadJson);
-        $updateStats($project->getId(), $project->getAttribute('teamId'), $connectedPayloadJson);
+
+        $register->get('telemetry.connectionCounter')->add(1);
+        $register->get('telemetry.connectionCreatedCounter')->add(1);
+
+        $stats->set($project->getId(), [
+            'projectId' => $project->getId(),
+            'teamId' => $project->getAttribute('teamId')
+        ]);
+        $stats->incr($project->getId(), 'connections');
+        $stats->incr($project->getId(), 'connectionsTotal');
+
+        $connectedOutboundBytes = \strlen($connectedPayloadJson);
+
+        triggerStats([METRIC_REALTIME_CONNECTIONS => 1, METRIC_REALTIME_OUTBOUND => $connectedOutboundBytes], $project->getId());
 
 
     } catch (Throwable $th) {
@@ -804,7 +775,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 
         // sanitize 0 && 5xx errors
         $realtimeViolation = $th instanceof AppwriteException && $th->getType() === AppwriteException::REALTIME_POLICY_VIOLATION;
-        if (($code === 0 || $code >= 500) && !$realtimeViolation && System::getEnv('_APP_ENV', 'production') !== 'development') {
+        if (($code === 0 || $code >= 500) && !$realtimeViolation && !Http::isDevelopment()) {
             $message = 'Error: Server Error';
         }
 
@@ -819,7 +790,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         $server->send([$connection], json_encode($response));
         $server->close($connection, $code);
 
-        if (System::getEnv('_APP_ENV', 'production') === 'development') {
+        if (Http::isDevelopment()) {
             Console::error('[Error] Connection Error');
             Console::error('[Error] Code: ' . $response['data']['code']);
             Console::error('[Error] Message: ' . $response['data']['message']);
@@ -827,9 +798,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
     }
 });
 
-$server->onMessage(function (int $connection, string $message) use ($server, $realtime, $containerId) {
+$server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
     $project = null;
     $authorization = null;
+
     try {
         $rawSize = \strlen($message);
         $response = new Response(new SwooleResponse());
@@ -838,7 +810,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         // Get authorization from connection (stored during onOpen)
         $authorization = $realtime->connections[$connection]['authorization'] ?? null;
         if ($authorization === null) {
-            $authorization = new Authorization();
+            $authorization = new Authorization('');
         }
 
         $database = getConsoleDB();
@@ -955,8 +927,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                             $subscriptionId,
                             $roles,
                             $subscription['channels'] ?? [],
-                            $queries,
-                            $user->getId()
+                            $queries
                         );
                     }
                 }
@@ -990,99 +961,6 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
 
                 break;
 
-            case 'subscribe':
-                /**
-                 * Message based upsertion of a subscription
-                 * If subscriptionId is given then it will match subId of the connection and update the subscription with channels and queries
-                 * If non-existing subid is given or not given a new subid will be generated
-                 * Similar to what we have now -> two subscribe() block with same channels and queries still two different subscriptions
-                 *
-                 * structure of the payload -> array of maps
-                 * 'data' : [subscriptionId:"" , channels:[] , queries:[]]
-                 */
-                if (!is_array($message['data']) || !array_is_list($message['data'])) {
-                    throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Payload is not valid.');
-                }
-
-                $roles = $realtime->connections[$connection]['roles'] ?? [Role::guests()->toString()];
-                $userId = $realtime->connections[$connection]['userId'] ?? '';
-
-                // bulk validation + parsing before subscribing
-                $parsedPayloads = [];
-                foreach ($message['data'] as $payload) {
-                    if (!\is_array($payload)) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Each subscribe payload must be an object.');
-                    }
-                    if (!array_key_exists('channels', $payload)) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'channels is not present in payload.');
-                    }
-                    if (!is_array($payload['channels']) || !array_is_list($payload['channels'])) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'channels is not a valid array.');
-                    }
-                    // registering the queries if not present and check in the same payload later on
-                    if (!array_key_exists('queries', $payload)) {
-                        $payload['queries'] = [];
-                    }
-                    if (!is_array($payload['queries']) || !array_is_list($payload['queries'])) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'queries is not a valid array.');
-                    }
-
-                    $subscriptionId = \array_key_exists('subscriptionId', $payload)
-                        ? $payload['subscriptionId']
-                        : ID::unique();
-
-                    try {
-                        $convertedQueries = Realtime::convertQueries($payload['queries']);
-                    } catch (QueryException $e) {
-                        throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Invalid query: ' . $e->getMessage());
-                    }
-
-                    $parsedPayloads[] = [
-                        'subscriptionId' => $subscriptionId,
-                        'channels' => $payload['channels'],
-                        'queries' => $convertedQueries,
-                    ];
-                }
-
-                foreach ($parsedPayloads as $parsedPayload) {
-                    $subscriptionId = $parsedPayload['subscriptionId'];
-                    $channels = \array_keys(Realtime::convertChannels($parsedPayload['channels'], $userId));
-                    $queries = $parsedPayload['queries'];
-                    $realtime->subscribe($projectId, $connection, $subscriptionId, $roles, $channels, $queries);
-                }
-
-                // subscribe() overwrites the connection entry; restore auth so later onMessage uses the same context.
-                $realtime->connections[$connection]['authorization'] = $authorization;
-
-                $responsePayload = json_encode([
-                    'type' => 'response',
-                    'data' => [
-                        'to' => 'subscribe',
-                        'success' => true,
-                        'subscriptions' => \array_map(function (array $parsedPayload) {
-                            return [
-                                'subscriptionId' => $parsedPayload['subscriptionId'],
-                                'channels' => $parsedPayload['channels'],
-                                'queries' => \array_map(fn ($q) => $q->toString(), $parsedPayload['queries']),
-                            ];
-                        }, $parsedPayloads),
-                    ]
-                ]);
-
-                $server->send([$connection], $responsePayload);
-
-                if ($project !== null && !$project->isEmpty()) {
-                    $subscribeOutboundBytes = \strlen($responsePayload);
-
-                    if ($subscribeOutboundBytes > 0) {
-                        triggerStats([
-                            METRIC_REALTIME_OUTBOUND => $subscribeOutboundBytes,
-                        ], $project->getId());
-                    }
-                }
-
-                break;
-
             default:
                 throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Message type is not valid.');
         }
@@ -1096,7 +974,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         $message = $th->getMessage();
 
         // sanitize 0 && 5xx errors
-        if (($code === 0 || $code >= 500) && System::getEnv('_APP_ENV', 'production') !== 'development') {
+        if (($code === 0 || $code >= 500) && !Http::isDevelopment()) {
             $message = 'Error: Server Error';
         }
 

app/views/install/compose.phtml

@@ -11,13 +11,18 @@ $httpsPort = $this->getParam('httpsPort', '');
 $version = $this->getParam('version', '');
 $organization = $this->getParam('organization', '');
 $image = $this->getParam('image', '');
+$appwriteImage = $this->getParam('appwriteImage', '');
+$useHostSourceMount = $this->getParam('useHostSourceMount', false);
 $enableAssistant = $this->getParam('enableAssistant', false);
 $dbService = $this->getParam('database', 'mongodb');
-$allowedDbServices = ['mariadb', 'mongodb'];
+$allowedDbServices = ['mariadb', 'mongodb', 'postgresql'];
 if (!\in_array($dbService, $allowedDbServices, true)) {
     $dbService = 'mongodb';
 }
 $hostPath = rtrim($this->getParam('hostPath', ''), '/');
+if ($appwriteImage === '') {
+    $appwriteImage = $organization . '/' . $image . ':' . $version;
+}
 ?>services:
   traefik:
     image: traefik:3.6
@@ -46,7 +51,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - appwrite
 
   appwrite:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     container_name: appwrite
     <<: *x-logging
     restart: unless-stopped
@@ -67,7 +72,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - traefik.http.routers.appwrite_api_https.service=appwrite_api
       - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
-<?php if ($version === 'local' && !empty($hostPath)): ?>
+<?php if ($useHostSourceMount && !empty($hostPath)): ?>
       - "<?php echo $hostPath; ?>:/usr/src/code:rw"
 <?php endif; ?>
       - appwrite-uploads:/storage/uploads:rw
@@ -194,7 +199,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:7.8.26
+    image: <?php echo $organization; ?>/console:7.6.4
     restart: unless-stopped
     networks:
       - appwrite
@@ -214,7 +219,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - traefik.http.routers.appwrite_console_https.tls=true
 
   appwrite-realtime:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: realtime
     container_name: appwrite-realtime
     <<: *x-logging
@@ -261,7 +266,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-audits:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-audits
     <<: *x-logging
     container_name: appwrite-worker-audits
@@ -291,7 +296,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-webhooks:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-webhooks
     <<: *x-logging
     container_name: appwrite-worker-webhooks
@@ -323,7 +328,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-deletes:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-deletes
     <<: *x-logging
     container_name: appwrite-worker-deletes
@@ -390,7 +395,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_EMAIL_CERTIFICATES
 
   appwrite-worker-databases:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-databases
     <<: *x-logging
     container_name: appwrite-worker-databases
@@ -420,7 +425,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-builds:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-builds
     <<: *x-logging
     container_name: appwrite-worker-builds
@@ -492,7 +497,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DOMAIN_SITES
 
   appwrite-worker-certificates:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-certificates
     <<: *x-logging
     container_name: appwrite-worker-certificates
@@ -532,37 +537,8 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_ADAPTER
       - _APP_LOGGING_CONFIG
 
-  appwrite-worker-executions:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-executions
-    <<: *x-logging
-    container_name: appwrite-worker-executions
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      redis:
-        condition: service_healthy
-      <?= $dbService ?>:
-        condition: service_healthy
-    environment:
-      - _APP_ENV
-      - _APP_WORKER_PER_CORE
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_ENV
-      - _APP_DB_ADAPTER
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-      - _APP_LOGGING_CONFIG
-
   appwrite-worker-functions:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-functions
     <<: *x-logging
     container_name: appwrite-worker-functions
@@ -606,7 +582,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_LOGGING_CONFIG
 
   appwrite-worker-mails:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-mails
     <<: *x-logging
     container_name: appwrite-worker-mails
@@ -645,7 +621,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_OPTIONS_FORCE_HTTPS
 
   appwrite-worker-messaging:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-messaging
     <<: *x-logging
     container_name: appwrite-worker-messaging
@@ -701,7 +677,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_STORAGE_WASABI_BUCKET
 
   appwrite-worker-migrations:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-migrations
     <<: *x-logging
     container_name: appwrite-worker-migrations
@@ -740,7 +716,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
 
   appwrite-task-maintenance:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: maintenance
     <<: *x-logging
     container_name: appwrite-task-maintenance
@@ -784,7 +760,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
   appwrite-task-stats-resources:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     container_name: appwrite-task-stats-resources
     entrypoint: stats-resources
     <<: *x-logging
@@ -817,7 +793,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_STATS_RESOURCES_INTERVAL
 
   appwrite-worker-stats-resources:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-stats-resources
     container_name: appwrite-worker-stats-resources
     <<: *x-logging
@@ -849,7 +825,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_STATS_RESOURCES_INTERVAL
 
   appwrite-worker-stats-usage:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: worker-stats-usage
     container_name: appwrite-worker-stats-usage
     <<: *x-logging
@@ -881,7 +857,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_USAGE_AGGREGATION_INTERVAL
 
   appwrite-task-scheduler-functions:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: schedule-functions
     container_name: appwrite-task-scheduler-functions
     <<: *x-logging
@@ -910,7 +886,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_ADAPTER
 
   appwrite-task-scheduler-executions:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: schedule-executions
     container_name: appwrite-task-scheduler-executions
     <<: *x-logging
@@ -939,7 +915,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
       - _APP_DB_ADAPTER
 
   appwrite-task-scheduler-messages:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    image: <?php echo $appwriteImage."\n"; ?>
     entrypoint: schedule-messages
     container_name: appwrite-task-scheduler-messages
     <<: *x-logging
@@ -993,7 +969,7 @@ $hostPath = rtrim($this->getParam('hostPath', ''), '/');
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
-    image: openruntimes/executor:0.11.4
+    image: openruntimes/executor:0.7.22
     networks:
       - appwrite
       - runtimes

app/views/install/installer.phtml

@@ -13,7 +13,7 @@ $enabledDatabases = $enabledDatabases ?? ['mongodb', 'mariadb', 'postgresql'];
 $isLocalInstall = $isLocalInstall ?? false;
 
 
-$cardStep = ($step === 5) ? 4 : $step;
+$cardStep = min(4, $step);
 $stepFile = __DIR__ . "/installer/templates/steps/step-{$cardStep}.phtml";
 if (!is_file($stepFile)) {
     $stepFile = __DIR__ . "/installer/templates/steps/step-1.phtml";

app/views/install/installer/css/styles.css

@@ -478,10 +478,6 @@ body {
     overflow: hidden;
 }
 
-.installer-page[data-upgrade='true'] .installer-step {
-    min-height: 0;
-}
-
 .action-shell {
     display: flex;
     flex-direction: column;
@@ -695,19 +691,6 @@ body {
     transform: translateY(10px);
 }
 
-.install-counter {
-    margin-left: auto;
-    opacity: 0;
-    transition: opacity 0.2s ease;
-    white-space: nowrap;
-    user-select: none;
-    color: var(--fgcolor-neutral-secondary);
-}
-
-.install-row[data-status='in-progress'] .install-counter:not(:empty) {
-    opacity: 1;
-}
-
 .install-row-toggle {
     margin-left: auto;
     width: 32px;
@@ -914,17 +897,6 @@ body {
     gap: var(--gap-m);
 }
 
-.install-global-actions {
-    display: flex;
-    justify-content: center;
-    gap: var(--gap-m);
-    padding: var(--space-4) 0;
-}
-
-.install-global-actions.is-hidden {
-    display: none;
-}
-
 .install-error-details .button {
     align-self: center;
     margin-top: 0;
@@ -1812,92 +1784,3 @@ body {
         gap: var(--gap-s);
     }
 }
-
-.migration-option {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: var(--gap-l);
-    padding: var(--space-6);
-    background: var(--bgcolor-neutral-default);
-    border-radius: var(--border-radius-m);
-    outline: var(--border-width-s) solid var(--border-neutral);
-    outline-offset: calc(var(--border-width-s) * -1);
-    cursor: pointer;
-    transition: outline-color 0.15s ease-in-out;
-}
-
-.migration-option:hover {
-    outline-color: var(--border-neutral-stronger);
-}
-
-.migration-option-content {
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
-}
-
-.migration-switch {
-    flex-shrink: 0;
-}
-
-.migration-switch-track {
-    position: relative;
-    display: block;
-    width: 32px;
-    height: 20px;
-    border-radius: 10px;
-    background: var(--bgcolor-neutral-invert-weaker);
-    transition: background 0.15s ease-in-out;
-}
-
-.migration-switch-thumb {
-    position: absolute;
-    top: 2px;
-    left: 2px;
-    width: 16px;
-    height: 16px;
-    border-radius: 50%;
-    background: var(--bgcolor-neutral-primary);
-    transition: transform 0.15s ease-in-out;
-}
-
-#run-migration:checked ~ .migration-switch-track {
-    background: var(--bgcolor-neutral-invert-weak);
-}
-
-#run-migration:checked ~ .migration-switch-track .migration-switch-thumb {
-    transform: translateX(12px);
-}
-
-#run-migration:focus-visible ~ .migration-switch-track {
-    box-shadow: 0 0 0 var(--border-width-l) var(--border-focus);
-}
-
-.migration-hint {
-    display: flex;
-    align-items: flex-start;
-    gap: var(--gap-s);
-    padding: 0 var(--space-2);
-}
-
-.migration-hint-icon {
-    flex-shrink: 0;
-    width: 16px;
-    height: 16px;
-    color: var(--fgcolor-neutral-tertiary);
-    margin-top: 1px;
-}
-
-.migration-hint-icon svg {
-    width: 100%;
-    height: 100%;
-}
-
-.migration-code {
-    padding: 1px 4px;
-    border-radius: var(--border-radius-xs, 4px);
-    background: var(--bgcolor-neutral-secondary);
-    font-family: monospace;
-    font-size: inherit;
-}

app/views/install/installer/js/installer.js

@@ -12,7 +12,7 @@
     const { validateInstallRequest } = window.InstallerStepsProgress || {};
 
     const isUpgrade = document.body?.dataset.upgrade === 'true';
-    const stepFlow = isUpgrade ? [1, 6, 4, 5] : [1, 2, 3, 4, 5];
+    const stepFlow = isUpgrade ? [1, 4, 5] : [1, 2, 3, 4, 5];
     const cardSteps = stepFlow.filter((step) => step !== 5);
 
     const normalizeStep = (step) => {
@@ -53,7 +53,7 @@
     let pendingStep = null;
     let pendingPushState = false;
 
-    const clampStep = (step) => Math.max(1, Math.min(6, step));
+    const clampStep = (step) => Math.max(1, Math.min(5, step));
     const isInstallLocked = () => Boolean(window.InstallerSteps?.isInstallLocked?.());
 
     const scrollToFirstError = (panel) => {
@@ -399,18 +399,11 @@
                 }
             }
         }
-        if (action === 'next' && String(target) === '5') {
-            if (typeof validateInstallRequest === 'function') {
-                const isValid = await validateInstallRequest();
-                if (!isValid) {
-                    return;
-                }
+        if (action === 'next' && String(target) === '5' && typeof validateInstallRequest === 'function') {
+            const isValid = await validateInstallRequest();
+            if (!isValid) {
+                return;
             }
-            // Clear stale install data from previous runs so initStep5
-            // starts a fresh install instead of trying to resume.
-            const { clearInstallLock, clearInstallId } = window.InstallerStepsState || {};
-            clearInstallLock?.();
-            clearInstallId?.();
         }
         if (isInstallLocked() && Number(target) !== 5) {
             requestStep(5, true);

app/views/install/installer/js/modules/context.js

@@ -13,10 +13,7 @@
         DOCKER_COMPOSE: 'docker-compose',
         ENV_VARS: 'env-vars',
         DOCKER_CONTAINERS: 'docker-containers',
-        ACCOUNT_SETUP: 'account-setup',
-        MIGRATION: 'migration',
-        SSL_CERTIFICATE: 'ssl-certificate',
-        REDIRECT: 'redirect'
+        ACCOUNT_SETUP: 'account-setup'
     });
 
     const STATUS = Object.freeze({
@@ -53,11 +50,6 @@
             id: STEP_IDS.DOCKER_CONTAINERS,
             inProgress: 'Restarting Docker containers...',
             done: 'Docker containers restarted'
-        },
-        {
-            id: STEP_IDS.MIGRATION,
-            inProgress: 'Running database migration...',
-            done: 'Database migration completed'
         }
     ] : [
         {
@@ -83,7 +75,7 @@
         {
             id: STEP_IDS.ACCOUNT_SETUP,
             inProgress: 'Creating Appwrite account...',
-            done: 'Appwrite account created'
+            done: 'Appwrite account created (redirecting...)'
         }
     ]);
 
@@ -101,7 +93,7 @@
     const clampStep = (step) => {
         const numeric = Number(step);
         if (Number.isNaN(numeric)) return 1;
-        return Math.max(1, Math.min(6, numeric));
+        return Math.max(1, Math.min(5, numeric));
     };
 
     window.InstallerStepsContext = Object.freeze({

app/views/install/installer/js/modules/progress.js

@@ -21,7 +21,7 @@
         storeInstallId,
         clearInstallId
     } = window.InstallerStepsState || {};
-    const { extractHostname, isLocalHost, isIPAddress } = window.InstallerStepsValidation || {};
+    const { extractHostname, isLocalHost } = window.InstallerStepsValidation || {};
     const { generateSecretKey } = window.InstallerStepsUI || {};
     const { showToast } = window.InstallerToast || {};
 
@@ -111,10 +111,10 @@
             return normalized.summary || 'Installation failed.';
         }
         if (status === STATUS.COMPLETED) return step.done;
-        return message || step.inProgress;
+        return step.inProgress;
     };
 
-    const updateInstallRow = (row, step, status, message, details) => {
+    const updateInstallRow = (row, step, status, message) => {
         if (!row || !step) return;
         row.dataset.status = status;
         row.dataset.step = step.id;
@@ -138,15 +138,6 @@
             }
         }
 
-        const counter = row.querySelector('[data-install-counter]');
-        if (counter) {
-            const started = details?.containerStarted ?? 0;
-            const total = details?.containerTotal;
-            counter.textContent = (status === STATUS.IN_PROGRESS && total > 0 && started < total)
-                ? `${started}/${total}`
-                : '';
-        }
-
         // Show/hide "Navigate to Console" button for account setup errors
         const consoleBtn = row.querySelector('[data-install-console]');
         if (consoleBtn) {
@@ -260,7 +251,7 @@
         return Array.from(bytes, (byte) => byte.toString(16).padStart(2, '0')).join('');
     };
 
-    const buildRedirectUrl = (protocol) => {
+    const buildRedirectUrl = () => {
         const dataset = getBodyDataset?.() ?? {};
         const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
         if (!rawDomain) return '';
@@ -275,53 +266,22 @@
         } else if (normalizedHost === 'traefik') {
             host = rawDomain.replace(hostForProtocol, 'localhost');
         }
-        const port = protocol === 'https' ? httpsPort : httpPort;
-        const defaultPort = protocol === 'https' ? '443' : '80';
-        if (!hasPort && port && port !== defaultPort) {
+        let protocol = 'http';
+        let port = httpPort;
+        if (httpsPort && httpsPort !== '0' && !isLocalHost?.(normalizedHost)) {
+            protocol = 'https';
+            port = httpsPort;
+        }
+        if (!hasPort && port && ((protocol === 'http' && port !== '80') || (protocol === 'https' && port !== '443'))) {
             host = `${host}:${port}`;
         }
         return `${protocol}://${host}`;
     };
 
-    const normalizeHostname = (rawDomain) => {
-        const hostname = extractHostname?.(rawDomain)?.toLowerCase?.() ?? '';
-        if (hostname === '0.0.0.0' || hostname === 'traefik') return 'localhost';
-        return hostname;
-    };
-
-    const canUseHttps = () => {
-        const dataset = getBodyDataset?.() ?? {};
-        const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
-        const httpsPort = (formState?.httpsPort || dataset.defaultHttpsPort || '').trim();
-        if (!httpsPort || httpsPort === '0') return false;
-        const hostname = normalizeHostname(rawDomain);
-        return !isLocalHost?.(hostname) && !isIPAddress?.(hostname);
-    };
-
-    const pollCertificate = async (domain, port, maxAttempts, intervalMs) => {
-        for (let i = 0; i < maxAttempts; i++) {
-            try {
-                const response = await fetch(
-                    `/install/certificate?domain=${encodeURIComponent(domain)}&port=${encodeURIComponent(port)}`,
-                    { cache: 'no-store' }
-                );
-                if (response.ok) {
-                    const data = await response.json();
-                    if (data.ready) return true;
-                }
-            } catch {
-                // Installer server may have shut down
-            }
-            if (i < maxAttempts - 1) {
-                await new Promise((resolve) => setTimeout(resolve, intervalMs));
-            }
-        }
-        return false;
-    };
-
-    const redirectToApp = (protocol) => {
-        const url = buildRedirectUrl(protocol);
+    const redirectToApp = () => {
+        const url = buildRedirectUrl();
         if (!url) return;
+        // Fire-and-forget: tell the installer server it can shut down
         fetch('/install/shutdown', { method: 'POST', headers: withCsrfHeader() }).catch(() => {});
         window.location.href = url;
     };
@@ -358,7 +318,7 @@
         const normalizedDomain = (formState?.appDomain || '').trim() || 'localhost';
         const normalizedHttpPort = (formState?.httpPort || '').trim() || '80';
         const normalizedHttpsPort = (formState?.httpsPort || '').trim() || '443';
-        const normalizedEmail = (formState?.emailCertificates || '').trim() || (formState?.accountEmail || '').trim();
+        const normalizedEmail = (formState?.emailCertificates || '').trim();
         const normalizedAssistantKey = (formState?.assistantOpenAIKey || '').trim();
         const normalizedAccountEmail = (formState?.accountEmail || '').trim();
         const normalizedAccountPassword = (formState?.accountPassword || '').trim();
@@ -373,8 +333,7 @@
             opensslKey: (formState?.opensslKey || '').trim(),
             assistantOpenAIKey: normalizedAssistantKey,
             accountEmail: normalizedAccountEmail,
-            accountPassword: normalizedAccountPassword,
-            migrate: formState?.migrate ?? false
+            accountPassword: normalizedAccountPassword
         };
     };
 
@@ -447,7 +406,6 @@
 
     const initStep5 = (root) => {
         if (!root) return;
-        let resolvedProtocol = 'http';
 
         if (activeInstall?.controller) {
             activeInstall.controller.abort();
@@ -539,7 +497,7 @@
                     if (!state) return;
                     const row = ensureRow(step);
                     if (row) {
-                        updateInstallRow(row, step, state.status || STATUS.IN_PROGRESS, state.message, state.details);
+                        updateInstallRow(row, step, state.status || STATUS.IN_PROGRESS, state.message);
                         if (state.status === STATUS?.ERROR) {
                             updateInstallErrorDetails(row, {
                                 message: state.message,
@@ -589,9 +547,6 @@
                     }
                 }
             }
-            if (payload.status === STATUS.ERROR) {
-                showGlobalActions();
-            }
             scheduleFallback();
         };
 
@@ -629,7 +584,6 @@
 
         const applySnapshot = (snapshot) => {
             if (!snapshot || !snapshot.steps) return;
-            let hasErrors = false;
             INSTALLATION_STEPS.forEach((step) => {
                 const detail = snapshot.steps[step.id];
                 if (!detail) return;
@@ -638,14 +592,8 @@
                     message: detail.message,
                     details: snapshot.details?.[step.id]
                 });
-                if (detail.status === STATUS.ERROR) {
-                    hasErrors = true;
-                }
             });
             renderProgress();
-            if (hasErrors) {
-                showGlobalActions();
-            }
         };
 
         const checkAllCompleted = () => {
@@ -657,7 +605,9 @@
             const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
             const sessionDetails = sseSessionDetails || accountState?.details;
             finalizeInstall();
-            startSslCheck(sessionDetails);
+            notifyInstallComplete(activeInstall?.installId, sessionDetails).finally(() => {
+                setTimeout(() => redirectToApp(), TIMINGS?.redirectDelay ?? 0);
+            });
         };
 
         const startPolling = () => {
@@ -694,78 +644,6 @@
             }
             stopSyncedSpinnerRotation();
             setUnloadGuard(false);
-            clearInstallLock?.();
-        };
-
-        const SSL_STEP = {
-            id: STEP_IDS.SSL_CERTIFICATE,
-            inProgress: 'Generating SSL certificate...',
-            done: 'SSL certificate verified'
-        };
-
-        const REDIRECT_STEP = {
-            id: STEP_IDS.REDIRECT,
-            inProgress: 'Redirecting to console...',
-            done: 'Redirecting to console...'
-        };
-
-        const showRedirectStep = (sessionDetails, protocol) => {
-            animatePanelHeight(() => {
-                progressState.set(REDIRECT_STEP.id, {
-                    status: STATUS.IN_PROGRESS,
-                    message: REDIRECT_STEP.inProgress
-                });
-                const row = ensureRow(REDIRECT_STEP);
-                if (row) {
-                    updateInstallRow(row, REDIRECT_STEP, STATUS.IN_PROGRESS, REDIRECT_STEP.inProgress);
-                }
-            });
-            startSyncedSpinnerRotation(list);
-
-            const completeId = activeInstall?.installId || getStoredInstallId?.();
-            notifyInstallComplete(completeId, sessionDetails).finally(() => {
-                setTimeout(() => redirectToApp(protocol), TIMINGS?.redirectDelay ?? 0);
-            });
-        };
-
-        const startSslCheck = (sessionDetails) => {
-            if (!canUseHttps()) {
-                showRedirectStep(sessionDetails, 'http');
-                return;
-            }
-
-            animatePanelHeight(() => {
-                progressState.set(SSL_STEP.id, {
-                    status: STATUS.IN_PROGRESS,
-                    message: SSL_STEP.inProgress
-                });
-                const row = ensureRow(SSL_STEP);
-                if (row) {
-                    updateInstallRow(row, SSL_STEP, STATUS.IN_PROGRESS, SSL_STEP.inProgress);
-                }
-            });
-            startSyncedSpinnerRotation(list);
-
-            const dataset = getBodyDataset?.() ?? {};
-            const rawDomain = (formState?.appDomain || dataset.defaultAppDomain || '').trim();
-            const httpsPort = (formState?.httpsPort || dataset.defaultHttpsPort || '443').trim();
-            const domain = normalizeHostname(rawDomain);
-            pollCertificate(domain, httpsPort, 15, 2000).then((ready) => {
-                stopSyncedSpinnerRotation();
-                const certMessage = ready ? SSL_STEP.done : 'Certificate not ready, continuing over HTTP';
-                animatePanelHeight(() => {
-                    progressState.set(SSL_STEP.id, {
-                        status: STATUS.COMPLETED,
-                        message: certMessage
-                    });
-                    const row = ensureRow(SSL_STEP);
-                    if (row) {
-                        updateInstallRow(row, SSL_STEP, STATUS.COMPLETED, certMessage);
-                    }
-                });
-                resolvedProtocol = ready ? 'https' : 'http';
-                showRedirectStep(sessionDetails, resolvedProtocol);
-            });
         };
 
         const startInstallStream = async (installId, options = {}) => {
@@ -868,7 +746,9 @@
                         const accountState = progressState.get(STEP_IDS.ACCOUNT_SETUP);
                         const sessionDetails = sseSessionDetails || accountState?.details;
                         finalizeInstall();
-                        startSslCheck(sessionDetails);
+                        notifyInstallComplete(activeInstall?.installId, sessionDetails).finally(() => {
+                            setTimeout(() => redirectToApp(), TIMINGS?.redirectDelay ?? 0);
+                        });
                         return;
                     }
                     if (event === SSE_EVENTS.ERROR) {
@@ -912,29 +792,9 @@
             }
         };
 
-        const isSnapshotTerminal = (snapshot) => {
-            if (!snapshot?.steps) return 'empty';
-            const stepEntries = Object.values(snapshot.steps);
-            if (stepEntries.length === 0) return 'empty';
-            const hasError = stepEntries.some((s) => s.status === STATUS.ERROR);
-            if (hasError) return 'error';
-            const allCompleted = INSTALLATION_STEPS.every((step) => {
-                const detail = snapshot.steps[step.id];
-                return detail && detail.status === STATUS.COMPLETED;
-            });
-            if (allCompleted) return 'completed';
-            return false;
-        };
-
         const resumeInstall = async (installId) => {
             const snapshot = await fetchInstallStatus(installId);
-            const terminal = isSnapshotTerminal(snapshot);
-            if (!snapshot || terminal) {
-                if (terminal === 'completed') {
-                    return 'completed';
-                }
-                return false;
-            }
+            if (!snapshot) return false;
             activeInstall = {
                 installId,
                 controller: new AbortController(),
@@ -997,7 +857,7 @@
             const retryButton = event.target.closest('[data-install-retry]');
 
             if (consoleButton) {
-                redirectToApp(resolvedProtocol);
+                redirectToApp();
                 return;
             }
 
@@ -1008,60 +868,6 @@
             }
         });
 
-        const globalActions = root.querySelector('[data-install-global-actions]');
-
-        const showGlobalActions = () => {
-            if (globalActions) {
-                globalActions.classList.remove('is-hidden');
-            }
-        };
-
-        const performReset = async (hard) => {
-            const installId = activeInstall?.installId || getInstallLock?.()?.installId || getStoredInstallId?.();
-
-            try {
-                const res = await fetch('/install/reset', {
-                    method: 'POST',
-                    headers: withCsrfHeader({ 'Content-Type': 'application/json' }),
-                    body: JSON.stringify({ installId: installId || '', hard })
-                });
-                if (hard && !res.ok) {
-                    const data = await res.json().catch(() => ({}));
-                    showToast?.({
-                        status: 'error',
-                        title: 'Reset failed',
-                        description: data?.message || 'Could not stop containers. Try running "docker compose down -v" manually.',
-                        dismissible: true
-                    });
-                    return;
-                }
-            } catch (e) {
-                console.error('Reset request failed:', e);
-            }
-
-            clearInstallLock?.();
-            clearInstallId?.();
-            cleanupInstallFlow();
-            window.location.href = '/?step=1';
-        };
-
-        const startOverButton = root.querySelector('[data-install-start-over]');
-        if (startOverButton) {
-            startOverButton.addEventListener('click', () => performReset(false));
-        }
-
-        const hardResetButton = root.querySelector('[data-install-hard-reset]');
-        if (hardResetButton) {
-            hardResetButton.addEventListener('click', () => {
-                const confirmed = window.confirm(
-                    'This will stop all containers, remove all volumes (including database data, uploads, and certificates), and delete configuration files.\n\nThis action cannot be undone. Continue?'
-                );
-                if (confirmed) {
-                    performReset(true);
-                }
-            });
-        }
-
         // When the user switches back to this tab, check if installation
         // finished while the tab was in the background.
         document.addEventListener('visibilitychange', () => {
@@ -1070,45 +876,22 @@
             }
         });
 
-        const startFreshInstall = () => {
-            clearInstallId?.();
-            clearInstallLock?.();
-            const newInstallId = generateInstallId();
-            storeInstallId?.(newInstallId);
-            startInstallStream(newInstallId);
-        };
-
-        const recoverToLastStep = () => {
-            clearInstallId?.();
-            clearInstallLock?.();
-            const url = new URL(window.location.href);
-            const lastStep = url.searchParams.get('step');
-            // Stay on the current URL so the user keeps their place;
-            // only navigate away if we're already on step 5 (the
-            // progress screen) since there's nothing to show.
-            if (!lastStep || String(lastStep) === '5') {
-                window.location.href = '/?step=1';
-            }
-        };
-
         const lock = getInstallLock?.();
         const existingInstallId = lock?.installId || getStoredInstallId?.();
         if (existingInstallId) {
-            resumeInstall(existingInstallId).then((result) => {
-                if (result === 'completed') {
-                    // Install already finished — redirect to console
-                    // instead of bouncing back to step 1.
-                    stopSyncedSpinnerRotation();
-                    setUnloadGuard(false);
-                    clearInstallLock?.();
+            resumeInstall(existingInstallId).then((resumed) => {
+                if (!resumed) {
                     clearInstallId?.();
-                    startSslCheck(null);
-                } else if (!result) {
-                    recoverToLastStep();
+                    clearInstallLock?.();
+                    const newInstallId = generateInstallId();
+                    storeInstallId?.(newInstallId);
+                    startInstallStream(newInstallId);
                 }
             });
         } else {
-            startFreshInstall();
+            const newInstallId = generateInstallId();
+            storeInstallId?.(newInstallId);
+            startInstallStream(newInstallId);
         }
     };
 

app/views/install/installer/js/modules/state.js

@@ -7,8 +7,6 @@
 
     const INSTALL_LOCK_KEY = 'appwrite-install-lock';
     const INSTALL_ID_KEY = 'appwrite-install-id';
-    const INSTALL_LOCK_LOCAL_KEY = 'appwrite-install-lock-backup';
-    const INSTALL_ID_LOCAL_KEY = 'appwrite-install-id-backup';
 
     const formState = {
         appDomain: null,
@@ -57,24 +55,13 @@
     const getInstallLock = () => {
         try {
             const raw = sessionStorage.getItem(INSTALL_LOCK_KEY);
-            if (raw) {
-                const parsed = JSON.parse(raw);
-                if (parsed && typeof parsed === 'object') return parsed;
-            }
-        } catch (error) {}
-
-        try {
-            const raw = localStorage.getItem(INSTALL_LOCK_LOCAL_KEY);
-            if (raw) {
-                const parsed = JSON.parse(raw);
-                if (parsed && typeof parsed === 'object') {
-                    sessionStorage.setItem(INSTALL_LOCK_KEY, raw);
-                    return parsed;
-                }
-            }
-        } catch (error) {}
-
-        return null;
+            if (!raw) return null;
+            const parsed = JSON.parse(raw);
+            if (!parsed || typeof parsed !== 'object') return null;
+            return parsed;
+        } catch (error) {
+            return null;
+        }
     };
 
     const setInstallLock = (installId, payload) => {
@@ -92,9 +79,6 @@
         try {
             sessionStorage.setItem(INSTALL_LOCK_KEY, JSON.stringify(lock));
         } catch (error) {}
-        try {
-            localStorage.setItem(INSTALL_LOCK_LOCAL_KEY, JSON.stringify(lock));
-        } catch (error) {}
         if (document.body) {
             document.body.dataset.installLocked = 'true';
         }
@@ -105,9 +89,6 @@
         try {
             sessionStorage.removeItem(INSTALL_LOCK_KEY);
         } catch (error) {}
-        try {
-            localStorage.removeItem(INSTALL_LOCK_LOCAL_KEY);
-        } catch (error) {}
         if (document.body) {
             delete document.body.dataset.installLocked;
         }
@@ -140,31 +121,22 @@
 
     const getStoredInstallId = () => {
         try {
-            const val = sessionStorage.getItem(INSTALL_ID_KEY);
-            if (val) return val;
-        } catch (error) {}
-        try {
-            return localStorage.getItem(INSTALL_ID_LOCAL_KEY);
-        } catch (error) {}
-        return null;
+            return sessionStorage.getItem(INSTALL_ID_KEY);
+        } catch (error) {
+            return null;
+        }
     };
 
     const storeInstallId = (installId) => {
         try {
             sessionStorage.setItem(INSTALL_ID_KEY, installId);
         } catch (error) {}
-        try {
-            localStorage.setItem(INSTALL_ID_LOCAL_KEY, installId);
-        } catch (error) {}
     };
 
     const clearInstallId = () => {
         try {
             sessionStorage.removeItem(INSTALL_ID_KEY);
         } catch (error) {}
-        try {
-            localStorage.removeItem(INSTALL_ID_LOCAL_KEY);
-        } catch (error) {}
     };
 
     window.InstallerStepsState = {

app/views/install/installer/js/modules/ui.js

@@ -240,9 +240,6 @@
             if (key === 'database') {
                 value = toDatabaseLabel(formState?.database);
             }
-            if (key === 'emailCertificates' && !value) {
-                value = formState?.accountEmail;
-            }
             if (value) {
                 node.textContent = value;
             }

app/views/install/installer/js/modules/validation.js

@@ -106,18 +106,12 @@
         return LOCAL_HOSTS.has(normalized);
     };
 
-    const isIPAddress = (host) => {
-        if (!host) return false;
-        return isValidIPv4(host) || isValidIPv6(host);
-    };
-
     window.InstallerStepsValidation = {
         isValidEmail,
         isValidPort,
         isValidPassword,
         isValidHostnameInput,
         extractHostname,
-        isLocalHost,
-        isIPAddress
+        isLocalHost
     };
 })();

app/views/install/installer/js/steps.js

@@ -329,30 +329,6 @@
         }
     };
 
-    const initStep6 = (root) => {
-        if (!root) return;
-        syncInstallLockFlag?.();
-        applyLockPayload?.();
-        applyBodyDefaults?.();
-
-        const checkbox = root.querySelector('#run-migration');
-        if (checkbox) {
-            if (formState.migrate !== undefined) {
-                checkbox.checked = formState.migrate;
-            } else {
-                formState.migrate = checkbox.checked;
-            }
-            checkbox.addEventListener('change', () => {
-                formState.migrate = checkbox.checked;
-                dispatchStateChange?.('migrate');
-            });
-        }
-
-        if (isInstallLocked?.()) {
-            disableControls?.(root);
-        }
-    };
-
     const initStep = (step, container) => {
         if (!container) return;
         const root = container.querySelector('.step-layout') || container;
@@ -370,7 +346,6 @@
         if (normalized === 3) initStep3(root);
         if (normalized === 4) initStep4(root);
         if (normalized === 5) Progress.initStep5?.(root);
-        if (normalized === 6) initStep6(root);
     };
 
     window.InstallerSteps = {
@@ -415,7 +390,10 @@
                 if (!parsePort(httpPort, 'HTTP')) valid = false;
                 if (!parsePort(httpsPort, 'HTTPS')) valid = false;
 
-                if (sslEmail && sslEmail.value.trim() && !isValidEmail?.(sslEmail.value.trim())) {
+                if (!sslEmail || !sslEmail.value.trim()) {
+                    setFieldError?.(sslEmail, 'Please enter an email address for SSL certificates');
+                    valid = false;
+                } else if (!isValidEmail?.(sslEmail.value.trim())) {
                     setFieldError?.(sslEmail, 'Please enter a valid email address');
                     valid = false;
                 }

app/views/install/installer/templates/steps/step-4.phtml

@@ -62,14 +62,12 @@ $badgeClass = $defaultSecretKey !== '' ? 'badge-success' : 'badge-warning';
                         <span class="badge badge-neutral typography-text-xs-400" data-review-assistant-badge>Disabled</span>
                         <div class="review-label typography-text-xs-400 text-neutral-tertiary">Appwrite Assistant</div>
                     </div>
-                    <?php if (!$isUpgrade) { ?>
                     <div class="review-row">
                         <span class="badge <?php echo $badgeClass; ?> typography-text-xs-400" data-review-badge>
                             <?php echo htmlspecialchars((string) $badgeLabel, ENT_QUOTES, 'UTF-8'); ?>
                         </span>
                         <div class="review-label typography-text-xs-400 text-neutral-tertiary">Secret API key</div>
                     </div>
-                    <?php } ?>
                 </div>
             </div>
         </div>

app/views/install/installer/templates/steps/step-5.phtml

@@ -6,7 +6,7 @@ $isUpgrade = $isUpgrade ?? false;
         <div class="install-panel">
             <div class="install-header">
                 <div class="typography-text-m-400 text-neutral-primary">
-                    <?php echo $isUpgrade ? 'Updating Appwrite…' : 'Installing Appwrite…'; ?>
+                    <?php echo $isUpgrade ? 'Updating your app…' : 'Installing your app…'; ?>
                 </div>
             </div>
             <div class="install-list" data-install-list></div>
@@ -30,7 +30,6 @@ $isUpgrade = $isUpgrade ?? false;
                     </span>
                     <span class="install-text typography-text-m-400 text-neutral-primary" data-install-text></span>
                 </div>
-                <span class="install-counter typography-text-xs-400" data-install-counter></span>
                 <button type="button" class="install-row-toggle" aria-expanded="false" data-install-toggle>
                     <?php include __DIR__ . '/../../icons/chevron-down.svg'; ?>
                 </button>
@@ -51,13 +50,4 @@ $isUpgrade = $isUpgrade ?? false;
             </div>
         </div>
     </template>
-
-    <div class="install-global-actions is-hidden" data-install-global-actions>
-        <button type="button" class="button secondary" data-install-start-over>
-            <span class="button-text typography-text-m-500">Start Over</span>
-        </button>
-        <button type="button" class="button secondary" data-install-hard-reset>
-            <span class="button-text typography-text-m-500">Reset Everything</span>
-        </button>
-    </div>
 </div>

app/views/install/installer/templates/steps/step-6.phtml

@@ -1,37 +0,0 @@
-<?php
-$isUpgrade = $isUpgrade ?? false;
-?>
-<div class="step-layout" data-step="6">
-    <div class="stack-xl">
-        <div class="stack-xxxs">
-            <h1 class="typography-title-s text-neutral-primary">Database migration</h1>
-            <p class="typography-text-m-400 text-neutral-secondary">
-                Run database migration after the update to apply schema changes.
-            </p>
-        </div>
-
-        <div class="stack-xl">
-            <label class="migration-option" for="run-migration">
-                <span class="migration-option-content">
-                    <span class="typography-text-m-500 text-neutral-primary">Run migration automatically</span>
-                    <span class="typography-text-xs-400 text-neutral-tertiary">Recommended when upgrading to a new version</span>
-                </span>
-                <span class="migration-switch">
-                    <input type="checkbox" id="run-migration" name="migrate" class="sr-only" checked>
-                    <span class="migration-switch-track" aria-hidden="true">
-                        <span class="migration-switch-thumb"></span>
-                    </span>
-                </span>
-            </label>
-
-            <div class="migration-hint">
-                <span class="migration-hint-icon">
-                    <?php include __DIR__ . '/../../icons/info.svg'; ?>
-                </span>
-                <span class="typography-text-xs-400 text-neutral-tertiary">
-                    To run manually later: <code class="migration-code">docker compose exec appwrite migrate</code>
-                </span>
-            </div>
-        </div>
-    </div>
-</div>

app/worker.php

@@ -1,69 +1,511 @@
 <?php
 
 require_once __DIR__ . '/init.php';
-$registerWorkerMessageResources = require __DIR__ . '/init/worker/message.php';
 
 use Appwrite\Certificates\LetsEncrypt;
+use Appwrite\Event\Audit;
+use Appwrite\Event\Build;
+use Appwrite\Event\Certificate;
+use Appwrite\Event\Database as EventDatabase;
+use Appwrite\Event\Delete;
+use Appwrite\Event\Event;
+use Appwrite\Event\Func;
+use Appwrite\Event\Mail;
+use Appwrite\Event\Messaging;
+use Appwrite\Event\Migration;
+use Appwrite\Event\Publisher\Usage as UsagePublisher;
+use Appwrite\Event\Realtime;
+use Appwrite\Event\Screenshot;
+use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
+use Appwrite\Usage\Context;
+use Appwrite\Utopia\Database\Documents\User;
+use Executor\Executor;
 use Swoole\Runtime;
+use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
+use Utopia\Audit\Adapter\Database as AdapterDatabase;
+use Utopia\Audit\Audit as UtopiaAudit;
+use Utopia\Cache\Adapter\Pool as CachePool;
+use Utopia\Cache\Adapter\Sharding;
+use Utopia\Cache\Cache;
+use Utopia\Config\Config;
 use Utopia\Console;
+use Utopia\Database\Adapter\Pool as DatabasePool;
+use Utopia\Database\Database;
+use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
+use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Adapter\Swoole;
 use Utopia\Queue\Broker\Pool as BrokerPool;
+use Utopia\Queue\Message;
+use Utopia\Queue\Publisher;
+use Utopia\Queue\Queue;
 use Utopia\Queue\Server;
+use Utopia\Registry\Registry;
+use Utopia\Storage\Device\Telemetry as TelemetryDevice;
 use Utopia\System\System;
+use Utopia\Telemetry\Adapter as Telemetry;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
 Runtime::enableCoroutine();
 require_once __DIR__ . '/init/span.php';
 
-global $container;
-$container->set('pools', function ($register) {
-    return $register->get('pools');
-}, ['register']);
+global $register;
+Server::setResource('register', fn () => $register);
 
-$container->set('authorization', function () {
+Server::setResource('authorization', function () {
     $authorization = new Authorization();
     $authorization->disable();
 
     return $authorization;
 }, []);
 
-$container->set('project', fn () => new Document([]), []);
+Server::setResource('dbForPlatform', function (Cache $cache, Registry $register, Authorization $authorization) {
+    $pools = $register->get('pools');
+    $adapter = new DatabasePool($pools->get('console'));
+    $dbForPlatform = new Database($adapter, $cache);
 
-$container->set('log', fn () => new Log(), []);
+    $dbForPlatform
+        ->setDatabase(APP_DATABASE)
+        ->setAuthorization($authorization)
+        ->setNamespace('_console')
+        ->setDocumentType('users', User::class);
 
-$container->set('consumer', function (Group $pools) {
+    return $dbForPlatform;
+}, ['cache', 'register', 'authorization']);
+
+Server::setResource('project', function (Message $message, Database $dbForPlatform) {
+    $payload = $message->getPayload() ?? [];
+    $project = new Document($payload['project'] ?? []);
+
+    if ($project->getId() === 'console') {
+        return $project;
+    }
+
+    return $dbForPlatform->getDocument('projects', $project->getId());
+}, ['message', 'dbForPlatform']);
+
+Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform, Authorization $authorization) {
+    if ($project->isEmpty() || $project->getId() === 'console') {
+        return $dbForPlatform;
+    }
+
+    $pools = $register->get('pools');
+
+    try {
+        $dsn = new DSN($project->getAttribute('database'));
+    } catch (\InvalidArgumentException) {
+        // TODO: Temporary until all projects are using shared tables
+        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+    }
+
+    $adapter = new DatabasePool($pools->get($dsn->getHost()));
+    $database = new Database($adapter, $cache);
+    $database->setDocumentType('users', User::class);
+
+    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+    if (\in_array($dsn->getHost(), $sharedTables)) {
+        $database
+            ->setSharedTables(true)
+            ->setTenant($project->getSequence())
+            ->setNamespace($dsn->getParam('namespace'));
+    } else {
+        $database
+            ->setSharedTables(false)
+            ->setTenant(null)
+            ->setNamespace('_' . $project->getSequence());
+    }
+
+    $database
+        ->setDatabase(APP_DATABASE)
+        ->setAuthorization($authorization)
+        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+
+    return $database;
+}, ['cache', 'register', 'message', 'project', 'dbForPlatform', 'authorization']);
+
+Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, Authorization $authorization) {
+    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
+
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases): Database {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            return $dbForPlatform;
+        }
+
+        try {
+            $dsn = new DSN($project->getAttribute('database'));
+        } catch (\InvalidArgumentException) {
+            // TODO: Temporary until all projects are using shared tables
+            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+        }
+
+        if (isset($databases[$dsn->getHost()])) {
+            $database = $databases[$dsn->getHost()];
+            $database->setAuthorization($authorization);
+            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+            if (\in_array($dsn->getHost(), $sharedTables)) {
+                $database
+                    ->setSharedTables(true)
+                    ->setTenant($project->getSequence())
+                    ->setNamespace($dsn->getParam('namespace'));
+            } else {
+                $database
+                    ->setSharedTables(false)
+                    ->setTenant(null)
+                    ->setNamespace('_' . $project->getSequence());
+            }
+
+            return $database;
+        }
+
+        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $database = new Database($adapter, $cache);
+
+        $databases[$dsn->getHost()] = $database;
+
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+        if (\in_array($dsn->getHost(), $sharedTables)) {
+            $database
+                ->setSharedTables(true)
+                ->setTenant($project->getSequence())
+                ->setNamespace($dsn->getParam('namespace'));
+        } else {
+            $database
+                ->setSharedTables(false)
+                ->setTenant(null)
+                ->setNamespace('_' . $project->getSequence());
+        }
+
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization)
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+
+        return $database;
+    };
+}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+
+Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+    $database = null;
+
+    return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
+        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant($project->getSequence());
+            return $database;
+        }
+
+        $adapter = new DatabasePool($pools->get('logs'));
+        $database = new Database($adapter, $cache);
+
+        $database
+            ->setDatabase(APP_DATABASE)
+            ->setAuthorization($authorization)
+            ->setSharedTables(true)
+            ->setNamespace('logsV1')
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
+
+        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
+            $database->setTenant($project->getSequence());
+        }
+
+        return $database;
+    };
+}, ['pools', 'cache', 'authorization']);
+
+Server::setResource('abuseRetention', function () {
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+});
+
+Server::setResource('auditRetention', function (Document $project) {
+    if ($project->getId() === 'console') {
+        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
+    }
+
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
+}, ['project']);
+
+Server::setResource('executionRetention', function () {
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+});
+
+Server::setResource('cache', function (Registry $register) {
+    $pools = $register->get('pools');
+    $list = Config::getParam('pools-cache', []);
+    $adapters = [];
+
+    foreach ($list as $value) {
+        $adapters[] = new CachePool($pools->get($value));
+    }
+
+    return new Cache(new Sharding($adapters));
+}, ['register']);
+
+Server::setResource('redis', function () {
+    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
+    $port = System::getEnv('_APP_REDIS_PORT', 6379);
+    $pass = System::getEnv('_APP_REDIS_PASS', '');
+
+    $redis = new \Redis();
+    @$redis->pconnect($host, (int) $port);
+    if ($pass) {
+        $redis->auth($pass);
+    }
+    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
+
+    return $redis;
+});
+
+Server::setResource('timelimit', function (\Redis $redis) {
+    return function (string $key, int $limit, int $time) use ($redis) {
+        return new TimeLimitRedis($key, $limit, $time, $redis);
+    };
+}, ['redis']);
+
+Server::setResource('log', fn () => new Log());
+
+Server::setResource('publisher', function (Group $pools) {
+    return new BrokerPool(publisher: $pools->get('publisher'));
+}, ['pools']);
+
+Server::setResource('publisherDatabases', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('publisherFunctions', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('publisherMigrations', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('publisherMessaging', function (BrokerPool $publisher) {
+    return $publisher;
+}, ['publisher']);
+
+Server::setResource('consumer', function (Group $pools) {
     return new BrokerPool(consumer: $pools->get('consumer'));
 }, ['pools']);
 
-$container->set('consumerDatabases', function (BrokerPool $consumer) {
+Server::setResource('consumerDatabases', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-$container->set('consumerMigrations', function (BrokerPool $consumer) {
+Server::setResource('consumerMigrations', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-$container->set('consumerStatsUsage', function (BrokerPool $consumer) {
+Server::setResource('consumerStatsUsage', function (BrokerPool $consumer) {
     return $consumer;
 }, ['consumer']);
 
-$container->set('certificates', function () {
+Server::setResource('usage', function () {
+    return new Context();
+}, []);
+Server::setResource('publisherForUsage', fn (Publisher $publisher) => new UsagePublisher(
+    $publisher,
+    new Queue(System::getEnv('_APP_STATS_USAGE_QUEUE_NAME', Event::STATS_USAGE_QUEUE_NAME))
+), ['publisher']);
+
+Server::setResource('queueForDatabase', function (Publisher $publisher) {
+    return new EventDatabase($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForMessaging', function (Publisher $publisher) {
+    return new Messaging($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForMails', function (Publisher $publisher) {
+    return new Mail($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForBuilds', function (Publisher $publisher) {
+    return new Build($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForScreenshots', function (Publisher $publisher) {
+    return new Screenshot($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForDeletes', function (Publisher $publisher) {
+    return new Delete($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForEvents', function (Publisher $publisher) {
+    return new Event($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForAudits', function (Publisher $publisher) {
+    return new Audit($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForWebhooks', function (Publisher $publisher) {
+    return new Webhook($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForFunctions', function (Publisher $publisher) {
+    return new Func($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForRealtime', function () {
+    return new Realtime();
+}, []);
+
+Server::setResource('queueForCertificates', function (Publisher $publisher) {
+    return new Certificate($publisher);
+}, ['publisher']);
+
+Server::setResource('queueForMigrations', function (Publisher $publisher) {
+    return new Migration($publisher);
+}, ['publisher']);
+
+Server::setResource('logger', function (Registry $register) {
+    return $register->get('logger');
+}, ['register']);
+
+Server::setResource('pools', function (Registry $register) {
+    return $register->get('pools');
+}, ['register']);
+
+Server::setResource('telemetry', fn () => new NoTelemetry());
+
+Server::setResource('deviceForSites', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_SITES . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForMigrations', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForFunctions', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForFiles', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForBuilds', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource('deviceForCache', function (Document $project, Telemetry $telemetry) {
+    return new TelemetryDevice($telemetry, getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId()));
+}, ['project', 'telemetry']);
+
+Server::setResource(
+    'isResourceBlocked',
+    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
+);
+
+Server::setResource('plan', function (array $plan = []) {
+    return [];
+});
+
+Server::setResource('certificates', function () {
     $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
     if (empty($email)) {
         throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue a LetsEncrypt SSL certificate.');
     }
 
     return new LetsEncrypt($email);
-}, []);
+});
 
+Server::setResource('logError', function (Registry $register, Document $project) {
+    return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
+        $logger = $register->get('logger');
+
+        if ($logger) {
+            $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+
+            $log = new Log();
+            $log->setNamespace($namespace);
+            $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+            $log->setVersion($version);
+            $log->setType(Log::TYPE_ERROR);
+            $log->setMessage($error->getMessage());
+
+            $log->addTag('code', $error->getCode());
+            $log->addTag('verboseType', get_class($error));
+            $log->addTag('projectId', $project->getId() ?? '');
+
+            $log->addExtra('file', $error->getFile());
+            $log->addExtra('line', $error->getLine());
+            $log->addExtra('trace', $error->getTraceAsString());
+
+            if ($error->getPrevious() !== null) {
+                if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+                    $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
+                }
+                $log->addExtra('previousFile', $error->getPrevious()->getFile());
+                $log->addExtra('previousLine', $error->getPrevious()->getLine());
+            }
+
+            foreach (($extras ?? []) as $key => $value) {
+                $log->addExtra($key, $value);
+            }
+
+            $log->setAction($action);
+
+            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            try {
+                $responseCode = $logger->addLog($log);
+                Console::info('Error log pushed with status code: ' . $responseCode);
+            } catch (Throwable $th) {
+                Console::error('Error pushing log: ' . $th->getMessage());
+            }
+        }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
+
+        if ($error->getPrevious() !== null) {
+            if ($error->getPrevious()->getMessage() != $error->getMessage()) {
+                Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
+            }
+            Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
+        }
+    };
+}, ['register', 'project']);
+
+Server::setResource('executor', fn () => new Executor());
+
+Server::setResource('getAudit', function (Database $dbForPlatform, callable $getProjectDB) {
+    return function (Document $project) use ($dbForPlatform, $getProjectDB) {
+        if ($project->isEmpty() || $project->getId() === 'console') {
+            $adapter = new AdapterDatabase($dbForPlatform);
+
+            return new UtopiaAudit($adapter);
+        }
+
+        $dbForProject = $getProjectDB($project);
+        $adapter = new AdapterDatabase($dbForProject);
+
+        return new UtopiaAudit($adapter);
+    };
+}, ['dbForPlatform', 'getProjectDB']);
+
+Server::setResource('executionsRetentionCount', function (Document $project, array $plan) {
+    if ($project->getId() === 'console' || empty($plan)) {
+        return 0;
+    }
+
+    return (int) ($plan['executionsRetentionCount'] ?? 100);
+}, ['project', 'plan']);
+
+$pools = $register->get('pools');
 $platform = new Appwrite();
-$args = $_SERVER['argv'] ?? [];
+$args = $platform->getEnv('argv');
 
 if (! isset($args[1])) {
     Console::error('Missing worker name');
@@ -79,45 +521,38 @@ if (\str_starts_with($workerName, 'databases')) {
     $queueName = System::getEnv('_APP_QUEUE_NAME', 'v1-' . strtolower($workerName));
 }
 
-/** @var \Utopia\Pools\Group $pools */
-$pools = $container->get('pools');
-
-$adapter = new Swoole(
-    $pools->get('consumer')->pop()->getResource(),
-    System::getEnv('_APP_WORKERS_NUM', 1),
-    $queueName
-);
-
-$worker = new Server($adapter, $container);
-
 try {
-    $worker->init()->action(function () use ($worker, $registerWorkerMessageResources) {
-        $registerWorkerMessageResources($worker->getContainer());
-    });
-
-    $container->set('bus', function ($register) use ($worker) {
-        return $register->get('bus')->setResolver(
-            fn (string $name) => $worker->getContainer()->get($name)
-        );
-    }, ['register']);
-
-    $platform->setWorker($worker);
+    /**
+     * Any worker can be configured with the following env vars:
+     * - _APP_WORKERS_NUM           The total number of worker processes
+     * - _APP_WORKER_PER_CORE       The number of worker processes per core (ignored if _APP_WORKERS_NUM is set)
+     * - _APP_QUEUE_NAME            The name of the queue to read for database events
+     */
     $platform->init(Service::TYPE_WORKER, [
-        'workerName' => strtolower($workerName),
+        'workersNum' => System::getEnv('_APP_WORKERS_NUM', 1),
+        'connection' => $pools->get('consumer')->pop()->getResource(),
+        'workerName' => strtolower($workerName) ?? null,
+        'queueName' => $queueName,
     ]);
 } catch (\Throwable $e) {
     Console::error($e->getMessage() . ', File: ' . $e->getFile() . ', Line: ' . $e->getLine());
-    Console::exit(1);
 }
 
+$worker = $platform->getWorker();
+
+Server::setResource('bus', function ($register) use ($worker) {
+    return $register->get('bus')->setResolver(fn (string $name) => $worker->getResource($name));
+}, ['register']);
+
 $worker
     ->error()
     ->inject('error')
     ->inject('logger')
     ->inject('log')
+    ->inject('pools')
     ->inject('project')
     ->inject('authorization')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Document $project, Authorization $authorization) use ($queueName) {
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project, Authorization $authorization) use ($queueName) {
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
 
         if ($logger) {

composer.json

@@ -13,9 +13,9 @@
         "test": "vendor/bin/phpunit",
         "lint": "vendor/bin/pint --test --config pint.json",
         "format": "vendor/bin/pint --config pint.json",
-        "analyze": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=1G",
+		"analyze": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=1G",
         "bench": "vendor/bin/phpbench run --report=benchmark",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=1G",
+        "check": "./vendor/bin/phpstan analyse -c phpstan.neon",
         "installer:clean": "php src/Appwrite/Platform/Installer/Server.php --clean",
         "installer:dev": "docker compose build && composer installer:clean && php src/Appwrite/Platform/Installer/Server.php --docker"
     },
@@ -57,7 +57,7 @@
         "utopia-php/audit": "2.2.*",
         "utopia-php/auth": "0.5.*",
         "utopia-php/cache": "1.0.*",
-        "utopia-php/cli": "0.23.*",
+        "utopia-php/cli": "0.22.*",
         "utopia-php/compression": "0.1.*",
         "utopia-php/config": "1.*",
         "utopia-php/console": "0.1.*",
@@ -67,24 +67,24 @@
         "utopia-php/emails": "0.6.*",
         "utopia-php/dns": "1.6.*",
         "utopia-php/dsn": "0.2.1",
-        "utopia-php/http": "0.34.*",
+        "utopia-php/framework": "0.33.*",
         "utopia-php/fetch": "0.5.*",
         "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.8.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.22.*",
-        "utopia-php/migration": "1.9.*",
-        "utopia-php/platform": "0.12.*",
+        "utopia-php/messaging": "0.20.*",
+        "utopia-php/migration": "1.7.*",
+        "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "1.*",
         "utopia-php/span": "1.1.*",
         "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.17.*",
-        "utopia-php/servers": "0.3.*",
+        "utopia-php/queue": "0.15.*",
+        "utopia-php/servers": "0.2.5",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "1.0.*",
         "utopia-php/system": "0.10.*",
         "utopia-php/telemetry": "0.2.*",
-        "utopia-php/vcs": "3.*",
+        "utopia-php/vcs": "2.*",
         "utopia-php/websocket": "1.0.*",
         "matomo/device-detector": "6.4.*",
         "dragonmantank/cron-expression": "3.4.*",
@@ -92,10 +92,17 @@
         "chillerlan/php-qrcode": "4.3.*",
         "adhocore/jwt": "1.1.*",
         "spomky-labs/otphp": "11.*",
-        "webonyx/graphql-php": "15.31.*",
+        "webonyx/graphql-php": "14.11.*",
         "league/csv": "9.14.*",
-        "enshrined/svg-sanitize": "0.22.*"
+        "enshrined/svg-sanitize": "0.22.*",
+        "utopia-php/di": "0.1.0"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/database"
+        }
+    ],
     "require-dev": {
         "ext-fileinfo": "*",
         "appwrite/sdk-generator": "*",
@@ -107,11 +114,18 @@
         "czproject/git-php": "4.*",
         "laravel/pint": "1.*"
     },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/utopia-php/database"
+        }
+    ],
     "provide": {
         "ext-phpiredis": "*"
     },
     "config": {
         "platform": {
+            "php": "8.3"
         },
         "allow-plugins": {
             "php-http/discovery": true,

docker-compose.yml

@@ -112,8 +112,6 @@ services:
         condition: service_healthy
       coredns:
         condition: service_started
-      ollama:
-        condition: service_started
     entrypoint:
       - php
       - -e
@@ -161,12 +159,6 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER_VECTORSDB
-      - _APP_DB_HOST_VECTORSDB
-      - _APP_DB_PORT_VECTORSDB
-      - _APP_DB_SCHEMA_VECTORSDB
-      - _APP_DB_USER_VECTORSDB
-      - _APP_DB_PASS_VECTORSDB
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -254,7 +246,7 @@ services:
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:7.8.26
+    image: appwrite/console:7.5.7
     restart: unless-stopped
     networks:
       - appwrite
@@ -303,7 +295,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -320,12 +311,6 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER_VECTORSDB
-      - _APP_DB_HOST_VECTORSDB
-      - _APP_DB_PORT_VECTORSDB
-      - _APP_DB_SCHEMA_VECTORSDB
-      - _APP_DB_USER_VECTORSDB
-      - _APP_DB_PASS_VECTORSDB
       - _APP_USAGE_STATS
       - _APP_LOGGING_CONFIG
       - _APP_LOGGING_CONFIG_REALTIME
@@ -345,7 +330,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -379,7 +363,6 @@ services:
       - ${_APP_DB_HOST:-mongodb}
       - request-catcher-sms
       - request-catcher-webhook
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -410,7 +393,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     volumes:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
@@ -420,7 +402,6 @@ services:
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -477,11 +458,9 @@ services:
     volumes:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
-      
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -497,12 +476,6 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_DB_ADAPTER_VECTORSDB
-      - _APP_DB_HOST_VECTORSDB
-      - _APP_DB_PORT_VECTORSDB
-      - _APP_DB_SCHEMA_VECTORSDB
-      - _APP_DB_USER_VECTORSDB
-      - _APP_DB_PASS_VECTORSDB
       - _APP_LOGGING_CONFIG
       - _APP_WORKERS_NUM
       - _APP_QUEUE_NAME
@@ -524,7 +497,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -657,7 +629,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     volumes:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
@@ -877,7 +848,6 @@ services:
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
       - ./tests:/usr/src/code/tests
-      
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
     environment:
@@ -1074,7 +1044,6 @@ services:
     depends_on:
       - redis
       - ${_APP_DB_HOST:-mongodb}
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1108,7 +1077,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1139,7 +1107,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1170,7 +1137,6 @@ services:
     depends_on:
       - ${_APP_DB_HOST:-mongodb}
       - redis
-      - ollama
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -1262,6 +1228,7 @@ services:
       start_period: 5s
 
   mariadb:
+    profiles: ["mariadb"]
     image: mariadb:10.11 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     <<: *x-logging
@@ -1285,6 +1252,7 @@ services:
       retries: 12
 
   mongodb:
+    profiles: ["mongodb"]
     image: mongo:8.2.5
     container_name: appwrite-mongodb
     <<: *x-logging
@@ -1320,41 +1288,32 @@ services:
       retries: 10
       start_period: 30s
 
+
+
   postgresql:
-    image: appwrite/postgres:0.1.0
+    profiles: ["postgresql"]
+    build:
+      context: ./tests/resources/postgresql
+      args:
+        POSTGRES_VERSION: 17
     container_name: appwrite-postgresql
     <<: *x-logging
     networks:
       - appwrite
     volumes:
-      - appwrite-postgresql:/var/lib/postgresql/18/data:rw
+      - appwrite-postgresql:/var/lib/postgresql:rw
     ports:
       - "5432:5432"
     environment:
       - POSTGRES_DB=${_APP_DB_SCHEMA}
       - POSTGRES_USER=${_APP_DB_USER}
       - POSTGRES_PASSWORD=${_APP_DB_PASS}
+    command: "postgres"
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${_APP_DB_USER} -d ${_APP_DB_SCHEMA}"]
+      test: ["CMD-SHELL", "pg_isready -U ${_APP_DB_USER}"]
       interval: 5s
       timeout: 5s
-      retries: 10
-      start_period: 10s
-    command: "postgres"
-
-  ollama:
-    image: appwrite/ollama:0.1.1
-    container_name: ollama
-    ports:
-      - "11434:11434"
-    restart: unless-stopped
-    environment:
-      MODELS: ${_APP_EMBEDDING_MODELS:-embeddinggemma}
-      OLLAMA_KEEP_ALIVE: 24h
-    volumes:
-      - appwrite-models:/root/.ollama
-    networks:
-      - appwrite
+      retries: 12
 
   redis:
     image: redis:7.4.7-alpine
@@ -1477,4 +1436,3 @@ volumes:
   appwrite-sites:
   appwrite-builds:
   appwrite-config:
-  appwrite-models:

docs/references/documentsdb/create-collection.md

@@ -1 +0,0 @@
-Create a new Collection. Before using this route, you should create a new database resource using either a [server integration](https://appwrite.io/docs/server/databases#documentsDBCreateCollection) API or directly from your database console.

docs/references/documentsdb/create-document.md

@@ -1 +0,0 @@
-Create a new Document. Before using this route, you should create a new collection resource using either a [server integration](https://appwrite.io/docs/server/databases#documentsDBCreateCollection) API or directly from your database console.

docs/references/documentsdb/create-documents.md

@@ -1 +0,0 @@
-Create new Documents. Before using this route, you should create a new collection resource using either a [server integration](https://appwrite.io/docs/server/databases#documentsDBCreateCollection) API or directly from your database console.

docs/references/documentsdb/create-index.md

@@ -1,2 +0,0 @@
-Creates an index on the attributes listed. Your index should include all the attributes you will query in a single request.
-Attributes can be `key`, `fulltext`, and `unique`.

docs/references/documentsdb/create-operations.md

@@ -1 +0,0 @@
-Create multiple operations in a single transaction.

docs/references/documentsdb/create-transaction.md

@@ -1 +0,0 @@
-Create a new transaction.

docs/references/documentsdb/create.md

@@ -1 +0,0 @@
-Create a new Database.

docs/references/documentsdb/decrement-document-attribute.md

@@ -1 +0,0 @@
-Decrement a specific column of a row by a given value.

docs/references/documentsdb/delete-collection.md

@@ -1 +0,0 @@
-Delete a collection by its unique ID. Only users with write permissions have access to delete this resource.

docs/references/documentsdb/delete-document.md

@@ -1 +0,0 @@
-Delete a document by its unique ID.

docs/references/documentsdb/delete-documents.md

@@ -1 +0,0 @@
-Bulk delete documents using queries, if no queries are passed then all documents are deleted.

docs/references/documentsdb/delete-index.md

@@ -1 +0,0 @@
-Delete an index.

docs/references/documentsdb/delete-transaction.md

@@ -1 +0,0 @@
-Delete a transaction by its unique ID.

docs/references/documentsdb/delete.md

@@ -1 +0,0 @@
-Delete a database by its unique ID. Only API keys with with databases.write scope can delete a database.

docs/references/documentsdb/get-collection-logs.md

@@ -1 +0,0 @@
-Get the collection activity logs list by its unique ID.

docs/references/documentsdb/get-collection-usage.md

@@ -1 +0,0 @@
-Get usage metrics and statistics for a collection. Returning the total number of documents. The response includes both current totals and historical data over time. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, range defaults to 30 days.

docs/references/documentsdb/get-collection.md

@@ -1 +0,0 @@
-Get a collection by its unique ID. This endpoint response returns a JSON object with the collection metadata.

docs/references/documentsdb/get-database-usage.md

@@ -1 +0,0 @@
-Get usage metrics and statistics for a database. You can view the total number of collections, documents, and storage usage. The response includes both current totals and historical data over time. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, range defaults to 30 days.

docs/references/documentsdb/get-document-logs.md

@@ -1 +0,0 @@
-Get the document activity logs list by its unique ID.

docs/references/documentsdb/get-document.md

@@ -1 +0,0 @@
-Get a document by its unique ID. This endpoint response returns a JSON object with the document data.

docs/references/documentsdb/get-index.md

@@ -1 +0,0 @@
-Get index by ID.

docs/references/documentsdb/get-logs.md

@@ -1 +0,0 @@
-Get the database activity logs list by its unique ID.

docs/references/documentsdb/get-transaction.md

@@ -1 +0,0 @@
-Get a transaction by its unique ID.

docs/references/documentsdb/get.md

@@ -1 +0,0 @@
-Get a database by its unique ID. This endpoint response returns a JSON object with the database metadata.

docs/references/documentsdb/increment-document-attribute.md

@@ -1 +0,0 @@
-Increment a specific column of a row by a given value.

docs/references/documentsdb/list-attributes.md

@@ -1 +0,0 @@
-List attributes in the collection.

docs/references/documentsdb/list-collections.md

@@ -1 +0,0 @@
-Get a list of all collections that belong to the provided databaseId. You can use the search parameter to filter your results.

docs/references/documentsdb/list-documents.md

@@ -1 +0,0 @@
-Get a list of all the user's documents in a given collection. You can use the query params to filter your results.

docs/references/documentsdb/list-indexes.md

@@ -1 +0,0 @@
-List indexes in the collection.

docs/references/documentsdb/list-transactions.md

@@ -1 +0,0 @@
-List transactions across all databases.

docs/references/documentsdb/list-usage.md

@@ -1 +0,0 @@
-List usage metrics and statistics for all databases in the project. You can view the total number of databases, collections, documents, and storage usage. The response includes both current totals and historical data over time. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, range defaults to 30 days.

docs/references/documentsdb/list.md

@@ -1 +0,0 @@
-Get a list of all databases from the current Appwrite project. You can use the search parameter to filter your results.

docs/references/documentsdb/update-collection.md

@@ -1 +0,0 @@
-Update a collection by its unique ID.