filter out null values

.github/workflows/ci.yml

@@ -150,16 +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
+        run: composer analyze
 
   locale:
     name: Checks / Locale

.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,120 +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)`.
 
-## Cross-repo context
+**Correct Pattern:**
+```php
+// Good: Pass only changed attributes directly
+$user = $dbForProject->updateDocument('users', $user->getId(), new Document([
+    'name' => $name,
+    'email' => $email,
+]));
+```
 
-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.
+**Incorrect Pattern:**
+```php
+$user->setAttribute('name', $name);
+$user->setAttribute('email', $email);
+
+// Bad: Passing full document is inefficient
+$user = $dbForProject->updateDocument('users', $user->getId(), $user);
+```
+
+**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.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/authentication)** - 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,7 +72,6 @@ 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" \
@@ -84,7 +84,6 @@ 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" ^
@@ -95,7 +94,6 @@ docker run -it --rm ^
 
 ```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" `
@@ -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

@@ -329,20 +329,17 @@ $setResource('bus', function (Registry $register) use ($cli) {
 
 $setResource('telemetry', fn () => new NoTelemetry(), []);
 
-$exitCode = 0;
-
 $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();
     });
 
@@ -351,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/collections/projects.php

@@ -64,7 +64,7 @@ return [
             [
                 '$id' => ID::custom('database'),
                 'type' => Database::VAR_STRING,
-                'size' => 2000,
+                'size' => 128,
                 'required' => false,
                 'signed' => true,
                 'array' => false,
@@ -841,6 +841,28 @@ return [
                 'array' => true,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('providerBranches'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => [],
+                'array' => true,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('providerPaths'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => [],
+                'array' => true,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [
@@ -1320,6 +1342,28 @@ return [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('providerBranches'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => [],
+                'array' => true,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('providerPaths'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => [],
+                'array' => true,
+                'filters' => [],
+            ],
         ],
         'indexes' => [
             [

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.',

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/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/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/controllers/api/account.php

@@ -403,8 +403,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()) {
@@ -453,38 +452,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 {
@@ -515,11 +487,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');
@@ -723,7 +695,6 @@ Http::delete('/v1/account/sessions')
 
         $protocol = $request->getProtocol();
         $sessions = $user->getAttribute('sessions', []);
-        $currentSession = null;
 
         foreach ($sessions as $session) {/** @var Document $session */
             $dbForProject->deleteDocument('sessions', $session->getId());
@@ -745,7 +716,6 @@ Http::delete('/v1/account/sessions')
                     ->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));
 
@@ -758,11 +728,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();
     });
@@ -808,8 +776,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);
             }
         }
 
@@ -989,7 +956,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')
@@ -1537,9 +1504,8 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->inject('store')
     ->inject('proofForPassword')
     ->inject('proofForToken')
-    ->inject('plan')
     ->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, 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();
@@ -1781,38 +1747,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 {
@@ -1842,11 +1780,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');
@@ -1921,47 +1859,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'))) {
@@ -2078,7 +1988,7 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                 ->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;
@@ -2239,11 +2149,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');
         }
@@ -2278,38 +2187,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([
@@ -2336,11 +2217,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');
@@ -2548,11 +2429,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');
         }
@@ -2585,38 +2465,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([
@@ -2641,11 +2493,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');
@@ -3462,10 +3314,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');
 
@@ -3493,48 +3344,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)) {
@@ -3937,7 +3760,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)
@@ -4038,7 +3861,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);
     });
@@ -4268,7 +4091,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)
@@ -4360,7 +4183,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);
     });
@@ -4892,5 +4715,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);
         }

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

@@ -3566,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 {

app/controllers/api/migrations.php

@@ -29,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;
@@ -54,15 +53,6 @@ function getDatabaseTransferResourceServices(string $databaseType)
     };
 }
 
-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')
@@ -457,7 +447,6 @@ Http::post('/v1/migrations/csv/imports')
         }
         $fileSize = $deviceForMigrations->getFileSize($newPath);
         $resources = Transfer::extractServices([getDatabaseTransferResourceServices($databaseType)]);
