Generate updated specs

Handle generating request model specs
Add model on tablesdb
2026-05-26 13:51:13 +00:00 · 2025-12-09 00:36:35 +13:00 · 2025-12-09 00:30:53 +13:00 · 2025-12-09 00:26:27 +13:00 · 2025-12-08 23:47:46 +13:00 · 2025-12-08 23:47:30 +13:00
656 changed files with 9969 additions and 19170 deletions
@@ -21,13 +21,13 @@ _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPTIONS_ROUTER_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
-_APP_DNS=172.16.238.100 # CoreDNS
-_APP_DOMAIN=appwrite.test
+_APP_DNS=8.8.8.8
+_APP_DOMAIN=traefik
 _APP_CONSOLE_DOMAIN=localhost
 _APP_DOMAIN_FUNCTIONS=functions.localhost
 _APP_DOMAIN_SITES=sites.localhost
-_APP_DOMAIN_TARGET_CNAME=cname.localhost
-_APP_DOMAIN_TARGET_A=203.0.0.1
+_APP_DOMAIN_TARGET_CNAME=test.localhost
+_APP_DOMAIN_TARGET_A=127.0.0.1
 _APP_DOMAIN_TARGET_AAAA=::1
 _APP_DOMAIN_TARGET_CAA=digicert.com
 _APP_RULES_FORMAT=md5
@@ -124,5 +124,4 @@ _APP_MESSAGE_PUSH_TEST_DSN=
 _APP_WEBHOOK_MAX_FAILED_ATTEMPTS=10
 _APP_PROJECT_REGIONS=default
 _APP_FUNCTIONS_CREATION_ABUSE_LIMIT=5000
-_APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main
-_APP_TRUSTED_HEADERS=x-forwarded-for
+_APP_STATS_USAGE_DUAL_WRITING_DBS=database_db_main
@@ -8,68 +8,41 @@ on:

 permissions: read-all

-# Add stricter error-detection patterns so issue text doesn't trigger agent error detection.
-# After merging this file run `gh aw compile` to regenerate the lock file.
-env:
-  GH_AW_ERROR_PATTERNS: >-
-    [
-      {"id":"gh-action-error","pattern":"^::(error)(?:\\\\s+[^:]*)?::(.+)","level_group":1,"message_group":2,"description":"GitHub Actions workflow command - error"},
-      {"id":"gh-action-warning","pattern":"^::(warning)(?:\\\\s+[^:]*)?::(.+)","level_group":1,"message_group":2,"description":"GitHub Actions workflow command - warning"},
-      {"id":"bracketed-level","pattern":"^\\[(ERROR|CRITICAL|WARNING|WARN)\\]\\s+(.+)","level_group":1,"message_group":2,"description":"Bracketed log level at start of line"},
-      {"id":"timestamped-copilot","pattern":"^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z\\s+\\[(ERROR|WARN|WARNING|CRITICAL)\\]\\s+(.+)","level_group":1,"message_group":3,"description":"Timestamped Copilot CLI messages"}
-    ]
-
 network: defaults

 safe-outputs:
  add-labels:
-    max: 100
-    target: "*"
+    max: 5
  add-comment:
-    max: 10
-    target: "*"

 tools:
  web-fetch:
  web-search:
-  github:
-    toolsets:
-      - default
-      - labels

-timeout-minutes: 10
+timeout_minutes: 10
 source: githubnext/agentics/workflows/issue-triage.md@0837fb7b24c3b84ee77fb7c8cfa8735c48be347a
 ---
 # Agentic Triage

 <!-- Note - this file can be customized to your needs. Replace this section directly, or add further instructions here. After editing run 'gh aw compile' -->

-You're a triage assistant for GitHub issues. Your task is to analyze issues that were either created in the last 24 hours or updated (with a new comment) in the last 24 hours, and perform initial triage tasks for each of them.
+You're a triage assistant for GitHub issues. Your task is to analyze issues created in the last 24 hours and perform initial triage tasks for each of them.

-1. First, use the `list_issues` tool to retrieve all issues created or updated in the last 24 hours. The `since` parameter filters by the issue's `updated_at` timestamp, which includes both newly created issues and recently commented issues. Calculate the timestamp from 24 hours ago (example: 2025-11-06T20:27:14Z for reference) and use it for the `since` parameter.
+1. First, use the `list_issues` tool to retrieve all issues created in the last 24 hours. Filter issues by using the `since` parameter with a timestamp from 24 hours ago (calculate: current time minus 24 hours in ISO 8601 format).

 2. For each issue found, perform the following triage tasks:

-3. Use the `get_comments` tool to retrieve all the comments on the issue.
+3. Select appropriate labels for the issue from the provided list.

-4. Check for spam and quality issue descriptions and comments first:
-   
-   - **Non-English Content**: If the issue is primarily written in a non-English language, add a respectful and appreciative comment explaining that while you appreciate their contribution, the majority of the community communicates in English and kindly ask them to repost in English so everyone can follow along and help. Provide a friendly translation of your message in their language if possible.
-   - **Multiple Topics**: If the issue discusses multiple unrelated topics or problems, add a comment explaining that each issue should focus on one clear topic so the team can effectively solve the right problem. Politely ask them to split it into separate issues.
-   - **Obvious Spam or Bot-Generated Content**: If the issue/comment is obviously spam, generated by a bot, or something that is not an actual issue to be worked on, add an issue comment with a one-sentence analysis and move to the next issue.
+4. Retrieve the issue content using the `get_issue` tool. If the issue is obviously spam, or generated by bot, or something else that is not an actual issue to be worked on, then add an issue comment to the issue with a one sentence analysis and move to the next issue.

-5. Retrieve the issue content using the `get_issue` tool for any issues that pass the spam checks.
+5. Next, use the GitHub tools to gather additional context about the issue:

-6. Next, use the GitHub tools to gather additional context about the issue:
+   - Fetch the list of labels available in this repository. Use 'gh label list' bash command to fetch the labels. This will give you the labels you can use for triaging issues.
+   - Fetch any comments on the issue using the `get_issue_comments` tool
+   - **Search for duplicate and related issues**: Use the `search_issues` tool to find similar issues by searching for key terms from the issue title and description. Look for both open and closed issues that might be related or duplicates.

-   - Fetch the list of labels available in this repository using the `list_label` tool with `owner: "appwrite"` and `repo: "appwrite"` parameters. This will give you the labels you can use for triaging issues.
-   - Fetch any comments on the issue using the `get_issue_comments` tool to understand recent activity
-   - **Search for duplicate and related issues (repo first, then org-wide)**:
-     - First search in this repository using the `search_issues` tool with a query like: `repo:appwrite/appwrite is:issue (is:open OR is:closed) <key terms>`.
-     - Then perform an org-wide search across the entire Appwrite organization using: `org:appwrite is:issue (is:open OR is:closed) <key terms>`.
-     - Prefer linking to OPEN issues when identifying potential duplicates; include CLOSED ones as related history when useful.
-
-7. Analyze the issue content, considering:
+6. Analyze the issue content, considering:

   - The issue title and description
   - The type of issue (bug report, feature request, question, etc.)
@@ -78,38 +51,35 @@ You're a triage assistant for GitHub issues. Your task is to analyze issues that
   - User impact
   - Components affected

-8. Write notes, ideas, nudges, resource links, debugging strategies and/or reproduction steps for the team to consider relevant to the issue.
+7. Write notes, ideas, nudges, resource links, debugging strategies and/or reproduction steps for the team to consider relevant to the issue.

-9. Select appropriate labels from the available labels list:
+8. Select appropriate labels from the available labels list provided above:

   - Choose labels that accurately reflect the issue's nature
   - Be specific but comprehensive
   - Select priority labels if you can determine urgency (high-priority, med-priority, or low-priority)
   - Consider platform labels (android, ios) if applicable
-   - Search for similar issues. If you find a duplicate of another OPEN issue in THIS repository, you may use a "duplicate" label (if available) and reference the canonical issue.
-   - If the closest match is in another repository within the Appwrite org, do NOT mark as duplicate here; instead, link it in your comment under a "Cross‑repo related issues" section.
-   - Only select labels from the provided list
-   - Don't apply the `good first issue` or `help wanted` labels
+   - Search for similar issues, and if you find similar issues consider using a "duplicate" label if appropriate. Only do so if the issue is a duplicate of another OPEN issue.
+   - Only select labels from the provided list above
   - It's okay to not add any labels if none are clearly applicable

-10. Apply the selected labels:
+9. Apply the selected labels:

   - Use the `update_issue` tool to apply the labels to the issue
   - DO NOT communicate directly with users
   - If no labels are clearly applicable, do not apply any labels

-11. Add an issue comment to the issue with your analysis:
+10. Add an issue comment to the issue with your analysis:
   - Start with "🎯 Agentic Issue Triage"
   - Provide a brief summary of the issue
-   - **If duplicate or related issues were found**, add sections listing them with links:
-     - "### 🔗 Potentially Related Issues (this repo)" – bullet list of same-repo issues with titles and links
-     - If applicable: "### 🌐 Cross-repo related issues (org: appwrite)" – bullet list including `owner/repo#number` with titles and links
+   - **If duplicate or related issues were found**, add a section listing them with links (e.g., "### 🔗 Potentially Related Issues" followed by a bullet list of related issues with their titles and links)
   - Mention any relevant details that might help the team understand the issue better
   - Include any debugging strategies or reproduction steps if applicable
   - Suggest resources or links that might be helpful for resolving the issue or learning skills related to the issue or the particular area of the codebase affected by it
   - Mention any nudges or ideas that could help the team in addressing the issue
-   - If appropriate break the issue down to sub-tasks and write a checklist of things to do
-   - Use collapsed-by-default sections in the GitHub markdown to keep the comment tidy. Collapse all sections except the short main summary at the top. For bolded section titles, wrap the text with `<strong>` and `</strong>` to make it bold.
-   - Do not indicate/encourage a community member to submit a PR for the issue.
+   - If you have possible reproduction steps, include them in the comment
+   - If you have any debugging strategies, include them in the comment
+   - If appropriate break the issue down to sub-tasks and write a checklist of things to do.
+   - Use collapsed-by-default sections in the GitHub markdown to keep the comment tidy. Collapse all sections except the short main summary at the top.

-12. After processing all issues, provide a summary of how many issues were triaged (created or updated in the last 24 hours). If no issues matched the criteria, simply note that no issues needed triage.
+11. After processing all issues, provide a summary of how many issues were triaged. If no issues were created in the last 24 hours, simply note that no new issues needed triage.
@@ -42,7 +42,6 @@ jobs:
      with:
        context: .
        platforms: linux/amd64,linux/arm64
-        target: production
        build-args: |
          VERSION=${{ steps.meta.outputs.version }}
          VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
@@ -20,10 +20,10 @@ jobs:
        submodules: recursive

    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v3
+      uses: docker/setup-qemu-action@v2

    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v3
+      uses: docker/setup-buildx-action@v2

    - name: Login to Docker Hub
      uses: docker/login-action@v2
@@ -46,7 +46,6 @@ jobs:
      with:
        context: .
        platforms: linux/amd64,linux/arm64
-        target: production
        build-args: |
          VERSION=${{ steps.meta.outputs.version }}
        push: true
@@ -111,7 +111,7 @@ $ git push origin [name_of_your_new_branch]

 ## Setup From Source

