added logging

Remove request and response static state

README.md

@@ -1,43 +1,28 @@
-> 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)
+<img width="1920" height="1080" alt="image" src="https://github.com/user-attachments/assets/55a81268-4ecc-46cd-bdf5-73f7e8662fee" />
 
 <br />
 <p align="center">
-    <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>
+    <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>
     <br />
     <br />
 </p>
 
-<!-- [![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) -->
+[![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)
 
 English | [简体中文](README-CN.md)
 
-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.
+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.
 
-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).
+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.
 
-![Appwrite project dashboard showing various Appwrite features](public/images/github.png)
-
-Find out more at: [https://appwrite.io](https://appwrite.io).
+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)
@@ -47,17 +32,31 @@ 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.
@@ -168,51 +167,29 @@ 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) (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)
+- :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)
 
 #### Server
 
-- :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))
+- :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)
 
 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,17 +329,20 @@ $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) {
+    ->action(function (Throwable $error, callable $logError) use ($taskName, &$exitCode) {
         call_user_func_array($logError, [
             $error,
             'Task',
             $taskName,
         ]);
 
+        $exitCode = 1;
         Timer::clearAll();
     });
 
@@ -348,3 +351,4 @@ $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/console.php

@@ -39,6 +39,10 @@ $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,6 +226,21 @@ 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/templates/function.php

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

app/controllers/api/account.php

@@ -403,7 +403,8 @@ Http::post('/v1/account')
     ->inject('dbForProject')
     ->inject('authorization')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Authorization $authorization, Hooks $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) {
 
         $email = \strtolower($email);
         if ('console' === $project->getId()) {
@@ -452,11 +453,38 @@ 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 {
-            $emailCanonical = new Email($email);
-        } catch (Throwable) {
-            $emailCanonical = null;
+            $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);
         }
 
         try {
@@ -487,11 +515,11 @@ Http::post('/v1/account')
                 'authenticators' => null,
                 'search' => implode(' ', [$userId, $email, $name]),
                 'accessedAt' => DateTime::now(),
-                'emailCanonical' => $emailCanonical?->getCanonical(),
-                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
-                'emailIsCorporate' => $emailCanonical?->isCorporate(),
-                'emailIsDisposable' => $emailCanonical?->isDisposable(),
-                'emailIsFree' => $emailCanonical?->isFree(),
+                'emailCanonical' => $emailMetadata['emailCanonical'],
+                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+                'emailIsFree' => $emailMetadata['emailIsFree'],
             ]);
 
             $user->removeAttribute('$sequence');
@@ -695,6 +723,7 @@ 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());
@@ -716,6 +745,7 @@ 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));
 
@@ -728,9 +758,11 @@ Http::delete('/v1/account/sessions')
 
         $dbForProject->purgeCachedDocument('users', $user->getId());
 
-        $queueForEvents
-            ->setParam('userId', $user->getId())
-            ->setParam('sessionId', $session->getId());
+        if ($currentSession instanceof Document) {
+            $queueForEvents
+                ->setParam('userId', $user->getId())
+                ->setParam('sessionId', $currentSession->getId());
+        }
 
         $response->noContent();
     });
@@ -776,7 +808,8 @@ Http::get('/v1/account/sessions/:sessionId')
                     ->setAttribute('secret', $session->getAttribute('secret', ''))
                 ;
 
-                return $response->dynamic($session, Response::MODEL_SESSION);
+                $response->dynamic($session, Response::MODEL_SESSION);
+                return;
             }
         }
 
@@ -956,7 +989,7 @@ Http::patch('/v1/account/sessions/:sessionId')
             ->setPayload($response->output($session, Response::MODEL_SESSION))
         ;
 
-        return $response->dynamic($session, Response::MODEL_SESSION);
+        $response->dynamic($session, Response::MODEL_SESSION);
     });
 
 Http::post('/v1/account/sessions/email')
@@ -1504,8 +1537,9 @@ 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, 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, array $plan, Authorization $authorization) use ($oauthDefaultSuccess) {
         $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
         $port = $request->getPort();
         $callbackBase = $protocol . '://' . $request->getHostname();
@@ -1747,10 +1781,38 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                     }
                 }
 
+                $emailMetadata = [
+                    'emailCanonical' => null,
+                    'emailIsCanonical' => null,
+                    'emailIsCorporate' => null,
+                    'emailIsDisposable' => null,
+                    'emailIsFree' => null,
+                ];
+
                 try {
-                    $emailCanonical = new Email($email);
-                } catch (Throwable) {
-                    $emailCanonical = null;
+                    $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);
                 }
 
                 try {
@@ -1780,11 +1842,11 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
                         'authenticators' => null,
                         'search' => implode(' ', [$userId, $email, $name]),
                         'accessedAt' => DateTime::now(),
-                        'emailCanonical' => $emailCanonical?->getCanonical(),
-                        'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
-                        'emailIsCorporate' => $emailCanonical?->isCorporate(),
-                        'emailIsDisposable' => $emailCanonical?->isDisposable(),
-                        'emailIsFree' => $emailCanonical?->isFree(),
+                        'emailCanonical' => $emailMetadata['emailCanonical'],
+                        'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+                        'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+                        'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+                        'emailIsFree' => $emailMetadata['emailIsFree'],
                     ]);
 
                     $user->removeAttribute('$sequence');
@@ -1859,19 +1921,47 @@ Http::get('/v1/account/sessions/oauth2/:provider/redirect')
         }
 
         if (empty($user->getAttribute('email'))) {
-            $user->setAttribute('email', $oauth2->getUserEmail($accessToken));
+            $email = $oauth2->getUserEmail($accessToken);
+            $emailMetadata = [
+                'emailCanonical' => null,
+                'emailIsCanonical' => null,
+                'emailIsCorporate' => null,
+                'emailIsDisposable' => null,
+                'emailIsFree' => null,
+            ];
 
             try {
-                $emailCanonical = new Email($user->getAttribute('email'));
-            } catch (Throwable) {
-                $emailCanonical = null;
+                $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);
             }
 
-            $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 (($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']);
         }
 
         if (empty($user->getAttribute('name'))) {
@@ -1988,7 +2078,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) {
+        if (isset($sessionUpgrade) && $sessionUpgrade && isset($session)) {
             foreach ($user->getAttribute('targets', []) as $target) {
                 if ($target->getAttribute('providerType') !== MESSAGE_TYPE_PUSH) {
                     continue;
@@ -2149,10 +2239,11 @@ 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, 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, array $plan, ProofsPassword $proofForPassword, array $platform, Authorization $authorization) {
         if (empty(System::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
         }
@@ -2187,10 +2278,38 @@ 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 {
-                $emailCanonical = new Email($email);
-            } catch (Throwable) {
-                $emailCanonical = null;
+                $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);
             }
 
             $user->setAttributes([
@@ -2217,11 +2336,11 @@ Http::post('/v1/account/tokens/magic-url')
                 'authenticators' => null,
                 'search' => implode(' ', [$userId, $email]),
                 'accessedAt' => DateTime::now(),
-                'emailCanonical' => $emailCanonical?->getCanonical(),
-                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
-                'emailIsCorporate' => $emailCanonical?->isCorporate(),
-                'emailIsDisposable' => $emailCanonical?->isDisposable(),
-                'emailIsFree' => $emailCanonical?->isFree(),
+                'emailCanonical' => $emailMetadata['emailCanonical'],
+                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+                'emailIsFree' => $emailMetadata['emailIsFree'],
             ]);
 
             $user->removeAttribute('$sequence');
@@ -2429,10 +2548,11 @@ 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, 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, array $plan, ProofsPassword $proofForPassword, ProofsCode $proofForCode, Authorization $authorization) {
         if (empty(System::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP disabled');
         }
@@ -2465,10 +2585,38 @@ Http::post('/v1/account/tokens/email')
 
             $userId = $userId === 'unique()' ? ID::unique() : $userId;
 
+            $emailMetadata = [
+                'emailCanonical' => null,
+                'emailIsCanonical' => null,
+                'emailIsCorporate' => null,
+                'emailIsDisposable' => null,
+                'emailIsFree' => null,
+            ];
+
             try {
-                $emailCanonical = new Email($email);
-            } catch (Throwable) {
-                $emailCanonical = null;
+                $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);
             }
 
             $user->setAttributes([
@@ -2493,11 +2641,11 @@ Http::post('/v1/account/tokens/email')
                 'memberships' => null,
                 'search' => implode(' ', [$userId, $email]),
                 'accessedAt' => DateTime::now(),
-                'emailCanonical' => $emailCanonical?->getCanonical(),
-                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
-                'emailIsCorporate' => $emailCanonical?->isCorporate(),
-                'emailIsDisposable' => $emailCanonical?->isDisposable(),
-                'emailIsFree' => $emailCanonical?->isFree(),
+                'emailCanonical' => $emailMetadata['emailCanonical'],
+                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+                'emailIsFree' => $emailMetadata['emailIsFree'],
             ]);
 
             $user->removeAttribute('$sequence');
@@ -3314,9 +3462,10 @@ 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, 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, array $plan, ProofsPassword $proofForPassword, Authorization $authorization) {
         // passwordUpdate will be empty if the user has never set a password
         $passwordUpdate = $user->getAttribute('passwordUpdate');
 
@@ -3344,20 +3493,48 @@ 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 {
-            $emailCanonical = new Email($email);
-        } catch (Throwable) {
-            $emailCanonical = null;
+            $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);
         }
 
         $user
             ->setAttribute('email', $email)
             ->setAttribute('emailVerification', false) // After this user needs to confirm mail again
-            ->setAttribute('emailCanonical', $emailCanonical?->getCanonical())
-            ->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported())
-            ->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate())
-            ->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable())
-            ->setAttribute('emailIsFree', $emailCanonical?->isFree())
+            ->setAttribute('emailCanonical', $emailMetadata['emailCanonical'])
+            ->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical'])
+            ->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate'])
+            ->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable'])
+            ->setAttribute('emailIsFree', $emailMetadata['emailIsFree'])
         ;
 
         if (empty($passwordUpdate)) {
@@ -3760,7 +3937,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)
@@ -3861,7 +4038,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);
     });
@@ -4091,7 +4268,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)
@@ -4183,7 +4360,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);
     });
@@ -4715,5 +4892,5 @@ Http::delete('/v1/account/identities/:identityId')
             ->setParam('identityId', $identity->getId())
             ->setPayload($response->output($identity, Response::MODEL_IDENTITY));
 
-        return $response->noContent();
+        $response->noContent();
     });

app/controllers/api/locale.php

@@ -231,6 +231,7 @@ 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 = $currentScheduledAt ?? $scheduledAt;
+            $scheduleTime = $scheduledAt;
             if (!\is_null($scheduleTime)) {
                 $expiry = (new \DateTime($scheduleTime))->add(new \DateInterval('P15D'))->format('U');
             } else {

app/controllers/api/projects.php

@@ -1570,7 +1570,7 @@ Http::post('/v1/projects/:projectId/smtp/tests')
                 ->trigger();
         }
 
-        return $response->noContent();
+        $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): Document
+function createUser(Hash $hash, string $userId, ?string $email, ?string $password, ?string $phone, ?string $name, Document $project, Database $dbForProject, Hooks $hooks, array $plan): Document
 {
     $name = $name ?? '';
     $plaintextPassword = $password;
@@ -110,11 +110,39 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
             }
         }
 
+        $emailMetadata = [
+            'emailCanonical' => null,
+            'emailIsCanonical' => null,
+            'emailIsCorporate' => null,
+            'emailIsDisposable' => null,
+            'emailIsFree' => null,
+        ];
+
         try {
-            $emailCanonical = new Email($email);
-        } catch (Throwable) {
-            $emailCanonical = null;
+            $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);
+        }
+
         $hashedPassword = null;
 
         $isHashed = !$hash instanceof Plaintext;
@@ -159,11 +187,11 @@ function createUser(Hash $hash, string $userId, ?string $email, ?string $passwor
             'tokens' => null,
             'memberships' => null,
             'search' => implode(' ', [$userId, $email, $phone, $name]),
-            'emailCanonical' => $emailCanonical?->getCanonical(),
-            'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
-            'emailIsCorporate' => $emailCanonical?->isCorporate(),
-            'emailIsDisposable' => $emailCanonical?->isDisposable(),
-            'emailIsFree' => $emailCanonical?->isFree(),
+            'emailCanonical' => $emailMetadata['emailCanonical'],
+            'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+            'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+            'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+            'emailIsFree' => $emailMetadata['emailIsFree'],
         ]);
 
         if (!$isHashed && !empty($password)) {
@@ -256,10 +284,11 @@ Http::post('/v1/users')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $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) {
         $plaintext = new Plaintext();
 
-        $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks);
+        $user = createUser($plaintext, $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks, $plan);
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($user, Response::MODEL_USER);
@@ -292,11 +321,12 @@ Http::post('/v1/users/bcrypt')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->inject('plan')
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
         $bcrypt = new Bcrypt();
         $bcrypt->setCost(8); // Default cost
 