-        $resourceType = getDatabaseResourceType($databaseType);
 
         $migration = $dbForProject->createDocument('migrations', new Document([
             '$id' => $migrationId,
@@ -467,7 +456,7 @@ Http::post('/v1/migrations/csv/imports')
             'destination' => Appwrite::getName(),
             'resources' => $resources,
             'resourceId' => $resourceId,
-            'resourceType' => $resourceType,
+            'resourceType' => Resource::TYPE_DATABASE,
             'statusCounters' => '{}',
             'resourceData' => '{}',
             'errors' => [],
@@ -576,6 +565,16 @@ Http::post('/v1/migrations/csv/exports')
             throw new Exception(Exception::COLLECTION_NOT_FOUND);
         }
 
+        $validator = new Documents(
+            attributes: $collection->getAttribute('attributes', []),
+            indexes: $collection->getAttribute('indexes', []),
+            idAttributeType: $dbForProject->getAdapter()->getIdAttributeType(),
+        );
+
+        if (!$validator->isValid($parsedQueries)) {
+            throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+        }
+
         // getting databasetype
         $resources = explode(':', $resourceId);
         $databaseId = $resources[0];
@@ -584,23 +583,7 @@ Http::post('/v1/migrations/csv/exports')
         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(),
@@ -610,7 +593,7 @@ Http::post('/v1/migrations/csv/exports')
             'destination' => CSV::getName(),
             'resources' => $resources,
             'resourceId' => $resourceId,
-            'resourceType' => $resourceType,
+            'resourceType' => Resource::TYPE_DATABASE,
             'statusCounters' => '{}',
             'resourceData' => '{}',
             'errors' => [],
@@ -641,291 +624,6 @@ Http::post('/v1/migrations/csv/exports')
             ->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('queueForMigrations')
-    ->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,
-        Migration $queueForMigrations
-    ) {
-        $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());
-
-        $queueForMigrations
-            ->setMigration($migration)
-            ->setProject($project)
-            ->setPlatform($platform)
-            ->trigger();
-
-        $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('queueForMigrations')
-    ->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,
-        Migration $queueForMigrations
-    ) {
-        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());
-
-        $queueForMigrations
-            ->setMigration($migration)
-            ->setProject($project)
-            ->setPlatform($platform)
-            ->trigger();
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($migration, Response::MODEL_MIGRATION);
-    });
-
 Http::get('/v1/migrations')
     ->groups(['api', 'migrations'])
     ->desc('List migrations')

app/controllers/api/projects.php

@@ -1570,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)
@@ -1506,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);
 
@@ -1540,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 {
@@ -2402,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')
@@ -2466,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')
@@ -2721,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

@@ -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) {
@@ -868,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', ''));
@@ -979,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());
             }
         }
     });
@@ -1019,7 +1012,7 @@ Http::init()
             return;
         }
         $route = $request->getRoute();
-        if ($route?->getLabel('origin', false) === '*') {
+        if ($route->getLabel('origin', false) === '*') {
             return;
         }
         if (!$originValidator->isValid($origin)) {
@@ -1277,16 +1270,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,
@@ -1493,19 +1477,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->addHeader($name, $value, override: true);
-            }
-        } 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

@@ -96,7 +96,7 @@ 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();
 
         /**
@@ -419,7 +419,7 @@ Http::init()
             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);
             }
@@ -483,10 +483,7 @@ 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();
         $path = $route->getMatchedPath();
@@ -499,7 +496,7 @@ Http::init()
         if (
             array_key_exists('rest', $project->getAttribute('apis', []))
             && ! $project->getAttribute('apis', [])['rest']
-            && ! ($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            && ! (User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
@@ -531,8 +528,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
@@ -614,7 +611,7 @@ 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();
             $cacheLog = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
@@ -633,7 +630,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);
@@ -666,7 +663,7 @@ Http::init()
                         throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                     }
                     // 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());
@@ -700,7 +697,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;
         }
@@ -987,7 +984,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

@@ -3,8 +3,6 @@
 require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/init/span.php';
 
-global $register;
-
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Swoole\Constant;
@@ -33,6 +31,7 @@ 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;
 
@@ -104,7 +103,7 @@ function dispatch(Server $server, int $fd, int $type, $data = null): int
         $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
@@ -294,7 +293,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $tot
 
     go(function () use ($register, $app) {
         $pools = $register->get('pools');
-        /** @var \Utopia\Pools\Group $pools */
+        /** @var Group $pools */
         Http::setResource('pools', fn () => $pools);
 
         /** @var array $collections */