-To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and run the docker-compose stack.
+To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and create run the docker-compose stack.

 > If you just want to install Appwrite for day-to-day use and not as a contributor, you can reference the [installation guide](https://github.com/appwrite/appwrite#installation), the [getting started guide](https://appwrite.io/docs/quick-starts), or the main [README](README.md) file.

@@ -173,12 +173,12 @@ Learn more at our [Technology Stack](#technology-stack) section.
 - [MVVM](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel) - Appwrite console architecture

 ##### Container Namespace Conventions
-To keep our services easy to understand within Docker we follow a naming convention for all our containers depending on its intended use.
+To keep our services easy to understand within Docker we follow a naming convention for all our containers depending on it's intended use.

 `appwrite-worker-X` - Workers (`src/Appwrite/Platform/Workers/*`)
 `appwrite-task-X` - Tasks (`src/Appwrite/Platform/Tasks/*`)

-Other containers should be named the same as their service, for example `redis` should just be called `redis`.
+Other containes should be named the same as their service, for example `redis` should just be called `redis`.

 ##### Security

@@ -189,7 +189,7 @@ Other containers should be named the same as their service, for example `redis`

 ## Modules

-As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesn't contain all product's features such as workers or tasks. While there might still be some occurrences of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
+As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesnt contain all product's features such as workers or tasks. While there might still be some occurances of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.

 ### HTTP Endpoints

@@ -204,7 +204,7 @@ Tips and tricks:
 1. If endpoint doesn't have resource, use service name as resource name too
 > Example: `Modules/Sites/Http/Sites/Get.php`

-2. If there are multiple resources, use them all in folder structure
+2. If there are multiple resources, use then all in folder structure
 > Example: `Modules/Sites/Http/Deployments/Builds/Create.php`

 3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
@@ -222,73 +222,51 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 ```bash
 .
 ├── app # Main application
-│   ├── assets
-│   │   ├── dbip
-│   │   ├── fonts
-│   │   └── security
 │   ├── config # Config files
-│   │   ├── avatars
-│   │   ├── collections
-│   │   ├── locale
-│   │   ├── specs
-│   │   ├── storage
-│   │   └── templates
 │   ├── controllers # API & dashboard controllers
 │   │   ├── api
 │   │   ├── shared
 │   │   └── web
-│   ├── init # DB schemas
-│   │   └── database
-│   └── views # HTML server-side templates
-│       ├── general
-│       └── install
+│   ├── db # DB schemas
+│   ├── sdks # SDKs generated copies (used for generating code examples)
+│   ├── tasks # Server CLI commands
+│   ├── views # HTML server-side templates
+│   └── workers # Background workers
 ├── bin # Server executables (tasks & workers)
-├── dev # Debugger config
+├── docker # Docker related resources and configs
 ├── docs # Docs and tutorials
 │   ├── examples
-│   ├── lists
 │   ├── references
-│   ├── sdks
 │   ├── services
 │   ├── specs
 │   └── tutorials
 ├── public # Public files
+│   ├── dist
 │   ├── fonts
 │   ├── images
-│   ├── sdk-console
-│   ├── sdk-project
-│   └── sdk-web
-├── src # Supporting libraries (each lib has one role, common libs are released as
-│   ├── Appwrite
-│   │   ├── Auth
-│   │   ├── Certificates
-│   │   ├── Deletes
-│   │   ├── Detector
-│   │   ├── Docker
-│   │   ├── Event
-│   │   ├── Extend
-│   │   ├── Functions/Validator
-│   │   ├── GraphQL
-│   │   ├── Hooks
-│   │   ├── Messaging
-│   │   ├── Migration
-│   │   ├── Network
-│   │   ├── OpenSSL
-│   │   ├── Platform
-│   │   ├── Promises
-│   │   ├── PubSub
-│   │   ├── SDK
-│   │   ├── Task/Validator
-│   │   ├── Template
-│   │   ├── Transformation
-│   │   ├── URL
-│   │   ├── Utopia
-│   │   └── Vcs
-│   └── Executor
+│   ├── scripts
+│   └── styles
+├── src # Supporting libraries (each lib has one role, common libs are released as individual projects)
+│   └── Appwrite
+│       ├── Auth
+│       ├── Detector
+│       ├── Docker
+|       ├── DSN
+│       ├── Event
+│       ├── Extend
+│       ├── GraphQL
+│       ├── Messaging
+│       ├── Migration
+│       ├── Network
+│       ├── OpenSSL
+│       ├── Promises
+│       ├── Specification
+│       ├── Task
+│       ├── Template
+│       ├── URL
+│       └── Utopia
 └── tests # End to end & unit tests
-    ├── benchmarks
    ├── e2e
-    ├── extensions
    ├── resources
    └── unit
 ```
@@ -417,7 +395,7 @@ These are the current metrics we collect usage stats for:

 > Note: The curly brackets in the metric name represents a template and is replaced with a value when the metric is processed.

-Metrics are collected within 3 scopes Daily, monthly, and infinity. Adding new usage metric in order to aggregate usage stats is very simple, but very much dependent on where do you want to collect
+Metrics are collected within 3 scopes Daily, monthly, an infinity. Adding new usage metric in order to aggregate usage stats is very simple, but very much dependent on where do you want to collect
 statistics ,via API or via background worker. For both cases you will need to add a `const` variable in `app/init.php` under the usage metrics list using the naming convention `METRIC_<RESOURCE_NAME>` as shown below.

 ```php
@@ -683,7 +661,7 @@ docker compose exec redis redis-cli FLUSHALL

 ## Using preview domains locally

-Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud workspaces such as Gitpod or GitHub Codespaces.
+Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud woekspaces such as Gitpod or GitHub Codespaces.

 To use preview domains on Cloud workspaces, you can visit hostname provided by them, and supply function's preview domain as URL parameter:

@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
    --no-plugins --no-scripts --prefer-dist \
    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`

-FROM appwrite/base:0.10.6 AS base
+FROM appwrite/base:0.10.5 AS final

 LABEL maintainer="team@appwrite.io"

@@ -36,7 +36,9 @@ COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
 COPY ./app /usr/src/code/app
 COPY ./public /usr/src/code/public
 COPY ./bin /usr/local/bin
+COPY ./docs /usr/src/code/docs
 COPY ./src /usr/src/code/src
+COPY ./dev /usr/src/code/dev

 # Set Volumes
 RUN mkdir -p /storage/uploads && \
@@ -88,30 +90,15 @@ RUN chmod +x /usr/local/bin/doctor && \
    chmod +x /usr/local/bin/stats-resources && \
    chmod +x /usr/local/bin/worker-stats-resources

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

-FROM base AS production
-
-RUN rm -rf /usr/src/code/app/config/specs && \
-    rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20240924/xdebug.so && \
-    find /usr -name '*.a' -delete 2>/dev/null || true && \
-    find /usr -type d -name '__pycache__' -exec rm -rf {} + 2>/dev/null || true && \
-    find /usr -name '*.pyc' -delete 2>/dev/null || true
-
-EXPOSE 80
-
-CMD [ "php", "app/http.php" ]
-
-FROM base AS development
-
-COPY ./docs /usr/src/code/docs
-COPY ./dev /usr/src/code/dev
-
-RUN if [ "$DEBUG" = "true" ]; then \
-    cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini && \
-    mkdir -p /tmp/xdebug && \
-    apk add --update --no-cache openssh-client github-cli; \
-    fi
+# Enable Extensions
+RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
+RUN if [ "$DEBUG" = "true" ]; then mkdir -p /tmp/xdebug; fi
+RUN if [ "$DEBUG" = "true" ]; then apk add --update --no-cache openssh-client github-cli; fi
+RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
+RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xdebug.so; fi

 EXPOSE 80

@@ -2,7 +2,7 @@

 <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>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner with logo and slogan build like a team of hundreds""></a>
    <br />
    <br />
    <b>适用于[Flutter/Vue/Angular/React/iOS/Android/* 等等平台 *]的完整后端服务</b>
@@ -36,6 +36,7 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读

 内容：

+
 - [开始](#开始)
 - [安装](#安装)
  - [Unix](#unix)
@@ -56,8 +57,7 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读
 - [版权说明](#版权说明)

 ## 开始
-
-要轻松开始使用 Appwrite，您可以[**免费注册 Appwrite Cloud**](https://cloud.appwrite.io/)。在 Appwrite Cloud 公开测试版期间，您可以完全免费使用 Appwrite，而且我们不会收集您的信用卡信息。
+要轻松开始使用Appwrite，您可以[**免费注册Appwrite Cloud**](https://cloud.appwrite.io/)。在Appwrite Cloud公开测试版期间，您可以完全免费使用Appwrite，而且我们不会收集您的信用卡信息。

 ## 安装

@@ -119,16 +119,22 @@ docker run -it --rm `
          <br /><sub><b>DigitalOcean</b></sub></a>
        </a>
    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://gitpod.io/#https://github.com/appwrite/integration-for-gitpod">
+        <img width="50" height="39" src="public/images/integrations/gitpod-logo.svg" alt="Gitpod Logo" />
+          <br /><sub><b>Gitpod</b></sub></a>    
+      </a>
+    </td>
    <td align="center" width="100" height="100">
      <a href="https://www.linode.com/marketplace/apps/appwrite/appwrite/">
        <img width="50" height="39" src="public/images/integrations/akamai-logo.svg" alt="Akamai Logo" />
-          <br /><sub><b>Akamai Compute</b></sub></a>
+          <br /><sub><b>Akamai Compute</b></sub></a>    
      </a>
    </td>
    <td align="center" width="100" height="100">
      <a href="https://aws.amazon.com/marketplace/pp/prodview-2hiaeo2px4md6">
        <img width="50" height="39" src="public/images/integrations/aws-logo.svg" alt="AWS Logo" />
-          <br /><sub><b>AWS Marketplace</b></sub></a>
+          <br /><sub><b>AWS Marketplace</b></sub></a>    
      </a>
    </td>
  </tr>
@@ -182,28 +188,25 @@ docker run -it --rm `
 以下是当前支持的平台和语言列表。如果您想帮助我们为您选择的平台添加支持，您可以访问我们的 [SDK 生成器](https://github.com/appwrite/sdk-generator) 项目并查看我们的 [贡献指南](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md)。

 #### 客户端
-
- :white_check_mark: &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (由 Appwrite 团队维护)

 #### 服务器
-
- :white_check_mark: &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **公测** (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) - **公测** (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
- :white_check_mark: &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **公测** (由 Appwrite 团队维护)
+* :white_check_mark:  &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **公测** (由 Appwrite 团队维护)

 #### 开发者社区
-
- :white_check_mark: &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (维护者 [Michael Gangolf](https://github.com/m1ga/))
- :white_check_mark: &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (维护者 [fenix-hub @GodotNuts](https://github.com/fenix-hub))
+* :white_check_mark:  &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (维护者 [Michael Gangolf](https://github.com/m1ga/))  
+* :white_check_mark:  &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (维护者 [fenix-hub @GodotNuts](https://github.com/fenix-hub))  

 找不到需要的的 SDK？ - 欢迎通过发起 PR 来帮助我们完善 Appwrite 的软件生态环境 [SDK 生成器](https://github.com/appwrite/sdk-generator)!

@@ -6,10 +6,10 @@

 <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>
+    <a href="https://appwrite.io" target="_blank"><img src="./public/images/banner.png" alt="Appwrite banner, with logo and text saying "Build Like a Team of Hundreds"></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>
+    <b>Appwrite is an all-in-one development platform for Web, Mobile, and Flutter applications. Use built-in backend infrastructure and web hosting, all from a single place. Built with the open source community and optimized for developer experience in the coding languages you love.</b>
    <br />
    <br />
 </p>
@@ -32,6 +32,13 @@ Appwrite is an end-to-end platform for building Web, Mobile, Native, or Backend

 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).

+<p align="center">
+    <br />
+    <a href="https://www.producthunt.com/posts/appwrite-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-appwrite-2" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=360315&theme=light&period=daily" alt="Appwrite - 100&#0037;&#0032;open&#0032;source&#0032;alternative&#0032;for&#0032;Firebase | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+    <br />
+    <br />
+</p>
+
 ![Appwrite project dashboard showing various Appwrite features](public/images/github.png)

 Find out more at: [https://appwrite.io](https://appwrite.io).
@@ -122,6 +129,12 @@ Choose from one of the providers below:
          <br /><sub><b>DigitalOcean</b></sub></a>
        </a>
    </td>
+    <td align="center" width="100" height="100">
+      <a href="https://gitpod.io/#https://github.com/appwrite/integration-for-gitpod">
+        <img width="50" height="39" src="public/images/integrations/gitpod-logo.svg" alt="Gitpod Logo" />
+          <br /><sub><b>Gitpod</b></sub></a>
+      </a>
+    </td>
    <td align="center" width="100" height="100">
      <a href="https://www.linode.com/marketplace/apps/appwrite/appwrite/">
        <img width="50" height="39" src="public/images/integrations/akamai-logo.svg" alt="Akamai Logo" />
@@ -41,6 +41,8 @@ Config::setParam('runtimes', (new Runtimes('v5'))->getAll(supported: false));
 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';

+Authorization::disable();
+
 CLI::setResource('register', fn () => $register);

 CLI::setResource('cache', function ($pools) {
@@ -58,13 +60,7 @@ CLI::setResource('pools', function (Registry $register) {
    return $register->get('pools');
 }, ['register']);

-CLI::setResource('authorization', function () {
-    $authorization = new Authorization();
-    $authorization->disable();
-    return $authorization;
-}, []);
-
-CLI::setResource('dbForPlatform', function ($pools, $cache, $authorization) {
+CLI::setResource('dbForPlatform', function ($pools, $cache) {
    $sleep = 3;
    $maxAttempts = 5;
    $attempts = 0;
@@ -78,7 +74,6 @@ CLI::setResource('dbForPlatform', function ($pools, $cache, $authorization) {
            $dbForPlatform = new Database($adapter, $cache);

            $dbForPlatform
-                ->setAuthorization($authorization)
                ->setNamespace('_console')
                ->setMetadata('host', \gethostname())
                ->setMetadata('project', 'console');
@@ -104,7 +99,7 @@ CLI::setResource('dbForPlatform', function ($pools, $cache, $authorization) {
    }

    return $dbForPlatform;
-}, ['pools', 'cache', 'authorization']);
+}, ['pools', 'cache']);

 CLI::setResource('console', function () {
    return new Document(Config::getParam('console'));
@@ -115,10 +110,10 @@ CLI::setResource(
    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );

-CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, $authorization) {
+CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools

-    return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases) {
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
        if ($project->isEmpty() || $project->getId() === 'console') {
            return $dbForPlatform;
        }
@@ -151,7 +146,6 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

        $adapter = new DatabasePool($pools->get($dsn->getHost()));
        $database = new Database($adapter, $cache);
-
        $databases[$dsn->getHost()] = $database;
        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

@@ -168,18 +162,17 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
        }

        $database
-            ->setAuthorization($authorization)
            ->setMetadata('host', \gethostname())
            ->setMetadata('project', $project->getId());

        return $database;
    };
-}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+}, ['pools', 'dbForPlatform', 'cache']);

-CLI::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    $database = null;

-    return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
+    return function (?Document $project = null) use ($pools, $cache, $database) {
        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
            $database->setTenant((int)$project->getSequence());
            return $database;
@@ -189,7 +182,6 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio
        $database = new Database($adapter, $cache);

        $database
-            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
@@ -202,7 +194,7 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio

        return $database;
    };
-}, ['pools', 'cache', 'authorization']);
+}, ['pools', 'cache']);
 CLI::setResource('publisher', function (Group $pools) {
    return new BrokerPool(publisher: $pools->get('publisher'));
 }, ['pools']);
@@ -1317,17 +1317,6 @@ return [
                'array' => false,
                'filters' => [],
            ],
-            [
-                '$id' => ID::custom('logs'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 1000000,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
        ],
        'indexes' => [
            [
@@ -688,12 +688,12 @@ return [
    /** Databases */
    Exception::DATABASE_NOT_FOUND => [
        'name' => Exception::DATABASE_NOT_FOUND,
-        'description' => 'Database with the requested ID \'%s\' could not be found.',
+        'description' => 'Database not found',
        'code' => 404
    ],
    Exception::DATABASE_ALREADY_EXISTS => [
        'name' => Exception::DATABASE_ALREADY_EXISTS,
-        'description' => 'Database with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'Database already exists',
        'code' => 409
    ],
    Exception::DATABASE_TIMEOUT => [
@@ -710,41 +710,41 @@ return [
    /** Collections */
    Exception::COLLECTION_NOT_FOUND => [
        'name' => Exception::COLLECTION_NOT_FOUND,
-        'description' => 'Collection with the requested ID \'%s\' could not be found.',
+        'description' => 'Collection with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::COLLECTION_ALREADY_EXISTS => [
        'name' => Exception::COLLECTION_ALREADY_EXISTS,
-        'description' => 'A collection with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'A collection with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
        'code' => 409,
    ],
    Exception::COLLECTION_LIMIT_EXCEEDED => [
        'name' => Exception::COLLECTION_LIMIT_EXCEEDED,
-        'description' => 'The maximum number of collections for database \'%s\' has been reached.',
+        'description' => 'The maximum number of collections has been reached.',
        'code' => 400,
    ],

    /** Tables */
    Exception::TABLE_NOT_FOUND => [
        'name' => Exception::TABLE_NOT_FOUND,
-        'description' => 'Table with the requested ID \'%s\' could not be found.',
+        'description' => 'Table with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::TABLE_ALREADY_EXISTS => [
        'name' => Exception::TABLE_ALREADY_EXISTS,
-        'description' => 'A table with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'A table with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
        'code' => 409,
    ],
    Exception::TABLE_LIMIT_EXCEEDED => [
        'name' => Exception::TABLE_LIMIT_EXCEEDED,
-        'description' => 'The maximum number of tables for database \'%s\' has been reached.',
+        'description' => 'The maximum number of tables has been reached.',
        'code' => 400,
    ],

    /** Documents */
    Exception::DOCUMENT_NOT_FOUND => [
        'name' => Exception::DOCUMENT_NOT_FOUND,
-        'description' => 'Document with the requested ID \'%s\' could not be found.',
+        'description' => 'Document with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::DOCUMENT_INVALID_STRUCTURE => [
@@ -764,7 +764,7 @@ return [
    ],
    Exception::DOCUMENT_ALREADY_EXISTS => [
        'name' => Exception::DOCUMENT_ALREADY_EXISTS,
-        'description' => 'Document with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'Document with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
        'code' => 409,
    ],
    Exception::DOCUMENT_UPDATE_CONFLICT => [
@@ -781,7 +781,7 @@ return [
    /** Rows */
    Exception::ROW_NOT_FOUND => [
        'name' => Exception::ROW_NOT_FOUND,
-        'description' => 'Row with the requested ID \'%s\' could not be found.',
+        'description' => 'Row with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::ROW_INVALID_STRUCTURE => [
@@ -791,7 +791,7 @@ return [
    ],
    Exception::ROW_MISSING_DATA => [
        'name' => Exception::ROW_MISSING_DATA,
-        'description' => 'The row data is missing. Try again with row data populated.',
+        'description' => 'The row data is missing. Try again with row data populated',
        'code' => 400,
    ],
    Exception::ROW_MISSING_PAYLOAD => [
@@ -801,7 +801,7 @@ return [
    ],
    Exception::ROW_ALREADY_EXISTS => [
        'name' => Exception::ROW_ALREADY_EXISTS,
-        'description' => 'Row with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'Row with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
        'code' => 409,
    ],
    Exception::ROW_UPDATE_CONFLICT => [
@@ -818,17 +818,17 @@ return [
    /** Attributes */
    Exception::ATTRIBUTE_NOT_FOUND => [
        'name' => Exception::ATTRIBUTE_NOT_FOUND,
-        'description' => 'Attribute with the requested key \'%s\' could not be found.',
+        'description' => 'Attribute with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::ATTRIBUTE_UNKNOWN => [
        'name' => Exception::ATTRIBUTE_UNKNOWN,
-        'description' => 'The attribute \'%s\' required for the index could not be found. Please confirm all your attributes are in the available state.',
+        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the available state.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_NOT_AVAILABLE => [
        'name' => Exception::ATTRIBUTE_NOT_AVAILABLE,
-        'description' => 'The requested attribute \'%s\' is not yet available. Please try again later.',
+        'description' => 'The requested attribute is not yet available. Please try again later.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_FORMAT_UNSUPPORTED => [
@@ -843,12 +843,12 @@ return [
    ],
    Exception::ATTRIBUTE_ALREADY_EXISTS => [
        'name' => Exception::ATTRIBUTE_ALREADY_EXISTS,
-        'description' => 'Attribute with the requested key \'%s\' already exists. Attribute keys must be unique, try again with a different key.',
+        'description' => 'Attribute with the requested key already exists. Attribute keys must be unique, try again with a different key.',
        'code' => 409,
    ],
    Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
        'name' => Exception::ATTRIBUTE_LIMIT_EXCEEDED,
-        'description' => 'The maximum number or size of attributes for collection \'%s\' has been reached.',
+        'description' => 'The maximum number or size of attributes for this collection has been reached.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_VALUE_INVALID => [
@@ -858,7 +858,7 @@ return [
    ],
    Exception::ATTRIBUTE_TYPE_INVALID => [
        'name' => Exception::ATTRIBUTE_TYPE_INVALID,
-        'description' => 'The attribute \'%s\' type is invalid.',
+        'description' => 'The attribute type is invalid.',
        'code' => 400,
    ],
    Exception::ATTRIBUTE_INVALID_RESIZE => [
@@ -869,7 +869,7 @@ return [

    Exception::ATTRIBUTE_TYPE_NOT_SUPPORTED => [
        'name' => Exception::ATTRIBUTE_TYPE_NOT_SUPPORTED,
-        'description' => 'Attribute type \'%s\' is not supported.',
+        'description' => 'Attribute type is not supported.',
        'code' => 400,
    ],

@@ -883,17 +883,17 @@ return [
    /** Columns */
    Exception::COLUMN_NOT_FOUND => [
        'name' => Exception::COLUMN_NOT_FOUND,
-        'description' => 'Column with the requested key \'%s\' could not be found.',
+        'description' => 'Column with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::COLUMN_UNKNOWN => [
        'name' => Exception::COLUMN_UNKNOWN,
-        'description' => 'The column \'%s\' required for the index could not be found. Please confirm all your columns are in the available state.',
+        'description' => 'The column required for the index could not be found. Please confirm all your columns are in the available state.',
        'code' => 400,
    ],
    Exception::COLUMN_NOT_AVAILABLE => [
        'name' => Exception::COLUMN_NOT_AVAILABLE,
-        'description' => 'The requested column \'%s\' is not yet available. Please try again later.',
+        'description' => 'The requested column is not yet available. Please try again later.',
        'code' => 400,
    ],
    Exception::COLUMN_FORMAT_UNSUPPORTED => [
@@ -908,12 +908,12 @@ return [
    ],
    Exception::COLUMN_ALREADY_EXISTS => [
        'name' => Exception::COLUMN_ALREADY_EXISTS,
-        'description' => 'Column with the requested key \'%s\' already exists. Column keys must be unique, try again with a different key.',
+        'description' => 'Column with the requested key already exists. Column keys must be unique, try again with a different key.',
        'code' => 409,
    ],
    Exception::COLUMN_LIMIT_EXCEEDED => [
        'name' => Exception::COLUMN_LIMIT_EXCEEDED,
-        'description' => 'The maximum number or size of columns for table \'%s\' has been reached.',
+        'description' => 'The maximum number or size of columns for this table has been reached.',
        'code' => 400,
    ],
    Exception::COLUMN_VALUE_INVALID => [
@@ -923,7 +923,7 @@ return [
    ],
    Exception::COLUMN_TYPE_INVALID => [
        'name' => Exception::COLUMN_TYPE_INVALID,
-        'description' => 'The column \'%s\' type is invalid.',
+        'description' => 'The column type is invalid.',
        'code' => 400,
    ],
    Exception::COLUMN_INVALID_RESIZE => [
@@ -933,24 +933,24 @@ return [
    ],
    Exception::COLUMN_TYPE_NOT_SUPPORTED => [
        'name' => Exception::COLUMN_TYPE_NOT_SUPPORTED,
-        'description' => 'Column type \'%s\' is not supported.',
+        'description' => 'Column type is not supported.',
        'code' => 400,
    ],

    /** Indexes */
    Exception::INDEX_NOT_FOUND => [
        'name' => Exception::INDEX_NOT_FOUND,
-        'description' => 'Index with the requested key \'%s\' could not be found.',
+        'description' => 'Index with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::INDEX_LIMIT_EXCEEDED => [
        'name' => Exception::INDEX_LIMIT_EXCEEDED,
-        'description' => 'The maximum number of indexes for collection \'%s\' has been reached.',
+        'description' => 'The maximum number of indexes has been reached.',
        'code' => 400,
    ],
    Exception::INDEX_ALREADY_EXISTS => [
        'name' => Exception::INDEX_ALREADY_EXISTS,
-        'description' => 'Index with the requested key \'%s\' already exists. Try again with a different key.',
+        'description' => 'Index with the requested key already exists. Try again with a different key.',
        'code' => 409,
    ],
    Exception::INDEX_INVALID => [
@@ -960,24 +960,24 @@ return [
    ],
    Exception::INDEX_DEPENDENCY => [
        'name' => Exception::INDEX_DEPENDENCY,
-        'description' => 'Attribute \'%s\' cannot be renamed or deleted. Please remove the associated index first.',
+        'description' => 'Attribute cannot be renamed or deleted. Please remove the associated index first.',
        'code' => 409,
    ],

    /** Column Indexes, same as Indexes but with different type */
    Exception::COLUMN_INDEX_NOT_FOUND => [
        'name' => Exception::COLUMN_INDEX_NOT_FOUND,
-        'description' => 'Index with the requested key \'%s\' could not be found.',
+        'description' => 'Index with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::COLUMN_INDEX_LIMIT_EXCEEDED => [
        'name' => Exception::COLUMN_INDEX_LIMIT_EXCEEDED,
-        'description' => 'The maximum number of indexes for table \'%s\' has been reached.',
+        'description' => 'The maximum number of indexes has been reached.',
        'code' => 400,
    ],
    Exception::COLUMN_INDEX_ALREADY_EXISTS => [
        'name' => Exception::COLUMN_INDEX_ALREADY_EXISTS,
-        'description' => 'Index with the requested key \'%s\' already exists. Try again with a different key.',
+        'description' => 'Index with the requested key already exists. Try again with a different key.',
        'code' => 409,
    ],
    Exception::COLUMN_INDEX_INVALID => [
@@ -987,19 +987,19 @@ return [
    ],
    Exception::COLUMN_INDEX_DEPENDENCY => [
        'name' => Exception::COLUMN_INDEX_DEPENDENCY,
-        'description' => 'Column \'%s\' cannot be renamed or deleted. Please remove the associated index first.',
+        'description' => 'Column cannot be renamed or deleted. Please remove the associated index first.',
        'code' => 409,
    ],

    /** Transactions */
    Exception::TRANSACTION_NOT_FOUND => [
        'name' => Exception::TRANSACTION_NOT_FOUND,
-        'description' => 'Transaction with the requested ID \'%s\' could not be found.',
+        'description' => 'Transaction with the requested ID could not be found.',
        'code' => 404,
    ],
    Exception::TRANSACTION_ALREADY_EXISTS => [
        'name' => Exception::TRANSACTION_ALREADY_EXISTS,
-        'description' => 'Transaction with the requested ID \'%s\' already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
+        'description' => 'Transaction with the requested ID already exists. Try again with a different ID or use ID.unique() to generate a unique ID.',
        'code' => 409,
    ],
    Exception::TRANSACTION_INVALID => [
@@ -187,7 +187,7 @@
                        <img
                            height="26px"
                            src="{{logoUrl}}"
-                            alt="{{platform}} logo"
+                            alt="Appwrite logo"
                        />
                    </td>
                </tr>
@@ -225,7 +225,7 @@
                <tr>
                    <td style="padding-left: 4px; padding-right: 4px">
                        <a
-                            href="{{twitter}}"
+                            href="{{twitterUrl}}"
                            class="social-icon"
                            title="Twitter"
                        >
@@ -234,7 +234,7 @@
                    </td>
                    <td style="padding-left: 4px; padding-right: 4px">
                        <a
-                            href="{{discord}}"
+                            href="{{discordUrl}}"
                            class="social-icon"
                        >
                            <img src="https://cloud.appwrite.io/images/mails/discord.png" height="24" width="24" />
@@ -242,7 +242,7 @@
                    </td>
                    <td style="padding-left: 4px; padding-right: 4px">
                        <a
-                            href="{{github}}"
+                            href="{{githubUrl}}"
                            class="social-icon"
                        >
                            <img src="https://cloud.appwrite.io/images/mails/github.png" height="24" width="24" />
@@ -252,15 +252,15 @@
            </table>
            <table style="width: auto; margin: 0 auto; margin-top: 60px">
                <tr>
-                    <td><a href="{{terms}}">Terms</a></td>
+                    <td><a href="{{termsUrl}}">Terms</a></td>
                    <td style="color: #e8e9f0">
                        <div style="margin: 0 8px">|</div>
                    </td>
-                    <td><a href="{{privacy}}">Privacy</a></td>
+                    <td><a href="{{privacyUrl}}">Privacy</a></td>
                </tr>
            </table>
            <p style="text-align: center" align="center">
-                &copy; {{year}} {{platform}} | 251 Little Falls Drive, Wilmington 19808,
+                &copy; {{year}} Appwrite | 251 Little Falls Drive, Wilmington 19808,
                Delaware, United States
            </p>
        </div>
@@ -462,15 +462,4 @@ return [
        'mock' => true,
        'class' => 'Appwrite\\Auth\\OAuth2\\Mock',
    ],
-    'mock-unverified' => [
-        'name' => 'MockUnverified',
-        'developers' => 'https://appwrite.io',
-        'icon' => 'icon-appwrite',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => false,
-        'beta' => false,
-        'mock' => true,
-        'class' => 'Appwrite\\Auth\\OAuth2\\MockUnverified',
-    ],
 ];
@@ -1,26 +0,0 @@
-<?php
-
-use Utopia\System\System;
-
-/**
- * Platform configuration
- */
-return [
-    'apiHostname' => System::getEnv('_APP_DOMAIN', 'localhost'),
-    'consoleHostname' => System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', 'localhost')),
-    'hostnames' => array_filter(array_unique([
-        System::getEnv('_APP_DOMAIN', 'localhost'),
-        System::getEnv('_APP_CONSOLE_DOMAIN', 'localhost'),
-    ])),
-    'platformName' => APP_EMAIL_PLATFORM_NAME,
-    'logoUrl' => APP_EMAIL_LOGO_URL,
-    'accentColor' => APP_EMAIL_ACCENT_COLOR,
-    'footerImageUrl' => APP_EMAIL_FOOTER_IMAGE_URL,
-    'twitterUrl' => APP_SOCIAL_TWITTER,
-    'discordUrl' => APP_SOCIAL_DISCORD,
-    'githubUrl' => APP_SOCIAL_GITHUB,
-    'termsUrl' => APP_EMAIL_TERMS_URL,
-    'privacyUrl' => APP_EMAIL_PRIVACY_URL,
-    'websiteUrl' => 'https://' . APP_DOMAIN,
-    'emailSenderName' => APP_EMAIL_PLATFORM_NAME,
-];
@@ -1,8 +1,8 @@
 <?php

 return [
-    APP_SDK_PLATFORM_CLIENT => [
-        'key' => APP_SDK_PLATFORM_CLIENT,
+    APP_PLATFORM_CLIENT => [
+        'key' => APP_PLATFORM_CLIENT,
        'name' => 'Client',
        'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](https://appwrite.io/docs/getting-started-for-web) or [getting started for Flutter](https://appwrite.io/docs/getting-started-for-flutter) tutorials to start building your first application.',
        'enabled' => true,
@@ -18,7 +18,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'javascript',
                'source' => \realpath(__DIR__ . '/../sdks/client-web'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-web.git',
@@ -67,7 +67,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'dart',
                'source' => \realpath(__DIR__ . '/../sdks/client-flutter'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-flutter.git',
@@ -86,7 +86,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'swift',
                'source' => \realpath(__DIR__ . '/../sdks/client-apple'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-apple.git',
@@ -104,7 +104,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => '',
                'source' => false,
                'gitUrl' => 'git@github.com:appwrite/sdk-for-objective-c.git',
@@ -123,7 +123,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'kotlin',
                'source' => \realpath(__DIR__ . '/../sdks/client-android'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-android.git',
@@ -146,7 +146,7 @@ return [
                'beta' => true,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'javascript',
                'source' => \realpath(__DIR__ . '/../sdks/client-react-native'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-react-native.git',
@@ -165,7 +165,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => true,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'graphql',
                'source' => \realpath(__DIR__ . '/../sdks/client-graphql'),
                'gitUrl' => '',
@@ -185,7 +185,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => true,
-                'family' => APP_SDK_PLATFORM_CLIENT,
+                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'http',
                'source' => \realpath(__DIR__ . '/../sdks/client-rest'),
                'gitUrl' => '',
@@ -198,8 +198,8 @@ return [
        ],
    ],

-    APP_SDK_PLATFORM_CONSOLE => [
-        'key' => APP_SDK_PLATFORM_CONSOLE,
+    APP_PLATFORM_CONSOLE => [
+        'key' => APP_PLATFORM_CONSOLE,
        'name' => 'Console',
        'enabled' => false,
        'beta' => false,
@@ -214,7 +214,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => true,
-                'family' => APP_SDK_PLATFORM_CONSOLE,
+                'family' => APP_PLATFORM_CONSOLE,
                'prism' => 'javascript',
                'source' => \realpath(__DIR__ . '/../sdks/console-web'),
                'gitUrl' => '',
@@ -233,7 +233,7 @@ return [
                'beta' => true,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_CONSOLE,
+                'family' => APP_PLATFORM_CONSOLE,
                'prism' => 'bash',
                'source' => \realpath(__DIR__ . '/../sdks/console-cli'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-cli.git',
@@ -252,8 +252,8 @@ return [
        ],
    ],

-    APP_SDK_PLATFORM_SERVER => [
-        'key' => APP_SDK_PLATFORM_SERVER,
+    APP_PLATFORM_SERVER => [
+        'key' => APP_PLATFORM_SERVER,
        'name' => 'Server',
        'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](https://appwrite.io/docs/getting-started-for-server) tutorial to start building your first server integration.',
        'enabled' => true,
@@ -262,14 +262,14 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '21.1.0',
+                'version' => '21.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'javascript',
                'source' => \realpath(__DIR__ . '/../sdks/server-nodejs'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-node.git',
@@ -281,14 +281,14 @@ return [
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '19.1.0',
+                'version' => '19.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'php',
                'source' => \realpath(__DIR__ . '/../sdks/server-php'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-php.git',
@@ -300,14 +300,14 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '14.1.0',
+                'version' => '14.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'python',
                'source' => \realpath(__DIR__ . '/../sdks/server-python'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-python.git',
@@ -319,14 +319,14 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '20.1.0',
+                'version' => '20.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'ruby',
                'source' => \realpath(__DIR__ . '/../sdks/server-ruby'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-ruby.git',
@@ -338,14 +338,14 @@ return [
            [
                'key' => 'go',
                'name' => 'Go',
-                'version' => 'v0.16.0',
+                'version' => 'v0.15.0',
                'url' => 'https://github.com/appwrite/sdk-for-go',
                'package' => 'https://github.com/appwrite/sdk-for-go',
                'enabled' => true,
                'beta' => true,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'go',
                'source' => \realpath(__DIR__ . '/../sdks/server-go'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-go.git',
@@ -357,14 +357,14 @@ return [
            [
                'key' => 'dotnet',
                'name' => '.NET',
-                'version' => '0.24.0',
+                'version' => '0.23.0',
                'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                'package' => 'https://www.nuget.org/packages/Appwrite',
                'enabled' => true,
                'beta' => true,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'csharp',
                'source' => \realpath(__DIR__ . '/../sdks/server-dotnet'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-dotnet.git',
@@ -376,14 +376,14 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '20.1.0',
+                'version' => '20.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'dart',
                'source' => \realpath(__DIR__ . '/../sdks/server-dart'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-dart.git',
@@ -395,14 +395,14 @@ return [
            [
                'key' => 'kotlin',
                'name' => 'Kotlin',
-                'version' => '13.1.0',
+                'version' => '13.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'kotlin',
                'source' => \realpath(__DIR__ . '/../sdks/server-kotlin'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-kotlin.git',
@@ -418,14 +418,14 @@ return [
            [
                'key' => 'swift',
                'name' => 'Swift',
-                'version' => '14.1.0',
+                'version' => '14.0.0',
                'url' => 'https://github.com/appwrite/sdk-for-swift',
                'package' => 'https://github.com/appwrite/sdk-for-swift',
                'enabled' => true,
                'beta' => false,
                'dev' => false,
                'hidden' => false,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'swift',
                'source' => \realpath(__DIR__ . '/../sdks/server-swift'),
                'gitUrl' => 'git@github.com:appwrite/sdk-for-swift.git',
@@ -444,7 +444,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => true,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'graphql',
                'source' => \realpath(__DIR__ . '/../sdks/server-graphql'),
                'gitUrl' => '',
@@ -464,7 +464,7 @@ return [
                'beta' => false,
                'dev' => false,
                'hidden' => true,
-                'family' => APP_SDK_PLATFORM_SERVER,
+                'family' => APP_PLATFORM_SERVER,
                'prism' => 'http',
                'source' => \realpath(__DIR__ . '/../sdks/server-rest'),
                'gitUrl' => '',
@@ -58,8 +58,6 @@ $admins = [
    'projects.write',
    'keys.read',
    'keys.write',
-    'devKeys.read',
-    'devKeys.write',
    'webhooks.read',
    'webhooks.write',
    'locale.read',
@@ -13,7 +13,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'web/console' => [
        'key' => 'web/console',
@@ -27,7 +26,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'account' => [
        'key' => 'account',
@@ -41,7 +39,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/account.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'avatars' => [
        'key' => 'avatars',
@@ -55,7 +52,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/avatars.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'databases' => [
        'key' => 'databases',
@@ -69,7 +65,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/databases.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'tablesdb' => [
        'key' => 'tablesdb',
@@ -83,7 +78,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/databases.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'locale' => [
        'key' => 'locale',
@@ -97,7 +91,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/locale.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'health' => [
        'key' => 'health',
@@ -111,7 +104,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/health.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'projects' => [
        'key' => 'projects',
@@ -125,7 +117,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'project' => [
        'key' => 'project',
@@ -139,7 +130,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'storage' => [
        'key' => 'storage',
@@ -153,7 +143,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/storage.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'teams' => [
        'key' => 'teams',
@@ -167,7 +156,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/teams.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'users' => [
        'key' => 'users',
@@ -181,7 +169,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/users.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'vcs' => [
        'key' => 'vcs',
@@ -195,7 +182,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'sites' => [
        'key' => 'sites',
@@ -209,7 +195,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/sites.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'functions' => [
        'key' => 'functions',
@@ -223,7 +208,6 @@ return [
        'tests' => false,
        'optional' => true,
        'icon' => '/images/services/functions.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'proxy' => [
        'key' => 'proxy',
@@ -237,7 +221,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '/images/services/proxy.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'mock' => [
        'key' => 'mock',
@@ -251,7 +234,6 @@ return [
        'tests' => true,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'graphql' => [
        'key' => 'graphql',
@@ -265,7 +247,6 @@ return [
        'tests' => true,
        'optional' => true,
        'icon' => '/images/services/graphql.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'console' => [
        'key' => 'console',
@@ -279,7 +260,6 @@ return [
        'tests' => false,
        'optional' => false,
        'icon' => '',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'migrations' => [
        'key' => 'migrations',
@@ -293,7 +273,6 @@ return [
        'tests' => true,
        'optional' => false,
        'icon' => '/images/services/migrations.png',
-        'platforms' => ['client', 'server', 'console'],
    ],
    'messaging' => [
        'key' => 'messaging',
@@ -307,6 +286,5 @@ return [
        'tests' => true,
        'optional' => true,
        'icon' => '/images/services/messaging.png',
-        'platforms' => ['client', 'server', 'console'],
    ]
 ];
@@ -3,6 +3,4 @@
 use Utopia\Image\Image;
 use Utopia\System\System;

-if (\class_exists('Imagick')) {
-    Image::setResourceLimit('memory', intval(System::getEnv('_APP_IMAGES_RESOURCE_LIMIT_MEMORY', 1024*1024*64)));
-}
+Image::setResourceLimit('memory', intval(System::getEnv('_APP_IMAGES_RESOURCE_LIMIT_MEMORY', 1024*1024*64)));
@@ -1,6 +1,5 @@
 <?php

-use Utopia\Config\Config;
 use Utopia\System\System;

 /**
@@ -8,8 +7,12 @@ use Utopia\System\System;
 */

 $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
-$platform = Config::getParam('platform', []);
-$hostname = $platform['consoleHostname'] ?? '';
+$hostname = System::getEnv('_APP_DOMAIN', '');
+
+// Temporary fix until we can set _APP_DOMAIN to "localhost" instead of "traefik"
+if (System::getEnv('_APP_ENV', 'development') === 'development') {
+    $hostname = 'localhost';
+}

 $url = $protocol . '://' . $hostname;

@@ -22,8 +25,6 @@ class UseCases
    public const DOCUMENTATION = 'documentation';
    public const BLOG = 'blog';
    public const AI = 'artificial intelligence';
-    public const FORMS = 'forms';
-    public const DASHBOARD = 'dashboard';
 }

 const TEMPLATE_FRAMEWORKS = [
@@ -1471,135 +1472,4 @@ return [
            ],
        ]
    ],
-    [
-        'key' => 'crm-dashboard-react-admin',
-        'name' => 'CRM dashboard with React Admin',
-        'tagline' => 'A React-based admin dashboard template with CRM features.',
-        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::DASHBOARD],
-        'screenshotDark' => $url . '/images/sites/templates/crm-dashboard-react-admin-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/crm-dashboard-react-admin-light.png',
-        'frameworks' => [
-            getFramework('REACT', [
-                'providerRootDirectory' => './react/react-admin',
-                'installCommand' => 'pnpm install',
-                'buildCommand' => 'pnpm build && pnpm db-seed',
-                'outputDirectory' => './dist',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.7.*',
-        'variables' => [
-            [
-                'name' => 'VITE_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'APPWRITE_API_KEY',
-                'description' => 'Your Appwrite API key (for seeding only)',
-                'value' => '',
-                'placeholder' => 'a0b1...',
-                'required' => true,
-                'type' => 'password'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_DATABASE_ID',
-                'description' => 'Database ID (default: admin)',
-                'value' => 'admin',
-                'placeholder' => 'admin',
-                'required' => false,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_TABLE_REVIEWS',
-                'description' => 'Table ID for reviews table',
-                'value' => 'reviews',
-                'placeholder' => 'reviews',
-                'required' => false,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_TABLE_INVOICES',
-                'description' => 'Table ID for invoices table',
-                'value' => 'invoices',
-                'placeholder' => 'invoices',
-                'required' => false,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_TABLE_ORDERS',
-                'description' => 'Table ID for orders table',
-                'value' => 'orders',
-                'placeholder' => 'orders',
-                'required' => false,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_TABLE_PRODUCTS',
-                'description' => 'Table ID for products table',
-                'value' => 'products',
-                'placeholder' => 'products',
-                'required' => false,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_TABLE_CATEGORIES',
-                'description' => 'Table ID for categories table',
-                'value' => 'categories',
-                'placeholder' => 'categories',
-                'required' => false,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_TABLE_CUSTOMERS',
-                'description' => 'Table ID for customers table',
-                'value' => 'customers',
-                'placeholder' => 'customers',
-                'required' => false,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'job-applications-formspree',
-        'name' => 'Job applications form with Formspree',
-        'tagline' => 'A simple form submission template using Formspree.',
-        'score' => 4, // 0 to 10 based on looks of screenshot (avoid 1,2,3,8,9,10 if possible)
-        'useCases' => [UseCases::FORMS],
-        'screenshotDark' => $url . '/images/sites/templates/job-applications-formspree-dark.png',
-        'screenshotLight' => $url . '/images/sites/templates/job-applications-formspree-light.png',
-        'frameworks' => [
-            getFramework('REACT', [
-                'providerRootDirectory' => './react/formspree',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.7.*',
-        'variables' => [
-            [
-                'name' => 'VITE_FORMSPREE_FORM_ID',
-                'description' => 'Your Formspree form ID',
-                'value' => '',
-                'placeholder' => 'xrgkpqld',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ]
 ];
@@ -81,7 +81,7 @@ return [
            ],
            [
                'name' => '_APP_DOMAIN',
-                'description' => 'Your Appwrite domain address. When setting a public suffix domain, Appwrite will attempt to issue a valid SSL certificate automatically. When used with a dev domain, Appwrite will assign a self-signed SSL certificate. The default value is \'localhost\'. Multiple domains can be separated by commas.',
+                'description' => 'Your Appwrite domain address. When setting a public suffix domain, Appwrite will attempt to issue a valid SSL certificate automatically. When used with a dev domain, Appwrite will assign a self-signed SSL certificate. The default value is \'localhost\'.',
                'introduction' => '',
                'default' => 'localhost',
                'required' => true,
@@ -357,15 +357,6 @@ return [
                'required' => false,
                'question' => '',
                'filter' => ''
-            ],
-            [
-                'name' => '_APP_TRUSTED_HEADERS',
-                'description' => 'This option allows you to set the list of trusted headers, the value is a comma‑separated list of HTTP header names, evaluated left-to-right for the first valid IP. Header names are treated case-insensitively.',
-                'introduction' => '1.8.0',
-                'default' => 'x-forwarded-for',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
            ]
        ],
    ],
@@ -70,9 +70,9 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
    unset($image);
 };

-$getUserGitHub = function (string $userId, Document $project, Database $dbForProject, Database $dbForPlatform, Authorization $authorization, ?Logger $logger) {
+$getUserGitHub = function (string $userId, Document $project, Database $dbForProject, Database $dbForPlatform, ?Logger $logger) {
    try {
-        $user = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $userId));
+        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));

        $sessions = $user->getAttribute('sessions', []);

@@ -123,7 +123,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
                    ->setAttribute('providerRefreshToken', $refreshToken)
                    ->setAttribute('providerAccessTokenExpiry', DateTime::addSeconds(new \DateTime(), (int)$oauth2->getAccessTokenExpiry('')));

-                $authorization->skip(fn () => $dbForProject->updateDocument('sessions', $gitHubSession->getId(), $gitHubSession));
+                Authorization::skip(fn () => $dbForProject->updateDocument('sessions', $gitHubSession->getId(), $gitHubSession));

                $dbForProject->purgeCachedDocument('users', $user->getId());
            } catch (Throwable $err) {
@@ -131,7 +131,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
                do {
                    $previousAccessToken = $gitHubSession->getAttribute('providerAccessToken');

-                    $user = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $userId));
+                    $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
                    $sessions = $user->getAttribute('sessions', []);

                    $gitHubSession = new Document();
@@ -178,7 +178,7 @@ App::get('/v1/avatars/credit-cards/:code')
        group: null,
        name: 'getCreditCard',
        description: '/docs/references/avatars/get-credit-card.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -206,7 +206,7 @@ App::get('/v1/avatars/browsers/:code')
        group: null,
        name: 'getBrowser',
        description: '/docs/references/avatars/get-browser.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -234,7 +234,7 @@ App::get('/v1/avatars/flags/:code')
        group: null,
        name: 'getFlag',
        description: '/docs/references/avatars/get-flag.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -262,7 +262,7 @@ App::get('/v1/avatars/image')
        group: null,
        name: 'getImage',
        description: '/docs/references/avatars/get-image.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -333,7 +333,7 @@ App::get('/v1/avatars/favicon')
        group: null,
        name: 'getFavicon',
        description: '/docs/references/avatars/get-favicon.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -507,7 +507,7 @@ App::get('/v1/avatars/qr')
        group: null,
        name: 'getQR',
        description: '/docs/references/avatars/get-qr.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -557,7 +557,7 @@ App::get('/v1/avatars/initials')
        group: null,
        name: 'getInitials',
        description: '/docs/references/avatars/get-initials.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -652,7 +652,7 @@ App::get('/v1/avatars/screenshots')
        group: null,
        name: 'getScreenshot',
        description: '/docs/references/avatars/get-screenshot.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        type: MethodType::LOCATION,
        responses: [
            new SDKResponse(
@@ -841,9 +841,8 @@ App::get('/v1/cards/cloud')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->inject('authorization')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger, Authorization $authorization) use ($getUserGitHub) {
-        $user = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $userId));
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
+        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -854,7 +853,7 @@ App::get('/v1/cards/cloud')
            $email = $user->getAttribute('email', '');
            $createdAt = new \DateTime($user->getCreatedAt());

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $authorization, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $logger);
            $githubName = $gitHub['name'] ?? '';
            $githubId = $gitHub['id'] ?? '';

@@ -1049,9 +1048,8 @@ App::get('/v1/cards/cloud-back')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->inject('authorization')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger, Authorization $authorization) use ($getUserGitHub) {
-        $user = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $userId));
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
+        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -1061,7 +1059,7 @@ App::get('/v1/cards/cloud-back')
            $userId = $user->getId();
            $email = $user->getAttribute('email', '');

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $authorization, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $logger);
            $githubId = $gitHub['id'] ?? '';

            $isHero = \array_key_exists($email, $heroes);
@@ -1128,9 +1126,8 @@ App::get('/v1/cards/cloud-og')
    ->inject('contributors')
    ->inject('employees')
    ->inject('logger')
-    ->inject('authorization')
-    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger, Authorization $authorization) use ($getUserGitHub) {
-        $user = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $userId));
+    ->action(function (string $userId, string $mock, int $width, int $height, Document $user, Document $project, Database $dbForProject, Database $dbForPlatform, Response $response, array $heroes, array $contributors, array $employees, ?Logger $logger) use ($getUserGitHub) {
+        $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));

        if ($user->isEmpty() && empty($mock)) {
            throw new Exception(Exception::USER_NOT_FOUND);
@@ -1145,7 +1142,7 @@ App::get('/v1/cards/cloud-og')
            $email = $user->getAttribute('email', '');
            $createdAt = new \DateTime($user->getCreatedAt());

-            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $authorization, $logger);
+            $gitHub = $getUserGitHub($user->getId(), $project, $dbForProject, $dbForPlatform, $logger);
            $githubName = $gitHub['name'] ?? '';
            $githubId = $gitHub['id'] ?? '';

@@ -43,6 +43,9 @@ App::get('/v1/console/variables')
    ))
    ->inject('response')
    ->action(function (Response $response) {
+        $validator = new Domain(System::getEnv('_APP_DOMAIN'));
+        $isDomainValid = !empty(System::getEnv('_APP_DOMAIN', '')) && $validator->isKnown() && !$validator->isTest();
+
        $validator = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME'));
        $isCNAMEValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_CNAME', '')) && $validator->isKnown() && !$validator->isTest();

@@ -52,7 +55,9 @@ App::get('/v1/console/variables')
        $validator = new IP(IP::V6);
        $isAAAAValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_AAAA', '')) && $validator->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA'));

-        $isDomainEnabled = $isAAAAValid || $isAValid || $isCNAMEValid;
+        $isDomainEnabled = $isDomainValid && (
+            $isAAAAValid || $isAValid || $isCNAMEValid
+        );

        $isVcsEnabled = !empty(System::getEnv('_APP_VCS_GITHUB_APP_NAME', ''))
            && !empty(System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY', ''))
@@ -28,12 +28,11 @@ use Utopia\Validator\Text;
 App::init()
    ->groups(['graphql'])
    ->inject('project')
-    ->inject('authorization')
-    ->action(function (Document $project, Authorization $authorization) {
+    ->action(function (Document $project) {
        if (
            array_key_exists('graphql', $project->getAttribute('apis', []))
            && !$project->getAttribute('apis', [])['graphql']
-            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
+            && !(User::isPrivileged(Authorization::getRoles()) || User::isApp(Authorization::getRoles()))
        ) {
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }
@@ -47,7 +46,7 @@ App::get('/v1/graphql')
        namespace: 'graphql',
        group: 'graphql',
        name: 'get',
-        auth: [AuthType::ADMIN, AuthType::KEY, AuthType::SESSION, AuthType::JWT],
+        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        hide: true,
        description: '/docs/references/graphql/get.md',
        responses: [
@@ -94,7 +93,7 @@ App::post('/v1/graphql/mutation')
        namespace: 'graphql',
        group: 'graphql',
        name: 'mutation',
-        auth: [AuthType::ADMIN, AuthType::KEY, AuthType::SESSION, AuthType::JWT],
+        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        description: '/docs/references/graphql/post.md',
        responses: [
            new SDKResponse(
@@ -145,7 +144,7 @@ App::post('/v1/graphql')
        namespace: 'graphql',
        group: 'graphql',
        name: 'query',
-        auth: [AuthType::ADMIN, AuthType::KEY, AuthType::SESSION, AuthType::JWT],
+        auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
        description: '/docs/references/graphql/post.md',
        responses: [
            new SDKResponse(
@@ -50,7 +50,7 @@ App::get('/v1/health')
        group: 'health',
        name: 'get',
        description: '/docs/references/health/get.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -89,7 +89,7 @@ App::get('/v1/health/db')
        group: 'health',
        name: 'getDB',
        description: '/docs/references/health/get-db.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -120,7 +120,7 @@ App::get('/v1/health/db')
                        $output[] = new Document([
                            'name' => $key . " ($database)",
                            'status' => 'pass',
-                            'ping' => \round((\microtime(true) - $checkStart) * 1000)
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
                        ]);
                    } else {
                        $failures[] = $database;
@@ -131,8 +131,6 @@ App::get('/v1/health/db')
            }
        }

-        // Only throw error if ALL databases failed (no successful pings)
-        // This allows partial failures in environments where not all DBs are ready
        if (!empty($failures)) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'DB failure on: ' . implode(", ", $failures));
        }
@@ -152,7 +150,7 @@ App::get('/v1/health/cache')
        group: 'health',
        name: 'getCache',
        description: '/docs/references/health/get-cache.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -182,7 +180,7 @@ App::get('/v1/health/cache')
                        $output[] = new Document([
                            'name' => $key . " ($cache)",
                            'status' => 'pass',
-                            'ping' => \round((\microtime(true) - $checkStart) * 1000)
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
                        ]);
                    } else {
                        $failures[] = $cache;
@@ -212,7 +210,7 @@ App::get('/v1/health/pubsub')
        group: 'health',
        name: 'getPubSub',
        description: '/docs/references/health/get-pubsub.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -242,7 +240,7 @@ App::get('/v1/health/pubsub')
                        $output[] = new Document([
                            'name' => $key . " ($pubsub)",
                            'status' => 'pass',
-                            'ping' => \round((\microtime(true) - $checkStart) * 1000)
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
                        ]);
                    } else {
                        $failures[] = $pubsub;
@@ -272,7 +270,7 @@ App::get('/v1/health/time')
        group: 'health',
        name: 'getTime',
        description: '/docs/references/health/get-time.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -336,7 +334,7 @@ App::get('/v1/health/queue/webhooks')
        group: 'queue',
        name: 'getQueueWebhooks',
        description: '/docs/references/health/get-queue-webhooks.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -369,7 +367,7 @@ App::get('/v1/health/queue/logs')
        group: 'queue',
        name: 'getQueueLogs',
        description: '/docs/references/health/get-queue-logs.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -402,7 +400,7 @@ App::get('/v1/health/certificate')
        group: 'health',
        name: 'getCertificate',
        description: '/docs/references/health/get-certificate.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -459,7 +457,7 @@ App::get('/v1/health/queue/certificates')
        group: 'queue',
        name: 'getQueueCertificates',
        description: '/docs/references/health/get-queue-certificates.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -492,7 +490,7 @@ App::get('/v1/health/queue/builds')
        group: 'queue',
        name: 'getQueueBuilds',
        description: '/docs/references/health/get-queue-builds.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -525,7 +523,7 @@ App::get('/v1/health/queue/databases')
        group: 'queue',
        name: 'getQueueDatabases',
        description: '/docs/references/health/get-queue-databases.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -558,7 +556,7 @@ App::get('/v1/health/queue/deletes')
        group: 'queue',
        name: 'getQueueDeletes',
        description: '/docs/references/health/get-queue-deletes.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -591,7 +589,7 @@ App::get('/v1/health/queue/mails')
        group: 'queue',
        name: 'getQueueMails',
        description: '/docs/references/health/get-queue-mails.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -624,7 +622,7 @@ App::get('/v1/health/queue/messaging')
        group: 'queue',
        name: 'getQueueMessaging',
        description: '/docs/references/health/get-queue-messaging.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -657,7 +655,7 @@ App::get('/v1/health/queue/migrations')
        group: 'queue',
        name: 'getQueueMigrations',
        description: '/docs/references/health/get-queue-migrations.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -690,7 +688,7 @@ App::get('/v1/health/queue/functions')
        group: 'queue',
        name: 'getQueueFunctions',
        description: '/docs/references/health/get-queue-functions.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -723,7 +721,7 @@ App::get('/v1/health/queue/stats-resources')
        group: 'queue',
        name: 'getQueueStatsResources',
        description: '/docs/references/health/get-queue-stats-resources.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -756,7 +754,7 @@ App::get('/v1/health/queue/stats-usage')
        group: 'queue',
        name: 'getQueueUsage',
        description: '/docs/references/health/get-queue-stats-usage.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -789,7 +787,7 @@ App::get('/v1/health/storage/local')
        group: 'storage',
        name: 'getStorageLocal',
        description: '/docs/references/health/get-storage-local.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -824,7 +822,7 @@ App::get('/v1/health/storage/local')

        $output = [
            'status' => 'pass',
-            'ping' => \round((\microtime(true) - $checkStart) * 1000)
+            'ping' => \round((\microtime(true) - $checkStart) / 1000)
        ];

        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
@@ -839,7 +837,7 @@ App::get('/v1/health/storage')
        group: 'storage',
        name: 'getStorage',
        description: '/docs/references/health/get-storage.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -876,7 +874,7 @@ App::get('/v1/health/storage')

        $output = [
            'status' => 'pass',
-            'ping' => \round((\microtime(true) - $checkStart) * 1000)
+            'ping' => \round((\microtime(true) - $checkStart) / 1000)
        ];

        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
@@ -891,7 +889,7 @@ App::get('/v1/health/anti-virus')
        group: 'health',
        name: 'getAntivirus',
        description: '/docs/references/health/get-storage-anti-virus.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -937,7 +935,7 @@ App::get('/v1/health/queue/failed/:name')
        group: 'queue',
        name: 'getFailedJobs',
        description: '/docs/references/health/get-failed-queue-jobs.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -20,7 +20,7 @@ App::get('/v1/locale')
        group: null,
        name: 'get',
        description: '/docs/references/locale/get-locale.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -79,7 +79,7 @@ App::get('/v1/locale/codes')
        group: null,
        name: 'listCodes',
        description: '/docs/references/locale/list-locale-codes.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -105,7 +105,7 @@ App::get('/v1/locale/countries')
        group: null,
        name: 'listCountries',
        description: '/docs/references/locale/list-countries.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -142,7 +142,7 @@ App::get('/v1/locale/countries/eu')
        group: null,
        name: 'listCountriesEU',
        description: '/docs/references/locale/list-countries-eu.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -181,7 +181,7 @@ App::get('/v1/locale/countries/phones')
        group: null,
        name: 'listCountriesPhones',
        description: '/docs/references/locale/list-countries-phones.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -219,7 +219,7 @@ App::get('/v1/locale/continents')
        group: null,
        name: 'listContinents',
        description: '/docs/references/locale/list-continents.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -255,7 +255,7 @@ App::get('/v1/locale/currencies')
        group: null,
        name: 'listCurrencies',
        description: '/docs/references/locale/list-currencies.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -282,7 +282,7 @@ App::get('/v1/locale/languages')
        group: null,
        name: 'listLanguages',
        description: '/docs/references/locale/list-languages.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -36,7 +36,6 @@ use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Database\Validator\Datetime as DatetimeValidator;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Cursor;
@@ -340,7 +339,6 @@ App::post('/v1/messaging/providers/smtp')
                since: '1.8.0',
                replaceWith: 'messaging.createSMTPProvider',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -874,7 +872,6 @@ App::post('/v1/messaging/providers/fcm')
                since: '1.8.0',
                replaceWith: 'messaging.createFCMProvider',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -964,7 +961,6 @@ App::post('/v1/messaging/providers/apns')
                since: '1.8.0',
                replaceWith: 'messaging.createAPNSProvider',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -1074,9 +1070,8 @@ App::get('/v1/messaging/providers')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (array $queries, string $search, bool $includeTotal, Database $dbForProject, Authorization $authorization, Response $response) {
+    ->action(function (array $queries, string $search, bool $includeTotal, Database $dbForProject, Response $response) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -1102,7 +1097,7 @@ App::get('/v1/messaging/providers')
            }

            $providerId = $cursor->getValue();
-            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('providers', $providerId));
+            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('providers', $providerId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Provider '{$providerId}' for the 'cursor' value not found.");
@@ -1160,6 +1155,12 @@ App::get('/v1/messaging/providers/:providerId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
+
        $audit = new Audit($dbForProject);
        $resource = 'provider/' . $providerId;
        $logs = $audit->getLogsByResource($resource, $queries);
@@ -1579,7 +1580,6 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
                since: '1.8.0',
                replaceWith: 'messaging.updateSMTPProvider',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -2171,7 +2171,6 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
                since: '1.8.0',
                replaceWith: 'messaging.updateFCMProvider',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -2267,7 +2266,6 @@ App::patch('/v1/messaging/providers/apns/:providerId')
                since: '1.8.0',
                replaceWith: 'messaging.updateAPNSProvider',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -2479,9 +2477,8 @@ App::get('/v1/messaging/topics')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (array $queries, string $search, bool $includeTotal, Database $dbForProject, Authorization $authorization, Response $response) {
+    ->action(function (array $queries, string $search, bool $includeTotal, Database $dbForProject, Response $response) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -2507,7 +2504,7 @@ App::get('/v1/messaging/topics')
            }

            $topicId = $cursor->getValue();
-            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));
+            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Topic '{$topicId}' for the 'cursor' value not found.");
@@ -2565,6 +2562,12 @@ App::get('/v1/messaging/topics/:topicId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
+
        $audit = new Audit($dbForProject);
        $resource = 'topic/' . $topicId;
        $logs = $audit->getLogsByResource($resource, $queries);
@@ -2777,27 +2780,29 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
    ->param('targetId', '', new UID(), 'Target ID. The target ID to link to the specified Topic ID.')
    ->inject('queueForEvents')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (string $subscriberId, string $topicId, string $targetId, Event $queueForEvents, Database $dbForProject, Authorization $authorization, Response $response) {
+    ->action(function (string $subscriberId, string $topicId, string $targetId, Event $queueForEvents, Database $dbForProject, Response $response) {
        $subscriberId = $subscriberId == 'unique()' ? ID::unique() : $subscriberId;

-        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));
+        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
        }
-        if (!$authorization->isValid(new Input('subscribe', $topic->getAttribute('subscribe')))) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+
+        $validator = new Authorization('subscribe');
+
+        if (!$validator->isValid($topic->getAttribute('subscribe'))) {
+            throw new Exception(Exception::USER_UNAUTHORIZED, $validator->getDescription());
        }

-        $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $targetId));
+        $target = Authorization::skip(fn () => $dbForProject->getDocument('targets', $targetId));

        if ($target->isEmpty()) {
            throw new Exception(Exception::USER_TARGET_NOT_FOUND);
        }

-        $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));
+        $user = Authorization::skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));

        $subscriber = new Document([
            '$id' => $subscriberId,
@@ -2830,7 +2835,7 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
                default => throw new Exception(Exception::TARGET_PROVIDER_INVALID_TYPE),
            };

-            $authorization->skip(fn () => $dbForProject->increaseDocumentAttribute(
+            Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute(
                'topics',
                $topicId,
                $totalAttribute,
@@ -2875,9 +2880,8 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (string $topicId, array $queries, string $search, bool $includeTotal, Database $dbForProject, Authorization $authorization, Response $response) {
+    ->action(function (string $topicId, array $queries, string $search, bool $includeTotal, Database $dbForProject, Response $response) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -2888,7 +2892,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
            $queries[] = Query::search('search', $search);
        }

-        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));
+        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
@@ -2911,7 +2915,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
            }

            $subscriberId = $cursor->getValue();
-            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('subscribers', $subscriberId));
+            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('subscribers', $subscriberId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Subscriber '{$subscriberId}' for the 'cursor' value not found.");
@@ -2925,10 +2929,10 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
            throw new Exception(Exception::DATABASE_QUERY_ORDER_NULL, "The order attribute '{$e->getAttribute()}' had a null value. Cursor pagination requires all documents order attribute values are non-null.");
        }

-        $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject, $authorization) {
-            return function () use ($subscriber, $dbForProject, $authorization) {
-                $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
-                $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));
+        $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject) {
+            return function () use ($subscriber, $dbForProject) {
+                $target = Authorization::skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
+                $user = Authorization::skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));

                return $subscriber
                    ->setAttribute('target', $target)
@@ -2981,6 +2985,12 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
+
        $audit = new Audit($dbForProject);
        $resource = 'subscriber/' . $subscriberId;
        $logs = $audit->getLogsByResource($resource, $queries);
@@ -3057,10 +3067,9 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->param('topicId', '', new UID(), 'Topic ID. The topic ID subscribed to.')
    ->param('subscriberId', '', new UID(), 'Subscriber ID.')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (string $topicId, string $subscriberId, Database $dbForProject, Authorization $authorization, Response $response) {
-        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));
+    ->action(function (string $topicId, string $subscriberId, Database $dbForProject, Response $response) {
+        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
@@ -3072,8 +3081,8 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
            throw new Exception(Exception::SUBSCRIBER_NOT_FOUND);
        }

-        $target = $authorization->skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
-        $user = $authorization->skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));
+        $target = Authorization::skip(fn () => $dbForProject->getDocument('targets', $subscriber->getAttribute('targetId')));
+        $user = Authorization::skip(fn () => $dbForProject->getDocument('users', $target->getAttribute('userId')));

        $subscriber
            ->setAttribute('target', $target)
@@ -3109,10 +3118,9 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
    ->param('subscriberId', '', new UID(), 'Subscriber ID.')
    ->inject('queueForEvents')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (string $topicId, string $subscriberId, Event $queueForEvents, Database $dbForProject, Authorization $authorization, Response $response) {
-        $topic = $authorization->skip(fn () => $dbForProject->getDocument('topics', $topicId));
+    ->action(function (string $topicId, string $subscriberId, Event $queueForEvents, Database $dbForProject, Response $response) {
+        $topic = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));

        if ($topic->isEmpty()) {
            throw new Exception(Exception::TOPIC_NOT_FOUND);
@@ -3135,7 +3143,7 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
            default => throw new Exception(Exception::TARGET_PROVIDER_INVALID_TYPE),
        };

-        $authorization->skip(fn () => $dbForProject->decreaseDocumentAttribute(
+        Authorization::skip(fn () => $dbForProject->decreaseDocumentAttribute(
            'topics',
            $topicId,
            $totalAttribute,
@@ -3335,7 +3343,6 @@ App::post('/v1/messaging/messages/sms')
                since: '1.8.0',
                replaceWith: 'messaging.createSMS',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -3499,8 +3506,7 @@ App::post('/v1/messaging/messages/push')
    ->inject('project')
    ->inject('queueForMessaging')
    ->inject('response')
-    ->inject('platform')
-    ->action(function (string $messageId, string $title, string $body, ?array $topics, ?array $users, ?array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, int $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response, array $platform) {
+    ->action(function (string $messageId, string $title, string $body, ?array $topics, ?array $users, ?array $targets, ?array $data, string $action, string $image, string $icon, string $sound, string $color, string $tag, int $badge, bool $draft, ?string $scheduledAt, bool $contentAvailable, bool $critical, string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response) {
        $messageId = $messageId == 'unique()'
            ? ID::unique()
            : $messageId;
@@ -3556,8 +3562,8 @@ App::post('/v1/messaging/messages/push')
                throw new Exception(Exception::STORAGE_FILE_TYPE_UNSUPPORTED);
            }

-            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-            $endpoint = "$protocol://{$platform['apiHostname']}/v1";
+            $host = System::getEnv('_APP_DOMAIN', 'localhost');
+            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';

            $scheduleTime = $currentScheduledAt ?? $scheduledAt;
            if (!\is_null($scheduleTime)) {
@@ -3577,7 +3583,7 @@ App::post('/v1/messaging/messages/push')
            $image = [
                'bucketId' => $bucket->getId(),
                'fileId' => $file->getId(),
-                'url' => "{$endpoint}/storage/buckets/{$bucket->getId()}/files/{$file->getId()}/push?project={$project->getId()}&jwt={$jwt}",
+                'url' => "{$protocol}://{$host}/v1/storage/buckets/{$bucket->getId()}/files/{$file->getId()}/push?project={$project->getId()}&jwt={$jwt}",
            ];
        }

@@ -3694,9 +3700,8 @@ App::get('/v1/messaging/messages')
    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('response')
-    ->action(function (array $queries, string $search, bool $includeTotal, Database $dbForProject, Authorization $authorization, Response $response) {
+    ->action(function (array $queries, string $search, bool $includeTotal, Database $dbForProject, Response $response) {
        try {
            $queries = Query::parseQueries($queries);
        } catch (QueryException $e) {
@@ -3722,7 +3727,7 @@ App::get('/v1/messaging/messages')
            }

            $messageId = $cursor->getValue();
-            $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('messages', $messageId));
+            $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('messages', $messageId));

            if ($cursorDocument->isEmpty()) {
                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Message '{$messageId}' for the 'cursor' value not found.");
@@ -3780,6 +3785,12 @@ App::get('/v1/messaging/messages/:messageId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
+
        $audit = new Audit($dbForProject);
        $resource = 'message/' . $messageId;
        $logs = $audit->getLogsByResource($resource, $queries);
@@ -4181,7 +4192,6 @@ App::patch('/v1/messaging/messages/sms/:messageId')
                since: '1.8.0',
                replaceWith: 'messaging.updateSMS',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'messaging',
@@ -4384,8 +4394,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
    ->inject('project')
    ->inject('queueForMessaging')
    ->inject('response')
-    ->inject('platform')
-    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $draft, ?string $scheduledAt, ?bool $contentAvailable, ?bool $critical, ?string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response, array $platform) {
+    ->action(function (string $messageId, ?array $topics, ?array $users, ?array $targets, ?string $title, ?string $body, ?array $data, ?string $action, ?string $image, ?string $icon, ?string $sound, ?string $color, ?string $tag, ?int $badge, ?bool $draft, ?string $scheduledAt, ?bool $contentAvailable, ?bool $critical, ?string $priority, Event $queueForEvents, Database $dbForProject, Database $dbForPlatform, Document $project, Messaging $queueForMessaging, Response $response) {
        $message = $dbForProject->getDocument('messages', $messageId);

        if ($message->isEmpty()) {
@@ -4553,6 +4562,9 @@ App::patch('/v1/messaging/messages/push/:messageId')
                throw new Exception(Exception::STORAGE_FILE_TYPE_UNSUPPORTED);
            }

+            $host = System::getEnv('_APP_DOMAIN', 'localhost');
+            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+
            $scheduleTime = $currentScheduledAt ?? $scheduledAt;
            if (!\is_null($scheduleTime)) {
                $expiry = (new \DateTime($scheduleTime))->add(new \DateInterval('P15D'))->format('U');
@@ -4568,13 +4580,10 @@ App::patch('/v1/messaging/messages/push/:messageId')
                'projectId' => $project->getId(),
            ]);

-            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-            $endpoint = "$protocol://{$platform['apiHostname']}/v1";
-
            $pushData['image'] = [
                'bucketId' => $bucket->getId(),
                'fileId' => $file->getId(),
-                'url' => "{$endpoint}/storage/buckets/{$bucket->getId()}/files/{$file->getId()}/push?project={$project->getId()}&jwt={$jwt}",
+                'url' => "{$protocol}://{$host}/v1/storage/buckets/{$bucket->getId()}/files/{$file->getId()}/push?project={$project->getId()}&jwt={$jwt}"
            ];
        }

@@ -69,11 +69,10 @@ App::post('/v1/migrations/appwrite')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('platform')
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForMigrations')
-    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
+    ->action(function (array $resources, string $endpoint, string $projectId, string $apiKey, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@@ -97,7 +96,6 @@ App::post('/v1/migrations/appwrite')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setPlatform($platform)
            ->setUser($user)
            ->trigger();

@@ -130,11 +128,10 @@ App::post('/v1/migrations/firebase')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('platform')
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForMigrations')
-    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
+    ->action(function (array $resources, string $serviceAccount, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $serviceAccountData = json_decode($serviceAccount, true);

        if (empty($serviceAccountData)) {
@@ -166,7 +163,6 @@ App::post('/v1/migrations/firebase')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setPlatform($platform)
            ->setUser($user)
            ->trigger();

@@ -204,11 +200,10 @@ App::post('/v1/migrations/supabase')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('platform')
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForMigrations')
-    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
+    ->action(function (array $resources, string $endpoint, string $apiKey, string $databaseHost, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@@ -235,7 +230,6 @@ App::post('/v1/migrations/supabase')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setPlatform($platform)
            ->setUser($user)
            ->trigger();

@@ -274,11 +268,10 @@ App::post('/v1/migrations/nhost')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('platform')
    ->inject('user')
    ->inject('queueForEvents')
    ->inject('queueForMigrations')
-    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
+    ->action(function (array $resources, string $subdomain, string $region, string $adminSecret, string $database, string $username, string $password, int $port, Response $response, Database $dbForProject, Document $project, Document $user, Event $queueForEvents, Migration $queueForMigrations) {
        $migration = $dbForProject->createDocument('migrations', new Document([
            '$id' => ID::unique(),
            'status' => 'pending',
@@ -306,7 +299,6 @@ App::post('/v1/migrations/nhost')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setPlatform($platform)
            ->setUser($user)
            ->trigger();

@@ -342,9 +334,7 @@ App::post('/v1/migrations/csv/imports')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
-    ->inject('authorization')
    ->inject('project')
-    ->inject('platform')
    ->inject('deviceForFiles')
    ->inject('deviceForMigrations')
    ->inject('queueForEvents')
@@ -357,15 +347,13 @@ App::post('/v1/migrations/csv/imports')
        Response $response,
        Database $dbForProject,
        Database $dbForPlatform,
-        Authorization $authorization,
        Document $project,
-        array $platform,
        Device $deviceForFiles,
        Device $deviceForMigrations,
        Event $queueForEvents,
        Migration $queueForMigrations
    ) {
-        $bucket = $authorization->skip(function () use ($internalFile, $dbForPlatform, $dbForProject, $bucketId) {
+        $bucket = Authorization::skip(function () use ($internalFile, $dbForPlatform, $dbForProject, $bucketId) {
            if ($internalFile) {
                return $dbForPlatform->getDocument('buckets', 'default');
            }
@@ -376,7 +364,7 @@ App::post('/v1/migrations/csv/imports')
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $file = $authorization->skip(fn () => $internalFile ? $dbForPlatform->getDocument('bucket_' . $bucket->getSequence(), $fileId) : $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+        $file = Authorization::skip(fn () => $internalFile ? $dbForPlatform->getDocument('bucket_' . $bucket->getSequence(), $fileId) : $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
        }
@@ -453,7 +441,6 @@ App::post('/v1/migrations/csv/imports')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setProject($project)
            ->trigger();

        $response
@@ -493,9 +480,7 @@ App::post('/v1/migrations/csv/exports')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('dbForPlatform')
-    ->inject('authorization')
    ->inject('project')
-    ->inject('platform')
    ->inject('queueForEvents')
    ->inject('queueForMigrations')
    ->action(function (
@@ -512,9 +497,7 @@ App::post('/v1/migrations/csv/exports')
        Response $response,
        Database $dbForProject,
        Database $dbForPlatform,
-        Authorization $authorization,
        Document $project,
-        array $platform,
        Event $queueForEvents,
        Migration $queueForMigrations
    ) {
@@ -524,7 +507,7 @@ App::post('/v1/migrations/csv/exports')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

-        $bucket = $authorization->skip(fn () => $dbForPlatform->getDocument('buckets', 'default'));
+        $bucket = Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'default'));
        if ($bucket->isEmpty()) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }
@@ -537,12 +520,12 @@ App::post('/v1/migrations/csv/exports')
            throw new Exception(Exception::COLLECTION_NOT_FOUND);
        }

-        $database = $authorization->skip(fn () => $dbForProject->getDocument('databases', $databaseId));
+        $database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
        if ($database->isEmpty()) {
            throw new Exception(Exception::DATABASE_NOT_FOUND);
        }

-        $collection = $authorization->skip(fn () => $dbForProject->getDocument('database_' . $database->getSequence(), $collectionId));
+        $collection = Authorization::skip(fn () => $dbForProject->getDocument('database_' . $database->getSequence(), $collectionId));
        if ($collection->isEmpty()) {
            throw new Exception(Exception::COLLECTION_NOT_FOUND);
        }
@@ -588,7 +571,6 @@ App::post('/v1/migrations/csv/exports')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setPlatform($platform)
            ->trigger();

        $response
@@ -921,10 +903,9 @@ App::patch('/v1/migrations/:migrationId')
    ->inject('response')
    ->inject('dbForProject')
    ->inject('project')
-    ->inject('platform')
    ->inject('user')
    ->inject('queueForMigrations')
-    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, array $platform, Document $user, Migration $queueForMigrations) {
+    ->action(function (string $migrationId, Response $response, Database $dbForProject, Document $project, Document $user, Migration $queueForMigrations) {
        $migration = $dbForProject->getDocument('migrations', $migrationId);

        if ($migration->isEmpty()) {
@@ -943,7 +924,6 @@ App::patch('/v1/migrations/:migrationId')
        $queueForMigrations
            ->setMigration($migration)
            ->setProject($project)
-            ->setPlatform($platform)
            ->setUser($user)
            ->trigger();

@@ -45,10 +45,9 @@ App::get('/v1/project/usage')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('getLogsDB')
    ->inject('smsRates')
-    ->action(function (string $startDate, string $endDate, string $period, Response $response, Document $project, Database $dbForProject, Authorization $authorization, callable $getLogsDB, array $smsRates) {
+    ->action(function (string $startDate, string $endDate, string $period, Response $response, Document $project, Database $dbForProject, callable $getLogsDB, array $smsRates) {
        $stats = $total = $usage = [];
        $format = 'Y-m-d 00:00:00';
        $firstDay = (new DateTime($startDate))->format($format);
@@ -103,7 +102,7 @@ App::get('/v1/project/usage')
            '1d' => 'Y-m-d\T00:00:00.000P',
        };

-        $authorization->skip(function () use ($dbForProject, $dbForLogs, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
+        Authorization::skip(function () use ($dbForProject, $dbForLogs, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
            foreach ($metrics['total'] as $metric) {
                $db = ($metric === METRIC_FILES_IMAGES_TRANSFORMED) ? $dbForLogs : $dbForProject;

@@ -287,7 +286,7 @@ App::get('/v1/project/usage')
        }, $dbForProject->find('functions'));

        // This total is includes free and paid SMS usage
-        $authPhoneTotal = $authorization->skip(fn () => $dbForProject->sum('stats', 'value', [
+        $authPhoneTotal = Authorization::skip(fn () => $dbForProject->sum('stats', 'value', [
            Query::equal('metric', [METRIC_AUTH_METHOD_PHONE]),
            Query::equal('period', ['1d']),
            Query::greaterThanEqual('time', $firstDay),
@@ -295,7 +294,7 @@ App::get('/v1/project/usage')
        ]));

        // This estimate is only for paid SMS usage
-        $authPhoneMetrics = $authorization->skip(fn () => $dbForProject->find('stats', [
+        $authPhoneMetrics = Authorization::skip(fn () => $dbForProject->find('stats', [
            Query::startsWith('metric', METRIC_AUTH_METHOD_PHONE . '.'),
            Query::equal('period', ['1d']),
            Query::greaterThanEqual('time', $firstDay),
@@ -563,7 +563,6 @@ App::patch('/v1/projects/:projectId/api')
                since: '1.8.0',
                replaceWith: 'projects.updateAPIStatus',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -621,7 +620,6 @@ App::patch('/v1/projects/:projectId/api/all')
                since: '1.8.0',
                replaceWith: 'projects.updateAPIStatusAll',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -2026,7 +2024,6 @@ App::patch('/v1/projects/:projectId/smtp')
                since: '1.8.0',
                replaceWith: 'projects.updateSMTP',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -2143,7 +2140,6 @@ App::post('/v1/projects/:projectId/smtp/tests')
                since: '1.8.0',
                replaceWith: 'projects.createSMTPTest',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -2238,7 +2234,6 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
                since: '1.8.0',
                replaceWith: 'projects.getSMSTemplate',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -2405,7 +2400,6 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
                since: '1.8.0',
                replaceWith: 'projects.updateSMSTemplate',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -2530,7 +2524,6 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
                since: '1.8.0',
                replaceWith: 'projects.deleteSMSTemplate',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'projects',
@@ -32,7 +32,6 @@ use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\UID;
@@ -69,7 +68,7 @@ App::post('/v1/storage/buckets')
        group: 'buckets',
        name: 'createBucket',
        description: '/docs/references/storage/create-bucket.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -174,7 +173,7 @@ App::get('/v1/storage/buckets')
        group: 'buckets',
        name: 'listBuckets',
        description: '/docs/references/storage/list-buckets.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -249,7 +248,7 @@ App::get('/v1/storage/buckets/:bucketId')
        group: 'buckets',
        name: 'getBucket',
        description: '/docs/references/storage/get-bucket.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -284,7 +283,7 @@ App::put('/v1/storage/buckets/:bucketId')
        group: 'buckets',
        name: 'updateBucket',
        description: '/docs/references/storage/update-bucket.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -358,7 +357,7 @@ App::delete('/v1/storage/buckets/:bucketId')
        group: 'buckets',
        name: 'deleteBucket',
        description: '/docs/references/storage/delete-bucket.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -412,7 +411,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
        group: 'files',
        name: 'createFile',
        description: '/docs/references/storage/create-file.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -434,20 +433,20 @@ App::post('/v1/storage/buckets/:bucketId/files')
    ->inject('mode')
    ->inject('deviceForFiles')
    ->inject('deviceForLocal')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode, Device $deviceForFiles, Device $deviceForLocal, Authorization $authorization) {
+    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $permissions, Request $request, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode, Device $deviceForFiles, Device $deviceForLocal) {

-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        if (!$authorization->isValid(new Input(Database::PERMISSION_CREATE, $bucket->getCreate()))) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+        $validator = new Authorization(Database::PERMISSION_CREATE);
+        if (!$validator->isValid($bucket->getCreate())) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        $allowedPermissions = [
@@ -470,7 +469,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
        }

        // Users can only manage their own roles, API keys and Admin users can manage any
-        $roles = $authorization->getRoles();
+        $roles = Authorization::getRoles();
        if (!User::isApp($roles) && !User::isPrivileged($roles)) {
            foreach (Database::PERMISSIONS as $type) {
                foreach ($permissions as $permission) {
@@ -483,7 +482,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
                        $permission->getIdentifier(),
                        $permission->getDimension()
                    ))->toString();
-                    if (!$authorization->hasRole($role)) {
+                    if (!Authorization::isRole($role)) {
                        throw new Exception(Exception::USER_UNAUTHORIZED, 'Permissions must be one of: (' . \implode(', ', $roles) . ')');
                    }
                }
@@ -709,10 +708,11 @@ App::post('/v1/storage/buckets/:bucketId/files')
                 * However as with chunk upload even if we are updating, we are essentially creating a file
                 * adding it's new chunk so we validate create permission instead of update
                 */
-                if (!$authorization->isValid(new Input(Database::PERMISSION_CREATE, $bucket->getCreate()))) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+                $validator = new Authorization(Database::PERMISSION_CREATE);
+                if (!$validator->isValid($bucket->getCreate())) {
+                    throw new Exception(Exception::USER_UNAUTHORIZED);
                }
-                $file = $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
+                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
            }
        } else {
            if ($file->isEmpty()) {
@@ -753,12 +753,13 @@ App::post('/v1/storage/buckets/:bucketId/files')
                 * However as with chunk upload even if we are updating, we are essentially creating a file
                 * adding it's new chunk so we validate create permission instead of update
                 */
-                if (!$authorization->isValid(new Input(Database::PERMISSION_CREATE, $bucket->getCreate()))) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+                $validator = new Authorization(Database::PERMISSION_CREATE);
+                if (!$validator->isValid($bucket->getCreate())) {
+                    throw new Exception(Exception::USER_UNAUTHORIZED);
                }

                try {
-                    $file = $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
+                    $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
                } catch (NotFoundException) {
                    throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                }
@@ -788,7 +789,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
        group: 'files',
        name: 'listFiles',
        description: '/docs/references/storage/list-files.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -802,22 +803,22 @@ App::get('/v1/storage/buckets/:bucketId/files')
    ->param('total', true, new Boolean(true), 'When set to false, the total count returned will be 0 and will not be calculated.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('mode')
-    ->action(function (string $bucketId, array $queries, string $search, bool $includeTotal, Response $response, Database $dbForProject, Authorization $authorization, string $mode) {
-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->action(function (string $bucketId, array $queries, string $search, bool $includeTotal, Response $response, Database $dbForProject, string $mode) {
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
+        $validator = new Authorization(Database::PERMISSION_READ);
+        $valid = $validator->isValid($bucket->getRead());
        if (!$fileSecurity && !$valid) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        $queries = Query::parseQueries($queries);
@@ -846,7 +847,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
            if ($fileSecurity && !$valid) {
                $cursorDocument = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
            } else {
-                $cursorDocument = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+                $cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
            }

            if ($cursorDocument->isEmpty()) {
@@ -856,13 +857,15 @@ App::get('/v1/storage/buckets/:bucketId/files')
            $cursor->setValue($cursorDocument);
        }

+        $filterQueries = Query::groupByType($queries)['filters'];
+
        try {
            if ($fileSecurity && !$valid) {
                $files = $dbForProject->find('bucket_' . $bucket->getSequence(), $queries);
-                $total = $includeTotal ? $dbForProject->count('bucket_' . $bucket->getSequence(), $queries, APP_LIMIT_COUNT) : 0;
+                $total = $includeTotal ? $dbForProject->count('bucket_' . $bucket->getSequence(), $filterQueries, APP_LIMIT_COUNT) : 0;
            } else {
-                $files = $authorization->skip(fn () => $dbForProject->find('bucket_' . $bucket->getSequence(), $queries));
-                $total = $includeTotal ? $authorization->skip(fn () => $dbForProject->count('bucket_' . $bucket->getSequence(), $queries, APP_LIMIT_COUNT)) : 0;
+                $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getSequence(), $queries));
+                $total = $includeTotal ? Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getSequence(), $filterQueries, APP_LIMIT_COUNT)) : 0;
            }
        } catch (NotFoundException) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -889,7 +892,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
        group: 'files',
        name: 'getFile',
        description: '/docs/references/storage/get-file.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -901,28 +904,28 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
    ->param('fileId', '', new UID(), 'File ID.')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('mode')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Authorization $authorization, string $mode) {
-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, string $mode) {
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
+        $validator = new Authorization(Database::PERMISSION_READ);
+        $valid = $validator->isValid($bucket->getRead());
        if (!$fileSecurity && !$valid) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($fileSecurity && !$valid) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
-            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        }

        if ($file->isEmpty()) {
@@ -946,7 +949,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
        group: 'files',
        name: 'getFilePreview',
        description: '/docs/references/storage/get-file-preview.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -978,18 +981,17 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
    ->inject('deviceForFiles')
    ->inject('deviceForLocal')
    ->inject('project')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, ?string $token, Request $request, Response $response, Database $dbForProject, Document $resourceToken, Device $deviceForFiles, Device $deviceForLocal, Document $project, Authorization $authorization) {
+    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, ?string $token, Request $request, Response $response, Database $dbForProject, Document $resourceToken, Device $deviceForFiles, Device $deviceForLocal, Document $project) {

        if (!\extension_loaded('imagick')) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
        }

        /* @type Document $bucket */
-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1001,16 +1003,17 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')

        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
+        $validator = new Authorization(Database::PERMISSION_READ);
+        $valid = $validator->isValid($bucket->getRead());
        if (!$fileSecurity && !$valid && !$isToken) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($fileSecurity && !$valid && !$isToken) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
            /* @type Document $file */
-            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        }

        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
@@ -1132,11 +1135,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
        $contentType = (\array_key_exists($output, $outputs)) ? $outputs[$output] : $outputs['jpg'];

        //Do not update transformedAt if it's a console user
-        if (!User::isPrivileged($authorization->getRoles())) {
+        if (!User::isPrivileged(Authorization::getRoles())) {
            $transformedAt = $file->getAttribute('transformedAt', '');
            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
                $file->setAttribute('transformedAt', DateTime::now());
-                $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
+                Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
            }
        }

@@ -1159,7 +1162,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
        group: 'files',
        name: 'getFileDownload',
        description: '/docs/references/storage/get-file-download.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1176,16 +1179,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
    ->inject('request')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('mode')
    ->inject('resourceToken')
    ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, ?string $token, Request $request, Response $response, Database $dbForProject, Authorization $authorization, string $mode, Document $resourceToken, Device $deviceForFiles) {
+    ->action(function (string $bucketId, string $fileId, ?string $token, Request $request, Response $response, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles) {
        /* @type Document $bucket */
-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1193,20 +1195,21 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')

        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
+        $validator = new Authorization(Database::PERMISSION_READ);
+        $valid = $validator->isValid($bucket->getRead());
        if (!$fileSecurity && !$valid && !$isToken) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($fileSecurity && !$valid && !$isToken) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
            /* @type Document $file */
-            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        }

        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($file->isEmpty()) {
@@ -1320,7 +1323,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
        group: 'files',
        name: 'getFileView',
        description: '/docs/references/storage/get-file-view.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1340,13 +1343,12 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
    ->inject('mode')
    ->inject('resourceToken')
    ->inject('deviceForFiles')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $fileId, ?string $token, Response $response, Request $request, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles, Authorization $authorization) {
+    ->action(function (string $bucketId, string $fileId, ?string $token, Response $response, Request $request, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles) {
        /* @type Document $bucket */
-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1354,20 +1356,21 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')

        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
+        $validator = new Authorization(Database::PERMISSION_READ);
+        $valid = $validator->isValid($bucket->getRead());
        if (!$fileSecurity && !$valid && !$isToken) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($fileSecurity && !$valid && !$isToken) {
            $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
        } else {
            /* @type Document $file */
-            $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+            $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        }

        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        if ($file->isEmpty()) {
@@ -1496,8 +1499,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
    ->inject('project')
    ->inject('mode')
    ->inject('deviceForFiles')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $fileId, string $jwt, Response $response, Request $request, Database $dbForProject, Database $dbForPlatform, Document $project, string $mode, Device $deviceForFiles, Authorization $authorization) {
+    ->action(function (string $bucketId, string $fileId, string $jwt, Response $response, Request $request, Database $dbForProject, Database $dbForPlatform, Document $project, string $mode, Device $deviceForFiles) {
        $decoder = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);

        try {
@@ -1518,15 +1520,15 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
        $disposition = $decoded['disposition'] ?? 'inline';
        $dbForProject = $isInternal ? $dbForPlatform : $dbForProject;

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

-        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
        }
@@ -1534,6 +1536,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
        $mimes = Config::getParam('storage-mimes');

        $path = $file->getAttribute('path', '');
+
        if (!$deviceForFiles->exists($path)) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND, 'File not found in ' . $path);
        }
@@ -1653,7 +1656,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        group: 'files',
        name: 'updateFile',
        description: '/docs/references/storage/update-file.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1670,26 +1673,26 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
    ->inject('user')
    ->inject('mode')
    ->inject('queueForEvents')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $fileId, ?string $name, ?array $permissions, Response $response, Database $dbForProject, Document $user, string $mode, Event $queueForEvents, Authorization $authorization) {
+    ->action(function (string $bucketId, string $fileId, ?string $name, ?array $permissions, Response $response, Database $dbForProject, Document $user, string $mode, Event $queueForEvents) {

-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_UPDATE, $bucket->getUpdate()));
+        $validator = new Authorization(Database::PERMISSION_UPDATE);
+        $valid = $validator->isValid($bucket->getUpdate());
        if (!$fileSecurity && !$valid) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        // Read permission should not be required for update
-        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
@@ -1703,7 +1706,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
        ]);

        // Users can only manage their own roles, API keys and Admin users can manage any
-        $roles = $authorization->getRoles();
+        $roles = Authorization::getRoles();
        if (!User::isApp($roles) && !User::isPrivileged($roles) && !\is_null($permissions)) {
            foreach (Database::PERMISSIONS as $type) {
                foreach ($permissions as $permission) {
@@ -1716,7 +1719,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
                        $permission->getIdentifier(),
                        $permission->getDimension()
                    ))->toString();
-                    if (!$authorization->hasRole($role)) {
+                    if (!Authorization::isRole($role)) {
                        throw new Exception(Exception::USER_UNAUTHORIZED, 'Permissions must be one of: (' . \implode(', ', $roles) . ')');
                    }
                }
@@ -1737,7 +1740,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
            if ($fileSecurity && !$valid) {
                $file = $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file);
            } else {
-                $file = $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
+                $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getSequence(), $fileId, $file));
            }
        } catch (NotFoundException) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1768,7 +1771,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
        group: 'files',
        name: 'deleteFile',
        description: '/docs/references/storage/delete-file.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -1785,34 +1788,33 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
    ->inject('mode')
    ->inject('deviceForFiles')
    ->inject('queueForDeletes')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $queueForEvents, string $mode, Device $deviceForFiles, Delete $queueForDeletes, Authorization $authorization) {
-        $bucket = $authorization->skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $queueForEvents, string $mode, Device $deviceForFiles, Delete $queueForDeletes) {
+        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));

-        $isAPIKey = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+        $isAPIKey = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
        }

        $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-        $valid = $authorization->isValid(new Input(Database::PERMISSION_DELETE, $bucket->getDelete()));
+        $validator = new Authorization(Database::PERMISSION_DELETE);
+        $valid = $validator->isValid($bucket->getDelete());
        if (!$fileSecurity && !$valid) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        // Read permission should not be required for delete
-        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));

        if ($file->isEmpty()) {
            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
        }

        // Make sure we don't delete the file before the document permission check occurs
-        $validFile = $authorization->isValid(new Input(Database::PERMISSION_DELETE, $file->getDelete()));
-        if ($fileSecurity && !$valid && !$validFile) {
-            throw new Exception(Exception::USER_UNAUTHORIZED, $authorization->getDescription());
+        if ($fileSecurity && !$valid && !$validator->isValid($file->getDelete())) {
+            throw new Exception(Exception::USER_UNAUTHORIZED);
        }

        $deviceDeleted = false;
@@ -1836,7 +1838,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
                if ($fileSecurity && !$valid) {
                    $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getSequence(), $fileId);
                } else {
-                    $deleted = $authorization->skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getSequence(), $fileId));
+                    $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getSequence(), $fileId));
                }
            } catch (NotFoundException) {
                throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -1881,8 +1883,7 @@ App::get('/v1/storage/usage')
    ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('authorization')
-    ->action(function (string $range, Response $response, Database $dbForProject, Authorization $authorization) {
+    ->action(function (string $range, Response $response, Database $dbForProject) {

        $periods = Config::getParam('usage', []);
        $stats = $usage = [];
@@ -1894,7 +1895,7 @@ App::get('/v1/storage/usage')
        ];

        $total = [];
-        $authorization->skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
            foreach ($metrics as $metric) {
                $result = $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
@@ -1972,8 +1973,7 @@ App::get('/v1/storage/:bucketId/usage')
    ->inject('project')
    ->inject('dbForProject')
    ->inject('getLogsDB')
-    ->inject('authorization')
-    ->action(function (string $bucketId, string $range, Response $response, Document $project, Database $dbForProject, callable $getLogsDB, Authorization $authorization) {
+    ->action(function (string $bucketId, string $range, Response $response, Document $project, Database $dbForProject, callable $getLogsDB) {

        $dbForLogs = call_user_func($getLogsDB, $project);
        $bucket = $dbForProject->getDocument('buckets', $bucketId);
@@ -1991,7 +1991,7 @@ App::get('/v1/storage/:bucketId/usage')
            str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED),
        ];

-        $authorization->skip(function () use ($dbForProject, $dbForLogs, $bucket, $days, $metrics, &$stats) {
+        Authorization::skip(function () use ($dbForProject, $dbForLogs, $bucket, $days, $metrics, &$stats) {
            foreach ($metrics as $metric) {
                $db = ($metric === str_replace('{bucketInternalId}', $bucket->getSequence(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED))
                    ? $dbForLogs
@@ -58,6 +58,7 @@ use Utopia\Validator\ArrayList;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
+use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;

 App::post('/v1/teams')
@@ -72,7 +73,7 @@ App::post('/v1/teams')
        group: 'teams',
        name: 'create',
        description: '/docs/references/teams/create-team.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -86,17 +87,16 @@ App::post('/v1/teams')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Authorization $authorization, Event $queueForEvents) {
+    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {

-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
-        $isAppUser = User::isApp($authorization->getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());
+        $isAppUser = User::isApp(Authorization::getRoles());

        $teamId = $teamId == 'unique()' ? ID::unique() : $teamId;

        try {
-            $team = $authorization->skip(fn () => $dbForProject->createDocument('teams', new Document([
+            $team = Authorization::skip(fn () => $dbForProject->createDocument('teams', new Document([
                '$id' => $teamId,
                '$permissions' => [
                    Permission::read(Role::team($teamId)),
@@ -164,7 +164,7 @@ App::get('/v1/teams')
        group: 'teams',
        name: 'list',
        description: '/docs/references/teams/list-teams.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -238,7 +238,7 @@ App::get('/v1/teams/:teamId')
        group: 'teams',
        name: 'get',
        description: '/docs/references/teams/get-team.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -269,7 +269,7 @@ App::get('/v1/teams/:teamId/prefs')
        group: 'teams',
        name: 'getPrefs',
        description: '/docs/references/teams/get-team-prefs.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -311,7 +311,7 @@ App::put('/v1/teams/:teamId')
        group: 'teams',
        name: 'updateName',
        description: '/docs/references/teams/update-team-name.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -357,7 +357,7 @@ App::put('/v1/teams/:teamId/prefs')
        group: 'teams',
        name: 'updatePrefs',
        description: '/docs/references/teams/update-team-prefs.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -404,7 +404,7 @@ App::delete('/v1/teams/:teamId')
        group: 'teams',
        name: 'delete',
        description: '/docs/references/teams/delete-team.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -463,7 +463,7 @@ App::post('/v1/teams/:teamId/memberships')
        group: 'memberships',
        name: 'createMembership',
        description: '/docs/references/teams/create-team-membership.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -486,13 +486,12 @@ App::post('/v1/teams/:teamId/memberships')
        }
        return new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE);
    }, 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', false, ['project'])
-    ->param('url', '', fn ($redirectValidator) => $redirectValidator, 'URL to redirect the user back to your app from the invitation email. This parameter is not required when an API key is supplied. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['redirectValidator']) // TODO add our own built-in confirm page
+    ->param('url', '', fn ($platforms, $devKey) => $devKey->isEmpty() ? new Redirect($platforms) : new URL(), 'URL to redirect the user back to your app from the invitation email. This parameter is not required when an API key is supplied. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['platforms', 'devKey']) // TODO add our own built-in confirm page
    ->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
    ->inject('response')
    ->inject('project')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('locale')
    ->inject('queueForMails')
    ->inject('queueForMessaging')
@@ -502,9 +501,9 @@ App::post('/v1/teams/:teamId/memberships')
    ->inject('plan')
    ->inject('proofForPassword')
    ->inject('proofForToken')
-    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Authorization $authorization, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan, Password $proofForPassword, Token $proofForToken) {
-        $isAppUser = User::isApp($authorization->getRoles());
-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $queueForMails, Messaging $queueForMessaging, Event $queueForEvents, callable $timelimit, StatsUsage $queueForStatsUsage, array $plan, Password $proofForPassword, Token $proofForToken) {
+        $isAppUser = User::isApp(Authorization::getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

        $url = htmlentities($url);
        if (empty($url)) {
@@ -621,13 +620,13 @@ App::post('/v1/teams/:teamId/memberships')
            ]);

            try {
-                $invitee = $authorization->skip(fn () => $dbForProject->createDocument('users', $userDocument));
+                $invitee = Authorization::skip(fn () => $dbForProject->createDocument('users', $userDocument));
            } catch (Duplicate $th) {
                throw new Exception(Exception::USER_ALREADY_EXISTS);
            }
        }

-        $isOwner = $authorization->hasRole('team:' . $team->getId() . '/owner');
+        $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');

        if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
            throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to send invitations for this team');
@@ -663,11 +662,11 @@ App::post('/v1/teams/:teamId/memberships')
            ]);

            $membership = ($isPrivilegedUser || $isAppUser) ?
-                $authorization->skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
+                Authorization::skip(fn () => $dbForProject->createDocument('memberships', $membership)) :
                $dbForProject->createDocument('memberships', $membership);

            if ($isPrivilegedUser || $isAppUser) {
-                $authorization->skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
+                Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
            }
        } elseif ($membership->getAttribute('confirm') === false) {
            $membership->setAttribute('secret', $proofForToken->hash($secret));
@@ -679,7 +678,7 @@ App::post('/v1/teams/:teamId/memberships')
            }

            $membership = ($isPrivilegedUser || $isAppUser) ?
-                $authorization->skip(fn () => $dbForProject->updateDocument('memberships', $membership->getId(), $membership)) :
+                Authorization::skip(fn () => $dbForProject->updateDocument('memberships', $membership->getId(), $membership)) :
                $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
        } else {
            throw new Exception(Exception::MEMBERSHIP_ALREADY_CONFIRMED);
@@ -850,7 +849,7 @@ App::get('/v1/teams/:teamId/memberships')
        group: 'memberships',
        name: 'listMemberships',
        description: '/docs/references/teams/list-team-members.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -865,8 +864,7 @@ App::get('/v1/teams/:teamId/memberships')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('authorization')
-    ->action(function (string $teamId, array $queries, string $search, bool $includeTotal, Response $response, Document $project, Database $dbForProject, Authorization $authorization) {
+    ->action(function (string $teamId, array $queries, string $search, bool $includeTotal, Response $response, Document $project, Database $dbForProject) {
        $team = $dbForProject->getDocument('teams', $teamId);

        if ($team->isEmpty()) {
@@ -936,7 +934,7 @@ App::get('/v1/teams/:teamId/memberships')
            'mfa' => $project->getAttribute('auths', [])['membershipsMfa'] ?? true,
        ];

-        $roles = $authorization->getRoles();
+        $roles = Authorization::getRoles();
        $isPrivilegedUser = User::isPrivileged($roles);
        $isAppUser = User::isApp($roles);

@@ -994,7 +992,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
        group: 'memberships',
        name: 'getMembership',
        description: '/docs/references/teams/get-team-member.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1007,8 +1005,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('authorization')
-    ->action(function (string $teamId, string $membershipId, Response $response, Document $project, Database $dbForProject, Authorization $authorization) {
+    ->action(function (string $teamId, string $membershipId, Response $response, Document $project, Database $dbForProject) {

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

@@ -1028,7 +1025,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
            'mfa' => $project->getAttribute('auths', [])['membershipsMfa'] ?? true,
        ];

-        $roles = $authorization->getRoles();
+        $roles = Authorization::getRoles();
        $isPrivilegedUser = User::isPrivileged($roles);
        $isAppUser = User::isApp($roles);

@@ -1082,7 +1079,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
        group: 'memberships',
        name: 'updateMembership',
        description: '/docs/references/teams/update-team-membership.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1107,9 +1104,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('user')
    ->inject('project')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Authorization $authorization, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {

        $team = $dbForProject->getDocument('teams', $teamId);
        if ($team->isEmpty()) {
@@ -1126,9 +1122,9 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
            throw new Exception(Exception::USER_NOT_FOUND);
        }

-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
-        $isAppUser = User::isApp($authorization->getRoles());
-        $isOwner = $authorization->hasRole('team:' . $team->getId() . '/owner');
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());
+        $isAppUser = User::isApp(Authorization::getRoles());
+        $isOwner = Authorization::isRole('team:' . $team->getId() . '/owner');

        if ($project->getId() === 'console') {
            // Quick check: fetch up to 2 owners to determine if only one exists
@@ -1193,7 +1189,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
        group: 'memberships',
        name: 'updateMembershipStatus',
        description: '/docs/references/teams/update-team-membership-status.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1209,13 +1205,12 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
    ->inject('response')
    ->inject('user')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('project')
    ->inject('geodb')
    ->inject('queueForEvents')
    ->inject('store')
    ->inject('proofForToken')
-    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Authorization $authorization, $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken) {
+    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $queueForEvents, Store $store, Token $proofForToken) {
        $protocol = $request->getProtocol();

        $membership = $dbForProject->getDocument('memberships', $membershipId);
@@ -1224,7 +1219,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            throw new Exception(Exception::MEMBERSHIP_NOT_FOUND);
        }

-        $team = $authorization->skip(fn () => $dbForProject->getDocument('teams', $teamId));
+        $team = Authorization::skip(fn () => $dbForProject->getDocument('teams', $teamId));

        if ($team->isEmpty()) {
            throw new Exception(Exception::TEAM_NOT_FOUND);
@@ -1260,11 +1255,11 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
            ->setAttribute('confirm', true)
        ;

-        $authorization->skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));
+        Authorization::skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));

        // Create session for the user if not logged in
        if (!$hasSession) {
-            $authorization->addRole(Role::user($user->getId())->toString());
+            Authorization::setRole(Role::user($user->getId())->toString());

            $detector = new Detector($request->getUserAgent('UNKNOWN'));
            $record = $geodb->get($request->getIP());
@@ -1292,7 +1287,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')

            $session = $dbForProject->createDocument('sessions', $session);

-            $authorization->addRole(Role::user($userId)->toString());
+            Authorization::setRole(Role::user($userId)->toString());

            $encoded = $store
                ->setProperty('id', $user->getId())
@@ -1330,7 +1325,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')

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

-        $authorization->skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));
+        Authorization::skip(fn () => $dbForProject->increaseDocumentAttribute('teams', $team->getId(), 'total', 1));

        $queueForEvents
            ->setParam('userId', $user->getId())
@@ -1359,7 +1354,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
        group: 'memberships',
        name: 'deleteMembership',
        description: '/docs/references/teams/delete-team-membership.md',
-        auth: [AuthType::ADMIN, AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -1374,9 +1369,8 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
    ->inject('project')
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('authorization')
    ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, Document $user, Document $project, Response $response, Database $dbForProject, Authorization $authorization, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, Document $user, Document $project, Response $response, Database $dbForProject, Event $queueForEvents) {

        $membership = $dbForProject->getDocument('memberships', $membershipId);

@@ -1434,7 +1428,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
        $dbForProject->purgeCachedDocument('users', $profile->getId());

        if ($membership->getAttribute('confirm')) { // Count only confirmed members
-            $authorization->skip(fn () => $dbForProject->decreaseDocumentAttribute('teams', $team->getId(), 'total', 1, 0));
+            Authorization::skip(fn () => $dbForProject->decreaseDocumentAttribute('teams', $team->getId(), 'total', 1, 0));
        }

        $queueForEvents
@@ -1485,6 +1479,12 @@ App::get('/v1/teams/:teamId/logs')
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }

+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
+
        $audit = new Audit($dbForProject);
        $resource = 'team/' . $team->getId();
        $logs = $audit->getLogsByResource($resource, $queries);
@@ -238,7 +238,7 @@ App::post('/v1/users')
        group: 'users',
        name: 'create',
        description: '/docs/references/users/create-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -275,7 +275,7 @@ App::post('/v1/users/bcrypt')
        group: 'users',
        name: 'createBcryptUser',
        description: '/docs/references/users/create-bcrypt-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -313,7 +313,7 @@ App::post('/v1/users/md5')
        group: 'users',
        name: 'createMD5User',
        description: '/docs/references/users/create-md5-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -350,7 +350,7 @@ App::post('/v1/users/argon2')
        group: 'users',
        name: 'createArgon2User',
        description: '/docs/references/users/create-argon2-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -387,7 +387,7 @@ App::post('/v1/users/sha')
        group: 'users',
        name: 'createSHAUser',
        description: '/docs/references/users/create-sha-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -428,7 +428,7 @@ App::post('/v1/users/phpass')
        group: 'users',
        name: 'createPHPassUser',
        description: '/docs/references/users/create-phpass-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -465,7 +465,7 @@ App::post('/v1/users/scrypt')
        group: 'users',
        name: 'createScryptUser',
        description: '/docs/references/users/create-scrypt-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -513,7 +513,7 @@ App::post('/v1/users/scrypt-modified')
        group: 'users',
        name: 'createScryptModifiedUser',
        description: '/docs/references/users/create-scrypt-modified-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -650,7 +650,7 @@ App::get('/v1/users')
        group: 'users',
        name: 'list',
        description: '/docs/references/users/list-users.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -729,7 +729,7 @@ App::get('/v1/users/:userId')
        group: 'users',
        name: 'get',
        description: '/docs/references/users/get-user.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -760,7 +760,7 @@ App::get('/v1/users/:userId/prefs')
        group: 'users',
        name: 'getPrefs',
        description: '/docs/references/users/get-user-prefs.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -831,7 +831,7 @@ App::get('/v1/users/:userId/sessions')
        group: 'sessions',
        name: 'listSessions',
        description: '/docs/references/users/list-user-sessions.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -875,7 +875,7 @@ App::get('/v1/users/:userId/memberships')
        group: 'memberships',
        name: 'listMemberships',
        description: '/docs/references/users/list-user-memberships.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -930,7 +930,7 @@ App::get('/v1/users/:userId/logs')
        group: 'logs',
        name: 'listLogs',
        description: '/docs/references/users/list-user-logs.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -957,7 +957,11 @@ App::get('/v1/users/:userId/logs')
        } catch (QueryException $e) {
            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
        }
-
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
        $audit = new Audit($dbForProject);
        $logs = $audit->getLogsByUser($user->getSequence(), $queries);
        $output = [];
@@ -1078,7 +1082,7 @@ App::get('/v1/users/identities')
        group: 'identities',
        name: 'listIdentities',
        description: '/docs/references/users/list-identities.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1148,7 +1152,7 @@ App::patch('/v1/users/:userId/status')
        group: 'users',
        name: 'updateStatus',
        description: '/docs/references/users/update-user-status.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1189,7 +1193,7 @@ App::put('/v1/users/:userId/labels')
        group: 'users',
        name: 'updateLabels',
        description: '/docs/references/users/update-user-labels.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1232,7 +1236,7 @@ App::patch('/v1/users/:userId/verification/phone')
        group: 'users',
        name: 'updatePhoneVerification',
        description: '/docs/references/users/update-user-phone-verification.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1274,7 +1278,7 @@ App::patch('/v1/users/:userId/name')
        group: 'users',
        name: 'updateName',
        description: '/docs/references/users/update-user-name.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1317,7 +1321,7 @@ App::patch('/v1/users/:userId/password')
        group: 'users',
        name: 'updatePassword',
        description: '/docs/references/users/update-user-password.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1416,7 +1420,7 @@ App::patch('/v1/users/:userId/email')
        group: 'users',
        name: 'updateEmail',
        description: '/docs/references/users/update-user-email.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1527,7 +1531,7 @@ App::patch('/v1/users/:userId/phone')
        group: 'users',
        name: 'updatePhone',
        description: '/docs/references/users/update-user-phone.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1617,7 +1621,7 @@ App::patch('/v1/users/:userId/verification')
        group: 'users',
        name: 'updateEmailVerification',
        description: '/docs/references/users/update-user-email-verification.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1655,7 +1659,7 @@ App::patch('/v1/users/:userId/prefs')
        group: 'users',
        name: 'updatePrefs',
        description: '/docs/references/users/update-user-prefs.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_OK,
@@ -1802,7 +1806,7 @@ App::patch('/v1/users/:userId/mfa')
            group: 'users',
            name: 'updateMfa',
            description: '/docs/references/users/update-user-mfa.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -1813,14 +1817,13 @@ App::patch('/v1/users/:userId/mfa')
                since: '1.8.0',
                replaceWith: 'users.updateMFA',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'users',
            group: 'users',
            name: 'updateMFA',
            description: '/docs/references/users/update-user-mfa.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -1862,7 +1865,7 @@ App::get('/v1/users/:userId/mfa/factors')
            group: 'mfa',
            name: 'listMfaFactors',
            description: '/docs/references/users/list-mfa-factors.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -1873,14 +1876,13 @@ App::get('/v1/users/:userId/mfa/factors')
                since: '1.8.0',
                replaceWith: 'users.listMFAFactors',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'users',
            group: 'mfa',
            name: 'listMFAFactors',
            description: '/docs/references/users/list-mfa-factors.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -1921,7 +1923,7 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
            group: 'mfa',
            name: 'getMfaRecoveryCodes',
            description: '/docs/references/users/get-mfa-recovery-codes.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -1932,14 +1934,13 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
                since: '1.8.0',
                replaceWith: 'users.getMFARecoveryCodes',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'users',
            group: 'mfa',
            name: 'getMFARecoveryCodes',
            description: '/docs/references/users/get-mfa-recovery-codes.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -1986,7 +1987,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
            group: 'mfa',
            name: 'createMfaRecoveryCodes',
            description: '/docs/references/users/create-mfa-recovery-codes.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_CREATED,
@@ -1997,14 +1998,13 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
                since: '1.8.0',
                replaceWith: 'users.createMFARecoveryCodes',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'users',
            group: 'mfa',
            name: 'createMFARecoveryCodes',
            description: '/docs/references/users/create-mfa-recovery-codes.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_CREATED,
@@ -2058,7 +2058,7 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
            group: 'mfa',
            name: 'updateMfaRecoveryCodes',
            description: '/docs/references/users/update-mfa-recovery-codes.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
@@ -2069,21 +2069,19 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
                since: '1.8.0',
                replaceWith: 'users.updateMFARecoveryCodes',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'users',
            group: 'mfa',
            name: 'updateMFARecoveryCodes',
            description: '/docs/references/users/update-mfa-recovery-codes.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_OK,
                    model: Response::MODEL_MFA_RECOVERY_CODES,
                )
-            ],
-            public: false,
+            ]
        )
    ])
    ->param('userId', '', new UID(), 'User ID.')
@@ -2130,7 +2128,7 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
            group: 'mfa',
            name: 'deleteMfaAuthenticator',
            description: '/docs/references/users/delete-mfa-authenticator.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_NOCONTENT,
@@ -2142,14 +2140,13 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
                since: '1.8.0',
                replaceWith: 'users.deleteMFAAuthenticator',
            ),
-            public: false,
        ),
        new Method(
            namespace: 'users',
            group: 'mfa',
            name: 'deleteMFAAuthenticator',
            description: '/docs/references/users/delete-mfa-authenticator.md',
-            auth: [AuthType::ADMIN, AuthType::KEY],
+            auth: [AuthType::KEY],
            responses: [
                new SDKResponse(
                    code: Response::STATUS_CODE_NOCONTENT,
@@ -2198,7 +2195,7 @@ App::post('/v1/users/:userId/sessions')
        group: 'sessions',
        name: 'createSession',
        description: '/docs/references/users/create-session.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -2290,7 +2287,7 @@ App::post('/v1/users/:userId/tokens')
        group: 'sessions',
        name: 'createToken',
        description: '/docs/references/users/create-token.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -2355,7 +2352,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
        group: 'sessions',
        name: 'deleteSession',
        description: '/docs/references/users/delete-user-session.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -2406,7 +2403,7 @@ App::delete('/v1/users/:userId/sessions')
        group: 'sessions',
        name: 'deleteSessions',
        description: '/docs/references/users/delete-user-sessions.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -2456,7 +2453,7 @@ App::delete('/v1/users/:userId')
        group: 'users',
        name: 'delete',
        description: '/docs/references/users/delete.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -2566,7 +2563,7 @@ App::delete('/v1/users/identities/:identityId')
        group: 'identities',
        name: 'deleteIdentity',
        description: '/docs/references/users/delete-identity.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_NOCONTENT,
@@ -2606,7 +2603,7 @@ App::post('/v1/users/:userId/jwts')
        group: 'sessions',
        name: 'createJWT',
        description: '/docs/references/users/create-user-jwt.md',
-        auth: [AuthType::ADMIN, AuthType::KEY],
+        auth: [AuthType::KEY],
        responses: [
            new SDKResponse(
                code: Response::STATUS_CODE_CREATED,
@@ -2674,8 +2671,8 @@ App::get('/v1/users/usage')
    ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
    ->inject('response')
    ->inject('dbForProject')
-    ->inject('authorization')
-    ->action(function (string $range, Response $response, Database $dbForProject, Authorization $authorization) {
+    ->inject('register')
+    ->action(function (string $range, Response $response, Database $dbForProject) {

        $periods = Config::getParam('usage', []);
        $stats = $usage = [];
@@ -2685,7 +2682,7 @@ App::get('/v1/users/usage')
            METRIC_SESSIONS,
        ];

-        $authorization->skip(function () use ($dbForProject, $days, $metrics, &$stats) {
+        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
            foreach ($metrics as $count => $metric) {
                $result =  $dbForProject->findOne('stats', [
                    Query::equal('metric', [$metric]),
@@ -4,6 +4,7 @@ use Appwrite\Auth\OAuth2\Github as OAuth2Github;
 use Appwrite\Event\Build;
 use Appwrite\Event\Delete;
 use Appwrite\Extend\Exception;
+use Appwrite\Network\Validator\Redirect;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -76,7 +77,7 @@ use Utopia\VCS\Exception\RepositoryNotFound;

 use function Swoole\Coroutine\batch;

-$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForPlatform, Authorization $authorization, Build $queueForBuilds, callable $getProjectDB, Request $request, array $platform) {
+$createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForPlatform, Build $queueForBuilds, callable $getProjectDB, Request $request) {
    $errors = [];
    foreach ($repositories as $repository) {
        try {
@@ -87,12 +88,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            }

            $projectId = $repository->getAttribute('projectId');
-            $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+            $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
            $dbForProject = $getProjectDB($project);

            $resourceCollection = $resourceType === "function" ? 'functions' : 'sites';
            $resourceId = $repository->getAttribute('resourceId');
-            $resource = $authorization->skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
+            $resource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
            $resourceInternalId = $resource->getSequence();

            $deploymentId = ID::unique();
@@ -132,7 +133,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId

            $commentStatus = $isAuthorized ? 'waiting' : 'failed';
            $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
-            $hostname = $platform['consoleHostname'] ?? '';
+            $hostname = System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', ''));

            $authorizeUrl = $protocol . '://' . $hostname . "/console/git/authorize-contributor?projectId={$projectId}&installationId={$installationId}&repositoryId={$repositoryId}&providerPullRequestId={$providerPullRequestId}";

@@ -141,7 +142,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
            $latestCommentId = '';

            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
-                $latestComment = $authorization->skip(fn () => $dbForPlatform->findOne('vcsComments', [
+                $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerPullRequestId', [$providerPullRequestId]),
                    Query::orderDesc('$createdAt'),
@@ -174,24 +175,24 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    if ($lockAcquired) {
                        // Wrap in try/finally to ensure lock file gets deleted
                        try {
-                            $comment = new Comment($platform);
+                            $comment = new Comment();
                            $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
                            $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');

                            $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                        } finally {
-                            $authorization->skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
+                            Authorization::skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
                        }
                    }
                } else {
-                    $comment = new Comment($platform);
+                    $comment = new Comment();
                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
                    $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));

                    if (!empty($latestCommentId)) {
                        $teamId = $project->getAttribute('teamId', '');

-                        $latestComment = $authorization->skip(fn () => $dbForPlatform->createDocument('vcsComments', new Document([
+                        $latestComment = Authorization::skip(fn () => $dbForPlatform->createDocument('vcsComments', new Document([
                            '$id' => ID::unique(),
                            '$permissions' => [
                                Permission::read(Role::team(ID::custom($teamId))),
@@ -212,7 +213,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    }
                }
            } elseif (!empty($providerBranch)) {
-                $latestComments = $authorization->skip(fn () => $dbForPlatform->find('vcsComments', [
+                $latestComments = Authorization::skip(fn () => $dbForPlatform->find('vcsComments', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::equal('providerBranch', [$providerBranch]),
                    Query::orderDesc('$createdAt'),
@@ -245,13 +246,13 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    if ($lockAcquired) {
                        // Wrap in try/finally to ensure lock file gets deleted
                        try {
-                            $comment = new Comment($platform);
+                            $comment = new Comment();
                            $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
                            $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');

                            $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                        } finally {
-                            $authorization->skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
+                            Authorization::skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
                        }
                    }
                }
@@ -294,7 +295,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                $commands[] = $resource->getAttribute('commands', '');
            }

-            $deployment = $authorization->skip(fn () => $dbForProject->createDocument('deployments', new Document([
+            $deployment = Authorization::skip(fn () => $dbForProject->createDocument('deployments', new Document([
                '$id' => $deploymentId,
                '$permissions' => [
                    Permission::read(Role::any()),
@@ -334,7 +335,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                ->setAttribute('latestDeploymentInternalId', $deployment->getSequence())
                ->setAttribute('latestDeploymentCreatedAt', $deployment->getCreatedAt())
                ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
-            $authorization->skip(fn () => $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource));
+            Authorization::skip(fn () => $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource));

            if ($resource->getCollection() === 'sites') {
                $projectId = $project->getId();
@@ -344,7 +345,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                $domain = ID::unique() . "." . $sitesDomain;
                $ruleId = md5($domain);
                $previewRuleId = $ruleId;
-                $authorization->skip(
+                Authorization::skip(
                    fn () => $dbForPlatform->createDocument('rules', new Document([
                        '$id' => $ruleId,
                        'projectId' => $project->getId(),
@@ -377,7 +378,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    $domain = "branch-{$branchPrefix}-{$resourceProjectHash}.{$sitesDomain}";
                    $ruleId = md5($domain);
                    try {
-                        $authorization->skip(
+                        Authorization::skip(
                            fn () => $dbForPlatform->createDocument('rules', new Document([
                                '$id' => $ruleId,
                                'projectId' => $project->getId(),
@@ -408,7 +409,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                    $domain = "commit-" . substr($providerCommitHash, 0, 16) . ".{$sitesDomain}";
                    $ruleId = md5($domain);
                    try {
-                        $authorization->skip(
+                        Authorization::skip(
                            fn () => $dbForPlatform->createDocument('rules', new Document([
                                '$id' => $ruleId,
                                'projectId' => $project->getId(),
@@ -460,19 +461,19 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                if ($lockAcquired) {
                    // Wrap in try/finally to ensure lock file gets deleted
                    try {
-                        $rule = $authorization->skip(fn () => $dbForPlatform->getDocument('rules', $previewRuleId));
+                        $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', $previewRuleId));

                        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
                        $previewUrl = !empty($rule) ? ("{$protocol}://" . $rule->getAttribute('domain', '')) : '';

                        if (!empty($previewUrl)) {
-                            $comment = new Comment($platform);
+                            $comment = new Comment();
                            $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
                            $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, $previewUrl);
                            $github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment());
                        }
                    } finally {
-                        $authorization->skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
+                        Authorization::skip(fn () => $dbForPlatform->deleteDocument('vcsCommentLocks', $latestCommentId));
                    }
                }
            }
@@ -541,12 +542,12 @@ App::get('/v1/vcs/github/authorize')
        type: MethodType::WEBAUTH,
        hide: true,
    ))
-    ->param('success', '', fn ($redirectValidator) => $redirectValidator, 'URL to redirect back to console after a successful installation attempt.', true, ['redirectValidator'])
-    ->param('failure', '', fn ($redirectValidator) => $redirectValidator, 'URL to redirect back to console after a failed installation attempt.', true, ['redirectValidator'])
+    ->param('success', '', fn ($platforms) => new Redirect($platforms), 'URL to redirect back to console after a successful installation attempt.', true, ['platforms'])
+    ->param('failure', '', fn ($platforms) => new Redirect($platforms), 'URL to redirect back to console after a failed installation attempt.', true, ['platforms'])
+    ->inject('request')
    ->inject('response')
    ->inject('project')
-    ->inject('platform')
-    ->action(function (string $success, string $failure, Response $response, Document $project, array $platform) {
+    ->action(function (string $success, string $failure, Request $request, Response $response, Document $project) {
        $state = \json_encode([
            'projectId' => $project->getId(),
            'success' => $success,
@@ -555,7 +556,7 @@ App::get('/v1/vcs/github/authorize')

        $appName = System::getEnv('_APP_VCS_GITHUB_APP_NAME');
        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
-        $hostname = $platform['consoleHostname'] ?? '';
+        $hostname = System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', ''));

        if (empty($appName)) {
            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'GitHub App name is not configured. Please configure VCS (Version Control System) variables in .env file.');
@@ -584,10 +585,10 @@ App::get('/v1/vcs/github/callback')
    ->inject('gitHub')
    ->inject('user')
    ->inject('project')
+    ->inject('request')
    ->inject('response')
    ->inject('dbForPlatform')
-    ->inject('platform')
-    ->action(function (string $providerInstallationId, string $setupAction, string $state, string $code, GitHub $github, Document $user, Document $project, Response $response, Database $dbForPlatform, array $platform) {
+    ->action(function (string $providerInstallationId, string $setupAction, string $state, string $code, GitHub $github, Document $user, Document $project, Request $request, Response $response, Database $dbForPlatform) {
        if (empty($state)) {
            $error = 'Installation requests from organisation members for the Appwrite GitHub App are currently unsupported. To proceed with the installation, login to the Appwrite Console and install the GitHub App.';
            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $error);
@@ -614,7 +615,7 @@ App::get('/v1/vcs/github/callback')

        $region = $project->getAttribute('region', 'default');
        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
-        $hostname = $platform['consoleHostname'] ?? '';
+        $hostname = System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', ''));

        $defaultState = [
            'success' => $protocol . '://' . $hostname . "/console/project-$region-$projectId/settings/git-installations",
@@ -1476,12 +1477,10 @@ App::post('/v1/vcs/github/events')
    ->inject('request')
    ->inject('response')
    ->inject('dbForPlatform')
-    ->inject('authorization')
    ->inject('getProjectDB')
    ->inject('queueForBuilds')
-    ->inject('platform')
    ->action(
-        function (GitHub $github, Request $request, Response $response, Database $dbForPlatform, Authorization $authorization, callable $getProjectDB, Build $queueForBuilds, array $platform) use ($createGitDeployments) {
+        function (GitHub $github, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
            $payload = $request->getRawPayload();
            $signatureRemote = $request->getHeader('x-hub-signature-256', '');
            $signatureLocal = System::getEnv('_APP_VCS_GITHUB_WEBHOOK_SECRET', '');
@@ -1517,14 +1516,14 @@ App::post('/v1/vcs/github/events')
                $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);

                //find resourceId from relevant resources table
-                $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                    Query::equal('providerRepositoryId', [$providerRepositoryId]),
                    Query::limit(100),
                ]));

                // create new deployment only on push (not committed by us) and not when branch is created or deleted
                if ($providerCommitAuthorEmail !== APP_VCS_GITHUB_EMAIL && !$providerBranchCreated && !$providerBranchDeleted) {
-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthorName, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $request, $platform);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthorName, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, '', false, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);
                }
            } elseif ($event == $github::EVENT_INSTALLATION) {
                if ($parsedPayload["action"] == "deleted") {
@@ -1537,16 +1536,16 @@ App::post('/v1/vcs/github/events')
                    ]);

                    foreach ($installations as $installation) {
-                        $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                        $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                            Query::equal('installationInternalId', [$installation->getSequence()]),
                            Query::limit(1000)
                        ]));

                        foreach ($repositories as $repository) {
-                            $authorization->skip(fn () => $dbForPlatform->deleteDocument('repositories', $repository->getId()));
+                            Authorization::skip(fn () => $dbForPlatform->deleteDocument('repositories', $repository->getId()));
                        }

-                        $authorization->skip(fn () => $dbForPlatform->deleteDocument('installations', $installation->getId()));
+                        Authorization::skip(fn () => $dbForPlatform->deleteDocument('installations', $installation->getId()));
                    }
                }
            } elseif ($event == $github::EVENT_PULL_REQUEST) {
@@ -1575,12 +1574,12 @@ App::post('/v1/vcs/github/events')
                    $providerCommitAuthor = $commitDetails["commitAuthor"] ?? '';
                    $providerCommitMessage = $commitDetails["commitMessage"] ?? '';

-                    $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                    $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                        Query::equal('providerRepositoryId', [$providerRepositoryId]),
                        Query::orderDesc('$createdAt')
                    ]));

-                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $request, $platform);
+                    $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerBranchUrl, $providerRepositoryName, $providerRepositoryUrl, $providerRepositoryOwner, $providerCommitHash, $providerCommitAuthor, $providerCommitAuthorUrl, $providerCommitMessage, $providerCommitUrl, $providerPullRequestId, $external, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);
                } elseif ($parsedPayload["action"] == "closed") {
                    // Allowed external contributions cleanup

@@ -1589,7 +1588,7 @@ App::post('/v1/vcs/github/events')
                    $external = $parsedPayload["external"] ?? true;

                    if ($external) {
-                        $repositories = $authorization->skip(fn () => $dbForPlatform->find('repositories', [
+                        $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                            Query::equal('providerRepositoryId', [$providerRepositoryId]),
                            Query::orderDesc('$createdAt')
                        ]));
@@ -1600,7 +1599,7 @@ App::post('/v1/vcs/github/events')
                            if (\in_array($providerPullRequestId, $providerPullRequestIds)) {
                                $providerPullRequestIds = \array_diff($providerPullRequestIds, [$providerPullRequestId]);
                                $repository = $repository->setAttribute('providerPullRequestIds', $providerPullRequestIds);
-                                $repository = $authorization->skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
+                                $repository = Authorization::skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
                            }
                        }
                    }
@@ -1784,21 +1783,20 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
    ->param('repositoryId', '', new Text(256), 'VCS Repository Id')
    ->param('providerPullRequestId', '', new Text(256), 'GitHub Pull Request Id')
    ->inject('gitHub')
+    ->inject('request')
    ->inject('response')
    ->inject('project')
    ->inject('dbForPlatform')
-    ->inject('authorization')
    ->inject('getProjectDB')
    ->inject('queueForBuilds')
-    ->inject('platform')
-    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForPlatform, Authorization $authorization, callable $getProjectDB, Build $queueForBuilds, array $platform) use ($createGitDeployments) {
+    ->action(function (string $installationId, string $repositoryId, string $providerPullRequestId, GitHub $github, Request $request, Response $response, Document $project, Database $dbForPlatform, callable $getProjectDB, Build $queueForBuilds) use ($createGitDeployments) {
        $installation = $dbForPlatform->getDocument('installations', $installationId);

        if ($installation->isEmpty()) {
            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
        }

-        $repository = $authorization->skip(fn () => $dbForPlatform->findOne('repositories', [
+        $repository = Authorization::skip(fn () => $dbForPlatform->findOne('repositories', [
            Query::equal('$id', [$repositoryId]),
            Query::equal('projectInternalId', [$project->getSequence()])
        ]));
@@ -1816,7 +1814,7 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor

        // TODO: Delete from array when PR is closed

-        $repository = $authorization->skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));
+        $repository = Authorization::skip(fn () => $dbForPlatform->updateDocument('repositories', $repository->getId(), $repository));

        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
@@ -1839,16 +1837,8 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor

        $providerBranch = \explode(':', $pullRequestResponse['head']['label'])[1] ?? '';
        $providerCommitHash = $pullRequestResponse['head']['sha'] ?? '';
-        $providerBranchUrl = $pullRequestResponse['head']['repo']['html_url'] ?? '';
-        $providerRepositoryName = $pullRequestResponse['head']['repo']['name'] ?? '';
-        $providerRepositoryUrl = $pullRequestResponse['head']['repo']['html_url'] ?? '';
-        $providerRepositoryOwner = $pullRequestResponse['head']['repo']['owner']['login'] ?? '';
-        $providerCommitAuthor = $pullRequestResponse['head']['user']['login'] ?? '';
-        $providerCommitAuthorUrl = $pullRequestResponse['head']['user']['html_url'] ?? '';
-        $providerCommitMessage = $pullRequestResponse['title'] ?? '';
-        $providerCommitUrl = $pullRequestResponse['html_url'] ?? '';

-        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, '', '', '', '', $providerCommitHash, '', '', '', '', $providerPullRequestId, true, $dbForPlatform, $authorization, $queueForBuilds, $getProjectDB, $request, $platform);
+        $createGitDeployments($github, $providerInstallationId, $repositories, $providerBranch, $providerCommitHash, $providerPullRequestId, true, $dbForPlatform, $queueForBuilds, $getProjectDB, $request);

        $response->noContent();
    });
@@ -10,7 +10,7 @@ use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception as AppwriteException;
-use Appwrite\Network\Cors;
+use Appwrite\Network\Validator\Origin;
 use Appwrite\Platform\Appwrite;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
@@ -39,7 +39,6 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
@@ -52,25 +51,24 @@ use Utopia\Logger\Log\User;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
 use Utopia\System\System;
-use Utopia\Validator;
 use Utopia\Validator\Text;

 Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);

-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Authorization $authorization, ?Key $apiKey)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
 {
    $host = $request->getHostname() ?? '';
    if (!empty($previewHostname)) {
        $host = $previewHostname;
    }

-    // TODO: (@Meldiron) Remove after 1.7.x migration
+    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-        $rule = $authorization->skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
+        $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
    } else {
-        $rule = $authorization->skip(
+        $rule = Authorization::skip(
            fn () => $dbForPlatform->find('rules', [
                Query::equal('domain', [$host]),
                Query::limit(1)
@@ -79,9 +77,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    }

    $errorView = __DIR__ . '/../views/general/error.phtml';
-    $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-    $url = $protocol . '://' . $platform['consoleHostname'];
-    $platformHostnames = $platform['hostnames'] ?? [];
+    $url = (System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https') . '://' . System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', ''));

    if ($rule->isEmpty()) {
        $appDomainFunctionsFallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
@@ -102,8 +98,10 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            throw $exception;
        }

-        if (!in_array($host, $platformHostnames)) {
-            throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.', view: $errorView);
+        if (System::getEnv('_APP_OPTIONS_ROUTER_PROTECTION', 'disabled') === 'enabled') {
+            if ($host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL && $host !== System::getEnv('_APP_CONSOLE_DOMAIN', '')) {
+                throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.', view: $errorView);
+            }
        }

        // Act as API - no Proxy logic
@@ -111,7 +109,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
    }

    $projectId = $rule->getAttribute('projectId');
-    $project = $authorization->skip(
+    $project = Authorization::skip(
        fn () => $dbForPlatform->getDocument('projects', $projectId)
    );

@@ -119,7 +117,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        $accessedAt = $project->getAttribute('accessedAt', 0);
        if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
            $project->setAttribute('accessedAt', DateTime::now());
-            $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
+            Authorization::skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
        }

        /**
@@ -145,7 +143,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

    if ($type === 'deployment') {
        if (System::getEnv('_APP_OPTIONS_ROUTER_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https') {
+            if ($request->getProtocol() !== 'https' && $request->getHostname() !== APP_HOSTNAME_INTERNAL) {
                if ($request->getMethod() !== Request::METHOD_GET) {
                    throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.', view: $errorView);
                }
@@ -158,7 +156,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

        /** @var Document $deployment */
        if (!empty($rule->getAttribute('deploymentId', ''))) {
-            $deployment = $authorization->skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
+            $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('deploymentId')));
        } else {
            // 1.6.x DB schema compatibility
            // TODO: Make sure deploymentId is never empty, and remove this code
@@ -172,15 +170,15 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw

            // Document of site or function
            $resource = $resourceType === 'function' ?
-                $authorization->skip(fn () => $dbForProject->getDocument('functions', $resourceId)) :
-                $authorization->skip(fn () => $dbForProject->getDocument('sites', $resourceId));
+                Authorization::skip(fn () => $dbForProject->getDocument('functions', $resourceId)) :
+                Authorization::skip(fn () => $dbForProject->getDocument('sites', $resourceId));

            // ID of active deployments
            // Attempts to use attribute from both schemas (1.6 and 1.7)
            $activeDeploymentId = $resource->getAttribute('deploymentId', $resource->getAttribute('deployment', ''));

            // Get deployment document, as intended originally
-            $deployment = $authorization->skip(fn () => $dbForProject->getDocument('deployments', $activeDeploymentId));
+            $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $activeDeploymentId));
        }

        if ($deployment->getAttribute('resourceType', '') === 'functions') {
@@ -199,8 +197,8 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
        }

        $resource = $type === 'function' ?
-            $authorization->skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
-            $authorization->skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));
+            Authorization::skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
+            Authorization::skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));

        $isPreview = $type === 'function' ? false : ($rule->getAttribute('trigger', '') !== 'manual');

@@ -242,7 +240,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                $userExists = false;
                $userId = $payload['userId'] ?? '';
                if (!empty($userId)) {
-                    $user = $authorization->skip(fn () => $dbForPlatform->getDocument('users', $userId));
+                    $user = Authorization::skip(fn () => $dbForPlatform->getDocument('users', $userId));
                    if (!$user->isEmpty() && $user->getAttribute('status', false)) {
                        $userExists = true;
                    }
@@ -255,7 +253,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                }

                $membershipExists = false;
-                $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+                $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
                if (!$project->isEmpty() && isset($user)) {
                    $teamId = $project->getAttribute('teamId', '');
                    $membership = $user->find('teamId', $teamId, 'memberships');
@@ -270,7 +268,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            }

            if (!$authorized) {
-                $url = $protocol . "://" . $platform['consoleHostname'];
+                $url = (System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https') . "://" . System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', ''));
                $response
                    ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
                    ->addHeader('Pragma', 'no-cache')
@@ -458,8 +456,9 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
        }

-        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-        $endpoint = "$protocol://{$platform['apiHostname']}/v1";
+        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') === 'disabled' ? 'http' : 'https';
+        $hostname = System::getEnv('_APP_DOMAIN');
+        $endpoint = $protocol . '://' . $hostname . "/v1";

        // Appwrite vars
        if ($type === 'function') {
@@ -846,32 +845,34 @@ App::init()
    ->inject('request')
    ->inject('response')
    ->inject('log')
+    ->inject('console')
    ->inject('project')
    ->inject('dbForPlatform')
    ->inject('getProjectDB')
    ->inject('locale')
    ->inject('localeCodes')
+    ->inject('platforms')
    ->inject('geodb')
    ->inject('queueForStatsUsage')
    ->inject('queueForEvents')
+    ->inject('queueForCertificates')
    ->inject('queueForFunctions')
    ->inject('executor')
-    ->inject('platform')
    ->inject('isResourceBlocked')
    ->inject('previewHostname')
    ->inject('devKey')
    ->inject('apiKey')
-    ->inject('cors')
-    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Func $queueForFunctions, Executor $executor, array $platform, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization) {
+    ->inject('httpReferrer')
+    ->inject('httpReferrerSafe')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $platforms, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, Executor $executor, callable $isResourceBlocked, string $previewHostname, Document $devKey, ?Key $apiKey, string $httpReferrer, string $httpReferrerSafe) {
        /*
        * Appwrite Router
        */
-        $hostname = $request->getHostname() ?? '';
-        $platformHostnames = $platform['hostnames'] ?? [];
+        $host = $request->getHostname() ?? '';
+        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
-        if (!\in_array($hostname, $platformHostnames) || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey)) {
+        if ($host !== $mainDomain || !empty($previewHostname)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -911,12 +912,98 @@ App::init()
            }
        }

+        $domain = $request->getHostname();
+        $domains = Config::getParam('domains', []);
+        if (!array_key_exists($domain, $domains)) {
+            $domain = new Domain(!empty($domain) ? $domain : '');
+
+            if (empty($domain->get()) || !$domain->isKnown() || $domain->isTest()) {
+                $domains[$domain->get()] = false;
+                Console::warning($domain->get() . ' is not a publicly accessible domain. Skipping SSL certificate generation.');
+            } elseif (str_starts_with($request->getURI(), '/.well-known/acme-challenge')) {
+                Console::warning('Skipping SSL certificates generation on ACME challenge.');
+            } else {
+                Authorization::disable();
+
+                $envDomain = System::getEnv('_APP_DOMAIN', '');
+                $mainDomain = null;
+                if (!empty($envDomain) && $envDomain !== 'localhost') {
+                    $mainDomain = $envDomain;
+                } else {
+                    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+                    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+                        $domainDocument = $dbForPlatform->getDocument('rules', md5($envDomain));
+                    } else {
+                        $domainDocument = $dbForPlatform->findOne('rules', [Query::orderAsc('$id')]);
+                    }
+                    $mainDomain = !$domainDocument->isEmpty() ? $domainDocument->getAttribute('domain') : $domain->get();
+                }
+
+                if ($mainDomain !== $domain->get()) {
+                    Console::warning($domain->get() . ' is not a main domain. Skipping SSL certificate generation.');
+                } else {
+                    // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+                    if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+                        $domainDocument = $dbForPlatform->getDocument('rules', md5($domain->get()));
+                    } else {
+                        $domainDocument = $dbForPlatform->findOne('rules', [
+                            Query::equal('domain', [$domain->get()])
+                        ]);
+                    }
+
+                    $owner = '';
+                    $functionsDomainFallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
+                    $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+                    $siteDomain = System::getEnv('_APP_DOMAIN_SITES', '');
+                    if (!empty($functionsDomainFallback) && \str_ends_with($host, $functionsDomainFallback)) {
+                        $functionsDomain = $functionsDomainFallback;
+                    }
+
+                    if (
+                        (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) ||
+                        (!empty($siteDomain) && \str_ends_with($domain->get(), $siteDomain))
+                    ) {
+                        $owner = 'Appwrite';
+                    }
+
+                    if ($domainDocument->isEmpty()) {
+                        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
+                        $domainDocument = new Document([
+                            // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+                            '$id' => $ruleId,
+                            'domain' => $domain->get(),
+                            'type' => 'api',
+                            'status' => 'verifying',
+                            'projectId' => $console->getId(),
+                            'projectInternalId' => $console->getSequence(),
+                            'search' => implode(' ', [$ruleId, $domain->get()]),
+                            'owner' => $owner,
+                            'region' => $console->getAttribute('region')
+                        ]);
+
+                        $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);
+
+                        Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
+
+                        $queueForCertificates
+                            ->setDomain($domainDocument)
+                            ->setSkipRenewCheck(true)
+                            ->trigger();
+                    }
+                }
+                $domains[$domain->get()] = true;
+
+                Authorization::reset(); // ensure authorization is re-enabled
+            }
+            Config::setParam('domains', $domains);
+        }
+
        $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
        if (\in_array($localeParam, $localeCodes)) {
            $locale->setDefault($localeParam);
        }

-        $origin = \parse_url($request->getOrigin($request->getReferer('')), PHP_URL_HOST);
+        $origin = \parse_url($request->getOrigin($httpReferrer), PHP_URL_HOST);
        $selfDomain = new Domain($request->getHostname());
        $endDomain = new Domain((string)$origin);
        Config::setParam(
@@ -945,8 +1032,8 @@ App::init()
        $warnings = [];

        /*
-         * Response format
-         */
+        * Response format
+        */
        $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
        if ($responseFormat) {
            if (version_compare($responseFormat, '1.4.0', '<')) {
@@ -966,13 +1053,14 @@ App::init()
            }
        }

-        // Add Appwrite warning headers
-        if (!empty($warnings)) {
-            $response->addHeader('X-Appwrite-Warning', implode(';', $warnings));
-        }
-
+        /*
+        * Security Headers
+        *
+        * As recommended at:
+        * @see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
+        */
        if (System::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https' && ($swooleRequest->header['host'] ?? '') !== 'localhost') { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
+            if ($request->getProtocol() !== 'https' && ($swooleRequest->header['host'] ?? '') !== 'localhost' && ($swooleRequest->header['host'] ?? '') !== APP_HOSTNAME_INTERNAL) { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
                if ($request->getMethod() !== Request::METHOD_GET) {
                    throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                }
@@ -980,152 +1068,49 @@ App::init()
                return $response->redirect('https://' . $request->getHostname() . $request->getURI());
            }
        }
-    });
-
-/**
- * Security headers
- *
- * @see https://www.owasp.org/index.php/List_of_useful_HTTP_headers
- */
-App::init()
-    ->groups(['api', 'web'])
-    ->inject('request')
-    ->inject('response')
-    ->inject('cors')
-    ->inject('devKey')
-    ->inject('originValidator')
-    ->action(function (Request $request, Response $response, Cors $cors, Document $devKey, Validator $originValidator) {
-        // CORS headers
-        foreach ($cors->headers($request->getOrigin()) as $name => $value) {
-            $response->addHeader($name, $value);
-        }
-
-        // Security headers
-        $response
-            ->addHeader('Server', 'Appwrite')
-            ->addHeader('X-Content-Type-Options', 'nosniff');

        if ($request->getProtocol() === 'https') {
-            $maxAge = 60 * 60 * 24 * 126; // 126 days
-            $response->addHeader('Strict-Transport-Security', "max-age=$maxAge");
+            $response->addHeader('Strict-Transport-Security', 'max-age=' . (60 * 60 * 24 * 126)); // 126 days
        }

-        // Application level CSRF protection
-        $origin = $request->getOrigin();
-        if (empty($origin) || !$devKey->isEmpty() || !empty($request->getHeader('x-appwrite-key'))) {
-            return;
+        $response
+            ->addHeader('Server', 'Appwrite')
+            ->addHeader('X-Content-Type-Options', 'nosniff')
+            ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Dev-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-Appwrite-Timeout, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Forwarded-For, X-Forwarded-User-Agent')
+            ->addHeader('Access-Control-Expose-Headers', 'X-Appwrite-Session, X-Fallback-Cookies')
+            ->addHeader('Access-Control-Allow-Origin', $httpReferrerSafe)
+            ->addHeader('Access-Control-Allow-Credentials', 'true');
+
+        if (!$devKey->isEmpty()) {
+            $response->addHeader('Access-Control-Allow-Origin', '*');
        }
-        $route = $request->getRoute();
-        if ($route->getLabel('origin', false) === '*') {
-            return;
+
+        if (!empty($warnings)) {
+            $response->addHeader('X-Appwrite-Warning', implode(';', $warnings));
        }
-        if (!$originValidator->isValid($origin)) {
+
+        /*
+        * Validate Client Domain - Check to avoid CSRF attack
+        *  Adding Appwrite API domains to allow XDOMAIN communication
+        *  Skip this check for non-web platforms which are not required to send an origin header
+        */
+        $origin = $request->getOrigin($request->getReferer(''));
+        $originValidator = new Origin($platforms);
+
+        if (
+            $devKey->isEmpty()
+            && !empty($origin)
+            && !$originValidator->isValid($origin)
+            && \in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE])
+            && $route->getLabel('origin', false) !== '*'
+            && empty($request->getHeader('x-appwrite-key', ''))
+            && \parse_url($httpReferrerSafe, PHP_URL_HOST) === 'localhost'
+        ) {
            throw new AppwriteException(AppwriteException::GENERAL_UNKNOWN_ORIGIN, $originValidator->getDescription());
        }
    });

-/**
- * Automatic certificate generation
- */
-App::init()
-   ->groups(['api', 'web'])
-   ->inject('request')
-   ->inject('console')
-   ->inject('dbForPlatform')
-   ->inject('queueForCertificates')
-   ->inject('platform')
-   ->inject('authorization')
-   ->action(function (Request $request, Document $console, Database $dbForPlatform, Certificate $queueForCertificates, array $platform, Authorization $authorization) {
-       $hostname = $request->getHostname();
-       $cache = Config::getParam('hostnames', []);
-       $platformHostnames = $platform['hostnames'] ?? [];
-
-       // 1. Cache hit
-       if (array_key_exists($hostname, $cache)) {
-           return;
-       }
-
-       // 2. Domain validation
-       $domain = new Domain(!empty($hostname) ? $hostname : '');
-       if (empty($domain->get()) || !$domain->isKnown() || $domain->isTest()) {
-           $cache[$domain->get()] = false;
-           Config::setParam('hostnames', $cache);
-           Console::warning($domain->get() . ' is not a publicly accessible domain. Skipping SSL certificate generation.');
-           return;
-       }
-
-       if (str_starts_with($request->getURI(), '/.well-known/acme-challenge')) {
-           Console::warning('Skipping SSL certificates generation on ACME challenge.');
-           return;
-       }
-
-       // 3. Check if domain is a main domain
-       if (!in_array($domain->get(), $platformHostnames)) {
-           Console::warning($domain->get() . ' is not a main domain. Skipping SSL certificate generation.');
-           return;
-       }
-
-       // 4. Check/create rule (requires DB access)
-       $authorization->disable();
-       try {
-           // TODO: (@Meldiron) Remove after 1.7.x migration
-           $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
-           $document = $isMd5
-               ? $dbForPlatform->getDocument('rules', md5($domain->get()))
-               : $dbForPlatform->findOne('rules', [
-                   Query::equal('domain', [$domain->get()]),
-               ]);
-
-           if (!$document->isEmpty()) {
-               return;
-           }
-
-           // 5. Create new rule
-           $owner = '';
-           $fallback = System::getEnv('_APP_DOMAIN_FUNCTIONS_FALLBACK', '');
-           $funcDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
-           $siteDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-
-           if (!empty($fallback) && \str_ends_with($domain->get(), $fallback)) {
-               $funcDomain = $fallback;
-           }
-
-           if (
-               (!empty($funcDomain) && \str_ends_with($domain->get(), $funcDomain)) ||
-               (!empty($siteDomain) && \str_ends_with($domain->get(), $siteDomain))
-           ) {
-               $owner = 'Appwrite';
-           }
-
-           $ruleId = $isMd5 ? md5($domain->get()) : ID::unique();
-           $document = new Document([
-               '$id' => $ruleId,
-               'domain' => $domain->get(),
-               'type' => 'api',
-               'status' => 'verifying',
-               'projectId' => $console->getId(),
-               'projectInternalId' => $console->getSequence(),
-               'search' => implode(' ', [$ruleId, $domain->get()]),
-               'owner' => $owner,
-               'region' => $console->getAttribute('region')
-           ]);
-
-           $dbForPlatform->createDocument('rules', $document);
-
-           Console::info('Issuing a TLS certificate for the main domain (' . $domain->get() . ') in a few seconds...');
-           $queueForCertificates
-               ->setDomain($document)
-               ->setSkipRenewCheck(true)
-               ->trigger();
-       } catch (Duplicate $e) {
-           Console::info('Certificate already exists');
-       } finally {
-           $cache[$domain->get()] = true;
-           Config::setParam('hostnames', $cache);
-           $authorization->reset();
-       }
-   });
-
 App::options()
    ->inject('utopia')
    ->inject('swooleRequest')
@@ -1140,33 +1125,38 @@ App::options()
    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('platform')
    ->inject('previewHostname')
    ->inject('project')
    ->inject('devKey')
    ->inject('apiKey')
-    ->inject('cors')
-    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey, Cors $cors, Authorization $authorization) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project, Document $devKey, ?Key $apiKey) {
        /*
        * Appwrite Router
        */
-        $platformHostnames = $platform['hostnames'] ?? [];
+        $host = $request->getHostname() ?? '';
+        $mainDomain = System::getEnv('_APP_DOMAIN', '');
        // Only run Router when external domain
-        if (!in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $apiKey)) {
+        if ($host !== $mainDomain || !empty($previewHostname)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }

-        foreach ($cors->headers($request->getOrigin()) as $name => $value) {
-            $response->addHeader($name, $value);
-        }
+        $origin = $request->getOrigin();

        $response
            ->addHeader('Server', 'Appwrite')
+            ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Dev-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-Appwrite-Timeout, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Appwrite-Session, X-Fallback-Cookies, X-Forwarded-For, X-Forwarded-User-Agent')
+            ->addHeader('Access-Control-Expose-Headers', 'X-Appwrite-Session, X-Fallback-Cookies')
+            ->addHeader('Access-Control-Allow-Origin', $origin)
+            ->addHeader('Access-Control-Allow-Credentials', 'true')
            ->noContent();

+        if (!$devKey->isEmpty()) {
+            $response->addHeader('Access-Control-Allow-Origin', '*');
+        }
+
        /** OPTIONS requests in utopia do not execute shutdown handlers, as a result we need to track the OPTIONS requests explicitly
         * @see https://github.com/utopia-php/http/blob/0.33.16/src/App.php#L825-L855
         */
@@ -1188,8 +1178,7 @@ App::error()
    ->inject('log')
    ->inject('queueForStatsUsage')
    ->inject('devKey')
-    ->inject('authorization')
-    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, StatsUsage $queueForStatsUsage, Document $devKey, Authorization $authorization) {
+    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, Log $log, StatsUsage $queueForStatsUsage) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
        $route = $utopia->getRoute();
        $class = \get_class($error);
@@ -1271,7 +1260,7 @@ App::error()
         * If not a publishable error, track usage stats. Publishable errors are >= 500 or those explicitly marked as publish=true in errors.php
         */
        if (!$publish && $project->getId() !== 'console') {
-            if (!DBUser::isPrivileged($authorization->getRoles())) {
+            if (!DBUser::isPrivileged(Authorization::getRoles())) {
                $fileSize = 0;
                $file = $request->getFiles('file');
                if (!empty($file)) {
@@ -1333,7 +1322,7 @@ App::error()
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('roles', $authorization->getRoles());
+            $log->addExtra('roles', Authorization::getRoles());

            $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
            if (!empty($sdk)) {
@@ -1454,17 +1443,18 @@ App::get('/robots.txt')
    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('platform')
    ->inject('previewHostname')
    ->inject('apiKey')
-    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization) {
-        $platformHostnames = $platform['hostnames'] ?? [];
-        if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+        $host = $request->getHostname() ?? '';
+        $consoleDomain = System::getEnv('_APP_CONSOLE_DOMAIN', '');
+        $mainDomain = System::getEnv('_APP_DOMAIN', '');
+
+        if (($host === $consoleDomain || $host === $mainDomain || $host === 'localhost') && empty($previewHostname)) {
            $template = new View(__DIR__ . '/../views/general/robots.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1487,17 +1477,18 @@ App::get('/humans.txt')
    ->inject('executor')
    ->inject('geodb')
    ->inject('isResourceBlocked')
-    ->inject('platform')
    ->inject('previewHostname')
    ->inject('apiKey')
-    ->inject('authorization')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, array $platform, string $previewHostname, ?Key $apiKey, Authorization $authorization) {
-        $platformHostnames = $platform['hostnames'] ?? [];
-        if (in_array($request->getHostname(), $platformHostnames) || !empty($previewHostname)) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Log $log, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Executor $executor, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+        $host = $request->getHostname() ?? '';
+        $consoleDomain = System::getEnv('_APP_CONSOLE_DOMAIN', '');
+        $mainDomain = System::getEnv('_APP_DOMAIN', '');
+
+        if (($host === $consoleDomain || $host === $mainDomain || $host === 'localhost') && empty($previewHostname)) {
            $template = new View(__DIR__ . '/../views/general/humans.phtml');
            $response->text($template->render(false));
        } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $platform, $previewHostname, $authorization, $apiKey)) {
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $log, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $executor, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
                $utopia->getRoute()?->label('router', true);
            }
        }
@@ -1581,8 +1572,7 @@ App::get('/v1/ping')
    ->inject('project')
    ->inject('dbForPlatform')
    ->inject('queueForEvents')
-    ->inject('authorization')
-    ->action(function (Response $response, Document $project, Database $dbForPlatform, Event $queueForEvents, Authorization $authorization) {
+    ->action(function (Response $response, Document $project, Database $dbForPlatform, Event $queueForEvents) {
        if ($project->isEmpty() || $project->getId() === 'console') {
            throw new AppwriteException(AppwriteException::PROJECT_NOT_FOUND);
        }
@@ -1594,7 +1584,7 @@ App::get('/v1/ping')
            ->setAttribute('pingCount', $pingCount)
            ->setAttribute('pingedAt', $pingedAt);

-        $authorization->skip(function () use ($dbForPlatform, $project) {
+        Authorization::skip(function () use ($dbForPlatform, $project) {
            $dbForPlatform->updateDocument('projects', $project->getId(), $project);
        });

@@ -15,6 +15,7 @@ use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\UID;
 use Utopia\Locale\Locale;
 use Utopia\System\System;
+use Utopia\Validator\Host;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub;
@@ -26,7 +27,7 @@ App::get('/v1/mock/tests/general/oauth2')
    ->label('docs', false)
    ->label('mock', true)
    ->param('client_id', '', new Text(100), 'OAuth2 Client ID.')
-    ->param('redirect_uri', '', fn ($redirectValidator) => $redirectValidator, 'URL to redirect back to your app after a failed login attempt.  Only URLs from hostnames in your project\'s platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['redirectValidator']) // Important to deny an open redirect attack
+    ->param('redirect_uri', '', new Host(['localhost']), 'OAuth2 Redirect URI.') // Important to deny an open redirect attack
    ->param('scope', '', new Text(100), 'OAuth2 scope list.')
    ->param('state', '', new Text(1024), 'OAuth2 state.')
    ->inject('response')
@@ -63,7 +64,7 @@ App::get('/v1/mock/tests/general/oauth2/token')
    ->param('client_id', '', new Text(100), 'OAuth2 Client ID.')
    ->param('client_secret', '', new Text(100), 'OAuth2 scope list.')
    ->param('grant_type', 'authorization_code', new WhiteList(['refresh_token', 'authorization_code']), 'OAuth2 Grant Type.', true)
-    ->param('redirect_uri', '', fn ($redirectValidator) => $redirectValidator, 'URL to redirect back to your app after a successful login attempt.  Only URLs from hostnames in your project\'s platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['redirectValidator'])
+    ->param('redirect_uri', '', new Host(['localhost']), 'OAuth2 Redirect URI.', true)
    ->param('code', '', new Text(100), 'OAuth2 state.', true)
    ->param('refresh_token', '', new Text(100), 'OAuth2 refresh token.', true)
    ->inject('response')
@@ -117,28 +118,6 @@ App::get('/v1/mock/tests/general/oauth2/user')
            'id' => 1,
            'name' => 'User Name',
            'email' => 'useroauth@localhost.test',
-            'verified' => true,
-        ]);
-    });
-
-App::get('/v1/mock/tests/general/oauth2/user-unverified')
-    ->desc('OAuth2 User Unverified')
-    ->groups(['mock'])
-    ->label('scope', 'public')
-    ->label('docs', false)
-    ->param('token', '', new Text(100), 'OAuth2 Access Token.')
-    ->inject('response')
-    ->action(function (string $token, Response $response) {
-
-        if ($token != '123456') {
-            throw new Exception(Exception::GENERAL_MOCK, 'Invalid token');
-        }
-
-        $response->json([
-            'id' => 2,
-            'name' => 'User Name Unverified',
-            'email' => 'useroauthunverified@localhost.test',
-            'verified' => false,
        ]);
    });

@@ -8,9 +8,7 @@ use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
-use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
-use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
@@ -30,7 +28,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Authorization\Input;
 use Utopia\Queue\Publisher;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
@@ -234,8 +231,7 @@ App::init()
    ->inject('mode')
    ->inject('team')
    ->inject('apiKey')
-    ->inject('authorization')
-    ->action(function (App $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey, Authorization $authorization) {
+    ->action(function (App $utopia, Request $request, Database $dbForPlatform, Database $dbForProject, Audit $queueForAudits, Document $project, User $user, ?Document $session, array $servers, string $mode, Document $team, ?Key $apiKey) {
        $route = $utopia->getRoute();

        /**
@@ -320,7 +316,7 @@ App::init()
            // Handle special app role case
            if ($apiKey->getRole() === User::ROLE_APPS) {
                // Disable authorization checks for API keys
-                $authorization->setDefaultStatus(false);
+                Authorization::setDefaultStatus(false);

                $user = new User([
                    '$id' => '',
@@ -394,14 +390,14 @@ App::init()
                $scopes = \array_merge($scopes, $roles[$role]['scopes']);
            }

-            $authorization->setDefaultStatus(false);  // Cancel security segmentation for admin users.
+            Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
        }

        $scopes = \array_unique($scopes);

-        $authorization->addRole($role);
-        foreach ($user->getRoles($authorization) as $authRole) {
-            $authorization->addRole($authRole);
+        Authorization::setRole($role);
+        foreach ($user->getRoles() as $authRole) {
+            Authorization::setRole($authRole);
        }

        // Step 6: Update project and user last activity
@@ -409,7 +405,7 @@ App::init()
            $accessedAt = $project->getAttribute('accessedAt', 0);
            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
                $project->setAttribute('accessedAt', DateTime::now());
-                $authorization->skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
+                Authorization::skip(fn () => $dbForPlatform->updateDocument('projects', $project->getId(), $project));
            }
        }

@@ -444,7 +440,7 @@ App::init()
            if (
                array_key_exists($namespace, $project->getAttribute('services', []))
                && !$project->getAttribute('services', [])[$namespace]
-                && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
+                && !(User::isPrivileged(Authorization::getRoles()) || User::isApp(Authorization::getRoles()))
            ) {
                throw new Exception(Exception::GENERAL_SERVICE_DISABLED);
            }
@@ -499,9 +495,6 @@ App::init()
    ->inject('queueForDatabase')
    ->inject('queueForBuilds')
    ->inject('queueForStatsUsage')
-    ->inject('queueForFunctions')
-    ->inject('queueForMails')
-    ->inject('queueForMigrations')
    ->inject('dbForProject')
    ->inject('timelimit')
    ->inject('resourceToken')
@@ -510,16 +503,14 @@ App::init()
    ->inject('plan')
    ->inject('devKey')
    ->inject('telemetry')
-    ->inject('platform')
-    ->inject('authorization')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Mail $queueForMails, Migration $queueForMigrations, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry, array $platform, Authorization $authorization) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Publisher $publisherFunctions, Publisher $publisherWebhooks, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, Document $resourceToken, string $mode, ?Key $apiKey, array $plan, Document $devKey, Telemetry $telemetry) use ($usageDatabaseListener, $eventDatabaseListener) {

        $route = $utopia->getRoute();

        if (
            array_key_exists('rest', $project->getAttribute('apis', []))
            && !$project->getAttribute('apis', [])['rest']
-            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
+            && !(User::isPrivileged(Authorization::getRoles()) || User::isApp(Authorization::getRoles()))
        ) {
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }
@@ -549,7 +540,7 @@ App::init()

        $closestLimit = null;

-        $roles = $authorization->getRoles();
+        $roles = Authorization::getRoles();
        $isPrivilegedUser = User::isPrivileged($roles);
        $isAppUser = User::isApp($roles);

@@ -586,10 +577,6 @@ App::init()
            }
        }

-        /**
-         *  TODO: (@loks0n)
-         *  Avoid mutating the message across file boundaries - it's difficult to reason about at scale.
-         */
        /*
        * Background Jobs
        */
@@ -620,17 +607,10 @@ App::init()
            }
        }

-        /* Auto-set projects */
        $queueForDeletes->setProject($project);
        $queueForDatabase->setProject($project);
-        $queueForMessaging->setProject($project);
-        $queueForFunctions->setProject($project);
        $queueForBuilds->setProject($project);
-
-        /* Auto-set platforms */
-        $queueForFunctions->setPlatform($platform);
-        $queueForBuilds->setPlatform($platform);
-        $queueForMails->setPlatform($platform);
+        $queueForMessaging->setProject($project);

        // Clone the queues, to prevent events triggered by the database listener
        // from overwriting the events that are supposed to be triggered in the shutdown hook.
@@ -660,10 +640,10 @@ App::init()
        if ($useCache) {
            $route = $utopia->match($request);
            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !User::isPrivileged($authorization->getRoles());
+            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !User::isPrivileged(Authorization::getRoles());

            $key = $request->cacheIdentifier();
-            $cacheLog  = $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
+            $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
            $cache = new Cache(
                new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
            );
@@ -680,10 +660,10 @@ App::init()

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

                    $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getSequence();
-                    $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
+                    $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());

                    if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAppUser && !$isPrivilegedUser)) {
                        throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -694,7 +674,8 @@ App::init()
                    }

                    $fileSecurity = $bucket->getAttribute('fileSecurity', false);
-                    $valid = $authorization->isValid(new Input(Database::PERMISSION_READ, $bucket->getRead()));
+                    $validator = new Authorization(Database::PERMISSION_READ);
+                    $valid = $validator->isValid($bucket->getRead());
                    if (!$fileSecurity && !$valid && !$isToken) {
                        throw new Exception(Exception::USER_UNAUTHORIZED);
                    }
@@ -705,7 +686,7 @@ App::init()
                    if ($fileSecurity && !$valid && !$isToken) {
                        $file = $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId);
                    } else {
-                        $file = $authorization->skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
+                        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getSequence(), $fileId));
                    }

                    if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getSequence()) {
@@ -716,11 +697,11 @@ App::init()
                        throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                    }
                    //Do not update transformedAt if it's a console user
-                    if (!User::isPrivileged($authorization->getRoles())) {
+                    if (!User::isPrivileged(Authorization::getRoles())) {
                        $transformedAt = $file->getAttribute('transformedAt', '');
                        if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
                            $file->setAttribute('transformedAt', DateTime::now());
-                            $authorization->skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
+                            Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
                        }
                    }
                }
@@ -816,8 +797,7 @@ App::shutdown()
    ->inject('queueForWebhooks')
    ->inject('queueForRealtime')
    ->inject('dbForProject')
-    ->inject('authorization')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, StatsUsage $queueForStatsUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject, Authorization $authorization) use ($parseLabel) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, User $user, Event $queueForEvents, Audit $queueForAudits, StatsUsage $queueForStatsUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject) use ($parseLabel) {

        $responsePayload = $response->getPayload();

@@ -943,11 +923,11 @@ App::shutdown()

                $key = $request->cacheIdentifier();
                $signature = md5($data['payload']);
-                $cacheLog  =  $authorization->skip(fn () => $dbForProject->getDocument('cache', $key));
+                $cacheLog  =  Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
                $accessedAt = $cacheLog->getAttribute('accessedAt', 0);
                $now = DateTime::now();
                if ($cacheLog->isEmpty()) {
-                    $authorization->skip(fn () => $dbForProject->createDocument('cache', new Document([
+                    Authorization::skip(fn () => $dbForProject->createDocument('cache', new Document([
                        '$id' => $key,
                        'resource' => $resource,
                        'resourceType' => $resourceType,
@@ -957,7 +937,7 @@ App::shutdown()
                    ])));
                } elseif (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_CACHE_UPDATE)) > $accessedAt) {
                    $cacheLog->setAttribute('accessedAt', $now);
-                    $authorization->skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));
+                    Authorization::skip(fn () => $dbForProject->updateDocument('cache', $cacheLog->getId(), $cacheLog));
                    // Overwrite the file every APP_CACHE_UPDATE seconds to update the file modified time that is used in the TTL checks in cache->load()
                    $cache->save($key, $data['payload']);
                }
@@ -969,7 +949,7 @@ App::shutdown()
        }

        if ($project->getId() !== 'console') {
-            if (!User::isPrivileged($authorization->getRoles())) {
+            if (!User::isPrivileged(Authorization::getRoles())) {
                $fileSize = 0;
                $file = $request->getFiles('file');
                if (!empty($file)) {
@@ -36,8 +36,7 @@ App::init()
    ->inject('request')
    ->inject('project')
    ->inject('geodb')
-    ->inject('authorization')
-    ->action(function (App $utopia, Request $request, Document $project, Reader $geodb, Authorization $authorization) {
+    ->action(function (App $utopia, Request $request, Document $project, Reader $geodb) {
        $denylist = System::getEnv('_APP_CONSOLE_COUNTRIES_DENYLIST', '');
        if (!empty($denylist && $project->getId() === 'console')) {
            $countries = explode(',', $denylist);
@@ -50,8 +49,8 @@ App::init()

        $route = $utopia->match($request);

-        $isPrivilegedUser = User::isPrivileged($authorization->getRoles());
-        $isAppUser = User::isApp($authorization->getRoles());
+        $isPrivilegedUser = User::isPrivileged(Authorization::getRoles());
+        $isAppUser = User::isApp(Authorization::getRoles());

        if ($isAppUser || $isPrivilegedUser) { // Skip limits for app and console devs
            return;
@@ -10,7 +10,7 @@ App::get('/versions')
    ->label('scope', 'public')
    ->inject('response')
    ->action(function (Response $response) {
-        $platforms = Config::getParam('sdks');
+        $platforms = Config::getParam('platforms');

        $versions = [
            'server' => APP_VERSION_STABLE,
@@ -25,6 +25,7 @@ use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Pools\Group;
@@ -258,9 +259,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
        createDatabase($app, 'getLogsDB', 'logs', $collections['logs'], $pools);

        // create appwrite database, `dbForPlatform` is a direct access call.
-        createDatabase($app, 'dbForPlatform', 'appwrite', $collections['console'], $pools, function (Database $dbForPlatform) use ($collections, $app) {
-            $authorization = $app->getResource('authorization');
-
+        createDatabase($app, 'dbForPlatform', 'appwrite', $collections['console'], $pools, function (Database $dbForPlatform) use ($collections) {
            if ($dbForPlatform->getCollection(Audit::COLLECTION)->isEmpty()) {
                $audit = new Audit($dbForPlatform);
                $audit->setup();
@@ -319,9 +318,9 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                $dbForPlatform->createCollection('bucket_' . $bucket->getSequence(), $attributes, $indexes);
            }

-            if ($authorization->skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
+            if (Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
                Console::info("    └── Creating screenshots bucket...");
-                $authorization->skip(fn () => $dbForPlatform->createDocument('buckets', new Document([
+                Authorization::skip(fn () => $dbForPlatform->createDocument('buckets', new Document([
                    '$id' => ID::custom('screenshots'),
                    '$collection' => ID::custom('buckets'),
                    'name' => 'Screenshots',
@@ -336,7 +335,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                    'search' => 'buckets Screenshots',
                ])));

-                $bucket = $authorization->skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots'));
+                $bucket = Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots'));

                Console::info("    └── Creating files collection for screenshots bucket...");
                $files = $collections['buckets']['files'] ?? [];
@@ -364,7 +363,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                    'orders' => $index['orders'],
                ]), $files['indexes']);

-                $authorization->skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getSequence(), $attributes, $indexes));
+                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getSequence(), $attributes, $indexes));
            }
        });

@@ -455,12 +454,8 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
    App::setResource('pools', fn () => $pools);

    try {
-        $authorization = $app->getResource('authorization');
-
-        $request->setAuthorization($authorization);
-        $response->setAuthorization($authorization);
-        $authorization->cleanRoles();
-        $authorization->addRole(Role::any()->toString());
+        Authorization::cleanRoles();
+        Authorization::setRole(Role::any()->toString());

        $app->run($request, $response);
    } catch (\Throwable $th) {
@@ -502,7 +497,7 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
            $log->addExtra('file', $th->getFile());
            $log->addExtra('line', $th->getLine());
            $log->addExtra('trace', $th->getTraceAsString());
-            $log->addExtra('roles', isset($authorization) ? $authorization->getRoles() : []);
+            $log->addExtra('roles', Authorization::getRoles());

            $sdk = $route->getLabel("sdk", false);

@@ -561,7 +556,7 @@ $http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
    /** @var Utopia\Database\Database $dbForPlatform */
    $dbForPlatform = $app->getResource('dbForPlatform');

-    Timer::tick(DOMAIN_SYNC_TIMER * 1000, function () use ($dbForPlatform, $domains, &$lastSyncUpdate, $app) {
+    Timer::tick(DOMAIN_SYNC_TIMER * 1000, function () use ($dbForPlatform, $domains, &$lastSyncUpdate) {
        try {
            $time = DateTime::now();
            $limit = 1000;
@@ -578,8 +573,7 @@ $http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
                }
                $results = [];
                try {
-                    $authorization = $app->getResource('authorization');
-                    $results = $authorization->skip(fn () =>  $dbForPlatform->find('rules', $queries));
+                    $results = Authorization::skip(fn () =>  $dbForPlatform->find('rules', $queries));
                } catch (Throwable $th) {
                    Console::error($th->getMessage());
                }
@@ -15,8 +15,7 @@ Config::load('auth', __DIR__ . '/../config/auth.php', $configAdapter);
 Config::load('apis', __DIR__ . '/../config/apis.php', $configAdapter);  // List of APIs
 Config::load('errors', __DIR__ . '/../config/errors.php', $configAdapter);
 Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php', $configAdapter);
-Config::load('sdks', __DIR__ . '/../config/sdks.php', $configAdapter);
-Config::load('platform', __DIR__ . '/../config/platform.php', $configAdapter);
+Config::load('platforms', __DIR__ . '/../config/platforms.php', $configAdapter);
 Config::load('console', __DIR__ . '/../config/console.php', $configAdapter);
 Config::load('collections', __DIR__ . '/../config/collections.php', $configAdapter);
 Config::load('frameworks', __DIR__ . '/../config/frameworks.php', $configAdapter);
@@ -4,17 +4,12 @@ use Appwrite\Platform\Modules\Compute\Specification;

 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
-
-// Email
 const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
 const APP_EMAIL_SECURITY = ''; // Default security email address
 const APP_EMAIL_LOGO_URL = 'https://cloud.appwrite.io/images/mails/logo.png';
 const APP_EMAIL_ACCENT_COLOR = '#fd366e';
 const APP_EMAIL_TERMS_URL = 'https://appwrite.io/terms';
 const APP_EMAIL_PRIVACY_URL = 'https://appwrite.io/privacy';
-const APP_EMAIL_PLATFORM_NAME = 'Appwrite';
-const APP_EMAIL_FOOTER_IMAGE_URL = 'https://appwrite.io/email/footer.png';
-
 const APP_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
 const APP_MODE_DEFAULT = 'default';
 const APP_MODE_ADMIN = 'admin';
@@ -60,7 +55,6 @@ const APP_DATABASE_TIMEOUT_MILLISECONDS_API = 15 * 1000; // 15 seconds
 const APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER = 300 * 1000; // 5 minutes
 const APP_DATABASE_TIMEOUT_MILLISECONDS_TASK = 300 * 1000; // 5 minutes
 const APP_DATABASE_QUERY_MAX_VALUES = 500;
-const APP_DATABASE_QUERY_MAX_VALUES_WORKER = 5000;
 const APP_DATABASE_ENCRYPT_SIZE_MIN = 150;
 const APP_DATABASE_TXN_TTL_MIN = 60; // 1 minute
 const APP_DATABASE_TXN_TTL_MAX = 3600; // 1 hour
@@ -87,12 +81,13 @@ const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
 const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
+const APP_HOSTNAME_INTERNAL = 'appwrite';
 const APP_COMPUTE_CPUS_DEFAULT = 0.5;
 const APP_COMPUTE_MEMORY_DEFAULT = 512;
 const APP_COMPUTE_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
-const APP_SDK_PLATFORM_SERVER = 'server';
-const APP_SDK_PLATFORM_CLIENT = 'client';
-const APP_SDK_PLATFORM_CONSOLE = 'console';
+const APP_PLATFORM_SERVER = 'server';
+const APP_PLATFORM_CLIENT = 'client';
+const APP_PLATFORM_CONSOLE = 'console';
 const APP_VCS_GITHUB_USERNAME = 'Appwrite';
 const APP_VCS_GITHUB_EMAIL = 'team@appwrite.io';
 const APP_VCS_GITHUB_URL = 'https://github.com/TeamAppwrite';
@@ -209,12 +204,6 @@ const DELETE_TYPE_SESSION_TARGETS = 'session_targets';
 const DELETE_TYPE_CSV_EXPORTS = 'csv_exports';
 const DELETE_TYPE_MAINTENANCE = 'maintenance';

-// Rule statuses
-const RULE_STATUS_CREATED = 'created'; // This is also the status when domain DNS verification fails.
-const RULE_STATUS_CERTIFICATE_GENERATING = 'verifying';
-const RULE_STATUS_CERTIFICATE_GENERATION_FAILED = 'unverified';
-const RULE_STATUS_VERIFIED = 'verified';
-
 // Message types
 const MESSAGE_SEND_TYPE_INTERNAL = 'internal';
 const MESSAGE_SEND_TYPE_EXTERNAL = 'external';
@@ -4,6 +4,7 @@ use Appwrite\OpenSSL\OpenSSL;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\System\System;

 Database::addFilter(
@@ -69,11 +70,11 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        $attributes = $database->getAuthorization()->skip(fn () => $database->find('attributes', [
+        $attributes = $database->find('attributes', [
            Query::equal('collectionInternalId', [$document->getSequence()]),
            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
            Query::limit($database->getLimitForAttributes()),
-        ]));
+        ]);

        foreach ($attributes as $attribute) {
            $attributeType = $attribute->getAttribute('type');
@@ -104,12 +105,12 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('indexes', [
                Query::equal('collectionInternalId', [$document->getSequence()]),
                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
                Query::limit($database->getLimitForIndexes()),
-            ]));
+            ]);
    }
 );

@@ -119,11 +120,11 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('platforms', [
                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
+            ]);
    }
 );

@@ -133,11 +134,11 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('keys', [
                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
+            ]);
    }
 );

@@ -147,11 +148,11 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('devKeys', [
                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
+            ]);
    }
 );

@@ -161,11 +162,11 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('webhooks', [
                Query::equal('projectInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
+            ]);
    }
 );

@@ -175,7 +176,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return  $database->getAuthorization()->skip(fn () => $database->find('sessions', [
+        return Authorization::skip(fn () => $database->find('sessions', [
            Query::equal('userInternalId', [$document->getSequence()]),
            Query::limit(APP_LIMIT_SUBQUERY),
        ]));
@@ -188,7 +189,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return  $database->getAuthorization()->skip(fn () => $database
+        return Authorization::skip(fn () => $database
            ->find('tokens', [
                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
@@ -202,7 +203,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return  $database->getAuthorization()->skip(fn () => $database
+        return Authorization::skip(fn () => $database
            ->find('challenges', [
                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
@@ -216,7 +217,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return Authorization::skip(fn () => $database
            ->find('authenticators', [
                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
@@ -230,7 +231,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return  $database->getAuthorization()->skip(fn () => $database
+        return Authorization::skip(fn () => $database
            ->find('memberships', [
                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY),
@@ -250,14 +251,14 @@ Database::addFilter(
            default => ['function', 'site']
        };

-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('variables', [
                Query::equal('resourceInternalId', [$document->getSequence()]),
                Query::equal('resourceType', $resourceType),
                Query::orderAsc('resourceType'),
                Query::orderAsc(),
                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
+            ]);
    }
 );

@@ -293,11 +294,11 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return $database->getAuthorization()->skip(fn () => $database
+        return $database
            ->find('variables', [
                Query::equal('resourceType', ['project']),
                Query::limit(APP_LIMIT_SUBQUERY)
-            ]));
+            ]);
    }
 );

@@ -330,7 +331,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        return  $database->getAuthorization()->skip(fn () => $database
+        return Authorization::skip(fn () => $database
            ->find('targets', [
                Query::equal('userInternalId', [$document->getSequence()]),
                Query::limit(APP_LIMIT_SUBQUERY)
@@ -344,7 +345,7 @@ Database::addFilter(
        return;
    },
    function (mixed $value, Document $document, Database $database) {
-        $targetIds =  $database->getAuthorization()->skip(fn () => \array_map(
+        $targetIds = Authorization::skip(fn () => \array_map(
            fn ($document) => $document->getAttribute('targetInternalId'),
            $database->find('subscribers', [
                Query::equal('topicInternalId', [$document->getSequence()]),
@@ -20,10 +20,8 @@ use Appwrite\Event\StatsUsage;
 use Appwrite\Event\Webhook;
 use Appwrite\Extend\Exception;
 use Appwrite\GraphQL\Schema;
-use Appwrite\Network\Cors;
 use Appwrite\Network\Platform;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\Network\Validator\Redirect;
 use Appwrite\Utopia\Database\Documents\User;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
@@ -45,6 +43,7 @@ use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime as DatabaseDateTime;
 use Utopia\Database\Document;
+use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
@@ -65,7 +64,7 @@ use Utopia\Storage\Storage;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
-use Utopia\Validator\URL;
+use Utopia\Validator\Hostname;
 use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;

@@ -160,161 +159,81 @@ App::setResource('queueForMigrations', function (Publisher $publisher) {
 App::setResource('queueForStatsResources', function (Publisher $publisher) {
    return new StatsResources($publisher);
 }, ['publisher']);
+App::setResource('platforms', function (Request $request, Document $console, Document $project, Database $dbForPlatform) {
+    $console->setAttribute('platforms', [ // Always allow current host
+        '$collection' => ID::custom('platforms'),
+        'name' => 'Current Host',
+        'type' => Platform::TYPE_WEB,
+        'hostname' => $request->getHostname(),
+    ], Document::SET_TYPE_APPEND);

-/**
- * Platform configuration
- */
-App::setResource('platform', function () {
-    return Config::getParam('platform', []);
-}, []);
+    $hostnames = explode(',', System::getEnv('_APP_CONSOLE_HOSTNAMES', ''));
+    $validator = new Hostname();
+    foreach ($hostnames as $hostname) {
+        $hostname = trim($hostname);
+        if (!$validator->isValid($hostname)) {
+            continue;
+        }
+        $console->setAttribute('platforms', [
+            '$collection' => ID::custom('platforms'),
+            'type' => Platform::TYPE_WEB,
+            'name' => $hostname,
+            'hostname' => $hostname,
+        ], Document::SET_TYPE_APPEND);
+    }

-/**
- * List of allowed request hostnames for the request.
- */
-App::setResource('allowedHostnames', function (array $platform, Document $project, Document $rule, Document $devKey, Request $request) {
-    $allowed = [...($platform['hostnames'] ?? [])];
-
-    /* Add platform configured hostnames */
+    // Add `exp` and `appwrite-callback-{projectId}` schemes
    if (!$project->isEmpty() && $project->getId() !== 'console') {
-        $platforms = $project->getAttribute('platforms', []);
-        $hostnames = Platform::getHostnames($platforms);
-        $allowed = [...$allowed, ...$hostnames];
+        $project->setAttribute('platforms', [
+            '$collection' => ID::custom('platforms'),
+            'type' => Platform::TYPE_SCHEME,
+            'name' => 'Expo',
+            'key' => 'exp',
+        ], Document::SET_TYPE_APPEND);
+        $project->setAttribute('platforms', [
+            '$collection' => ID::custom('platforms'),
+            'type' => Platform::TYPE_SCHEME,
+            'name' => 'Appwrite Callback',
+            'key' => 'appwrite-callback-' . $project->getId(),
+        ], Document::SET_TYPE_APPEND);
    }

-    /* Add the request hostname if a dev key is found */
-    if (!$devKey->isEmpty()) {
-        $allowed[] = $request->getHostname();
+    $origin = \parse_url($request->getOrigin(), PHP_URL_HOST);
+
+    if (empty($origin)) {
+        $origin = \parse_url($request->getReferer(), PHP_URL_HOST);
    }

-    $originHostname = parse_url($request->getOrigin(), PHP_URL_HOST);
-
-    /* Add request hostname for preflight requests */
-    if ($request->getMethod() === 'OPTIONS') {
-        $allowed[] = $originHostname;
-    }
-
-    /* Allow the request origin if a dev key or rule is found */
-    if ((!$rule->isEmpty() || !$devKey->isEmpty()) && !empty($originHostname)) {
-        $allowed[] = $originHostname;
-    }
-
-    return array_unique($allowed);
-}, ['platform', 'project', 'rule', 'devKey', 'request']);
-
-/**
- * List of allowed request schemes for the request.
- */
-App::setResource('allowedSchemes', function (Document $project) {
-    $allowed = [];
-
-    if (!$project->isEmpty() && $project->getId() !== 'console') {
-        /* Add hardcoded schemes */
-        $allowed[] = 'exp';
-        $allowed[] = 'appwrite-callback-' . $project->getId();
-
-        /* Add platform configured schemes */
-        $platforms = $project->getAttribute('platforms', []);
-        $schemes = Platform::getSchemes($platforms);
-        $allowed = [...$allowed, ...$schemes];
-    }
-
-    return array_unique($allowed);
-}, ['project']);
-
-/**
- * Rule associated with a request origin.
- */
-App::setResource('rule', function (Request $request, Database $dbForPlatform, Document $project, Authorization $authorization) {
-    $domain = \parse_url($request->getOrigin(), PHP_URL_HOST);
-    if (empty($domain)) {
-        return new Document();
-    }
-
-    // TODO: (@Meldiron) Remove after 1.7.x migration
-    $isMd5 = System::getEnv('_APP_RULES_FORMAT') === 'md5';
-    $rule = $authorization->skip(function () use ($dbForPlatform, $domain, $isMd5) {
-        if ($isMd5) {
-            return $dbForPlatform->getDocument('rules', md5($domain));
+    // Safe if rule with same project ID exists
+    if (!empty($origin)) {
+        if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+            $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($origin ?? '')));
+        } else {
+            $rule = Authorization::skip(
+                fn () => $dbForPlatform->find('rules', [
+                    Query::equal('domain', [$origin]),
+                    Query::limit(1)
+                ])
+            )[0] ?? new Document();
        }

-        return $dbForPlatform->findOne('rules', [
-            Query::equal('domain', [$domain]),
-        ]) ?? new Document();
-    });
-
-    if ($rule->getAttribute('projectInternalId') !== $project->getSequence()) {
-        return new Document();
+        if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getSequence()) {
+            $project->setAttribute('platforms', [
+                '$collection' => ID::custom('platforms'),
+                'type' => Platform::TYPE_WEB,
+                'name' => $origin,
+                'hostname' => $origin,
+            ], Document::SET_TYPE_APPEND);
+        }
    }

-    return $rule;
-}, ['request', 'dbForPlatform', 'project', 'authorization']);
+    return [
+        ...$console->getAttribute('platforms', []),
+        ...$project->getAttribute('platforms', []),
+    ];
+}, ['request', 'console', 'project', 'dbForPlatform']);

-/**
- * CORS service
- */
-App::setResource('cors', fn (array $allowedHostnames) => new Cors(
-    $allowedHostnames,
-    allowedMethods: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'],
-    allowedHeaders: [
-        'Accept',
-        'Origin',
-        'Cookie',
-        'Set-Cookie',
-        // Content
-        'Content-Type',
-        'Content-Range',
-        // Appwrite
-        'X-Appwrite-Project',
-        'X-Appwrite-Key',
-        'X-Appwrite-Dev-Key',
-        'X-Appwrite-Locale',
-        'X-Appwrite-Mode',
-        'X-Appwrite-JWT',
-        'X-Appwrite-Response-Format',
-        'X-Appwrite-Timeout',
-        'X-Appwrite-ID',
-        'X-Appwrite-Timestamp',
-        'X-Appwrite-Session',
-        // SDK generator
-        'X-SDK-Version',
-        'X-SDK-Name',
-        'X-SDK-Language',
-        'X-SDK-Platform',
-        'X-SDK-GraphQL',
-        'X-SDK-Profile',
-        // Caching
-        'Range',
-        'Cache-Control',
-        'Expires',
-        'Pragma',
-        // Server to server
-        'X-Fallback-Cookies',
-        'X-Requested-With',
-        'X-Forwarded-For',
-        'X-Forwarded-User-Agent',
-    ],
-    allowCredentials: true,
-    exposedHeaders: [
-        'X-Appwrite-Session',
-        'X-Fallback-Cookies',
-    ],
-), ['allowedHostnames']);
-
-App::setResource('originValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
-    if (!$devKey->isEmpty()) {
-        return new URL();
-    }
-    return new Origin($allowedHostnames, $allowedSchemes);
-}, ['devKey', 'allowedHostnames', 'allowedSchemes']);
-
-App::setResource('redirectValidator', function (Document $devKey, array $allowedHostnames, array $allowedSchemes) {
-    if (!$devKey->isEmpty()) {
-        return new URL();
-    }
-    return new Redirect($allowedHostnames, $allowedSchemes);
-}, ['devKey', 'allowedHostnames', 'allowedSchemes']);
-
-App::setResource('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken, $authorization) {
+App::setResource('user', function (string $mode, Document $project, Document $console, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Store $store, Token $proofForToken) {
    /**
     * Handles user authentication and session validation.
     *
@@ -334,7 +253,7 @@ App::setResource('user', function (string $mode, Document $project, Document $co
     *    overwriting the previous value.
     */

-    $authorization->setDefaultStatus(true);
+    Authorization::setDefaultStatus(true);

    $store->setKey('a_session_' . $project->getId());

@@ -401,7 +320,7 @@ App::setResource('user', function (string $mode, Document $project, Document $co
    }
    // if (APP_MODE_ADMIN === $mode) {
    //     if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
-    //         $authorization->setDefaultStatus(false);  // Cancel security segmentation for admin users.
+    //         Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
    //     } else {
    //         $user = new Document([]);
    //     }
@@ -433,9 +352,9 @@ App::setResource('user', function (string $mode, Document $project, Document $co
    $dbForPlatform->setMetadata('user', $user->getId());

    return $user;
-}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken', 'authorization']);
+}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform', 'store', 'proofForToken']);

-App::setResource('project', function ($dbForPlatform, $request, $console, $authorization) {
+App::setResource('project', function ($dbForPlatform, $request, $console) {
    /** @var Appwrite\Utopia\Request $request */
    /** @var Utopia\Database\Database $dbForPlatform */
    /** @var Utopia\Database\Document $console */
@@ -446,10 +365,10 @@ App::setResource('project', function ($dbForPlatform, $request, $console, $autho
        return $console;
    }

-    $project = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+    $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));

    return $project;
-}, ['dbForPlatform', 'request', 'console', 'authorization']);
+}, ['dbForPlatform', 'request', 'console']);

 App::setResource('session', function (User $user, Store $store, Token $proofForToken) {
    if ($user->isEmpty()) {
@@ -472,6 +391,10 @@ App::setResource('session', function (User $user, Store $store, Token $proofForT
    return;
 }, ['user', 'store', 'proofForToken']);

+App::setResource('console', function () {
+    return new Document(Config::getParam('console'));
+}, []);
+
 App::setResource('store', function (): Store {
    return new Store();
 });
@@ -502,15 +425,7 @@ App::setResource('proofForCode', function (): Code {
    return $code;
 });

-App::setResource('console', function () {
-    return new Document(Config::getParam('console'));
-}, []);
-
-App::setResource('authorization', function () {
-    return new Authorization();
-}, []);
-
-App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project, Authorization $authorization) {
+App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project) {
    if ($project->isEmpty() || $project->getId() === 'console') {
        return $dbForPlatform;
    }
@@ -526,7 +441,6 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
    $database = new Database($adapter, $cache);

    $database
-        ->setAuthorization($authorization)
        ->setMetadata('host', \gethostname())
        ->setMetadata('project', $project->getId())
        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
@@ -548,15 +462,13 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform
    }

    return $database;
-}, ['pools', 'dbForPlatform', 'cache', 'project', 'authorization']);
-
-App::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authorization $authorization) {
+}, ['pools', 'dbForPlatform', 'cache', 'project']);

+App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
    $adapter = new DatabasePool($pools->get('console'));
    $database = new Database($adapter, $cache);

    $database
-        ->setAuthorization($authorization)
        ->setNamespace('_console')
        ->setMetadata('host', \gethostname())
        ->setMetadata('project', 'console')
@@ -566,12 +478,12 @@ App::setResource('dbForPlatform', function (Group $pools, Cache $cache, Authoriz
    $database->setDocumentType('users', User::class);

    return $database;
-}, ['pools', 'cache', 'authorization']);
+}, ['pools', 'cache']);

-App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, Authorization $authorization) {
+App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
    $databases = [];

-    return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases) {
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
        if ($project->isEmpty() || $project->getId() === 'console') {
            return $dbForPlatform;
        }
@@ -583,15 +495,13 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
        }

-        $configure = (function (Database $database) use ($project, $dsn, $authorization) {
+        $configure = (function (Database $database) use ($project, $dsn) {
            $database
-                ->setAuthorization($authorization)
                ->setMetadata('host', \gethostname())
                ->setMetadata('project', $project->getId())
                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES)
-                ->setDocumentType('users', User::class)
-            ;
+                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
+            $database->setDocumentType('users', User::class);

            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

@@ -621,12 +531,12 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform

        return $database;
    };
-}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+}, ['pools', 'dbForPlatform', 'cache']);

-App::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    $database = null;

-    return function (?Document $project = null) use ($pools, $cache, $authorization, &$database) {
+    return function (?Document $project = null) use ($pools, $cache, &$database) {
        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
            $database->setTenant((int) $project->getSequence());
            return $database;
@@ -636,7 +546,6 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio
        $database = new Database($adapter, $cache);

        $database
-            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
@@ -649,7 +558,7 @@ App::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorizatio

        return $database;
    };
-}, ['pools', 'cache', 'authorization']);
+}, ['pools', 'cache']);

 App::setResource('telemetry', fn () => new NoTelemetry());

@@ -829,8 +738,8 @@ App::setResource('passwordsDictionary', function ($register) {


 App::setResource('servers', function () {
-    $platforms = Config::getParam('sdks');
-    $server = $platforms[APP_SDK_PLATFORM_SERVER];
+    $platforms = Config::getParam('platforms');
+    $server = $platforms[APP_PLATFORM_SERVER];

    $languages = array_map(function ($language) {
        return strtolower($language['name']);
@@ -843,7 +752,7 @@ App::setResource('promiseAdapter', function ($register) {
    return $register->get('promiseAdapter');
 }, ['register']);

-App::setResource('schema', function ($utopia, $dbForProject, $authorization) {
+App::setResource('schema', function ($utopia, $dbForProject) {

    $complexity = function (int $complexity, array $args) {
        $queries = Query::parseQueries($args['queries'] ?? []);
@@ -853,8 +762,8 @@ App::setResource('schema', function ($utopia, $dbForProject, $authorization) {
        return $complexity * $limit;
    };

-    $attributes = function (int $limit, int $offset) use ($dbForProject, $authorization) {
-        $attrs = $authorization->skip(fn () => $dbForProject->find('attributes', [
+    $attributes = function (int $limit, int $offset) use ($dbForProject) {
+        $attrs = Authorization::skip(fn () => $dbForProject->find('attributes', [
            Query::limit($limit),
            Query::offset($offset),
        ]));
@@ -928,7 +837,25 @@ App::setResource('schema', function ($utopia, $dbForProject, $authorization) {
        $urls,
        $params,
    );
-}, ['utopia', 'dbForProject', 'authorization']);
+}, ['utopia', 'dbForProject']);
+
+App::setResource('contributors', function () {
+    $path = 'app/config/contributors.json';
+    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+    return $list;
+});
+
+App::setResource('employees', function () {
+    $path = 'app/config/employees.json';
+    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+    return $list;
+});
+
+App::setResource('heroes', function () {
+    $path = 'app/config/heroes.json';
+    $list = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+    return $list;
+});

 App::setResource('gitHub', function (Cache $cache) {
    return new VcsGitHub($cache);
@@ -956,7 +883,7 @@ App::setResource('smsRates', function () {
    return [];
 });

-App::setResource('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform, Authorization $authorization) {
+App::setResource('devKey', function (Request $request, Document $project, array $servers, Database $dbForPlatform) {
    $devKey = $request->getHeader('x-appwrite-dev-key', $request->getParam('devKey', ''));

    // Check if given key match project's development keys
@@ -975,7 +902,7 @@ App::setResource('devKey', function (Request $request, Document $project, array
    $accessedAt = $key->getAttribute('accessedAt', 0);
    if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
        $key->setAttribute('accessedAt', DatabaseDateTime::now());
-        $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), $key));
+        Authorization::skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), $key));
        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
    }

@@ -992,15 +919,14 @@ App::setResource('devKey', function (Request $request, Document $project, array

            /** Update access time as well */
            $key->setAttribute('accessedAt', DatabaseDateTime::now());
-            $key = $authorization->skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), $key));
+            $key = Authorization::skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), $key));
            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
        }
    }
-
    return $key;
-}, ['request', 'project', 'servers', 'dbForPlatform', 'authorization']);
+}, ['request', 'project', 'servers', 'dbForPlatform']);

-App::setResource('team', function (Document $project, Database $dbForPlatform, App $utopia, Request $request, Authorization $authorization) {
+App::setResource('team', function (Document $project, Database $dbForPlatform, App $utopia, Request $request) {
    $teamInternalId = '';
    if ($project->getId() !== 'console') {
        $teamInternalId = $project->getAttribute('teamInternalId', '');
@@ -1010,7 +936,7 @@ App::setResource('team', function (Document $project, Database $dbForPlatform, A
        if (str_starts_with($path, '/v1/projects/:projectId')) {
            $uri = $request->getURI();
            $pid = explode('/', $uri)[3];
-            $p = $authorization->skip(fn () => $dbForPlatform->getDocument('projects', $pid));
+            $p = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $pid));
            $teamInternalId = $p->getAttribute('teamInternalId', '');
        } elseif ($path === '/v1/projects') {
            $teamId = $request->getParam('teamId', '');
@@ -1019,7 +945,7 @@ App::setResource('team', function (Document $project, Database $dbForPlatform, A
                return new Document([]);
            }

-            $team = $authorization->skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
+            $team = Authorization::skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
            return $team;
        }
    }
@@ -1028,14 +954,14 @@ App::setResource('team', function (Document $project, Database $dbForPlatform, A
        return new Document([]);
    }

-    $team = $authorization->skip(function () use ($dbForPlatform, $teamInternalId) {
+    $team = Authorization::skip(function () use ($dbForPlatform, $teamInternalId) {
        return $dbForPlatform->findOne('teams', [
            Query::equal('$sequence', [$teamInternalId]),
        ]);
    });

    return $team;
-}, ['project', 'dbForPlatform', 'utopia', 'request', 'authorization']);
+}, ['project', 'dbForPlatform', 'utopia', 'request']);

 App::setResource(
    'isResourceBlocked',
@@ -1073,7 +999,7 @@ App::setResource('apiKey', function (Request $request, Document $project): ?Key

 App::setResource('executor', fn () => new Executor());

-App::setResource('resourceToken', function ($project, $dbForProject, $request, Authorization $authorization) {
+App::setResource('resourceToken', function ($project, $dbForProject, $request) {
    $tokenJWT = $request->getParam('token');

    if (!empty($tokenJWT) && !$project->isEmpty()) { // JWT authentication
@@ -1091,7 +1017,7 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request, A
            return new Document([]);
        }

-        $token = $authorization->skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));
+        $token = Authorization::skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));

        if ($token->isEmpty()) {
            return new Document([]);
@@ -1109,7 +1035,7 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request, A
        }

        return match ($token->getAttribute('resourceType')) {
-            TOKENS_RESOURCE_TYPE_FILES => (function () use ($token, $dbForProject, $authorization) {
+            TOKENS_RESOURCE_TYPE_FILES => (function () use ($token, $dbForProject) {
                $sequences = explode(':', $token->getAttribute('resourceInternalId'));
                $ids = explode(':', $token->getAttribute('resourceId'));

@@ -1120,7 +1046,7 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request, A
                $accessedAt = $token->getAttribute('accessedAt', 0);
                if (empty($accessedAt) || DatabaseDateTime::formatTz(DatabaseDateTime::addSeconds(new \DateTime(), -APP_RESOURCE_TOKEN_ACCESS)) > $accessedAt) {
                    $token->setAttribute('accessedAt', DatabaseDateTime::now());
-                    $authorization->skip(fn () => $dbForProject->updateDocument('resourceTokens', $token->getId(), $token));
+                    Authorization::skip(fn () => $dbForProject->updateDocument('resourceTokens', $token->getId(), $token));
                }

                return new Document([
@@ -1135,8 +1061,39 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request, A
        };
    }
    return new Document([]);
-}, ['project', 'dbForProject', 'request', 'authorization']);
+}, ['project', 'dbForProject', 'request']);

-App::setResource('transactionState', function (Database $dbForProject, Authorization $authorization) {
-    return new TransactionState($dbForProject, $authorization);
-}, ['dbForProject', 'authorization']);
+App::setResource('httpReferrer', function (Request $request): string {
+    $referrer = $request->getReferer();
+    return $referrer;
+}, ['request']);
+
+App::setResource('httpReferrerSafe', function (Request $request, string $httpReferrer, array $platforms, Database $dbForPlatform, Document $project, App $utopia): string {
+    $origin = \parse_url($request->getOrigin($httpReferrer), PHP_URL_HOST);
+    $protocol = \parse_url($request->getOrigin($httpReferrer), PHP_URL_SCHEME);
+    $port = \parse_url($request->getOrigin($httpReferrer), PHP_URL_PORT);
+    $referrer = (!empty($protocol) ? $protocol : $request->getProtocol()) . '://' . $origin . (!empty($port) ? ':' . $port : '');
+
+    // Safe if route is publicly accessible
+    $route = $utopia->getRoute();
+    if ($route->getLabel('origin', false)) {
+        return $referrer;
+    }
+
+    // Safe if added as web platform
+    $originValidator = new Origin($platforms);
+    if ($originValidator->isValid($request->getOrigin($httpReferrer))) {
+        return $referrer;
+    }
+
+    // Unsafe; Localhost is always safe for ease of local development
+    $origin = 'localhost';
+    $protocol = \parse_url($request->getOrigin($httpReferrer), PHP_URL_SCHEME);
+    $port = \parse_url($request->getOrigin($httpReferrer), PHP_URL_PORT);
+    $referrer = (!empty($protocol) ? $protocol : $request->getProtocol()) . '://' . $origin . (!empty($port) ? ':' . $port : '');
+    return $referrer;
+}, ['request', 'httpReferrer', 'platforms', 'dbForPlatform', 'project', 'utopia']);
+
+App::setResource('transactionState', function (Database $dbForProject) {
+    return new TransactionState($dbForProject);
+}, ['dbForProject']);
@@ -32,6 +32,7 @@ use Utopia\Database\Document;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Pools\Group;
@@ -308,7 +309,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
                    'value' => '{}'
                ]);

-                $statsDocument = $database->getAuthorization()->skip(fn () => $database->createDocument('realtime', $document));
+                $statsDocument = Authorization::skip(fn () => $database->createDocument('realtime', $document));
                break;
            } catch (Throwable) {
                Console::warning("Collection not ready. Retrying connection ({$attempts})...");
@@ -338,7 +339,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
                    ->setAttribute('timestamp', DateTime::now())
                    ->setAttribute('value', json_encode($payload));

-                $database->getAuthorization()->skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
+                Authorization::skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
            } catch (Throwable $th) {
                $logError($th, "updateWorkerDocument");
            }
@@ -369,7 +370,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,

                $payload = [];

-                $list = $database->getAuthorization()->skip(fn () => $database->find('realtime', [
+                $list = Authorization::skip(fn () => $database->find('realtime', [
                    Query::greaterThan('timestamp', DateTime::addSeconds(new \DateTime(), -15)),
                ]));

@@ -463,13 +464,13 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                    if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
                        $connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
                        $consoleDatabase = getConsoleDB();
-                        $project = $consoleDatabase->getAuthorization()->skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
+                        $project = Authorization::skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
                        $database = getProjectDB($project);

                        /** @var Appwrite\Utopia\Database\Documents\User $user */
                        $user = $database->getDocument('users', $userId);

-                        $roles = $user->getRoles($database->getAuthorization());
+                        $roles = $user->getRoles();
                        $channels = $realtime->connections[$connection]['channels'];

                        $realtime->unsubscribe($connection);
@@ -525,7 +526,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
    try {
        /** @var Document $project */
        $project = $app->getResource('project');
-        $authorization = $app->getResource('authorization');

        /*
         *  Project Check
@@ -537,12 +537,13 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
        if (
            array_key_exists('realtime', $project->getAttribute('apis', []))
            && !$project->getAttribute('apis', [])['realtime']
-            && !(User::isPrivileged($authorization->getRoles()) || User::isApp($authorization->getRoles()))
+            && !(User::isPrivileged(Authorization::getRoles()) || User::isApp(Authorization::getRoles()))
        ) {
            throw new AppwriteException(AppwriteException::GENERAL_API_DISABLED);
        }

        $timelimit = $app->getResource('timelimit');
+        $platforms = $app->getResource('platforms');
        $user = $app->getResource('user'); /** @var User $user */

        /*
@@ -567,13 +568,13 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         * Skip this check for non-web platforms which are not required to send an origin header.
         */
        $origin = $request->getOrigin();
-        $originValidator = $app->getResource('originValidator');
+        $originValidator = new Origin($platforms);

        if (!empty($origin) && !$originValidator->isValid($origin) && $project->getId() !== 'console') {
            throw new Exception(Exception::REALTIME_POLICY_VIOLATION, $originValidator->getDescription());
        }

-        $roles = $user->getRoles($authorization);
+        $roles = $user->getRoles();

        $channels = Realtime::convertChannels($request->getQuery('channels', []), $user->getId());

@@ -586,8 +587,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,

        $realtime->subscribe($project->getId(), $connection, $roles, $channels);

-        $realtime->connections[$connection]['authorization'] = $authorization;
-
        $user = empty($user->getId()) ? null : $response->output($user, Response::MODEL_ACCOUNT);

        $server->send([$connection], json_encode([
@@ -616,7 +615,6 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
            $code = 500;
        }

-
        $message = $th->getMessage();

        // sanitize 0 && 5xx errors
@@ -646,19 +644,12 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 $server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
    try {
        $response = new Response(new SwooleResponse());
-        $projectId = $realtime->connections[$connection]['projectId'] ?? null;
-
-        // Get authorization from connection (stored during onOpen)
-        $authorization = $realtime->connections[$connection]['authorization'] ?? null;
-
+        $projectId = $realtime->connections[$connection]['projectId'];
        $database = getConsoleDB();
-        $database->setAuthorization($authorization);

        if ($projectId !== 'console') {
-            $project = $authorization->skip(fn () => $database->getDocument('projects', $projectId));
-
+            $project = Authorization::skip(fn () => $database->getDocument('projects', $projectId));
            $database = getProjectDB($project);
-            $database->setAuthorization($authorization);
        } else {
            $project = null;
        }
@@ -722,19 +713,10 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                    throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Session is not valid.');
                }

-                $roles = $user->getRoles($database->getAuthorization());
+                $roles = $user->getRoles();
                $channels = Realtime::convertChannels(array_flip($realtime->connections[$connection]['channels']), $user->getId());
-
-                // Preserve authorization before subscribe overwrites the connection array
-                $authorization = $realtime->connections[$connection]['authorization'] ?? null;
-
                $realtime->subscribe($realtime->connections[$connection]['projectId'], $connection, $roles, $channels);

-                // Restore authorization after subscribe
-                if ($authorization !== null) {
-                    $realtime->connections[$connection]['authorization'] = $authorization;
-                }
-
                $user = $response->output($user, Response::MODEL_ACCOUNT);
                $server->send([$connection], json_encode([
                    'type' => 'response',
@@ -1,5 +1,4 @@
 <?php
-use Utopia\Config\Config;
 use Utopia\System\System;

 $development = $this->getParam('development', false);
@@ -16,8 +15,7 @@ $labelClass = '';
 $buttons = [];

 $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-$platform = Config::getParam('platform', []);
-$hostname = $platform['consoleHostname'] ?? '';
+$hostname = System::getEnv('_APP_CONSOLE_DOMAIN', System::getEnv('_APP_DOMAIN', ''));
 // TODO: remove this later
 if (System::getEnv('_APP_ENV') === 'development') {
    $hostname = 'localhost';
@@ -539,4 +537,4 @@ switch ($type) {
    </script>
 </body>

-</html>
+</html>
@@ -46,30 +46,19 @@ use Utopia\System\System;
 use Utopia\Telemetry\Adapter as Telemetry;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;

+Authorization::disable();
 Runtime::enableCoroutine();

 Server::setResource('register', fn () => $register);

-Server::setResource('authorization', function () {
-    $authorization = new Authorization();
-    $authorization->disable();
-    return  $authorization;
-}, []);
-
-Server::setResource('dbForPlatform', function (Cache $cache, Registry $register, Authorization $authorization) {
+Server::setResource('dbForPlatform', function (Cache $cache, Registry $register) {
    $pools = $register->get('pools');
    $adapter = new DatabasePool($pools->get('console'));
    $dbForPlatform = new Database($adapter, $cache);
-
-    $dbForPlatform
-        ->setAuthorization($authorization)
-        ->setNamespace('_console')
-        ->setDocumentType('users', User::class)
-    ;
-
-
+    $dbForPlatform->setNamespace('_console');
+    $dbForPlatform->setDocumentType('users', User::class);
    return $dbForPlatform;
-}, ['cache', 'register', 'authorization']);
+}, ['cache', 'register']);

 Server::setResource('project', function (Message $message, Database $dbForPlatform) {
    $payload = $message->getPayload() ?? [];
@@ -82,7 +71,7 @@ Server::setResource('project', function (Message $message, Database $dbForPlatfo
    return $dbForPlatform->getDocument('projects', $project->getId());
 }, ['message', 'dbForPlatform']);

-Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform, Authorization $authorization) {
+Server::setResource('dbForProject', function (Cache $cache, Registry $register, Message $message, Document $project, Database $dbForPlatform) {
    if ($project->isEmpty() || $project->getId() === 'console') {
        return $dbForPlatform;
    }
@@ -114,17 +103,15 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
            ->setNamespace('_' . $project->getSequence());
    }

-    $database
-        ->setAuthorization($authorization)
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+    $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);

    return $database;
-}, ['cache', 'register', 'message', 'project', 'dbForPlatform', 'authorization']);
+}, ['cache', 'register', 'message', 'project', 'dbForPlatform']);

-Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache, Authorization $authorization) {
+Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
    $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools

-    return function (Document $project) use ($pools, $dbForPlatform, $cache, $authorization, &$databases): Database {
+    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases): Database {
        if ($project->isEmpty() || $project->getId() === 'console') {
            return $dbForPlatform;
        }
@@ -138,7 +125,7 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf

        if (isset($databases[$dsn->getHost()])) {
            $database = $databases[$dsn->getHost()];
-            $database->setAuthorization($authorization);
+
            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));

            if (\in_array($dsn->getHost(), $sharedTables)) {
@@ -175,17 +162,15 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
                ->setNamespace('_' . $project->getSequence());
        }

-        $database
-            ->setAuthorization($authorization)
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
+        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);

        return $database;
    };
-}, ['pools', 'dbForPlatform', 'cache', 'authorization']);
+}, ['pools', 'dbForPlatform', 'cache']);

-Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authorization $authorization) {
+Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
    $database = null;
-    return function (?Document $project = null) use ($pools, $cache, $database, $authorization) {
+    return function (?Document $project = null) use ($pools, $cache, $database) {
        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
            $database->setTenant((int)$project->getSequence());
            return $database;
@@ -195,11 +180,10 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authoriza
        $database = new Database($adapter, $cache);

        $database
-            ->setAuthorization($authorization)
            ->setSharedTables(true)
            ->setNamespace('logsV1')
            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES_WORKER);
+            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);

        // set tenant
        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
@@ -208,7 +192,7 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache, Authoriza

        return $database;
    };
-}, ['pools', 'cache', 'authorization']);
+}, ['pools', 'cache']);

 Server::setResource('abuseRetention', function () {
    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
@@ -427,13 +411,6 @@ Server::setResource('logError', function (Registry $register, Document $project)
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());

-            if ($error->getPrevious() !== null) {
-                if ($error->getPrevious()->getMessage() != $error->getMessage()) {
-                    $log->addExtra('previousMessage', $error->getPrevious()->getMessage());
-                }
-                $log->addExtra('previousFile', $error->getPrevious()->getFile());
-                $log->addExtra('previousLine', $error->getPrevious()->getLine());
-            }

            foreach (($extras ?? []) as $key => $value) {
                $log->addExtra($key, $value);
@@ -454,13 +431,6 @@ Server::setResource('logError', function (Registry $register, Document $project)

        Console::warning("Failed: {$error->getMessage()}");
        Console::warning($error->getTraceAsString());
-
-        if ($error->getPrevious() !== null) {
-            if ($error->getPrevious()->getMessage() != $error->getMessage()) {
-                Console::warning("Previous Failed: {$error->getPrevious()->getMessage()}");
-            }
-            Console::warning("Previous File: {$error->getPrevious()->getFile()} Line: {$error->getPrevious()->getLine()}");
-        }
    };
 }, ['register', 'project']);

@@ -510,8 +480,7 @@ $worker
    ->inject('log')
    ->inject('pools')
    ->inject('project')
-    ->inject('authorization')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project, Authorization $authorization) use ($worker, $queueName) {
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project) use ($worker, $queueName) {
        $version = System::getEnv('_APP_VERSION', 'UNKNOWN');

        if ($logger) {
@@ -527,7 +496,7 @@ $worker
            $log->addExtra('file', $error->getFile());
            $log->addExtra('line', $error->getLine());
            $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('roles', $authorization->getRoles());
+            $log->addExtra('roles', Authorization::getRoles());

            $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
@@ -52,11 +52,11 @@
        "utopia-php/cache": "0.13.*",
        "utopia-php/cli": "0.15.*",
        "utopia-php/config": "1.*.*",
-        "utopia-php/database": "4.*",
+        "utopia-php/database": "3.*",
        "utopia-php/detector": "0.2.*",
        "utopia-php/domains": "0.9.*",
        "utopia-php/emails": "0.6.*",
-        "utopia-php/dns": "1.4.*",
+        "utopia-php/dns": "1.1.*",
        "utopia-php/dsn": "0.2.1",
        "utopia-php/framework": "0.33.*",
        "utopia-php/fetch": "0.4.*",
@@ -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": "99b8126a83fa0cb257df7c34ff2fdef5",
+    "content-hash": "0cad126c9b41c0d496462ba03ff36d7b",
    "packages": [
        {
            "name": "adhocore/jwt",
@@ -2004,16 +2004,16 @@
        },
        {
            "name": "phpseclib/phpseclib",
-            "version": "3.0.48",
+            "version": "3.0.47",
            "source": {
                "type": "git",
                "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "64065a5679c50acb886e82c07aa139b0f757bb89"
+                "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/64065a5679c50acb886e82c07aa139b0f757bb89",
-                "reference": "64065a5679c50acb886e82c07aa139b0f757bb89",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9d6ca36a6c2dd434765b1071b2644a1c683b385d",
+                "reference": "9d6ca36a6c2dd434765b1071b2644a1c683b385d",
                "shasum": ""
            },
            "require": {
@@ -2094,7 +2094,7 @@
            ],
            "support": {
                "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.48"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.47"
            },
            "funding": [
                {
@@ -2110,7 +2110,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-12-15T11:51:42+00:00"
+            "time": "2025-10-06T01:07:24+00:00"
        },
        {
            "name": "psr/container",
@@ -2453,20 +2453,20 @@
        },
        {
            "name": "ramsey/uuid",
-            "version": "4.9.2",
+            "version": "4.9.1",
            "source": {
                "type": "git",
                "url": "https://github.com/ramsey/uuid.git",
-                "reference": "8429c78ca35a09f27565311b98101e2826affde0"
+                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/8429c78ca35a09f27565311b98101e2826affde0",
-                "reference": "8429c78ca35a09f27565311b98101e2826affde0",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/81f941f6f729b1e3ceea61d9d014f8b6c6800440",
+                "reference": "81f941f6f729b1e3ceea61d9d014f8b6c6800440",
                "shasum": ""
            },
            "require": {
-                "brick/math": "^0.8.16 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12 || ^0.13 || ^0.14",
                "php": "^8.0",
                "ramsey/collection": "^1.2 || ^2.0"
            },
@@ -2525,9 +2525,9 @@
            ],
            "support": {
                "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.9.2"
+                "source": "https://github.com/ramsey/uuid/tree/4.9.1"
            },
-            "time": "2025-12-14T04:43:48+00:00"
+            "time": "2025-09-04T20:59:21+00:00"
        },
        {
            "name": "spomky-labs/otphp",
@@ -3552,21 +3552,21 @@
        },
        {
            "name": "utopia-php/audit",
-            "version": "1.0.3",
+            "version": "1.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/audit.git",
-                "reference": "15656acfddb9d6f03c395b73673fc66c793c10a5"
+                "reference": "8c17065c2473d4ca799f65585ca74eb53e1be211"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/15656acfddb9d6f03c395b73673fc66c793c10a5",
-                "reference": "15656acfddb9d6f03c395b73673fc66c793c10a5",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/8c17065c2473d4ca799f65585ca74eb53e1be211",
+                "reference": "8c17065c2473d4ca799f65585ca74eb53e1be211",
                "shasum": ""
            },
            "require": {
                "php": ">=8.0",
-                "utopia-php/database": "4.*"
+                "utopia-php/database": "*"
            },
            "require-dev": {
                "laravel/pint": "1.*",
@@ -3593,9 +3593,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/1.0.3"
+                "source": "https://github.com/utopia-php/audit/tree/1.0.2"
            },
-            "time": "2025-11-04T11:27:42+00:00"
+            "time": "2025-10-20T07:14:26+00:00"
        },
        {
            "name": "utopia-php/auth",
@@ -3654,16 +3654,16 @@
        },
        {
            "name": "utopia-php/cache",
-            "version": "0.13.2",
+            "version": "0.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/cache.git",
-                "reference": "5768498c9f451482f0bf3eede4d6452ddcd4a0f6"
+                "reference": "97220cb3b3822b166ee016d1646e2ae2815dc540"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/cache/zipball/5768498c9f451482f0bf3eede4d6452ddcd4a0f6",
-                "reference": "5768498c9f451482f0bf3eede4d6452ddcd4a0f6",
+                "url": "https://api.github.com/repos/utopia-php/cache/zipball/97220cb3b3822b166ee016d1646e2ae2815dc540",
+                "reference": "97220cb3b3822b166ee016d1646e2ae2815dc540",
                "shasum": ""
            },
            "require": {
@@ -3672,7 +3672,7 @@
                "ext-redis": "*",
                "php": ">=8.0",
                "utopia-php/pools": "0.8.*",
-                "utopia-php/telemetry": "*"
+                "utopia-php/telemetry": "0.1.*"
            },
            "require-dev": {
                "laravel/pint": "1.2.*",
@@ -3700,9 +3700,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/cache/issues",
-                "source": "https://github.com/utopia-php/cache/tree/0.13.2"
+                "source": "https://github.com/utopia-php/cache/tree/0.13.1"
            },
-            "time": "2025-12-17T08:55:43+00:00"
+            "time": "2025-05-09T14:43:52+00:00"
        },
        {
            "name": "utopia-php/cli",
@@ -3896,16 +3896,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "4.3.0",
+            "version": "3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "fe7a1326ad623609e65587fe8c01a630a7075fee"
+                "reference": "5da71b65a6123ce2e78795522b05b7458aabfbd7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/fe7a1326ad623609e65587fe8c01a630a7075fee",
-                "reference": "fe7a1326ad623609e65587fe8c01a630a7075fee",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/5da71b65a6123ce2e78795522b05b7458aabfbd7",
+                "reference": "5da71b65a6123ce2e78795522b05b7458aabfbd7",
                "shasum": ""
            },
            "require": {
@@ -3948,9 +3948,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/4.3.0"
+                "source": "https://github.com/utopia-php/database/tree/3.5.0"
            },
-            "time": "2025-11-14T03:43:10+00:00"
+            "time": "2025-11-18T08:11:01+00:00"
        },
        {
            "name": "utopia-php/detector",
@@ -3999,23 +3999,23 @@
        },
        {
            "name": "utopia-php/dns",
-            "version": "1.4.1",
+            "version": "1.1.4",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/dns.git",
-                "reference": "5daf8b683dad877491c4df84c6be24850b2f363b"
+                "reference": "eea6b9299a1420ae6c574f16eb1e9da8689ac56b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/dns/zipball/5daf8b683dad877491c4df84c6be24850b2f363b",
-                "reference": "5daf8b683dad877491c4df84c6be24850b2f363b",
+                "url": "https://api.github.com/repos/utopia-php/dns/zipball/eea6b9299a1420ae6c574f16eb1e9da8689ac56b",
+                "reference": "eea6b9299a1420ae6c574f16eb1e9da8689ac56b",
                "shasum": ""
            },
            "require": {
                "php": ">=8.3",
                "utopia-php/console": "0.0.*",
                "utopia-php/domains": "0.9.*",
-                "utopia-php/telemetry": "*",
+                "utopia-php/telemetry": "0.1.*",
                "utopia-php/validators": "0.*"
            },
            "require-dev": {
@@ -4050,9 +4050,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/dns/issues",
-                "source": "https://github.com/utopia-php/dns/tree/1.4.1"
+                "source": "https://github.com/utopia-php/dns/tree/1.1.4"
            },
-            "time": "2025-12-17T09:09:08+00:00"
+            "time": "2025-11-26T13:38:10+00:00"
        },
        {
            "name": "utopia-php/domains",
@@ -4264,16 +4264,16 @@
        },
        {
            "name": "utopia-php/framework",
-            "version": "0.33.35",
+            "version": "0.33.34",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/http.git",
-                "reference": "82b139fb04f30045db51b0d322224f222da32313"
+                "reference": "76def92594c32504ec80eaacdb60ff8fad73c856"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/http/zipball/82b139fb04f30045db51b0d322224f222da32313",
-                "reference": "82b139fb04f30045db51b0d322224f222da32313",
+                "url": "https://api.github.com/repos/utopia-php/http/zipball/76def92594c32504ec80eaacdb60ff8fad73c856",
+                "reference": "76def92594c32504ec80eaacdb60ff8fad73c856",
                "shasum": ""
            },
            "require": {
@@ -4306,9 +4306,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/http/issues",
-                "source": "https://github.com/utopia-php/http/tree/0.33.35"
+                "source": "https://github.com/utopia-php/http/tree/0.33.34"
            },
-            "time": "2025-12-12T08:33:52+00:00"
+            "time": "2025-12-08T07:55:31+00:00"
        },
        {
            "name": "utopia-php/image",
@@ -4513,16 +4513,16 @@
        },
        {
            "name": "utopia-php/migration",
-            "version": "1.3.5",
+            "version": "1.3.9",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/migration.git",
-                "reference": "6f366f1d4ac2796e59a97d1ba28cedc355e7122e"
+                "reference": "c55ec67c74663190cda10fd79297422147be7e85"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/migration/zipball/6f366f1d4ac2796e59a97d1ba28cedc355e7122e",
-                "reference": "6f366f1d4ac2796e59a97d1ba28cedc355e7122e",
+                "url": "https://api.github.com/repos/utopia-php/migration/zipball/c55ec67c74663190cda10fd79297422147be7e85",
+                "reference": "c55ec67c74663190cda10fd79297422147be7e85",
                "shasum": ""
            },
            "require": {
@@ -4531,7 +4531,7 @@
                "ext-openssl": "*",
                "php": ">=8.1",
                "utopia-php/console": "0.0.*",
-                "utopia-php/database": "4.*",
+                "utopia-php/database": "3.*",
                "utopia-php/dsn": "0.2.*",
                "utopia-php/storage": "0.18.*"
            },
@@ -4562,9 +4562,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/migration/issues",
-                "source": "https://github.com/utopia-php/migration/tree/1.3.5"
+                "source": "https://github.com/utopia-php/migration/tree/1.3.9"
            },
-            "time": "2025-11-25T11:18:29+00:00"
+            "time": "2025-12-08T08:45:09+00:00"
        },
        {
            "name": "utopia-php/mongo",
@@ -4730,21 +4730,21 @@
        },
        {
            "name": "utopia-php/pools",
-            "version": "0.8.3",
+            "version": "0.8.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/pools.git",
-                "reference": "ad7d6ba946376e81c603204285ce9a674b6502b8"
+                "reference": "05c67aba42eb68ac65489cc1e7fc5db83db2dd4d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/pools/zipball/ad7d6ba946376e81c603204285ce9a674b6502b8",
-                "reference": "ad7d6ba946376e81c603204285ce9a674b6502b8",
+                "url": "https://api.github.com/repos/utopia-php/pools/zipball/05c67aba42eb68ac65489cc1e7fc5db83db2dd4d",
+                "reference": "05c67aba42eb68ac65489cc1e7fc5db83db2dd4d",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.4",
-                "utopia-php/telemetry": "*"
+                "php": ">=8.3",
+                "utopia-php/telemetry": "0.1.*"
            },
            "require-dev": {
                "laravel/pint": "1.*",
@@ -4776,9 +4776,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/pools/issues",
-                "source": "https://github.com/utopia-php/pools/tree/0.8.3"
+                "source": "https://github.com/utopia-php/pools/tree/0.8.2"
            },
-            "time": "2025-12-17T09:35:18+00:00"
+            "time": "2025-04-17T02:04:54+00:00"
        },
        {
            "name": "utopia-php/preloader",
@@ -4835,16 +4835,16 @@
        },
        {
            "name": "utopia-php/queue",
-            "version": "0.11.2",
+            "version": "0.11.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/queue.git",
-                "reference": "a854f7c4abc18e0eca55fc5608cd7088d71eb19f"
+                "reference": "498bbbef418b1db71b51e1bb62f5d1d752ddd8d6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/queue/zipball/a854f7c4abc18e0eca55fc5608cd7088d71eb19f",
-                "reference": "a854f7c4abc18e0eca55fc5608cd7088d71eb19f",
+                "url": "https://api.github.com/repos/utopia-php/queue/zipball/498bbbef418b1db71b51e1bb62f5d1d752ddd8d6",
+                "reference": "498bbbef418b1db71b51e1bb62f5d1d752ddd8d6",
                "shasum": ""
            },
            "require": {
@@ -4854,7 +4854,7 @@
                "utopia-php/fetch": "0.4.*",
                "utopia-php/framework": "0.33.*",
                "utopia-php/pools": "0.8.*",
-                "utopia-php/telemetry": "*"
+                "utopia-php/telemetry": "0.1.*"
            },
            "require-dev": {
                "ext-redis": "*",
@@ -4895,9 +4895,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/queue/issues",
-                "source": "https://github.com/utopia-php/queue/tree/0.11.2"
+                "source": "https://github.com/utopia-php/queue/tree/0.11.1"
            },
-            "time": "2025-12-17T09:32:35+00:00"
+            "time": "2025-05-30T11:50:34+00:00"
        },
        {
            "name": "utopia-php/registry",
@@ -4953,16 +4953,16 @@
        },
        {
            "name": "utopia-php/storage",
-            "version": "0.18.18",
+            "version": "0.18.16",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/storage.git",
-                "reference": "acaea524f315f87b8811a2c34450fe2b502f49d8"
+                "reference": "0c7b8ad68de8e1eb23ccc8af9f27a30eb832930f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/acaea524f315f87b8811a2c34450fe2b502f49d8",
-                "reference": "acaea524f315f87b8811a2c34450fe2b502f49d8",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/0c7b8ad68de8e1eb23ccc8af9f27a30eb832930f",
+                "reference": "0c7b8ad68de8e1eb23ccc8af9f27a30eb832930f",
                "shasum": ""
            },
            "require": {
@@ -5005,28 +5005,28 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/0.18.18"
+                "source": "https://github.com/utopia-php/storage/tree/0.18.16"
            },
-            "time": "2025-12-17T07:33:45+00:00"
+            "time": "2025-12-03T02:15:45+00:00"
        },
        {
            "name": "utopia-php/swoole",
-            "version": "0.8.5",
+            "version": "0.8.4",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/swoole.git",
-                "reference": "e42b6b8e44c457a7b35d8a857d7af1d67d667c58"
+                "reference": "150c30700e738c52348cce9ed0e0f0ff96872081"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/e42b6b8e44c457a7b35d8a857d7af1d67d667c58",
-                "reference": "e42b6b8e44c457a7b35d8a857d7af1d67d667c58",
+                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/150c30700e738c52348cce9ed0e0f0ff96872081",
+                "reference": "150c30700e738c52348cce9ed0e0f0ff96872081",
                "shasum": ""
            },
            "require": {
                "ext-swoole": "*",
                "php": ">=8.0",
-                "utopia-php/framework": "0.33.35"
+                "utopia-php/framework": "0.33.*"
            },
            "require-dev": {
                "laravel/pint": "1.2.*",
@@ -5056,9 +5056,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/swoole/issues",
-                "source": "https://github.com/utopia-php/swoole/tree/0.8.5"
+                "source": "https://github.com/utopia-php/swoole/tree/0.8.4"
            },
-            "time": "2025-12-15T14:03:23+00:00"
+            "time": "2025-09-07T09:39:46+00:00"
        },
        {
            "name": "utopia-php/system",
@@ -8943,7 +8943,7 @@
    ],
    "aliases": [],
    "minimum-stability": "stable",
-    "stability-flags": {},
+    "stability-flags": [],
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
@@ -8967,5 +8967,5 @@
    "platform-overrides": {
        "php": "8.3"
    },
-    "plugin-api-version": "2.9.0"
+    "plugin-api-version": "2.6.0"
 }
@@ -38,15 +38,9 @@ services:
    depends_on:
      - appwrite
    networks:
-      appwrite:
-        aliases:
-          - appwrite.test
-      gateway:
-        aliases:
-          - appwrite.test
-      runtimes:
-        aliases:
-          - appwrite.test
+      - gateway
+      - appwrite
+      - runtimes

  appwrite:
    container_name: appwrite
@@ -54,7 +48,6 @@ services:
    image: appwrite-dev
    build:
      context: .
-      target: development
      args:
        DEBUG: false
        TESTING: true
@@ -63,8 +56,6 @@ services:
      - 9501:80
    networks:
      - appwrite
-    dns:
-      - 172.16.238.100
    labels:
      - "traefik.enable=true"
      - "traefik.constraint-label-stack=appwrite"
@@ -101,7 +92,6 @@ services:
    depends_on:
      - mariadb
      - redis
-      - coredns
      # - clamav
    entrypoint:
      - php
@@ -223,7 +213,6 @@ services:
      - _APP_DATABASE_SHARED_NAMESPACE
      - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
      - _APP_CUSTOM_DOMAIN_DENY_LIST
-      - _APP_TRUSTED_HEADERS
    extra_hosts:
      - "host.docker.internal:host-gateway"

@@ -740,7 +729,6 @@ services:
      - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
      - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
      - _APP_DATABASE_SHARED_TABLES
-      - _APP_OPTIONS_FORCE_HTTPS

  appwrite-task-maintenance:
    entrypoint: maintenance
@@ -1083,21 +1071,6 @@ services:
    volumes:
      - appwrite-redis:/data:rw

-  coredns: # DNS server for testing purposes (Proxy APIs)
-    image: coredns/coredns:1.12.4
-    container_name: appwrite-coredns
-    restart: unless-stopped
-    <<: *x-logging
-    command: ["-conf", "/mnt/resources/Corefile"]
-    # If you need to debug CoreDNS, do it from "appwrite container", or port forward:
-    # ports:
-    #  - "53:53"
-    networks:
-      appwrite:
-        ipv4_address: 172.16.238.100
-    volumes:
-      - ./tests/resources/coredns:/mnt/resources:ro
-
  # Dev Tools Start ------------------------------------------------------------------------------------------
  #
  # The Appwrite Team uses the following tools to help debug, monitor and diagnose the Appwrite stack
@@ -1111,26 +1084,13 @@ services:
  # GraphQl Explorer - A nice UI for exploring GraphQL API

  maildev: # used mainly for dev tests
-    image: appwrite/mailcatcher:1.1.1
+    image: appwrite/mailcatcher:1.0.0
    container_name: appwrite-mailcatcher
    <<: *x-logging
    ports:
      - "9503:1080"
    networks:
      - appwrite
-      - gateway
-    labels:
-      - "traefik.enable=true"
-      - "traefik.constraint-label-stack=appwrite"
-      - "traefik.docker.network=gateway"
-      - "traefik.http.services.appwrite_maildev.loadbalancer.server.port=1080"
-      - "traefik.http.routers.appwrite_maildev_http.entrypoints=appwrite_web"
-      - "traefik.http.routers.appwrite_maildev_http.rule=Host(`mail.localhost`)"
-      - "traefik.http.routers.appwrite_maildev_http.service=appwrite_maildev"
-      - "traefik.http.routers.appwrite_maildev_https.entrypoints=appwrite_websecure"
-      - "traefik.http.routers.appwrite_maildev_https.rule=Host(`mail.localhost`)"
-      - "traefik.http.routers.appwrite_maildev_https.service=appwrite_maildev"
-      - "traefik.http.routers.appwrite_maildev_https.tls=true"

  request-catcher-webhook: # used mainly for dev tests (mock HTTP webhook)
    image: appwrite/requestcatcher:1.0.0
@@ -1159,54 +1119,14 @@ services:
      - 9506:8080
    networks:
      - appwrite
-      - gateway
-    environment:
-      - ADMINER_DESIGN=pepa-linha
-      - ADMINER_DEFAULT_SERVER=mariadb
-      - ADMINER_DEFAULT_USERNAME=root
-      - ADMINER_DEFAULT_PASSWORD=rootsecretpassword
-      - ADMINER_DEFAULT_DB=appwrite
-    configs:
-      - source: adminer-index.php
-        target: /var/www/html/index.php
-        mode: 0755
-    labels:
-      - "traefik.enable=true"
-      - "traefik.constraint-label-stack=appwrite"
-      - "traefik.docker.network=gateway"
-      - "traefik.http.services.appwrite_adminer.loadbalancer.server.port=8080"
-      - "traefik.http.routers.appwrite_adminer_http.entrypoints=appwrite_web"
-      - "traefik.http.routers.appwrite_adminer_http.rule=Host(`mysql.localhost`)"
-      - "traefik.http.routers.appwrite_adminer_http.service=appwrite_adminer"
-      - "traefik.http.routers.appwrite_adminer_https.entrypoints=appwrite_websecure"
-      - "traefik.http.routers.appwrite_adminer_https.rule=Host(`mysql.localhost`)"
-      - "traefik.http.routers.appwrite_adminer_https.service=appwrite_adminer"
-      - "traefik.http.routers.appwrite_adminer_https.tls=true"

  redis-insight:
    image: redis/redisinsight:latest
    restart: unless-stopped
    networks:
      - appwrite
-      - gateway
    environment:
-      - RI_PRE_SETUP_DATABASES_PATH=/mnt/connections.json
-    configs:
-      - source: redisinsight-connections.json
-        target: /mnt/connections.json
-        mode: 0755
-    labels:
-      - "traefik.enable=true"
-      - "traefik.constraint-label-stack=appwrite"
-      - "traefik.docker.network=gateway"
-      - "traefik.http.services.appwrite_redisinsight.loadbalancer.server.port=5540"
-      - "traefik.http.routers.appwrite_redisinsight_http.entrypoints=appwrite_web"
-      - "traefik.http.routers.appwrite_redisinsight_http.rule=Host(`redis.localhost`)"
-      - "traefik.http.routers.appwrite_redisinsight_http.service=appwrite_redisinsight"
-      - "traefik.http.routers.appwrite_redisinsight_https.entrypoints=appwrite_websecure"
-      - "traefik.http.routers.appwrite_redisinsight_https.rule=Host(`redis.localhost`)"
-      - "traefik.http.routers.appwrite_redisinsight_https.service=appwrite_redisinsight"
-      - "traefik.http.routers.appwrite_redisinsight_https.tls=true"
+      - REDIS_HOSTS=redis
    ports:
      - "8081:5540"

@@ -1228,67 +1148,9 @@ networks:
    name: gateway
  appwrite:
    name: appwrite
-    ipam:
-      config:
-        - subnet: 172.16.238.0/24
  runtimes:
    name: runtimes

-configs:
-  redisinsight-connections.json:
-    content: |
-      [
-        {
-          "compressor": "NONE",
-          "id": "104dc90a-21ef-4d5e-8912-b30baabb152f",
-          "host": "redis",
-          "port": 6379,
-          "name": "redis:6379",
-          "db": 0,
-          "username": "default",
-          "password": null,
-          "connectionType": "STANDALONE",
-          "nameFromProvider": null,
-          "provider": "REDIS",
-          "lastConnection": "2025-10-16T09:22:02.591Z",
-          "modules": [
-            {
-              "name": "ReJSON",
-              "version": 20808,
-              "semanticVersion": "2.8.8"
-            },
-            {
-              "name": "search",
-              "version": 21015,
-              "semanticVersion": "2.10.15"
-            }
-          ],
-          "tls": false,
-          "tlsServername": null,
-          "verifyServerCert": null,
-          "caCert": null,
-          "clientCert": null,
-          "ssh": false,
-          "sshOptions": null,
-          "forceStandalone": false,
-          "tags": []
-        }
-      ]
-
-  adminer-index.php:
-    content: |
-      <?php
-        if(!count($$_GET)) {
-          $$_POST['auth'] = [
-            'server' => $$_ENV['ADMINER_DEFAULT_SERVER'],
-            'driver' => 'server', /* seems to autodetect the driver from server settings */
-            'username' => $$_ENV['ADMINER_DEFAULT_USERNAME'],
-            'password' => $$_ENV['ADMINER_DEFAULT_PASSWORD'],
-            'db' => $$_ENV['ADMINER_DEFAULT_DB'],
-          ];
-        }
-        include './adminer.php';
-
 volumes:
  appwrite-mariadb:
  appwrite-redis:
@@ -14,13 +14,7 @@ databases.updateDocument(
    "<DATABASE_ID>", // databaseId 
    "<COLLECTION_ID>", // collectionId 
    "<DOCUMENT_ID>", // documentId 
-    Map.of(
-        "username", "walter.obrien",
-        "email", "walter.obrien@example.com",
-        "fullName", "Walter O'Brien",
-        "age", 33,
-        "isAdmin", false
-    ), // data (optional)
+    Map.of("a", "b"), // data (optional)
    List.of(Permission.read(Role.any())), // permissions (optional)
    "<TRANSACTION_ID>", // transactionId (optional)
    new CoroutineCallback<>((result, error) -> {
@@ -14,13 +14,7 @@ databases.upsertDocument(
    "<DATABASE_ID>", // databaseId 
    "<COLLECTION_ID>", // collectionId 
    "<DOCUMENT_ID>", // documentId 
-    Map.of(
-        "username", "walter.obrien",
-        "email", "walter.obrien@example.com",
-        "fullName", "Walter O'Brien",
-        "age", 30,
-        "isAdmin", false
-    ), // data (optional)
+    Map.of("a", "b"), // data 
    List.of(Permission.read(Role.any())), // permissions (optional)
    "<TRANSACTION_ID>", // transactionId (optional)
    new CoroutineCallback<>((result, error) -> {
@@ -14,13 +14,7 @@ tablesDB.updateRow(
    "<DATABASE_ID>", // databaseId 
    "<TABLE_ID>", // tableId 
    "<ROW_ID>", // rowId 
-    Map.of(
-        "username", "walter.obrien",
-        "email", "walter.obrien@example.com",
-        "fullName", "Walter O'Brien",
-        "age", 33,
-        "isAdmin", false
-    ), // data (optional)
+    Map.of("a", "b"), // data (optional)
    List.of(Permission.read(Role.any())), // permissions (optional)
    "<TRANSACTION_ID>", // transactionId (optional)
    new CoroutineCallback<>((result, error) -> {
@@ -14,13 +14,7 @@ tablesDB.upsertRow(
    "<DATABASE_ID>", // databaseId 
    "<TABLE_ID>", // tableId 
    "<ROW_ID>", // rowId 
-    Map.of(
-        "username", "walter.obrien",
-        "email", "walter.obrien@example.com",
-        "fullName", "Walter O'Brien",
-        "age", 33,
-        "isAdmin", false
-    ), // data (optional)
+    Map.of("a", "b"), // data (optional)
    List.of(Permission.read(Role.any())), // permissions (optional)
    "<TRANSACTION_ID>", // transactionId (optional)
    new CoroutineCallback<>((result, error) -> {
@@ -14,13 +14,7 @@ val result = databases.updateDocument(
    databaseId = "<DATABASE_ID>", 
    collectionId = "<COLLECTION_ID>", 
    documentId = "<DOCUMENT_ID>", 
-    data = mapOf(
-        "username" to "walter.obrien",
-        "email" to "walter.obrien@example.com",
-        "fullName" to "Walter O'Brien",
-        "age" to 33,
-        "isAdmin" to false
-    ), // (optional)
+    data = mapOf( "a" to "b" ), // (optional)
    permissions = listOf(Permission.read(Role.any())), // (optional)
    transactionId = "<TRANSACTION_ID>", // (optional)
 )
@@ -14,13 +14,7 @@ val result = databases.upsertDocument(
    databaseId = "<DATABASE_ID>", 
    collectionId = "<COLLECTION_ID>", 
    documentId = "<DOCUMENT_ID>", 
-    data = mapOf(
-        "username" to "walter.obrien",
-        "email" to "walter.obrien@example.com",
-        "fullName" to "Walter O'Brien",
-        "age" to 30,
-        "isAdmin" to false
-    ), // (optional)
+    data = mapOf( "a" to "b" ), 
    permissions = listOf(Permission.read(Role.any())), // (optional)
    transactionId = "<TRANSACTION_ID>", // (optional)
 )
@@ -14,13 +14,7 @@ val result = tablesDB.updateRow(
    databaseId = "<DATABASE_ID>", 
    tableId = "<TABLE_ID>", 
    rowId = "<ROW_ID>", 
-    data = mapOf(
-        "username" to "walter.obrien",
-        "email" to "walter.obrien@example.com",
-        "fullName" to "Walter O'Brien",
-        "age" to 33,
-        "isAdmin" to false
-    ), // (optional)
+    data = mapOf( "a" to "b" ), // (optional)
    permissions = listOf(Permission.read(Role.any())), // (optional)
    transactionId = "<TRANSACTION_ID>", // (optional)
 )
@@ -14,13 +14,7 @@ val result = tablesDB.upsertRow(
    databaseId = "<DATABASE_ID>", 
    tableId = "<TABLE_ID>", 
    rowId = "<ROW_ID>", 
-    data = mapOf(
-        "username" to "walter.obrien",
-        "email" to "walter.obrien@example.com",
-        "fullName" to "Walter O'Brien",
-        "age" to 33,
-        "isAdmin" to false
-    ), // (optional)
+    data = mapOf( "a" to "b" ), // (optional)
    permissions = listOf(Permission.read(Role.any())), // (optional)
    transactionId = "<TRANSACTION_ID>", // (optional)
 )
@@ -10,13 +10,7 @@ let document = try await databases.updateDocument(
    databaseId: "<DATABASE_ID>",
    collectionId: "<COLLECTION_ID>",
    documentId: "<DOCUMENT_ID>",
-    data: [
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    ], // optional
+    data: [:], // optional
    permissions: [Permission.read(Role.any())], // optional
    transactionId: "<TRANSACTION_ID>" // optional
 )
@@ -10,13 +10,7 @@ let document = try await databases.upsertDocument(
    databaseId: "<DATABASE_ID>",
    collectionId: "<COLLECTION_ID>",
    documentId: "<DOCUMENT_ID>",
-    data: [
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 30,
-        "isAdmin": false
-    ], // optional
+    data: [:],
    permissions: [Permission.read(Role.any())], // optional
    transactionId: "<TRANSACTION_ID>" // optional
 )
@@ -10,13 +10,7 @@ let row = try await tablesDB.updateRow(
    databaseId: "<DATABASE_ID>",
    tableId: "<TABLE_ID>",
    rowId: "<ROW_ID>",
-    data: [
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    ], // optional
+    data: [:], // optional
    permissions: [Permission.read(Role.any())], // optional
    transactionId: "<TRANSACTION_ID>" // optional
 )
@@ -10,13 +10,7 @@ let row = try await tablesDB.upsertRow(
    databaseId: "<DATABASE_ID>",
    tableId: "<TABLE_ID>",
    rowId: "<ROW_ID>",
-    data: [
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    ], // optional
+    data: [:], // optional
    permissions: [Permission.read(Role.any())], // optional
    transactionId: "<TRANSACTION_ID>" // optional
 )
@@ -12,13 +12,7 @@ Document result = await databases.updateDocument(
    databaseId: '<DATABASE_ID>',
    collectionId: '<COLLECTION_ID>',
    documentId: '<DOCUMENT_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    }, // optional
+    data: {}, // optional
    permissions: [Permission.read(Role.any())], // optional
    transactionId: '<TRANSACTION_ID>', // optional
 );
@@ -12,13 +12,7 @@ Document result = await databases.upsertDocument(
    databaseId: '<DATABASE_ID>',
    collectionId: '<COLLECTION_ID>',
    documentId: '<DOCUMENT_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 30,
-        "isAdmin": false
-    }, // optional
+    data: {},
    permissions: [Permission.read(Role.any())], // optional
    transactionId: '<TRANSACTION_ID>', // optional
 );
@@ -12,13 +12,7 @@ Row result = await tablesDB.updateRow(
    databaseId: '<DATABASE_ID>',
    tableId: '<TABLE_ID>',
    rowId: '<ROW_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    }, // optional
+    data: {}, // optional
    permissions: [Permission.read(Role.any())], // optional
    transactionId: '<TRANSACTION_ID>', // optional
 );
@@ -12,13 +12,7 @@ Row result = await tablesDB.upsertRow(
    databaseId: '<DATABASE_ID>',
    tableId: '<TABLE_ID>',
    rowId: '<ROW_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    }, // optional
+    data: {}, // optional
    permissions: [Permission.read(Role.any())], // optional
    transactionId: '<TRANSACTION_ID>', // optional
 );
@@ -3,7 +3,7 @@ mutation {
        databaseId: "<DATABASE_ID>",
        collectionId: "<COLLECTION_ID>",
        documentId: "<DOCUMENT_ID>",
-        data: "{\"username\":\"walter.obrien\",\"email\":\"walter.obrien@example.com\",\"fullName\":\"Walter O'Brien\",\"age\":33,\"isAdmin\":false}",
+        data: "{}",
        permissions: ["read("any")"],
        transactionId: "<TRANSACTION_ID>"
    ) {
@@ -3,7 +3,7 @@ mutation {
        databaseId: "<DATABASE_ID>",
        collectionId: "<COLLECTION_ID>",
        documentId: "<DOCUMENT_ID>",
-        data: "{\"username\":\"walter.obrien\",\"email\":\"walter.obrien@example.com\",\"fullName\":\"Walter O'Brien\",\"age\":30,\"isAdmin\":false}",
+        data: "{}",
        permissions: ["read("any")"],
        transactionId: "<TRANSACTION_ID>"
    ) {
@@ -3,7 +3,7 @@ mutation {
        databaseId: "<DATABASE_ID>",
        tableId: "<TABLE_ID>",
        rowId: "<ROW_ID>",
-        data: "{\"username\":\"walter.obrien\",\"email\":\"walter.obrien@example.com\",\"fullName\":\"Walter O'Brien\",\"age\":33,\"isAdmin\":false}",
+        data: "{}",
        permissions: ["read("any")"],
        transactionId: "<TRANSACTION_ID>"
    ) {
@@ -3,7 +3,7 @@ mutation {
        databaseId: "<DATABASE_ID>",
        tableId: "<TABLE_ID>",
        rowId: "<ROW_ID>",
-        data: "{\"username\":\"walter.obrien\",\"email\":\"walter.obrien@example.com\",\"fullName\":\"Walter O'Brien\",\"age\":33,\"isAdmin\":false}",
+        data: "{}",
        permissions: ["read("any")"],
        transactionId: "<TRANSACTION_ID>"
    ) {
@@ -10,13 +10,7 @@ const result = await databases.updateDocument({
    databaseId: '<DATABASE_ID>',
    collectionId: '<COLLECTION_ID>',
    documentId: '<DOCUMENT_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    }, // optional
+    data: {}, // optional
    permissions: ["read("any")"], // optional
    transactionId: '<TRANSACTION_ID>' // optional
 });
@@ -10,13 +10,7 @@ const result = await databases.upsertDocument({
    databaseId: '<DATABASE_ID>',
    collectionId: '<COLLECTION_ID>',
    documentId: '<DOCUMENT_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 30,
-        "isAdmin": false
-    }, // optional
+    data: {},
    permissions: ["read("any")"], // optional
    transactionId: '<TRANSACTION_ID>' // optional
 });
@@ -10,13 +10,7 @@ const result = await tablesDB.updateRow({
    databaseId: '<DATABASE_ID>',
    tableId: '<TABLE_ID>',
    rowId: '<ROW_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    }, // optional
+    data: {}, // optional
    permissions: ["read("any")"], // optional
    transactionId: '<TRANSACTION_ID>' // optional
 });
@@ -10,13 +10,7 @@ const result = await tablesDB.upsertRow({
    databaseId: '<DATABASE_ID>',
    tableId: '<TABLE_ID>',
    rowId: '<ROW_ID>',
-    data: {
-        "username": "walter.obrien",
-        "email": "walter.obrien@example.com",
-        "fullName": "Walter O'Brien",
-        "age": 33,
-        "isAdmin": false
-    }, // optional
+    data: {}, // optional
    permissions: ["read("any")"], // optional
    transactionId: '<TRANSACTION_ID>' // optional
 });
@@ -3,6 +3,4 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "email": "email@example.com",
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
@@ -3,6 +3,4 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "factor": "email"
@@ -2,5 +2,3 @@ GET /v1/account/sessions/oauth2/{provider} HTTP/1.1
 Host: cloud.appwrite.io
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>
@@ -2,5 +2,3 @@ GET /v1/account/tokens/oauth2/{provider} HTTP/1.1
 Host: cloud.appwrite.io
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
@@ -3,8 +3,6 @@ Host: cloud.appwrite.io
 Content-Type: application/json
 X-Appwrite-Response-Format: 1.8.0
 X-Appwrite-Project: <YOUR_PROJECT_ID>
-X-Appwrite-Session: 
-X-Appwrite-JWT: <YOUR_JWT>

 {
  "userId": "<USER_ID>",
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jake Barnby	ad80a2dd40	Generate updated specs	2025-12-09 00:36:35 +13:00
Jake Barnby	9ed2ebd1a5	Handle generating request model specs	2025-12-09 00:30:53 +13:00
Jake Barnby	70d59ad5c6	Add model on tablesdb	2025-12-09 00:26:27 +13:00
Jake Barnby	f56ee18ba9	Merge branch 'feat-request-model' of github.com:appwrite/appwrite into feat-request-model	2025-12-08 23:47:46 +13:00
Jake Barnby	5666098ae6	Update validator	2025-12-08 23:47:30 +13:00
Jake Barnby	f667fdfdf6	Add base request model for operations	2025-12-08 23:47:15 +13:00
Jake BarnbyandGitHub	82efff38a6	Merge branch '1.8.x' into feat-request-model	2025-12-08 09:24:01 +00:00
Jake Barnby	51823a705f	Update lock	2025-12-08 20:57:21 +13:00
Jake Barnby	0be9e25a0e	Use request model	2025-12-08 19:20:08 +13:00