-        $user = createUser($bcrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($bcrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -330,10 +360,11 @@ Http::post('/v1/users/md5')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->inject('plan')
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
         $md5 = new MD5();
 
-        $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($md5, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -367,10 +398,11 @@ Http::post('/v1/users/argon2')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->inject('plan')
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
         $argon2 = new Argon2();
 
-        $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($argon2, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -405,13 +437,14 @@ Http::post('/v1/users/sha')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, string $passwordVersion, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $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) {
         $sha = new Sha();
         if (!empty($passwordVersion)) {
             $sha->setVersion($passwordVersion);
         }
 
-        $user = createUser($sha, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($sha, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -445,10 +478,11 @@ Http::post('/v1/users/phpass')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+    ->inject('plan')
+    ->action(function (string $userId, string $email, string $password, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks, array $plan) {
         $phpass = new PHPass();
 
-        $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($phpass, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -487,7 +521,8 @@ Http::post('/v1/users/scrypt')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->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) {
+    ->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) {
         $scrypt = new Scrypt();
         $scrypt
             ->setSalt($passwordSalt)
@@ -496,7 +531,7 @@ Http::post('/v1/users/scrypt')
             ->setParallelCost($passwordParallel)
             ->setLength($passwordLength);
 
-        $user = createUser($scrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($scrypt, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -533,14 +568,15 @@ Http::post('/v1/users/scrypt-modified')
     ->inject('project')
     ->inject('dbForProject')
     ->inject('hooks')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, ?string $name, Response $response, Document $project, Database $dbForProject, Hooks $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) {
         $scryptModified = new ScryptModified();
         $scryptModified
             ->setSalt($passwordSalt)
             ->setSaltSeparator($passwordSaltSeparator)
             ->setSignerKey($passwordSignerKey);
 
-        $user = createUser($scryptModified, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
+        $user = createUser($scryptModified, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks, $plan);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -1470,8 +1506,10 @@ 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, Event $queueForEvents) {
+    ->action(function (string $userId, string $email, Response $response, Database $dbForProject, Document $project, array $plan, Event $queueForEvents) {
 
         $user = $dbForProject->getDocument('users', $userId);
 
@@ -1502,20 +1540,47 @@ Http::patch('/v1/users/:userId/email')
 
         $oldEmail = $user->getAttribute('email');
 
+        $emailMetadata = [
+            'emailCanonical' => null,
+            'emailIsCanonical' => null,
+            'emailIsCorporate' => null,
+            'emailIsDisposable' => null,
+            'emailIsFree' => null,
+        ];
+
         try {
-            $emailCanonical = new Email($email);
-        } catch (Throwable) {
-            $emailCanonical = null;
+            $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);
         }
 
         $user
             ->setAttribute('email', $email)
             ->setAttribute('emailVerification', false)
-            ->setAttribute('emailCanonical', $emailCanonical?->getCanonical())
-            ->setAttribute('emailIsCanonical', $emailCanonical?->isCanonicalSupported())
-            ->setAttribute('emailIsCorporate', $emailCanonical?->isCorporate())
-            ->setAttribute('emailIsDisposable', $emailCanonical?->isDisposable())
-            ->setAttribute('emailIsFree', $emailCanonical?->isFree())
+            ->setAttribute('emailCanonical', $emailMetadata['emailCanonical'])
+            ->setAttribute('emailIsCanonical', $emailMetadata['emailIsCanonical'])
+            ->setAttribute('emailIsCorporate', $emailMetadata['emailIsCorporate'])
+            ->setAttribute('emailIsDisposable', $emailMetadata['emailIsDisposable'])
+            ->setAttribute('emailIsFree', $emailMetadata['emailIsFree'])
         ;
 
         try {
@@ -2337,9 +2402,8 @@ Http::post('/v1/users/:userId/sessions')
             ->setParam('sessionId', $session->getId())
             ->setPayload($response->output($session, Response::MODEL_SESSION));
 
-        return $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($session, Response::MODEL_SESSION);
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($session, Response::MODEL_SESSION);
     });
 
 Http::post('/v1/users/:userId/tokens')
@@ -2402,9 +2466,8 @@ Http::post('/v1/users/:userId/tokens')
             ->setParam('tokenId', $token->getId())
             ->setPayload($response->output($token, Response::MODEL_TOKEN));
 
-        return $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($token, Response::MODEL_TOKEN);
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($token, Response::MODEL_TOKEN);
     });
 
 Http::delete('/v1/users/:userId/sessions/:sessionId')
@@ -2658,7 +2721,7 @@ Http::delete('/v1/users/identities/:identityId')
             ->setParam('identityId', $identity->getId())
             ->setPayload($response->output($identity, Response::MODEL_IDENTITY));
 
-        return $response->noContent();
+        $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);
                 }
-                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
+                $response->redirect('https://' . $request->getHostname() . $request->getURI());
+                return false;
             }
         }
 
         /** @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,6 +244,7 @@ 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)) {
@@ -273,7 +274,7 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
 
                 $membershipExists = false;
                 $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-                if (!$project->isEmpty() && isset($user)) {
+                if (!$project->isEmpty() && !$user->isEmpty()) {
                     $teamId = $project->getAttribute('teamId', '');
                     $membership = $user->find('teamId', $teamId, 'memberships');
                     if (!empty($membership)) {
@@ -379,7 +380,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'] = '';
@@ -459,7 +460,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'] ?? ''
             ]);
@@ -529,6 +530,11 @@ function router(Http $utopia, Database $dbForPlatform, callable $getProjectDB, S
         }
 
         /** Execute function */
+        $executionResponse = [
+            'headers' => [],
+            'body' => '',
+        ];
+
         try {
             $version = match ($type) {
                 'function' => $resource->getAttribute('version', 'v2'),
@@ -734,7 +740,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) {
@@ -862,12 +868,12 @@ Http::init()
         * Request format
         */
         $route = $utopia->getRoute();
-        Request::setRoute($route);
+        $request->setRoute($route);
 
         if ($route === null) {
-            return $response
-                ->setStatusCode(404)
-                ->send('Not Found');
+            $response->setStatusCode(404);
+            $response->send('Not Found');
+            return;
         }
 
         $requestFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
@@ -973,7 +979,8 @@ Http::init()
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                 }
 
-                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
+                $response->redirect('https://' . $request->getHostname() . $request->getURI());
+                return;
             }
         }
     });
@@ -1012,7 +1019,7 @@ Http::init()
             return;
         }
         $route = $request->getRoute();
-        if ($route->getLabel('origin', false) === '*') {
+        if ($route?->getLabel('origin', false) === '*') {
             return;
         }
         if (!$originValidator->isValid($origin)) {
@@ -1486,6 +1493,19 @@ 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,36 +244,38 @@ Http::get('/v1/mock/github/callback')
             throw new Exception(Exception::PROJECT_NOT_FOUND, $error);
         }
 
-        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);
+        if (empty($providerInstallationId)) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Missing provider installation ID');
         }
 
+        $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/http.php

@@ -3,6 +3,8 @@
 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;
@@ -31,7 +33,6 @@ 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;
 
@@ -293,7 +294,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $tot
 
     go(function () use ($register, $app) {
         $pools = $register->get('pools');
-        /** @var Group $pools */
+        /** @var \Utopia\Pools\Group $pools */
         Http::setResource('pools', fn () => $pools);
 
         /** @var array $collections */
@@ -655,7 +656,7 @@ $http->on(Constant::EVENT_TASK, function () use ($register) {
     /** @var Utopia\Database\Database $dbForPlatform */
     $dbForPlatform = $app->getResource('dbForPlatform');
 
-    /** @var Table $riskyDomains */
+    /** @var \Swoole\Table $riskyDomains */
     $riskyDomains = $app->getResource('riskyDomains');
 
     Timer::tick(DOMAIN_SYNC_TIMER * 1000, function () use ($dbForPlatform, $riskyDomains, &$lastSyncUpdate, $app) {

app/init/registers.php

@@ -6,7 +6,6 @@ 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;
@@ -25,6 +24,7 @@ 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) || empty($providerConfig)) {
+    if (empty($providerName)) {
         return;
     }
 
@@ -121,7 +121,7 @@ $register->set('realtimeLogger', function () {
         default => ['key' => $loggingProvider->getHost()],
     };
 
-    if (empty($providerName) || empty($providerConfig)) {
+    if (empty($providerName)) {
         return;
     }
 
@@ -242,8 +242,8 @@ $register->set('pools', function () {
         ],
     ];
 
-    $maxConnections = System::getEnv('_APP_CONNECTIONS_MAX', 151);
-    $instanceConnections = $maxConnections / System::getEnv('_APP_POOL_CLIENTS', 14);
+    $maxConnections = (int) System::getEnv('_APP_CONNECTIONS_MAX', 151);
+    $instanceConnections = $maxConnections / (int) 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, $dsn) {
+                'mongodb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
                     try {
                         $mongo = new MongoClient($dsnDatabase, $dsnHost, (int)$dsnPort, $dsnUser, $dsnPass, false);
                         @$mongo->connect();
@@ -433,35 +433,20 @@ $register->set('db', function () {
 });
 
 $register->set('smtp', function () {
-    $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;
+    $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,
+    );
 });
 $register->set('geodb', function () {
     return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2025-12.mmdb');

app/init/resources.php

@@ -696,7 +696,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,7 +237,6 @@ if (!function_exists('getTelemetry')) {
 if (!function_exists('triggerStats')) {
     function triggerStats(array $event, string $projectId): void
     {
-        return;
     }
 }
 
@@ -320,14 +319,14 @@ if (!function_exists('logError')) {
 
 $server->error(logError(...));
 
-$server->onStart(function () use ($stats, $register, $containerId, &$statsDocument) {
+$server->onStart(function () use ($stats, $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 ($register, $containerId, &$statsDocument) {
+    go(function () use ($containerId, &$statsDocument) {
         $attempts = 0;
         $database = getConsoleDB();
 
@@ -357,7 +356,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
      */
     // 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 ($register, $stats, &$statsDocument) {
+        Timer::tick(5000, function () use ($stats, &$statsDocument) {
             $payload = [];
             foreach ($stats as $projectId => $value) {
                 $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
@@ -384,6 +383,22 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
     }
 });
 
+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');
 
@@ -396,7 +411,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     $attempts = 0;
     $start = time();
 
-    Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
+    Timer::tick(5000, function () use ($server, $realtime, $stats) {
         /**
          * Sending current connections to project channels on the console project every 5 seconds.
          */
@@ -689,6 +704,9 @@ $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());
@@ -798,7 +816,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
     }
 });
 
-$server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
+$server->onMessage(function (int $connection, string $message) use ($server, $realtime, $containerId) {
     $project = null;
     $authorization = null;
 
@@ -810,7 +828,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/worker.php

@@ -1,7 +1,6 @@
 <?php
 
 require_once __DIR__ . '/init.php';
-
 use Appwrite\Certificates\LetsEncrypt;
 use Appwrite\Event\Audit;
 use Appwrite\Event\Build;
@@ -280,14 +279,14 @@ Server::setResource('abuseRetention', function () {
 
 Server::setResource('auditRetention', function (Document $project) {
     if ($project->getId() === 'console') {
-        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
+        return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
     }
 
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
+    return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
 }, ['project']);
 
 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+    return DateTime::addSeconds(new \DateTime(), -1 * (int) System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
 });
 
 Server::setResource('cache', function (Registry $register) {

composer.json

@@ -72,7 +72,7 @@
         "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.8.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.20.*",
+        "utopia-php/messaging": "0.22.*",
         "utopia-php/migration": "1.9.*",
         "utopia-php/platform": "0.7.*",
         "utopia-php/pools": "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": "b5261855586680e467168f527e0634ae",
+    "content-hash": "4fe91e67f343fbe6deac1fdc7eda949f",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -4467,23 +4467,23 @@
         },
         {
             "name": "utopia-php/messaging",
-            "version": "0.20.1",
+            "version": "0.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "fcb4c3c46a48008a677957690bd45ec934dd33b0"
+                "reference": "a6ac04fd204fb6a16bf8c75a84d0b9fc10aa5030"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/fcb4c3c46a48008a677957690bd45ec934dd33b0",
-                "reference": "fcb4c3c46a48008a677957690bd45ec934dd33b0",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/a6ac04fd204fb6a16bf8c75a84d0b9fc10aa5030",
+                "reference": "a6ac04fd204fb6a16bf8c75a84d0b9fc10aa5030",
                 "shasum": ""
             },
             "require": {
                 "ext-curl": "*",
                 "ext-openssl": "*",
                 "giggsey/libphonenumber-for-php-lite": "9.0.23",
-                "php": ">=8.0.0",
+                "php": ">=8.1.0",
                 "phpmailer/phpmailer": "6.9.1"
             },
             "require-dev": {
@@ -4512,9 +4512,9 @@
             ],
             "support": {
                 "issues": "https://github.com/utopia-php/messaging/issues",
-                "source": "https://github.com/utopia-php/messaging/tree/0.20.1"
+                "source": "https://github.com/utopia-php/messaging/tree/0.22.0"
             },
-            "time": "2026-02-06T09:56:06+00:00"
+            "time": "2026-04-02T04:09:19+00:00"
         },
         {
             "name": "utopia-php/migration",

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

@@ -0,0 +1 @@
+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

@@ -0,0 +1 @@
+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.

phpstan-baseline.neon

@@ -1,721 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: '#^PHPDoc tag @var above a method has no effect\.$#'
-			identifier: varTag.misplaced
-			count: 1
-			path: app/config/templates/function.php
-
-		-
-			message: '#^Array has 2 duplicate keys with value ''outputDirectory'' \(''outputDirectory'', ''outputDirectory''\)\.$#'
-			identifier: array.duplicateKey
-			count: 3
-			path: app/config/templates/site.php
-
-		-
-			message: '#^PHPDoc tag @var above a method has no effect\.$#'
-			identifier: varTag.misplaced
-			count: 1
-			path: app/config/templates/site.php
-
-		-
-			message: '#^Result of method Appwrite\\Utopia\\Response\:\:dynamic\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 2
-			path: app/controllers/api/account.php
-
-		-
-			message: '#^Result of method Utopia\\Http\\Response\:\:noContent\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 1
-			path: app/controllers/api/account.php
-
-		-
-			message: '#^Variable \$session might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: app/controllers/api/account.php
-
-		-
-			message: '#^Variable \$output might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/controllers/api/locale.php
-
-		-
-			message: '#^Variable \$currentScheduledAt on left side of \?\? is never defined\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: app/controllers/api/messaging.php
-
-		-
-			message: '#^Result of method Utopia\\Http\\Response\:\:noContent\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 1
-			path: app/controllers/api/projects.php
-
-		-
-			message: '#^Result of method Appwrite\\Utopia\\Response\:\:dynamic\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 2
-			path: app/controllers/api/users.php
-
-		-
-			message: '#^Result of method Utopia\\Http\\Response\:\:noContent\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 1
-			path: app/controllers/api/users.php
-
-		-
-			message: '#^Result of method Utopia\\Http\\Response\:\:redirect\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 2
-			path: app/controllers/general.php
-
-		-
-			message: '#^Result of method Utopia\\Http\\Response\:\:send\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 1
-			path: app/controllers/general.php
-
-		-
-			message: '#^Variable \$body on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: app/controllers/general.php
-
-		-
-			message: '#^Variable \$deployment in PHPDoc tag @var does not exist\.$#'
-			identifier: varTag.variableNotFound
-			count: 1
-			path: app/controllers/general.php
-
-		-
-			message: '#^Variable \$executionId on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: app/controllers/general.php
-
-		-
-			message: '#^Variable \$executionResponse might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/controllers/general.php
-
-		-
-			message: '#^Variable \$user might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/controllers/general.php
-
-		-
-			message: '#^Variable \$installation might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: app/controllers/mock.php
-
-		-
-			message: '#^Variable \$register might not be defined\.$#'
-			identifier: variable.undefined
-			count: 3
-			path: app/http.php
-
-		-
-			message: '#^Variable \$tag on left side of \?\? always exists and is always null\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: app/init/database/filters.php
-
-		-
-			message: '#^Anonymous function has an unused use \$dsn\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: app/init/registers.php
-
-		-
-			message: '#^Binary operation "/" between string and string results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: app/init/registers.php
-
-		-
-			message: '#^Property PHPMailer\\PHPMailer\\PHPMailer\:\:\$Port \(int\) does not accept string\.$#'
-			identifier: assign.propertyType
-			count: 1
-			path: app/init/registers.php
-
-		-
-			message: '#^Variable \$providerConfig in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 2
-			path: app/init/registers.php
-
-		-
-			message: '#^Variable \$providerConfig on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: app/init/registers.php
-
-		-
-			message: '#^Variable \$hostname on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: app/init/resources.php
-
-		-
-			message: '#^Anonymous function has an unused use \$register\.$#'
-			identifier: closure.unusedUse
-			count: 4
-			path: app/realtime.php
-
-		-
-			message: '#^Class Utopia\\Database\\Validator\\Authorization does not have a constructor and must be instantiated without any parameters\.$#'
-			identifier: new.noConstructor
-			count: 1
-			path: app/realtime.php
-
-		-
-			message: '#^Function triggerStats\(\) returns void but does not have any side effects\.$#'
-			identifier: void.pure
-			count: 1
-			path: app/realtime.php
-
-		-
-			message: '#^Binary operation "\*" between \-1 and string results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 3
-			path: app/worker.php
-
-		-
-			message: '#^Anonymous function has an unused use \$context\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/GraphQL/Resolvers.php
-
-		-
-			message: '#^Anonymous function has an unused use \$info\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/GraphQL/Resolvers.php
-
-		-
-			message: '#^Anonymous function has an unused use \$type\.$#'
-			identifier: closure.unusedUse
-			count: 5
-			path: src/Appwrite/GraphQL/Resolvers.php
-
-		-
-			message: '#^Variable \$request in PHPDoc tag @var does not exist\.$#'
-			identifier: varTag.variableNotFound
-			count: 1
-			path: src/Appwrite/GraphQL/Resolvers.php
-
-		-
-			message: '#^Variable \$response in PHPDoc tag @var does not exist\.$#'
-			identifier: varTag.variableNotFound
-			count: 1
-			path: src/Appwrite/GraphQL/Resolvers.php
-
-		-
-			message: '#^Method Appwrite\\Network\\Cors\:\:headers\(\) should return array\<string, string\> but returns array\<string, int\|string\>\.$#'
-			identifier: return.type
-			count: 5
-			path: src/Appwrite/Network/Cors.php
-
-		-
-			message: '#^Parameter &\$tag by\-ref type of method Appwrite\\OpenSSL\\OpenSSL\:\:encrypt\(\) expects null, string\|null given\.$#'
-			identifier: parameterByRef.type
-			count: 1
-			path: src/Appwrite/OpenSSL/OpenSSL.php
-
-		-
-			message: '#^Variable \$output in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Avatars/Http/Action.php
-
-		-
-			message: '#^Variable \$output in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php
-
-		-
-			message: '#^Variable \$output in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php
-
-		-
-			message: '#^Binary operation "%%" between string and 5 results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php
-
-		-
-			message: '#^Method Appwrite\\Platform\\Modules\\Databases\\Http\\Databases\\Action\:\:setHttpPath\(\) should return Appwrite\\Platform\\Action but returns Utopia\\Platform\\Action\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php
-
-		-
-			message: '#^Method Appwrite\\Platform\\Modules\\Databases\\Http\\Databases\\Collections\\Documents\\Action\:\:setHttpPath\(\) should return Appwrite\\Platform\\Modules\\Databases\\Http\\Databases\\Action but returns Appwrite\\Platform\\Action\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
-
-		-
-			message: '#^Variable \$relations in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
-
-		-
-			message: '#^Anonymous function has an unused use \$dbForProject\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
-
-		-
-			message: '#^Variable \$document in PHPDoc tag @var does not match assigned variable \$collectionTableId\.$#'
-			identifier: varTag.differentVariable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
-
-		-
-			message: '#^Variable \$hostname on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php
-
-		-
-			message: '#^Variable \$enabled on left side of \?\?\= always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php
-
-		-
-			message: '#^Offset ''deviceBrand'' does not exist on int\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
-
-		-
-			message: '#^Offset ''deviceModel'' does not exist on int\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
-
-		-
-			message: '#^Offset ''deviceName'' does not exist on int\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php
-
-		-
-			message: '#^Method Appwrite\\Platform\\Modules\\Databases\\Http\\Databases\\Transactions\\Action\:\:setHttpPath\(\) should return Appwrite\\Platform\\Modules\\Databases\\Http\\Databases\\Action but returns Appwrite\\Platform\\Action\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php
-
-		-
-			message: '#^Anonymous function has an unused use \$existing\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php
-
-		-
-			message: '#^Anonymous function has an unused use \$queueForEvents\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
-
-		-
-			message: '#^Anonymous function has an unused use \$queueForFunctions\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
-
-		-
-			message: '#^Anonymous function has an unused use \$queueForRealtime\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
-
-		-
-			message: '#^Anonymous function has an unused use \$queueForWebhooks\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
-
-		-
-			message: '#^Anonymous function has an unused use \$usage\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
-
-		-
-			message: '#^PHPDoc tag @throws with type Appwrite\\Platform\\Modules\\Databases\\Http\\Databases\\Transactions\\Structure\|Throwable\|Utopia\\Database\\Validator\\Authorization is not subtype of Throwable$#'
-			identifier: throws.notThrowable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php
-
-		-
-			message: '#^Offset ''deviceBrand'' does not exist on int\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
-
-		-
-			message: '#^Offset ''deviceModel'' does not exist on int\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
-
-		-
-			message: '#^Offset ''deviceName'' does not exist on int\.$#'
-			identifier: offsetAccess.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php
-
-		-
-			message: '#^Call to method getAttribute\(\) on an unknown class Appwrite\\Platform\\Modules\\Functions\\Http\\Executions\\Utopia\\Database\\Document\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Call to method getId\(\) on an unknown class Appwrite\\Platform\\Modules\\Functions\\Http\\Executions\\Utopia\\Database\\Document\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Call to method isEmpty\(\) on an unknown class Appwrite\\Platform\\Modules\\Functions\\Http\\Executions\\Utopia\\Database\\Document\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Method Appwrite\\Platform\\Modules\\Functions\\Http\\Executions\\Create\:\:enqueueDeletes\(\) returns void but does not have any side effects\.$#'
-			identifier: void.pure
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^PHPDoc tag @var for variable \$session contains unknown class Appwrite\\Platform\\Modules\\Functions\\Http\\Executions\\Utopia\\Database\\Document\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Result of method Appwrite\\Utopia\\Response\:\:dynamic\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Variable \$body on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Variable \$executionId on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Variable \$jwt on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php
-
-		-
-			message: '#^Call to an undefined method Appwrite\\Event\\Event\:\:setSubscribers\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php
-
-		-
-			message: '#^Undefined variable\: \$cpus$#'
-			identifier: variable.undefined
-			count: 3
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Undefined variable\: \$memory$#'
-			identifier: variable.undefined
-			count: 3
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Variable \$deployment might not be defined\.$#'
-			identifier: variable.undefined
-			count: 4
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Variable \$logsAfter on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Variable \$logsBefore on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Variable \$providerCommitHash on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Variable \$rule in empty\(\) always exists and is not falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Functions/Workers/Builds.php
-
-		-
-			message: '#^Result of method Appwrite\\Utopia\\Response\:\:dynamic\(\) \(void\) is used\.$#'
-			identifier: method.void
-			count: 1
-			path: src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php
-
-		-
-			message: '#^Variable \$iv might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
-
-		-
-			message: '#^Variable \$tag might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php
-
-		-
-			message: '#^Caught class Appwrite\\Platform\\Modules\\Teams\\Http\\Memberships\\Throwable not found\.$#'
-			identifier: class.notFound
-			count: 1
-			path: src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
-
-		-
-			message: '#^Variable \$email in empty\(\) always exists and is always falsy\.$#'
-			identifier: empty.variable
-			count: 1
-			path: src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
-
-		-
-			message: '#^Variable \$hash might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
-
-		-
-			message: '#^Variable \$invitee might not be defined\.$#'
-			identifier: variable.undefined
-			count: 14
-			path: src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php
-
-		-
-			message: '#^Variable \$providerConfig on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Tasks/Doctor.php
-
-		-
-			message: '#^Variable \$compose in isset\(\) always exists and is not nullable\.$#'
-			identifier: isset.variable
-			count: 1
-			path: src/Appwrite/Platform/Tasks/Install.php
-
-		-
-			message: '#^Variable \$prUrls might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Tasks/SDKs.php
-
-		-
-			message: '#^Anonymous function has an unused use \$dbForPlatform\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Tasks/StatsResources.php
-
-		-
-			message: '#^PHPDoc tag @param references unknown parameter\: \$getProjectDB$#'
-			identifier: parameter.notFound
-			count: 1
-			path: src/Appwrite/Platform/Workers/Audits.php
-
-		-
-			message: '#^Anonymous function has an unused use \$certificates\.$#'
-			identifier: closure.unusedUse
-			count: 2
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^Anonymous function has an unused use \$dbForPlatform\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^Anonymous function has an unused use \$dbForProject\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^Anonymous function has an unused use \$project\.$#'
-			identifier: closure.unusedUse
-			count: 6
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^Anonymous function has an unused use \$resourceType\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^PHPDoc tag @param references unknown parameter\: \$build$#'
-			identifier: parameter.notFound
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^PHPDoc tag @param references unknown parameter\: \$dbForPlatform$#'
-			identifier: parameter.notFound
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^PHPDoc tag @param references unknown parameter\: \$target$#'
-			identifier: parameter.notFound
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^PHPDoc tag @throws with type Appwrite\\Extend\\Exception\|Utopia\\Database\\Exception\|Utopia\\Database\\Validator\\Authorization is not subtype of Throwable$#'
-			identifier: throws.notThrowable
-			count: 2
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^PHPDoc tag @throws with type Appwrite\\Extend\\Exception\|Utopia\\Database\\Validator\\Authorization is not subtype of Throwable$#'
-			identifier: throws.notThrowable
-			count: 1
-			path: src/Appwrite/Platform/Workers/Deletes.php
-
-		-
-			message: '#^PHPDoc tag @throws with type Appwrite\\Platform\\Workers\\Exception is not subtype of Throwable$#'
-			identifier: throws.notThrowable
-			count: 2
-			path: src/Appwrite/Platform/Workers/Functions.php
-
-		-
-			message: '#^Variable \$body on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 2
-			path: src/Appwrite/Platform/Workers/Functions.php
-
-		-
-			message: '#^Variable \$errorCode might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Workers/Functions.php
-
-		-
-			message: '#^Variable \$executionId on left side of \?\? always exists and is not nullable\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Workers/Functions.php
-
-		-
-			message: '#^Binary operation "\+\=" between 0 and array\<array\<mixed\>\|int\|string\>\|int\|string results in an error\.$#'
-			identifier: assignOp.invalid
-			count: 1
-			path: src/Appwrite/Platform/Workers/Messaging.php
-
-		-
-			message: '#^Variable \$provider might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Workers/Messaging.php
-
-		-
-			message: '#^Variable \$aggregatedResources might not be defined\.$#'
-			identifier: variable.undefined
-			count: 1
-			path: src/Appwrite/Platform/Workers/Migrations.php
-
-		-
-			message: '#^Anonymous function has an unused use \$dbForLogs\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Workers/StatsResources.php
-
-		-
-			message: '#^Anonymous function has an unused use \$sequence\.$#'
-			identifier: closure.unusedUse
-			count: 1
-			path: src/Appwrite/Platform/Workers/StatsUsage.php
-
-		-
-			message: '#^Callable callable\(\)\: Utopia\\Database\\Database invoked with 1 parameter, 0 required\.$#'
-			identifier: arguments.count
-			count: 2
-			path: src/Appwrite/Platform/Workers/StatsUsage.php
-
-		-
-			message: '#^Variable \$curlError on left side of \?\? is never defined\.$#'
-			identifier: nullCoalesce.variable
-			count: 1
-			path: src/Appwrite/Platform/Workers/Webhooks.php
-
-		-
-			message: '#^Unsafe usage of new static\(\)\.$#'
-			identifier: new.static
-			count: 3
-			path: src/Appwrite/Promises/Promise.php
-
-		-
-			message: '#^Property Appwrite\\SDK\\Method\:\:\$hide on left side of \?\? is not nullable nor uninitialized\.$#'
-			identifier: nullCoalesce.initializedProperty
-			count: 1
-			path: src/Appwrite/SDK/Method.php
-
-		-
-			message: '#^PHPDoc tag @param has invalid value \(Document \$this\)\: Unexpected token "\$this", expected variable at offset 69 on line 4$#'
-			identifier: phpDoc.parseError
-			count: 1
-			path: src/Appwrite/Utopia/Database/Documents/User.php
-
-		-
-			message: '#^PHPDoc tag @param references unknown parameter\: \$sessions$#'
-			identifier: parameter.notFound
-			count: 1
-			path: src/Appwrite/Utopia/Database/Documents/User.php
-
-		-
-			message: '#^Binary operation "\+" between string and 1 results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: tests/e2e/Services/GraphQL/Legacy/AbuseTest.php
-
-		-
-			message: '#^Binary operation "\+" between string and 1 results in an error\.$#'
-			identifier: binaryOp.invalid
-			count: 1
-			path: tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php
-
-		-
-			message: '#^Call to an undefined method Utopia\\Queue\\Publisher\:\:getEvents\(\)\.$#'
-			identifier: method.notFound
-			count: 1
-			path: tests/unit/Event/EventTest.php

phpstan.neon

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

src/Appwrite/Auth/OAuth2/Yahoo.php

@@ -23,8 +23,9 @@ class Yahoo extends OAuth2
      * @var array
      */
     protected array $scopes = [
-        'sdct-r',
-        'sdpp-w',
+        'openid',
+        'profile',
+        'email',
     ];
 
     /**

src/Appwrite/Event/Event.php

@@ -285,7 +285,7 @@ class Event
      *
      * @param string $key
      * @param Document $context
-     * @return self
+     * @return static
      */
     public function setContext(string $key, Document $context): self
     {
@@ -309,7 +309,7 @@ class Event
     /**
      * Set class used for this event.
      * @param string $class
-     * @return self
+     * @return static
      */
     public function setClass(string $class): self
     {
@@ -648,10 +648,8 @@ class Event
      *
      * @param Event $event
      *
-     * @return self
-     *
      */
-    public function from(Event $event): self
+    public function from(Event $event): static
     {
         $this->project = $event->getProject();
         $this->user = $event->getUser();

src/Appwrite/Event/Message/Usage.php

@@ -4,7 +4,7 @@ namespace Appwrite\Event\Message;
 
 use Utopia\Database\Document;
 
-final class Usage extends Base
+class Usage extends Base
 {
     /**
      * @param Document $project
@@ -40,7 +40,8 @@ final class Usage extends Base
      */
     public static function fromArray(array $data): static
     {
-        return new self(
+        /** @phpstan-ignore new.static (subclass constructors are backwards-compatible via optional params) */
+        return new static(
             project: new Document($data['project'] ?? []),
             metrics: $data['metrics'] ?? [],
             reduce: array_map(fn (array $doc) => new Document($doc), $data['reduce'] ?? []),

src/Appwrite/Extend/Exception.php

@@ -82,6 +82,9 @@ class Exception extends \Exception
     public const string USER_PASSWORD_RECENTLY_USED = 'password_recently_used';
     public const string USER_PASSWORD_PERSONAL_DATA = 'password_personal_data';
     public const string USER_EMAIL_ALREADY_EXISTS = 'user_email_already_exists';
+    public const string USER_EMAIL_DISPOSABLE = 'user_email_disposable';
+    public const string USER_EMAIL_FREE = 'user_email_free';
+    public const string USER_EMAIL_NOT_CANONICAL = 'user_email_not_canonical';
     public const string USER_PASSWORD_MISMATCH = 'user_password_mismatch';
     public const string USER_SESSION_NOT_FOUND = 'user_session_not_found';
     public const string USER_IDENTITY_NOT_FOUND = 'user_identity_not_found';

src/Appwrite/GraphQL/Resolvers.php

@@ -25,11 +25,7 @@ class Resolvers
         ?Route $route,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $route, $args, $context, $info) {
-                /** @var Http $utopia */
-                /** @var Response $response */
-                /** @var Request $request */
-
+            function (callable $resolve, callable $reject) use ($utopia, $route, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -96,7 +92,7 @@ class Resolvers
         callable $url,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -127,7 +123,7 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -163,7 +159,7 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -195,7 +191,7 @@ class Resolvers
         callable $params,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $params, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);
@@ -225,7 +221,7 @@ class Resolvers
         callable $url,
     ): callable {
         return static fn ($type, $args, $context, $info) => new Swoole(
-            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $type, $args) {
+            function (callable $resolve, callable $reject) use ($utopia, $databaseId, $collectionId, $url, $args) {
                 $utopia = $utopia->getResource('utopia:graphql', true);
                 $request = $utopia->getResource('request', true);
                 $response = $utopia->getResource('response', true);

src/Appwrite/Network/Cors.php

@@ -48,7 +48,7 @@ final class Cors
     /**
      * Build CORS headers for a given request origin.
      *
-     * @return array<string,string>
+     * @return array<string, int|string>
      */
     public function headers(string $origin): array
     {

src/Appwrite/OpenSSL/OpenSSL.php

@@ -18,7 +18,7 @@ class OpenSSL
      *
      * @return string
      */
-    public static function encrypt($data, $method, $key, $options = 0, $iv = '', &$tag = null, $aad = '', $tag_length = 16)
+    public static function encrypt($data, $method, $key, $options = 0, $iv = '', ?string &$tag = null, $aad = '', $tag_length = 16)
     {
         return \openssl_encrypt($data, $method, $key, $options, $iv, $tag, $aad, $tag_length);
     }

src/Appwrite/Platform/Modules/Avatars/Http/Action.php

@@ -49,7 +49,6 @@ class Action extends PlatformAction
 
         $image = new Image(\file_get_contents($path));
         $image->crop((int) $width, (int) $height);
-        $output = (empty($output)) ? $type : $output;
         $data = $image->output($output, $quality);
         $response
             ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days

src/Appwrite/Platform/Modules/Avatars/Http/Favicon/Get.php

@@ -204,7 +204,6 @@ class Get extends Action
 
         $image = new Image($data);
         $image->crop((int) $width, (int) $height);
-        $output = (empty($output)) ? $type : $output;
         $data = $image->output($output, $quality);
 
         $response

src/Appwrite/Platform/Modules/Avatars/Http/Image/Get.php

@@ -95,7 +95,6 @@ class Get extends Action
         }
 
         $image->crop((int) $width, (int) $height);
-        $output = (empty($output)) ? $type : $output;
         $data = $image->output($output, $quality);
 
         $response

src/Appwrite/Platform/Modules/Avatars/Http/Initials/Get.php

@@ -90,7 +90,7 @@ class Get extends Action
             }
         }
 
-        $rand = \substr($code, -1);
+        $rand = (int) \substr((string) $code, -1);
 
         $rand = ($rand > \count($themes) - 1) ? $rand % \count($themes) : $rand;
 

src/Appwrite/Platform/Modules/Databases/Http/Databases/Action.php

@@ -17,7 +17,7 @@ class Action extends AppwriteAction
         return $this->context;
     }
 
-    public function setHttpPath(string $path): AppwriteAction
+    public function setHttpPath(string $path): self
     {
         if (\str_contains($path, '/tablesdb')) {
             $this->context = DATABASE_TYPE_TABLESDB;
@@ -28,7 +28,8 @@ class Action extends AppwriteAction
         if (\str_contains($path, '/vectorsdb')) {
             $this->context = DATABASE_TYPE_VECTORSDB;
         }
-        return parent::setHttpPath($path);
+        parent::setHttpPath($path);
+        return $this;
     }
 
     /**

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php

@@ -24,7 +24,7 @@ abstract class Action extends DatabasesAction
      */
     abstract protected function getResponseModel(): string;
 
-    public function setHttpPath(string $path): DatabasesAction
+    public function setHttpPath(string $path): self
     {
         if (str_contains($path, '/tablesdb/')) {
             $this->context = ROWS;
@@ -47,7 +47,8 @@ abstract class Action extends DatabasesAction
             ],
         ];
 
-        return parent::setHttpPath($path);
+        parent::setHttpPath($path);
+        return $this;
     }
 
     protected function getDatabasesOperationReadMetric(): string
@@ -406,8 +407,6 @@ abstract class Action extends DatabasesAction
 
             if (\is_array($related)) {
                 $document->setAttribute($relationship->getAttribute('key'), \array_values($relations));
-            } elseif (empty($relations)) {
-                $document->setAttribute($relationship->getAttribute('key'), null);
             }
         }
 

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php

@@ -209,7 +209,7 @@ class Create extends Action
             throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Bulk create is not supported for ' . $this->getSDKNamespace() . ' with relationship ' . $this->getStructureContext());
         }
 
-        $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk, $dbForProject, $authorization) {
+        $setPermissions = function (Document $document, ?array $permissions) use ($user, $isAPIKey, $isPrivilegedUser, $isBulk, $authorization) {
             $allowedPermissions = [
                 Database::PERMISSION_READ,
                 Database::PERMISSION_UPDATE,

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php

@@ -122,7 +122,6 @@ class Update extends Action
 
         $dbForDatabases = $getDatabasesDB($database);
         // Read permission should not be required for update
-        /** @var Document $document */
         $collectionTableId = 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence();
 
         if ($transactionId !== null) {

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/XList.php

@@ -147,7 +147,7 @@ class XList extends Action
                     $cacheKeyBase = \sprintf(
                         '%s-cache-%s:%s:%s:collection:%s:%s:user:%s:%s',
                         $dbForProject->getCacheName(),
-                        $hostname ?? '',
+                        $hostname,
                         $dbForProject->getNamespace(),
                         $dbForProject->getTenant(),
                         $collectionId,

src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Update.php

@@ -99,8 +99,6 @@ class Update extends Action
         // Map aggregate permissions into the multiple permissions they represent.
         $permissions = Permission::aggregate($permissions);
 
-        $enabled ??= $collection->getAttribute('enabled', true);
-
         $collection = $dbForProject->updateDocument(
             'database_' . $database->getSequence(),
             $collectionId,

src/Appwrite/Platform/Modules/Databases/Http/Databases/Logs/XList.php

@@ -103,6 +103,9 @@ class XList extends Action
             $os = $detector->getOS();
             $client = $detector->getClient();
             $device = $detector->getDevice();
+            $deviceName = \is_array($device) ? ($device['deviceName'] ?? '') : '';
+            $deviceBrand = \is_array($device) ? ($device['deviceBrand'] ?? '') : '';
+            $deviceModel = \is_array($device) ? ($device['deviceModel'] ?? '') : '';
 
             $output[$i] = new Document([
                 'event' => $log['event'],
@@ -121,9 +124,9 @@ class XList extends Action
                 'clientVersion' => $client['clientVersion'],
                 'clientEngine' => $client['clientEngine'],
                 'clientEngineVersion' => $client['clientEngineVersion'],
-                'deviceName' => $device['deviceName'],
-                'deviceBrand' => $device['deviceBrand'],
-                'deviceModel' => $device['deviceModel'],
+                'deviceName' => $deviceName,
+                'deviceBrand' => $deviceBrand,
+                'deviceModel' => $deviceModel,
             ]);
 
             $record = $geodb->get($log['ip']);

src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Action.php

@@ -33,7 +33,7 @@ abstract class Action extends DatabasesAction
         return $this->databaseType.'.'.METRIC_DATABASE_ID_OPERATIONS_WRITES;
     }
 
-    public function setHttpPath(string $path): DatabasesAction
+    public function setHttpPath(string $path): self
     {
         switch (true) {
             case str_contains($path, '/tablesdb'):
@@ -50,7 +50,8 @@ abstract class Action extends DatabasesAction
                 $this->databaseType = VECTORSDB;
                 break;
         }
-        return parent::setHttpPath($path);
+        parent::setHttpPath($path);
+        return $this;
     }
 
     /**

src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Operations/Create.php

@@ -239,7 +239,7 @@ class Create extends Action
             }
         }
 
-        $transaction = $authorization->skip(fn () => $dbForProject->withTransaction(function () use ($dbForProject, $transactionId, $staged, $existing, $operations) {
+        $transaction = $authorization->skip(fn () => $dbForProject->withTransaction(function () use ($dbForProject, $transactionId, $staged, $operations) {
             $dbForProject->createDocuments('transactionLogs', $staged);
             return $dbForProject->increaseDocumentAttribute(
                 'transactions',

src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php

@@ -105,8 +105,7 @@ class Update extends Action
      * @throws Exception
      * @throws \Throwable
      * @throws \Utopia\Database\Exception
-     * @throws Authorization
-     * @throws Structure
+     * @throws StructureException
      * @throws \Utopia\Http\Exception
      */
     public function action(string $transactionId, bool $commit, bool $rollback, Document $project, UtopiaResponse $response, Database $dbForProject, callable $getDatabasesDB, User $user, TransactionState $transactionState, Delete $queueForDeletes, Event $queueForEvents, Context $usage, Event $queueForRealtime, Event $queueForFunctions, Event $queueForWebhooks, Authorization $authorization, EventProcessor $eventProcessor): void
@@ -183,7 +182,7 @@ class Update extends Action
             $dbForDatabases = $getDatabasesDB($databaseDoc);
 
             try {
-                $dbForDatabases->withTransaction(function () use ($dbForDatabases, $dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $queueForEvents, $usage, $queueForRealtime, $queueForFunctions, $queueForWebhooks, $authorization) {
+                $dbForDatabases->withTransaction(function () use ($dbForDatabases, $dbForProject, $transactionState, $queueForDeletes, $transactionId, &$transaction, &$operations, &$totalOperations, &$databaseOperations, &$currentDocumentId, $authorization) {
                     $authorization->skip(fn () => $dbForProject->updateDocument('transactions', $transactionId, new Document([
                         'status' => 'committing',
                     ])));

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Logs/XList.php

@@ -97,6 +97,9 @@ class XList extends Action
             $os = $detector->getOS();
             $client = $detector->getClient();
             $device = $detector->getDevice();
+            $deviceName = \is_array($device) ? ($device['deviceName'] ?? '') : '';
+            $deviceBrand = \is_array($device) ? ($device['deviceBrand'] ?? '') : '';
+            $deviceModel = \is_array($device) ? ($device['deviceModel'] ?? '') : '';
 
             $output[$i] = new Document([
                 'event' => $log['event'],
@@ -115,9 +118,9 @@ class XList extends Action
                 'clientVersion' => $client['clientVersion'],
                 'clientEngine' => $client['clientEngine'],
                 'clientEngineVersion' => $client['clientEngineVersion'],
-                'deviceName' => $device['deviceName'],
-                'deviceBrand' => $device['deviceBrand'],
-                'deviceModel' => $device['deviceModel'],
+                'deviceName' => $deviceName,
+                'deviceBrand' => $deviceBrand,
+                'deviceModel' => $deviceModel,
             ]);
 
             $record = $geodb->get($log['ip']);

src/Appwrite/Platform/Modules/Databases/Http/VectorsDB/Collections/Create.php

@@ -130,9 +130,26 @@ class Create extends CollectionAction
             $indexes[] = new Document($index);
         }
         try {
-            // passing null in creates only creates the metadata collection
-            if (!$dbForDatabases->exists(null, Database::METADATA)) {
-                $dbForDatabases->create();
+            // Bootstrap the database metadata without a separate existence
+            // check to avoid races when multiple first collections are created
+            // concurrently for the same VectorsDB database.
+            for ($attempt = 0; $attempt < 5; $attempt++) {
+                try {
+                    $dbForDatabases->create();
+                    break;
+                } catch (DuplicateException) {
+                    break;
+                } catch (\Throwable $e) {
+                    if ($dbForDatabases->exists(null, Database::METADATA)) {
+                        break;
+                    }
+
+                    if ($attempt === 4) {
+                        throw $e;
+                    }
+
+                    \usleep(100_000);
+                }
             }
             $dbForDatabases->createCollection(
                 id: 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(),

src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php

@@ -213,7 +213,10 @@ class Create extends Base
             $current = new Document();
 
             foreach ($sessions as $session) {
-                /** @var Utopia\Database\Document $session */
+                if (!$session instanceof Document) {
+                    continue;
+                }
+
                 if ($proofForToken->verify($store->getProperty('secret', ''), $session->getAttribute('secret'))) { // Find most recent active session for user ID and JWT headers
                     $current = $session;
                 }
@@ -237,11 +240,11 @@ class Create extends Base
         ]);
 
         $executionId = ID::unique();
-        $headers['x-appwrite-execution-id'] = $executionId ?? '';
+        $headers['x-appwrite-execution-id'] = $executionId;
         $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
         $headers['x-appwrite-trigger'] = 'http';
-        $headers['x-appwrite-user-id'] = $user->getId() ?? '';
-        $headers['x-appwrite-user-jwt'] = $jwt ?? '';
+        $headers['x-appwrite-user-id'] = $user->getId();
+        $headers['x-appwrite-user-jwt'] = $jwt;
         $headers['x-appwrite-country-code'] = '';
         $headers['x-appwrite-continent-code'] = '';
         $headers['x-appwrite-continent-eu'] = 'false';
@@ -350,16 +353,18 @@ class Create extends Base
                 }
             }
 
-            $this->enqueueDeletes(
-                $project,
-                $function->getSequence(),
-                $executionsRetentionCount,
+            if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
                 $queueForDeletes
-            );
+                    ->setProject($project)
+                    ->setResource($function->getSequence())
+                    ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
+                    ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+                    ->trigger();
+            }
 
-            return $response
-                ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-                ->dynamic($execution, Response::MODEL_EXECUTION);
+            $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
+            $response->dynamic($execution, Response::MODEL_EXECUTION);
+            return;
         }
 
         $durationStart = \microtime(true);
@@ -370,7 +375,7 @@ class Create extends Base
         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'] ?? ''
             ]);
@@ -537,32 +542,18 @@ class Create extends Base
             }
         }
 
-        $this->enqueueDeletes(
-            $project,
-            $function->getSequence(),
-            $executionsRetentionCount,
+        if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
             $queueForDeletes
-        );
+                ->setProject($project)
+                ->setResource($function->getSequence())
+                ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
+                ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
+                ->trigger();
+        }
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($execution, Response::MODEL_EXECUTION);
     }
 
-    private function enqueueDeletes(
-        Document $project,
-        string $resourceId,
-        int $executionsRetentionCount,
-        DeleteEvent $queueForDeletes
-    ): void {
-        /* cleanup */
-        if ($executionsRetentionCount > 0 && ENABLE_EXECUTIONS_LIMIT_ON_ROUTE) {
-            $queueForDeletes
-                ->setProject($project)
-                ->setResource($resourceId)
-                ->setResourceType(RESOURCE_TYPE_FUNCTIONS)
-                ->setType(DELETE_TYPE_EXECUTIONS_LIMIT)
-                ->trigger();
-        }
-    }
 }

src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php

@@ -424,8 +424,8 @@ class Create extends Base
 
                 /** Trigger Realtime Events */
                 $queueForRealtime
-                    ->from($ruleCreate)
                     ->setSubscribers(['console', $project->getId()])
+                    ->from($ruleCreate)
                     ->trigger();
             }
         }

src/Appwrite/Platform/Modules/Functions/Workers/Builds.php

@@ -450,7 +450,7 @@ class Builds extends Action
 
                     $providerCommitHash = \trim($stdout);
 
-                    $deployment->setAttribute('providerCommitHash', $providerCommitHash ?? '');
+                    $deployment->setAttribute('providerCommitHash', $providerCommitHash);
                     $deployment->setAttribute('providerCommitAuthorUrl', APP_VCS_GITHUB_URL);
                     $deployment->setAttribute('providerCommitAuthor', APP_VCS_GITHUB_USERNAME);
                     $deployment->setAttribute('providerCommitMessage', "Create '" . $resource->getAttribute('name', '') . "' function");
@@ -862,7 +862,7 @@ class Builds extends Action
             if (\str_contains($logs, '{APPWRITE_DETECTION_SEPARATOR_START}')) {
                 [$logsBefore, $detectionLogsStart] = \explode('{APPWRITE_DETECTION_SEPARATOR_START}', $logs, 2);
                 [$detectionLogs, $logsAfter] = \explode('{APPWRITE_DETECTION_SEPARATOR_END}', $detectionLogsStart, 2);
-                $logs = ($logsBefore ?? '') . ($logsAfter ?? '');
+                $logs = $logsBefore . $logsAfter;
             }
 
             $deployment->setAttribute('buildLogs', $logs);
@@ -1203,6 +1203,8 @@ class Builds extends Action
     protected function sendUsage(Document $resource, Document $deployment, Document $project, Context $usage, UsagePublisher $publisherForUsage): void
     {
         $spec = Config::getParam('specifications')[$resource->getAttribute('buildSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
+        $cpus = (int) ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT);
+        $memory = (int) ($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT);
 
         switch ($deployment->getAttribute('status')) {
             case 'ready':
@@ -1364,6 +1366,8 @@ class Builds extends Action
         Realtime $queueForRealtime,
         array $platform
     ): void {
+        $deployment = new Document();
+
         try {
             if ($resource->getAttribute('providerSilentMode', false) === true) {
                 return;
@@ -1444,7 +1448,7 @@ class Builds extends Action
                     $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
                     $previewUrl = match ($resource->getCollection()) {
                         'functions' => '',
-                        'sites' => ! empty($rule) ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '',
+                        'sites' => !$rule->isEmpty() ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '',
                         default => throw new \Exception('Invalid resource type')
                     };
 

src/Appwrite/Platform/Modules/Projects/Http/Projects/Create.php

@@ -114,6 +114,9 @@ class Create extends Action
             'passwordDictionary' => false,
             'duration' => TOKEN_EXPIRATION_LOGIN_LONG,
             'personalDataCheck' => false,
+            'disposableEmails' => false,
+            'canonicalEmails' => false,
+            'freeEmails' => false,
             'mockNumbers' => [],
             'sessionAlerts' => false,
             'membershipsUserName' => false,

src/Appwrite/Platform/Modules/Proxy/Http/Rules/Verification/Update.php

@@ -83,7 +83,8 @@ class Update extends Action
 
         // If rule is already verified or in certificate generation state, don't queue for verification again
         if ($rule->getAttribute('status') === RULE_STATUS_VERIFIED || $rule->getAttribute('status') === RULE_STATUS_CERTIFICATE_GENERATING) {
-            return $response->dynamic($rule, Response::MODEL_PROXY_RULE);
+            $response->dynamic($rule, Response::MODEL_PROXY_RULE);
+            return;
         }
 
         try {

src/Appwrite/Platform/Modules/Storage/Http/Buckets/Files/Create.php

@@ -286,6 +286,8 @@ class Create extends Action
             $mimeType = $deviceForFiles->getFileMimeType($path); // Get mime-type before compression and encryption
             $fileHash = $deviceForFiles->getFileHash($path); // Get file hash before compression and encryption
             $data = '';
+            $iv = '';
+            $tag = null;
             // Compression
             $algorithm = $bucket->getAttribute('compression', Compression::NONE);
             if ($fileSize <= APP_STORAGE_READ_BUFFER && $algorithm != Compression::NONE) {

src/Appwrite/Platform/Modules/Teams/Http/Memberships/Create.php

@@ -102,6 +102,8 @@ class Create extends Action
     {
         $isAppUser = $user->isApp($authorization->getRoles());
         $isPrivilegedUser = $user->isPrivileged($authorization->getRoles());
+        $invitee = new Document();
+        $hash = '';
 
         if (empty($url)) {
             if (! $isAppUser && ! $isPrivilegedUser) {
@@ -145,9 +147,6 @@ class Create extends Action
             }
         } elseif (! empty($phone)) {
             $invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
-            if (! $invitee->isEmpty() && ! empty($email) && $invitee->getAttribute('email', '') !== $email) {
-                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
-            }
         }
 
         if ($invitee->isEmpty()) { // Create new user if no user with same email found
@@ -169,14 +168,41 @@ class Create extends Action
                 throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
             }
 
+            $emailMetadata = [
+                'emailCanonical' => null,
+                'emailIsCanonical' => null,
+                'emailIsCorporate' => null,
+                'emailIsDisposable' => null,
+                'emailIsFree' => null,
+            ];
+
             try {
-                $userId = ID::unique();
-                $hash = $proofForPassword->hash($proofForPassword->generate());
-                $emailCanonical = new Email($email);
-            } catch (Throwable) {
-                $emailCanonical = null;
+                $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);
+            }
+
+            $hash = $proofForPassword->hash($proofForPassword->generate());
+
             $userId = ID::unique();
 
             $userDocument = new Document([
@@ -209,11 +235,11 @@ class Create extends Action
                 'tokens' => null,
                 'memberships' => null,
                 'search' => implode(' ', [$userId, $email, $name]),
-                'emailCanonical' => $emailCanonical?->getCanonical(),
-                'emailIsCanonical' => $emailCanonical?->isCanonicalSupported(),
-                'emailIsCorporate' => $emailCanonical?->isCorporate(),
-                'emailIsDisposable' => $emailCanonical?->isDisposable(),
-                'emailIsFree' => $emailCanonical?->isFree(),
+                'emailCanonical' => $emailMetadata['emailCanonical'],
+                'emailIsCanonical' => $emailMetadata['emailIsCanonical'],
+                'emailIsCorporate' => $emailMetadata['emailIsCorporate'],
+                'emailIsDisposable' => $emailMetadata['emailIsDisposable'],
+                'emailIsFree' => $emailMetadata['emailIsFree'],
             ]);
 
             try {

src/Appwrite/Platform/Tasks/Doctor.php

@@ -4,7 +4,6 @@ namespace Appwrite\Platform\Tasks;
 
 use Appwrite\ClamAV\Network;
 use Appwrite\PubSub\Adapter\Pool as PubSubPool;
-use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Config\Config;
 use Utopia\Console;
@@ -13,6 +12,8 @@ use Utopia\Domains\Domain;
 use Utopia\DSN\DSN;
 use Utopia\Http\Http;
 use Utopia\Logger\Logger;
+use Utopia\Messaging\Adapter\Email as EmailAdapter;
+use Utopia\Messaging\Messages\Email as EmailMessage;
 use Utopia\Platform\Action;
 use Utopia\Pools\Group;
 use Utopia\Queue\Broker\Pool as BrokerPool;
@@ -124,7 +125,7 @@ class Doctor extends Action
         $providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');
 
         try {
-            $loggingProvider = new DSN($providerConfig ?? '');
+            $loggingProvider = new DSN($providerConfig);
 
             $providerName = $loggingProvider->getScheme();
 
@@ -212,15 +213,18 @@ class Doctor extends Action
         }
 
         try {
-            /* @var PHPMailer $mail */
-            $mail = $register->get('smtp');
+            /** @var EmailAdapter $smtp */
+            $smtp = $register->get('smtp');
 
-            $mail->addAddress('demo@example.com', 'Example.com');
-            $mail->Subject = 'Test SMTP Connection';
-            $mail->Body = 'Hello World';
-            $mail->AltBody = 'Hello World';
+            $emailMessage = new EmailMessage(
+                to: ['demo@example.com'],
+                subject: 'Test SMTP Connection',
+                content: 'Hello World',
+                fromName: \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server')),
+                fromEmail: System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM),
+            );
 
-            $mail->send();
+            $smtp->send($emailMessage);
             Console::success('🟢 ' . str_pad("SMTP", 50, '.') . 'connected');
         } catch (\Throwable) {
             Console::error('🔴 ' . str_pad("SMTP", 47, '.') . 'disconnected');

src/Appwrite/Platform/Tasks/Install.php

@@ -227,7 +227,7 @@ class Install extends Action
         // Fall back to CLI mode
         $enableAssistant = false;
         $assistantExistsInOldCompose = false;
-        if ($existingInstallation && isset($compose)) {
+        if ($existingInstallation) {
             try {
                 $assistantService = $compose->getService('appwrite-assistant');
                 $assistantExistsInOldCompose = $assistantService !== null;

src/Appwrite/Platform/Tasks/SDKs.php

@@ -566,6 +566,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
                 $repoBranch = $language['repoBranch'] ?? 'main';
                 if ($git && !empty($gitUrl)) {
+                    $prUrls = [];
+
                     // Generate commit message: use provided message, AI changelog, or fallback
                     if (! empty($message)) {
                         $commitMessage = $message;

src/Appwrite/Platform/Tasks/ScheduleFunctions.php

@@ -61,7 +61,7 @@ class ScheduleFunctions extends ScheduleBase
             $nextDate = $cron->getNextRunDate();
             $next = DateTime::format($nextDate);
 
-            $currentTick = $next < $timeFrame;
+            $currentTick = $next <= $timeFrame;
 
             if (!$currentTick) {
                 continue;
@@ -88,7 +88,7 @@ class ScheduleFunctions extends ScheduleBase
                     $scheduleKey = $delayConfig['key'];
                     // Ensure schedule was not deleted
                     if (!\array_key_exists($scheduleKey, $this->schedules)) {
-                        return;
+                        continue;
                     }
 
                     $schedule = $this->schedules[$scheduleKey];

src/Appwrite/Platform/Tasks/StatsResources.php

@@ -60,7 +60,7 @@ class StatsResources extends Action
 
         $interval = (int) System::getEnv('_APP_STATS_RESOURCES_INTERVAL', '3600');
 
-        Console::loop(function () use ($queueForStatsResources, $dbForPlatform) {
+        Console::loop(function () use ($queueForStatsResources) {
 
             $last24Hours = (new \DateTime())->sub(\DateInterval::createFromDateString('24 hours'));
             /**

src/Appwrite/Platform/Workers/Audits.php

@@ -6,7 +6,6 @@ use Exception;
 use Throwable;
 use Utopia\Console;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Authorization;
 use Utopia\Database\Exception\Structure;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
@@ -51,13 +50,11 @@ class Audits extends Action
 
     /**
      * @param Message $message
-     * @param callable $getProjectDB
      * @param Document $project
-     * @param callable $getAudit
+     * @param callable(Document): \Utopia\Audit\Audit $getAudit
      * @return Commit|NoCommit
      * @throws Throwable
      * @throws \Utopia\Database\Exception
-     * @throws Authorization
      * @throws Structure
      */
     public function action(Message $message, Document $project, callable $getAudit): Commit|NoCommit

src/Appwrite/Platform/Workers/Deletes.php

@@ -24,7 +24,6 @@ use Utopia\Database\Exception\Conflict;
 use Utopia\Database\Exception\Restricted;
 use Utopia\Database\Exception\Structure;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Action;
@@ -363,7 +362,6 @@ class Deletes extends Action
     /**
      * @param Document $project
      * @param callable $getProjectDB
-     * @param Document $target
      * @return void
      * @throws Exception
      */
@@ -438,7 +436,6 @@ class Deletes extends Action
      * @param string $resource
      * @param string|null $resourceType
      * @return void
-     * @throws Authorization
      * @throws Exception
      */
     private function deleteCacheByResource(Document $project, callable $getProjectDB, string $resource, ?string $resourceType = null): void
@@ -518,7 +515,6 @@ class Deletes extends Action
     }
 
     /**
-     * @param Database $dbForPlatform
      * @param callable $getProjectDB
      * @param string $hourlyUsageRetentionDatetime
      * @return void
@@ -586,7 +582,6 @@ class Deletes extends Action
      * @param Database $dbForPlatform
      * @param Document $document
      * @return void
-     * @throws Authorization
      * @throws DatabaseException
      * @throws Conflict
      * @throws Restricted
@@ -623,7 +618,6 @@ class Deletes extends Action
      * @param Document $document
      * @return void
      * @throws Exception
-     * @throws Authorization
      * @throws DatabaseException
      */
     protected function deleteProject(Database $dbForPlatform, callable $getProjectDB, callable $getDatabasesDB, Device $deviceForFiles, Device $deviceForSites, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
@@ -952,7 +946,7 @@ class Deletes extends Action
             // fast path, no need to list anything!
             $delete($dbForProject, $resourceInternalId, $resourceType);
         } else {
-            $processResource = function (string $type) use ($dbForProject, $delete, $resourceType) {
+            $processResource = function (string $type) use ($dbForProject, $delete) {
                 $this->listByGroup(
                     collection: $type,
                     queries: [Query::select(['$id', '$sequence'])],
@@ -1109,7 +1103,7 @@ class Deletes extends Action
             Query::equal('resourceInternalId', [$siteInternalId]),
             Query::equal('resourceType', ['sites']),
             Query::orderAsc()
-        ], $dbForProject, function (Document $document) use ($project, $certificates, $deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds) {
+        ], $dbForProject, function (Document $document) use ($deviceForSites, $deviceForBuilds, $deviceForFiles, $dbForPlatform, &$deploymentInternalIds, &$deploymentIds) {
             $deploymentInternalIds[] = $document->getSequence();
             $deploymentIds[] = $document->getId();
             $this->deleteBuildFiles($deviceForBuilds, $document);
@@ -1172,7 +1166,7 @@ class Deletes extends Action
             Query::equal('deploymentResourceInternalId', [$functionInternalId]),
             Query::equal('projectInternalId', [$project->getSequence()]),
             Query::orderAsc()
-        ], $dbForPlatform, function (Document $document) use ($project, $dbForPlatform, $certificates) {
+        ], $dbForPlatform, function (Document $document) use ($dbForPlatform, $certificates) {
             $this->deleteRule($dbForPlatform, $document, $certificates);
         });
 
@@ -1196,7 +1190,7 @@ class Deletes extends Action
             Query::equal('resourceInternalId', [$functionInternalId]),
             Query::equal('resourceType', ['functions']),
             Query::orderAsc()
-        ], $dbForProject, function (Document $document) use ($dbForPlatform, $project, $certificates, $deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
+        ], $dbForProject, function (Document $document) use ($deviceForFunctions, $deviceForBuilds, &$deploymentInternalIds) {
             $deploymentInternalIds[] = $document->getSequence();
             $this->deleteDeploymentFiles($deviceForFunctions, $document);
             $this->deleteBuildFiles($deviceForBuilds, $document);
@@ -1321,7 +1315,7 @@ class Deletes extends Action
 
     /**
      * @param Device $device
-     * @param Document $build
+     * @param Document $deployment
      * @return void
      */
     private function deleteBuildFiles(Device $device, Document $deployment): void
@@ -1631,9 +1625,9 @@ class Deletes extends Action
         try {
             $dbForProject->deleteDocuments('transactions', [
                 Query::lessThan('expiresAt', DateTime::format(new \DateTime())),
-            ], onNext: function (Document $transaction) use ($dbForProject, $project, &$transactionInternalIds) {
+            ], onNext: function (Document $transaction) use (&$transactionInternalIds) {
                 $transactionInternalIds[] = $transaction->getSequence();
-            }, onError: function (Throwable $th) use ($project) {
+            }, onError: function (Throwable $th) {
                 // Swallow errors to avoid breaking the cleanup process
             });
         } catch (Throwable $th) {
@@ -1646,7 +1640,7 @@ class Deletes extends Action
 
         $dbForProject->deleteDocuments('transactionLogs', [
             Query::equal('transactionInternalId', $transactionInternalIds),
-        ], onError: function (Throwable $th) use ($project) {
+        ], onError: function (Throwable $th) {
             // Swallow errors to avoid breaking the cleanup process
         });
     }

src/Appwrite/Platform/Workers/Functions.php

@@ -33,7 +33,7 @@ class Functions extends Action
     }
 
     /**
-     * @throws Exception
+     * @throws \Exception
      */
     public function __construct()
     {
@@ -256,7 +256,7 @@ class Functions extends Action
      * @param Document $user
      * @param string|null $jwt
      * @param string|null $event
-     * @throws Exception
+     * @throws \Exception
      */
     private function fail(
         string $message,
@@ -271,10 +271,10 @@ class Functions extends Action
         ?string $event = null,
     ): void {
         $executionId = ID::unique();
-        $headers['x-appwrite-execution-id'] = $executionId ?? '';
+        $headers['x-appwrite-execution-id'] = $executionId;
         $headers['x-appwrite-trigger'] = $trigger;
         $headers['x-appwrite-event'] = $event ?? '';
-        $headers['x-appwrite-user-id'] = $user->getId() ?? '';
+        $headers['x-appwrite-user-id'] = $user->getId();
         $headers['x-appwrite-user-jwt'] = $jwt ?? '';
 
         $headersFiltered = [];
@@ -458,8 +458,8 @@ class Functions extends Action
         if ($version === 'v2') {
             $vars = \array_merge($vars, [
                 'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body ?? '',
-                'APPWRITE_FUNCTION_EVENT_DATA' => $body ?? '',
+                'APPWRITE_FUNCTION_DATA' => $body,
+                'APPWRITE_FUNCTION_EVENT_DATA' => $body,
                 'APPWRITE_FUNCTION_EVENT' => $headers['x-appwrite-event'] ?? '',
                 'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
                 'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
@@ -508,6 +508,9 @@ class Functions extends Action
         ]);
 
         /** Execute function */
+        $error = null;
+        $errorCode = 0;
+
         try {
             $version = $function->getAttribute('version', 'v2');
             $command = $runtime['startCommand'];

src/Appwrite/Platform/Workers/Mails.php

@@ -4,10 +4,13 @@ namespace Appwrite\Platform\Workers;
 
 use Appwrite\Template\Template;
 use Exception;
-use PHPMailer\PHPMailer\PHPMailer;
 use Swoole\Runtime;
 use Utopia\Database\Document;
 use Utopia\Logger\Log;
+use Utopia\Messaging\Adapter\Email as EmailAdapter;
+use Utopia\Messaging\Adapter\Email\SMTP;
+use Utopia\Messaging\Messages\Email as EmailMessage;
+use Utopia\Messaging\Messages\Email\Attachment;
 use Utopia\Platform\Action;
 use Utopia\Queue\Message;
 use Utopia\Registry\Registry;
@@ -49,9 +52,9 @@ class Mails extends Action
 
     /**
      * @param Message $message
+     * @param Document $project
      * @param Registry $register
      * @param Log $log
-     * @throws \PHPMailer\PHPMailer\Exception
      * @return void
      * @throws Exception
      */
@@ -132,36 +135,38 @@ class Mails extends Action
         // render() will return the subject in <p> tags, so use strip_tags() to remove them
         $subject = \strip_tags($subjectTemplate->render());
 
-        /** @var PHPMailer $mail */
-        $mail = empty($smtp)
+        /** @var EmailAdapter $adapter */
+        $adapter = empty($smtp)
             ? $register->get('smtp')
-            : $this->getMailer($smtp);
+            : new SMTP(
+                host: $smtp['host'],
+                port: (int) $smtp['port'],
+                username: $smtp['username'] ?? '',
+                password: $smtp['password'] ?? '',
+                smtpSecure: $smtp['secure'] ?? '',
+                smtpAutoTLS: false,
+                xMailer: 'Appwrite Mailer',
+                timeout: 10,
+                keepAlive: true,
+                timelimit: 30,
+            );
 
-        $mail->clearAddresses();
-        $mail->clearAllRecipients();
-        $mail->clearReplyTos();
-        $mail->clearAttachments();
-        $mail->clearBCCs();
-        $mail->clearCCs();
-        $mail->addAddress($recipient, $name);
-        $mail->Subject = $subject;
-        $mail->Body = $body;
+        // Resolve from/replyTo using fallback hierarchy: Custom options > SMTP config > Defaults
+        $defaultFromEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+        $defaultFromName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
 
-        $mail->AltBody = $body;
-        $mail->AltBody = preg_replace('/<style\b[^>]*>(.*?)<\/style>/is', '', $mail->AltBody);
-        $mail->AltBody = \strip_tags($mail->AltBody);
-        $mail->AltBody = \trim($mail->AltBody);
-
-        $replyTo = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
-        $replyToName = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
+        $fromEmail = !empty($smtp) ? ($smtp['senderEmail'] ?? $defaultFromEmail) : $defaultFromEmail;
+        $fromName = !empty($smtp) ? ($smtp['senderName'] ?? $defaultFromName) : $defaultFromName;
+        $replyTo = $defaultFromEmail;
+        $replyToName = $defaultFromName;
 
         $customMailOptions = $payload['customMailOptions'] ?? [];
 
-        // fallback hierarchy: Custom options > SMTP config > Defaults.
-        if (!empty($customMailOptions['senderEmail']) || !empty($customMailOptions['senderName'])) {
-            $fromEmail = $customMailOptions['senderEmail'] ?? $mail->From;
-            $fromName = $customMailOptions['senderName'] ?? $mail->FromName;
-            $mail->setFrom($fromEmail, $fromName);
+        if (!empty($customMailOptions['senderEmail'])) {
+            $fromEmail = $customMailOptions['senderEmail'];
+        }
+        if (!empty($customMailOptions['senderName'])) {
+            $fromName = $customMailOptions['senderName'];
         }
 
         if (!empty($customMailOptions['replyToEmail']) || !empty($customMailOptions['replyToName'])) {
@@ -172,18 +177,32 @@ class Mails extends Action
             $replyToName = $smtp['senderName'] ?? $replyToName;
         }
 
-        $mail->addReplyTo($replyTo, $replyToName);
+        $attachments = null;
         if (!empty($attachment['content'] ?? '')) {
-            $mail->AddStringAttachment(
-                base64_decode($attachment['content']),
-                $attachment['filename'] ?? 'unknown.file',
-                $attachment['encoding'] ?? PHPMailer::ENCODING_BASE64,
-                $attachment['type'] ?? 'plain/text'
-            );
+            $attachments = [
+                new Attachment(
+                    name: $attachment['filename'] ?? 'unknown.file',
+                    path: '',
+                    type: $attachment['type'] ?? 'plain/text',
+                    content: \base64_decode($attachment['content']),
+                ),
+            ];
         }
 
+        $emailMessage = new EmailMessage(
+            to: [['email' => $recipient, 'name' => $name]],
+            subject: $subject,
+            content: $body,
+            fromName: $fromName,
+            fromEmail: $fromEmail,
+            replyToName: $replyToName,
+            replyToEmail: $replyTo,
+            attachments: $attachments,
+            html: true,
+        );
+
         try {
-            $mail->send();
+            $adapter->send($emailMessage);
         } catch (\Throwable $error) {
             if ($type === 'smtp') {
                 throw new Exception('Error sending mail: ' . $error->getMessage(), 401);
@@ -191,38 +210,4 @@ class Mails extends Action
             throw new Exception('Error sending mail: ' . $error->getMessage(), 500);
         }
     }
-
-    /**
-     * @param array $smtp
-     * @return PHPMailer
-     * @throws \PHPMailer\PHPMailer\Exception
-     */
-    protected function getMailer(array $smtp): PHPMailer
-    {
-        $mail = new PHPMailer(true);
-
-        $mail->isSMTP();
-
-        $username = $smtp['username'];
-        $password = $smtp['password'];
-
-        $mail->XMailer = 'Appwrite Mailer';
-        $mail->Host = $smtp['host'];
-        $mail->Port = $smtp['port'];
-        $mail->SMTPAuth = (!empty($username) && !empty($password));
-        $mail->Username = $username;
-        $mail->Password = $password;
-        $mail->SMTPSecure = $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.) */
-
-        $mail->setFrom($smtp['senderEmail'], $smtp['senderName']);
-
-        $mail->isHTML();
-
-        return $mail;
-    }
 }

src/Appwrite/Platform/Workers/Messaging.php

@@ -285,7 +285,7 @@ class Messaging extends Action
 
                         try {
                             $response = $adapter->send($data);
-                            $deliveredTotal += $response['deliveredTo'];
+                            $deliveredTotal += (int) $response['deliveredTo'];
                             foreach ($response['results'] as $result) {
                                 if ($result['status'] === 'failure') {
                                     $deliveryErrors[] = "Failed sending to target {$result['recipient']} with error: {$result['error']}";
@@ -380,7 +380,7 @@ class Messaging extends Action
         ]));
 
         // Delete any attachments that were downloaded to local storage
-        if ($provider->getAttribute('type') === MESSAGE_TYPE_EMAIL) {
+        if ($providerType === MESSAGE_TYPE_EMAIL) {
             if ($deviceForFiles->getType() === Storage::DEVICE_LOCAL) {
                 return;
             }

src/Appwrite/Platform/Workers/Migrations.php

@@ -408,6 +408,7 @@ class Migrations extends Action
         $tempAPIKey = $this->generateAPIKey($project);
 
         $transfer = $source = $destination = null;
+        $aggregatedResources = [];
 
         $host = System::getEnv('_APP_MIGRATION_HOST');
         if (empty($host)) {
@@ -444,7 +445,6 @@ class Migrations extends Action
                 $destination
             );
 
-            $aggregatedResources = [];
             /** Start Transfer */
             if (empty($source->getErrors())) {
                 $migration->setAttribute('stage', 'migrating');

src/Appwrite/Platform/Workers/StatsResources.php

@@ -208,7 +208,7 @@ class StatsResources extends Action
     {
         $totalFiles = 0;
         $totalStorage = 0;
-        $this->foreachDocument($dbForProject, 'buckets', [], function ($bucket) use ($dbForProject, $dbForLogs, $region, &$totalFiles, &$totalStorage) {
+        $this->foreachDocument($dbForProject, 'buckets', [], function ($bucket) use ($dbForProject, $region, &$totalFiles, &$totalStorage) {
             try {
                 $files = $dbForProject->count('bucket_' . $bucket->getSequence());
             } catch (Throwable $th) {

src/Appwrite/Platform/Workers/StatsUsage.php

@@ -140,7 +140,7 @@ class StatsUsage extends Action
 
     /**
      * @param Message $message
-     * @param callable(): Database $getProjectDB
+     * @param callable(Document): Database $getProjectDB
      * @param callable(): Database $getLogsDB
      * @param Registry $register
      * @return void
@@ -212,7 +212,7 @@ class StatsUsage extends Action
     * @param Document $project
     * @param Document $document
     * @param array $metrics
-    * @param  callable(): Database $getProjectDB
+    * @param  callable(Document): Database $getProjectDB
     * @param string $databaseType Database type from context
     * @return void
     */
@@ -394,7 +394,7 @@ class StatsUsage extends Action
 
     /**
      * Commit stats to DB
-     * @param callable(): Database $getProjectDB
+     * @param callable(Document): Database $getProjectDB
      * @return void
      */
     public function commitToDb(callable $getProjectDB): void
@@ -459,7 +459,7 @@ class StatsUsage extends Action
                 /**
                  * Sort by unique index key reduce locks/deadlocks
                  */
-                usort($projectStats['stats'], function ($a, $b) use ($sequence) {
+                usort($projectStats['stats'], function ($a, $b) {
                     // Metric DESC
                     $cmp = strcmp($b['metric'], $a['metric']);
                     if ($cmp !== 0) {

src/Appwrite/Platform/Workers/Webhooks.php

@@ -233,7 +233,7 @@ class Webhooks extends Action
         $template->setParam('{{webhook}}', $webhook->getAttribute('name'));
         $template->setParam('{{project}}', $project->getAttribute('name'));
         $template->setParam('{{url}}', $webhook->getAttribute('url'));
-        $template->setParam('{{error}}', $curlError ??  'The server returned ' . $statusCode . ' status code');
+        $template->setParam('{{error}}', 'The server returned ' . $statusCode . ' status code');
         $template->setParam('{{path}}', "/console/project-$region-$projectId/settings/webhooks/$webhookId");
         $template->setParam('{{attempts}}', $attempts);
 

src/Appwrite/Promises/Promise.php

@@ -2,6 +2,7 @@
 
 namespace Appwrite\Promises;
 
+/** @phpstan-consistent-constructor */
 abstract class Promise
 {
     protected const STATE_PENDING = 1;

src/Appwrite/SDK/Method.php

@@ -197,7 +197,7 @@ class Method
 
     public function isHidden(): bool|array
     {
-        return $this->hide ?? false;
+        return $this->hide;
     }
 
     public function isPackaging(): bool

src/Appwrite/SDK/Specification/Format.php

@@ -210,6 +210,25 @@ abstract class Format
         return $this->services;
     }
 
+    protected function getDescriptionContents(?string $description): string
+    {
+        if ($description === null || $description === '') {
+            return '';
+        }
+
+        if (!\str_ends_with($description, '.md')) {
+            return $description;
+        }
+
+        $contents = @\file_get_contents($description);
+
+        if ($contents === false) {
+            throw new \RuntimeException('Documentation file not found or unreadable: ' . $description);
+        }
+
+        return $contents;
+    }
+
     protected function getRequestEnumName(string $service, string $method, string $param): ?string
     {
         /* `$service` is `$namespace` */

src/Appwrite/SDK/Specification/Format/OpenAPI3.php

@@ -125,10 +125,7 @@ class OpenAPI3 extends Format
 
             $namespace = $sdk->getNamespace() ?? 'default';
 
-            if ($desc === null) {
-                $desc = '';
-            }
-            $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+            $descContents = $this->getDescriptionContents($desc);
 
             $temp = [
                 'summary' => $route->getDesc(),
@@ -193,7 +190,7 @@ class OpenAPI3 extends Format
                         'parameters' => [],
                         'required' => [],
                         'responses' => [],
-                        'description' => ($desc) ? \file_get_contents($desc) : '',
+                        'description' => $this->getDescriptionContents($desc),
                         'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
                         'public' => $methodObj->isPublic(),
                     ];

src/Appwrite/SDK/Specification/Format/Swagger2.php

@@ -126,10 +126,7 @@ class Swagger2 extends Format
             $sdkPlatforms = array_values(array_unique($sdkPlatforms));
             $namespace = $sdk->getNamespace() ?? 'default';
 
-            if ($desc === null) {
-                $desc = '';
-            }
-            $descContents = \str_ends_with($desc, '.md') ? \file_get_contents($desc) : $desc;
+            $descContents = $this->getDescriptionContents($desc);
 
             $temp = [
                 'summary' => $route->getDesc(),
@@ -201,7 +198,7 @@ class Swagger2 extends Format
                         'parameters' => [],
                         'required' => [],
                         'responses' => [],
-                        'description' => ($desc) ? \file_get_contents($desc) : '',
+                        'description' => $this->getDescriptionContents($desc),
                         'demo' => \strtolower($namespace) . '/' . Template::fromCamelCaseToDash($methodObj->getMethodName()) . '.md',
                         'public' => $methodObj->isPublic(),
                     ];

src/Appwrite/Utopia/Database/Documents/User.php

@@ -86,7 +86,6 @@ class User extends Document
     /**
      * Check if user is anonymous.
      *
-     * @param Document $this
      * @return bool
      */
     public function isAnonymous(): bool
@@ -153,7 +152,6 @@ class User extends Document
     /**
      * Verify session and check that its not expired.
      *
-     * @param array<Document> $sessions
      * @param string $secret
      *
      * @return bool|string

src/Appwrite/Utopia/Request.php

@@ -17,7 +17,7 @@ class Request extends UtopiaRequest
      * @var array<Filter>
      */
     private array $filters = [];
-    private static ?Route $route = null;
+    private ?Route $route = null;
 
     public function __construct(SwooleRequest $request)
     {
@@ -34,11 +34,11 @@ class Request extends UtopiaRequest
     {
         $parameters = parent::getParams();
 
-        if (!$this->hasFilters() || !self::hasRoute()) {
+        if (!$this->hasFilters() || !$this->hasRoute()) {
             return $parameters;
         }
 
-        $methods = self::getRoute()->getLabel('sdk', null);
+        $methods = $this->getRoute()?->getLabel('sdk', null);
 
         if (empty($methods)) {
             return $parameters;
@@ -131,9 +131,9 @@ class Request extends UtopiaRequest
      *
      * @return void
      */
-    public static function setRoute(?Route $route): void
+    public function setRoute(?Route $route): void
     {
-        self::$route = $route;
+        $this->route = $route;
     }
 
     /**
@@ -141,9 +141,9 @@ class Request extends UtopiaRequest
      *
      * @return Route|null
      */
-    public static function getRoute(): ?Route
+    public function getRoute(): ?Route
     {
-        return self::$route;
+        return $this->route;
     }
 
     /**
@@ -151,9 +151,9 @@ class Request extends UtopiaRequest
      *
      * @return bool
      */
-    public static function hasRoute(): bool
+    public function hasRoute(): bool
     {
-        return self::$route !== null;
+        return $this->route !== null;
     }
 
     /**

src/Appwrite/Utopia/Response.php

@@ -299,7 +299,7 @@ class Response extends SwooleResponse
     /**
      * @var bool
      */
-    protected static bool $showSensitive = false;
+    protected bool $showSensitive = false;
 
     /**
      * @var array<string, Model>
@@ -509,7 +509,7 @@ class Response extends SwooleResponse
                 $isPrivilegedUser = $user->isPrivileged($roles);
                 $isAppUser = $user->isApp($roles);
 
-                if ((!$isPrivilegedUser && !$isAppUser) && !self::$showSensitive) {
+                if ((!$isPrivilegedUser && !$isAppUser) && !$this->showSensitive) {
                     $data->setAttribute($key, '');
                 }
             }
@@ -659,18 +659,20 @@ class Response extends SwooleResponse
     }
 
     /**
-     * Static wrapper to show sensitive data in response
+     * Wrapper to show sensitive data in response
      *
      * @param callable(): array $callback The callback to show sensitive information for
      * @return array
      */
-    public static function showSensitive(callable $callback): array
+    public function showSensitive(callable $callback): array
     {
+        $previous = $this->showSensitive;
+
         try {
-            self::$showSensitive = true;
+            $this->showSensitive = true;
             return $callback();
         } finally {
-            self::$showSensitive = false;
+            $this->showSensitive = $previous;
         }
     }
 

src/Appwrite/Utopia/Response/Model/Project.php

@@ -137,6 +137,24 @@ class Project extends Model
                 'default' => false,
                 'example' => true,
             ])
+            ->addRule('authDisposableEmails', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Whether or not to disallow disposable email addresses during signup and email updates.',
+                'default' => false,
+                'example' => true,
+            ])
+            ->addRule('authCanonicalEmails', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Whether or not to require canonical email addresses during signup and email updates.',
+                'default' => false,
+                'example' => true,
+            ])
+            ->addRule('authFreeEmails', [
+                'type' => self::TYPE_BOOLEAN,
+                'description' => 'Whether or not to disallow free email addresses during signup and email updates.',
+                'default' => false,
+                'example' => true,
+            ])
             ->addRule('authMockNumbers', [
                 'type' => Response::MODEL_MOCK_NUMBER,
                 'description' => 'An array of mock numbers and their corresponding verification codes (OTPs).',
@@ -415,6 +433,9 @@ class Project extends Model
         $document->setAttribute('authPasswordHistory', $authValues['passwordHistory'] ?? 0);
         $document->setAttribute('authPasswordDictionary', $authValues['passwordDictionary'] ?? false);
         $document->setAttribute('authPersonalDataCheck', $authValues['personalDataCheck'] ?? false);
+        $document->setAttribute('authDisposableEmails', $authValues['disposableEmails'] ?? false);
+        $document->setAttribute('authCanonicalEmails', $authValues['canonicalEmails'] ?? false);
+        $document->setAttribute('authFreeEmails', $authValues['freeEmails'] ?? false);
         $document->setAttribute('authMockNumbers', $authValues['mockNumbers'] ?? []);
         $document->setAttribute('authSessionAlerts', $authValues['sessionAlerts'] ?? false);
         $document->setAttribute('authMembershipsUserName', $authValues['membershipsUserName'] ?? true);

tests/e2e/Services/Functions/FunctionsBase.php

@@ -100,6 +100,24 @@ trait FunctionsBase
                     'x-appwrite-key' => $this->getProject()['apiKey'],
                 ]));
                 $this->assertNotEquals(401, $function['headers']['status-code'], 'Auth failed while polling function activation');
+
+                if (
+                    ($function['body']['deploymentId'] ?? '') !== $deploymentId
+                    && ($function['body']['latestDeploymentId'] ?? '') === $deploymentId
+                    && ($function['body']['latestDeploymentStatus'] ?? '') === 'ready'
+                ) {
+                    $activation = $this->updateFunctionDeployment($functionId, $deploymentId);
+                    $this->assertContains(
+                        $activation['headers']['status-code'],
+                        [200, 409],
+                        'Deployment activation request failed: ' . json_encode($activation['body'], JSON_PRETTY_PRINT)
+                    );
+
+                    if ($activation['headers']['status-code'] === 200) {
+                        $function = $activation;
+                    }
+                }
+
                 $this->assertEquals($deploymentId, $function['body']['deploymentId'] ?? '', 'Deployment is not activated, deployment: ' . json_encode($function['body'], JSON_PRETTY_PRINT));
             }, 120000, 500);
         }

tests/e2e/Services/GraphQL/Legacy/AbuseTest.php

@@ -102,7 +102,7 @@ class AbuseTest extends Scope
         $maxQueries = System::getEnv('_APP_GRAPHQL_MAX_QUERIES', 10);
 
         $query = [];
-        for ($i = 0; $i <= $maxQueries + 1; $i++) {
+        for ($i = 0; $i <= ((int) $maxQueries) + 1; $i++) {
             $query[] = ['query' => $this->getQuery(self::LIST_COUNTRIES)];
         }
 

tests/e2e/Services/GraphQL/TablesDB/AbuseTest.php

@@ -102,7 +102,7 @@ class AbuseTest extends Scope
         $maxQueries = System::getEnv('_APP_GRAPHQL_MAX_QUERIES', 10);
 
         $query = [];
-        for ($i = 0; $i <= $maxQueries + 1; $i++) {
+        for ($i = 0; $i <= ((int) $maxQueries) + 1; $i++) {
             $query[] = ['query' => $this->getQuery(self::LIST_COUNTRIES)];
         }
 

tests/e2e/Services/Projects/ProjectsConsoleClientTest.php

@@ -62,6 +62,9 @@ class ProjectsConsoleClientTest extends Scope
         $this->assertArrayHasKey('platforms', $response['body']);
         $this->assertArrayHasKey('webhooks', $response['body']);
         $this->assertArrayHasKey('keys', $response['body']);
+        $this->assertEquals(false, $response['body']['authDisposableEmails']);
+        $this->assertEquals(false, $response['body']['authCanonicalEmails']);
+        $this->assertEquals(false, $response['body']['authFreeEmails']);
 
         $response = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
             'content-type' => 'application/json',

tests/unit/Event/EventTest.php

@@ -5,7 +5,6 @@ namespace Tests\Unit\Event;
 use Appwrite\Event\Event;
 use InvalidArgumentException;
 use PHPUnit\Framework\TestCase;
-use Utopia\Queue\Publisher;
 
 require_once __DIR__ . '/../../../app/init.php';
 
@@ -13,7 +12,7 @@ class EventTest extends TestCase
 {
     protected ?Event $object = null;
     protected string $queue = '';
-    protected Publisher $publisher;
+    protected MockPublisher $publisher;
 
     public function setUp(): void
     {

tests/unit/Functions/Validator/HeadersTest.php

@@ -76,11 +76,6 @@ class HeadersTest extends TestCase
         ];
         $this->assertFalse($this->object->isValid($headers));
 
-        $headers = [
-            null => 'value',
-        ];
-        $this->assertFalse($this->object->isValid($headers));
-
         $headers = [
             'X-Header' => null,
         ];

tests/unit/Utopia/RequestTest.php

@@ -147,6 +147,21 @@ class RequestTest extends TestCase
         $this->assertSame('unexpected', $params['extra']);
     }
 
+    public function testRouteIsScopedToRequestInstance(): void
+    {
+        $firstRequest = new Request(new SwooleRequest());
+        $secondRequest = new Request(new SwooleRequest());
+
+        $firstRoute = new Route(Request::METHOD_GET, '/first');
+        $secondRoute = new Route(Request::METHOD_GET, '/second');
+
+        $firstRequest->setRoute($firstRoute);
+        $secondRequest->setRoute($secondRoute);
+
+        $this->assertSame($firstRoute, $firstRequest->getRoute());
+        $this->assertSame($secondRoute, $secondRequest->getRoute());
+    }
+
     /**
      * Helper to attach a route with multiple SDK methods to the request.
      */

tests/unit/Utopia/ResponseTest.php

@@ -5,6 +5,7 @@ namespace Tests\Unit\Utopia;
 use Appwrite\Utopia\Response;
 use Exception;
 use PHPUnit\Framework\TestCase;
+use ReflectionProperty;
 use Swoole\Http\Response as SwooleResponse;
 use Tests\Unit\Utopia\Response\Filters\First;
 use Tests\Unit\Utopia\Response\Filters\Second;
@@ -176,4 +177,26 @@ class ResponseTest extends TestCase
         $this->assertArrayHasKey('required', $single);
         $this->assertArrayNotHasKey('hidden', $singleFromArray);
     }
+
+    public function testShowSensitiveRestoresPreviousState(): void
+    {
+        $isShowingSensitive = new ReflectionProperty(Response::class, 'showSensitive');
+
+        $this->assertFalse($isShowingSensitive->getValue($this->response));
+
+        $payload = $this->response->showSensitive(function () use ($isShowingSensitive) {
+            return [
+                'outer' => $isShowingSensitive->getValue($this->response),
+                'inner' => $this->response->showSensitive(fn () => [
+                    'state' => $isShowingSensitive->getValue($this->response),
+                ]),
+                'afterInner' => $isShowingSensitive->getValue($this->response),
+            ];
+        });
+
+        $this->assertTrue($payload['outer']);
+        $this->assertTrue($payload['inner']['state']);
+        $this->assertTrue($payload['afterInner']);
+        $this->assertFalse($isShowingSensitive->getValue($this->response));
+    }
 }