@@ -656,7 +655,7 @@ $http->on(Constant::EVENT_TASK, function () use ($register) {
     /** @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) {

app/init/constants.php

@@ -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';

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;
     }
 
@@ -242,8 +242,8 @@ $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);
 
     $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
 
@@ -308,7 +308,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();
@@ -433,20 +433,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/resources.php

@@ -432,10 +432,8 @@ Http::setResource('user', function (string $mode, Document $project, Document $c
         $jwtUserId = $payload['userId'] ?? '';
         if (! empty($jwtUserId)) {
             if ($mode === APP_MODE_ADMIN) {
-                /** @var User $user */
                 $user = $dbForPlatform->getDocument('users', $jwtUserId);
             } else {
-                /** @var User $user */
                 $user = $dbForProject->getDocument('users', $jwtUserId);
             }
         }
@@ -455,7 +453,6 @@ Http::setResource('user', function (string $mode, Document $project, Document $c
             throw new Exception(Exception::USER_API_KEY_AND_SESSION_SET);
         }
 
-        /** @var User $accountKeyUser */
         $accountKeyUser = $dbForPlatform->getAuthorization()->skip(fn () => $dbForPlatform->getDocument('users', $accountKeyUserId));
         if (! $accountKeyUser->isEmpty()) {
             $key = $accountKeyUser->find(
@@ -696,7 +693,7 @@ Http::setResource('dbForProject', function (Group $pools, Database $dbForPlatfor
         $cacheKey = \sprintf(
             '%s-cache-%s:%s:%s:project:%s:functions:events',
             $dbForProject->getCacheName(),
-            $hostname,
+            $hostname ?? '',
             $dbForProject->getNamespace(),
             $dbForProject->getTenant(),
             $project->getId()

app/realtime.php

@@ -237,6 +237,7 @@ if (!function_exists('getTelemetry')) {
 if (!function_exists('triggerStats')) {
     function triggerStats(array $event, string $projectId): void
     {
+        return;
     }
 }
 
@@ -319,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();
 
@@ -356,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');
@@ -383,22 +384,6 @@ $server->onStart(function () use ($stats, $containerId, &$statsDocument) {
     }
 });
 
-function cloudRealtimeLogConnectionHostnames(Http $app, Document $project, Request $request): void
-{
-    try {
-        /** @var array<int, string> $allowed */
-        $allowed = $app->getResource('allowedHostnames');
-        Console::info(sprintf(
-            '[Realtime] project=%s origin=%s allowedHostnames=%s',
-            $project->getId(),
-            $request->getOrigin(),
-            json_encode(array_values($allowed))
-        ));
-    } catch (Throwable $e) {
-        Console::error('[Realtime] allowedHostnames log failed: ' . $e->getMessage());
-    }
-}
-
 $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime) {
     Console::success('Worker ' . $workerId . ' started successfully');
 
@@ -411,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.
          */
@@ -533,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());
@@ -657,14 +642,10 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, 'Missing or unknown project ID');
         }
 
-        $timelimit = $app->getResource('timelimit');
-        $user = $app->getResource('user'); /** @var User $user */
-        $logUser = $user;
-
         if (
             array_key_exists('realtime', $project->getAttribute('apis', []))
             && !$project->getAttribute('apis', [])['realtime']
-            && !($user->isPrivileged($authorization->getRoles()) || $user->isApp($authorization->getRoles()))
+            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
         ) {
             throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
         }
@@ -675,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
          *
@@ -704,9 +689,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
          */
         $origin = $request->getOrigin();
         $originValidator = $app->getResource('originValidator');
-        
-    
-        cloudRealtimeLogConnectionHostnames($app, $project, $request);
 
         if (!empty($origin) && !$originValidator->isValid($origin) && $project->getId() !== 'console') {
             throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription());
@@ -816,7 +798,7 @@ $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;
 
@@ -828,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();

app/views/install/compose.phtml

@@ -13,7 +13,7 @@ $organization = $this->getParam('organization', '');
 $image = $this->getParam('image', '');
 $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';
 }
@@ -194,7 +194,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

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,6 +1,7 @@
 <?php
 
 require_once __DIR__ . '/init.php';
+
 use Appwrite\Certificates\LetsEncrypt;
 use Appwrite\Event\Audit;
 use Appwrite\Event\Build;
@@ -279,14 +280,14 @@ Server::setResource('abuseRetention', function () {
 
 Server::setResource('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 * 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
+    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 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
 });
 
 Server::setResource('cache', function (Registry $register) {

composer.json

@@ -72,8 +72,8 @@
         "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/messaging": "0.20.*",
+        "utopia-php/migration": "1.8.*",
         "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "1.*",
         "utopia-php/span": "1.1.*",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4fe91e67f343fbe6deac1fdc7eda949f",
+    "content-hash": "f9225f2b580de0ccb796b2fb8c881384",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -161,16 +161,16 @@
         },
         {
             "name": "appwrite/php-runtimes",
-            "version": "0.19.5",
+            "version": "0.19.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/runtimes.git",
-                "reference": "aa2f7760cd0493c0880209b92df812c9386b3546"
+                "reference": "eea9d1b3ca2540eab623b419c8afde09ef406c0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/aa2f7760cd0493c0880209b92df812c9386b3546",
-                "reference": "aa2f7760cd0493c0880209b92df812c9386b3546",
+                "url": "https://api.github.com/repos/appwrite/runtimes/zipball/eea9d1b3ca2540eab623b419c8afde09ef406c0b",
+                "reference": "eea9d1b3ca2540eab623b419c8afde09ef406c0b",
                 "shasum": ""
             },
             "require": {
@@ -210,9 +210,9 @@
             ],
             "support": {
                 "issues": "https://github.com/appwrite/runtimes/issues",
-                "source": "https://github.com/appwrite/runtimes/tree/0.19.5"
+                "source": "https://github.com/appwrite/runtimes/tree/0.19.4"
             },
-            "time": "2026-04-01T01:39:23+00:00"
+            "time": "2026-02-17T10:04:39+00:00"
         },
         {
             "name": "brick/math",
@@ -1226,16 +1226,16 @@
         },
         {
             "name": "open-telemetry/api",
-            "version": "1.9.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opentelemetry-php/api.git",
-                "reference": "6f8d237ce2c304ca85f31970f788e7f074d147be"
+                "reference": "df5197c6fd0ddd8e9883b87de042d9341300e2ad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/6f8d237ce2c304ca85f31970f788e7f074d147be",
-                "reference": "6f8d237ce2c304ca85f31970f788e7f074d147be",
+                "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/df5197c6fd0ddd8e9883b87de042d9341300e2ad",
+                "reference": "df5197c6fd0ddd8e9883b87de042d9341300e2ad",
                 "shasum": ""
             },
             "require": {
@@ -1292,20 +1292,20 @@
                 "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                 "source": "https://github.com/open-telemetry/opentelemetry-php"
             },
-            "time": "2026-02-25T13:24:05+00:00"
+            "time": "2026-01-21T04:14:03+00:00"
         },
         {
             "name": "open-telemetry/context",
-            "version": "1.5.0",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opentelemetry-php/context.git",
-                "reference": "3c414b246e0dabb7d6145404e6a5e4536ca18d07"
+                "reference": "d4c4470b541ce72000d18c339cfee633e4c8e0cf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/3c414b246e0dabb7d6145404e6a5e4536ca18d07",
-                "reference": "3c414b246e0dabb7d6145404e6a5e4536ca18d07",
+                "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/d4c4470b541ce72000d18c339cfee633e4c8e0cf",
+                "reference": "d4c4470b541ce72000d18c339cfee633e4c8e0cf",
                 "shasum": ""
             },
             "require": {
@@ -1347,11 +1347,11 @@
             ],
             "support": {
                 "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V",
-                "docs": "https://opentelemetry.io/docs/languages/php",
+                "docs": "https://opentelemetry.io/docs/php",
                 "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                 "source": "https://github.com/open-telemetry/opentelemetry-php"
             },
-            "time": "2025-10-19T06:44:33+00:00"
+            "time": "2025-09-19T00:05:49+00:00"
         },
         {
             "name": "open-telemetry/exporter-otlp",
@@ -1419,16 +1419,16 @@
         },
         {
             "name": "open-telemetry/gen-otlp-protobuf",
-            "version": "1.9.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opentelemetry-php/gen-otlp-protobuf.git",
-                "reference": "a229cf161d42001d64c8f21e8f678581fe1c66b9"
+                "reference": "673af5b06545b513466081884b47ef15a536edde"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/a229cf161d42001d64c8f21e8f678581fe1c66b9",
-                "reference": "a229cf161d42001d64c8f21e8f678581fe1c66b9",
+                "url": "https://api.github.com/repos/opentelemetry-php/gen-otlp-protobuf/zipball/673af5b06545b513466081884b47ef15a536edde",
+                "reference": "673af5b06545b513466081884b47ef15a536edde",
                 "shasum": ""
             },
             "require": {
@@ -1474,30 +1474,30 @@
             ],
             "support": {
                 "chat": "https://app.slack.com/client/T08PSQ7BQ/C01NFPCV44V",
-                "docs": "https://opentelemetry.io/docs/languages/php",
+                "docs": "https://opentelemetry.io/docs/php",
                 "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                 "source": "https://github.com/open-telemetry/opentelemetry-php"
             },
-            "time": "2025-10-19T06:44:33+00:00"
+            "time": "2025-09-17T23:10:12+00:00"
         },
         {
             "name": "open-telemetry/sdk",
-            "version": "1.14.0",
+            "version": "1.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/opentelemetry-php/sdk.git",
-                "reference": "6e3d0ce93e76555dd5e2f1d19443ff45b990e410"
+                "reference": "c76f91203bf7ef98ab3f4e0a82ca21699af185e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/6e3d0ce93e76555dd5e2f1d19443ff45b990e410",
-                "reference": "6e3d0ce93e76555dd5e2f1d19443ff45b990e410",
+                "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/c76f91203bf7ef98ab3f4e0a82ca21699af185e1",
+                "reference": "c76f91203bf7ef98ab3f4e0a82ca21699af185e1",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "nyholm/psr7-server": "^1.1",
-                "open-telemetry/api": "^1.8",
+                "open-telemetry/api": "^1.7",
                 "open-telemetry/context": "^1.4",
                 "open-telemetry/sem-conv": "^1.0",
                 "php": "^8.1",
@@ -1575,7 +1575,7 @@
                 "issues": "https://github.com/open-telemetry/opentelemetry-php/issues",
                 "source": "https://github.com/open-telemetry/opentelemetry-php"
             },
-            "time": "2026-03-21T11:50:01+00:00"
+            "time": "2026-01-28T11:38:11+00:00"
         },
         {
             "name": "open-telemetry/sem-conv",
@@ -3403,16 +3403,16 @@
         },
         {
             "name": "utopia-php/agents",
-            "version": "1.3.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/agents.git",
-                "reference": "06064fd9fb19b77ae45a12ec7bcbc17670912c30"
+                "reference": "052227953678a30ecc4b5467401fcb0b2386471e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/agents/zipball/06064fd9fb19b77ae45a12ec7bcbc17670912c30",
-                "reference": "06064fd9fb19b77ae45a12ec7bcbc17670912c30",
+                "url": "https://api.github.com/repos/utopia-php/agents/zipball/052227953678a30ecc4b5467401fcb0b2386471e",
+                "reference": "052227953678a30ecc4b5467401fcb0b2386471e",
                 "shasum": ""
             },
             "require": {
@@ -3450,9 +3450,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/agents/issues",
-                "source": "https://github.com/utopia-php/agents/tree/1.3.0"
+                "source": "https://github.com/utopia-php/agents/tree/1.2.1"
             },
-            "time": "2026-03-26T03:51:11+00:00"
+            "time": "2026-02-24T06:03:55+00:00"
         },
         {
             "name": "utopia-php/analytics",
@@ -4002,16 +4002,16 @@
         },
         {
             "name": "utopia-php/dns",
-            "version": "1.6.6",
+            "version": "1.6.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/dns.git",
-                "reference": "917901ecfe5f09a540e4f689b6cbb80b9f55035d"
+                "reference": "574327f0f5fabefa7048030c5634cde33ad10640"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/dns/zipball/917901ecfe5f09a540e4f689b6cbb80b9f55035d",
-                "reference": "917901ecfe5f09a540e4f689b6cbb80b9f55035d",
+                "url": "https://api.github.com/repos/utopia-php/dns/zipball/574327f0f5fabefa7048030c5634cde33ad10640",
+                "reference": "574327f0f5fabefa7048030c5634cde33ad10640",
                 "shasum": ""
             },
             "require": {
@@ -4053,9 +4053,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/dns/issues",
-                "source": "https://github.com/utopia-php/dns/tree/1.6.6"
+                "source": "https://github.com/utopia-php/dns/tree/1.6.5"
             },
-            "time": "2026-03-27T11:13:50+00:00"
+            "time": "2026-02-19T16:06:46+00:00"
         },
         {
             "name": "utopia-php/domains",
@@ -4467,23 +4467,23 @@
         },
         {
             "name": "utopia-php/messaging",
-            "version": "0.22.0",
+            "version": "0.20.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "a6ac04fd204fb6a16bf8c75a84d0b9fc10aa5030"
+                "reference": "fcb4c3c46a48008a677957690bd45ec934dd33b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/a6ac04fd204fb6a16bf8c75a84d0b9fc10aa5030",
-                "reference": "a6ac04fd204fb6a16bf8c75a84d0b9fc10aa5030",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/fcb4c3c46a48008a677957690bd45ec934dd33b0",
+                "reference": "fcb4c3c46a48008a677957690bd45ec934dd33b0",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-openssl": "*",
                 "giggsey/libphonenumber-for-php-lite": "9.0.23",
-                "php": ">=8.1.0",
+                "php": ">=8.0.0",
                 "phpmailer/phpmailer": "6.9.1"
             },
             "require-dev": {
@@ -4512,22 +4512,22 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/messaging/issues",
-                "source": "https://github.com/utopia-php/messaging/tree/0.22.0"
+                "source": "https://github.com/utopia-php/messaging/tree/0.20.1"
             },
-            "time": "2026-04-02T04:09:19+00:00"
+            "time": "2026-02-06T09:56:06+00:00"
         },
         {
             "name": "utopia-php/migration",
-            "version": "1.9.1",
+            "version": "1.8.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/migration.git",
-                "reference": "7a86aeadf182b63a9f4ceba7e137588b31c5d2e2"
+                "reference": "8633523b3343d492427331b6eec53f020f6ab7a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/7a86aeadf182b63a9f4ceba7e137588b31c5d2e2",
-                "reference": "7a86aeadf182b63a9f4ceba7e137588b31c5d2e2",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/8633523b3343d492427331b6eec53f020f6ab7a7",
+                "reference": "8633523b3343d492427331b6eec53f020f6ab7a7",
                 "shasum": ""
             },
             "require": {
@@ -4567,9 +4567,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/1.9.1"
+                "source": "https://github.com/utopia-php/migration/tree/1.8.3"
             },
-            "time": "2026-03-25T07:05:27+00:00"
+            "time": "2026-03-19T09:18:47+00:00"
         },
         {
             "name": "utopia-php/mongo",
@@ -5439,16 +5439,16 @@
     "packages-dev": [
         {
             "name": "appwrite/sdk-generator",
-            "version": "1.14.0",
+            "version": "1.11.14",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "7e7e257b10a8c1384a237e7d8d73452e2108901e"
+                "reference": "ed4faf10fafa1930ed0be3dfe43e41561f2de75b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/7e7e257b10a8c1384a237e7d8d73452e2108901e",
-                "reference": "7e7e257b10a8c1384a237e7d8d73452e2108901e",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/ed4faf10fafa1930ed0be3dfe43e41561f2de75b",
+                "reference": "ed4faf10fafa1930ed0be3dfe43e41561f2de75b",
                 "shasum": ""
             },
             "require": {
@@ -5484,9 +5484,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/1.14.0"
+                "source": "https://github.com/appwrite/sdk-generator/tree/1.11.14"
             },
-            "time": "2026-03-26T12:50:11+00:00"
+            "time": "2026-03-20T10:55:13+00:00"
         },
         {
             "name": "brianium/paratest",
@@ -6195,11 +6195,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.44",
+            "version": "2.1.42",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/4a88c083c668b2c364a425c9b3171b2d9ea5d218",
-                "reference": "4a88c083c668b2c364a425c9b3171b2d9ea5d218",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/1279e1ce86ba768f0780c9d889852b4e02ff40d0",
+                "reference": "1279e1ce86ba768f0780c9d889852b4e02ff40d0",
                 "shasum": ""
             },
             "require": {
@@ -6244,7 +6244,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2026-03-25T17:34:21+00:00"
+            "time": "2026-03-17T14:58:32+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -8456,5 +8456,5 @@
     "platform-dev": {
         "ext-fileinfo": "*"
     },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }

docker-compose.yml

@@ -254,7 +254,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

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/delete-transaction.md

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

docs/references/documentsdb/get-transaction.md

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

docs/references/documentsdb/list-transactions.md

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

docs/references/documentsdb/update-transaction.md

@@ -1 +0,0 @@
-Update a transaction, to either commit or roll back its operations.

docs/references/health/get-queue-audits.md

@@ -1 +1 @@
-Get the number of audit logs that are waiting to be processed in the Appwrite internal queue server.
+Get the number of audit logs that are waiting to be processed in the Appwrite internal queue server.

docs/references/migrations/migration-json-export.md

@@ -1 +0,0 @@
-Export documents to a JSON file from your Appwrite database. This endpoint allows you to export documents to a JSON file stored in a secure internal bucket. You'll receive an email with a download link when the export is complete.

docs/references/migrations/migration-json-import.md

@@ -1 +0,0 @@
-Import documents from a JSON file into your Appwrite database. This endpoint allows you to import documents from a JSON file uploaded to Appwrite Storage bucket.

docs/references/vectorsdb/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/vectorsdb/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/vectorsdb/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/vectorsdb/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/vectorsdb/create-operations.md

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

docs/references/vectorsdb/create-transaction.md

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

docs/references/vectorsdb/create.md

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

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

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

docs/references/vectorsdb/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/vectorsdb/delete-document.md

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

docs/references/vectorsdb/delete-documents.md

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

docs/references/vectorsdb/delete-index.md

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

docs/references/vectorsdb/delete-transaction.md

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

docs/references/vectorsdb/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/vectorsdb/get-collection-logs.md

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

docs/references/vectorsdb/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/vectorsdb/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/vectorsdb/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/vectorsdb/get-document-logs.md

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

docs/references/vectorsdb/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/vectorsdb/get-index.md

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

docs/references/vectorsdb/get-logs.md

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

docs/references/vectorsdb/get-transaction.md

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

docs/references/vectorsdb/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/vectorsdb/increment-document-attribute.md

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

docs/references/vectorsdb/list-attributes.md

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

docs/references/vectorsdb/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/vectorsdb/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/vectorsdb/list-indexes.md

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

docs/references/vectorsdb/list-transactions.md

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

docs/references/vectorsdb/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/vectorsdb/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/vectorsdb/update-collection.md

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

docs/references/vectorsdb/update-document.md

@@ -1 +0,0 @@
-Update a document by its unique ID. Using the patch method you can pass only specific fields that will get updated.

docs/references/vectorsdb/update-documents.md

@@ -1 +0,0 @@
-Update all documents that match your queries, if no queries are submitted then all documents are updated. You can pass only specific fields to be updated.

docs/references/vectorsdb/update-transaction.md

@@ -1 +0,0 @@
-Update a transaction, to either commit or roll back its operations.

docs/references/vectorsdb/update.md

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

docs/references/vectorsdb/upsert-document.md

@@ -1 +0,0 @@
-Create or update a 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/vectorsdb/upsert-documents.md

@@ -1 +0,0 @@
-Create or update 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/sdks/markdown/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+## 0.3.0
+
+* Add `bytesMax` and `bytesUsed` properties to Collection and Table documentation
+* Add `queries` parameter to `listKeys` and `keyId` parameter to `createKey` documentation
+* Add `dart-3.10` and `flutter-3.38` runtimes
+* Fix Teams membership docs to use `string[]` instead of `Roles[]`
+
+## 0.2.0
+
+* Document array-based enum parameters in Markdown examples (e.g., `permissions: BrowserPermission[]`).
+* Breaking change: `Output` enum has been removed; use `ImageFormat` instead.
+
+## 0.1.0
+
+* Initial release

docs/sdks/rust/CHANGELOG.md

@@ -1,5 +0,0 @@
-# Change Log
-
-## 0.1.0
-
-* Initial release

docs/sdks/rust/GETTING_STARTED.md

@@ -1,68 +0,0 @@
-## Getting Started
-
-### Init your SDK
-Initialize your SDK with your Appwrite server API endpoint and project ID which can be found on your project settings page and your new API secret Key from project's API keys section.
-
-```rust
-use appwrite::client::Client;
-
-let client = Client::new()
-    .set_endpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
-    .set_project("5df5acd0d48c2") // Your project ID
-    .set_key("919c2d18fb5d4...a2ae413da83346ad2") // Your secret API key
-    .set_self_signed(true); // Use only on dev mode with a self-signed SSL cert
-```
-
-### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
-
-```rust
-use appwrite::client::Client;
-use appwrite::services::users::Users;
-use appwrite::id::ID;
-
-let client = Client::new()
-    .set_endpoint("https://[HOSTNAME_OR_IP]/v1")
-    .set_project("5df5acd0d48c2")
-    .set_key("919c2d18fb5d4...a2ae413da83346ad2")
-    .set_self_signed(true);
-
-let users = Users::new(&client);
-
-let user = users.create(
-    ID::unique(),
-    Some("email@example.com"),
-    Some("+123456789"),
-    Some("password"),
-    Some("Walter O'Brien"),
-).await?;
-
-println!("{}", user.name);
-println!("{}", user.email);
-```
-
-### Error Handling
-The Appwrite Rust SDK returns `Result` types. You can handle errors using standard Rust error handling patterns. Below is an example.
-
-```rust
-use appwrite::error::AppwriteError;
-
-match users.create(
-    ID::unique(),
-    Some("email@example.com"),
-    Some("+123456789"),
-    Some("password"),
-    Some("Walter O'Brien"),
-).await {
-    Ok(user) => println!("{}", user.name),
-    Err(AppwriteError { message, code, .. }) => {
-        eprintln!("Error {}: {}", code, message);
-    }
-}
-```
-
-### Learn more
-You can use the following resources to learn more and get help
-- 🚀 [Getting Started Tutorial](https://appwrite.io/docs/getting-started-for-server)
-- 📜 [Appwrite Docs](https://appwrite.io/docs)
-- 💬 [Discord Community](https://appwrite.io/discord)

phpstan.neon

@@ -1,6 +1,8 @@
+includes:
+  - phpstan-baseline.neon
+
 parameters:
   level: 3
-  tmpDir: .phpstan-cache
   paths:
     - src
     - app
@@ -12,3 +14,4 @@ parameters:
     - vendor/swoole/ide-helper
   excludePaths:
     - tests/resources
+

src/Appwrite/Auth/OAuth2.php

@@ -155,7 +155,7 @@ abstract class OAuth2
     /**
      * @param string $code
      *
-     * @return int
+     * @return string
      */
     public function getAccessTokenExpiry(string $code): int
     {

src/Appwrite/Auth/OAuth2/Disqus.php

@@ -108,7 +108,7 @@ class Disqus extends OAuth2
     }
 
     /**
-     * @param string $accessToken
+     * @param string $token
      *
      * @return string
      */