sync with 1.6.x

.coderabbit.yaml

@@ -1,11 +0,0 @@
-reviews:
-  path_filters:
-    - "!app/config/specs/**"
-    - "!docs/examples/**"
-    - "!docs/references/**"
-    - "!docs/sdks/**"
-  auto_review:
-    base_branches:
-      - main
-      - 1.6.x
-      - 1.7.x

.env

@@ -15,18 +15,14 @@ _APP_SYSTEM_TEAM_EMAIL=team@appwrite.io
 _APP_EMAIL_SECURITY=security@appwrite.io
 _APP_EMAIL_CERTIFICATES=certificates@appwrite.io
 _APP_SYSTEM_RESPONSE_FORMAT=
-_APP_CUSTOM_DOMAIN_DENY_LIST=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_ROUTER_FORCE_HTTPS=disabled
+_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
-_APP_DOMAIN_SITES=sites.localhost
-_APP_DOMAIN_TARGET_CNAME=test.localhost
-_APP_DOMAIN_TARGET_A=127.0.0.1
-_APP_DOMAIN_TARGET_AAAA=::1
+_APP_DOMAIN_TARGET=localhost
 _APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
@@ -73,28 +69,25 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_COMPUTE_SIZE_LIMIT=30000000
+_APP_FUNCTIONS_SIZE_LIMIT=30000000
 _APP_FUNCTIONS_TIMEOUT=900
-_APP_SITES_TIMEOUT=30
-_APP_COMPUTE_BUILD_TIMEOUT=900
-_APP_COMPUTE_CPUS=8
-_APP_COMPUTE_MEMORY=8192
-_APP_COMPUTE_INACTIVE_THRESHOLD=600
-_APP_COMPUTE_MAINTENANCE_INTERVAL=600
-_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
+_APP_FUNCTIONS_BUILD_TIMEOUT=900
+_APP_FUNCTIONS_CPUS=8
+_APP_FUNCTIONS_MEMORY=8192
+_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
+_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
-_APP_SITES_RUNTIMES=static-1,node-22,flutter-3.29
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_MAINTENANCE_START_TIME=12:00
+_APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE=15778800
 _APP_USAGE_AGGREGATION_INTERVAL=30
-_APP_STATS_RESOURCES_INTERVAL=30
+_APP_STATS_RESOURCES_INTERVAL=3600
 _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_MAINTENANCE_RETENTION_SCHEDULES=86400
 _APP_USAGE_STATS=enabled

.github/workflows/benchmark.yml

@@ -1,120 +0,0 @@
-name: Benchmark
-concurrency:
-  group: '${{ github.workflow }}-${{ github.ref }}'
-  cancel-in-progress: true
-env:
-  IMAGE: appwrite-dev
-  CACHE_KEY: 'appwrite-dev-${{ github.event.pull_request.head.sha }}'
-'on':
-  - pull_request
-jobs:
-  setup:
-    name: Setup & Build Appwrite Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Build Appwrite
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: false
-          tags: '${{ env.IMAGE }}'
-          load: true
-          cache-from: type=gha
-          cache-to: 'type=gha,mode=max'
-          outputs: 'type=docker,dest=/tmp/${{ env.IMAGE }}.tar'
-          build-args: |
-            DEBUG=false
-            TESTING=true
-            VERSION=dev
-      - name: Cache Docker Image
-        uses: actions/cache@v4
-        with:
-          key: '${{ env.CACHE_KEY }}'
-          path: '/tmp/${{ env.IMAGE }}.tar'
-  benchmarking:
-    name: Benchmark
-    runs-on: ubuntu-latest
-    needs: setup
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-      - name: Load Cache
-        uses: actions/cache@v4
-        with:
-          key: '${{ env.CACHE_KEY }}'
-          path: '/tmp/${{ env.IMAGE }}.tar'
-          fail-on-cache-miss: true
-      - name: Load and Start Appwrite
-        run: |
-          sed -i 's/traefik/localhost/g' .env
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          docker compose up -d
-          sleep 10
-      - name: Install Oha
-        run: |
-          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
-          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
-          sudo apt update
-          sudo apt install oha
-      - name: Benchmark PR
-        run: 'oha -z 180s  http://localhost/v1/health/version -j > benchmark.json'
-      - name: Cleaning
-        run: docker compose down -v
-      - name: Installing latest version
-        run: |
-          rm docker-compose.yml
-          rm .env
-          curl https://appwrite.io/install/compose -o docker-compose.yml
-          curl https://appwrite.io/install/env -o .env
-          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
-          docker compose up -d
-          sleep 10
-      - name: Benchmark Latest
-        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark-latest.json
-      - name: Prepare comment
-        run: |
-          echo '## :sparkles: Benchmark results' > benchmark.txt
-          echo ' ' >> benchmark.txt
-          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
-          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
-          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
-          echo " " >> benchmark.txt
-          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
-          echo "| --- | --- | --- | "  >> benchmark.txt
-          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
-          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
-          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
-      - name: Save results
-        uses: actions/upload-artifact@v4
-        if: '${{ !cancelled() }}'
-        with:
-          name: benchmark.json
-          path: benchmark.json
-          retention-days: 7
-      - name: Find Comment
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        uses: peter-evans/find-comment@v3
-        id: fc
-        with:
-          issue-number: '${{ github.event.pull_request.number }}'
-          comment-author: 'github-actions[bot]'
-          body-includes: Benchmark results
-      - name: Comment on PR
-        if: github.event.pull_request.head.repo.full_name == github.repository
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          comment-id: '${{ steps.fc.outputs.comment-id }}'
-          issue-number: '${{ github.event.pull_request.number }}'
-          body-path: benchmark.txt
-          edit-mode: replace

.github/workflows/cleanup-cache.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         
       - name: Cleanup
         run: |

.github/workflows/codeql-analysis.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/linter.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 2
 

.github/workflows/publish.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         fetch-depth: 2
         submodules: recursive
@@ -26,7 +26,7 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ vars.DOCKERHUB_USERNAME }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -28,7 +28,7 @@ jobs:
     - name: Login to Docker Hub
       uses: docker/login-action@v2
       with:
-        username: ${{ vars.DOCKERHUB_USERNAME }}
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker

.github/workflows/sdk-preview.yml

@@ -1,46 +1,25 @@
-name: "SDK Preview"
+name: "Console SDK Preview"
 
 on:
   pull_request:
     paths:
       - 'app/config/specs/*-latest-console.json'
-  workflow_dispatch:
-    inputs:
-      platform:
-        type: choice
-        description: "Platform to build"
-        options:
-          - client
-          - server
+
 
 jobs:
   setup:
-    name: Setup & Build SDK
+    name: Setup & Build Console SDK
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-
-      - name: Set SDK type
-        id: set-sdk
-        run: |
-          PLATFORM="${{ github.event.inputs.platform }}"
-          if [ -z "$PLATFORM" ]; then
-            PLATFORM="console"
-          fi
-          if [ "$PLATFORM" = "server" ]; then
-            echo "sdk_type=nodejs" >> $GITHUB_OUTPUT
-          else
-            echo "sdk_type=web" >> $GITHUB_OUTPUT
-          fi
-          echo "platform=$PLATFORM" >> $GITHUB_OUTPUT
         
       - name: Load and Start Appwrite
         run: |
           docker compose build
           docker compose up -d
-          docker compose exec appwrite sdks --platform=${{ steps.set-sdk.outputs.platform }} --sdk=${{ steps.set-sdk.outputs.sdk_type }} --version=latest --git=no
-          sudo chown -R $USER:$USER ./app/sdks/${{ steps.set-sdk.outputs.platform }}-${{ steps.set-sdk.outputs.sdk_type }}
+          docker compose exec appwrite sdks --platform=console --sdk=web --version=latest --git=no
+          sudo chown -R $USER:$USER ./app/sdks/console-web
           
       - uses: actions/setup-node@v4
         with:

.github/workflows/static-analysis.yml

@@ -1,16 +0,0 @@
-name: "Static code analysis"
-
-on: [pull_request]
-jobs:
-  lint:
-    name: CodeQL
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out the repo
-      uses: actions/checkout@v4
-
-    - name: Run CodeQL
-      run: |
-        docker run --rm -v $PWD:/app composer:2.6 sh -c \
-        "composer install --profile --ignore-platform-reqs && composer check"

.github/workflows/tests.yml

@@ -90,9 +90,6 @@ jobs:
           docker compose up -d
           sleep 10
 
-      - name: Logs
-        run: docker compose logs appwrite
-
       - name: Doctor
         run: docker compose exec -T appwrite doctor
 
@@ -122,14 +119,6 @@ jobs:
           docker load --input /tmp/${{ env.IMAGE }}.tar
           docker compose up -d
           sleep 10
-          
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
 
       - name: Run General Tests
         run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/General --debug
@@ -153,10 +142,7 @@ jobs:
           Locale,
           Projects,
           Realtime,
-          Sites,
-          Proxy,
           Storage,
-          Tokens,
           Teams,
           Users,
           Webhooks,
@@ -181,14 +167,6 @@ jobs:
           docker compose up -d
           sleep 30
 
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
       - name: Run ${{ matrix.service }} tests with Project table mode
         run: |
           echo "Using project tables"
@@ -198,7 +176,7 @@ jobs:
           docker compose exec -T \
             -e _APP_DATABASE_SHARED_TABLES \
             -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude=devKeys
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
 
   e2e_shared_mode_test:
     name: E2E Shared Mode Service Test
@@ -221,16 +199,13 @@ jobs:
             Locale,
             Projects,
             Realtime,
-            Sites,
-            Proxy,
             Storage,
             Teams,
             Users,
             Webhooks,
             VCS,
             Messaging,
-            Migrations,
-            Tokens
+            Migrations
           ]
         tables-mode: [
           'Shared V1',
@@ -254,14 +229,6 @@ jobs:
           docker compose up -d
           sleep 30
 
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
       - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
         run: |
           if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
@@ -273,90 +240,90 @@ jobs:
             export _APP_DATABASE_SHARED_TABLES=database_db_main
             export _APP_DATABASE_SHARED_TABLES_V1=
           fi
-      
+          
           docker compose exec -T \
             -e _APP_DATABASE_SHARED_TABLES \
             -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug --exclude=devKeys
+            appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
 
-  e2e_dev_keys:
-    name: E2E Service Test (Dev Keys)
+  benchmarking:
+    name: Benchmark
     runs-on: ubuntu-latest
     needs: setup
-    strategy:
-      fail-fast: false
+    permissions:
+      pull-requests: write
     steps:
-      - name: checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
-
       - name: Load Cache
         uses: actions/cache@v4
         with:
           key: ${{ env.CACHE_KEY }}
           path: /tmp/${{ env.IMAGE }}.tar
           fail-on-cache-miss: true
-
       - name: Load and Start Appwrite
         run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
+          sed -i 's/traefik/localhost/g' .env 
+          docker load --input /tmp/${{ env.IMAGE }}.tar          
           docker compose up -d
-          sleep 30
-
-      - name: Run Projects tests with dev keys in dedicated table mode
+          sleep 10
+      - name: Install Oha
         run: |
-          echo "Using project tables"
-          export _APP_DATABASE_SHARED_TABLES=
-          export _APP_DATABASE_SHARED_TABLES_V1=
-
-          docker compose exec -T \
-            -e _APP_DATABASE_SHARED_TABLES \
-            -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=devKeys
-
-  e2e_dev_keys_shared_mode:
-    name: E2E Shared Mode Service Test (Dev Keys)
-    runs-on: ubuntu-latest
-    needs: [ setup, check_database_changes ]
-    if: needs.check_database_changes.outputs.database_changed == 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        tables-mode: [
-          'Shared V1',
-          'Shared V2',
-        ]
-    steps:
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: Load Cache
-        uses: actions/cache@v4
+          echo "deb [signed-by=/usr/share/keyrings/azlux-archive-keyring.gpg] http://packages.azlux.fr/debian/ stable main" | sudo tee /etc/apt/sources.list.d/azlux.list
+          sudo wget -O /usr/share/keyrings/azlux-archive-keyring.gpg https://azlux.fr/repo.gpg
+          sudo apt update
+          sudo apt install oha
+      - name: Benchmark PR
+        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark.json
+      - name: Cleaning
+        run: docker compose down -v
+      - name: Installing latest version
+        run: |
+          rm docker-compose.yml
+          rm .env
+          curl https://appwrite.io/install/compose -o docker-compose.yml
+          curl https://appwrite.io/install/env -o .env
+          sed -i 's/_APP_OPTIONS_ABUSE=enabled/_APP_OPTIONS_ABUSE=disabled/g' .env
+          docker compose up -d
+          sleep 10
+      - name: Benchmark Latest
+        run: oha -z 180s  http://localhost/v1/health/version -j > benchmark-latest.json
+      - name: Prepare comment
+        run: |
+          echo '## :sparkles: Benchmark results' > benchmark.txt
+          echo ' ' >> benchmark.txt
+          echo "- Requests per second: $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- Requests with 200 status code: $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json)" >> benchmark.txt
+          echo "- P99 latency: $(jq -r '.latencyPercentiles.p99' benchmark.json )" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "## :zap:  Benchmark Comparison" >> benchmark.txt
+          echo " " >> benchmark.txt
+          echo "| Metric | This PR | Latest version | "  >> benchmark.txt
+          echo "| --- | --- | --- | "  >> benchmark.txt
+          echo "| RPS | $(jq -r '.summary.requestsPerSec|tonumber?|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.summary.requestsPerSec|tonumber|floor|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| 200 | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark.json) | $(jq -r '.statusCodeDistribution."200"|tostring|[while(length>0;.[:-3])|.[-3:]]|reverse|join(",")' benchmark-latest.json) | "  >> benchmark.txt
+          echo "| P99 | $(jq -r '.latencyPercentiles.p99' benchmark.json ) | $(jq -r '.latencyPercentiles.p99' benchmark-latest.json ) | "  >> benchmark.txt
+      - name: Save results
+        uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
         with:
-          key: ${{ env.CACHE_KEY }}
-          path: /tmp/${{ env.IMAGE }}.tar
-          fail-on-cache-miss: true
-
-      - name: Load and Start Appwrite
-        run: |
-          docker load --input /tmp/${{ env.IMAGE }}.tar
-          sed -i 's/_APP_OPTIONS_ABUSE=disabled/_APP_OPTIONS_ABUSE=enabled/' .env
-          docker compose up -d
-          sleep 30
-
-      - name: Run Projects tests with dev keys in ${{ matrix.tables-mode }} table mode
-        run: |
-          if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
-            echo "Using shared tables V1"
-            export _APP_DATABASE_SHARED_TABLES=database_db_main
-            export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
-          elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
-            echo "Using shared tables V2"
-            export _APP_DATABASE_SHARED_TABLES=database_db_main
-            export _APP_DATABASE_SHARED_TABLES_V1=
-          fi
-
-          docker compose exec -T \
-            -e _APP_DATABASE_SHARED_TABLES \
-            -e _APP_DATABASE_SHARED_TABLES_V1 \
-            appwrite test /usr/src/code/tests/e2e/Services/Projects --debug --group=devKeys
+          name: benchmark.json
+          path: benchmark.json
+          retention-days: 7
+      - name: Find Comment
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: peter-evans/find-comment@v3
+        id: fc
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: Benchmark results
+      - name: Comment on PR
+        if: github.event.pull_request.head.repo.full_name == github.repository
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body-path: benchmark.txt
+          edit-mode: replace

.gitignore

@@ -3,7 +3,6 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
-/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
 !/.idea/workspace.xml

.gitpod.yml

@@ -7,7 +7,6 @@ tasks:
       docker pull composer
     command: |
       docker run --rm --interactive --tty \
-      --user "$(id -u):$(id -g)" \
       --volume $PWD:/app \
       composer install \
       --ignore-platform-reqs \
@@ -24,3 +23,11 @@ vscode:
   extensions:
     - ms-azuretools.vscode-docker
     - zobo.php-intellisense
+
+github:
+  # https://www.gitpod.io/docs/prebuilds#github-specific-configuration
+  prebuilds:
+    # enable for pull requests coming from forks (defaults to false)
+    pullRequestsFromForks: true
+    # add a check to pull requests (defaults to true)
+    addCheck: false

CHANGES.md

@@ -1,267 +1,3 @@
-# Version 1.6.2
-
-## What's Changed
-
-### Notable changes
-
-* Delete git folder to reduce build size in [9076](https://github.com/appwrite/appwrite/pull/9076)
-* Upgrade assistant in [9100](https://github.com/appwrite/appwrite/pull/9100)
-* Use redis adapter for abuse in [9121](https://github.com/appwrite/appwrite/pull/9121)
-* Set base specification CPUs to 0.5 again in [9146](https://github.com/appwrite/appwrite/pull/9146)
-* Add new push message parameters in [9060](https://github.com/appwrite/appwrite/pull/9060)
-* Update audits to include user type in [9211](https://github.com/appwrite/appwrite/pull/9211)
-* Enable HEIC in [9251](https://github.com/appwrite/appwrite/pull/9251)
-* Added teamName to membership redirect url in [9269](https://github.com/appwrite/appwrite/pull/9269)
-* Add support endpoint url for S3 in [9303](https://github.com/appwrite/appwrite/pull/9303)
-* Added RuPay Credit Card Icon in Avatars Service in [5046](https://github.com/appwrite/appwrite/pull/5046)
-* Add figma oauth provider in [9623](https://github.com/appwrite/appwrite/pull/9623)
-* Update console to version 5.2.58 in [9637](https://github.com/appwrite/appwrite/pull/9637)
-
-### Fixes
-
-* Remove failed attribute in [9032](https://github.com/appwrite/appwrite/pull/9032)
-* Fix delete notFound attribute in [9038](https://github.com/appwrite/appwrite/pull/9038)
-* 🇮🇸 Added missing Icelandic translations for email strings. in [4848](https://github.com/appwrite/appwrite/pull/4848)
-* fix doc comment for filter method in [5769](https://github.com/appwrite/appwrite/pull/5769)
-* Delete attribute No throwing Exception on not found in [9157](https://github.com/appwrite/appwrite/pull/9157)
-* Fix VCS identity collision in [9138](https://github.com/appwrite/appwrite/pull/9138)
-* Fix disabling of email-otp when user wants to in [9200](https://github.com/appwrite/appwrite/pull/9200)
-* Ensure user can delete session in [9209](https://github.com/appwrite/appwrite/pull/9209)
-* Fix resend invitation in [9218](https://github.com/appwrite/appwrite/pull/9218)
-* Fix phone number parsing exception handling in [9246](https://github.com/appwrite/appwrite/pull/9246)
-* Fix amazon oauth in [9253](https://github.com/appwrite/appwrite/pull/9253)
-* Fix slack oauth scopes, and updated to v2 in [9228](https://github.com/appwrite/appwrite/pull/9228)
-* Fix forwarded user agent in [9271](https://github.com/appwrite/appwrite/pull/9271)
-* Fix WEBP File Preview Rendering Issue in [9321](https://github.com/appwrite/appwrite/pull/9321)
-* Fix build memory specifications in [9360](https://github.com/appwrite/appwrite/pull/9360)
-* Fix Self Hosting functions by adding missed config in [9373](https://github.com/appwrite/appwrite/pull/9373)
-* Fix resend team invite if already accepted in [9348](https://github.com/appwrite/appwrite/pull/9348)
-* Fix null errors on team invite in [9391](https://github.com/appwrite/appwrite/pull/9391)
-* Fix email (smtp) to multiple recipients in [9243](https://github.com/appwrite/appwrite/pull/9243)
-* Fix stats timing by using receivedAt date when available in [9428](https://github.com/appwrite/appwrite/pull/9428)
-* Make min/max params optional for attribute update in [9387](https://github.com/appwrite/appwrite/pull/9387)
-* Fix blocking of phone sessions when disabled on console in [9447](https://github.com/appwrite/appwrite/pull/9447)
-* Fix logging config in [9467](https://github.com/appwrite/appwrite/pull/9467)
-* Update audit timestamp origin in [9481](https://github.com/appwrite/appwrite/pull/9481)
-* Fix certificates in deletes worker in [9466](https://github.com/appwrite/appwrite/pull/9466)
-* Fix console audits delete in [9547](https://github.com/appwrite/appwrite/pull/9547)
-* Fix migrations in [9633](https://github.com/appwrite/appwrite/pull/9633)
-* Ensure all 4xx errors in OAuth redirect lead to the failure URL in [9679](https://github.com/appwrite/appwrite/pull/9679)
-* Treat 0 as unlimited for CPUs and memory in [9638](https://github.com/appwrite/appwrite/pull/9638)
-* Add contextual dispatch logic to fix high CPU usage in [9687](https://github.com/appwrite/appwrite/pull/9687)
-
-### Miscellaneous
-
-* Merge 1.6.x into feat-custom-cf-hostnames in [8904](https://github.com/appwrite/appwrite/pull/8904)
-* Improve compression param checks in [8922](https://github.com/appwrite/appwrite/pull/8922)
-* upgrade utopia storage in [8930](https://github.com/appwrite/appwrite/pull/8930)
-* Feat migration in [8797](https://github.com/appwrite/appwrite/pull/8797)
-* feat fix web routes in [8962](https://github.com/appwrite/appwrite/pull/8962)
-* Fix no pool access in [9027](https://github.com/appwrite/appwrite/pull/9027)
-* feat: use environment variable to check rules format in [9039](https://github.com/appwrite/appwrite/pull/9039)
-* Update storage.php in [9037](https://github.com/appwrite/appwrite/pull/9037)
-* Upgrade db 0.53.200 in [9050](https://github.com/appwrite/appwrite/pull/9050)
-* Chore: upgrade utopia storage in [9066](https://github.com/appwrite/appwrite/pull/9066)
-* Update usage-dump payload in [9085](https://github.com/appwrite/appwrite/pull/9085)
-* GitHub Workflows security hardening in [3728](https://github.com/appwrite/appwrite/pull/3728)
-* Update add-oauth2-provider.md in [4313](https://github.com/appwrite/appwrite/pull/4313)
-* update readme-cn some doc in [5278](https://github.com/appwrite/appwrite/pull/5278)
-* Add accessibility features in [7042](https://github.com/appwrite/appwrite/pull/7042)
-* Add Appwrite Cloud to read me. in [5445](https://github.com/appwrite/appwrite/pull/5445)
-* Migration throw error in [9092](https://github.com/appwrite/appwrite/pull/9092)
-* Fix usage payload bug in [9097](https://github.com/appwrite/appwrite/pull/9097)
-* chore: replace occurrences of dbForConsole to dbForPlatform in [9096](https://github.com/appwrite/appwrite/pull/9096)
-* fix(realtime): decrement connectionCounter only if connection is known in [9055](https://github.com/appwrite/appwrite/pull/9055)
-* payload bug fix in [9098](https://github.com/appwrite/appwrite/pull/9098)
-* Fix usage payload bug in [9099](https://github.com/appwrite/appwrite/pull/9099)
-* Usage payload debug in [9101](https://github.com/appwrite/appwrite/pull/9101)
-* Usage payload debug in [9103](https://github.com/appwrite/appwrite/pull/9103)
-* Usage payload debug in [9104](https://github.com/appwrite/appwrite/pull/9104)
-* Feat: createFunction abuse labels in [9102](https://github.com/appwrite/appwrite/pull/9102)
-* Docs-create-document in [9105](https://github.com/appwrite/appwrite/pull/9105)
-* Docs: Create document and unknown attribute error messages. in [5427](https://github.com/appwrite/appwrite/pull/5427)
-* Fix: update project accessed at from router and schedulers in [9109](https://github.com/appwrite/appwrite/pull/9109)
-* chore: initial commit in [9111](https://github.com/appwrite/appwrite/pull/9111)
-* chore: optimise webhooks payload in [9115](https://github.com/appwrite/appwrite/pull/9115)
-* Revert "chore: initial commit" in [9117](https://github.com/appwrite/appwrite/pull/9117)
-* chore: fix attribute name in [9118](https://github.com/appwrite/appwrite/pull/9118)
-* Migrate to redis abuse in [9124](https://github.com/appwrite/appwrite/pull/9124)
-* Added webhooks usage stats in [9125](https://github.com/appwrite/appwrite/pull/9125)
-* chore remove abuse cleanup in [9137](https://github.com/appwrite/appwrite/pull/9137)
-* fix: remove abuse delete trigger in [9139](https://github.com/appwrite/appwrite/pull/9139)
-* Remove firebase OAuth API endpoints in [9144](https://github.com/appwrite/appwrite/pull/9144)
-* chore: release client sdks in [9112](https://github.com/appwrite/appwrite/pull/9112)
-* Update general.php in [9155](https://github.com/appwrite/appwrite/pull/9155)
-* feat(swoole): allow configuration override of available cpus in [9177](https://github.com/appwrite/appwrite/pull/9177)
-* Usage databases api read writes addition in [9142](https://github.com/appwrite/appwrite/pull/9142)
-* Fix dead connections in [9190](https://github.com/appwrite/appwrite/pull/9190)
-* Add hostname to audits in [9165](https://github.com/appwrite/appwrite/pull/9165)
-* chore: shifted authphone usage tracking to api calls in [9191](https://github.com/appwrite/appwrite/pull/9191)
-* Revert "Fix dead connections" in [9201](https://github.com/appwrite/appwrite/pull/9201)
-* Add assertEventually to messaging provider logs test in [9192](https://github.com/appwrite/appwrite/pull/9192)
-* feat project sms usage in [9198](https://github.com/appwrite/appwrite/pull/9198)
-* chore: add audit labels to project resources in [9056](https://github.com/appwrite/appwrite/pull/9056)
-* fix sms usage in [9207](https://github.com/appwrite/appwrite/pull/9207)
-* Update database in [9202](https://github.com/appwrite/appwrite/pull/9202)
-* Fix dead connections in [9213](https://github.com/appwrite/appwrite/pull/9213)
-* Revert "Fix dead connections" in [9214](https://github.com/appwrite/appwrite/pull/9214)
-* Add logs db init for consistency in [9163](https://github.com/appwrite/appwrite/pull/9163)
-* Split the collection definitions in [9153](https://github.com/appwrite/appwrite/pull/9153)
-* Log path with populated parameters in [9220](https://github.com/appwrite/appwrite/pull/9220)
-* Add missing scope on function template in [9208](https://github.com/appwrite/appwrite/pull/9208)
-* Add relatedCollection default in [9225](https://github.com/appwrite/appwrite/pull/9225)
-* fix: function usage in [9235](https://github.com/appwrite/appwrite/pull/9235)
-* feat: optimise events payloads in [9232](https://github.com/appwrite/appwrite/pull/9232)
-* Optimise webhook events in [9168](https://github.com/appwrite/appwrite/pull/9168)
-* fix: maintenance job missing type in [9238](https://github.com/appwrite/appwrite/pull/9238)
-* Update Fetch to 0.3.0 in [9245](https://github.com/appwrite/appwrite/pull/9245)
-* Fix maintenance job in [9247](https://github.com/appwrite/appwrite/pull/9247)
-* chore: add missing case for executions in [9248](https://github.com/appwrite/appwrite/pull/9248)
-* Add index dependency exception in [9226](https://github.com/appwrite/appwrite/pull/9226)
-* chore: fix benchmarking test when made from fork in [9233](https://github.com/appwrite/appwrite/pull/9233)
-* Update SDK Generator versions in [9188](https://github.com/appwrite/appwrite/pull/9188)
-* chore: skipped job instead of throwing error in [9250](https://github.com/appwrite/appwrite/pull/9250)
-* Implement new SDK Class on 1.6.x in [9237](https://github.com/appwrite/appwrite/pull/9237)
-* Delete collection before Appwrite's attributes in [9256](https://github.com/appwrite/appwrite/pull/9256)
-* Feat batch usage dump in [9255](https://github.com/appwrite/appwrite/pull/9255)
-* Fix cloud tests in [9261](https://github.com/appwrite/appwrite/pull/9261)
-* Usage: Databases reads writes in [9260](https://github.com/appwrite/appwrite/pull/9260)
-* Update: Latest sdk specs in [9274](https://github.com/appwrite/appwrite/pull/9274)
-* Revert "Feat batch usage dump" in [9276](https://github.com/appwrite/appwrite/pull/9276)
-* feat: add fast2SMS adapter in [9263](https://github.com/appwrite/appwrite/pull/9263)
-* Update Sdk Generator dependency in [9280](https://github.com/appwrite/appwrite/pull/9280)
-* Transformed at addition in [9281](https://github.com/appwrite/appwrite/pull/9281)
-* Docs: clarify update endpoints only work on draft messages in [9236](https://github.com/appwrite/appwrite/pull/9236)
-* Update sdk generator dependency in [9282](https://github.com/appwrite/appwrite/pull/9282)
-* Revert "Transformed at addition" in [9284](https://github.com/appwrite/appwrite/pull/9284)
-* replaced init for cloud link in [9285](https://github.com/appwrite/appwrite/pull/9285)
-* Add transformed at in [9289](https://github.com/appwrite/appwrite/pull/9289)
-* Make migrations use Dynamic keys for destination in [9291](https://github.com/appwrite/appwrite/pull/9291)
-* Make sessions limit tests assert eventually in [9298](https://github.com/appwrite/appwrite/pull/9298)
-* Chore update database in [9306](https://github.com/appwrite/appwrite/pull/9306)
-* feat: add AMQP queues in [9287](https://github.com/appwrite/appwrite/pull/9287)
-* fix(test): use assertEventually instead of while(true) in [9308](https://github.com/appwrite/appwrite/pull/9308)
-* fix(certificate worker): events are published without queue name in [9309](https://github.com/appwrite/appwrite/pull/9309)
-* chore: update utopia-php/queue to 0.8.1 in [9311](https://github.com/appwrite/appwrite/pull/9311)
-* chore: update utopia-php/queue to 0.8.2 in [9312](https://github.com/appwrite/appwrite/pull/9312)
-* fix(schedule-tasks): revert back to direct pool usage in [9313](https://github.com/appwrite/appwrite/pull/9313)
-* feat: custom app schemes in [9262](https://github.com/appwrite/appwrite/pull/9262)
-* Revert "feat: custom app schemes" in [9319](https://github.com/appwrite/appwrite/pull/9319)
-* Restore "feat: custom app schemes"" in [9320](https://github.com/appwrite/appwrite/pull/9320)
-* Revert "Restore "feat: custom app schemes""" in [9323](https://github.com/appwrite/appwrite/pull/9323)
-* chore: update dependencies in [9330](https://github.com/appwrite/appwrite/pull/9330)
-* Feat: logs DB in [9272](https://github.com/appwrite/appwrite/pull/9272)
-* Catch invalid index in [9329](https://github.com/appwrite/appwrite/pull/9329)
-* Fix: missing call for image transformations counting in [9342](https://github.com/appwrite/appwrite/pull/9342)
-* Fix drop abuse on shared table project delete in [9346](https://github.com/appwrite/appwrite/pull/9346)
-* Only run all table mode tests on db update in [9338](https://github.com/appwrite/appwrite/pull/9338)
-* Fix: missing periodic metric in [9350](https://github.com/appwrite/appwrite/pull/9350)
-* feat(builds): check if function is blocked before building in [9332](https://github.com/appwrite/appwrite/pull/9332)
-* feat: batch create audit logs in [9347](https://github.com/appwrite/appwrite/pull/9347)
-* Chore: Update migrations in [9355](https://github.com/appwrite/appwrite/pull/9355)
-* Fix: metric time was not being written to DB in [9354](https://github.com/appwrite/appwrite/pull/9354)
-* Fix patch index validation in [9356](https://github.com/appwrite/appwrite/pull/9356)
-* Fix image trnasformation metrics in [9370](https://github.com/appwrite/appwrite/pull/9370)
-* Use batch delete in worker in [9375](https://github.com/appwrite/appwrite/pull/9375)
-* Fix Model Platform is missing response key: store  in [9361](https://github.com/appwrite/appwrite/pull/9361)
-* Feat key segmented usage in [9336](https://github.com/appwrite/appwrite/pull/9336)
-* Feat messaging metrics in [9353](https://github.com/appwrite/appwrite/pull/9353)
-* Fix removed audits for shared v2 in [9388](https://github.com/appwrite/appwrite/pull/9388)
-* chore: bump utopia-php/image to 0.8.0 in [9390](https://github.com/appwrite/appwrite/pull/9390)
-* Fix outdated CLI commands in documentation in [9122](https://github.com/appwrite/appwrite/pull/9122)
-* disable logs display in [9398](https://github.com/appwrite/appwrite/pull/9398)
-* Log batches per project in [9403](https://github.com/appwrite/appwrite/pull/9403)
-* Batch per project in [9410](https://github.com/appwrite/appwrite/pull/9410)
-* Fix: stats resources only queue projects accessed in last 3 hours in [9411](https://github.com/appwrite/appwrite/pull/9411)
-* Track options requests in [9397](https://github.com/appwrite/appwrite/pull/9397)
-* chore: bump docker-base in [9406](https://github.com/appwrite/appwrite/pull/9406)
-* refactor: migrate Realtime::send calls to queueForRealtime in [9325](https://github.com/appwrite/appwrite/pull/9325)
-* Revert "Fix: stats resources only queue projects accessed in last 3 hours" in [9424](https://github.com/appwrite/appwrite/pull/9424)
-* Remove usage and usage dump in favor of stats-usage and stats-usage-dump in [9339](https://github.com/appwrite/appwrite/pull/9339)
-* Fix: disable dual writing in [9429](https://github.com/appwrite/appwrite/pull/9429)
-* Disable transformedAt update for console users in [9425](https://github.com/appwrite/appwrite/pull/9425)
-* chore: add image transformation stats to usage endpoint in [9393](https://github.com/appwrite/appwrite/pull/9393)
-* chore: added timeout to deployment builds in tests in [9426](https://github.com/appwrite/appwrite/pull/9426)
-* fix: model for image transformations in usage project in [9442](https://github.com/appwrite/appwrite/pull/9442)
-* Feat: calculate database storage in stats-resources in [9443](https://github.com/appwrite/appwrite/pull/9443)
-* Activities batch writes in [9438](https://github.com/appwrite/appwrite/pull/9438)
-* chore: bump cache 0.12.x in [9412](https://github.com/appwrite/appwrite/pull/9412)
-* chore: queue console project for maintenance delete in [9479](https://github.com/appwrite/appwrite/pull/9479)
-* chore: added logsdb for deletes worker in [9462](https://github.com/appwrite/appwrite/pull/9462)
-* Feat: calculate and log time taken for each project in [9491](https://github.com/appwrite/appwrite/pull/9491)
-* chore: update initializing dbForLogs in [9494](https://github.com/appwrite/appwrite/pull/9494)
-* Feat bulk audit delete in [9487](https://github.com/appwrite/appwrite/pull/9487)
-* Prepare 1.6.2 release in [9499](https://github.com/appwrite/appwrite/pull/9499)
-* Regenerate specs in [9497](https://github.com/appwrite/appwrite/pull/9497)
-* Regenerate examples in [9498](https://github.com/appwrite/appwrite/pull/9498)
-* chore: bump sdk in [9414](https://github.com/appwrite/appwrite/pull/9414)
-* update queue to 0.9.* in [9505](https://github.com/appwrite/appwrite/pull/9505)
-* Feat improve delete queries in [9507](https://github.com/appwrite/appwrite/pull/9507)
-* Feat: Add rule attributes in [9508](https://github.com/appwrite/appwrite/pull/9508)
-* Sync main into 1.6.x in [9496](https://github.com/appwrite/appwrite/pull/9496)
-* Bump console to version 5.2.53 in [9495](https://github.com/appwrite/appwrite/pull/9495)
-* Prepare 1.6.1 release in [9294](https://github.com/appwrite/appwrite/pull/9294)
-* Improve delete ordering in [9512](https://github.com/appwrite/appwrite/pull/9512)
-* Cleanups in [9511](https://github.com/appwrite/appwrite/pull/9511)
-* Feat dynamic regions in [9408](https://github.com/appwrite/appwrite/pull/9408)
-* Feat env vars to system lib in [9515](https://github.com/appwrite/appwrite/pull/9515)
-* Feat: domains count in [9514](https://github.com/appwrite/appwrite/pull/9514)
-* Migration read from db in [9529](https://github.com/appwrite/appwrite/pull/9529)
-* feat: add pool telemetry in [9530](https://github.com/appwrite/appwrite/pull/9530)
-* Disable PDO persistence since we manage our own pool in [9526](https://github.com/appwrite/appwrite/pull/9526)
-* chore: set min operations to 1 for reads and writes in [9536](https://github.com/appwrite/appwrite/pull/9536)
-* Remove default region in [9430](https://github.com/appwrite/appwrite/pull/9430)
-* Use cursor pagination with bigger limit for maintenance project loop in [9546](https://github.com/appwrite/appwrite/pull/9546)
-* chore: stop tests on failure in [9525](https://github.com/appwrite/appwrite/pull/9525)
-* chore: only update total count for privileged users in [9554](https://github.com/appwrite/appwrite/pull/9554)
-* refactor: initialization of audit retention in [9563](https://github.com/appwrite/appwrite/pull/9563)
-* Delete worker queries fixes in [9523](https://github.com/appwrite/appwrite/pull/9523)
-* Bump database 0.62.x in [9568](https://github.com/appwrite/appwrite/pull/9568)
-* Fix: schedules region filtering in [9577](https://github.com/appwrite/appwrite/pull/9577)
-* Deletes worker fix selects for pagination in [9578](https://github.com/appwrite/appwrite/pull/9578)
-* Add $permissions for delete documents selects in [9579](https://github.com/appwrite/appwrite/pull/9579)
-* chore(audits): return queue pre-fetch results in [9533](https://github.com/appwrite/appwrite/pull/9533)
-* Revert "chore(audits): return queue pre-fetch results" in [9586](https://github.com/appwrite/appwrite/pull/9586)
-* Feat multi tenant insert in [9573](https://github.com/appwrite/appwrite/pull/9573)
-* Add order by for cursor in [9588](https://github.com/appwrite/appwrite/pull/9588)
-* Feat update fetch in [9592](https://github.com/appwrite/appwrite/pull/9592)
-* Fix tenant casting in [9598](https://github.com/appwrite/appwrite/pull/9598)
-* Feat update ws in [9602](https://github.com/appwrite/appwrite/pull/9602)
-* Update database in [9603](https://github.com/appwrite/appwrite/pull/9603)
-* Fix: image transformation cache in [9608](https://github.com/appwrite/appwrite/pull/9608)
-* Remove audit payload in [9610](https://github.com/appwrite/appwrite/pull/9610)
-* Sample rate from DSN in [9559](https://github.com/appwrite/appwrite/pull/9559)
-* Restrict role change for sole org owner in [9615](https://github.com/appwrite/appwrite/pull/9615)
-* chore: update php image to 0.8.1 in [9616](https://github.com/appwrite/appwrite/pull/9616)
-* feat: refactor executor setup in [9420](https://github.com/appwrite/appwrite/pull/9420)
-* chore: update gitpod.yml config in [9561](https://github.com/appwrite/appwrite/pull/9561)
-* chore: update dependencies in [9625](https://github.com/appwrite/appwrite/pull/9625)
-* Update migrations lib in [9628](https://github.com/appwrite/appwrite/pull/9628)
-* feat: cache telemetry in [9624](https://github.com/appwrite/appwrite/pull/9624)
-* Bump console to version 5.2.56 in [9631](https://github.com/appwrite/appwrite/pull/9631)
-* Multi region support in [8667](https://github.com/appwrite/appwrite/pull/8667)
-* Revert "Multi region support" in [9632](https://github.com/appwrite/appwrite/pull/9632)
-* Revert "Revert "Multi region support"" in [9636](https://github.com/appwrite/appwrite/pull/9636)
-* Fix tasks in [9644](https://github.com/appwrite/appwrite/pull/9644)
-* chore: updated the migration version to 8.6 in [9646](https://github.com/appwrite/appwrite/pull/9646)
-* Fix: merge the working of StatsUsage and StatsUsageDump in [9585](https://github.com/appwrite/appwrite/pull/9585)
-* Update database in [9643](https://github.com/appwrite/appwrite/pull/9643)
-* chore: fix error logging for CLI tasks in [9651](https://github.com/appwrite/appwrite/pull/9651)
-* fix: usage test assertion in [9653](https://github.com/appwrite/appwrite/pull/9653)
-* Fix keys in [9656](https://github.com/appwrite/appwrite/pull/9656)
-* Feat: multi tenant dual writing in [9583](https://github.com/appwrite/appwrite/pull/9583)
-* Fix/throwing 400 for null order attributes  in [9657](https://github.com/appwrite/appwrite/pull/9657)
-* feat: sdk group attribute in [9596](https://github.com/appwrite/appwrite/pull/9596)
-* Add configurable function and build size in [9648](https://github.com/appwrite/appwrite/pull/9648)
-* feat: update API endpoint in the code examples in [8933](https://github.com/appwrite/appwrite/pull/8933)
-* chore: abstract token secret hiding to response model in [9574](https://github.com/appwrite/appwrite/pull/9574)
-* chore: update sdks in [9655](https://github.com/appwrite/appwrite/pull/9655)
-* feat: allow non-critical events to ignore exceptions when enqueuing the event in [9680](https://github.com/appwrite/appwrite/pull/9680)
-* Revert "Add configurable function and build size" in [9681](https://github.com/appwrite/appwrite/pull/9681)
-* core: introduce endpoint.docs in specs in [9685](https://github.com/appwrite/appwrite/pull/9685)
-* fix: remove content-type header from get request specs in [9666](https://github.com/appwrite/appwrite/pull/9666)
-* chore: update flutter sdk in [9691](https://github.com/appwrite/appwrite/pull/9691)
-
 # Version 1.6.1
 
 ## What's Changed

CONTRIBUTING.md

@@ -163,28 +163,6 @@ Other containes should be named the same as their service, for example `redis` s
 - [Encryption](https://medium.com/searchencrypt/what-is-encryption-how-does-it-work-e8f20e340537#:~:text=Encryption%20is%20a%20process%20that,%2C%20or%20decrypt%2C%20the%20information.)
 - [Hashing](https://searchsqlserver.techtarget.com/definition/hashing#:~:text=Hashing%20is%20the%20transformation%20of,it%20using%20the%20original%20value.)
 
-## 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
-
-Every endpoint file follows below structure, making it consistent with HTTP REST endpoint path:
-
-```
-src/Appwrite/Platform/Modules/[service]/Http/[resource]/[action].php
-```
-
-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 then all in folder structure
-> Example: `Modules/Sites/Http/Deployments/Builds/Create.php`
-
-3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
-
 ## Architecture
 
 Appwrite's current structure is a combination of both [Monolithic](https://en.wikipedia.org/wiki/Monolithic_application) and [Microservice](https://en.wikipedia.org/wiki/Microservices) architectures.

Dockerfile

@@ -44,14 +44,12 @@ COPY ./dev /usr/src/code/dev
 
 # Set Volumes
 RUN mkdir -p /storage/uploads && \
-    mkdir -p /storage/imports && \
     mkdir -p /storage/cache && \
     mkdir -p /storage/config && \
     mkdir -p /storage/certificates && \
     mkdir -p /storage/functions && \
     mkdir -p /storage/debug && \
     chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads && \
-    chown -Rf www-data.www-data /storage/imports && chmod -Rf 0755 /storage/imports && \
     chown -Rf www-data.www-data /storage/cache && chmod -Rf 0755 /storage/cache && \
     chown -Rf www-data.www-data /storage/config && chmod -Rf 0755 /storage/config && \
     chown -Rf www-data.www-data /storage/certificates && chmod -Rf 0755 /storage/certificates && \
@@ -70,7 +68,6 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/sdks && \
     chmod +x /usr/local/bin/specs && \
     chmod +x /usr/local/bin/ssl && \
-    chmod +x /usr/local/bin/screenshot && \
     chmod +x /usr/local/bin/test && \
     chmod +x /usr/local/bin/upgrade && \
     chmod +x /usr/local/bin/vars && \
@@ -89,6 +86,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/worker-migrations && \
     chmod +x /usr/local/bin/worker-webhooks && \
     chmod +x /usr/local/bin/worker-stats-usage && \
+    chmod +x /usr/local/bin/worker-stats-usage-dump && \
     chmod +x /usr/local/bin/stats-resources && \
     chmod +x /usr/local/bin/worker-stats-resources
 

README-CN.md

@@ -72,7 +72,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.6.1
 ```
 
 ### Windows
@@ -84,7 +84,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.6.1
 ```
 
 #### PowerShell
@@ -94,7 +94,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.6.1
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -1,5 +1,4 @@
-> [Get started with Appwrite](https://apwr.dev/appcloud)
-> [Join the Init kick off event 19th of May: The future of Appwrite with Founder & CEO Eldad Fux](https://www.youtube.com/watch?v=1g8tuogsp7A)
+> Appwrite Init has concluded! You can check out all the latest announcements [on our Init website](https://appwrite.io/init) :rocket:
 
 <br />
 <p align="center">
@@ -25,9 +24,11 @@
 
 English | [简体中文](README-CN.md)
 
+[**Announcing Appwrite Cloud Public Beta! Sign up today!**](https://cloud.appwrite.io)
+
 Appwrite is an end-to-end backend server for Web, Mobile, Native, or Backend apps packaged as a set of Docker<nobr> microservices. Appwrite abstracts the complexity and repetitiveness required to build a modern backend API from scratch and allows you to build secure apps faster.
 
-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).
+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, and [more services](https://appwrite.io/docs).
 
 <p align="center">
     <br />
@@ -51,7 +52,7 @@ Table of Contents:
   - [Upgrade from an Older Version](#upgrade-from-an-older-version)
 - [One-Click Setups](#one-click-setups)
 - [Getting Started](#getting-started)
-  - [Products](#products)
+  - [Services](#services)
   - [SDKs](#sdks)
     - [Client](#client)
     - [Server](#server)
@@ -78,7 +79,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.6.1
 ```
 
 ### Windows
@@ -90,7 +91,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.6.1
 ```
 
 #### PowerShell
@@ -100,7 +101,7 @@ docker run -it --rm `
     --volume /var/run/docker.sock:/var/run/docker.sock `
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
     --entrypoint="install" `
-    appwrite/appwrite:1.7.2
+    appwrite/appwrite:1.6.1
 ```
 
 Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.

app/cli.php

@@ -9,16 +9,11 @@ use Appwrite\Event\StatsResources;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Platform\Appwrite;
 use Appwrite\Runtimes\Runtimes;
-use Executor\Executor;
-use Swoole\Runtime;
-use Swoole\Timer;
-use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
@@ -26,16 +21,12 @@ use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Publisher;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
-use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
-use function Swoole\Coroutine\run;
-
-// overwriting runtimes to be architecture agnostic for CLI
-Config::setParam('runtimes', (new Runtimes('v5'))->getAll(supported: false));
+// overwriting runtimes to be architectur agnostic for CLI
+Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
 
 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';
@@ -49,7 +40,11 @@ CLI::setResource('cache', function ($pools) {
     $adapters = [];
 
     foreach ($list as $value) {
-        $adapters[] = new CachePool($pools->get($value));
+        $adapters[] = $pools
+            ->get($value)
+            ->pop()
+            ->getResource()
+        ;
     }
 
     return new Cache(new Sharding($adapters));
@@ -69,8 +64,12 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
         $attempts++;
         try {
             // Prepare database connection
-            $adapter = new DatabasePool($pools->get('console'));
-            $dbForPlatform = new Database($adapter, $cache);
+            $dbAdapter = $pools
+                ->get('console')
+                ->pop()
+                ->getResource();
+
+            $dbForPlatform = new Database($dbAdapter, $cache);
 
             $dbForPlatform
                 ->setNamespace('_console')
@@ -88,6 +87,7 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
             $ready = true;
         } catch (\Throwable $err) {
             Console::warning($err->getMessage());
+            $pools->get('console')->reclaim();
             sleep($sleep);
         }
     } while ($attempts < $maxAttempts && !$ready);
@@ -99,10 +99,6 @@ CLI::setResource('dbForPlatform', function ($pools, $cache) {
     return $dbForPlatform;
 }, ['pools', 'cache']);
 
-CLI::setResource('console', function () {
-    return new Document(Config::getParam('console'));
-}, []);
-
 CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
     $databases = []; // TODO: @Meldiron This should probably be responsibility of utopia-php/pools
 
@@ -137,8 +133,12 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
             return $database;
         }
 
-        $adapter = new DatabasePool($pools->get($dsn->getHost()));
-        $database = new Database($adapter, $cache);
+        $dbAdapter = $pools
+            ->get($dsn->getHost())
+            ->pop()
+            ->getResource();
+
+        $database = new Database($dbAdapter, $cache);
         $databases[$dsn->getHost()] = $database;
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
@@ -164,20 +164,26 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform
 
 CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
     $database = null;
-
     return function (?Document $project = null) use ($pools, $cache, $database) {
         if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
             $database->setTenant($project->getInternalId());
             return $database;
         }
 
-        $adapter = new DatabasePool($pools->get('logs'));
-        $database = new Database($adapter, $cache);
+        $dbAdapter = $pools
+            ->get('logs')
+            ->pop()
+            ->getResource();
+
+        $database = new Database(
+            $dbAdapter,
+            $cache
+        );
 
         $database
             ->setSharedTables(true)
             ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_TASK)
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
             ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
 
         // set tenant
@@ -189,14 +195,14 @@ CLI::setResource('getLogsDB', function (Group $pools, Cache $cache) {
     };
 }, ['pools', 'cache']);
 
-CLI::setResource('queueForStatsUsage', function (Publisher $publisher) {
+CLI::setResource('queueForStatsUsage', function (Connection $publisher) {
     return new StatsUsage($publisher);
 }, ['publisher']);
 CLI::setResource('queueForStatsResources', function (Publisher $publisher) {
     return new StatsResources($publisher);
 }, ['publisher']);
 CLI::setResource('publisher', function (Group $pools) {
-    return new BrokerPool(publisher: $pools->get('publisher'));
+    return $pools->get('publisher')->pop()->getResource();
 }, ['pools']);
 CLI::setResource('queueForFunctions', function (Publisher $publisher) {
     return new Func($publisher);
@@ -209,13 +215,6 @@ CLI::setResource('queueForCertificates', function (Publisher $publisher) {
 }, ['publisher']);
 CLI::setResource('logError', function (Registry $register) {
     return function (Throwable $error, string $namespace, string $action) use ($register) {
-        Console::error('[Error] Timestamp: ' . date('c', time()));
-        Console::error('[Error] Type: ' . get_class($error));
-        Console::error('[Error] Message: ' . $error->getMessage());
-        Console::error('[Error] File: ' . $error->getFile());
-        Console::error('[Error] Line: ' . $error->getLine());
-        Console::error('[Error] Trace: ' . $error->getTraceAsString());
-
         $logger = $register->get('logger');
 
         if ($logger) {
@@ -234,7 +233,6 @@ CLI::setResource('logError', function (Registry $register) {
             $log->addExtra('file', $error->getFile());
             $log->addExtra('line', $error->getLine());
             $log->addExtra('trace', $error->getTraceAsString());
-            $log->addExtra('detailedTrace', $error->getTrace());
 
             $log->setAction($action);
 
@@ -248,42 +246,22 @@ CLI::setResource('logError', function (Registry $register) {
                 Console::error('Error pushing log: ' . $th->getMessage());
             }
         }
+
+        Console::warning("Failed: {$error->getMessage()}");
+        Console::warning($error->getTraceAsString());
     };
 }, ['register']);
 
-CLI::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
-CLI::setResource('telemetry', fn () => new NoTelemetry());
-
 $platform = new Appwrite();
-$args = $platform->getEnv('argv');
-
-if (!isset($args[0])) {
-    Console::error('Missing task name');
-    Console::exit(1);
-}
-
-\array_shift($args);
-$taskName = $args[0];
 $platform->init(Service::TYPE_TASK);
+
 $cli = $platform->getCli();
 
 $cli
     ->error()
     ->inject('error')
-    ->inject('logError')
-    ->action(function (Throwable $error, callable $logError) use ($taskName) {
-        call_user_func_array($logError, [
-            $error,
-            'Task',
-            $taskName,
-        ]);
-
-        Timer::clearAll();
+    ->action(function (Throwable $error) {
+        Console::error($error->getMessage());
     });
 
-$cli->shutdown()->action(fn () => Timer::clearAll());
-
-// Enable coroutines, but disable TCP hooks. These don't work until we use `\Utopia\Cache\Adapter\Pool` and `\Utopia\Database\Adapter\Pool`.
-Runtime::enableCoroutine(SWOOLE_HOOK_ALL ^ SWOOLE_HOOK_TCP);
-run($cli->run(...));
+$cli->run();

app/config/collections/common.php

@@ -1038,7 +1038,7 @@ return [
                 '$id' => ID::custom('providerUid'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 2048, // Decrease to 128 as in index length?
+                'size' => 2048,
                 'signed' => true,
                 'required' => false,
                 'default' => null,
@@ -1101,42 +1101,20 @@ return [
                 'array' => false,
                 'filters' => ['json', 'encrypt'],
             ],
-            [
-                '$id' => ID::custom('scopes'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => true,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('expire'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'required' => false,
-                'signed' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
         ],
         'indexes' => [
             [
                 '$id' => ID::custom('_key_userInternalId_provider_providerUid'),
                 'type' => Database::INDEX_UNIQUE,
                 'attributes' => ['userInternalId', 'provider', 'providerUid'],
-                'lengths' => [11, 128, 128], // providerUid is length 2000!
+                'lengths' => [11, 128, 128],
                 'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_provider_providerUid'),
                 'type' => Database::INDEX_UNIQUE,
                 'attributes' => ['provider', 'providerUid'],
-                'lengths' => [128, 128], // providerUid is length 2000!
+                'lengths' => [128, 128],
                 'orders' => [Database::ORDER_ASC, Database::ORDER_ASC],
             ],
             [
@@ -1439,13 +1417,6 @@ return [
                 'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
-            [
-                '$id' => ID::custom('_key_roles'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['roles'],
-                'lengths' => [128],
-                'orders' => [],
-            ],
         ],
     ],
 
@@ -2381,20 +2352,6 @@ return [
                 'lengths' => [],
                 'orders' => [],
             ],
-            [
-                '$id' => ID::custom('_key_expired'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['expired'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_session_internal_id'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['sessionInternalId'],
-                'lengths' => [],
-                'orders' => [],
-            ],
         ],
     ],
 

app/config/collections/platform.php

@@ -225,7 +225,7 @@ return [
                 '$id' => ID::custom('templates'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 1_000_000, // TODO make sure size fits
+                'size' => 1000000, // TODO make sure size fits
                 'signed' => true,
                 'required' => false,
                 'default' => [],
@@ -287,17 +287,6 @@ return [
                 'array' => false,
                 'filters' => ['subQueryKeys'],
             ],
-            [
-                '$id' => ID::custom('devKeys'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['subQueryDevKeys'],
-            ],
             [
                 '$id' => ID::custom('search'),
                 'type' => Database::VAR_STRING,
@@ -367,21 +356,7 @@ return [
                 'attributes' => ['pingedAt'],
                 'lengths' => [],
                 'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_database'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['database'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_region_accessed_at'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['region', 'accessedAt'],
-                'lengths' => [],
-                'orders' => [],
-            ],
+            ]
         ],
     ],
 
@@ -505,20 +480,6 @@ return [
                 'lengths' => [],
                 'orders' => [],
             ],
-            [
-                '$id' => ID::custom('_key_project_id_region'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectId', 'region'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_region_rt_active'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['region', 'resourceType', 'active'],
-                'lengths' => [],
-                'orders' => [],
-            ],
         ],
     ],
 
@@ -728,107 +689,6 @@ return [
         ],
     ],
 
-    'devKeys' => [
-        '$collection' => ID::custom(Database::METADATA),
-        '$id' => ID::custom('devKeys'),
-        'name' => 'Dev keys',
-        'attributes' => [
-            [
-                '$id' => ID::custom('projectInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('projectId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => 0,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('name'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('secret'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 512, // var_dump of \bin2hex(\random_bytes(128)) => string(256) doubling for encryption
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => ['encrypt'],
-            ],
-            [
-                '$id' => ID::custom('expire'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('accessedAt'),
-                'type' => Database::VAR_DATETIME,
-                'format' => '',
-                'size' => 0,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['datetime'],
-            ],
-            [
-                '$id' => ID::custom('sdks'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => true,
-                'filters' => [],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_key_project'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_accessedAt',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['accessedAt'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-        ],
-    ],
-
     'webhooks' => [
         '$collection' => ID::custom(Database::METADATA),
         '$id' => ID::custom('webhooks'),
@@ -1153,10 +1013,21 @@ return [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('type'), // 'api', 'redirect', 'deployment' (site or function)
+                '$id' => ID::custom('resourceType'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 32,
+                'size' => 100,
+                'signed' => true,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('resourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
                 'signed' => true,
                 'required' => false,
                 'default' => null,
@@ -1164,104 +1035,16 @@ return [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('trigger'), // 'manual', 'deployment', '' (empty)
+                '$id' => ID::custom('resourceId'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 32,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('redirectUrl'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 2048,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('redirectStatusCode'),
-                'type' => Database::VAR_INTEGER,
-                'format' => '',
-                'size' => 0,
+                'size' => Database::LENGTH_KEY,
                 'signed' => true,
                 'required' => false,
                 'default' => null,
                 'array' => false,
                 'filters' => [],
             ],
-            [
-                '$id' => ID::custom('deploymentResourceType'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 32,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentResourceId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentResourceInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('deploymentVcsProviderBranch'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
             [
                 '$id' => ID::custom('status'),
                 'type' => Database::VAR_STRING,
@@ -1283,49 +1066,9 @@ return [
                 'default' => null,
                 'array' => false,
                 'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('owner'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => false,
-                'default' => '', // "Appwrite" or empty string
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('region'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16,
-                'signed' => true,
-                'required' => true,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
+            ]
         ],
         'indexes' => [
-            [
-                '$id' => ID::custom('_key_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
             [
                 '$id' => ID::custom('_key_domain'),
                 'type' => Database::INDEX_UNIQUE,
@@ -1348,81 +1091,25 @@ return [
                 'orders' => [Database::ORDER_ASC],
             ],
             [
-                '$id' => '_key_type',
+                '$id' => '_key_resourceInternalId',
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['type'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_trigger',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['trigger'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentResourceType',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentResourceType'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentResourceId',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentResourceId'],
+                'attributes' => ['resourceInternalId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
-                '$id' => '_key_deploymentResourceInternalId',
+                '$id' => '_key_resourceId',
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentResourceInternalId'],
+                'attributes' => ['resourceId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
-                '$id' => '_key_deploymentId',
+                '$id' => '_key_resourceType',
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentInternalId',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_deploymentVcsProviderBranch',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentVcsProviderBranch'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_owner'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['owner'],
-                'lengths' => [16],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_region'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['region'],
-                'lengths' => [16],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_piid_riid_rt'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'deploymentInternalId', 'deploymentResourceType'],
+                'attributes' => ['resourceType'],
                 'lengths' => [],
-                'orders' => [],
+                'orders' => [Database::ORDER_ASC],
             ],
         ],
     ],
@@ -1719,14 +1406,7 @@ return [
                 'attributes' => ['resourceType'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_piid_riid_rt'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'resourceInternalId', 'resourceType'],
-                'lengths' => [],
-                'orders' => [],
-            ],
+            ]
         ],
     ],
 
@@ -1874,13 +1554,6 @@ return [
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
-            [
-                '$id' => ID::custom('_key_piid_prid_rt'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['projectInternalId', 'providerRepositoryId'],
-                'lengths' => [],
-                'orders' => [],
-            ],
         ],
     ],
 
@@ -1890,5 +1563,5 @@ return [
         'name' => 'vcsCommentLocks',
         'attributes' => [],
         'indexes' => []
-    ],
+    ]
 ];

app/config/console.php

@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Initializes console project document.
- */
-
-use Appwrite\Auth\Auth;
-use Appwrite\Network\Validator\Origin;
-use Utopia\Database\Helpers\ID;
-use Utopia\System\System;
-
-$console = [
-    '$id' => ID::custom('console'),
-    '$internalId' => ID::custom('console'),
-    'name' => 'Appwrite',
-    '$collection' => ID::custom('projects'),
-    'description' => 'Appwrite core engine',
-    'logo' => '',
-    'teamId' => null,
-    'webhooks' => [],
-    'keys' => [],
-    'platforms' => [
-        [
-            '$collection' => ID::custom('platforms'),
-            'name' => 'Localhost',
-            'type' => Origin::CLIENT_TYPE_WEB,
-            'hostname' => 'localhost',
-        ], // Current host is added on app init
-    ],
-    'region' => 'fra',
-    'legalName' => '',
-    'legalCountry' => '',
-    'legalState' => '',
-    'legalCity' => '',
-    'legalAddress' => '',
-    'legalTaxId' => '',
-    'auths' => [
-        'mockNumbers' => [],
-        'invites' => System::getEnv('_APP_CONSOLE_INVITES', 'enabled') === 'enabled',
-        'limit' => (System::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
-        'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
-        'sessionAlerts' => System::getEnv('_APP_CONSOLE_SESSION_ALERTS', 'disabled') === 'enabled'
-    ],
-    'authWhitelistEmails' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
-    'authWhitelistIPs' => (!empty(System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', System::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
-    'oAuthProviders' => [
-        'githubEnabled' => true,
-        'githubSecret' => System::getEnv('_APP_CONSOLE_GITHUB_SECRET', ''),
-        'githubAppid' => System::getEnv('_APP_CONSOLE_GITHUB_APP_ID', '')
-    ],
-];
-
-return $console;

app/config/errors.php

@@ -81,7 +81,7 @@ return [
     ],
     Exception::GENERAL_ROUTE_NOT_FOUND => [
         'name' => Exception::GENERAL_ROUTE_NOT_FOUND,
-        'description' => 'Route not found. Please ensure the endpoint is configured correctly and that the API route is valid for this SDK version. Refer to the API docs for more details.',
+        'description' => 'The requested route was not found. Please refer to the API docs and try again.',
         'code' => 404,
     ],
     Exception::GENERAL_CURSOR_NOT_FOUND => [
@@ -375,13 +375,6 @@ return [
         'code' => 409,
     ],
 
-    /** Console */
-    Exception::RESOURCE_ALREADY_EXISTS => [
-        'name' => Exception::RESOURCE_ALREADY_EXISTS,
-        'description' => 'Resource with the requested ID already exists. Please choose a different ID and try again.',
-        'code' => 409,
-    ],
-
     /** Membership */
     Exception::MEMBERSHIP_NOT_FOUND => [
         'name' => Exception::MEMBERSHIP_NOT_FOUND,
@@ -488,23 +481,6 @@ return [
         'code' => 403,
     ],
 
-    /** Tokens */
-    Exception::TOKEN_NOT_FOUND => [
-        'name' => Exception::TOKEN_NOT_FOUND,
-        'description' => 'The requested file token could not be found.',
-        'code' => 404,
-    ],
-    Exception::TOKEN_EXPIRED => [
-        'name' => Exception::TOKEN_EXPIRED,
-        'description' => 'The requested file token has expired.',
-        'code' => 401,
-    ],
-    Exception::TOKEN_RESOURCE_TYPE_INVALID => [
-        'name' => Exception::TOKEN_RESOURCE_TYPE_INVALID,
-        'description' => 'The resource type for the token is invalid.',
-        'code' => 400,
-    ],
-
     /** VCS */
     Exception::INSTALLATION_NOT_FOUND => [
         'name' => Exception::INSTALLATION_NOT_FOUND,
@@ -544,7 +520,7 @@ return [
         'code' => 404,
     ],
     Exception::FUNCTION_ENTRYPOINT_MISSING => [
-        'name' => Exception::FUNCTION_ENTRYPOINT_MISSING,
+        'name' => Exception::FUNCTION_RUNTIME_UNSUPPORTED,
         'description' => 'Entrypoint for your Appwrite Function is missing. Please specify it when making deployment or update the entrypoint under your function\'s "Settings" > "Configuration" > "Entrypoint".',
         'code' => 404,
     ],
@@ -558,28 +534,6 @@ return [
         'description' => 'Function Template with the requested ID could not be found.',
         'code' => 404,
     ],
-    Exception::FUNCTION_RUNTIME_NOT_DETECTED => [
-        'name' => Exception::FUNCTION_RUNTIME_NOT_DETECTED,
-        'description' => 'Function runtime could not be detected.',
-        'code' => 400,
-    ],
-    Exception::FUNCTION_EXECUTE_PERMISSION_MISSING => [
-        'name' => Exception::FUNCTION_EXECUTE_PERMISSION_MISSING,
-        'description' => 'To execute function using domain, execute permissions must include "any" or "guests".',
-        'code' => 401,
-    ],
-
-    /** Sites */
-    Exception::SITE_NOT_FOUND => [
-        'name' => Exception::SITE_NOT_FOUND,
-        'description' => 'Site with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::SITE_TEMPLATE_NOT_FOUND => [
-        'name' => Exception::SITE_TEMPLATE_NOT_FOUND,
-        'description' => 'Site Template with the requested ID could not be found.',
-        'code' => 404,
-    ],
 
     /** Builds  */
     Exception::BUILD_NOT_FOUND => [
@@ -602,16 +556,6 @@ return [
         'description' => 'Build with the requested ID is already completed and cannot be canceled.',
         'code' => 400,
     ],
-    Exception::BUILD_CANCELED => [
-        'name' => Exception::BUILD_CANCELED,
-        'description' => 'Build with the requested ID has been canceled.',
-        'code' => 400,
-    ],
-    Exception::BUILD_FAILED => [
-        'name' => Exception::BUILD_FAILED,
-        'description' => 'Build with the requested ID failed. Please check the logs for more information.',
-        'code' => 400,
-    ],
 
     /** Deployments */
     Exception::DEPLOYMENT_NOT_FOUND => [
@@ -633,13 +577,6 @@ return [
         'code' => 400,
     ],
 
-    /** Logs */
-    Exception::LOG_NOT_FOUND => [
-        'name' => Exception::LOG_NOT_FOUND,
-        'description' => 'Log with the requested ID could not be found.',
-        'code' => 404,
-    ],
-
     /** Databases */
     Exception::DATABASE_NOT_FOUND => [
         'name' => Exception::DATABASE_NOT_FOUND,
@@ -656,11 +593,6 @@ return [
         'description' => 'Database timed out. Try adjusting your queries or adding an index.',
         'code' => 408
     ],
-    Exception::DATABASE_QUERY_ORDER_NULL => [
-        'name' => Exception::DATABASE_QUERY_ORDER_NULL,
-        'description' => 'The order attribute had a null value. Cursor pagination requires all documents order attribute values are non-null.',
-        'code' => 400,
-    ],
 
     /** Collections */
     Exception::COLLECTION_NOT_FOUND => [
@@ -869,7 +801,7 @@ return [
     Exception::RULE_VERIFICATION_FAILED => [
         'name' => Exception::RULE_VERIFICATION_FAILED,
         'description' => 'Domain verification failed. Please check if your DNS records are correct and try again.',
-        'code' => 400,
+        'code' => 401,
         'publish' => true
     ],
     Exception::PROJECT_SMTP_CONFIG_INVALID => [
@@ -912,11 +844,6 @@ return [
         'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
         'code' => 409,
     ],
-    Exception::VARIABLE_CANNOT_UNSET_SECRET => [
-        'name' => Exception::VARIABLE_CANNOT_UNSET_SECRET,
-        'description' => 'Secret variables cannot be marked as non-secret. Please re-create the variable if this is your intention.',
-        'code' => 400,
-    ],
     Exception::GRAPHQL_NO_QUERY => [
         'name' => Exception::GRAPHQL_NO_QUERY,
         'description' => 'Param "query" is not optional.',

app/config/events.php

@@ -217,34 +217,6 @@ return [
             ],
         ]
     ],
-    'sites' => [
-        '$model' => Response::MODEL_SITE,
-        '$resource' => true,
-        '$description' => 'This event triggers on any sites event.',
-        'deployments' => [
-            '$model' => Response::MODEL_DEPLOYMENT,
-            '$resource' => true,
-            '$description' => 'This event triggers on any deployments event.',
-            'create' => [
-                '$description' => 'This event triggers when a deployment is created.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when a deployment is deleted.'
-            ],
-            'update' => [
-                '$description' => 'This event triggers when a deployment is updated.'
-            ],
-        ],
-        'create' => [
-            '$description' => 'This event triggers when a site is created.'
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a site is deleted.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a site is updated.',
-        ]
-    ],
     'functions' => [
         '$model' => Response::MODEL_FUNCTION,
         '$resource' => true,

app/config/frameworks.php

@@ -1,312 +0,0 @@
-<?php
-
-/**
- * List of Appwrite Sites supported frameworks
- */
-
-use Utopia\Config\Config;
-
-$templateRuntimes = Config::getParam('template-runtimes');
-
-function getVersions(array $versions, string $prefix)
-{
-    return array_map(function ($version) use ($prefix) {
-        return $prefix . '-' . $version;
-    }, $versions);
-}
-
-return [
-    'analog' => [
-        'key' => 'analog',
-        'name' => 'Analog',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/analog/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/analog/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/analog',
-                'startCommand' => 'bash helpers/analog/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/analog/public',
-                'startCommand' => 'bash helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'angular' => [
-        'key' => 'angular',
-        'name' => 'Angular',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/angular/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/angular/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/angular',
-                'startCommand' => 'bash helpers/angular/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist/angular/browser',
-                'startCommand' => 'bash helpers/server.sh',
-                'fallbackFile' => 'index.csr.html'
-            ]
-        ]
-    ],
-    'nextjs' => [
-        'key' => 'nextjs',
-        'name' => 'Next.js',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/next-js/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/next-js/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './.next',
-                'startCommand' => 'bash helpers/next-js/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './out',
-                'startCommand' => 'bash helpers/server.sh',
-            ]
-        ]
-    ],
-    'react' => [
-        'key' => 'react',
-        'name' => 'React',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'nuxt' => [
-        'key' => 'nuxt',
-        'name' => 'Nuxt',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/nuxt/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/nuxt/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './.output',
-                'startCommand' => 'bash helpers/nuxt/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run generate',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './output/public',
-                'startCommand' => 'bash helpers/server.sh',
-            ]
-        ]
-    ],
-    'vue' => [
-        'key' => 'vue',
-        'name' => 'Vue.js',
-        'screenshotSleep' => 5000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'sveltekit' => [
-        'key' => 'sveltekit',
-        'name' => 'SvelteKit',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/sveltekit/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/sveltekit/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'bash helpers/sveltekit/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'bash helpers/server.sh',
-            ]
-        ]
-    ],
-    'astro' => [
-        'key' => 'astro',
-        'name' => 'Astro',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/astro/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/astro/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/astro/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/server.sh',
-            ]
-        ]
-    ],
-    'remix' => [
-        'key' => 'remix',
-        'name' => 'Remix',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'bundleCommand' => 'bash /usr/local/server/helpers/remix/bundle.sh',
-        'envCommand' => 'source /usr/local/server/helpers/remix/env.sh',
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'bash helpers/remix/server.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build/client',
-                'startCommand' => 'bash helpers/server.sh',
-            ]
-        ]
-    ],
-    'lynx' => [
-        'key' => 'lynx',
-        'name' => 'Lynx',
-        'screenshotSleep' => 5000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'flutter' => [
-        'key' => 'flutter',
-        'name' => 'Flutter',
-        'screenshotSleep' => 5000,
-        'buildRuntime' => 'flutter-3.29',
-        'runtimes' => getVersions($templateRuntimes['FLUTTER']['versions'], 'flutter'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'flutter build web --release -t lib/main.dart',
-                'installCommand' => 'flutter pub get',
-                'outputDirectory' => './build/web',
-                'startCommand' => 'bash helpers/server.sh',
-            ],
-        ],
-    ],
-    'react-native' => [
-        'key' => 'react-native',
-        'name' => 'React Native',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/server.sh',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'vite' => [
-        'key' => 'vite',
-        'name' => 'Vite',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'bash helpers/server.sh',
-            ],
-        ]
-    ],
-    'other' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'screenshotSleep' => 3000,
-        'buildRuntime' => 'node-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => '',
-                'installCommand' => '',
-                'outputDirectory' => './',
-                'startCommand' => 'bash helpers/server.sh',
-            ],
-        ]
-    ],
-];

app/config/function-templates.php

@@ -1,8 +1,39 @@
 <?php
 
-use Utopia\Config\Config;
-
-$templateRuntimes = Config::getParam('template-runtimes');
+const TEMPLATE_RUNTIMES = [
+    'NODE' => [
+        'name' => 'node',
+        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
+    ],
+    'PYTHON' => [
+        'name' => 'python',
+        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
+    ],
+    'DART' => [
+        'name' => 'dart',
+        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
+    ],
+    'GO' => [
+        'name' => 'go',
+        'versions' => ['1.23']
+    ],
+    'PHP' => [
+        'name' => 'php',
+        'versions' => ['8.3', '8.2', '8.1', '8.0']
+    ],
+    'DENO' => [
+        'name' => 'deno',
+        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
+    ],
+    'BUN' => [
+        'name' => 'bun',
+        'versions' => ['1.1', '1.0']
+    ],
+    'RUBY' => [
+        'name' => 'ruby',
+        'versions' => ['3.3', '3.2', '3.1', '3.0']
+    ],
+];
 
 function getRuntimes($runtime, $commands, $entrypoint, $providerRootDirectory, $versionsDenyList = [])
 {
@@ -23,7 +54,6 @@ return [
         'icon' => 'icon-lightning-bolt',
         'id' => 'starter',
         'name' => 'Starter function',
-        'score' => 5,
         'tagline' =>
             'A simple function to get started. Edit this function to explore endless possibilities with Appwrite Functions.',
         'permissions' => ['any'],
@@ -32,24 +62,24 @@ return [
         'timeout' => 15,
         'useCases' => ['starter'],
         'runtimes' => [
-            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/starter'),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/starter'
             ),
-            ...getRuntimes($templateRuntimes['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
-            ...getRuntimes($templateRuntimes['GO'], '', 'main.go', 'go/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['GO'], '', 'main.go', 'go/starter'),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/starter'
             ),
-            ...getRuntimes($templateRuntimes['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
-            ...getRuntimes($templateRuntimes['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
-            ...getRuntimes($templateRuntimes['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
         ],
         'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.',
         'vcsProvider' => 'github',
@@ -63,7 +93,6 @@ return [
         'icon' => 'icon-upstash',
         'id' => 'query-upstash-vector',
         'name' => 'Query Upstash Vector',
-        'score' => 4,
         'tagline' => 'Vector database that stores text embeddings and context retrieval for LLMs',
         'permissions' => ['any'],
         'events' => [],
@@ -72,7 +101,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-upstash-vector'
@@ -108,7 +137,6 @@ return [
         'icon' => 'icon-redis',
         'id' => 'query-redis-labs',
         'name' => 'Query Redis Labs',
-        'score' => 4,
         'tagline' => 'Key-value database with advanced caching capabilities.',
         'permissions' => ['any'],
         'events' => [],
@@ -117,7 +145,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-redis-labs'
@@ -152,7 +180,6 @@ return [
         'icon' => 'icon-neo4j',
         'id' => 'query-neo4j-auradb',
         'name' => 'Query Neo4j AuraDB',
-        'score' => 4,
         'tagline' => 'Graph database with focus on relations between data.',
         'permissions' => ['any'],
         'events' => [],
@@ -161,7 +188,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-neo4j-auradb'
@@ -204,7 +231,6 @@ return [
         'icon' => 'icon-mongodb',
         'id' => 'query-mongo-atlas',
         'name' => 'Query MongoDB Atlas',
-        'score' => 4,
         'tagline' =>
             'Realtime NoSQL document database with geospecial, graph, search, and vector suport.',
         'permissions' => ['any'],
@@ -214,7 +240,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-mongo-atlas'
@@ -242,7 +268,6 @@ return [
         'icon' => 'icon-neon',
         'id' => 'query-neon-postgres',
         'name' => 'Query Neon Postgres',
-        'score' => 4,
         'tagline' =>
             'Reliable SQL database with replication, point-in-time recovery, and pgvector support.',
         'permissions' => ['any'],
@@ -252,7 +277,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-neon-postgres'
@@ -311,7 +336,6 @@ return [
         'icon' => 'icon-open-ai',
         'id' => 'prompt-chatgpt',
         'name' => 'Prompt ChatGPT',
-        'score' => 7,
         'tagline' => 'Ask questions and let OpenAI GPT-3.5-turbo answer.',
         'permissions' => ['any'],
         'events' => [],
@@ -320,25 +344,25 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/prompt-chatgpt'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/prompt_chatgpt'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/prompt-chatgpt'
             ),
             ...getRuntimes(
-                $templateRuntimes['DART'],
+                TEMPLATE_RUNTIMES['DART'],
                 'dart pub get',
                 'lib/main.dart',
                 'dart/prompt_chatgpt'
@@ -373,7 +397,6 @@ return [
         'icon' => 'icon-discord',
         'id' => 'discord-command-bot',
         'name' => 'Discord Command Bot',
-        'score' => 6,
         'tagline' => 'Simple command using Discord Interactions.',
         'permissions' => ['any'],
         'events' => [],
@@ -382,19 +405,19 @@ return [
         'useCases' => ['messaging'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/discord-command-bot'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt && python src/setup.py',
                 'src/main.py',
                 'python/discord_command_bot'
             ),
             ...getRuntimes(
-                $templateRuntimes['GO'],
+                TEMPLATE_RUNTIMES['GO'],
                 '',
                 'main.go',
                 'go/discord-command-bot'
@@ -437,7 +460,6 @@ return [
         'icon' => 'icon-perspective-api',
         'id' => 'analyze-with-perspectiveapi',
         'name' => 'Analyze with PerspectiveAPI',
-        'score' => 5,
         'tagline' => 'Automate moderation by getting toxicity of messages.',
         'permissions' => ['any'],
         'events' => [],
@@ -446,7 +468,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/analyze-with-perspectiveapi'
@@ -473,7 +495,6 @@ return [
         'icon' => 'icon-pangea',
         'id' => 'censor-with-redact',
         'name' => 'Censor with Redact',
-        'score' => 5,
         'tagline' =>
             'Censor sensitive information from a provided text string using Redact API by Pangea.',
         'permissions' => ['any'],
@@ -483,19 +504,19 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/censor-with-redact'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/censor_with_redact'
             ),
             ...getRuntimes(
-                $templateRuntimes['DART'],
+                TEMPLATE_RUNTIMES['DART'],
                 'dart pub get',
                 'lib/main.dart',
                 'dart/censor_with_redact'
@@ -522,7 +543,6 @@ return [
         'icon' => 'icon-document',
         'id' => 'generate-pdf',
         'name' => 'Generate PDF',
-        'score' => 7,
         'tagline' => 'Document containing sample invoice in PDF format.',
         'permissions' => ['any'],
         'events' => [],
@@ -530,7 +550,7 @@ return [
         'timeout' => 15,
         'useCases' => ['utilities'],
         'runtimes' => [
-            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
+            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
         ],
         'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/generate-pdf">file</a>.',
         'vcsProvider' => 'github',
@@ -544,7 +564,6 @@ return [
         'icon' => 'icon-github',
         'id' => 'github-issue-bot',
         'name' => 'GitHub issue bot',
-        'score' => 4,
         'tagline' =>
             'Automate the process of responding to newly opened issues in a GitHub repository.',
         'permissions' => ['any'],
@@ -554,7 +573,7 @@ return [
         'useCases' => ['dev-tools'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/github-issue-bot'
@@ -589,7 +608,6 @@ return [
         'icon' => 'icon-bookmark',
         'id' => 'url-shortener',
         'name' => 'URL shortener',
-        'score' => 3,
         'tagline' => 'Generate URL with short ID and redirect to the original URL when visited.',
         'permissions' => ['any'],
         'events' => [],
@@ -598,7 +616,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/url-shortener'
@@ -641,7 +659,6 @@ return [
         'icon' => 'icon-algolia',
         'id' => 'sync-with-algolia',
         'name' => 'Sync with Algolia',
-        'score' => 4,
         'tagline' => 'Intuitive search bar for any data in Appwrite Databases.',
         'permissions' => ['any'],
         'events' => [],
@@ -650,19 +667,19 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/sync-with-algolia'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/sync_with_algolia'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/sync-with-algolia'
@@ -723,7 +740,6 @@ return [
         'icon' => 'icon-meilisearch',
         'id' => 'sync-with-meilisearch',
         'name' => 'Sync with Meilisearch',
-        'score' => 4,
         'tagline' => 'Intuitive search bar for any data in Appwrite Databases.',
         'permissions' => ['any'],
         'events' => [],
@@ -732,31 +748,31 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['BUN'],
+                TEMPLATE_RUNTIMES['BUN'],
                 'bun install',
                 'src/main.ts',
                 'bun/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['RUBY'],
+                TEMPLATE_RUNTIMES['RUBY'],
                 'bundle install',
                 'lib/main.rb',
                 'ruby/sync-with-meilisearch'
@@ -817,7 +833,6 @@ return [
         'icon' => 'icon-vonage',
         'id' => 'whatsapp-with-vonage',
         'name' => 'WhatsApp with Vonage',
-        'score' => 6,
         'tagline' => 'Simple bot to answer WhatsApp messages.',
         'permissions' => ['any'],
         'events' => [],
@@ -826,37 +841,37 @@ return [
         'useCases' => ['messaging'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/whatsapp_with_vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['DART'],
+                TEMPLATE_RUNTIMES['DART'],
                 'dart pub get',
                 'lib/main.dart',
                 'dart/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['BUN'],
+                TEMPLATE_RUNTIMES['BUN'],
                 'bun install',
                 'src/main.ts',
                 'bun/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['RUBY'],
+                TEMPLATE_RUNTIMES['RUBY'],
                 'bundle install',
                 'lib/main.rb',
                 'ruby/whatsapp-with-vonage'
@@ -904,7 +919,6 @@ return [
         'icon' => 'icon-bell',
         'id' => 'push-notification-with-fcm',
         'name' => 'Push notification with FCM',
-        'score' => 4,
         'tagline' => 'Send push notifications to your users using Firebase Cloud Messaging (FCM).',
         'permissions' => ['any'],
         'events' => [],
@@ -913,7 +927,7 @@ return [
         'useCases' => ['messaging'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/push-notification-with-fcm'
@@ -961,7 +975,6 @@ return [
         'icon' => 'icon-mail',
         'id' => 'email-contact-form',
         'name' => 'Email contact form',
-        'score' => 7,
         'tagline' => 'Sends an email with the contents of a HTML form.',
         'permissions' => ['any'],
         'events' => [],
@@ -970,19 +983,19 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/email-contact-form'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/email_contact_form'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/email-contact-form'
@@ -1045,7 +1058,6 @@ return [
         'icon' => 'icon-stripe',
         'id' => 'subscriptions-with-stripe',
         'name' => 'Subscriptions with Stripe',
-        'score' => 6,
         'tagline' => 'Receive recurring card payments and grant subscribers extra permissions.',
         'permissions' => ['any'],
         'events' => [],
@@ -1054,7 +1066,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/subscriptions-with-stripe'
@@ -1087,7 +1099,6 @@ return [
         'icon' => 'icon-stripe',
         'id' => 'payments-with-stripe',
         'name' => 'Payments with Stripe',
-        'score' => 8,
         'tagline' => 'Receive card payments and store paid orders.',
         'permissions' => ['any'],
         'events' => [],
@@ -1096,7 +1107,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/payments-with-stripe'
@@ -1145,7 +1156,6 @@ return [
         'icon' => 'icon-chat',
         'id' => 'text-generation-with-huggingface',
         'name' => 'Text generation',
-        'score' => 5,
         'tagline' => 'Generate text using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => [],
@@ -1154,7 +1164,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/text-generation-with-huggingface'
@@ -1180,7 +1190,6 @@ return [
         'icon' => 'icon-translate',
         'id' => 'language-translation-with-huggingface',
         'name' => 'Language translation',
-        'score' => 5,
         'tagline' => 'Translate text using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => [],
@@ -1189,7 +1198,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/language-translation-with-huggingface'
@@ -1215,7 +1224,6 @@ return [
         'icon' => 'icon-eye',
         'id' => 'image-classification-with-huggingface',
         'name' => 'Image classification',
-        'score' => 5,
         'tagline' => 'Classify images using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => ['buckets.*.files.*.create'],
@@ -1224,7 +1232,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/image-classification-with-huggingface'
@@ -1274,7 +1282,6 @@ return [
         'icon' => 'icon-eye',
         'id' => 'object-detection-with-huggingface',
         'name' => 'Object detection',
-        'score' => 5,
         'tagline' => 'Detect objects in images using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => ['buckets.*.files.*.create'],
@@ -1283,7 +1290,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/object-detection-with-huggingface'
@@ -1333,7 +1340,6 @@ return [
         'icon' => 'icon-text',
         'id' => 'speech-recognition-with-huggingface',
         'name' => 'Speech recognition',
-        'score' => 5,
         'tagline' => 'Transcribe audio to text using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => ['buckets.*.files.*.create'],
@@ -1342,7 +1348,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/speech-recognition-with-huggingface'
@@ -1392,7 +1398,6 @@ return [
         'icon' => 'icon-chat',
         'id' => 'text-to-speech-with-huggingface',
         'name' => 'Text to speech',
-        'score' => 5,
         'tagline' => 'Convert text to speech using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => ['databases.*.collections.*.documents.*.create'],
@@ -1401,7 +1406,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/text-to-speech-with-huggingface'
@@ -1451,7 +1456,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'generate-with-replicate',
         'name' => 'Generate with Replicate',
-        'score' => 5,
         'tagline' => "Generate text, audio and images using Replicate's API.",
         'permissions' => ['any'],
         'events' => [],
@@ -1460,7 +1464,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-replicate'
@@ -1487,7 +1491,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'generate-with-together-ai',
         'name' => 'Generate with Together AI',
-        'score' => 5,
         'tagline' => "Generate text and images using Together AI's API.",
         'permissions' => ['any'],
         'events' => [],
@@ -1496,7 +1499,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-together-ai'
@@ -1530,7 +1533,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'chat-with-perplexity-ai',
         'name' => 'Chat with Perplexity AI',
-        'score' => 5,
         'tagline' => 'Create a chatbot using the Perplexity AI API.',
         'permissions' => ['any'],
         'events' => [],
@@ -1539,7 +1541,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/chat-with-perplexity-ai'
@@ -1572,7 +1574,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'generate-with-replicate',
         'name' => 'Generate with Replicate',
-        'score' => 5,
         'tagline' => "Generate text, audio and images using Replicate's API.",
         'permissions' => ['any'],
         'events' => [],
@@ -1581,7 +1582,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-replicate'
@@ -1608,7 +1609,6 @@ return [
         'icon' => 'icon-document-search',
         'id' => 'sync-with-pinecone',
         'name' => 'Sync with Pinecone',
-        'score' => 4,
         'tagline' => "Sync your Appwrite database with Pinecone's vector database.",
         'permissions' => ['any'],
         'events' => [],
@@ -1617,7 +1617,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/sync-with-pinecone'
@@ -1672,7 +1672,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'rag-with-langchain',
         'name' => 'RAG with LangChain',
-        'score' => 6,
         'tagline' => 'Generate text using a LangChain RAG model',
         'permissions' => ['any'],
         'events' => [],
@@ -1681,7 +1680,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/rag-with-langchain'
@@ -1736,7 +1735,6 @@ return [
         'icon' => 'icon-chat',
         'id' => 'speak-with-elevenlabs',
         'name' => 'Speak with ElevenLabs',
-        'score' => 5,
         'tagline' => 'Convert text to speech using the ElevenLabs API.',
         'permissions' => ['any'],
         'cron' => '',
@@ -1745,7 +1743,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/speak-with-elevenlabs'
@@ -1792,7 +1790,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'speak-with-lmnt',
         'name' => 'Speak with LMNT',
-        'score' => 5,
         'tagline' => 'Convert text to speech using the LMNT API.',
         'permissions' => ['any'],
         'cron' => '',
@@ -1801,7 +1798,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/speak-with-lmnt'
@@ -1834,7 +1831,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'chat-with-anyscale',
         'name' => 'Chat with AnyScale',
-        'score' => 5,
         'tagline' => 'Create a chatbot using the AnyScale API.',
         'permissions' => ['any'],
         'cron' => '',
@@ -1843,7 +1839,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/chat-with-anyscale'
@@ -1876,7 +1872,6 @@ return [
         'icon' => 'icon-music-note',
         'id' => 'music-generation-with-huggingface',
         'name' => 'Music generation',
-        'score' => 4,
         'tagline' => 'Generate music from a text prompt using the Hugging Face inference API.',
         'permissions' => ['any'],
         'events' => [],
@@ -1885,7 +1880,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/music-generation-with-huggingface'
@@ -1919,7 +1914,6 @@ return [
         'icon' => 'icon-chip',
         'id' => 'generate-with-fal-ai',
         'name' => 'Generate with fal.ai',
-        'score' => 5,
         'tagline' => "Generate images using fal.ai's API.",
         'permissions' => ['any'],
         'events' => [],
@@ -1928,7 +1922,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-fal-ai'
@@ -1955,7 +1949,6 @@ return [
         'icon' => 'icon-currency-dollar',
         'id' => 'subscriptions-with-lemon-squeezy',
         'name' => 'Subscriptions with Lemon Squeezy',
-        'score' => 6,
         'tagline' => 'Receive recurring card payments and grant subscribers extra permissions.',
         'permissions' => ['any'],
         'events' => [],
@@ -1964,7 +1957,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/subscriptions-with-lemon-squeezy'
@@ -2011,7 +2004,6 @@ return [
         'icon' => 'icon-currency-dollar',
         'id' => 'payments-with-lemon-squeezy',
         'name' => 'Payments with Lemon Squeezy',
-        'score' => 6,
         'tagline' => 'Receive card payments and store paid orders.',
         'permissions' => ['any'],
         'events' => [],
@@ -2020,7 +2012,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/payments-with-lemon-squeezy'

app/config/locale/continents.php

@@ -1,46 +1,11 @@
 <?php
 
-/**
- * Continent codes with names and approximate central coordinates
- *
- * Coordinates represent approximate geographical centers of each continent
- * Note: These are simplified centroids and may not represent the exact geographical center
- */
-
 return [
-    'AF' => [
-        'name' => 'Africa',
-        'latitude' => 8.7832,
-        'longitude' => 34.5085
-    ],
-    'AN' => [
-        'name' => 'Antarctica',
-        'latitude' => -82.8628,
-        'longitude' => 135.0000
-    ],
-    'AS' => [
-        'name' => 'Asia',
-        'latitude' => 34.0479,
-        'longitude' => 100.6197
-    ],
-    'EU' => [
-        'name' => 'Europe',
-        'latitude' => 54.5260,
-        'longitude' => 15.2551
-    ],
-    'NA' => [
-        'name' => 'North America',
-        'latitude' => 54.5260,
-        'longitude' => -105.2551
-    ],
-    'OC' => [
-        'name' => 'Oceania',
-        'latitude' => -22.7359,
-        'longitude' => 140.0188
-    ],
-    'SA' => [
-        'name' => 'South America',
-        'latitude' => -8.7832,
-        'longitude' => -55.4915
-    ],
+    'AF',
+    'AN',
+    'AS',
+    'EU',
+    'NA',
+    'OC',
+    'SA',
 ];

app/config/locale/countries.php

@@ -1,210 +1,209 @@
 <?php
 
 /**
- * ISO 3166 standard country codes with country names and coordinates
+ * ISO 3166 standard country codes
  * https://www.iso.org/iso-3166-country-codes.html
  *
  * Source:
  * https://www.iso.org/obp/ui/#search/code/
- * Coordinates source: Natural Earth Data (approximate country centroids)
  */
 
 return [
-    'AF' => ['name' => 'Afghanistan', 'latitude' => 33.0, 'longitude' => 66.0],
-    'AO' => ['name' => 'Angola', 'latitude' => -12.5, 'longitude' => 18.5],
-    'AL' => ['name' => 'Albania', 'latitude' => 41.0, 'longitude' => 20.0],
-    'AD' => ['name' => 'Andorra', 'latitude' => 42.5, 'longitude' => 1.6],
-    'AE' => ['name' => 'United Arab Emirates', 'latitude' => 24.0, 'longitude' => 54.0],
-    'AR' => ['name' => 'Argentina', 'latitude' => -34.0, 'longitude' => -64.0],
-    'AM' => ['name' => 'Armenia', 'latitude' => 40.0, 'longitude' => 45.0],
-    'AG' => ['name' => 'Antigua and Barbuda', 'latitude' => 17.05, 'longitude' => -61.8],
-    'AU' => ['name' => 'Australia', 'latitude' => -25.0, 'longitude' => 135.0],
-    'AT' => ['name' => 'Austria', 'latitude' => 47.3, 'longitude' => 13.3],
-    'AZ' => ['name' => 'Azerbaijan', 'latitude' => 40.5, 'longitude' => 47.5],
-    'BI' => ['name' => 'Burundi', 'latitude' => -3.5, 'longitude' => 30.0],
-    'BE' => ['name' => 'Belgium', 'latitude' => 50.8, 'longitude' => 4.0],
-    'BJ' => ['name' => 'Benin', 'latitude' => 9.5, 'longitude' => 2.25],
-    'BF' => ['name' => 'Burkina Faso', 'latitude' => 13.0, 'longitude' => -2.0],
-    'BD' => ['name' => 'Bangladesh', 'latitude' => 24.0, 'longitude' => 90.0],
-    'BG' => ['name' => 'Bulgaria', 'latitude' => 43.0, 'longitude' => 25.0],
-    'BH' => ['name' => 'Bahrain', 'latitude' => 26.0, 'longitude' => 50.5],
-    'BS' => ['name' => 'Bahamas', 'latitude' => 24.25, 'longitude' => -76.0],
-    'BA' => ['name' => 'Bosnia and Herzegovina', 'latitude' => 44.0, 'longitude' => 18.0],
-    'BY' => ['name' => 'Belarus', 'latitude' => 53.0, 'longitude' => 28.0],
-    'BZ' => ['name' => 'Belize', 'latitude' => 17.25, 'longitude' => -88.75],
-    'BO' => ['name' => 'Bolivia', 'latitude' => -17.0, 'longitude' => -65.0],
-    'BR' => ['name' => 'Brazil', 'latitude' => -10.0, 'longitude' => -55.0],
-    'BB' => ['name' => 'Barbados', 'latitude' => 13.17, 'longitude' => -59.53],
-    'BN' => ['name' => 'Brunei', 'latitude' => 4.5, 'longitude' => 114.67],
-    'BT' => ['name' => 'Bhutan', 'latitude' => 27.5, 'longitude' => 90.5],
-    'BW' => ['name' => 'Botswana', 'latitude' => -22.0, 'longitude' => 24.0],
-    'CF' => ['name' => 'Central African Republic', 'latitude' => 7.0, 'longitude' => 21.0],
-    'CA' => ['name' => 'Canada', 'latitude' => 60.0, 'longitude' => -95.0],
-    'CH' => ['name' => 'Switzerland', 'latitude' => 47.0, 'longitude' => 8.0],
-    'CL' => ['name' => 'Chile', 'latitude' => -30.0, 'longitude' => -71.0],
-    'CN' => ['name' => 'China', 'latitude' => 35.0, 'longitude' => 105.0],
-    'CI' => ['name' => 'Côte d\'Ivoire', 'latitude' => 8.0, 'longitude' => -5.0],
-    'CM' => ['name' => 'Cameroon', 'latitude' => 6.0, 'longitude' => 12.0],
-    'CD' => ['name' => 'Democratic Republic of the Congo', 'latitude' => -2.5, 'longitude' => 23.5],
-    'CG' => ['name' => 'Republic of the Congo', 'latitude' => -1.0, 'longitude' => 15.0],
-    'CO' => ['name' => 'Colombia', 'latitude' => 4.0, 'longitude' => -72.0],
-    'KM' => ['name' => 'Comoros', 'latitude' => -12.17, 'longitude' => 44.25],
-    'CV' => ['name' => 'Cape Verde', 'latitude' => 16.0, 'longitude' => -24.0],
-    'CR' => ['name' => 'Costa Rica', 'latitude' => 10.0, 'longitude' => -84.0],
-    'CU' => ['name' => 'Cuba', 'latitude' => 21.5, 'longitude' => -80.0],
-    'CY' => ['name' => 'Cyprus', 'latitude' => 35.0, 'longitude' => 33.0],
-    'CZ' => ['name' => 'Czech Republic', 'latitude' => 49.75, 'longitude' => 15.5],
-    'DE' => ['name' => 'Germany', 'latitude' => 51.0, 'longitude' => 9.0],
-    'DJ' => ['name' => 'Djibouti', 'latitude' => 11.5, 'longitude' => 43.0],
-    'DM' => ['name' => 'Dominica', 'latitude' => 15.42, 'longitude' => -61.33],
-    'DK' => ['name' => 'Denmark', 'latitude' => 56.0, 'longitude' => 10.0],
-    'DO' => ['name' => 'Dominican Republic', 'latitude' => 19.0, 'longitude' => -70.67],
-    'DZ' => ['name' => 'Algeria', 'latitude' => 28.0, 'longitude' => 3.0],
-    'EC' => ['name' => 'Ecuador', 'latitude' => -2.0, 'longitude' => -77.5],
-    'EG' => ['name' => 'Egypt', 'latitude' => 27.0, 'longitude' => 30.0],
-    'ER' => ['name' => 'Eritrea', 'latitude' => 15.0, 'longitude' => 39.0],
-    'ES' => ['name' => 'Spain', 'latitude' => 40.0, 'longitude' => -4.0],
-    'EE' => ['name' => 'Estonia', 'latitude' => 59.0, 'longitude' => 26.0],
-    'ET' => ['name' => 'Ethiopia', 'latitude' => 8.0, 'longitude' => 38.0],
-    'FI' => ['name' => 'Finland', 'latitude' => 64.0, 'longitude' => 26.0],
-    'FJ' => ['name' => 'Fiji', 'latitude' => -18.0, 'longitude' => 175.0],
-    'FR' => ['name' => 'France', 'latitude' => 46.0, 'longitude' => 2.0],
-    'FM' => ['name' => 'Micronesia', 'latitude' => 6.92, 'longitude' => 158.25],
-    'GA' => ['name' => 'Gabon', 'latitude' => -1.0, 'longitude' => 11.75],
-    'GB' => ['name' => 'United Kingdom', 'latitude' => 54.0, 'longitude' => -2.0],
-    'GE' => ['name' => 'Georgia', 'latitude' => 42.0, 'longitude' => 43.5],
-    'GH' => ['name' => 'Ghana', 'latitude' => 8.0, 'longitude' => -2.0],
-    'GN' => ['name' => 'Guinea', 'latitude' => 11.0, 'longitude' => -10.0],
-    'GM' => ['name' => 'Gambia', 'latitude' => 13.47, 'longitude' => -16.57],
-    'GW' => ['name' => 'Guinea-Bissau', 'latitude' => 12.0, 'longitude' => -15.0],
-    'GQ' => ['name' => 'Equatorial Guinea', 'latitude' => 2.0, 'longitude' => 10.0],
-    'GR' => ['name' => 'Greece', 'latitude' => 39.0, 'longitude' => 22.0],
-    'GD' => ['name' => 'Grenada', 'latitude' => 12.12, 'longitude' => -61.67],
-    'GT' => ['name' => 'Guatemala', 'latitude' => 15.5, 'longitude' => -90.25],
-    'GY' => ['name' => 'Guyana', 'latitude' => 5.0, 'longitude' => -59.0],
-    'HK' => ['name' => 'Hong Kong', 'latitude' => 22.25, 'longitude' => 114.17],
-    'HN' => ['name' => 'Honduras', 'latitude' => 15.0, 'longitude' => -86.5],
-    'HR' => ['name' => 'Croatia', 'latitude' => 45.17, 'longitude' => 15.5],
-    'HT' => ['name' => 'Haiti', 'latitude' => 19.0, 'longitude' => -72.42],
-    'HU' => ['name' => 'Hungary', 'latitude' => 47.0, 'longitude' => 20.0],
-    'ID' => ['name' => 'Indonesia', 'latitude' => -5.0, 'longitude' => 120.0],
-    'IN' => ['name' => 'India', 'latitude' => 20.0, 'longitude' => 77.0],
-    'IE' => ['name' => 'Ireland', 'latitude' => 53.0, 'longitude' => -8.0],
-    'IR' => ['name' => 'Iran', 'latitude' => 32.0, 'longitude' => 53.0],
-    'IQ' => ['name' => 'Iraq', 'latitude' => 33.0, 'longitude' => 44.0],
-    'IS' => ['name' => 'Iceland', 'latitude' => 65.0, 'longitude' => -18.0],
-    'IL' => ['name' => 'Israel', 'latitude' => 31.5, 'longitude' => 34.75],
-    'IT' => ['name' => 'Italy', 'latitude' => 42.83, 'longitude' => 12.83],
-    'JM' => ['name' => 'Jamaica', 'latitude' => 18.25, 'longitude' => -77.5],
-    'JO' => ['name' => 'Jordan', 'latitude' => 31.0, 'longitude' => 36.0],
-    'JP' => ['name' => 'Japan', 'latitude' => 36.0, 'longitude' => 138.0],
-    'KZ' => ['name' => 'Kazakhstan', 'latitude' => 48.0, 'longitude' => 68.0],
-    'KE' => ['name' => 'Kenya', 'latitude' => 1.0, 'longitude' => 38.0],
-    'KG' => ['name' => 'Kyrgyzstan', 'latitude' => 41.0, 'longitude' => 75.0],
-    'KH' => ['name' => 'Cambodia', 'latitude' => 13.0, 'longitude' => 105.0],
-    'KI' => ['name' => 'Kiribati', 'latitude' => 1.42, 'longitude' => 173.0],
-    'KN' => ['name' => 'Saint Kitts and Nevis', 'latitude' => 17.33, 'longitude' => -62.75],
-    'KR' => ['name' => 'South Korea', 'latitude' => 37.0, 'longitude' => 127.5],
-    'KW' => ['name' => 'Kuwait', 'latitude' => 29.34, 'longitude' => 47.66],
-    'LA' => ['name' => 'Laos', 'latitude' => 18.0, 'longitude' => 105.0],
-    'LB' => ['name' => 'Lebanon', 'latitude' => 33.83, 'longitude' => 35.83],
-    'LR' => ['name' => 'Liberia', 'latitude' => 6.5, 'longitude' => -9.5],
-    'LY' => ['name' => 'Libya', 'latitude' => 25.0, 'longitude' => 17.0],
-    'LC' => ['name' => 'Saint Lucia', 'latitude' => 13.88, 'longitude' => -61.13],
-    'LI' => ['name' => 'Liechtenstein', 'latitude' => 47.17, 'longitude' => 9.53],
-    'LK' => ['name' => 'Sri Lanka', 'latitude' => 7.0, 'longitude' => 81.0],
-    'LS' => ['name' => 'Lesotho', 'latitude' => -29.5, 'longitude' => 28.5],
-    'LT' => ['name' => 'Lithuania', 'latitude' => 56.0, 'longitude' => 24.0],
-    'LU' => ['name' => 'Luxembourg', 'latitude' => 49.75, 'longitude' => 6.17],
-    'LV' => ['name' => 'latitudevia', 'latitude' => 57.0, 'longitude' => 25.0],
-    'MA' => ['name' => 'Morocco', 'latitude' => 32.0, 'longitude' => -5.0],
-    'MC' => ['name' => 'Monaco', 'latitude' => 43.73, 'longitude' => 7.4],
-    'MD' => ['name' => 'Moldova', 'latitude' => 47.0, 'longitude' => 29.0],
-    'MG' => ['name' => 'Madagascar', 'latitude' => -20.0, 'longitude' => 47.0],
-    'MV' => ['name' => 'Maldives', 'latitude' => 3.25, 'longitude' => 73.0],
-    'MX' => ['name' => 'Mexico', 'latitude' => 23.0, 'longitude' => -102.0],
-    'MH' => ['name' => 'Marshall Islands', 'latitude' => 9.0, 'longitude' => 168.0],
-    'MK' => ['name' => 'North Macedonia', 'latitude' => 41.83, 'longitude' => 22.0],
-    'ML' => ['name' => 'Mali', 'latitude' => 17.0, 'longitude' => -4.0],
-    'MT' => ['name' => 'Malta', 'latitude' => 35.83, 'longitude' => 14.58],
-    'MM' => ['name' => 'Myanmar', 'latitude' => 22.0, 'longitude' => 98.0],
-    'ME' => ['name' => 'Montenegro', 'latitude' => 42.5, 'longitude' => 19.3],
-    'MN' => ['name' => 'Mongolia', 'latitude' => 46.0, 'longitude' => 105.0],
-    'MZ' => ['name' => 'Mozambique', 'latitude' => -18.25, 'longitude' => 35.0],
-    'MR' => ['name' => 'Mauritania', 'latitude' => 20.0, 'longitude' => -12.0],
-    'MU' => ['name' => 'Mauritius', 'latitude' => -20.28, 'longitude' => 57.55],
-    'MW' => ['name' => 'Malawi', 'latitude' => -13.5, 'longitude' => 34.0],
-    'MY' => ['name' => 'Malaysia', 'latitude' => 2.5, 'longitude' => 112.5],
-    'NA' => ['name' => 'Namibia', 'latitude' => -22.0, 'longitude' => 17.0],
-    'NE' => ['name' => 'Niger', 'latitude' => 16.0, 'longitude' => 8.0],
-    'NG' => ['name' => 'Nigeria', 'latitude' => 10.0, 'longitude' => 8.0],
-    'NI' => ['name' => 'Nicaragua', 'latitude' => 13.0, 'longitude' => -85.0],
-    'NL' => ['name' => 'Netherlands', 'latitude' => 52.5, 'longitude' => 5.75],
-    'NO' => ['name' => 'Norway', 'latitude' => 62.0, 'longitude' => 10.0],
-    'NP' => ['name' => 'Nepal', 'latitude' => 28.0, 'longitude' => 84.0],
-    'NR' => ['name' => 'Nauru', 'latitude' => -0.53, 'longitude' => 166.92],
-    'NZ' => ['name' => 'New Zealand', 'latitude' => -41.0, 'longitude' => 174.0],
-    'OM' => ['name' => 'Oman', 'latitude' => 21.0, 'longitude' => 57.0],
-    'PK' => ['name' => 'Pakistan', 'latitude' => 30.0, 'longitude' => 70.0],
-    'PS' => ['name' => 'Palestine', 'latitude' => 31.9, 'longitude' => 35.2],
-    'PA' => ['name' => 'Panama', 'latitude' => 9.0, 'longitude' => -80.0],
-    'PE' => ['name' => 'Peru', 'latitude' => -10.0, 'longitude' => -76.0],
-    'PH' => ['name' => 'Philippines', 'latitude' => 13.0, 'longitude' => 122.0],
-    'PW' => ['name' => 'Palau', 'latitude' => 7.5, 'longitude' => 134.5],
-    'PG' => ['name' => 'Papua New Guinea', 'latitude' => -6.0, 'longitude' => 147.0],
-    'PL' => ['name' => 'Poland', 'latitude' => 52.0, 'longitude' => 20.0],
-    'KP' => ['name' => 'North Korea', 'latitude' => 40.0, 'longitude' => 127.0],
-    'PT' => ['name' => 'Portugal', 'latitude' => 39.5, 'longitude' => -8.0],
-    'PY' => ['name' => 'Paraguay', 'latitude' => -23.0, 'longitude' => -58.0],
-    'QA' => ['name' => 'Qatar', 'latitude' => 25.5, 'longitude' => 51.25],
-    'RO' => ['name' => 'Romania', 'latitude' => 46.0, 'longitude' => 25.0],
-    'RU' => ['name' => 'Russia', 'latitude' => 60.0, 'longitude' => 100.0],
-    'RW' => ['name' => 'Rwanda', 'latitude' => -2.0, 'longitude' => 30.0],
-    'SA' => ['name' => 'Saudi Arabia', 'latitude' => 25.0, 'longitude' => 45.0],
-    'SD' => ['name' => 'Sudan', 'latitude' => 15.0, 'longitude' => 30.0],
-    'SN' => ['name' => 'Senegal', 'latitude' => 14.0, 'longitude' => -14.0],
-    'SG' => ['name' => 'Singapore', 'latitude' => 1.37, 'longitude' => 103.8],
-    'SB' => ['name' => 'Solomon Islands', 'latitude' => -8.0, 'longitude' => 159.0],
-    'SL' => ['name' => 'Sierra Leone', 'latitude' => 8.5, 'longitude' => -11.5],
-    'SV' => ['name' => 'El Salvador', 'latitude' => 13.83, 'longitude' => -88.92],
-    'SM' => ['name' => 'San Marino', 'latitude' => 43.77, 'longitude' => 12.42],
-    'SO' => ['name' => 'Somalia', 'latitude' => 10.0, 'longitude' => 49.0],
-    'RS' => ['name' => 'Serbia', 'latitude' => 44.0, 'longitude' => 21.0],
-    'SS' => ['name' => 'South Sudan', 'latitude' => 8.0, 'longitude' => 30.0],
-    'ST' => ['name' => 'São Tomé and Príncipe', 'latitude' => 1.0, 'longitude' => 7.0],
-    'SR' => ['name' => 'Suriname', 'latitude' => 4.0, 'longitude' => -56.0],
-    'SK' => ['name' => 'Slovakia', 'latitude' => 48.67, 'longitude' => 19.5],
-    'SI' => ['name' => 'Slovenia', 'latitude' => 46.0, 'longitude' => 15.0],
-    'SE' => ['name' => 'Sweden', 'latitude' => 62.0, 'longitude' => 15.0],
-    'SZ' => ['name' => 'Eswatini', 'latitude' => -26.5, 'longitude' => 31.5],
-    'SC' => ['name' => 'Seychelles', 'latitude' => -4.58, 'longitude' => 55.67],
-    'SY' => ['name' => 'Syria', 'latitude' => 35.0, 'longitude' => 38.0],
-    'TD' => ['name' => 'Chad', 'latitude' => 15.0, 'longitude' => 19.0],
-    'TG' => ['name' => 'Togo', 'latitude' => 8.0, 'longitude' => 1.17],
-    'TH' => ['name' => 'Thailand', 'latitude' => 15.0, 'longitude' => 100.0],
-    'TJ' => ['name' => 'Tajikistan', 'latitude' => 39.0, 'longitude' => 71.0],
-    'TM' => ['name' => 'Turkmenistan', 'latitude' => 40.0, 'longitude' => 60.0],
-    'TL' => ['name' => 'Timor-Leste', 'latitude' => -8.83, 'longitude' => 125.92],
-    'TO' => ['name' => 'Tonga', 'latitude' => -20.0, 'longitude' => -175.0],
-    'TT' => ['name' => 'Trinidad and Tobago', 'latitude' => 11.0, 'longitude' => -61.0],
-    'TN' => ['name' => 'Tunisia', 'latitude' => 34.0, 'longitude' => 9.0],
-    'TR' => ['name' => 'Turkey', 'latitude' => 39.0, 'longitude' => 35.0],
-    'TV' => ['name' => 'Tuvalu', 'latitude' => -8.0, 'longitude' => 178.0],
-    'TZ' => ['name' => 'Tanzania', 'latitude' => -6.0, 'longitude' => 35.0],
-    'TW' => ['name' => 'Taiwan', 'latitude' => 23.5, 'longitude' => 121.0],
-    'UG' => ['name' => 'Uganda', 'latitude' => 1.0, 'longitude' => 32.0],
-    'UA' => ['name' => 'Ukraine', 'latitude' => 49.0, 'longitude' => 32.0],
-    'UY' => ['name' => 'Uruguay', 'latitude' => -33.0, 'longitude' => -56.0],
-    'US' => ['name' => 'United States', 'latitude' => 38.0, 'longitude' => -97.0],
-    'UZ' => ['name' => 'Uzbekistan', 'latitude' => 41.0, 'longitude' => 64.0],
-    'VA' => ['name' => 'Vatican City', 'latitude' => 41.9, 'longitude' => 12.45],
-    'VC' => ['name' => 'Saint Vincent and the Grenadines', 'latitude' => 13.25, 'longitude' => -61.2],
-    'VE' => ['name' => 'Venezuela', 'latitude' => 8.0, 'longitude' => -66.0],
-    'VN' => ['name' => 'Vietnam', 'latitude' => 16.0, 'longitude' => 106.0],
-    'VU' => ['name' => 'Vanuatu', 'latitude' => -16.0, 'longitude' => 167.0],
-    'WS' => ['name' => 'Samoa', 'latitude' => -13.58, 'longitude' => -172.33],
-    'YE' => ['name' => 'Yemen', 'latitude' => 15.0, 'longitude' => 48.0],
-    'ZA' => ['name' => 'South Africa', 'latitude' => -29.0, 'longitude' => 24.0],
-    'ZM' => ['name' => 'Zambia', 'latitude' => -15.0, 'longitude' => 30.0],
-    'ZW' => ['name' => 'Zimbabwe', 'latitude' => -20.0, 'longitude' => 30.0],
+    'AF',
+    'AO',
+    'AL',
+    'AD',
+    'AE',
+    'AR',
+    'AM',
+    'AG',
+    'AU',
+    'AT',
+    'AZ',
+    'BI',
+    'BE',
+    'BJ',
+    'BF',
+    'BD',
+    'BG',
+    'BH',
+    'BS',
+    'BA',
+    'BY',
+    'BZ',
+    'BO',
+    'BR',
+    'BB',
+    'BN',
+    'BT',
+    'BW',
+    'CF',
+    'CA',
+    'CH',
+    'CL',
+    'CN',
+    'CI',
+    'CM',
+    'CD',
+    'CG',
+    'CO',
+    'KM',
+    'CV',
+    'CR',
+    'CU',
+    'CY',
+    'CZ',
+    'DE',
+    'DJ',
+    'DM',
+    'DK',
+    'DO',
+    'DZ',
+    'EC',
+    'EG',
+    'ER',
+    'ES',
+    'EE',
+    'ET',
+    'FI',
+    'FJ',
+    'FR',
+    'FM',
+    'GA',
+    'GB',
+    'GE',
+    'GH',
+    'GN',
+    'GM',
+    'GW',
+    'GQ',
+    'GR',
+    'GD',
+    'GT',
+    'GY',
+    'HK',
+    'HN',
+    'HR',
+    'HT',
+    'HU',
+    'ID',
+    'IN',
+    'IE',
+    'IR',
+    'IQ',
+    'IS',
+    'IL',
+    'IT',
+    'JM',
+    'JO',
+    'JP',
+    'KZ',
+    'KE',
+    'KG',
+    'KH',
+    'KI',
+    'KN',
+    'KR',
+    'KW',
+    'LA',
+    'LB',
+    'LR',
+    'LY',
+    'LC',
+    'LI',
+    'LK',
+    'LS',
+    'LT',
+    'LU',
+    'LV',
+    'MA',
+    'MC',
+    'MD',
+    'MG',
+    'MV',
+    'MX',
+    'MH',
+    'MK',
+    'ML',
+    'MT',
+    'MM',
+    'ME',
+    'MN',
+    'MZ',
+    'MR',
+    'MU',
+    'MW',
+    'MY',
+    'NA',
+    'NE',
+    'NG',
+    'NI',
+    'NL',
+    'NO',
+    'NP',
+    'NR',
+    'NZ',
+    'OM',
+    'PK',
+    'PS',
+    'PA',
+    'PE',
+    'PH',
+    'PW',
+    'PG',
+    'PL',
+    'KP',
+    'PT',
+    'PY',
+    'QA',
+    'RO',
+    'RU',
+    'RW',
+    'SA',
+    'SD',
+    'SN',
+    'SG',
+    'SB',
+    'SL',
+    'SV',
+    'SM',
+    'SO',
+    'RS',
+    'SS',
+    'ST',
+    'SR',
+    'SK',
+    'SI',
+    'SE',
+    'SZ',
+    'SC',
+    'SY',
+    'TD',
+    'TG',
+    'TH',
+    'TJ',
+    'TM',
+    'TL',
+    'TO',
+    'TT',
+    'TN',
+    'TR',
+    'TV',
+    'TZ',
+    'TW',
+    'UG',
+    'UA',
+    'UY',
+    'US',
+    'UZ',
+    'VA',
+    'VC',
+    'VE',
+    'VN',
+    'VU',
+    'WS',
+    'YE',
+    'ZA',
+    'ZM',
+    'ZW',
 ];

app/config/locale/templates/email-base-styled.tpl

@@ -79,7 +79,7 @@
         <style>
             a.button {
                 display: inline-block;
-                background: {{accentColor}};
+                background: #fd366e;
                 color: #ffffff;
                 border-radius: 8px;
                 height: 48px;
@@ -88,7 +88,7 @@
                 cursor: pointer;
                 text-align: center;
                 text-decoration: none;
-                border-color: {{accentColor}};
+                border-color: #fd366e;
                 border-style: solid;
                 border-width: 1px;
                 margin-right: 24px;
@@ -126,7 +126,7 @@
                     <td>
                         <img
                             height="32px"
-                            src="{{logoUrl}}"
+                            src="https://cloud.appwrite.io/images/mails/logo.png"
                         />
                     </td>
                 </tr>
@@ -164,7 +164,7 @@
                 <tr>
                     <td style="padding-left: 4px; padding-right: 4px">
                         <a
-                            href="{{twitterUrl}}"
+                            href="https://twitter.com/appwrite"
                             class="social-icon"
                             title="Twitter"
                         >
@@ -173,7 +173,7 @@
                     </td>
                     <td style="padding-left: 4px; padding-right: 4px">
                         <a
-                            href="{{discordUrl}}"
+                            href="https://appwrite.io/discord"
                             class="social-icon"
                         >
                             <img src="https://cloud.appwrite.io/images/mails/discord.png" height="24" width="24" />
@@ -181,7 +181,7 @@
                     </td>
                     <td style="padding-left: 4px; padding-right: 4px">
                         <a
-                            href="{{githubUrl}}"
+                            href="https://github.com/appwrite/appwrite"
                             class="social-icon"
                         >
                             <img src="https://cloud.appwrite.io/images/mails/github.png" height="24" width="24" />
@@ -191,11 +191,11 @@
             </table>
             <table style="width: auto; margin: 0 auto; margin-top: 60px">
                 <tr>
-                    <td><a href="{{termsUrl}}">Terms</a></td>
+                    <td><a href="https://appwrite.io/terms">Terms</a></td>
                     <td style="color: #e8e9f0">
                         <div style="margin: 0 8px">|</div>
                     </td>
-                    <td><a href="{{privacyUrl}}">Privacy</a></td>
+                    <td><a href="https://appwrite.io/privacy">Privacy</a></td>
                 </tr>
             </table>
             <p style="text-align: center" align="center">

app/config/oAuthProviders.php

@@ -11,7 +11,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Amazon',
     ],
     'apple' => [
         'name' => 'Apple',
@@ -22,7 +21,6 @@ return [
         'form' => 'apple.phtml', // Preparation for adding ability to customized OAuth UI forms, currently handled hardcoded.
         'beta' => true,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Apple',
     ],
     'auth0' => [
         'name' => 'Auth0',
@@ -33,7 +31,6 @@ return [
         'form' => 'auth0.phtml',
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Auth0',
     ],
     'authentik' => [
         'name' => 'Authentik',
@@ -44,7 +41,6 @@ return [
         'form' => 'authentik.phtml',
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Authentik',
     ],
     'autodesk' => [
         'name' => 'Autodesk',
@@ -55,7 +51,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Autodesk',
     ],
     'bitbucket' => [
         'name' => 'BitBucket',
@@ -66,7 +61,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Bitbucket',
     ],
     'bitly' => [
         'name' => 'Bitly',
@@ -76,8 +70,7 @@ return [
         'sandbox' => false,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Bitly',
+        'mock' => false
     ],
     'box' => [
         'name' => 'Box',
@@ -87,8 +80,7 @@ return [
         'sandbox' => false,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Box',
+        'mock' => false
     ],
     'dailymotion' => [
         'name' => 'Dailymotion',
@@ -98,8 +90,7 @@ return [
         'sandbox' => false,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Dailymotion',
+        'mock' => false
     ],
     'discord' => [
         'name' => 'Discord',
@@ -110,7 +101,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Discord',
     ],
     'disqus' => [
         'name' => 'Disqus',
@@ -121,7 +111,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Disqus',
     ],
     'dropbox' => [
         'name' => 'Dropbox',
@@ -132,7 +121,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Dropbox',
     ],
     'etsy' => [
         'name' => 'Etsy',
@@ -143,7 +131,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Etsy',
     ],
     'facebook' => [
         'name' => 'Facebook',
@@ -154,18 +141,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Facebook',
-    ],
-    'figma' => [
-        'name' => 'Figma',
-        'developers' => 'https://www.figma.com/developers/api#oauth2',
-        'icon' => 'icon-figma',
-        'enabled' => true,
-        'sandbox' => false,
-        'form' => false,
-        'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Figma',
     ],
     'github' => [
         'name' => 'GitHub',
@@ -176,7 +151,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Github',
     ],
     'gitlab' => [
         'name' => 'GitLab',
@@ -187,7 +161,6 @@ return [
         'form' => 'gitlab.phtml',
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Gitlab',
     ],
     'google' => [
         'name' => 'Google',
@@ -198,7 +171,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Google',
     ],
     'linkedin' => [
         'name' => 'LinkedIn',
@@ -209,7 +181,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Linkedin',
     ],
     'microsoft' => [
         'name' => 'Microsoft',
@@ -220,7 +191,6 @@ return [
         'form' => 'microsoft.phtml',
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Microsoft',
     ],
     'notion' => [
         'name' => 'Notion',
@@ -231,7 +201,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Notion',
     ],
     'oidc' => [
         'name' => 'OpenID Connect',
@@ -242,7 +211,6 @@ return [
         'form' => 'oidc.phtml',
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Oidc',
     ],
     'okta' => [
         'name' => 'Okta',
@@ -253,7 +221,6 @@ return [
         'form' => 'okta.phtml',
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Okta',
     ],
     'paypal' => [
         'name' => 'PayPal',
@@ -263,8 +230,7 @@ return [
         'sandbox' => false,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Paypal',
+        'mock' => false
     ],
     'paypalSandbox' => [
         'name' => 'PayPal Sandbox',
@@ -274,8 +240,7 @@ return [
         'sandbox' => true,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Paypal',
+        'mock' => false
     ],
     'podio' => [
         'name' => 'Podio',
@@ -286,7 +251,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Podio',
     ],
     'salesforce' => [
         'name' => 'Salesforce',
@@ -297,7 +261,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Salesforce',
     ],
     'slack' => [
         'name' => 'Slack',
@@ -308,7 +271,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Slack',
     ],
     'spotify' => [
         'name' => 'Spotify',
@@ -319,7 +281,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Spotify',
     ],
     'stripe' => [
         'name' => 'Stripe',
@@ -329,8 +290,7 @@ return [
         'sandbox' => false,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Stripe',
+        'mock' => false
     ],
     'tradeshift' => [
         'name' => 'Tradeshift',
@@ -341,7 +301,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Tradeshift',
     ],
     'tradeshiftBox' => [
         'name' => 'Tradeshift Sandbox',
@@ -352,7 +311,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Tradeshift',
     ],
     'twitch' => [
         'name' => 'Twitch',
@@ -363,7 +321,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Twitch',
     ],
     'wordpress' => [
         'name' => 'WordPress',
@@ -373,8 +330,7 @@ return [
         'sandbox' => false,
         'form' => false,
         'beta' => false,
-        'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Wordpress',
+        'mock' => false
     ],
     'yahoo' => [
         'name' => 'Yahoo',
@@ -385,7 +341,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Yahoo',
     ],
     'yammer' => [
         'name' => 'Yammer',
@@ -396,7 +351,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Yammer',
     ],
     'yandex' => [
         'name' => 'Yandex',
@@ -407,7 +361,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Yandex',
     ],
     'zoho' => [
         'name' => 'Zoho',
@@ -418,7 +371,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Zoho',
     ],
     'zoom' => [
         'name' => 'Zoom',
@@ -429,7 +381,6 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => false,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Zoom',
     ],
     // 'instagram' => [
     //     'name' => 'Instagram',
@@ -438,7 +389,6 @@ return [
     //     'enabled' => false,
     //     'beta' => false,
     //     'mock' => false,
-    //     'class' => 'Appwrite\\Auth\\OAuth2\\Instagram',
     // ],
     // 'twitter' => [
     //     'name' => 'twitter',
@@ -447,7 +397,6 @@ return [
     //     'enabled' => false,
     //     'beta' => false,
     //     'mock' => false,
-    //     'class' => 'Appwrite\\Auth\\OAuth2\\Twitter',
     // ],
 
     // Keep Last
@@ -460,6 +409,5 @@ return [
         'form' => false,
         'beta' => false,
         'mock' => true,
-        'class' => 'Appwrite\\Auth\\OAuth2\\Mock',
     ],
 ];

app/config/platforms.php

@@ -11,7 +11,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '18.1.0',
+                'version' => '16.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-web',
                 'package' => 'https://www.npmjs.com/package/appwrite',
                 'enabled' => true,
@@ -59,7 +59,7 @@ return [
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '16.1.0',
+                'version' => '13.1.1',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -77,7 +77,7 @@ return [
             [
                 'key' => 'apple',
                 'name' => 'Apple',
-                'version' => '10.1.0',
+                'version' => '7.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
@@ -112,7 +112,7 @@ return [
             [
                 'key' => 'android',
                 'name' => 'Android',
-                'version' => '8.1.0',
+                'version' => '6.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-android',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                 'enabled' => true,
@@ -134,7 +134,7 @@ return [
             [
                 'key' => 'react-native',
                 'name' => 'React Native',
-                'version' => '0.9.1',
+                'version' => '0.6.0',
                 'url' => 'https://github.com/appwrite/sdk-for-react-native',
                 'package' => 'https://npmjs.com/package/react-native-appwrite',
                 'enabled' => true,
@@ -199,7 +199,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Console',
-                'version' => '1.7.0',
+                'version' => '1.2.1',
                 'url' => 'https://github.com/appwrite/sdk-for-console',
                 'package' => '',
                 'enabled' => true,
@@ -217,7 +217,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '6.2.3',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,
@@ -245,7 +245,7 @@ return [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '17.0.0',
+                'version' => '14.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -263,7 +263,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '15.0.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -281,7 +281,7 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '15.0.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -299,7 +299,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '11.0.0',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -317,7 +317,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '16.0.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -335,7 +335,7 @@ return [
             [
                 'key' => 'go',
                 'name' => 'Go',
-                'version' => '0.8.0',
+                'version' => '0.3.0',
                 'url' => 'https://github.com/appwrite/sdk-for-go',
                 'package' => 'https://github.com/appwrite/sdk-for-go',
                 'enabled' => true,
@@ -353,7 +353,7 @@ return [
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '0.13.0',
+                'version' => '0.11.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => true,
@@ -371,7 +371,7 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '16.0.0',
+                'version' => '12.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
@@ -389,7 +389,7 @@ return [
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '9.0.0',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,
@@ -411,7 +411,7 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '10.0.0',
+                'version' => '6.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,

app/config/regions.php

@@ -3,8 +3,72 @@
 return [
     'default' => [
         '$id' => 'default',
-        'name' => 'default',
+        'name' => 'Frankfurt',
         'disabled' => false,
+        'flag' => 'de',
+        'default' => true,
+    ],
+    'fra' => [
+        '$id' => 'fra',
+        'name' => 'Frankfurt',
+        'disabled' => false,
+        'flag' => 'de',
+        'default' => true,
+    ],
+    'nyc' => [
+        '$id' => 'nyc',
+        'name' => 'New York',
+        'disabled' => true,
+        'flag' => 'us',
+        'default' => true,
+    ],
+    'sfo' => [
+        '$id' => 'sfo',
+        'name' => 'San Francisco',
+        'disabled' => true,
+        'flag' => 'us',
+        'default' => true,
+    ],
+    'blr' => [
+        '$id' => 'blr',
+        'name' => 'Bengaluru',
+        'disabled' => true,
+        'flag' => 'in',
+        'default' => true,
+    ],
+    'lon' => [
+        '$id' => 'lon',
+        'name' => 'London',
+        'disabled' => true,
+        'flag' => 'gb',
+        'default' => true,
+    ],
+    'ams' => [
+        '$id' => 'ams',
+        'name' => 'Amsterdam',
+        'disabled' => true,
+        'flag' => 'nl',
+        'default' => true,
+    ],
+    'sgp' => [
+        '$id' => 'sgp',
+        'name' => 'Singapore',
+        'disabled' => true,
+        'flag' => 'sg',
+        'default' => true,
+    ],
+    'tor' => [
+        '$id' => 'tor',
+        'name' => 'Toronto',
+        'disabled' => true,
+        'flag' => 'ca',
+        'default' => true,
+    ],
+    'syd' => [
+        '$id' => 'syd',
+        'name' => 'Sydney',
+        'disabled' => true,
+        'flag' => 'au',
         'default' => true,
     ],
 ];

app/config/roles.php

@@ -26,7 +26,6 @@ $member = [
     'subscribers.write',
     'subscribers.read',
     'assistant.read',
-    'rules.read'
 ];
 
 $admins = [
@@ -59,10 +58,6 @@ $admins = [
     'health.read',
     'functions.read',
     'functions.write',
-    'sites.read',
-    'sites.write',
-    'log.read',
-    'log.write',
     'execution.read',
     'execution.write',
     'rules.read',
@@ -81,8 +76,6 @@ $admins = [
     'topics.read',
     'subscribers.write',
     'subscribers.read',
-    'tokens.read',
-    'tokens.write',
 ];
 
 return [

app/config/runtimes.php

@@ -6,4 +6,4 @@
 
 use Appwrite\Runtimes\Runtimes;
 
-return (new Runtimes('v5'))->getAll();
+return (new Runtimes('v4'))->getAll();

app/config/runtimes/specifications.php

@@ -1,6 +1,6 @@
 <?php
 
-use Appwrite\Platform\Modules\Compute\Specification;
+use Appwrite\Functions\Specification;
 
 return [
     Specification::S_05VCPU_512MB => [

app/config/scopes.php

@@ -64,18 +64,6 @@ return [ // List of publicly visible scopes
     'functions.write' => [
         'description' => 'Access to create, update, and delete your project\'s functions and code deployments',
     ],
-    'sites.read' => [
-        'description' => 'Access to read your project\'s sites and deployments',
-    ],
-    'sites.write' => [
-        'description' => 'Access to create, update, and delete your project\'s sites and deployments',
-    ],
-    'log.read' => [
-        'description' => 'Access to read your site\'s logs',
-    ],
-    'log.write' => [
-        'description' => 'Access to update, and delete your site\'s logs',
-    ],
     'execution.read' => [
         'description' => 'Access to read your project\'s execution logs',
     ],
@@ -142,10 +130,4 @@ return [ // List of publicly visible scopes
     'assistant.read' => [
         'description' => 'Access to read the Assistant service',
     ],
-    'tokens.read' => [
-        'description' => 'Access to read your project\'s tokens',
-    ],
-    'tokens.write' => [
-        'description' => 'Access to create, update, and delete your project\'s tokens',
-    ],
 ];

app/config/services.php

@@ -65,6 +65,9 @@ return [
         'tests' => false,
         'optional' => true,
         'icon' => '/images/services/databases.png',
+        'globalAttributes' => [
+            'databaseId'
+        ]
     ],
     'locale' => [
         'key' => 'locale',
@@ -170,25 +173,12 @@ return [
         'optional' => false,
         'icon' => '',
     ],
-    'sites' => [
-        'key' => 'sites',
-        'name' => 'Sites',
-        'subtitle' => 'The Sites Service allows you view, create and manage your web applications.',
-        'description' => '/docs/services/sites.md',
-        'controller' => '', // Uses modules
-        'sdk' => true,
-        'docs' => true,
-        'docsUrl' => 'https://appwrite.io/docs/sites',
-        'tests' => false,
-        'optional' => true,
-        'icon' => '/images/services/sites.png',
-    ],
     'functions' => [
         'key' => 'functions',
         'name' => 'Functions',
         'subtitle' => 'The Functions Service allows you view, create and manage your Cloud Functions.',
         'description' => '/docs/services/functions.md',
-        'controller' => '', // Uses modules
+        'controller' => 'api/functions.php',
         'sdk' => true,
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/functions',

app/config/storage/inputs.php

@@ -4,6 +4,7 @@ return [
     // Accepted inputs files
     "jpg" => "image/jpeg",
     "jpeg" => "image/jpeg",
+    "gif" => "image/gif",
     "png" => "image/png",
     "heic" => "image/heic",
     "webp" => "image/webp",

app/config/storage/outputs.php

@@ -4,6 +4,7 @@ return [
     // Accepted outputs files
     "jpg" => "image/jpeg",
     "jpeg" => "image/jpeg",
+    "gif" => "image/gif",
     "png" => "image/png",
     "webp" => "image/webp",
     "heic" => "image/heic",

app/config/template-runtimes.php

@@ -1,43 +0,0 @@
-<?php
-
-// TODO: Remove, replace with runtimes.php directly
-// Used in function templates and site frameworks
-
-return [
-    'NODE' => [
-        'name' => 'node',
-        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
-    ],
-    'PYTHON' => [
-        'name' => 'python',
-        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
-    ],
-    'DART' => [
-        'name' => 'dart',
-        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
-    ],
-    'GO' => [
-        'name' => 'go',
-        'versions' => ['1.23']
-    ],
-    'PHP' => [
-        'name' => 'php',
-        'versions' => ['8.3', '8.2', '8.1', '8.0']
-    ],
-    'DENO' => [
-        'name' => 'deno',
-        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
-    ],
-    'BUN' => [
-        'name' => 'bun',
-        'versions' => ['1.1', '1.0']
-    ],
-    'RUBY' => [
-        'name' => 'ruby',
-        'versions' => ['3.3', '3.2', '3.1', '3.0']
-    ],
-    'FLUTTER' => [
-        'name' => 'flutter',
-        'versions' => ['3.24']
-    ],
-];

app/config/variables.php

@@ -45,16 +45,7 @@ return [
             ],
             [
                 'name' => '_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS',
-                'description' => 'Deprecated since 1.7.0. Allows you to force HTTPS connection to function domains. This feature redirects any HTTP call to HTTPS and adds the \'Strict-Transport-Security\' header to all HTTP responses. By default, set to \'enabled\'. To disable, set to \'disabled\'. This feature will work only when your ports are set to default 80 and 443.',
-                'introduction' => '',
-                'default' => 'disabled',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_OPTIONS_ROUTER_FORCE_HTTPS',
-                'description' => 'Allows you to force HTTPS connection to function and site domains. This feature redirects any HTTP call to HTTPS and adds the \'Strict-Transport-Security\' header to all HTTP responses. By default, set to \'enabled\'. To disable, set to \'disabled\'. This feature will work only when your ports are set to default 80 and 443.',
+                'description' => 'Allows you to force HTTPS connection to function domains. This feature redirects any HTTP call to HTTPS and adds the \'Strict-Transport-Security\' header to all HTTP responses. By default, set to \'enabled\'. To disable, set to \'disabled\'. This feature will work only when your ports are set to default 80 and 443.',
                 'introduction' => '',
                 'default' => 'disabled',
                 'required' => false,
@@ -88,15 +79,6 @@ return [
                 'question' => 'Enter your Appwrite hostname',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_CUSTOM_DOMAIN_DENY_LIST',
-                'description' => 'List of reserved or prohibited domains when configuring custom domains.',
-                'introduction' => '',
-                'default' => 'example.com,test.com,app.example.com',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_DOMAIN_FUNCTIONS',
                 'description' => 'A domain to use for function preview URLs. Setting to empty turns off function preview URLs.',
@@ -106,51 +88,15 @@ return [
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_DOMAIN_SITES',
-                'description' => 'A domain to use for site preview URLs.',
-                'introduction' => '',
-                'default' => 'sites.localhost',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_DOMAIN_TARGET',
-                'description' => 'Deprecated since 1.7.0. A DNS A record hostname to serve as a CNAME target for your Appwrite custom domains. You can use the same value as used for the Appwrite \'_APP_DOMAIN\' variable. The default value is \'localhost\'.',
+                'description' => 'A DNS A record hostname to serve as a CNAME target for your Appwrite custom domains. You can use the same value as used for the Appwrite \'_APP_DOMAIN\' variable. The default value is \'localhost\'.',
                 'introduction' => '',
                 'default' => 'localhost',
                 'required' => true,
                 'question' => 'Enter a DNS A record hostname to serve as a CNAME for your custom domains.' . PHP_EOL . 'You can use the same value as used for the Appwrite hostname.',
                 'filter' => 'domainTarget'
             ],
-            [
-                'name' => '_APP_DOMAIN_TARGET_CNAME',
-                'description' => 'A domain that can be used as DNS CNAME record to point to instance of Appwrite server.',
-                'introduction' => '',
-                'default' => 'localhost',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DOMAIN_TARGET_AAAA',
-                'description' => 'An IPv6 that can be used as DNS AAAA record to point to instance of Appwrite server.',
-                'introduction' => '',
-                'default' => '::1',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_DOMAIN_TARGET_A',
-                'description' => 'An IPV4 that can be used as DNS A record to point to instance of Appwrite server.',
-                'introduction' => '',
-                'default' => '127.0.0.1',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_CONSOLE_WHITELIST_ROOT',
                 'description' => 'This option allows you to disable the creation of new users on the Appwrite console. When enabled only 1 user will be able to use the registration form. New users can be added by inviting them to your project. By default this option is enabled.',
@@ -800,22 +746,13 @@ return [
         'variables' => [
             [
                 'name' => '_APP_FUNCTIONS_SIZE_LIMIT',
-                'description' => 'Deprecated since 1.7.0. The maximum size of a function in bytes. The default value is 30MB.',
+                'description' => 'The maximum size of a function in bytes. The default value is 30MB.',
                 'introduction' => '0.13.0',
                 'default' => '30000000',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_SIZE_LIMIT',
-                'description' => 'The maximum size of a function and site deployments in bytes. The default value is 30MB.',
-                'introduction' => '1.7.0',
-                'default' => '30000000',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_FUNCTIONS_BUILD_SIZE_LIMIT',
                 'description' => 'The maximum size of a built deployment in bytes. The default value is 2,000,000,000 (2GB), and the maximum value is 4,294,967,295 (4.2GB).',
@@ -836,22 +773,13 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_BUILD_TIMEOUT',
-                'description' => 'Deprecated since 1.7.0. The maximum number of seconds allowed as a timeout value when building a new function. The default value is 900 seconds.',
+                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function. The default value is 900 seconds.',
                 'introduction' => '0.13.0',
                 'default' => '900',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_BUILD_TIMEOUT',
-                'description' => 'The maximum number of seconds allowed as a timeout value when building a new function or site. The default value is 900 seconds.',
-                'introduction' => '1.7.0',
-                'default' => '900',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_FUNCTIONS_CONTAINERS',
                 'description' => 'Deprecated since 1.2.0. Runtimes now timeout by inactivity using \'_APP_FUNCTIONS_INACTIVE_THRESHOLD\'.',
@@ -863,40 +791,22 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'Deprecated since 1.7.0. The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty or 0, CPU limit will be disabled',
+                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_CPUS',
-                'description' => 'The maximum number of CPU core a single cloud function or a site is allowed to use. Please note that setting a value higher than available cores might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
-                'introduction' => '1.7.0',
-                'default' => '0',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'Deprecated since 1.7.0. The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty or 0, memory limit will be disabled.',
+                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
                 'introduction' => '0.7.0',
                 'default' => '0',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_MEMORY',
-                'description' => 'The maximum amount of memory a single function or site is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
-                'introduction' => '1.7.0',
-                'default' => '0',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY_SWAP',
                 'description' => 'Deprecated since 1.2.0. High use of swap memory is not recommended to preserve harddrive health.',
@@ -954,22 +864,13 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'Deprecated since 1.7.0. The minimum time a function must be inactive before it can be shut down and cleaned up. This feature is intended to clean up unused containers. Containers may remain active for longer than the interval before being shut down, as Appwrite only cleans up unused containers every hour. If no value is provided, the default is 60 seconds.',
+                'description' => 'The minimum time a function must be inactive before it can be shut down and cleaned up. This feature is intended to clean up unused containers. Containers may remain active for longer than the interval before being shut down, as Appwrite only cleans up unused containers every hour. If no value is provided, the default is 60 seconds.',
                 'introduction' => '0.13.0',
                 'default' => '60',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_INACTIVE_THRESHOLD',
-                'description' => 'The minimum time a function or site must be inactive before it can be shut down and cleaned up. This feature is intended to clean up unused containers. Containers may remain active for longer than the interval before being shut down, as Appwrite only cleans up unused containers every hour. If no value is provided, the default is 60 seconds.',
-                'introduction' => '1.7.0',
-                'default' => '60',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => 'DOCKERHUB_PULL_USERNAME',
                 'description' => 'Deprecated with 1.2.0, use \'_APP_DOCKER_HUB_USERNAME\' instead.',
@@ -1008,22 +909,13 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_RUNTIMES_NETWORK',
-                'description' => 'Deprecated since 1.7.0. The docker network used for communication between the executor and runtimes.',
+                'description' => 'The docker network used for communication between the executor and runtimes.',
                 'introduction' => '1.2.0',
                 'default' => 'runtimes',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_RUNTIMES_NETWORK',
-                'description' => 'The docker network used for communication between the executor and runtimes for sites and functions.',
-                'introduction' => '1.7.0',
-                'default' => 'runtimes',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_DOCKER_HUB_USERNAME',
                 'description' => 'The username for hub.docker.com. This variable is used to pull images from hub.docker.com.',
@@ -1044,7 +936,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_MAINTENANCE_INTERVAL',
-                'description' => 'Deprecated since 1.7.0. Interval value containing the number of seconds that the executor should wait before checking for inactive runtimes. The default value is 3600 seconds (1 hour).',
+                'description' => 'Interval value containing the number of seconds that the executor should wait before checking for inactive runtimes. The default value is 3600 seconds (1 hour).',
                 'introduction' => '1.4.0',
                 'default' => '3600',
                 'required' => false,
@@ -1052,42 +944,8 @@ return [
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_COMPUTE_MAINTENANCE_INTERVAL',
-                'description' => 'Interval value containing the number of seconds that the executor should wait before checking for inactive runtimes of functions and sites. The default value is 3600 seconds (1 hour).',
-                'introduction' => '1.7.0',
-                'default' => '3600',
-                'required' => false,
-                'overwrite' => true,
-                'question' => '',
-                'filter' => ''
-            ],
         ],
     ],
-    [
-        'category' => 'Sites',
-        'description' => '',
-        'variables' => [
-            [
-                'name' => '_APP_SITES_TIMEOUT',
-                'description' => 'The maximum number of seconds allowed as a timeout value when creating a new site. The default value is 900 seconds. This is the global limit, timeout for individual functions are configured in the sites\'s settings or in appwrite.json.',
-                'introduction' => '1.7.0',
-                'default' => '900',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-            [
-                'name' => '_APP_SITES_RUNTIMES',
-                'description' => "This option allows you to enable or disable runtime environments for Sites. Disable unused runtimes to save disk space.\n\nTo enable cloud site runtimes, pass a list of enabled environments separated by a comma.\n\nCurrently, supported environments are: " . \implode(', ', \array_keys(Config::getParam('runtimes'))),
-                'introduction' => '1.7.0',
-                'default' => 'static-1,node-22,flutter-3.29',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
-        ]
-    ],
     [
         'category' => 'VCS (Version Control System)',
         'description' => '',
@@ -1163,22 +1021,13 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_DELAY',
-                'description' => 'Deprecated with 1.6.2 use _APP_MAINTENANCE_START_TIME instead to run the maintenance at a specific time per day.',
+                'description' => 'Delay value containing the number of seconds that the Appwrite maintenance process should wait before executing system cleanups and optimizations. The default value is 0 seconds.',
                 'introduction' => '1.5.0',
                 'default' => '0',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_MAINTENANCE_START_TIME',
-                'description' => 'The time of day (in 24-hour format) when the maintenance process should start. The default value is 00:00.',
-                'introduction' => '1.6.2',
-                'default' => '00:00',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_CACHE',
                 'description' => 'The maximum duration (in seconds) upto which to retain cached files. The default value is 2592000 seconds (30 days).',
@@ -1199,22 +1048,13 @@ return [
             ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
-                'description' => 'The maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
                 'introduction' => '0.7.0',
                 'default' => '1209600',
                 'required' => false,
                 'question' => '',
                 'filter' => ''
             ],
-            [
-                'name' => '_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE',
-                'description' => 'The maximum duration (in seconds) upto which to retain console audit logs. The default value is 15778800 seconds (6 months).',
-                'introduction' => '1.6.2',
-                'default' => '15778800',
-                'required' => false,
-                'question' => '',
-                'filter' => ''
-            ],
             [
                 'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
                 'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',

app/controllers/api/account.php

@@ -43,7 +43,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -156,6 +155,9 @@ function sendSessionAlert(Locale $locale, Document $user, Document $project, Doc
 
 
 $createSession = function (string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Locale $locale, Reader $geodb, Event $queueForEvents, Mail $queueForMails) {
+    $roles = Authorization::getRoles();
+    $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+    $isAppUser = Auth::isAppUser($roles);
 
     /** @var Utopia\Database\Document $user */
     $userFromRequest = Authorization::skip(fn () => $dbForProject->getDocument('users', $userId));
@@ -271,7 +273,7 @@ $createSession = function (string $userId, string $secret, Request $request, Res
         ->setAttribute('current', true)
         ->setAttribute('countryName', $countryName)
         ->setAttribute('expire', $expire)
-        ->setAttribute('secret', Auth::encodeSession($user->getId(), $sessionSecret))
+        ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $sessionSecret) : '')
     ;
 
     $response->dynamic($session, Response::MODEL_SESSION);
@@ -287,7 +289,6 @@ App::post('/v1/account')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'create',
         description: '/docs/references/account/create.md',
         auth: [],
@@ -431,7 +432,6 @@ App::get('/v1/account')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'get',
         description: '/docs/references/account/get.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -461,7 +461,6 @@ App::delete('/v1/account')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'delete',
         description: '/docs/references/account/delete.md',
         auth: [AuthType::ADMIN],
@@ -514,7 +513,6 @@ App::get('/v1/account/sessions')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'listSessions',
         description: '/docs/references/account/list-sessions.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -532,6 +530,9 @@ App::get('/v1/account/sessions')
     ->inject('project')
     ->action(function (Response $response, Document $user, Locale $locale, Document $project) {
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
 
         $sessions = $user->getAttribute('sessions', []);
         $current = Auth::sessionVerify($sessions, Auth::$secret);
@@ -541,7 +542,7 @@ App::get('/v1/account/sessions')
 
             $session->setAttribute('countryName', $countryName);
             $session->setAttribute('current', ($current == $session->getId()) ? true : false);
-            $session->setAttribute('secret', $session->getAttribute('secret', ''));
+            $session->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $session->getAttribute('secret', '') : '');
 
             $sessions[$key] = $session;
         }
@@ -561,7 +562,6 @@ App::delete('/v1/account/sessions')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'deleteSessions',
         description: '/docs/references/account/delete-sessions.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -631,7 +631,6 @@ App::get('/v1/account/sessions/:sessionId')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'getSession',
         description: '/docs/references/account/get-session.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -650,6 +649,10 @@ App::get('/v1/account/sessions/:sessionId')
     ->inject('project')
     ->action(function (?string $sessionId, Response $response, Document $user, Locale $locale, Document $project) {
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
         $sessions = $user->getAttribute('sessions', []);
         $sessionId = ($sessionId === 'current')
             ? Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret)
@@ -662,7 +665,7 @@ App::get('/v1/account/sessions/:sessionId')
                 $session
                     ->setAttribute('current', ($session->getAttribute('secret') == Auth::hash(Auth::$secret)))
                     ->setAttribute('countryName', $countryName)
-                    ->setAttribute('secret', $session->getAttribute('secret', ''))
+                    ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $session->getAttribute('secret', '') : '')
                 ;
 
                 return $response->dynamic($session, Response::MODEL_SESSION);
@@ -681,7 +684,6 @@ App::delete('/v1/account/sessions/:sessionId')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'deleteSession',
         description: '/docs/references/account/delete-session.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -719,7 +721,9 @@ App::delete('/v1/account/sessions/:sessionId')
                 continue;
             }
 
-            $dbForProject->deleteDocument('sessions', $session->getId());
+            $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $session) {
+                return $dbForProject->deleteDocument('sessions', $session->getId());
+            });
 
             unset($sessions[$key]);
 
@@ -768,7 +772,6 @@ App::patch('/v1/account/sessions/:sessionId')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'updateSession',
         description: '/docs/references/account/update-session.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -853,7 +856,6 @@ App::post('/v1/account/sessions/email')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'createEmailPasswordSession',
         description: '/docs/references/account/create-session-email-password.md',
         auth: [],
@@ -895,6 +897,10 @@ App::post('/v1/account/sessions/email')
             throw new Exception(Exception::USER_BLOCKED); // User is in status blocked
         }
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
         $user->setAttributes($profile->getArrayCopy());
 
         $hooks->trigger('passwordValidator', [$dbForProject, $project, $password, &$user, false]);
@@ -960,7 +966,7 @@ App::post('/v1/account/sessions/email')
         $session
             ->setAttribute('current', true)
             ->setAttribute('countryName', $countryName)
-            ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
+            ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '')
         ;
 
         $queueForEvents
@@ -990,7 +996,6 @@ App::post('/v1/account/sessions/anonymous')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'createAnonymousSession',
         description: '/docs/references/account/create-session-anonymous.md',
         auth: [],
@@ -1014,6 +1019,9 @@ App::post('/v1/account/sessions/anonymous')
     ->inject('queueForEvents')
     ->action(function (Request $request, Response $response, Locale $locale, Document $user, Document $project, Database $dbForProject, Reader $geodb, Event $queueForEvents) {
         $protocol = $request->getProtocol();
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
 
         if ('console' === $project->getId()) {
             throw new Exception(Exception::USER_ANONYMOUS_CONSOLE_PROHIBITED, 'Failed to create anonymous user');
@@ -1115,7 +1123,7 @@ App::post('/v1/account/sessions/anonymous')
         $session
             ->setAttribute('current', true)
             ->setAttribute('countryName', $countryName)
-            ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
+            ->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '')
         ;
 
         $response->dynamic($session, Response::MODEL_SESSION);
@@ -1131,7 +1139,6 @@ App::post('/v1/account/sessions/token')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'createSession',
         description: '/docs/references/account/create-session.md',
         auth: [],
@@ -1165,7 +1172,6 @@ App::get('/v1/account/sessions/oauth2/:provider')
     ->label('scope', 'sessions.write')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'createOAuth2Session',
         description: '/docs/references/account/create-session-oauth2.md',
         type: MethodType::WEBAUTH,
@@ -1182,8 +1188,8 @@ App::get('/v1/account/sessions/oauth2/:provider')
     ->label('abuse-limit', 50)
     ->label('abuse-key', 'ip:{ip}')
     ->param('provider', '', new WhiteList(\array_keys(Config::getParam('oAuthProviders')), true), 'OAuth2 Provider. Currently, supported providers are: ' . \implode(', ', \array_keys(\array_filter(Config::getParam('oAuthProviders'), fn ($node) => (!$node['mock'])))) . '.')
-    ->param('success', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), '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, ['clients', 'devKey'])
-    ->param('failure', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), '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, ['clients', 'devKey'])
+    ->param('success', '', fn ($clients) => new Host($clients), '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, ['clients'])
+    ->param('failure', '', fn ($clients) => new Host($clients), '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, ['clients'])
     ->param('scopes', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'A list of custom OAuth2 scopes. Check each provider internal docs for a list of supported scopes. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
     ->inject('request')
     ->inject('response')
@@ -1210,8 +1216,8 @@ App::get('/v1/account/sessions/oauth2/:provider')
             throw new Exception(Exception::PROJECT_PROVIDER_DISABLED, 'This provider is disabled. Please configure the provider app ID and app secret key from your ' . APP_NAME . ' console to continue.');
         }
 
-        $oAuthProviders = Config::getParam('oAuthProviders');
-        $className = $oAuthProviders[$provider]['class'];
+        $className = 'Appwrite\\Auth\\OAuth2\\' . \ucfirst($provider);
+
         if (!\class_exists($className)) {
             throw new Exception(Exception::PROJECT_PROVIDER_UNSUPPORTED);
         }
@@ -1237,7 +1243,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
     });
 
 App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('Get OAuth2 callback')
+    ->desc('OAuth2 callback')
     ->groups(['account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -1267,7 +1273,7 @@ App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     });
 
 App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('Create OAuth2 callback')
+    ->desc('OAuth2 callback')
     ->groups(['account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -1298,7 +1304,7 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     });
 
 App::get('/v1/account/sessions/oauth2/:provider/redirect')
-    ->desc('Get OAuth2 redirect')
+    ->desc('OAuth2 redirect')
     ->groups(['api', 'account', 'session'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -1443,7 +1449,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::notEqual('userInternalId', $user->getInternalId()),
             ]);
             if (!$identityWithMatchingEmail->isEmpty()) {
-                $failureRedirect(Exception::USER_ALREADY_EXISTS);
+                throw new Exception(Exception::USER_ALREADY_EXISTS);
             }
 
             $userWithMatchingEmail = $dbForProject->find('users', [
@@ -1451,7 +1457,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::notEqual('$id', $userId),
             ]);
             if (!empty($userWithMatchingEmail)) {
-                $failureRedirect(Exception::USER_ALREADY_EXISTS);
+                throw new Exception(Exception::USER_ALREADY_EXISTS);
             }
 
             $sessionUpgrade = true;
@@ -1480,7 +1486,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
 
         if ($user === false || $user->isEmpty()) { // No user logged in or with OAuth2 provider ID, create new one or connect with account with same email
             if (empty($email)) {
-                $failureRedirect(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
+                throw new Exception(Exception::USER_UNAUTHORIZED, 'OAuth provider failed to return email.');
             }
 
             /**
@@ -1523,7 +1529,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                     Query::equal('providerEmail', [$email]),
                 ]);
                 if (!$identityWithMatchingEmail->isEmpty()) {
-                    $failureRedirect(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                    throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
                 }
 
                 try {
@@ -1595,7 +1601,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                 Query::notEqual('userInternalId', $user->getInternalId()),
             ]);
             if (!empty($identitiesWithMatchingEmail)) {
-                $failureRedirect(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
+                throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
             }
 
             $dbForProject->createDocument('identities', new Document([
@@ -1763,7 +1769,6 @@ App::get('/v1/account/tokens/oauth2/:provider')
     ->label('scope', 'sessions.write')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'tokens',
         name: 'createOAuth2Token',
         description: '/docs/references/account/create-token-oauth2.md',
         auth: [],
@@ -1779,8 +1784,8 @@ App::get('/v1/account/tokens/oauth2/:provider')
     ->label('abuse-limit', 50)
     ->label('abuse-key', 'ip:{ip}')
     ->param('provider', '', new WhiteList(\array_keys(Config::getParam('oAuthProviders')), true), 'OAuth2 Provider. Currently, supported providers are: ' . \implode(', ', \array_keys(\array_filter(Config::getParam('oAuthProviders'), fn ($node) => (!$node['mock'])))) . '.')
-    ->param('success', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), '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, ['clients', 'devKey'])
-    ->param('failure', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), '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, ['clients', 'devKey'])
+    ->param('success', '', fn ($clients) => new Host($clients), '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, ['clients'])
+    ->param('failure', '', fn ($clients) => new Host($clients), '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, ['clients'])
     ->param('scopes', [], new ArrayList(new Text(APP_LIMIT_ARRAY_ELEMENT_SIZE), APP_LIMIT_ARRAY_PARAMS_SIZE), 'A list of custom OAuth2 scopes. Check each provider internal docs for a list of supported scopes. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long.', true)
     ->inject('request')
     ->inject('response')
@@ -1844,7 +1849,6 @@ App::post('/v1/account/tokens/magic-url')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'tokens',
         name: 'createMagicURLToken',
         description: '/docs/references/account/create-token-magic-url.md',
         auth: [],
@@ -1860,7 +1864,7 @@ App::post('/v1/account/tokens/magic-url')
     ->label('abuse-key', ['url:{url},email:{param-email}', 'url:{url},ip:{ip}'])
     ->param('userId', '', new CustomId(), 'Unique Id. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('email', '', new Email(), 'User email.')
-    ->param('url', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), 'URL to redirect the user back to your app from the magic URL login. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients', 'devKey'])
+    ->param('url', '', fn ($clients) => new Host($clients), 'URL to redirect the user back to your app from the magic URL login. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients'])
     ->param('phrase', false, new Boolean(), 'Toggle for security phrase. If enabled, email will be send with a randomly generated phrase and the phrase will also be included in the response. Confirming phrases match increases the security of your authentication flow.', true)
     ->inject('request')
     ->inject('response')
@@ -1880,6 +1884,9 @@ App::post('/v1/account/tokens/magic-url')
             $phrase = Phrase::generate();
         }
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
 
         $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
         if (!$result->isEmpty()) {
@@ -1999,7 +2006,6 @@ App::post('/v1/account/tokens/magic-url')
 
         $senderEmail = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
         $senderName = System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server');
-
         $replyTo = "";
 
         if ($smtpEnabled) {
@@ -2062,11 +2068,17 @@ App::post('/v1/account/tokens/magic-url')
             ->setRecipient($email)
             ->trigger();
 
+        // Set to unhashed secret for events and server responses
         $token->setAttribute('secret', $tokenSecret);
 
         $queueForEvents
             ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);
 
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $token->setAttribute('secret', '');
+        }
+
         if (!empty($phrase)) {
             $token->setAttribute('phrase', $phrase);
         }
@@ -2086,7 +2098,6 @@ App::post('/v1/account/tokens/email')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'tokens',
         name: 'createEmailToken',
         description: '/docs/references/account/create-token-email.md',
         auth: [],
@@ -2099,7 +2110,7 @@ App::post('/v1/account/tokens/email')
         contentType: ContentType::JSON,
     ))
     ->label('abuse-limit', 10)
-    ->label('abuse-key', ['url:{url},email:{param-email}', 'url:{url},ip:{ip}'])
+    ->label('abuse-key', 'url:{url},email:{param-email}')
     ->param('userId', '', new CustomId(), 'User ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
     ->param('email', '', new Email(), 'User email.')
     ->param('phrase', false, new Boolean(), 'Toggle for security phrase. If enabled, email will be send with a randomly generated phrase and the phrase will also be included in the response. Confirming phrases match increases the security of your authentication flow.', true)
@@ -2120,6 +2131,10 @@ App::post('/v1/account/tokens/email')
             $phrase = Phrase::generate();
         }
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
         $result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
         if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
@@ -2288,11 +2303,17 @@ App::post('/v1/account/tokens/email')
             ->setRecipient($email)
             ->trigger();
 
+        // Set to unhashed secret for events and server responses
         $token->setAttribute('secret', $tokenSecret);
 
         $queueForEvents
             ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);
 
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $token->setAttribute('secret', '');
+        }
+
         if (!empty($phrase)) {
             $token->setAttribute('phrase', $phrase);
         }
@@ -2312,7 +2333,6 @@ App::put('/v1/account/sessions/magic-url')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'updateMagicURLSession',
         description: '/docs/references/account/create-session.md',
         auth: [],
@@ -2350,7 +2370,6 @@ App::put('/v1/account/sessions/phone')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'sessions',
         name: 'updatePhoneSession',
         description: '/docs/references/account/create-session.md',
         auth: [],
@@ -2389,7 +2408,6 @@ App::post('/v1/account/tokens/phone')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'tokens',
         name: 'createPhoneToken',
         description: '/docs/references/account/create-token-phone.md',
         auth: [],
@@ -2421,6 +2439,10 @@ App::post('/v1/account/tokens/phone')
             throw new Exception(Exception::GENERAL_PHONE_DISABLED, 'Phone provider not configured');
         }
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
         $result = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
         if (!$result->isEmpty()) {
             $user->setAttributes($result->getArrayCopy());
@@ -2572,13 +2594,14 @@ App::post('/v1/account/tokens/phone')
             }
         }
 
+        // Set to unhashed secret for events and server responses
         $token->setAttribute('secret', $secret);
 
         $queueForEvents
             ->setPayload($response->output($token, Response::MODEL_TOKEN), sensitive: ['secret']);
 
-        // Encode secret for clients
-        $token->setAttribute('secret', Auth::encodeSession($user->getId(), $secret));
+        // Hide secret for clients
+        $token->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? Auth::encodeSession($user->getId(), $secret) : '');
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -2593,7 +2616,6 @@ App::post('/v1/account/jwts')
     ->label('auth.type', 'jwt')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'tokens',
         name: 'createJWT',
         description: '/docs/references/account/create-jwt.md',
         auth: [],
@@ -2642,7 +2664,6 @@ App::get('/v1/account/prefs')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'getPrefs',
         description: '/docs/references/account/get-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2669,7 +2690,6 @@ App::get('/v1/account/logs')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'logs',
         name: 'listLogs',
         description: '/docs/references/account/list-logs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2746,7 +2766,6 @@ App::patch('/v1/account/name')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'updateName',
         description: '/docs/references/account/update-name.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2768,7 +2787,7 @@ App::patch('/v1/account/name')
 
         $user->setAttribute('name', $name);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -2785,7 +2804,6 @@ App::patch('/v1/account/password')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'updatePassword',
         description: '/docs/references/account/update-password.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2843,7 +2861,7 @@ App::patch('/v1/account/password')
             ->setAttribute('hash', Auth::DEFAULT_ALGO)
             ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -2859,7 +2877,6 @@ App::patch('/v1/account/email')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'updateEmail',
         description: '/docs/references/account/update-email.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -2928,7 +2945,7 @@ App::patch('/v1/account/email')
         }
 
         try {
-            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
             /**
              * @var Document $oldTarget
              */
@@ -2956,7 +2973,6 @@ App::patch('/v1/account/phone')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'updatePhone',
         description: '/docs/references/account/update-phone.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3014,7 +3030,7 @@ App::patch('/v1/account/phone')
         }
 
         try {
-            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+            $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
             /**
              * @var Document $oldTarget
              */
@@ -3042,7 +3058,6 @@ App::patch('/v1/account/prefs')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'updatePrefs',
         description: '/docs/references/account/update-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3064,7 +3079,7 @@ App::patch('/v1/account/prefs')
 
         $user->setAttribute('prefs', $prefs);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
 
         $queueForEvents->setParam('userId', $user->getId());
 
@@ -3080,7 +3095,6 @@ App::patch('/v1/account/status')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'account',
         name: 'updateStatus',
         description: '/docs/references/account/update-status.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3102,7 +3116,7 @@ App::patch('/v1/account/status')
 
         $user->setAttribute('status', false);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
 
         $queueForEvents
             ->setParam('userId', $user->getId())
@@ -3131,7 +3145,6 @@ App::post('/v1/account/recovery')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'recovery',
         name: 'createRecovery',
         description: '/docs/references/account/create-recovery.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3146,7 +3159,7 @@ App::post('/v1/account/recovery')
     ->label('abuse-limit', 10)
     ->label('abuse-key', ['url:{url},email:{param-email}', 'url:{url},ip:{ip}'])
     ->param('email', '', new Email(), 'User email.')
-    ->param('url', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), 'URL to redirect the user back to your app from the recovery email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients', 'devKey'])
+    ->param('url', '', fn ($clients) => new Host($clients), 'URL to redirect the user back to your app from the recovery email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients'])
     ->inject('request')
     ->inject('response')
     ->inject('user')
@@ -3161,6 +3174,11 @@ App::post('/v1/account/recovery')
             throw new Exception(Exception::GENERAL_SMTP_DISABLED, 'SMTP Disabled');
         }
         $url = htmlentities($url);
+
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
         $email = \strtolower($email);
 
         $profile = $dbForProject->findOne('users', [
@@ -3284,13 +3302,19 @@ App::post('/v1/account/recovery')
             ->setSubject($subject)
             ->trigger();
 
+        // Set to unhashed secret for events and server responses
         $recovery->setAttribute('secret', $secret);
 
         $queueForEvents
             ->setParam('userId', $profile->getId())
             ->setParam('tokenId', $recovery->getId())
             ->setUser($profile)
-            ->setPayload(Response::showSensitive(fn () => $response->output($recovery, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload($response->output($recovery, Response::MODEL_TOKEN), sensitive: ['secret']);
+
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $recovery->setAttribute('secret', '');
+        }
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3298,7 +3322,7 @@ App::post('/v1/account/recovery')
     });
 
 App::put('/v1/account/recovery')
-    ->desc('Update password recovery (confirmation)')
+    ->desc('Create password recovery (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'sessions.write')
     ->label('event', 'users.[userId].recovery.[tokenId].update')
@@ -3307,7 +3331,6 @@ App::put('/v1/account/recovery')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'recovery',
         name: 'updateRecovery',
         description: '/docs/references/account/update-recovery.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3384,7 +3407,7 @@ App::put('/v1/account/recovery')
         $queueForEvents
             ->setParam('userId', $profile->getId())
             ->setParam('tokenId', $recoveryDocument->getId())
-            ->setPayload(Response::showSensitive(fn () => $response->output($recoveryDocument, Response::MODEL_TOKEN)), sensitive: ['secret']);
+        ;
 
         $response->dynamic($recoveryDocument, Response::MODEL_TOKEN);
     });
@@ -3398,7 +3421,6 @@ App::post('/v1/account/verification')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'verification',
         name: 'createVerification',
         description: '/docs/references/account/create-email-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3412,7 +3434,7 @@ App::post('/v1/account/verification')
     ))
     ->label('abuse-limit', 10)
     ->label('abuse-key', 'url:{url},userId:{userId}')
-    ->param('url', '', fn ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : new URL(), 'URL to redirect the user back to your app from the verification email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients', 'devKey']) // TODO add built-in confirm page
+    ->param('url', '', fn ($clients) => new Host($clients), 'URL to redirect the user back to your app from the verification email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', false, ['clients']) // TODO add built-in confirm page
     ->inject('request')
     ->inject('response')
     ->inject('project')
@@ -3432,6 +3454,9 @@ App::post('/v1/account/verification')
             throw new Exception(Exception::USER_EMAIL_ALREADY_VERIFIED);
         }
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
         $verificationSecret = Auth::tokenGenerator(Auth::TOKEN_LENGTH_VERIFICATION);
         $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
 
@@ -3540,12 +3565,18 @@ App::post('/v1/account/verification')
             ->setName($user->getAttribute('name') ?? '')
             ->trigger();
 
+        // Set to unhashed secret for events and server responses
         $verification->setAttribute('secret', $verificationSecret);
 
         $queueForEvents
             ->setParam('userId', $user->getId())
             ->setParam('tokenId', $verification->getId())
-            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setPayload($response->output($verification, Response::MODEL_TOKEN), sensitive: ['secret']);
+
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $verification->setAttribute('secret', '');
+        }
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -3553,7 +3584,7 @@ App::post('/v1/account/verification')
     });
 
 App::put('/v1/account/verification')
-    ->desc('Update email verification (confirmation)')
+    ->desc('Create email verification (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].verification.[tokenId].update')
@@ -3561,7 +3592,6 @@ App::put('/v1/account/verification')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'verification',
         name: 'updateVerification',
         description: '/docs/references/account/update-email-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3613,8 +3643,7 @@ App::put('/v1/account/verification')
 
         $queueForEvents
             ->setParam('userId', $userId)
-            ->setParam('tokenId', $verification->getId())
-            ->setPayload(Response::showSensitive(fn () => $response->output($verification, Response::MODEL_TOKEN)), sensitive: ['secret']);
+            ->setParam('tokenId', $verification->getId());
 
         $response->dynamic($verification, Response::MODEL_TOKEN);
     });
@@ -3629,7 +3658,6 @@ App::post('/v1/account/verification/phone')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'verification',
         name: 'createPhoneVerification',
         description: '/docs/references/account/create-phone-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3668,6 +3696,10 @@ App::post('/v1/account/verification/phone')
             throw new Exception(Exception::USER_PHONE_ALREADY_VERIFIED);
         }
 
+        $roles = Authorization::getRoles();
+        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+        $isAppUser = Auth::isAppUser($roles);
+
         $secret = null;
         $sendSMS = true;
         $mockNumbers = $project->getAttribute('auths', [])['mockNumbers'] ?? [];
@@ -3756,6 +3788,7 @@ App::post('/v1/account/verification/phone')
             }
         }
 
+        // Set to unhashed secret for events and server responses
         $verification->setAttribute('secret', $secret);
 
         $queueForEvents
@@ -3763,6 +3796,11 @@ App::post('/v1/account/verification/phone')
             ->setParam('tokenId', $verification->getId())
             ->setPayload($response->output($verification, Response::MODEL_TOKEN), sensitive: ['secret']);
 
+        // Hide secret for clients
+        if (!$isPrivilegedUser && !$isAppUser) {
+            $verification->setAttribute('secret', '');
+        }
+
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($verification, Response::MODEL_TOKEN);
@@ -3777,7 +3815,6 @@ App::put('/v1/account/verification/phone')
     ->label('audits.resource', 'user/{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'verification',
         name: 'updatePhoneVerification',
         description: '/docs/references/account/update-phone-verification.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3843,7 +3880,6 @@ App::patch('/v1/account/mfa')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'updateMFA',
         description: '/docs/references/account/update-mfa.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3866,7 +3902,7 @@ App::patch('/v1/account/mfa')
 
         $user->setAttribute('mfa', $mfa);
 
-        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+        $user = $dbForProject->withRequestTimestamp($requestTimestamp, fn () => $dbForProject->updateDocument('users', $user->getId(), $user));
 
         if ($mfa) {
             $factors = $session->getAttribute('factors', []);
@@ -3897,7 +3933,6 @@ App::get('/v1/account/mfa/factors')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'listMfaFactors',
         description: '/docs/references/account/list-mfa-factors.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -3938,7 +3973,6 @@ App::post('/v1/account/mfa/authenticators/:type')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'createMfaAuthenticator',
         description: '/docs/references/account/create-mfa-authenticator.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4006,7 +4040,7 @@ App::post('/v1/account/mfa/authenticators/:type')
     });
 
 App::put('/v1/account/mfa/authenticators/:type')
-    ->desc('Update authenticator (confirmation)')
+    ->desc('Verify authenticator')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.mfa')
     ->label('scope', 'account')
@@ -4015,7 +4049,6 @@ App::put('/v1/account/mfa/authenticators/:type')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'updateMfaAuthenticator',
         description: '/docs/references/account/update-mfa-authenticator.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4085,7 +4118,6 @@ App::post('/v1/account/mfa/recovery-codes')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'createMfaRecoveryCodes',
         description: '/docs/references/account/create-mfa-recovery-codes.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4123,7 +4155,7 @@ App::post('/v1/account/mfa/recovery-codes')
     });
 
 App::patch('/v1/account/mfa/recovery-codes')
-    ->desc('Update MFA recovery codes (regenerate)')
+    ->desc('Regenerate MFA recovery codes')
     ->groups(['api', 'account', 'mfaProtected'])
     ->label('event', 'users.[userId].update.mfa')
     ->label('scope', 'account')
@@ -4132,7 +4164,6 @@ App::patch('/v1/account/mfa/recovery-codes')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'updateMfaRecoveryCodes',
         description: '/docs/references/account/update-mfa-recovery-codes.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4169,12 +4200,11 @@ App::patch('/v1/account/mfa/recovery-codes')
     });
 
 App::get('/v1/account/mfa/recovery-codes')
-    ->desc('List MFA recovery codes')
+    ->desc('Get MFA recovery codes')
     ->groups(['api', 'account', 'mfaProtected'])
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'getMfaRecoveryCodes',
         description: '/docs/references/account/get-mfa-recovery-codes.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4213,7 +4243,6 @@ App::delete('/v1/account/mfa/authenticators/:type')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'deleteMfaAuthenticator',
         description: '/docs/references/account/delete-mfa-authenticator.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4259,7 +4288,6 @@ App::post('/v1/account/mfa/challenge')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'createMfaChallenge',
         description: '/docs/references/account/create-mfa-challenge.md',
         auth: [],
@@ -4470,7 +4498,7 @@ App::post('/v1/account/mfa/challenge')
     });
 
 App::put('/v1/account/mfa/challenge')
-    ->desc('Update MFA challenge (confirmation)')
+    ->desc('Create MFA challenge (confirmation)')
     ->groups(['api', 'account', 'mfa'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -4479,7 +4507,6 @@ App::put('/v1/account/mfa/challenge')
     ->label('audits.userId', '{response.userId}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'mfa',
         name: 'updateMfaChallenge',
         description: '/docs/references/account/update-mfa-challenge.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4573,7 +4600,6 @@ App::post('/v1/account/targets/push')
     ->label('event', 'users.[userId].targets.[targetId].create')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'pushTargets',
         name: 'createPushTarget',
         description: '/docs/references/account/create-push-target.md',
         auth: [AuthType::SESSION],
@@ -4654,7 +4680,6 @@ App::put('/v1/account/targets/:targetId/push')
     ->label('event', 'users.[userId].targets.[targetId].update')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'pushTargets',
         name: 'updatePushTarget',
         description: '/docs/references/account/update-push-target.md',
         auth: [AuthType::SESSION],
@@ -4719,7 +4744,6 @@ App::delete('/v1/account/targets/:targetId/push')
     ->label('event', 'users.[userId].targets.[targetId].delete')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'pushTargets',
         name: 'deletePushTarget',
         description: '/docs/references/account/delete-push-target.md',
         auth: [AuthType::SESSION],
@@ -4770,7 +4794,6 @@ App::get('/v1/account/identities')
     ->label('scope', 'account')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'identities',
         name: 'listIdentities',
         description: '/docs/references/account/list-identities.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -4822,11 +4845,8 @@ App::get('/v1/account/identities')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForProject->find('identities', $queries);
-        } catch (OrderException $e) {
-            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.");
-        }
+
+        $results = $dbForProject->find('identities', $queries);
         $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
@@ -4845,7 +4865,6 @@ App::delete('/v1/account/identities/:identityId')
     ->label('audits.userId', '{user.$id}')
     ->label('sdk', new Method(
         namespace: 'account',
-        group: 'identities',
         name: 'deleteIdentity',
         description: '/docs/references/account/delete-identity.md',
         auth: [AuthType::SESSION, AuthType::JWT],

app/controllers/api/avatars.php

@@ -171,7 +171,6 @@ App::get('/v1/avatars/credit-cards/:code')
     ->label('cache.resource', 'avatar/credit-card')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getCreditCard',
         description: '/docs/references/avatars/get-credit-card.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -187,7 +186,7 @@ App::get('/v1/avatars/credit-cards/:code')
     ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-credit-cards'))), 'Credit Card Code. Possible values: ' . \implode(', ', \array_keys(Config::getParam('avatar-credit-cards'))) . '.')
     ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('quality', -1, new Range(-1, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
+    ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->inject('response')
     ->action(fn (string $code, int $width, int $height, int $quality, Response $response) =>  $avatarCallback('credit-cards', $code, $width, $height, $quality, $response));
 
@@ -199,7 +198,6 @@ App::get('/v1/avatars/browsers/:code')
     ->label('cache.resource', 'avatar/browser')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getBrowser',
         description: '/docs/references/avatars/get-browser.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -215,7 +213,7 @@ App::get('/v1/avatars/browsers/:code')
     ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-browsers'))), 'Browser Code.')
     ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('quality', -1, new Range(-1, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
+    ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->inject('response')
     ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('browsers', $code, $width, $height, $quality, $response));
 
@@ -227,7 +225,6 @@ App::get('/v1/avatars/flags/:code')
     ->label('cache.resource', 'avatar/flag')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getFlag',
         description: '/docs/references/avatars/get-flag.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -243,7 +240,7 @@ App::get('/v1/avatars/flags/:code')
     ->param('code', '', new WhiteList(\array_keys(Config::getParam('avatar-flags'))), 'Country Code. ISO Alpha-2 country code format.')
     ->param('width', 100, new Range(0, 2000), 'Image width. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
-    ->param('quality', -1, new Range(-1, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
+    ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->inject('response')
     ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('flags', $code, $width, $height, $quality, $response));
 
@@ -255,7 +252,6 @@ App::get('/v1/avatars/image')
     ->label('cache.resource', 'avatar/image')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getImage',
         description: '/docs/references/avatars/get-image.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -326,7 +322,6 @@ App::get('/v1/avatars/favicon')
     ->label('cache.resource', 'avatar/favicon')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getFavicon',
         description: '/docs/references/avatars/get-favicon.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -477,7 +472,6 @@ App::get('/v1/avatars/qr')
     ->label('scope', 'avatars.read')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getQR',
         description: '/docs/references/avatars/get-qr.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -502,7 +496,6 @@ App::get('/v1/avatars/qr')
             'addQuietzone' => true,
             'quietzoneSize' => $margin,
             'outputType' => QRCode::OUTPUT_IMAGICK,
-            'scale' => 15,
         ]);
 
         $qrcode = new QRCode($options);
@@ -517,7 +510,7 @@ App::get('/v1/avatars/qr')
         $response
             ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
             ->setContentType('image/png')
-            ->send($image->output('png', 90));
+            ->send($image->output('png', 9));
     });
 
 App::get('/v1/avatars/initials')
@@ -527,7 +520,6 @@ App::get('/v1/avatars/initials')
     ->label('cache.resource', 'avatar/initials')
     ->label('sdk', new Method(
         namespace: 'avatars',
-        group: null,
         name: 'getInitials',
         description: '/docs/references/avatars/get-initials.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],

app/controllers/api/console.php

@@ -8,9 +8,7 @@ use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Document;
-use Utopia\Domains\Domain;
 use Utopia\System\System;
-use Utopia\Validator\IP;
 use Utopia\Validator\Text;
 
 App::init()
@@ -29,7 +27,6 @@ App::get('/v1/console/variables')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'console',
-        group: 'console',
         name: 'variables',
         description: '/docs/references/console/variables.md',
         auth: [AuthType::ADMIN],
@@ -43,21 +40,10 @@ 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();
-
-        $validator = new IP(IP::V4);
-        $isAValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_A', '')) && ($validator->isValid(System::getEnv('_APP_DOMAIN_TARGET_A')));
-
-        $validator = new IP(IP::V6);
-        $isAAAAValid = !empty(System::getEnv('_APP_DOMAIN_TARGET_AAAA', '')) && $validator->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA'));
-
-        $isDomainEnabled = $isDomainValid && (
-            $isAAAAValid || $isAValid || $isCNAMEValid
-        );
+        $isDomainEnabled = !empty(System::getEnv('_APP_DOMAIN', ''))
+            && !empty(System::getEnv('_APP_DOMAIN_TARGET', ''))
+            && System::getEnv('_APP_DOMAIN', '') !== 'localhost'
+            && System::getEnv('_APP_DOMAIN_TARGET', '') !== 'localhost';
 
         $isVcsEnabled = !empty(System::getEnv('_APP_VCS_GITHUB_APP_NAME', ''))
             && !empty(System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY', ''))
@@ -68,31 +54,24 @@ App::get('/v1/console/variables')
         $isAssistantEnabled = !empty(System::getEnv('_APP_ASSISTANT_OPENAI_API_KEY', ''));
 
         $variables = new Document([
-            '_APP_DOMAIN_TARGET_CNAME' => System::getEnv('_APP_DOMAIN_TARGET_CNAME'),
-            '_APP_DOMAIN_TARGET_AAAA' => System::getEnv('_APP_DOMAIN_TARGET_AAAA'),
-            '_APP_DOMAIN_TARGET_A' => System::getEnv('_APP_DOMAIN_TARGET_A'),
+            '_APP_DOMAIN_TARGET' => System::getEnv('_APP_DOMAIN_TARGET'),
             '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_COMPUTE_SIZE_LIMIT' => +System::getEnv('_APP_COMPUTE_SIZE_LIMIT'),
+            '_APP_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
             '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
             '_APP_VCS_ENABLED' => $isVcsEnabled,
             '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
-            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
-            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
-            '_APP_DOMAIN_FUNCTIONS' => System::getEnv('_APP_DOMAIN_FUNCTIONS'),
-            '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS'),
-            '_APP_DOMAINS_NAMESERVERS' => System::getEnv('_APP_DOMAINS_NAMESERVERS'),
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
         ]);
 
         $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
     });
 
 App::post('/v1/console/assistant')
-    ->desc('Create assistant query')
+    ->desc('Ask query')
     ->groups(['api', 'assistant'])
     ->label('scope', 'assistant.read')
     ->label('sdk', new Method(
         namespace: 'assistant',
-        group: 'console',
         name: 'chat',
         description: '/docs/references/assistant/chat.md',
         auth: [AuthType::ADMIN],

app/controllers/api/graphql.php

@@ -44,7 +44,6 @@ App::get('/v1/graphql')
     ->label('scope', 'graphql')
     ->label('sdk', new Method(
         namespace: 'graphql',
-        group: 'graphql',
         name: 'get',
         auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
         hide: true,
@@ -91,7 +90,6 @@ App::post('/v1/graphql/mutation')
     ->label('scope', 'graphql')
     ->label('sdk', new Method(
         namespace: 'graphql',
-        group: 'graphql',
         name: 'mutation',
         auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
         description: '/docs/references/graphql/post.md',
@@ -142,7 +140,6 @@ App::post('/v1/graphql')
     ->label('scope', 'graphql')
     ->label('sdk', new Method(
         namespace: 'graphql',
-        group: 'graphql',
         name: 'query',
         auth: [AuthType::KEY, AuthType::SESSION, AuthType::JWT],
         description: '/docs/references/graphql/post.md',

app/controllers/api/health.php

@@ -3,16 +3,13 @@
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\PubSub\Adapter\Pool as PubSubPool;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response;
 use Utopia\App;
-use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Document;
 use Utopia\Domains\Validator\PublicDomain;
 use Utopia\Pools\Group;
@@ -35,10 +32,9 @@ App::get('/v1/health')
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
         namespace: 'health',
-        group: 'health',
         name: 'get',
-        description: '/docs/references/health/get.md',
         auth: [AuthType::KEY],
+        description: '/docs/references/health/get.md',
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -73,11 +69,10 @@ App::get('/v1/health/db')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'health',
         name: 'getDB',
         description: '/docs/references/health/get-db.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -89,8 +84,8 @@ App::get('/v1/health/db')
     ->inject('response')
     ->inject('pools')
     ->action(function (Response $response, Group $pools) {
+
         $output = [];
-        $failures = [];
 
         $configs = [
             'Console.DB' => Config::getParam('pools-console'),
@@ -100,7 +95,7 @@ App::get('/v1/health/db')
         foreach ($configs as $key => $config) {
             foreach ($config as $database) {
                 try {
-                    $adapter = new DatabasePool($pools->get($database));
+                    $adapter = $pools->get($database)->pop()->getResource();
 
                     $checkStart = \microtime(true);
 
@@ -111,16 +106,16 @@ App::get('/v1/health/db')
                             'ping' => \round((\microtime(true) - $checkStart) / 1000)
                         ]);
                     } else {
-                        $failures[] = $database;
+                        $failure[] = $database;
                     }
-                } catch (\Throwable) {
-                    $failures[] = $database;
+                } catch (\Throwable $th) {
+                    $failure[] = $database;
                 }
             }
         }
 
-        if (!empty($failures)) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'DB failure on: ' . implode(", ", $failures));
+        if (!empty($failure)) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'DB failure on: ' . implode(", ", $failure));
         }
 
         $response->dynamic(new Document([
@@ -134,11 +129,10 @@ App::get('/v1/health/cache')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'health',
         name: 'getCache',
         description: '/docs/references/health/get-cache.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -150,39 +144,44 @@ App::get('/v1/health/cache')
     ->inject('response')
     ->inject('pools')
     ->action(function (Response $response, Group $pools) {
+
         $output = [];
-        $failures = [];
 
         $configs = [
             'Cache' => Config::getParam('pools-cache'),
         ];
 
         foreach ($configs as $key => $config) {
-            foreach ($config as $cache) {
+            foreach ($config as $database) {
                 try {
-                    $adapter = new CachePool($pools->get($cache));
+                    /** @var \Utopia\Cache\Adapter $adapter */
+                    $adapter = $pools->get($database)->pop()->getResource();
 
                     $checkStart = \microtime(true);
 
                     if ($adapter->ping()) {
                         $output[] = new Document([
-                            'name' => $key . " ($cache)",
+                            'name' => $key . " ($database)",
                             'status' => 'pass',
                             'ping' => \round((\microtime(true) - $checkStart) / 1000)
                         ]);
                     } else {
-                        $failures[] = $cache;
+                        $output[] = new Document([
+                            'name' => $key . " ($database)",
+                            'status' => 'fail',
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                        ]);
                     }
-                } catch (\Throwable) {
-                    $failures[] = $cache;
+                } catch (\Throwable $th) {
+                    $output[] = new Document([
+                        'name' => $key . " ($database)",
+                        'status' => 'fail',
+                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                    ]);
                 }
             }
         }
 
-        if (!empty($failures)) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Cache failure on: ' . implode(", ", $failures));
-        }
-
         $response->dynamic(new Document([
             'statuses' => $output,
             'total' => count($output),
@@ -194,11 +193,10 @@ App::get('/v1/health/pubsub')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'health',
         name: 'getPubSub',
         description: '/docs/references/health/get-pubsub.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -210,39 +208,44 @@ App::get('/v1/health/pubsub')
     ->inject('response')
     ->inject('pools')
     ->action(function (Response $response, Group $pools) {
+
         $output = [];
-        $failures = [];
 
         $configs = [
             'PubSub' => Config::getParam('pools-pubsub'),
         ];
 
         foreach ($configs as $key => $config) {
-            foreach ($config as $pubsub) {
+            foreach ($config as $database) {
                 try {
-                    $adapter = new PubSubPool($pools->get($pubsub));
+                    /** @var \Appwrite\PubSub\Adapter $adapter */
+                    $adapter = $pools->get($database)->pop()->getResource();
 
                     $checkStart = \microtime(true);
 
                     if ($adapter->ping()) {
                         $output[] = new Document([
-                            'name' => $key . " ($pubsub)",
+                            'name' => $key . " ($database)",
                             'status' => 'pass',
                             'ping' => \round((\microtime(true) - $checkStart) / 1000)
                         ]);
                     } else {
-                        $failures[] = $pubsub;
+                        $output[] = new Document([
+                            'name' => $key . " ($database)",
+                            'status' => 'fail',
+                            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                        ]);
                     }
-                } catch (\Throwable) {
-                    $failures[] = $pubsub;
+                } catch (\Throwable $th) {
+                    $output[] = new Document([
+                        'name' => $key . " ($database)",
+                        'status' => 'fail',
+                        'ping' => \round((\microtime(true) - $checkStart) / 1000)
+                    ]);
                 }
             }
         }
 
-        if (!empty($failures)) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Pubsub failure on: ' . implode(", ", $failures));
-        }
-
         $response->dynamic(new Document([
             'statuses' => $output,
             'total' => count($output),
@@ -254,11 +257,10 @@ App::get('/v1/health/time')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'health',
         name: 'getTime',
         description: '/docs/references/health/get-time.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -318,11 +320,10 @@ App::get('/v1/health/queue/webhooks')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueWebhooks',
         description: '/docs/references/health/get-queue-webhooks.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -344,18 +345,17 @@ App::get('/v1/health/queue/webhooks')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/logs')
     ->desc('Get logs queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueLogs',
         description: '/docs/references/health/get-queue-logs.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -377,18 +377,17 @@ App::get('/v1/health/queue/logs')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/certificate')
     ->desc('Get the SSL certificate for a domain')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'health',
         name: 'getCertificate',
         description: '/docs/references/health/get-certificate.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -434,18 +433,17 @@ App::get('/v1/health/certificate')
             'validTo' => $certificatePayload['validTo_time_t'],
             'signatureTypeSN' => $certificatePayload['signatureTypeSN'],
         ]), Response::MODEL_HEALTH_CERTIFICATE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/certificates')
     ->desc('Get certificates queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueCertificates',
         description: '/docs/references/health/get-queue-certificates.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -467,18 +465,17 @@ App::get('/v1/health/queue/certificates')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/builds')
     ->desc('Get builds queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueBuilds',
         description: '/docs/references/health/get-queue-builds.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -500,18 +497,17 @@ App::get('/v1/health/queue/builds')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/databases')
     ->desc('Get databases queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueDatabases',
         description: '/docs/references/health/get-queue-databases.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -534,18 +530,17 @@ App::get('/v1/health/queue/databases')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/deletes')
     ->desc('Get deletes queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueDeletes',
         description: '/docs/references/health/get-queue-deletes.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -567,18 +562,17 @@ App::get('/v1/health/queue/deletes')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/mails')
     ->desc('Get mails queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueMails',
         description: '/docs/references/health/get-queue-mails.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -600,18 +594,17 @@ App::get('/v1/health/queue/mails')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/messaging')
     ->desc('Get messaging queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueMessaging',
         description: '/docs/references/health/get-queue-messaging.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -633,18 +626,17 @@ App::get('/v1/health/queue/messaging')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/migrations')
     ->desc('Get migrations queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueMigrations',
         description: '/docs/references/health/get-queue-migrations.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -666,18 +658,17 @@ App::get('/v1/health/queue/migrations')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/functions')
     ->desc('Get functions queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueFunctions',
         description: '/docs/references/health/get-queue-functions.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -699,18 +690,17 @@ App::get('/v1/health/queue/functions')
         }
 
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
-    });
+    }, ['response']);
 
 App::get('/v1/health/queue/stats-resources')
     ->desc('Get stats  resources queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueStatsResources',
         description: '/docs/references/health/get-queue-stats-resources.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -739,11 +729,10 @@ App::get('/v1/health/queue/stats-usage')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getQueueUsage',
         description: '/docs/references/health/get-queue-stats-usage.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -767,16 +756,47 @@ App::get('/v1/health/queue/stats-usage')
         $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
     });
 
+App::get('/v1/health/queue/stats-usage-dump')
+    ->desc('Get usage dump queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk', new Method(
+        auth: [AuthType::KEY],
+        namespace: 'health',
+        name: 'getQueueStatsUsageDump',
+        description: '/docs/references/health/get-queue-stats-usage-dump.md',
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_OK,
+                model: Response::MODEL_HEALTH_QUEUE,
+            )
+        ],
+        contentType: ContentType::JSON
+    ))
+    ->param('threshold', 5000, new Integer(true), 'Queue size threshold. When hit (equal or higher), endpoint returns server error. Default value is 5000.', true)
+    ->inject('publisher')
+    ->inject('response')
+    ->action(function (int|string $threshold, Publisher $publisher, Response $response) {
+        $threshold = \intval($threshold);
+
+        $size = $publisher->getQueueSize(new Queue(Event::STATS_USAGE_DUMP_QUEUE_NAME));
+
+        if ($size >= $threshold) {
+            throw new Exception(Exception::HEALTH_QUEUE_SIZE_EXCEEDED, "Queue size threshold hit. Current size is {$size} and threshold is {$threshold}.");
+        }
+
+        $response->dynamic(new Document([ 'size' => $size ]), Response::MODEL_HEALTH_QUEUE);
+    });
+
 App::get('/v1/health/storage/local')
     ->desc('Get local storage')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'storage',
         name: 'getStorageLocal',
         description: '/docs/references/health/get-storage-local.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -822,11 +842,10 @@ App::get('/v1/health/storage')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'storage',
         name: 'getStorage',
         description: '/docs/references/health/get-storage.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -838,10 +857,9 @@ App::get('/v1/health/storage')
     ->inject('response')
     ->inject('deviceForFiles')
     ->inject('deviceForFunctions')
-    ->inject('deviceForSites')
     ->inject('deviceForBuilds')
-    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForSites, Device $deviceForBuilds) {
-        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForSites,  $deviceForBuilds];
+    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds) {
+        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForBuilds];
         $checkStart = \microtime(true);
 
         foreach ($devices as $device) {
@@ -871,11 +889,10 @@ App::get('/v1/health/anti-virus')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'health',
         name: 'getAntivirus',
         description: '/docs/references/health/get-storage-anti-virus.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -917,11 +934,10 @@ App::get('/v1/health/queue/failed/:name')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk', new Method(
+        auth: [AuthType::KEY],
         namespace: 'health',
-        group: 'queue',
         name: 'getFailedJobs',
         description: '/docs/references/health/get-failed-queue-jobs.md',
-        auth: [AuthType::KEY],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
@@ -938,6 +954,7 @@ App::get('/v1/health/queue/failed/:name')
         Event::FUNCTIONS_QUEUE_NAME,
         Event::STATS_RESOURCES_QUEUE_NAME,
         Event::STATS_USAGE_QUEUE_NAME,
+        Event::STATS_USAGE_DUMP_QUEUE_NAME,
         Event::WEBHOOK_QUEUE_NAME,
         Event::CERTIFICATES_QUEUE_NAME,
         Event::BUILDS_QUEUE_NAME,
@@ -963,6 +980,9 @@ App::get('/v1/health/stats') // Currently only used internally
 ->desc('Get system stats')
     ->groups(['api', 'health'])
     ->label('scope', 'root')
+    // ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    // ->label('sdk.namespace', 'health')
+    // ->label('sdk.method', 'getStats')
     ->label('docs', false)
     ->inject('response')
     ->inject('register')

app/controllers/api/locale.php

@@ -17,7 +17,6 @@ App::get('/v1/locale')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'get',
         description: '/docs/references/locale/get-locale.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -81,7 +80,6 @@ App::get('/v1/locale/codes')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listCodes',
         description: '/docs/references/locale/list-locale-codes.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -107,7 +105,6 @@ App::get('/v1/locale/countries')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listCountries',
         description: '/docs/references/locale/list-countries.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -121,7 +118,7 @@ App::get('/v1/locale/countries')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
-        $list = array_keys(Config::getParam('locale-countries')); /* @var $list array */
+        $list = Config::getParam('locale-countries'); /* @var $list array */
         $output = [];
 
         foreach ($list as $value) {
@@ -144,7 +141,6 @@ App::get('/v1/locale/countries/eu')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listCountriesEU',
         description: '/docs/references/locale/list-countries-eu.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -183,7 +179,6 @@ App::get('/v1/locale/countries/phones')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listCountriesPhones',
         description: '/docs/references/locale/list-countries-phones.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -221,7 +216,6 @@ App::get('/v1/locale/continents')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listContinents',
         description: '/docs/references/locale/list-continents.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -235,7 +229,7 @@ App::get('/v1/locale/continents')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
-        $list = array_keys(Config::getParam('locale-continents'));
+        $list = Config::getParam('locale-continents');
 
         foreach ($list as $value) {
             $output[] = new Document([
@@ -257,7 +251,6 @@ App::get('/v1/locale/currencies')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listCurrencies',
         description: '/docs/references/locale/list-currencies.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -284,7 +277,6 @@ App::get('/v1/locale/languages')
     ->label('scope', 'locale.read')
     ->label('sdk', new Method(
         namespace: 'locale',
-        group: null,
         name: 'listLanguages',
         description: '/docs/references/locale/list-languages.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],

app/controllers/api/messaging.php

@@ -30,7 +30,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
@@ -64,7 +63,6 @@ App::post('/v1/messaging/providers/mailgun')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createMailgunProvider',
         description: '/docs/references/messaging/create-mailgun-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -158,7 +156,6 @@ App::post('/v1/messaging/providers/sendgrid')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createSendgridProvider',
         description: '/docs/references/messaging/create-sendgrid-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -240,7 +237,6 @@ App::post('/v1/messaging/providers/smtp')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createSmtpProvider',
         description: '/docs/references/messaging/create-smtp-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -335,7 +331,6 @@ App::post('/v1/messaging/providers/msg91')
     ->label('event', 'providers.[providerId].create')
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createMsg91Provider',
         description: '/docs/references/messaging/create-msg91-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -418,7 +413,6 @@ App::post('/v1/messaging/providers/telesign')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createTelesignProvider',
         description: '/docs/references/messaging/create-telesign-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -502,7 +496,6 @@ App::post('/v1/messaging/providers/textmagic')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createTextmagicProvider',
         description: '/docs/references/messaging/create-textmagic-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -586,7 +579,6 @@ App::post('/v1/messaging/providers/twilio')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createTwilioProvider',
         description: '/docs/references/messaging/create-twilio-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -670,7 +662,6 @@ App::post('/v1/messaging/providers/vonage')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createVonageProvider',
         description: '/docs/references/messaging/create-vonage-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -754,7 +745,6 @@ App::post('/v1/messaging/providers/fcm')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createFcmProvider',
         description: '/docs/references/messaging/create-fcm-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -824,7 +814,6 @@ App::post('/v1/messaging/providers/apns')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'createApnsProvider',
         description: '/docs/references/messaging/create-apns-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -914,7 +903,6 @@ App::get('/v1/messaging/providers')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'listProviders',
         description: '/docs/references/messaging/list-providers.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -963,15 +951,10 @@ App::get('/v1/messaging/providers')
 
             $cursor->setValue($cursorDocument);
         }
-        try {
-            $providers = $dbForProject->find('providers', $queries);
-            $total = $dbForProject->count('providers', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'providers' => $providers,
-            'total' => $total,
+            'providers' => $dbForProject->find('providers', $queries),
+            'total' => $dbForProject->count('providers', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_PROVIDER_LIST);
     });
 
@@ -982,7 +965,6 @@ App::get('/v1/messaging/providers/:providerId/logs')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'listProviderLogs',
         description: '/docs/references/messaging/list-provider-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1079,7 +1061,6 @@ App::get('/v1/messaging/providers/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'getProvider',
         description: '/docs/references/messaging/get-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1113,7 +1094,6 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateMailgunProvider',
         description: '/docs/references/messaging/update-mailgun-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1226,7 +1206,6 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateSendgridProvider',
         description: '/docs/references/messaging/update-sendgrid-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1324,7 +1303,6 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateSmtpProvider',
         description: '/docs/references/messaging/update-smtp-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1453,7 +1431,6 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateMsg91Provider',
         description: '/docs/references/messaging/update-msg91-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1540,7 +1517,6 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateTelesignProvider',
         description: '/docs/references/messaging/update-telesign-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1629,7 +1605,6 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateTextmagicProvider',
         description: '/docs/references/messaging/update-textmagic-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1718,7 +1693,6 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateTwilioProvider',
         description: '/docs/references/messaging/update-twilio-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1807,7 +1781,6 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateVonageProvider',
         description: '/docs/references/messaging/update-vonage-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1896,7 +1869,6 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateFcmProvider',
         description: '/docs/references/messaging/update-fcm-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -1972,7 +1944,6 @@ App::patch('/v1/messaging/providers/apns/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'updateApnsProvider',
         description: '/docs/references/messaging/update-apns-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2074,7 +2045,6 @@ App::delete('/v1/messaging/providers/:providerId')
     ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'providers',
         name: 'deleteProvider',
         description: '/docs/references/messaging/delete-provider.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2117,7 +2087,6 @@ App::post('/v1/messaging/topics')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'topics',
         name: 'createTopic',
         description: '/docs/references/messaging/create-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2164,7 +2133,6 @@ App::get('/v1/messaging/topics')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'topics',
         name: 'listTopics',
         description: '/docs/references/messaging/list-topics.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2213,15 +2181,10 @@ App::get('/v1/messaging/topics')
 
             $cursor->setValue($cursorDocument[0]);
         }
-        try {
-            $topics = $dbForProject->find('topics', $queries);
-            $total = $dbForProject->count('topics', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'topics' => $topics,
-            'total' => $total,
+            'topics' => $dbForProject->find('topics', $queries),
+            'total' => $dbForProject->count('topics', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_TOPIC_LIST);
     });
 
@@ -2232,7 +2195,6 @@ App::get('/v1/messaging/topics/:topicId/logs')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'topics',
         name: 'listTopicLogs',
         description: '/docs/references/messaging/list-topic-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2330,7 +2292,6 @@ App::get('/v1/messaging/topics/:topicId')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'topics',
         name: 'getTopic',
         description: '/docs/references/messaging/get-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2365,7 +2326,6 @@ App::patch('/v1/messaging/topics/:topicId')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'topics',
         name: 'updateTopic',
         description: '/docs/references/messaging/update-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2416,7 +2376,6 @@ App::delete('/v1/messaging/topics/:topicId')
     ->label('resourceType', RESOURCE_TYPE_TOPICS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'topics',
         name: 'deleteTopic',
         description: '/docs/references/messaging/delete-topic.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2464,7 +2423,6 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'subscribers',
         name: 'createSubscriber',
         description: '/docs/references/messaging/create-subscriber.md',
         auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2564,7 +2522,6 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'subscribers',
         name: 'listSubscribers',
         description: '/docs/references/messaging/list-subscribers.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2622,11 +2579,8 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
 
             $cursor->setValue($cursorDocument);
         }
-        try {
-            $subscribers = $dbForProject->find('subscribers', $queries);
-        } catch (OrderException $e) {
-            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 = $dbForProject->find('subscribers', $queries);
 
         $subscribers = batch(\array_map(function (Document $subscriber) use ($dbForProject) {
             return function () use ($subscriber, $dbForProject) {
@@ -2653,7 +2607,6 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'subscribers',
         name: 'listSubscriberLogs',
         description: '/docs/references/messaging/list-subscriber-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2751,7 +2704,6 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'subscribers',
         name: 'getSubscriber',
         description: '/docs/references/messaging/get-subscriber.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2800,7 +2752,6 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
     ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'subscribers',
         name: 'deleteSubscriber',
         description: '/docs/references/messaging/delete-subscriber.md',
         auth: [AuthType::JWT, AuthType::SESSION, AuthType::ADMIN, AuthType::KEY],
@@ -2867,7 +2818,6 @@ App::post('/v1/messaging/messages/email')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'createEmail',
         description: '/docs/references/messaging/create-email.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -2986,7 +2936,7 @@ App::post('/v1/messaging/messages/email')
                 break;
             case MessageStatus::SCHEDULED:
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => $project->getAttribute('region'),
+                    'region' => System::getEnv('_APP_REGION', 'default'),
                     'resourceType' => 'message',
                     'resourceId' => $message->getId(),
                     'resourceInternalId' => $message->getInternalId(),
@@ -3026,7 +2976,6 @@ App::post('/v1/messaging/messages/sms')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'createSms',
         description: '/docs/references/messaging/create-sms.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3109,7 +3058,7 @@ App::post('/v1/messaging/messages/sms')
                 break;
             case MessageStatus::SCHEDULED:
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => $project->getAttribute('region'),
+                    'region' => System::getEnv('_APP_REGION', 'default'),
                     'resourceType' => 'message',
                     'resourceId' => $message->getId(),
                     'resourceInternalId' => $message->getInternalId(),
@@ -3149,7 +3098,6 @@ App::post('/v1/messaging/messages/push')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'createPush',
         description: '/docs/references/messaging/create-push.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3327,7 +3275,7 @@ App::post('/v1/messaging/messages/push')
                 break;
             case MessageStatus::SCHEDULED:
                 $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => $project->getAttribute('region'),
+                    'region' => System::getEnv('_APP_REGION', 'default'),
                     'resourceType' => 'message',
                     'resourceId' => $message->getId(),
                     'resourceInternalId' => $message->getInternalId(),
@@ -3364,7 +3312,6 @@ App::get('/v1/messaging/messages')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'listMessages',
         description: '/docs/references/messaging/list-messages.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3413,15 +3360,10 @@ App::get('/v1/messaging/messages')
 
             $cursor->setValue($cursorDocument);
         }
-        try {
-            $messages = $dbForProject->find('messages', $queries);
-            $total = $dbForProject->count('messages', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'messages' => $messages,
-            'total' => $total,
+            'messages' => $dbForProject->find('messages', $queries),
+            'total' => $dbForProject->count('messages', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_MESSAGE_LIST);
     });
 
@@ -3432,7 +3374,6 @@ App::get('/v1/messaging/messages/:messageId/logs')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'logs',
         name: 'listMessageLogs',
         description: '/docs/references/messaging/list-message-logs.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3530,7 +3471,6 @@ App::get('/v1/messaging/messages/:messageId/targets')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'listTargets',
         description: '/docs/references/messaging/list-message-targets.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3593,15 +3533,10 @@ App::get('/v1/messaging/messages/:messageId/targets')
 
             $cursor->setValue($cursorDocument);
         }
-        try {
-            $targets = $dbForProject->find('targets', $queries);
-            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'targets' => $targets,
-            'total' => $total,
+            'targets' => $dbForProject->find('targets', $queries),
+            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_TARGET_LIST);
     });
 
@@ -3612,7 +3547,6 @@ App::get('/v1/messaging/messages/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'getMessage',
         description: '/docs/references/messaging/get-message.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3646,7 +3580,6 @@ App::patch('/v1/messaging/messages/email/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'updateEmail',
         description: '/docs/references/messaging/update-email.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3728,7 +3661,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
 
         if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
             $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => $project->getAttribute('region'),
+                'region' => System::getEnv('_APP_REGION', 'default'),
                 'resourceType' => 'message',
                 'resourceId' => $message->getId(),
                 'resourceInternalId' => $message->getInternalId(),
@@ -3853,7 +3786,6 @@ App::patch('/v1/messaging/messages/sms/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'updateSms',
         description: '/docs/references/messaging/update-sms.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -3930,7 +3862,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
 
         if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
             $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => $project->getAttribute('region'),
+                'region' => System::getEnv('_APP_REGION', 'default'),
                 'resourceType' => 'message',
                 'resourceId' => $message->getId(),
                 'resourceInternalId' => $message->getInternalId(),
@@ -4015,7 +3947,6 @@ App::patch('/v1/messaging/messages/push/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'updatePush',
         description: '/docs/references/messaging/update-push.md',
         auth: [AuthType::ADMIN, AuthType::KEY],
@@ -4104,7 +4035,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
 
         if (\is_null($currentScheduledAt) && !\is_null($scheduledAt)) {
             $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                'region' => $project->getAttribute('region'),
+                'region' => System::getEnv('_APP_REGION', 'default'),
                 'resourceType' => 'message',
                 'resourceId' => $message->getId(),
                 'resourceInternalId' => $message->getInternalId(),
@@ -4275,7 +4206,6 @@ App::delete('/v1/messaging/messages/:messageId')
     ->label('resourceType', RESOURCE_TYPE_MESSAGES)
     ->label('sdk', new Method(
         namespace: 'messaging',
-        group: 'messages',
         name: 'delete',
         description: '/docs/references/messaging/delete-message.md',
         auth: [AuthType::ADMIN, AuthType::KEY],

app/controllers/api/migrations.php

@@ -1,39 +1,26 @@
 <?php
 
-use Appwrite\Auth\Auth;
 use Appwrite\Event\Event;
 use Appwrite\Event\Migration;
 use Appwrite\Extend\Exception;
-use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Database\Validator\CompoundUID;
 use Appwrite\Utopia\Database\Validator\Queries\Migrations;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Order as OrderException;
 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\Query\Cursor;
 use Utopia\Database\Validator\UID;
-use Utopia\Migration\Resource;
 use Utopia\Migration\Sources\Appwrite;
-use Utopia\Migration\Sources\CSV;
 use Utopia\Migration\Sources\Firebase;
 use Utopia\Migration\Sources\NHost;
 use Utopia\Migration\Sources\Supabase;
-use Utopia\Migration\Transfer;
-use Utopia\Storage\Compression\Algorithms\GZIP;
-use Utopia\Storage\Compression\Algorithms\Zstd;
-use Utopia\Storage\Compression\Compression;
-use Utopia\Storage\Device;
-use Utopia\System\System;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
@@ -44,13 +31,12 @@ include_once __DIR__ . '/../shared/api.php';
 
 App::post('/v1/migrations/appwrite')
     ->groups(['api', 'migrations'])
-    ->desc('Create Appwrite migration')
+    ->desc('Migrate Appwrite data')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'createAppwriteMigration',
         description: '/docs/references/migrations/migration-appwrite.md',
         auth: [AuthType::ADMIN],
@@ -103,15 +89,15 @@ App::post('/v1/migrations/appwrite')
             ->dynamic($migration, Response::MODEL_MIGRATION);
     });
 
+
 App::post('/v1/migrations/firebase')
     ->groups(['api', 'migrations'])
-    ->desc('Create Firebase migration')
+    ->desc('Migrate Firebase data')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'createFirebaseMigration',
         description: '/docs/references/migrations/migration-firebase.md',
         auth: [AuthType::ADMIN],
@@ -172,13 +158,12 @@ App::post('/v1/migrations/firebase')
 
 App::post('/v1/migrations/supabase')
     ->groups(['api', 'migrations'])
-    ->desc('Create Supabase migration')
+    ->desc('Migrate Supabase data')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'createSupabaseMigration',
         description: '/docs/references/migrations/migration-supabase.md',
         auth: [AuthType::ADMIN],
@@ -239,13 +224,12 @@ App::post('/v1/migrations/supabase')
 
 App::post('/v1/migrations/nhost')
     ->groups(['api', 'migrations'])
-    ->desc('Create NHost migration')
+    ->desc('Migrate NHost data')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].create')
     ->label('audits.event', 'migration.create')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'createNHostMigration',
         description: '/docs/references/migrations/migration-nhost.md',
         auth: [AuthType::ADMIN],
@@ -306,138 +290,12 @@ App::post('/v1/migrations/nhost')
             ->dynamic($migration, Response::MODEL_MIGRATION);
     });
 
-App::post('/v1/migrations/csv')
-    ->groups(['api', 'migrations'])
-    ->desc('Import documents from a CSV')
-    ->label('scope', 'migrations.write')
-    ->label('event', 'migrations.[migrationId].create')
-    ->label('audits.event', 'migration.create')
-    ->label('sdk', new Method(
-        namespace: 'migrations',
-        group: null,
-        name: 'createCsvMigration',
-        description: '/docs/references/migrations/migration-csv.md',
-        auth: [AuthType::ADMIN],
-        responses: [
-            new SDKResponse(
-                code: Response::STATUS_CODE_ACCEPTED,
-                model: Response::MODEL_MIGRATION,
-            )
-        ]
-    ))
-    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
-    ->param('fileId', '', new UID(), 'File ID.')
-    ->param('resourceId', null, new CompoundUID(), 'Composite ID in the format {databaseId:collectionId}, identifying a collection within a database.')
-    ->inject('response')
-    ->inject('dbForProject')
-    ->inject('project')
-    ->inject('deviceForFiles')
-    ->inject('deviceForImports')
-    ->inject('queueForEvents')
-    ->inject('queueForMigrations')
-    ->action(function (string $bucketId, string $fileId, string $resourceId, Response $response, Database $dbForProject, Document $project, Device $deviceForFiles, Device $deviceForImports, Event $queueForEvents, Migration $queueForMigrations) {
-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-
-        $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
-
-        if ($bucket->isEmpty() || (!$isAPIKey && !$isPrivilegedUser)) {
-            throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
-        }
-
-        $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
-        if ($file->isEmpty()) {
-            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
-        }
-
-        $path = $file->getAttribute('path', '');
-        if (!$deviceForFiles->exists($path)) {
-            throw new Exception(Exception::STORAGE_FILE_NOT_FOUND, 'File not found in ' . $path);
-        }
-
-        // no encryption, compression on files above 20MB.
-        $hasEncryption = !empty($file->getAttribute('openSSLCipher'));
-        $compression = $file->getAttribute('algorithm', Compression::NONE);
-        $hasCompression = $compression !== Compression::NONE;
-
-        $migrationId = ID::unique();
-        $newPath = $deviceForImports->getPath('/' . $migrationId . '_' . $fileId . '.csv');
-
-        if ($hasEncryption || $hasCompression) {
-            $source = $deviceForFiles->read($path);
-
-            // 1. decrypt
-            if ($hasEncryption) {
-                $source = OpenSSL::decrypt(
-                    $source,
-                    $file->getAttribute('openSSLCipher'),
-                    System::getEnv('_APP_OPENSSL_KEY_V' . $file->getAttribute('openSSLVersion')),
-                    0,
-                    hex2bin($file->getAttribute('openSSLIV')),
-                    hex2bin($file->getAttribute('openSSLTag'))
-                );
-            }
-
-            // 2. decompress
-            if ($hasCompression) {
-                switch ($compression) {
-                    case Compression::ZSTD:
-                        $source = (new Zstd())->decompress($source);
-                        break;
-                    case Compression::GZIP:
-                        $source = (new GZIP())->decompress($source);
-                        break;
-                }
-            }
-
-            // manual write after decryption and/or decompression
-            if (! $deviceForImports->write($newPath, $source, 'text/csv')) {
-                throw new \Exception("Unable to copy file");
-            }
-        } elseif (! $deviceForFiles->transfer($path, $newPath, $deviceForImports)) {
-            throw new \Exception("Unable to copy file");
-        }
-
-        $fileSize = $deviceForImports->getFileSize($newPath);
-        $resources = Transfer::extractServices([Transfer::GROUP_DATABASES]);
-
-        $migration = $dbForProject->createDocument('migrations', new Document([
-            '$id' => $migrationId,
-            'status' => 'pending',
-            'stage' => 'init',
-            'source' => CSV::getName(),
-            'destination' => Appwrite::getName(),
-            'resources' => $resources,
-            'resourceId' => $resourceId,
-            'resourceType' => Resource::TYPE_DATABASE,
-            'statusCounters' => [],
-            'resourceData' => [],
-            'errors' => [],
-            'options' => [
-                'path' => $newPath,
-                'size' => $fileSize,
-            ],
-        ]));
-
-        $queueForEvents->setParam('migrationId', $migration->getId());
-
-        $queueForMigrations
-            ->setMigration($migration)
-            ->setProject($project)
-            ->trigger();
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($migration, Response::MODEL_MIGRATION);
-    });
-
 App::get('/v1/migrations')
     ->groups(['api', 'migrations'])
     ->desc('List migrations')
     ->label('scope', 'migrations.read')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'list',
         description: '/docs/references/migrations/list-migrations.md',
         auth: [AuthType::ADMIN],
@@ -489,15 +347,10 @@ App::get('/v1/migrations')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $migrations = $dbForProject->find('migrations', $queries);
-            $total = $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'migrations' => $migrations,
-            'total' => $total,
+            'migrations' => $dbForProject->find('migrations', $queries),
+            'total' => $dbForProject->count('migrations', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_MIGRATION_LIST);
     });
 
@@ -507,7 +360,6 @@ App::get('/v1/migrations/:migrationId')
     ->label('scope', 'migrations.read')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'get',
         description: '/docs/references/migrations/get-migration.md',
         auth: [AuthType::ADMIN],
@@ -533,11 +385,10 @@ App::get('/v1/migrations/:migrationId')
 
 App::get('/v1/migrations/appwrite/report')
     ->groups(['api', 'migrations'])
-    ->desc('Get Appwrite migration report')
+    ->desc('Generate a report on Appwrite data')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'getAppwriteReport',
         description: '/docs/references/migrations/migration-appwrite-report.md',
         auth: [AuthType::ADMIN],
@@ -557,7 +408,6 @@ App::get('/v1/migrations/appwrite/report')
     ->inject('project')
     ->inject('user')
     ->action(function (array $resources, string $endpoint, string $projectID, string $key, Response $response) {
-
         $appwrite = new Appwrite($projectID, $endpoint, $key);
 
         try {
@@ -582,11 +432,10 @@ App::get('/v1/migrations/appwrite/report')
 
 App::get('/v1/migrations/firebase/report')
     ->groups(['api', 'migrations'])
-    ->desc('Get Firebase migration report')
+    ->desc('Generate a report on Firebase data')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'getFirebaseReport',
         description: '/docs/references/migrations/migration-firebase-report.md',
         auth: [AuthType::ADMIN],
@@ -635,11 +484,10 @@ App::get('/v1/migrations/firebase/report')
 
 App::get('/v1/migrations/supabase/report')
     ->groups(['api', 'migrations'])
-    ->desc('Get Supabase migration report')
+    ->desc('Generate a report on Supabase Data')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'getSupabaseReport',
         description: '/docs/references/migrations/migration-supabase-report.md',
         auth: [AuthType::ADMIN],
@@ -684,11 +532,10 @@ App::get('/v1/migrations/supabase/report')
 
 App::get('/v1/migrations/nhost/report')
     ->groups(['api', 'migrations'])
-    ->desc('Get NHost migration report')
+    ->desc('Generate a report on NHost Data')
     ->label('scope', 'migrations.write')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'getNHostReport',
         description: '/docs/references/migrations/migration-nhost-report.md',
         auth: [AuthType::ADMIN],
@@ -733,14 +580,13 @@ App::get('/v1/migrations/nhost/report')
 
 App::patch('/v1/migrations/:migrationId')
     ->groups(['api', 'migrations'])
-    ->desc('Update retry migration')
+    ->desc('Retry migration')
     ->label('scope', 'migrations.write')
     ->label('event', 'migrations.[migrationId].retry')
     ->label('audits.event', 'migration.retry')
     ->label('audits.resource', 'migrations/{request.migrationId}')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'retry',
         description: '/docs/references/migrations/retry-migration.md',
         auth: [AuthType::ADMIN],
@@ -791,7 +637,6 @@ App::delete('/v1/migrations/:migrationId')
     ->label('audits.resource', 'migrations/{request.migrationId}')
     ->label('sdk', new Method(
         namespace: 'migrations',
-        group: null,
         name: 'delete',
         description: '/docs/references/migrations/delete-migration.md',
         auth: [AuthType::ADMIN],

app/controllers/api/project.php

@@ -17,7 +17,6 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
 use Utopia\Database\Validator\UID;
-use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
@@ -27,7 +26,6 @@ App::get('/v1/project/usage')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'project',
-        group: null,
         name: 'getUsage',
         description: '/docs/references/project/get-usage.md',
         auth: [AuthType::ADMIN],
@@ -150,7 +148,7 @@ App::get('/v1/project/usage')
         $executionsBreakdown = array_map(function ($function) use ($dbForProject) {
             $id = $function->getId();
             $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS);
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS);
             $value = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$metric]),
                 Query::equal('period', ['inf'])
@@ -166,7 +164,7 @@ App::get('/v1/project/usage')
         $executionsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
             $id = $function->getId();
             $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS);
             $value = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$metric]),
                 Query::equal('period', ['inf'])
@@ -182,7 +180,7 @@ App::get('/v1/project/usage')
         $buildsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
             $id = $function->getId();
             $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS);
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS);
             $value = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$metric]),
                 Query::equal('period', ['inf'])
@@ -231,13 +229,13 @@ App::get('/v1/project/usage')
         $functionsStorageBreakdown = array_map(function ($function) use ($dbForProject) {
             $id = $function->getId();
             $name = $function->getAttribute('name');
-            $deploymentMetric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE);
+            $deploymentMetric = str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE);
             $deploymentValue = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$deploymentMetric]),
                 Query::equal('period', ['inf'])
             ]);
 
-            $buildMetric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE);
+            $buildMetric = str_replace(['{functionInternalId}'], [$function->getInternalId()], METRIC_FUNCTION_ID_BUILDS_STORAGE);
             $buildValue = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$buildMetric]),
                 Query::equal('period', ['inf'])
@@ -255,7 +253,7 @@ App::get('/v1/project/usage')
         $executionsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
             $id = $function->getId();
             $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS);
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS);
             $value = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$metric]),
                 Query::equal('period', ['inf'])
@@ -271,7 +269,7 @@ App::get('/v1/project/usage')
         $buildsMbSecondsBreakdown = array_map(function ($function) use ($dbForProject) {
             $id = $function->getId();
             $name = $function->getAttribute('name');
-            $metric = str_replace(['{resourceType}', '{resourceInternalId}'], [RESOURCE_TYPE_FUNCTIONS, $function->getInternalId()], METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS);
+            $metric = str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS);
             $value = $dbForProject->findOne('stats', [
                 Query::equal('metric', [$metric]),
                 Query::equal('period', ['inf'])
@@ -389,7 +387,6 @@ App::post('/v1/project/variables')
     ->label('audits.event', 'variable.create')
     ->label('sdk', new Method(
         namespace: 'project',
-        group: null,
         name: 'createVariable',
         description: '/docs/references/project/create-variable.md',
         auth: [AuthType::ADMIN],
@@ -402,12 +399,11 @@ App::post('/v1/project/variables')
     ))
     ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
     ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
-    ->param('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
     ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForPlatform')
-    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $key, string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
         $variableId = ID::unique();
 
         $variable = new Document([
@@ -422,7 +418,6 @@ App::post('/v1/project/variables')
             'resourceType' => 'project',
             'key' => $key,
             'value' => $value,
-            'secret' => $secret,
             'search' => implode(' ', [$variableId, $key, 'project']),
         ]);
 
@@ -451,7 +446,6 @@ App::get('/v1/project/variables')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'project',
-        group: null,
         name: 'listVariables',
         description: '/docs/references/project/list-variables.md',
         auth: [AuthType::ADMIN],
@@ -482,7 +476,6 @@ App::get('/v1/project/variables/:variableId')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'project',
-        group: null,
         name: 'getVariable',
         description: '/docs/references/project/get-variable.md',
         auth: [AuthType::ADMIN],
@@ -512,7 +505,6 @@ App::put('/v1/project/variables/:variableId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'project',
-        group: null,
         name: 'updateVariable',
         description: '/docs/references/project/update-variable.md',
         auth: [AuthType::ADMIN],
@@ -526,25 +518,19 @@ App::put('/v1/project/variables/:variableId')
     ->param('variableId', '', new UID(), 'Variable unique ID.', false)
     ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
     ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
-    ->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
     ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForPlatform')
-    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
         $variable = $dbForProject->getDocument('variables', $variableId);
         if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
             throw new Exception(Exception::VARIABLE_NOT_FOUND);
         }
 
-        if ($variable->getAttribute('secret') === true && $secret === false) {
-            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
-        }
-
         $variable
             ->setAttribute('key', $key)
             ->setAttribute('value', $value ?? $variable->getAttribute('value'))
-            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
             ->setAttribute('search', implode(' ', [$variableId, $key, 'project']));
 
         try {
@@ -570,7 +556,6 @@ App::delete('/v1/project/variables/:variableId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'project',
-        group: null,
         name: 'deleteVariable',
         description: '/docs/references/project/delete-variable.md',
         auth: [AuthType::ADMIN],

app/controllers/api/projects.php

@@ -24,12 +24,10 @@ use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -70,7 +68,6 @@ App::post('/v1/projects')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'create',
         description: '/docs/references/projects/create.md',
         auth: [AuthType::ADMIN],
@@ -141,14 +138,6 @@ App::post('/v1/projects')
 
         $databases = Config::getParam('pools-database', []);
 
-        if ($region !== 'default') {
-            $databaseKeys = System::getEnv('_APP_DATABASE_KEYS', '');
-            $keys = explode(',', $databaseKeys);
-            $databases = array_filter($keys, function ($value) use ($region) {
-                return str_contains($value, $region);
-            });
-        }
-
         $databaseOverride = System::getEnv('_APP_DATABASE_OVERRIDE');
         $index = \array_search($databaseOverride, $databases);
         if ($index !== false) {
@@ -216,17 +205,17 @@ App::post('/v1/projects')
             $dsn = new DSN('mysql://' . $dsn);
         }
 
+        $adapter = $pools->get($dsn->getHost())->pop()->getResource();
+        $dbForProject = new Database($adapter, $cache);
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
         $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
+
         $projectTables = !\in_array($dsn->getHost(), $sharedTables);
         $sharedTablesV1 = \in_array($dsn->getHost(), $sharedTablesV1);
         $sharedTablesV2 = !$projectTables && !$sharedTablesV1;
         $sharedTables = $sharedTablesV1 || $sharedTablesV2;
 
         if (!$sharedTablesV2) {
-            $adapter = new DatabasePool($pools->get($dsn->getHost()));
-            $dbForProject = new Database($adapter, $cache);
-
             if ($sharedTables) {
                 $dbForProject
                     ->setSharedTables(true)
@@ -308,7 +297,6 @@ App::get('/v1/projects')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'list',
         description: '/docs/references/projects/list.md',
         auth: [AuthType::ADMIN],
@@ -361,15 +349,10 @@ App::get('/v1/projects')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $projects = $dbForPlatform->find('projects', $queries);
-            $total = $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'projects' => $projects,
-            'total' => $total,
+            'projects' => $dbForPlatform->find('projects', $queries),
+            'total' => $dbForPlatform->count('projects', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_PROJECT_LIST);
     });
 
@@ -379,7 +362,6 @@ App::get('/v1/projects/:projectId')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'get',
         description: '/docs/references/projects/get.md',
         auth: [AuthType::ADMIN],
@@ -412,7 +394,6 @@ App::patch('/v1/projects/:projectId')
     ->label('audits.resource', 'project/{request.projectId}')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'update',
         description: '/docs/references/projects/update.md',
         auth: [AuthType::ADMIN],
@@ -466,7 +447,6 @@ App::patch('/v1/projects/:projectId/team')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'updateTeam',
         description: '/docs/references/projects/update-team.md',
         auth: [AuthType::ADMIN],
@@ -541,7 +521,6 @@ App::patch('/v1/projects/:projectId/service')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'updateServiceStatus',
         description: '/docs/references/projects/update-service-status.md',
         auth: [AuthType::ADMIN],
@@ -579,7 +558,6 @@ App::patch('/v1/projects/:projectId/service/all')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'updateServiceStatusAll',
         description: '/docs/references/projects/update-service-status-all.md',
         auth: [AuthType::ADMIN],
@@ -620,7 +598,6 @@ App::patch('/v1/projects/:projectId/api')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'updateApiStatus',
         description: '/docs/references/projects/update-api-status.md',
         auth: [AuthType::ADMIN],
@@ -658,7 +635,6 @@ App::patch('/v1/projects/:projectId/api/all')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'updateApiStatusAll',
         description: '/docs/references/projects/update-api-status-all.md',
         auth: [AuthType::ADMIN],
@@ -699,7 +675,6 @@ App::patch('/v1/projects/:projectId/oauth2')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateOAuth2',
         description: '/docs/references/projects/update-oauth2.md',
         auth: [AuthType::ADMIN],
@@ -750,7 +725,6 @@ App::patch('/v1/projects/:projectId/auth/session-alerts')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateSessionAlerts',
         description: '/docs/references/projects/update-session-alerts.md',
         auth: [AuthType::ADMIN],
@@ -788,7 +762,6 @@ App::patch('/v1/projects/:projectId/auth/memberships-privacy')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateMembershipsPrivacy',
         description: '/docs/references/projects/update-memberships-privacy.md',
         auth: [AuthType::ADMIN],
@@ -830,7 +803,6 @@ App::patch('/v1/projects/:projectId/auth/limit')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateAuthLimit',
         description: '/docs/references/projects/update-auth-limit.md',
         auth: [AuthType::ADMIN],
@@ -868,7 +840,6 @@ App::patch('/v1/projects/:projectId/auth/duration')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateAuthDuration',
         description: '/docs/references/projects/update-auth-duration.md',
         auth: [AuthType::ADMIN],
@@ -906,7 +877,6 @@ App::patch('/v1/projects/:projectId/auth/:method')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateAuthStatus',
         description: '/docs/references/projects/update-auth-status.md',
         auth: [AuthType::ADMIN],
@@ -947,7 +917,6 @@ App::patch('/v1/projects/:projectId/auth/password-history')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateAuthPasswordHistory',
         description: '/docs/references/projects/update-auth-password-history.md',
         auth: [AuthType::ADMIN],
@@ -985,7 +954,6 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateAuthPasswordDictionary',
         description: '/docs/references/projects/update-auth-password-dictionary.md',
         auth: [AuthType::ADMIN],
@@ -1018,12 +986,11 @@ App::patch('/v1/projects/:projectId/auth/password-dictionary')
     });
 
 App::patch('/v1/projects/:projectId/auth/personal-data')
-    ->desc('Update personal data check')
+    ->desc('Enable or disable checking user passwords for similarity with their personal data.')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updatePersonalDataCheck',
         description: '/docs/references/projects/update-personal-data-check.md',
         auth: [AuthType::ADMIN],
@@ -1061,7 +1028,6 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateAuthSessionsLimit',
         description: '/docs/references/projects/update-auth-sessions-limit.md',
         auth: [AuthType::ADMIN],
@@ -1099,7 +1065,6 @@ App::patch('/v1/projects/:projectId/auth/mock-numbers')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'updateMockNumbers',
         description: '/docs/references/projects/update-mock-numbers.md',
         auth: [AuthType::ADMIN],
@@ -1147,7 +1112,6 @@ App::delete('/v1/projects/:projectId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'projects',
         name: 'delete',
         description: '/docs/references/projects/delete.md',
         auth: [AuthType::ADMIN],
@@ -1191,7 +1155,6 @@ App::post('/v1/projects/:projectId/webhooks')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'webhooks',
         name: 'createWebhook',
         description: '/docs/references/projects/create-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1256,7 +1219,6 @@ App::get('/v1/projects/:projectId/webhooks')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'webhooks',
         name: 'listWebhooks',
         description: '/docs/references/projects/list-webhooks.md',
         auth: [AuthType::ADMIN],
@@ -1295,7 +1257,6 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('scope', 'projects.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'webhooks',
         name: 'getWebhook',
         description: '/docs/references/projects/get-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1336,7 +1297,6 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'webhooks',
         name: 'updateWebhook',
         description: '/docs/references/projects/update-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1402,7 +1362,6 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'webhooks',
         name: 'updateWebhookSignature',
         description: '/docs/references/projects/update-webhook-signature.md',
         auth: [AuthType::ADMIN],
@@ -1448,7 +1407,6 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'webhooks',
         name: 'deleteWebhook',
         description: '/docs/references/projects/delete-webhook.md',
         auth: [AuthType::ADMIN],
@@ -1496,7 +1454,6 @@ App::post('/v1/projects/:projectId/keys')
     ->label('scope', 'keys.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'keys',
         name: 'createKey',
         description: '/docs/references/projects/create-key.md',
         auth: [AuthType::ADMIN],
@@ -1553,7 +1510,6 @@ App::get('/v1/projects/:projectId/keys')
     ->label('scope', 'keys.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'keys',
         name: 'listKeys',
         description: '/docs/references/projects/list-keys.md',
         auth: [AuthType::ADMIN],
@@ -1592,7 +1548,6 @@ App::get('/v1/projects/:projectId/keys/:keyId')
     ->label('scope', 'keys.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'keys',
         name: 'getKey',
         description: '/docs/references/projects/get-key.md',
         auth: [AuthType::ADMIN],
@@ -1633,7 +1588,6 @@ App::put('/v1/projects/:projectId/keys/:keyId')
     ->label('scope', 'keys.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'keys',
         name: 'updateKey',
         description: '/docs/references/projects/update-key.md',
         auth: [AuthType::ADMIN],
@@ -1686,7 +1640,6 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
     ->label('scope', 'keys.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'keys',
         name: 'deleteKey',
         description: '/docs/references/projects/delete-key.md',
         auth: [AuthType::ADMIN],
@@ -1734,7 +1687,6 @@ App::post('/v1/projects/:projectId/jwts')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'auth',
         name: 'createJWT',
         description: '/docs/references/projects/create-jwt.md',
         auth: [AuthType::ADMIN],
@@ -1778,7 +1730,6 @@ App::post('/v1/projects/:projectId/platforms')
     ->label('scope', 'platforms.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'platforms',
         name: 'createPlatform',
         description: '/docs/references/projects/create-platform.md',
         auth: [AuthType::ADMIN],
@@ -1835,7 +1786,6 @@ App::get('/v1/projects/:projectId/platforms')
     ->label('scope', 'platforms.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'platforms',
         name: 'listPlatforms',
         description: '/docs/references/projects/list-platforms.md',
         auth: [AuthType::ADMIN],
@@ -1874,7 +1824,6 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
     ->label('scope', 'platforms.read')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'platforms',
         name: 'getPlatform',
         description: '/docs/references/projects/get-platform.md',
         auth: [AuthType::ADMIN],
@@ -1915,7 +1864,6 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
     ->label('scope', 'platforms.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'platforms',
         name: 'updatePlatform',
         description: '/docs/references/projects/update-platform.md',
         auth: [AuthType::ADMIN],
@@ -1971,7 +1919,6 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
     ->label('scope', 'platforms.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'platforms',
         name: 'deletePlatform',
         description: '/docs/references/projects/delete-platform.md',
         auth: [AuthType::ADMIN],
@@ -2019,7 +1966,6 @@ App::patch('/v1/projects/:projectId/smtp')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'updateSmtp',
         description: '/docs/references/projects/update-smtp.md',
         auth: [AuthType::ADMIN],
@@ -2116,7 +2062,6 @@ App::post('/v1/projects/:projectId/smtp/tests')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'createSmtpTest',
         description: '/docs/references/projects/create-smtp-test.md',
         auth: [AuthType::ADMIN],
@@ -2140,8 +2085,7 @@ App::post('/v1/projects/:projectId/smtp/tests')
     ->inject('response')
     ->inject('dbForPlatform')
     ->inject('queueForMails')
-    ->inject('plan')
-    ->action(function (string $projectId, array $emails, string $senderName, string $senderEmail, string $replyTo, string $host, int $port, string $username, string $password, string $secure, Response $response, Database $dbForPlatform, Mail $queueForMails, array $plan) {
+    ->action(function (string $projectId, array $emails, string $senderName, string $senderEmail, string $replyTo, string $host, int $port, string $username, string $password, string $secure, Response $response, Database $dbForPlatform, Mail $queueForMails) {
         $project = $dbForPlatform->getDocument('projects', $projectId);
 
         if ($project->isEmpty()) {
@@ -2154,14 +2098,7 @@ App::post('/v1/projects/:projectId/smtp/tests')
         $template = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-smtp-test.tpl');
         $template
             ->setParam('{{from}}', "{$senderName} ({$senderEmail})")
-            ->setParam('{{replyTo}}', "{$senderName} ({$replyToEmail})")
-            ->setParam('{{logoUrl}}', $plan['logoUrl'] ?? APP_EMAIL_LOGO_URL)
-            ->setParam('{{accentColor}}', $plan['accentColor'] ?? APP_EMAIL_ACCENT_COLOR)
-            ->setParam('{{twitterUrl}}', $plan['twitterUrl'] ?? APP_SOCIAL_TWITTER)
-            ->setParam('{{discordUrl}}', $plan['discordUrl'] ?? APP_SOCIAL_DISCORD)
-            ->setParam('{{githubUrl}}', $plan['githubUrl'] ?? APP_SOCIAL_GITHUB_APPWRITE)
-            ->setParam('{{termsUrl}}', $plan['termsUrl'] ?? APP_EMAIL_TERMS_URL)
-            ->setParam('{{privacyUrl}}', $plan['privacyUrl'] ?? APP_EMAIL_PRIVACY_URL);
+            ->setParam('{{replyTo}}', "{$senderName} ({$replyToEmail})");
 
         foreach ($emails as $email) {
             $queueForMails
@@ -2191,7 +2128,6 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'getSmsTemplate',
         description: '/docs/references/projects/get-sms-template.md',
         auth: [AuthType::ADMIN],
@@ -2239,7 +2175,6 @@ App::get('/v1/projects/:projectId/templates/email/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'getEmailTemplate',
         description: '/docs/references/projects/get-email-template.md',
         auth: [AuthType::ADMIN],
@@ -2298,7 +2233,6 @@ App::patch('/v1/projects/:projectId/templates/sms/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'updateSmsTemplate',
         description: '/docs/references/projects/update-sms-template.md',
         auth: [AuthType::ADMIN],
@@ -2345,7 +2279,6 @@ App::patch('/v1/projects/:projectId/templates/email/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'updateEmailTemplate',
         description: '/docs/references/projects/update-email-template.md',
         auth: [AuthType::ADMIN],
@@ -2402,7 +2335,6 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'deleteSmsTemplate',
         description: '/docs/references/projects/delete-sms-template.md',
         auth: [AuthType::ADMIN],
@@ -2448,12 +2380,11 @@ App::delete('/v1/projects/:projectId/templates/sms/:type/:locale')
     });
 
 App::delete('/v1/projects/:projectId/templates/email/:type/:locale')
-    ->desc('Delete custom email template')
+    ->desc('Reset custom email template')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk', new Method(
         namespace: 'projects',
-        group: 'templates',
         name: 'deleteEmailTemplate',
         description: '/docs/references/projects/delete-email-template.md',
         auth: [AuthType::ADMIN],

app/controllers/api/proxy.php

@@ -4,7 +4,7 @@ use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Extend\Exception;
-use Appwrite\Network\Validator\DNS;
+use Appwrite\Network\Validator\CNAME;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
@@ -15,15 +15,155 @@ use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Query as QueryException;
+use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
 use Utopia\Logger\Log;
 use Utopia\System\System;
-use Utopia\Validator\AnyOf;
-use Utopia\Validator\IP;
+use Utopia\Validator\Domain as ValidatorDomain;
 use Utopia\Validator\Text;
+use Utopia\Validator\WhiteList;
+
+App::post('/v1/proxy/rules')
+    ->groups(['api', 'proxy'])
+    ->desc('Create rule')
+    ->label('scope', 'rules.write')
+    ->label('event', 'rules.[ruleId].create')
+    ->label('audits.event', 'rule.create')
+    ->label('audits.resource', 'rule/{response.$id}')
+    ->label('sdk', new Method(
+        namespace: 'proxy',
+        name: 'createRule',
+        description: '/docs/references/proxy/create-rule.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_PROXY_RULE,
+            )
+        ]
+    ))
+    ->param('domain', null, new ValidatorDomain(), 'Domain name.')
+    ->param('resourceType', null, new WhiteList(['api', 'function']), 'Action definition for the rule. Possible values are "api", "function"')
+    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api", leave empty. If resourceType is "function", provide ID of the function.', true)
+    ->inject('response')
+    ->inject('project')
+    ->inject('queueForCertificates')
+    ->inject('queueForEvents')
+    ->inject('dbForPlatform')
+    ->inject('dbForProject')
+    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject) {
+        $mainDomain = System::getEnv('_APP_DOMAIN', '');
+        if ($domain === $mainDomain) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
+        }
+
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+        if ($functionsDomain != '' && str_ends_with($domain, $functionsDomain)) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or it\'s subdomain to specific resource. Please use different domain.');
+        }
+
+        if ($domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed. Please pick another one.');
+        }
+
+        // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+        if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+            $document = $dbForPlatform->getDocument('rules', md5($domain));
+        } else {
+            $document = $dbForPlatform->findOne('rules', [
+                Query::equal('domain', [$domain]),
+            ]);
+        }
+
+
+        if (!$document->isEmpty()) {
+            if ($document->getAttribute('projectId') === $project->getId()) {
+                $resourceType = $document->getAttribute('resourceType');
+                $resourceId = $document->getAttribute('resourceId');
+                $message = "Domain already assigned to '{$resourceType}' service";
+                if (!empty($resourceId)) {
+                    $message .= " with ID '{$resourceId}'";
+                }
+
+                $message .= '.';
+            } else {
+                $message = 'Domain already assigned to different project.';
+            }
+
+            throw new Exception(Exception::RULE_ALREADY_EXISTS, $message);
+        }
+
+        $resourceInternalId = '';
+
+        if ($resourceType == 'function') {
+            if (empty($resourceId)) {
+                throw new Exception(Exception::FUNCTION_NOT_FOUND);
+            }
+
+            $function = $dbForProject->getDocument('functions', $resourceId);
+
+            if ($function->isEmpty()) {
+                throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
+            }
+
+            $resourceInternalId = $function->getInternalId();
+        }
+
+        try {
+            $domain = new Domain($domain);
+        } catch (\Throwable) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Domain may not start with http:// or https://.');
+        }
+
+        // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
+
+        $rule = new Document([
+            '$id' => $ruleId,
+            'projectId' => $project->getId(),
+            'projectInternalId' => $project->getInternalId(),
+            'domain' => $domain->get(),
+            'resourceType' => $resourceType,
+            'resourceId' => $resourceId,
+            'resourceInternalId' => $resourceInternalId,
+            'certificateId' => '',
+        ]);
+
+        $status = 'created';
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
+        if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
+            $status = 'verified';
+        }
+
+        if ($status === 'created') {
+            $target = new Domain(System::getEnv('_APP_DOMAIN_TARGET', ''));
+            $validator = new CNAME($target->get()); // Verify Domain with DNS records
+
+            if ($validator->isValid($domain->get())) {
+                $status = 'verifying';
+
+                $queueForCertificates
+                    ->setDomain(new Document([
+                        'domain' => $rule->getAttribute('domain')
+                    ]))
+                    ->trigger();
+            }
+        }
+
+        $rule->setAttribute('status', $status);
+        $rule = $dbForPlatform->createDocument('rules', $rule);
+
+        $queueForEvents->setParam('ruleId', $rule->getId());
+
+        $rule->setAttribute('logs', '');
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($rule, Response::MODEL_PROXY_RULE);
+    });
 
 App::get('/v1/proxy/rules')
     ->groups(['api', 'proxy'])
@@ -31,7 +171,6 @@ App::get('/v1/proxy/rules')
     ->label('scope', 'rules.read')
     ->label('sdk', new Method(
         namespace: 'proxy',
-        group: null,
         name: 'listRules',
         description: '/docs/references/proxy/list-rules.md',
         auth: [AuthType::ADMIN],
@@ -106,7 +245,6 @@ App::get('/v1/proxy/rules/:ruleId')
     ->label('scope', 'rules.read')
     ->label('sdk', new Method(
         namespace: 'proxy',
-        group: null,
         name: 'getRule',
         description: '/docs/references/proxy/get-rule.md',
         auth: [AuthType::ADMIN],
@@ -144,7 +282,6 @@ App::delete('/v1/proxy/rules/:ruleId')
     ->label('audits.resource', 'rule/{request.ruleId}')
     ->label('sdk', new Method(
         namespace: 'proxy',
-        group: null,
         name: 'deleteRule',
         description: '/docs/references/proxy/delete-rule.md',
         auth: [AuthType::ADMIN],
@@ -189,7 +326,6 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
     ->label('audits.resource', 'rule/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'proxy',
-        group: null,
         name: 'updateRuleVerification',
         description: '/docs/references/proxy/update-rule-verification.md',
         auth: [AuthType::ADMIN],
@@ -214,27 +350,17 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
             throw new Exception(Exception::RULE_NOT_FOUND);
         }
 
-        $validators = [];
-        $targetCNAME = new Domain(System::getEnv('_APP_DOMAIN_TARGET_CNAME', ''));
-        if ($targetCNAME->isKnown() && !$targetCNAME->isTest()) {
-            $validators[] = new DNS($targetCNAME->get(), DNS::RECORD_CNAME);
-        }
-        if ((new IP(IP::V4))->isValid(System::getEnv('_APP_DOMAIN_TARGET_A', ''))) {
-            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_A', ''), DNS::RECORD_A);
-        }
-        if ((new IP(IP::V6))->isValid(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''))) {
-            $validators[] = new DNS(System::getEnv('_APP_DOMAIN_TARGET_AAAA', ''), DNS::RECORD_AAAA);
-        }
+        $target = new Domain(System::getEnv('_APP_DOMAIN_TARGET', ''));
 
-        if (empty($validators)) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'At least one of domain targets environment variable must be configured.');
+        if (!$target->isKnown() || $target->isTest()) {
+            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Domain target must be configured as environment variable.');
         }
 
         if ($rule->getAttribute('verification') === true) {
             return $response->dynamic($rule, Response::MODEL_PROXY_RULE);
         }
 
-        $validator = new AnyOf($validators, AnyOf::TYPE_STRING);
+        $validator = new CNAME($target->get()); // Verify Domain with DNS records
         $domain = new Domain($rule->getAttribute('domain', ''));
 
         $validationStart = \microtime(true);
@@ -242,14 +368,7 @@ App::patch('/v1/proxy/rules/:ruleId/verification')
             $log->addExtra('dnsTiming', \strval(\microtime(true) - $validationStart));
             $log->addTag('dnsDomain', $domain->get());
 
-            $errors = [];
-            foreach ($validators as $validator) {
-                if (!empty($validator->getLogs())) {
-                    $errors[] = $validator->getLogs();
-                }
-            }
-
-            $error = \implode("\n", $errors);
+            $error = $validator->getLogs();
             $log->addExtra('dnsResponse', \is_array($error) ? \json_encode($error) : \strval($error));
 
             throw new Exception(Exception::RULE_VERIFICATION_FAILED);

app/controllers/api/storage.php

@@ -24,7 +24,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\NotFound as NotFoundException;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -63,7 +62,6 @@ App::post('/v1/storage/buckets')
     ->label('audits.resource', 'bucket/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'buckets',
         name: 'createBucket',
         description: '/docs/references/storage/create-bucket.md',
         auth: [AuthType::KEY],
@@ -166,7 +164,6 @@ App::get('/v1/storage/buckets')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'buckets',
         name: 'listBuckets',
         description: '/docs/references/storage/list-buckets.md',
         auth: [AuthType::KEY],
@@ -219,15 +216,10 @@ App::get('/v1/storage/buckets')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $buckets = $dbForProject->find('buckets', $queries);
-            $total = $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'buckets' => $buckets,
-            'total' => $total,
+            'buckets' => $dbForProject->find('buckets', $queries),
+            'total' => $dbForProject->count('buckets', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_BUCKET_LIST);
     });
 
@@ -238,7 +230,6 @@ App::get('/v1/storage/buckets/:bucketId')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'buckets',
         name: 'getBucket',
         description: '/docs/references/storage/get-bucket.md',
         auth: [AuthType::KEY],
@@ -273,7 +264,6 @@ App::put('/v1/storage/buckets/:bucketId')
     ->label('audits.resource', 'bucket/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'buckets',
         name: 'updateBucket',
         description: '/docs/references/storage/update-bucket.md',
         auth: [AuthType::KEY],
@@ -344,7 +334,6 @@ App::delete('/v1/storage/buckets/:bucketId')
     ->label('audits.resource', 'bucket/{request.bucketId}')
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'buckets',
         name: 'deleteBucket',
         description: '/docs/references/storage/delete-bucket.md',
         auth: [AuthType::KEY],
@@ -398,18 +387,17 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'createFile',
         description: '/docs/references/storage/create-file.md',
+        type: MethodType::UPLOAD,
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+        requestType: 'multipart/form-data',
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_CREATED,
                 model: Response::MODEL_FILE,
             )
-        ],
-        type: MethodType::UPLOAD,
-        requestType: ContentType::MULTIPART
+        ]
     ))
     ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new CustomId(), 'File ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
@@ -768,7 +756,6 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'listFiles',
         description: '/docs/references/storage/list-files.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -850,8 +837,6 @@ App::get('/v1/storage/buckets/:bucketId/files')
             }
         } catch (NotFoundException) {
             throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
-        } catch (OrderException $e) {
-            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.");
         }
 
         $response->dynamic(new Document([
@@ -868,7 +853,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'getFile',
         description: '/docs/references/storage/get-file.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -925,7 +909,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->label('cache.resource', 'file/{request.fileId}')
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'getFilePreview',
         description: '/docs/references/storage/get-file-preview.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -943,7 +926,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->param('width', 0, new Range(0, 4000), 'Resize preview image width, Pass an integer between 0 to 4000.', true)
     ->param('height', 0, new Range(0, 4000), 'Resize preview image height, Pass an integer between 0 to 4000.', true)
     ->param('gravity', Image::GRAVITY_CENTER, new WhiteList(Image::getGravityTypes()), 'Image crop gravity. Can be one of ' . implode(",", Image::getGravityTypes()), true)
-    ->param('quality', -1, new Range(-1, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to keep existing image quality.', true)
+    ->param('quality', 100, new Range(0, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->param('borderWidth', 0, new Range(0, 100), 'Preview image border in pixels. Pass an integer between 0 to 100. Defaults to 0.', true)
     ->param('borderColor', '', new HexColor(), 'Preview image border color. Use a valid HEX color, no # is needed for prefix.', true)
     ->param('borderRadius', 0, new Range(0, 4000), 'Preview image border radius in pixels. Pass an integer between 0 to 4000.', true)
@@ -951,14 +934,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->param('rotation', 0, new Range(-360, 360), 'Preview image rotation in degrees. Pass an integer between -360 and 360.', true)
     ->param('background', '', new HexColor(), 'Preview image background color. Only works with transparent images (png). Use a valid HEX color, no # is needed for prefix.', true)
     ->param('output', '', new WhiteList(\array_keys(Config::getParam('storage-outputs')), true), 'Output format type (jpeg, jpg, png, gif and webp).', true)
-    // NOTE: this is only for the sdk generator and is not used in the action below and is utilised in `resources.php` for `resourceToken`.
-    ->param('token', '', new Text(512), 'File token for accessing this file.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('resourceToken')
     ->inject('deviceForFiles')
     ->inject('deviceForLocal')
-    ->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, Response $response, Database $dbForProject, Document $resourceToken, Device $deviceForFiles, Device $deviceForLocal) {
+    ->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, Response $response, Database $dbForProject, Device $deviceForFiles, Device $deviceForLocal) {
 
         if (!\extension_loaded('imagick')) {
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
@@ -973,24 +953,19 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
             throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
         }
 
-        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getInternalId();
         $fileSecurity = $bucket->getAttribute('fileSecurity', false);
         $validator = new Authorization(Database::PERMISSION_READ);
         $valid = $validator->isValid($bucket->getRead());
-        if (!$fileSecurity && !$valid && !$isToken) {
+        if (!$fileSecurity && !$valid) {
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
-        if ($fileSecurity && !$valid && !$isToken) {
+        if ($fileSecurity && !$valid) {
             $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
         } else {
             $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
         }
 
-        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getInternalId()) {
-            throw new Exception(Exception::USER_UNAUTHORIZED);
-        }
-
         if ($file->isEmpty()) {
             throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
         }
@@ -1116,7 +1091,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'getFileDownload',
         description: '/docs/references/storage/get-file-download.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1131,15 +1105,12 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ))
     ->param('bucketId', '', new UID(), 'Storage bucket ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
-    // NOTE: this is only for the sdk generator and is not used in the action below and is utilised in `resources.php` for `resourceToken`.
-    ->param('token', '', new Text(512), 'File token for accessing this file.', true)
     ->inject('request')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('mode')
-    ->inject('resourceToken')
     ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, ?string $token, Request $request, Response $response, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles) {
+    ->action(function (string $bucketId, string $fileId, Request $request, Response $response, Database $dbForProject, string $mode, Device $deviceForFiles) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -1150,11 +1121,10 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
             throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
         }
 
-        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getInternalId();
         $fileSecurity = $bucket->getAttribute('fileSecurity', false);
         $validator = new Authorization(Database::PERMISSION_READ);
         $valid = $validator->isValid($bucket->getRead());
-        if (!$fileSecurity && !$valid && !$isToken) {
+        if (!$fileSecurity && !$valid) {
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
@@ -1164,10 +1134,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
             $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
         }
 
-        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getInternalId()) {
-            throw new Exception(Exception::USER_UNAUTHORIZED);
-        }
-
         if ($file->isEmpty()) {
             throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
         }
@@ -1241,15 +1207,12 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
         if (!empty($source)) {
             if (!empty($rangeHeader)) {
                 $response->send(substr($source, $start, ($end - $start + 1)));
-                return;
             }
             $response->send($source);
-            return;
         }
 
         if (!empty($rangeHeader)) {
             $response->send($deviceForFiles->read($path, $start, ($end - $start + 1)));
-            return;
         }
 
         if ($size > APP_STORAGE_READ_BUFFER) {
@@ -1276,7 +1239,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'getFileView',
         description: '/docs/references/storage/get-file-view.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1291,15 +1253,12 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ))
     ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
-    // NOTE: this is only for the sdk generator and is not used in the action below and is utilised in `resources.php` for `resourceToken`.
-    ->param('token', '', new Text(512), 'File token for accessing this file.', true)
     ->inject('response')
     ->inject('request')
     ->inject('dbForProject')
     ->inject('mode')
-    ->inject('resourceToken')
     ->inject('deviceForFiles')
-    ->action(function (string $bucketId, string $fileId, ?string $token, Response $response, Request $request, Database $dbForProject, string $mode, Document $resourceToken, Device $deviceForFiles) {
+    ->action(function (string $bucketId, string $fileId, Response $response, Request $request, Database $dbForProject, string $mode, Device $deviceForFiles) {
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
         $isAPIKey = Auth::isAppUser(Authorization::getRoles());
@@ -1309,11 +1268,10 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
             throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
         }
 
-        $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getInternalId();
         $fileSecurity = $bucket->getAttribute('fileSecurity', false);
         $validator = new Authorization(Database::PERMISSION_READ);
         $valid = $validator->isValid($bucket->getRead());
-        if (!$fileSecurity && !$valid && !$isToken) {
+        if (!$fileSecurity && !$valid) {
             throw new Exception(Exception::USER_UNAUTHORIZED);
         }
 
@@ -1323,10 +1281,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
             $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
         }
 
-        if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getInternalId()) {
-            throw new Exception(Exception::USER_UNAUTHORIZED);
-        }
-
         if ($file->isEmpty()) {
             throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
         }
@@ -1410,7 +1364,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
         if (!empty($source)) {
             if (!empty($rangeHeader)) {
                 $response->send(substr($source, $start, ($end - $start + 1)));
-                return;
             }
             $response->send($source);
             return;
@@ -1443,6 +1396,9 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
     ->groups(['api', 'storage'])
     ->label('scope', 'public')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', '*/*')
+    ->label('sdk.methodType', 'location')
     ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](https://appwrite.io/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->param('jwt', '', new Text(2048, 0), 'JSON Web Token to validate', true)
@@ -1562,7 +1518,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
         if (!empty($source)) {
             if (!empty($rangeHeader)) {
                 $response->send(substr($source, $start, ($end - $start + 1)));
-                return;
             }
             $response->send($source);
             return;
@@ -1604,7 +1559,6 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'updateFile',
         description: '/docs/references/storage/update-file.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1719,7 +1673,6 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: 'files',
         name: 'deleteFile',
         description: '/docs/references/storage/delete-file.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1812,7 +1765,6 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
         $response->noContent();
     });
 
-/** Storage usage */
 App::get('/v1/storage/usage')
     ->desc('Get storage usage stats')
     ->groups(['api', 'storage'])
@@ -1820,7 +1772,6 @@ App::get('/v1/storage/usage')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: null,
         name: 'getUsage',
         description: '/docs/references/storage/get-usage.md',
         auth: [AuthType::ADMIN],
@@ -1907,7 +1858,6 @@ App::get('/v1/storage/:bucketId/usage')
     ->label('resourceType', RESOURCE_TYPE_BUCKETS)
     ->label('sdk', new Method(
         namespace: 'storage',
-        group: null,
         name: 'getBucketUsage',
         description: '/docs/references/storage/get-bucket-usage.md',
         auth: [AuthType::ADMIN],

app/controllers/api/teams.php

@@ -33,7 +33,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -52,7 +51,6 @@ use Utopia\Validator\ArrayList;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\Host;
 use Utopia\Validator\Text;
-use Utopia\Validator\URL;
 use Utopia\Validator\WhiteList;
 
 App::post('/v1/teams')
@@ -64,7 +62,6 @@ App::post('/v1/teams')
     ->label('audits.resource', 'team/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'create',
         description: '/docs/references/teams/create-team.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -155,7 +152,6 @@ App::get('/v1/teams')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'list',
         description: '/docs/references/teams/list-teams.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -208,12 +204,9 @@ App::get('/v1/teams')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForProject->find('teams', $queries);
-            $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
+        $results = $dbForProject->find('teams', $queries);
+        $total = $dbForProject->count('teams', $filterQueries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
             'teams' => $results,
@@ -227,7 +220,6 @@ App::get('/v1/teams/:teamId')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'get',
         description: '/docs/references/teams/get-team.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -258,7 +250,6 @@ App::get('/v1/teams/:teamId/prefs')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'getPrefs',
         description: '/docs/references/teams/get-team-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -294,7 +285,6 @@ App::put('/v1/teams/:teamId')
     ->label('audits.resource', 'team/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'updateName',
         description: '/docs/references/teams/update-team-name.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -323,7 +313,9 @@ App::put('/v1/teams/:teamId')
             ->setAttribute('name', $name)
             ->setAttribute('search', implode(' ', [$teamId, $name]));
 
-        $team = $dbForProject->updateDocument('teams', $team->getId(), $team);
+        $team = $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $team) {
+            return $dbForProject->updateDocument('teams', $team->getId(), $team);
+        });
 
         $queueForEvents->setParam('teamId', $team->getId());
 
@@ -340,7 +332,6 @@ App::put('/v1/teams/:teamId/prefs')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'updatePrefs',
         description: '/docs/references/teams/update-team-prefs.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -380,7 +371,6 @@ App::delete('/v1/teams/:teamId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'teams',
         name: 'delete',
         description: '/docs/references/teams/delete-team.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -439,7 +429,6 @@ App::post('/v1/teams/:teamId/memberships')
     ->label('audits.userId', '{request.userId}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'memberships',
         name: 'createMembership',
         description: '/docs/references/teams/create-team-membership.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -466,7 +455,7 @@ 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 ($clients, $devKey) => $devKey->isEmpty() ? new Host($clients) : 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, ['clients', 'devKey']) // TODO add our own built-in confirm page
+    ->param('url', '', fn ($clients) => new Host($clients), '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, ['clients']) // TODO add our own built-in confirm page
     ->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
     ->inject('response')
     ->inject('project')
@@ -626,10 +615,7 @@ App::post('/v1/teams/:teamId/memberships')
             $membership = ($isPrivilegedUser || $isAppUser) ?
                 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', Auth::hash($secret));
@@ -807,7 +793,6 @@ App::get('/v1/teams/:teamId/memberships')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'memberships',
         name: 'listMemberships',
         description: '/docs/references/teams/list-team-members.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -871,20 +856,17 @@ App::get('/v1/teams/:teamId/memberships')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $memberships = $dbForProject->find(
-                collection: 'memberships',
-                queries: $queries,
-            );
-            $total = $dbForProject->count(
-                collection: 'memberships',
-                queries: $filterQueries,
-                max: APP_LIMIT_COUNT
-            );
-        } catch (OrderException $e) {
-            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.");
-        }
 
+        $memberships = $dbForProject->find(
+            collection: 'memberships',
+            queries: $queries,
+        );
+
+        $total = $dbForProject->count(
+            collection: 'memberships',
+            queries: $filterQueries,
+            max: APP_LIMIT_COUNT
+        );
 
         $memberships = array_filter($memberships, fn (Document $membership) => !empty($membership->getAttribute('userId')));
 
@@ -949,7 +931,6 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'memberships',
         name: 'getMembership',
         description: '/docs/references/teams/get-team-member.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1036,7 +1017,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'memberships',
         name: 'updateMembership',
         description: '/docs/references/teams/update-team-membership.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1051,6 +1031,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->param('membershipId', '', new UID(), 'Membership ID.')
     ->param('roles', [], function (Document $project) {
         if ($project->getId() === 'console') {
+            ;
             $roles = array_keys(Config::getParam('roles', []));
             array_filter($roles, function ($role) {
                 return !in_array($role, [Auth::USER_ROLE_APPS, Auth::USER_ROLE_GUESTS, Auth::USER_ROLE_USERS]);
@@ -1062,10 +1043,9 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->inject('request')
     ->inject('response')
     ->inject('user')
-    ->inject('project')
     ->inject('dbForProject')
     ->inject('queueForEvents')
-    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents) {
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $queueForEvents) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
         if ($team->isEmpty()) {
@@ -1086,24 +1066,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
         $isAppUser = Auth::isAppUser(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
-            $ownersCount = $dbForProject->count(
-                collection: 'memberships',
-                queries: [
-                    Query::contains('roles', ['owner']),
-                    Query::equal('teamInternalId', [$team->getInternalId()])
-                ],
-                max: 2
-            );
-
-            // Prevent role change if there's only one owner left,
-            // the requester is that owner, and the new `$roles` no longer include 'owner'!
-            if ($ownersCount === 1 && $isOwner && !\in_array('owner', $roles)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'There must be at least one owner in the organization.');
-            }
-        }
-
         if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
             throw new Exception(Exception::USER_UNAUTHORIZED, 'User is not allowed to modify roles');
         }
@@ -1143,7 +1105,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->label('audits.userId', '{request.userId}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'memberships',
         name: 'updateMembershipStatus',
         description: '/docs/references/teams/update-team-membership-status.md',
         auth: [AuthType::SESSION, AuthType::JWT],
@@ -1301,7 +1262,6 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     ->label('audits.resource', 'team/{request.teamId}')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'memberships',
         name: 'deleteMembership',
         description: '/docs/references/teams/delete-team-membership.md',
         auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
@@ -1372,7 +1332,6 @@ App::get('/v1/teams/:teamId/logs')
     ->label('scope', 'teams.read')
     ->label('sdk', new Method(
         namespace: 'teams',
-        group: 'logs',
         name: 'listLogs',
         description: '/docs/references/teams/get-team-logs.md',
         auth: [AuthType::ADMIN],

app/controllers/api/users.php

@@ -9,8 +9,6 @@ use Appwrite\Auth\Validator\PasswordDictionary;
 use Appwrite\Auth\Validator\PasswordHistory;
 use Appwrite\Auth\Validator\PersonalData;
 use Appwrite\Auth\Validator\Phone;
-use Appwrite\Deletes\Identities as DeleteIdentities;
-use Appwrite\Deletes\Targets as DeleteTargets;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
@@ -23,7 +21,6 @@ use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries\Identities;
-use Appwrite\Utopia\Database\Validator\Queries\Memberships;
 use Appwrite\Utopia\Database\Validator\Queries\Targets;
 use Appwrite\Utopia\Database\Validator\Queries\Users;
 use Appwrite\Utopia\Request;
@@ -36,7 +33,6 @@ use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -195,7 +191,6 @@ App::post('/v1/users')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'create',
         description: '/docs/references/users/create-user.md',
         auth: [AuthType::KEY],
@@ -230,7 +225,6 @@ App::post('/v1/users/bcrypt')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createBcryptUser',
         description: '/docs/references/users/create-bcrypt-user.md',
         auth: [AuthType::KEY],
@@ -265,7 +259,6 @@ App::post('/v1/users/md5')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createMD5User',
         description: '/docs/references/users/create-md5-user.md',
         auth: [AuthType::KEY],
@@ -300,7 +293,6 @@ App::post('/v1/users/argon2')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createArgon2User',
         description: '/docs/references/users/create-argon2-user.md',
         auth: [AuthType::KEY],
@@ -335,7 +327,6 @@ App::post('/v1/users/sha')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createSHAUser',
         description: '/docs/references/users/create-sha-user.md',
         auth: [AuthType::KEY],
@@ -377,7 +368,6 @@ App::post('/v1/users/phpass')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createPHPassUser',
         description: '/docs/references/users/create-phpass-user.md',
         auth: [AuthType::KEY],
@@ -412,7 +402,6 @@ App::post('/v1/users/scrypt')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createScryptUser',
         description: '/docs/references/users/create-scrypt-user.md',
         auth: [AuthType::KEY],
@@ -460,7 +449,6 @@ App::post('/v1/users/scrypt-modified')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'createScryptModifiedUser',
         description: '/docs/references/users/create-scrypt-modified-user.md',
         auth: [AuthType::KEY],
@@ -499,7 +487,6 @@ App::post('/v1/users/:userId/targets')
     ->label('scope', 'targets.write')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'targets',
         name: 'createTarget',
         description: '/docs/references/users/create-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -591,7 +578,6 @@ App::get('/v1/users')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'list',
         description: '/docs/references/users/list-users.md',
         auth: [AuthType::KEY],
@@ -644,15 +630,10 @@ App::get('/v1/users')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $users = $dbForProject->find('users', $queries);
-            $total = $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'users' => $users,
-            'total' => $total,
+            'users' => $dbForProject->find('users', $queries),
+            'total' => $dbForProject->count('users', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_USER_LIST);
     });
 
@@ -662,7 +643,6 @@ App::get('/v1/users/:userId')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'get',
         description: '/docs/references/users/get-user.md',
         auth: [AuthType::KEY],
@@ -693,7 +673,6 @@ App::get('/v1/users/:userId/prefs')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'getPrefs',
         description: '/docs/references/users/get-user-prefs.md',
         auth: [AuthType::KEY],
@@ -726,7 +705,6 @@ App::get('/v1/users/:userId/targets/:targetId')
     ->label('scope', 'targets.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'targets',
         name: 'getTarget',
         description: '/docs/references/users/get-user-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -764,7 +742,6 @@ App::get('/v1/users/:userId/sessions')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'sessions',
         name: 'listSessions',
         description: '/docs/references/users/list-user-sessions.md',
         auth: [AuthType::KEY],
@@ -811,7 +788,6 @@ App::get('/v1/users/:userId/memberships')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'memberships',
         name: 'listMemberships',
         description: '/docs/references/users/list-user-memberships.md',
         auth: [AuthType::KEY],
@@ -823,11 +799,9 @@ App::get('/v1/users/:userId/memberships')
         ]
     ))
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('queries', [], new Memberships(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Memberships::ALLOWED_ATTRIBUTES), true)
-    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function (string $userId, array $queries, string $search, Response $response, Database $dbForProject) {
+    ->action(function (string $userId, Response $response, Database $dbForProject) {
 
         $user = $dbForProject->getDocument('users', $userId);
 
@@ -835,19 +809,6 @@ App::get('/v1/users/:userId/memberships')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
-        try {
-            $queries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        if (!empty($search)) {
-            $queries[] = Query::search('search', $search);
-        }
-
-        // Set internal queries
-        $queries[] = Query::equal('userInternalId', [$user->getInternalId()]);
-
         $memberships = array_map(function ($membership) use ($dbForProject, $user) {
             $team = $dbForProject->getDocument('teams', $membership->getAttribute('teamId'));
 
@@ -857,7 +818,7 @@ App::get('/v1/users/:userId/memberships')
                 ->setAttribute('userEmail', $user->getAttribute('email'));
 
             return $membership;
-        }, $dbForProject->find('memberships', $queries));
+        }, $user->getAttribute('memberships', []));
 
         $response->dynamic(new Document([
             'memberships' => $memberships,
@@ -871,7 +832,6 @@ App::get('/v1/users/:userId/logs')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'logs',
         name: 'listLogs',
         description: '/docs/references/users/list-user-logs.md',
         auth: [AuthType::KEY],
@@ -968,7 +928,6 @@ App::get('/v1/users/:userId/targets')
     ->label('scope', 'targets.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'targets',
         name: 'listTargets',
         description: '/docs/references/users/list-user-targets.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -1021,15 +980,10 @@ App::get('/v1/users/:userId/targets')
 
             $cursor->setValue($cursorDocument);
         }
-        try {
-            $targets = $dbForProject->find('targets', $queries);
-            $total = $dbForProject->count('targets', $queries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'targets' => $targets,
-            'total' => $total,
+            'targets' => $dbForProject->find('targets', $queries),
+            'total' => $dbForProject->count('targets', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_TARGET_LIST);
     });
 
@@ -1039,7 +993,6 @@ App::get('/v1/users/identities')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'identities',
         name: 'listIdentities',
         description: '/docs/references/users/list-identities.md',
         auth: [AuthType::KEY],
@@ -1092,15 +1045,10 @@ App::get('/v1/users/identities')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $identities = $dbForProject->find('identities', $queries);
-            $total = $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
         $response->dynamic(new Document([
-            'identities' => $identities,
-            'total' => $total,
+            'identities' => $dbForProject->find('identities', $queries),
+            'total' => $dbForProject->count('identities', $filterQueries, APP_LIMIT_COUNT),
         ]), Response::MODEL_IDENTITY_LIST);
     });
 
@@ -1114,7 +1062,6 @@ App::patch('/v1/users/:userId/status')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updateStatus',
         description: '/docs/references/users/update-user-status.md',
         auth: [AuthType::KEY],
@@ -1155,7 +1102,6 @@ App::put('/v1/users/:userId/labels')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updateLabels',
         description: '/docs/references/users/update-user-labels.md',
         auth: [AuthType::KEY],
@@ -1198,7 +1144,6 @@ App::patch('/v1/users/:userId/verification/phone')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updatePhoneVerification',
         description: '/docs/references/users/update-user-phone-verification.md',
         auth: [AuthType::KEY],
@@ -1240,7 +1185,6 @@ App::patch('/v1/users/:userId/name')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updateName',
         description: '/docs/references/users/update-user-name.md',
         auth: [AuthType::KEY],
@@ -1283,7 +1227,6 @@ App::patch('/v1/users/:userId/password')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updatePassword',
         description: '/docs/references/users/update-user-password.md',
         auth: [AuthType::KEY],
@@ -1366,7 +1309,6 @@ App::patch('/v1/users/:userId/email')
     ->label('audits.userId', '{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updateEmail',
         description: '/docs/references/users/update-user-email.md',
         auth: [AuthType::KEY],
@@ -1466,7 +1408,6 @@ App::patch('/v1/users/:userId/phone')
     ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updatePhone',
         description: '/docs/references/users/update-user-phone.md',
         auth: [AuthType::KEY],
@@ -1556,7 +1497,6 @@ App::patch('/v1/users/:userId/verification')
     ->label('audits.userId', '{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updateEmailVerification',
         description: '/docs/references/users/update-user-email-verification.md',
         auth: [AuthType::KEY],
@@ -1594,7 +1534,6 @@ App::patch('/v1/users/:userId/prefs')
     ->label('scope', 'users.write')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updatePrefs',
         description: '/docs/references/users/update-user-prefs.md',
         auth: [AuthType::KEY],
@@ -1635,7 +1574,6 @@ App::patch('/v1/users/:userId/targets/:targetId')
     ->label('scope', 'targets.write')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'targets',
         name: 'updateTarget',
         description: '/docs/references/users/update-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -1740,7 +1678,6 @@ App::patch('/v1/users/:userId/mfa')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'updateMfa',
         description: '/docs/references/users/update-user-mfa.md',
         auth: [AuthType::KEY],
@@ -1780,7 +1717,6 @@ App::get('/v1/users/:userId/mfa/factors')
     ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'mfa',
         name: 'listMfaFactors',
         description: '/docs/references/users/list-mfa-factors.md',
         auth: [AuthType::KEY],
@@ -1819,7 +1755,6 @@ App::get('/v1/users/:userId/mfa/recovery-codes')
     ->label('usage.metric', 'users.{scope}.requests.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'mfa',
         name: 'getMfaRecoveryCodes',
         description: '/docs/references/users/get-mfa-recovery-codes.md',
         auth: [AuthType::KEY],
@@ -1864,7 +1799,6 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'mfa',
         name: 'createMfaRecoveryCodes',
         description: '/docs/references/users/create-mfa-recovery-codes.md',
         auth: [AuthType::KEY],
@@ -1906,7 +1840,7 @@ App::patch('/v1/users/:userId/mfa/recovery-codes')
     });
 
 App::put('/v1/users/:userId/mfa/recovery-codes')
-    ->desc('Update MFA recovery codes (regenerate)')
+    ->desc('Regenerate MFA recovery codes')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.mfa.recovery-codes')
     ->label('scope', 'users.write')
@@ -1916,7 +1850,6 @@ App::put('/v1/users/:userId/mfa/recovery-codes')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'mfa',
         name: 'updateMfaRecoveryCodes',
         description: '/docs/references/users/update-mfa-recovery-codes.md',
         auth: [AuthType::KEY],
@@ -1967,7 +1900,6 @@ App::delete('/v1/users/:userId/mfa/authenticators/:type')
     ->label('usage.metric', 'users.{scope}.requests.update')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'mfa',
         name: 'deleteMfaAuthenticator',
         description: '/docs/references/users/delete-mfa-authenticator.md',
         auth: [AuthType::KEY],
@@ -2015,7 +1947,6 @@ App::post('/v1/users/:userId/sessions')
     ->label('usage.metric', 'sessions.{scope}.requests.create')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'sessions',
         name: 'createSession',
         description: '/docs/references/users/create-session.md',
         auth: [AuthType::KEY],
@@ -2100,7 +2031,6 @@ App::post('/v1/users/:userId/tokens')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'sessions',
         name: 'createToken',
         description: '/docs/references/users/create-token.md',
         auth: [AuthType::KEY],
@@ -2163,7 +2093,6 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'sessions',
         name: 'deleteSession',
         description: '/docs/references/users/delete-user-session.md',
         auth: [AuthType::KEY],
@@ -2214,7 +2143,6 @@ App::delete('/v1/users/:userId/sessions')
     ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'sessions',
         name: 'deleteSessions',
         description: '/docs/references/users/delete-user-sessions.md',
         auth: [AuthType::KEY],
@@ -2264,7 +2192,6 @@ App::delete('/v1/users/:userId')
     ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'users',
         name: 'delete',
         description: '/docs/references/users/delete.md',
         auth: [AuthType::KEY],
@@ -2293,8 +2220,6 @@ App::delete('/v1/users/:userId')
         $clone = clone $user;
 
         $dbForProject->deleteDocument('users', $userId);
-        DeleteIdentities::delete($dbForProject, Query::equal('userInternalId', [$user->getInternalId()]));
-        DeleteTargets::delete($dbForProject, Query::equal('userInternalId', [$user->getInternalId()]));
 
         $queueForDeletes
             ->setType(DELETE_TYPE_DOCUMENT)
@@ -2316,7 +2241,6 @@ App::delete('/v1/users/:userId/targets/:targetId')
     ->label('scope', 'targets.write')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'targets',
         name: 'deleteTarget',
         description: '/docs/references/users/delete-target.md',
         auth: [AuthType::KEY, AuthType::ADMIN],
@@ -2374,7 +2298,6 @@ App::delete('/v1/users/identities/:identityId')
     ->label('audits.resource', 'identity/{request.$identityId}')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'identities',
         name: 'deleteIdentity',
         description: '/docs/references/users/delete-identity.md',
         auth: [AuthType::KEY],
@@ -2414,7 +2337,6 @@ App::post('/v1/users/:userId/jwts')
     ->label('scope', 'users.write')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: 'sessions',
         name: 'createJWT',
         description: '/docs/references/users/create-user-jwt.md',
         auth: [AuthType::KEY],
@@ -2470,7 +2392,6 @@ App::get('/v1/users/usage')
     ->label('scope', 'users.read')
     ->label('sdk', new Method(
         namespace: 'users',
-        group: null,
         name: 'getUsage',
         description: '/docs/references/users/get-usage.md',
         auth: [AuthType::ADMIN],

app/controllers/api/vcs.php

@@ -14,12 +14,11 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Vcs\Comment;
 use Utopia\App;
+use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\Exception\Order as OrderException;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -27,35 +26,22 @@ use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Detector\Detection\Framework\Astro;
-use Utopia\Detector\Detection\Framework\Flutter;
-use Utopia\Detector\Detection\Framework\NextJs;
-use Utopia\Detector\Detection\Framework\Nuxt;
-use Utopia\Detector\Detection\Framework\Remix;
-use Utopia\Detector\Detection\Framework\SvelteKit;
-use Utopia\Detector\Detection\Packager\NPM;
-use Utopia\Detector\Detection\Packager\PNPM;
-use Utopia\Detector\Detection\Packager\Yarn;
-use Utopia\Detector\Detection\Runtime\Bun;
-use Utopia\Detector\Detection\Runtime\CPP;
-use Utopia\Detector\Detection\Runtime\Dart;
-use Utopia\Detector\Detection\Runtime\Deno;
-use Utopia\Detector\Detection\Runtime\Dotnet;
-use Utopia\Detector\Detection\Runtime\Java;
-use Utopia\Detector\Detection\Runtime\Node;
-use Utopia\Detector\Detection\Runtime\PHP;
-use Utopia\Detector\Detection\Runtime\Python;
-use Utopia\Detector\Detection\Runtime\Ruby;
-use Utopia\Detector\Detection\Runtime\Swift;
-use Utopia\Detector\Detector\Framework;
-use Utopia\Detector\Detector\Packager;
-use Utopia\Detector\Detector\Runtime;
-use Utopia\Detector\Detector\Strategy;
+use Utopia\Detector\Adapter\Bun;
+use Utopia\Detector\Adapter\CPP;
+use Utopia\Detector\Adapter\Dart;
+use Utopia\Detector\Adapter\Deno;
+use Utopia\Detector\Adapter\Dotnet;
+use Utopia\Detector\Adapter\Java;
+use Utopia\Detector\Adapter\JavaScript;
+use Utopia\Detector\Adapter\PHP;
+use Utopia\Detector\Adapter\Python;
+use Utopia\Detector\Adapter\Ruby;
+use Utopia\Detector\Adapter\Swift;
+use Utopia\Detector\Detector;
 use Utopia\System\System;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\Host;
 use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
 use Utopia\VCS\Adapter\Git\GitHub;
 use Utopia\VCS\Exception\RepositoryNotFound;
 
@@ -63,30 +49,29 @@ 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, Build $queueForBuilds, callable $getProjectDB, Request $request) {
     $errors = [];
-    foreach ($repositories as $repository) {
+    foreach ($repositories as $resource) {
         try {
-            $resourceType = $repository->getAttribute('resourceType');
+            $resourceType = $resource->getAttribute('resourceType');
 
-            if ($resourceType !== "function" && $resourceType !== "site") {
+            if ($resourceType !== "function") {
                 continue;
             }
 
-            $projectId = $repository->getAttribute('projectId');
+            $projectId = $resource->getAttribute('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));
-            $resourceInternalId = $resource->getInternalId();
+            $functionId = $resource->getAttribute('resourceId');
+            $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+            $functionInternalId = $function->getInternalId();
 
             $deploymentId = ID::unique();
-            $repositoryId = $repository->getId();
-            $repositoryInternalId = $repository->getInternalId();
-            $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
-            $installationId = $repository->getAttribute('installationId');
-            $installationInternalId = $repository->getAttribute('installationInternalId');
-            $productionBranch = $resource->getAttribute('providerBranch');
+            $repositoryId = $resource->getId();
+            $repositoryInternalId = $resource->getInternalId();
+            $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+            $installationId = $resource->getAttribute('installationId');
+            $installationInternalId = $resource->getAttribute('installationInternalId');
+            $productionBranch = $function->getAttribute('providerBranch');
             $activate = false;
 
             if ($providerBranch == $productionBranch && $external === false) {
@@ -110,7 +95,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
             $isAuthorized = !$external;
 
             if (!$isAuthorized && !empty($providerPullRequestId)) {
-                if (\in_array($providerPullRequestId, $repository->getAttribute('providerPullRequestIds', []))) {
+                if (\in_array($providerPullRequestId, $resource->getAttribute('providerPullRequestIds', []))) {
                     $isAuthorized = true;
                 }
             }
@@ -123,7 +108,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
             $latestCommentId = '';
 
-            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
+            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
                 $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
                     Query::equal('providerRepositoryId', [$providerRepositoryId]),
                     Query::equal('providerPullRequestId', [$providerPullRequestId]),
@@ -132,15 +117,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
                 if (!$latestComment->isEmpty()) {
                     $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
-
                     $comment = new Comment();
                     $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
 
                     $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                 } else {
                     $comment = new Comment();
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
                     $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));
 
                     if (!empty($latestCommentId)) {
@@ -177,19 +161,19 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                     $latestCommentId = $comment->getAttribute('providerCommentId', '');
                     $comment = new Comment();
                     $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
 
                     $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                 }
             }
 
             if (!$isAuthorized) {
-                $resourceName = $resource->getAttribute('name');
+                $functionName = $function->getAttribute('name');
                 $projectName = $project->getAttribute('name');
-                $name = "{$resourceName} ({$projectName})";
+                $name = "{$functionName} ({$projectName})";
                 $message = 'Authorization required for external contributor.';
 
-                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
                 try {
                     $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                     if (empty($repositoryName)) {
@@ -209,32 +193,18 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 $providerRepositoryOwner = $pullRequestResponse['head']['repo']['name'];
             }
 
-            $commands = [];
-            if (!empty($resource->getAttribute('installCommand', ''))) {
-                $commands[] = $resource->getAttribute('installCommand', '');
-            }
-            if (!empty($resource->getAttribute('buildCommand', ''))) {
-                $commands[] = $resource->getAttribute('buildCommand', '');
-            }
-            if (!empty($resource->getAttribute('commands', ''))) {
-                $commands[] = $resource->getAttribute('commands', '');
-            }
-
-            $deployment = Authorization::skip(fn () => $dbForProject->createDocument('deployments', new Document([
+            $deployment = $dbForProject->createDocument('deployments', new Document([
                 '$id' => $deploymentId,
                 '$permissions' => [
                     Permission::read(Role::any()),
                     Permission::update(Role::any()),
                     Permission::delete(Role::any()),
                 ],
-                'resourceId' => $resourceId,
-                'resourceInternalId' => $resourceInternalId,
-                'resourceType' => $resourceCollection,
-                'entrypoint' => $resource->getAttribute('entrypoint', ''),
-                'buildCommands' => \implode(' && ', $commands),
-                'buildOutput' => $resource->getAttribute('outputDirectory', ''),
-                'adapter' => $resource->getAttribute('adapter', ''),
-                'fallbackFile' => $resource->getAttribute('fallbackFile', ''),
+                'resourceId' => $functionId,
+                'resourceInternalId' => $functionInternalId,
+                'resourceType' => 'functions',
+                'entrypoint' => $function->getAttribute('entrypoint'),
+                'commands' => $function->getAttribute('commands'),
                 'type' => 'vcs',
                 'installationId' => $installationId,
                 'installationInternalId' => $installationInternalId,
@@ -248,119 +218,21 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 'providerCommitHash' => $providerCommitHash,
                 'providerCommitAuthorUrl' => $providerCommitAuthorUrl,
                 'providerCommitAuthor' => $providerCommitAuthor,
-                'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 255, '...'),
+                'providerCommitMessage' => $providerCommitMessage,
                 'providerCommitUrl' => $providerCommitUrl,
                 'providerCommentId' => \strval($latestCommentId),
                 'providerBranch' => $providerBranch,
+                'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
                 'activate' => $activate,
-            ])));
+            ]));
 
-            $resource = $resource
-                ->setAttribute('latestDeploymentId', $deployment->getId())
-                ->setAttribute('latestDeploymentInternalId', $deployment->getInternalId())
-                ->setAttribute('latestDeploymentCreatedAt', $deployment->getCreatedAt())
-                ->setAttribute('latestDeploymentStatus', $deployment->getAttribute('status', ''));
-            Authorization::skip(fn () => $dbForProject->updateDocument($resource->getCollection(), $resource->getId(), $resource));
-
-            if ($resource->getCollection() === 'sites') {
-                $projectId = $project->getId();
-
-                // Deployment preview
-                $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-                $domain = ID::unique() . "." . $sitesDomain;
-                $ruleId = md5($domain);
-                Authorization::skip(
-                    fn () => $dbForPlatform->createDocument('rules', new Document([
-                        '$id' => $ruleId,
-                        'projectId' => $project->getId(),
-                        'projectInternalId' => $project->getInternalId(),
-                        'domain' => $domain,
-                        'type' => 'deployment',
-                        'trigger' => 'deployment',
-                        'deploymentId' => $deployment->getId(),
-                        'deploymentInternalId' => $deployment->getInternalId(),
-                        'deploymentResourceType' => 'site',
-                        'deploymentResourceId' => $resourceId,
-                        'deploymentResourceInternalId' => $resourceInternalId,
-                        'deploymentVcsProviderBranch' => $providerBranch,
-                        'status' => 'verified',
-                        'certificateId' => '',
-                        'search' => implode(' ', [$ruleId, $domain]),
-                        'owner' => 'Appwrite',
-                        'region' => $project->getAttribute('region')
-                    ]))
-                );
-
-                // VCS branch preview
-                if (!empty($providerBranch)) {
-                    $domain = "branch-{$providerBranch}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
-                    $ruleId = md5($domain);
-                    try {
-                        Authorization::skip(
-                            fn () => $dbForPlatform->createDocument('rules', new Document([
-                                '$id' => $ruleId,
-                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
-                                'domain' => $domain,
-                                'type' => 'deployment',
-                                'trigger' => 'deployment',
-                                'deploymentId' => $deployment->getId(),
-                                'deploymentInternalId' => $deployment->getInternalId(),
-                                'deploymentResourceType' => 'site',
-                                'deploymentResourceId' => $resourceId,
-                                'deploymentResourceInternalId' => $resourceInternalId,
-                                'deploymentVcsProviderBranch' => $providerBranch,
-                                'status' => 'verified',
-                                'certificateId' => '',
-                                'search' => implode(' ', [$ruleId, $domain]),
-                                'owner' => 'Appwrite',
-                                'region' => $project->getAttribute('region')
-                            ]))
-                        );
-                    } catch (Duplicate $err) {
-                        // Ignore, rule already exists; will be updated by builds worker
-                    }
-                }
-
-                // VCS commit preview
-                if (!empty($providerCommitHash)) {
-                    $domain = "commit-{$providerCommitHash}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
-                    $ruleId = md5($domain);
-                    try {
-                        Authorization::skip(
-                            fn () => $dbForPlatform->createDocument('rules', new Document([
-                                '$id' => $ruleId,
-                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
-                                'domain' => $domain,
-                                'type' => 'deployment',
-                                'trigger' => 'deployment',
-                                'deploymentId' => $deployment->getId(),
-                                'deploymentInternalId' => $deployment->getInternalId(),
-                                'deploymentResourceType' => 'site',
-                                'deploymentResourceId' => $resourceId,
-                                'deploymentResourceInternalId' => $resourceInternalId,
-                                'deploymentVcsProviderBranch' => $providerBranch,
-                                'status' => 'verified',
-                                'certificateId' => '',
-                                'search' => implode(' ', [$ruleId, $domain]),
-                                'owner' => 'Appwrite',
-                                'region' => $project->getAttribute('region')
-                            ]))
-                        );
-                    } catch (Duplicate $err) {
-                        // Ignore, rule already exists; will be updated by builds worker
-                    }
-                }
-            }
-
-            if (!empty($providerCommitHash) && $resource->getAttribute('providerSilentMode', false) === false) {
-                $resourceName = $resource->getAttribute('name');
+            if (!empty($providerCommitHash) && $function->getAttribute('providerSilentMode', false) === false) {
+                $functionName = $function->getAttribute('name');
                 $projectName = $project->getAttribute('name');
-                $name = "{$resourceName} ({$projectName})";
+                $name = "{$functionName} ({$projectName})";
                 $message = 'Starting...';
 
-                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
                 try {
                     $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                     if (empty($repositoryName)) {
@@ -371,17 +243,17 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 }
                 $owner = $github->getOwnerName($providerInstallationId);
 
-                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/$resourceCollection/$resourceType-$resourceId";
+                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/functions/function-$functionId";
                 $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, 'pending', $message, $providerTargetUrl, $name);
             }
 
             $queueForBuilds
                 ->setType(BUILD_TYPE_DEPLOYMENT)
-                ->setResource($resource)
+                ->setResource($function)
                 ->setDeployment($deployment)
                 ->setProject($project); // set the project because it won't be set for git deployments
 
-            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function/site
+            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function
 
             //TODO: Add event?
         } catch (Throwable $e) {
@@ -397,13 +269,12 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 };
 
 App::get('/v1/vcs/github/authorize')
-    ->desc('Create GitHub app installation')
+    ->desc('Install GitHub app')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.read')
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'installations',
         name: 'createGitHubInstallation',
         description: '/docs/references/vcs/create-github-installation.md',
         auth: [AuthType::ADMIN],
@@ -447,7 +318,7 @@ App::get('/v1/vcs/github/authorize')
     });
 
 App::get('/v1/vcs/github/callback')
-    ->desc('Get installation and authorization from GitHub app')
+    ->desc('Capture installation and authorization from GitHub app')
     ->groups(['api', 'vcs'])
     ->label('scope', 'public')
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
@@ -585,7 +456,6 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'getRepositoryContents',
         description: '/docs/references/vcs/get-repository-contents.md',
         auth: [AuthType::ADMIN],
@@ -646,36 +516,30 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
         ]), Response::MODEL_VCS_CONTENT_LIST);
     });
 
-App::post('/v1/vcs/github/installations/:installationId/detections')
-    ->alias('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
-    ->desc('Create repository detection')
+App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:providerRepositoryId/detection')
+    ->desc('Detect runtime settings from source code')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'createRepositoryDetection',
         description: '/docs/references/vcs/create-repository-detection.md',
         auth: [AuthType::ADMIN],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_DETECTION_RUNTIME,
-            ),
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_DETECTION_FRAMEWORK,
+                model: Response::MODEL_DETECTION,
             )
         ]
     ))
     ->param('installationId', '', new Text(256), 'Installation Id')
     ->param('providerRepositoryId', '', new Text(256), 'Repository Id')
-    ->param('type', '', new WhiteList(['runtime', 'framework']), 'Detector type. Must be one of the following: runtime, framework')
     ->param('providerRootDirectory', '', new Text(256, 0), 'Path to Root Directory', true)
     ->inject('gitHub')
     ->inject('response')
+    ->inject('project')
     ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $providerRepositoryId, string $type, string $providerRootDirectory, GitHub $github, Response $response, Database $dbForPlatform) {
+    ->action(function (string $installationId, string $providerRepositoryId, string $providerRootDirectory, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
         $installation = $dbForPlatform->getDocument('installations', $installationId);
 
         if ($installation->isEmpty()) {
@@ -701,108 +565,32 @@ App::post('/v1/vcs/github/installations/:installationId/detections')
         $files = \array_column($files, 'name');
         $languages = $github->listRepositoryLanguages($owner, $repositoryName);
 
-        $detector = new Packager($files);
-        $detector
-            ->addOption(new Yarn())
-            ->addOption(new PNPM())
-            ->addOption(new NPM());
-        $detection = $detector->detect();
+        $detectorFactory = new Detector($files, $languages);
 
-        $packager = !\is_null($detection) ? $detection->getName() : 'npm';
+        $detectorFactory
+            ->addDetector(new JavaScript())
+            ->addDetector(new Bun())
+            ->addDetector(new PHP())
+            ->addDetector(new Python())
+            ->addDetector(new Dart())
+            ->addDetector(new Swift())
+            ->addDetector(new Ruby())
+            ->addDetector(new Java())
+            ->addDetector(new CPP())
+            ->addDetector(new Deno())
+            ->addDetector(new Dotnet());
 
-        if ($type === 'framework') {
-            $output = new Document([
-                'framework' => '',
-                'installCommand' => '',
-                'buildCommand' => '',
-                'outputDirectory' => '',
-            ]);
+        $runtime = $detectorFactory->detect();
 
-            $detector = new Framework($files, $packager);
-            $detector
-                ->addOption(new Flutter())
-                ->addOption(new Nuxt())
-                ->addOption(new Astro())
-                ->addOption(new SvelteKit())
-                ->addOption(new NextJs())
-                ->addOption(new Remix());
+        $runtimes = Config::getParam('runtimes');
+        $runtimeDetail = \array_reverse(\array_filter(\array_keys($runtimes), function ($key) use ($runtime, $runtimes) {
+            return $runtimes[$key]['key'] === $runtime;
+        }))[0] ?? '';
 
-            $framework = $detector->detect();
+        $detection = [];
+        $detection['runtime'] = $runtimeDetail;
 
-            if (!\is_null($framework)) {
-                $output->setAttribute('installCommand', $framework->getInstallCommand());
-                $output->setAttribute('buildCommand', $framework->getBuildCommand());
-                $output->setAttribute('outputDirectory', $framework->getOutputDirectory());
-                $framework = $framework->getName();
-            } else {
-                $framework = 'other';
-                $output->setAttribute('installCommand', '');
-                $output->setAttribute('buildCommand', '');
-                $output->setAttribute('outputDirectory', '');
-            }
-
-            $frameworks = Config::getParam('frameworks');
-            if (!\in_array($framework, \array_keys($frameworks), true)) {
-                $framework = 'other';
-            }
-            $output->setAttribute('framework', $framework);
-        } else {
-            $output = new Document([
-                'runtime' => '',
-                'commands' => '',
-                'entrypoint' => '',
-            ]);
-
-            $strategies = [
-                new Strategy(Strategy::FILEMATCH),
-                new Strategy(Strategy::LANGUAGES),
-                new Strategy(Strategy::EXTENSION),
-            ];
-
-            foreach ($strategies as $strategy) {
-                $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
-                $detector
-                    ->addOption(new Node())
-                    ->addOption(new Bun())
-                    ->addOption(new Deno())
-                    ->addOption(new PHP())
-                    ->addOption(new Python())
-                    ->addOption(new Dart())
-                    ->addOption(new Swift())
-                    ->addOption(new Ruby())
-                    ->addOption(new Java())
-                    ->addOption(new CPP())
-                    ->addOption(new Dotnet());
-
-                $runtime = $detector->detect();
-
-                if (!\is_null($runtime)) {
-                    $output->setAttribute('commands', $runtime->getCommands());
-                    $output->setAttribute('entrypoint', $runtime->getEntrypoint());
-                    $runtime = $runtime->getName();
-                    break;
-                }
-            }
-
-            if (!empty($runtime)) {
-                $runtimes = Config::getParam('runtimes');
-                $runtimeWithVersion = '';
-                foreach ($runtimes as $runtimeKey => $runtimeConfig) {
-                    if ($runtimeConfig['key'] === $runtime) {
-                        $runtimeWithVersion = $runtimeKey;
-                    }
-                }
-
-                if (empty($runtimeWithVersion)) {
-                    throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
-                }
-
-                $output->setAttribute('runtime', $runtimeWithVersion);
-            } else {
-                throw new Exception(Exception::FUNCTION_RUNTIME_NOT_DETECTED);
-            }
-        }
-        $response->dynamic($output, $type === 'framework' ? Response::MODEL_DETECTION_FRAMEWORK : Response::MODEL_DETECTION_RUNTIME);
+        $response->dynamic(new Document($detection), Response::MODEL_DETECTION);
     });
 
 App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
@@ -811,28 +599,23 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'listRepositories',
         description: '/docs/references/vcs/list-repositories.md',
         auth: [AuthType::ADMIN],
         responses: [
             new SDKResponse(
                 code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST,
-            ),
-            new SDKResponse(
-                code: Response::STATUS_CODE_OK,
-                model: Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST,
+                model: Response::MODEL_PROVIDER_REPOSITORY_LIST,
             )
         ]
     ))
     ->param('installationId', '', new Text(256), 'Installation Id')
-    ->param('type', '', new WhiteList(['runtime', 'framework']), 'Detector type. Must be one of the following: runtime, framework')
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('gitHub')
     ->inject('response')
+    ->inject('project')
     ->inject('dbForPlatform')
-    ->action(function (string $installationId, string $type, string $search, GitHub $github, Response $response, Database $dbForPlatform) {
+    ->action(function (string $installationId, string $search, GitHub $github, Response $response, Document $project, Database $dbForPlatform) {
         if (empty($search)) {
             $search = "";
         }
@@ -862,86 +645,39 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
             return $repo;
         }, $repos);
 
-        $repos = batch(\array_map(function ($repo) use ($type, $github) {
-            return function () use ($repo, $type, $github) {
-                $files = $github->listRepositoryContents($repo['organization'], $repo['name'], '');
-                $files = \array_column($files, 'name');
-
-                $detector = new Packager($files);
-                $detector
-                    ->addOption(new Yarn())
-                    ->addOption(new PNPM())
-                    ->addOption(new NPM());
-                $detection = $detector->detect();
-
-                $packager = !\is_null($detection) ? $detection->getName() : 'npm';
-
-                if ($type === 'framework') {
-                    $frameworkDetector = new Framework($files, $packager);
-                    $frameworkDetector
-                        ->addOption(new Flutter())
-                        ->addOption(new Nuxt())
-                        ->addOption(new Astro())
-                        ->addOption(new SvelteKit())
-                        ->addOption(new NextJs())
-                        ->addOption(new Remix());
-
-                    $detectedFramework = $frameworkDetector->detect();
-
-                    if (!\is_null($detectedFramework)) {
-                        $framework = $detectedFramework->getName();
-                    } else {
-                        $framework = 'other';
-                    }
-
-                    $frameworks = Config::getParam('frameworks');
-                    if (!\in_array($framework, \array_keys($frameworks), true)) {
-                        $framework = 'other';
-                    }
-                    $repo['framework'] = $framework;
-                } else {
+        $repos = batch(\array_map(function ($repo) use ($github) {
+            return function () use ($repo, $github) {
+                try {
+                    $files = $github->listRepositoryContents($repo['organization'], $repo['name'], '');
+                    $files = \array_column($files, 'name');
                     $languages = $github->listRepositoryLanguages($repo['organization'], $repo['name']);
 
-                    $strategies = [
-                        new Strategy(Strategy::FILEMATCH),
-                        new Strategy(Strategy::LANGUAGES),
-                        new Strategy(Strategy::EXTENSION),
-                    ];
+                    $detectorFactory = new Detector($files, $languages);
 
-                    foreach ($strategies as $strategy) {
-                        $detector = new Runtime($strategy === Strategy::LANGUAGES ? $languages : $files, $strategy, $packager);
-                        $detector
-                            ->addOption(new Node())
-                            ->addOption(new Bun())
-                            ->addOption(new Deno())
-                            ->addOption(new PHP())
-                            ->addOption(new Python())
-                            ->addOption(new Dart())
-                            ->addOption(new Swift())
-                            ->addOption(new Ruby())
-                            ->addOption(new Java())
-                            ->addOption(new CPP())
-                            ->addOption(new Dotnet());
+                    $detectorFactory
+                        ->addDetector(new JavaScript())
+                        ->addDetector(new Bun())
+                        ->addDetector(new PHP())
+                        ->addDetector(new Python())
+                        ->addDetector(new Dart())
+                        ->addDetector(new Swift())
+                        ->addDetector(new Ruby())
+                        ->addDetector(new Java())
+                        ->addDetector(new CPP())
+                        ->addDetector(new Deno())
+                        ->addDetector(new Dotnet());
 
-                        $runtime = $detector->detect();
+                    $runtime = $detectorFactory->detect();
 
-                        if (!\is_null($runtime)) {
-                            $runtime = $runtime->getName();
-                            break;
-                        }
-                    }
+                    $runtimes = Config::getParam('runtimes');
+                    $runtimeDetail = \array_reverse(\array_filter(\array_keys($runtimes), function ($key) use ($runtime, $runtimes) {
+                        return $runtimes[$key]['key'] === $runtime;
+                    }))[0] ?? '';
 
-                    if (!empty($runtime)) {
-                        $runtimes = Config::getParam('runtimes');
-                        $runtimeWithVersion = '';
-                        foreach ($runtimes as $runtimeKey => $runtimeConfig) {
-                            if ($runtimeConfig['key'] === $runtime) {
-                                $runtimeWithVersion = $runtimeKey;
-                            }
-                        }
-
-                        $repo['runtime'] = $runtimeWithVersion ?? '';
-                    }
+                    $repo['runtime'] = $runtimeDetail;
+                } catch (Throwable $error) {
+                    $repo['runtime'] = "";
+                    Console::warning("Runtime not detected for " . $repo['organization'] . "/" . $repo['name']);
                 }
                 return $repo;
             };
@@ -952,9 +688,9 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
         }, $repos);
 
         $response->dynamic(new Document([
-            $type === 'framework' ? 'frameworkProviderRepositories' : 'runtimeProviderRepositories' => $repos,
+            'providerRepositories' => $repos,
             'total' => \count($repos),
-        ]), ($type === 'framework') ? Response::MODEL_PROVIDER_REPOSITORY_FRAMEWORK_LIST : Response::MODEL_PROVIDER_REPOSITORY_RUNTIME_LIST);
+        ]), Response::MODEL_PROVIDER_REPOSITORY_LIST);
     });
 
 App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
@@ -963,7 +699,6 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'createRepository',
         description: '/docs/references/vcs/create-repository.md',
         auth: [AuthType::ADMIN],
@@ -1076,7 +811,6 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'getRepository',
         description: '/docs/references/vcs/get-repository.md',
         auth: [AuthType::ADMIN],
@@ -1131,7 +865,6 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories/:pro
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'listRepositoryBranches',
         description: '/docs/references/vcs/list-repository-branches.md',
         auth: [AuthType::ADMIN],
@@ -1224,7 +957,7 @@ App::post('/v1/vcs/github/events')
 
                 $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
 
-                //find resourceId from relevant resources table
+                //find functionId from functions table
                 $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                     Query::equal('providerRepositoryId', [$providerRepositoryId]),
                     Query::limit(100),
@@ -1236,7 +969,7 @@ App::post('/v1/vcs/github/events')
                 }
             } elseif ($event == $github::EVENT_INSTALLATION) {
                 if ($parsedPayload["action"] == "deleted") {
-                    // TODO: Use worker for this job instead (update function/site as well)
+                    // TODO: Use worker for this job instead (update function as well)
                     $providerInstallationId = $parsedPayload["installationId"];
 
                     $installations = $dbForPlatform->find('installations', [
@@ -1325,7 +1058,6 @@ App::get('/v1/vcs/installations')
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'installations',
         name: 'listInstallations',
         description: '/docs/references/vcs/list-installations.md',
         auth: [AuthType::ADMIN],
@@ -1381,12 +1113,9 @@ App::get('/v1/vcs/installations')
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
-        try {
-            $results = $dbForPlatform->find('installations', $queries);
-            $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
-        } catch (OrderException $e) {
-            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.");
-        }
+
+        $results = $dbForPlatform->find('installations', $queries);
+        $total = $dbForPlatform->count('installations', $filterQueries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
             'installations' => $results,
@@ -1400,7 +1129,6 @@ App::get('/v1/vcs/installations/:installationId')
     ->label('scope', 'vcs.read')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'installations',
         name: 'getInstallation',
         description: '/docs/references/vcs/get-installation.md',
         auth: [AuthType::ADMIN],
@@ -1435,7 +1163,6 @@ App::delete('/v1/vcs/installations/:installationId')
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'installations',
         name: 'deleteInstallation',
         description: '/docs/references/vcs/delete-installation.md',
         auth: [AuthType::ADMIN],
@@ -1471,12 +1198,11 @@ App::delete('/v1/vcs/installations/:installationId')
     });
 
 App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositoryId')
-    ->desc('Update external deployment (authorize)')
+    ->desc('Authorize external deployment')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.write')
     ->label('sdk', new Method(
         namespace: 'vcs',
-        group: 'repositories',
         name: 'updateExternalDeployments',
         description: '/docs/references/vcs/update-external-deployments.md',
         auth: [AuthType::ADMIN],

app/controllers/shared/api.php

@@ -92,20 +92,8 @@ $eventDatabaseListener = function (Document $project, Document $document, Respon
 
 $usageDatabaseListener = function (string $event, Document $document, StatsUsage $queueForStatsUsage) {
     $value = 1;
-
-    switch ($event) {
-        case Database::EVENT_DOCUMENT_DELETE:
-            $value = -1;
-            break;
-        case Database::EVENT_DOCUMENTS_DELETE:
-            $value = -1 * $document->getAttribute('modified', 0);
-            break;
-        case Database::EVENT_DOCUMENTS_CREATE:
-            $value = $document->getAttribute('modified', 0);
-            break;
-        case Database::EVENT_DOCUMENTS_UPSERT:
-            $value = $document->getAttribute('created', 0);
-            break;
+    if ($event === Database::EVENT_DOCUMENT_DELETE) {
+        $value = -1;
     }
 
     switch (true) {
@@ -169,15 +157,6 @@ $usageDatabaseListener = function (string $event, Document $document, StatsUsage
             $queueForStatsUsage
                 ->addMetric(METRIC_FUNCTIONS, $value); // per project
 
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
-                    ->addReduce($document);
-            }
-            break;
-        case $document->getCollection() === 'sites':
-            $queueForStatsUsage
-                ->addMetric(METRIC_SITES, $value); // per project
-
             if ($event === Database::EVENT_DOCUMENT_DELETE) {
                 $queueForStatsUsage
                     ->addReduce($document);
@@ -187,10 +166,8 @@ $usageDatabaseListener = function (string $event, Document $document, StatsUsage
             $queueForStatsUsage
                 ->addMetric(METRIC_DEPLOYMENTS, $value) // per project
                 ->addMetric(METRIC_DEPLOYMENTS_STORAGE, $document->getAttribute('size') * $value) // per project
-                ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS), $value) // per function
-                ->addMetric(str_replace(['{resourceType}'], [$document->getAttribute('resourceType')], METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value)
-                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS), $value) // per function
-                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);
+                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_FUNCTION_ID_DEPLOYMENTS), $value) // per function
+                ->addMetric(str_replace(['{resourceType}', '{resourceInternalId}'], [$document->getAttribute('resourceType'), $document->getAttribute('resourceInternalId')], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE), $document->getAttribute('size') * $value);
             break;
         default:
             break;
@@ -261,36 +238,34 @@ App::init()
                     subject: 'keys'
                 );
 
-                if (!$dbKey) {
-                    throw new Exception(Exception::USER_UNAUTHORIZED);
-                }
+                if ($dbKey) {
+                    $accessedAt = $dbKey->getAttribute('accessedAt', '');
 
-                $accessedAt = $dbKey->getAttribute('accessedAt', 0);
-
-                if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
-                    $dbKey->setAttribute('accessedAt', DateTime::now());
-                    $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
-                    $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-                }
-
-                $sdkValidator = new WhiteList($servers, true);
-                $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
-
-                if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
-                    $sdks = $dbKey->getAttribute('sdks', []);
-
-                    if (!in_array($sdk, $sdks)) {
-                        $sdks[] = $sdk;
-                        $dbKey->setAttribute('sdks', $sdks);
-
-                        /** Update access time as well */
-                        $dbKey->setAttribute('accessedAt', Datetime::now());
+                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_KEY_ACCESS)) > $accessedAt) {
+                        $dbKey->setAttribute('accessedAt', DateTime::now());
                         $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
                         $dbForPlatform->purgeCachedDocument('projects', $project->getId());
                     }
-                }
 
-                $queueForAudits->setUser($user);
+                    $sdkValidator = new WhiteList($servers, true);
+                    $sdk = $request->getHeader('x-sdk-name', 'UNKNOWN');
+
+                    if ($sdkValidator->isValid($sdk)) {
+                        $sdks = $dbKey->getAttribute('sdks', []);
+
+                        if (!in_array($sdk, $sdks)) {
+                            $sdks[] = $sdk;
+                            $dbKey->setAttribute('sdks', $sdks);
+
+                            /** Update access time as well */
+                            $dbKey->setAttribute('accessedAt', Datetime::now());
+                            $dbForPlatform->updateDocument('keys', $dbKey->getId(), $dbKey);
+                            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
+                        }
+                    }
+
+                    $queueForAudits->setUser($user);
+                }
             }
         } // Admin User Authentication
         elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
@@ -325,7 +300,7 @@ App::init()
 
         // Update project last activity
         if (!$project->isEmpty() && $project->getId() !== 'console') {
-            $accessedAt = $project->getAttribute('accessedAt', 0);
+            $accessedAt = $project->getAttribute('accessedAt', '');
             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));
@@ -334,7 +309,7 @@ App::init()
 
         // Update user last activity
         if (!empty($user->getId())) {
-            $accessedAt = $user->getAttribute('accessedAt', 0);
+            $accessedAt = $user->getAttribute('accessedAt', '');
             if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
                 $user->setAttribute('accessedAt', DateTime::now());
 
@@ -351,8 +326,6 @@ App::init()
          */
         $method = $route->getLabel('sdk', false);
 
-        // Take the first method if there's more than one,
-        // namespace can not differ between methods on the same route
         if (\is_array($method)) {
             $method = $method[0];
         }
@@ -415,12 +388,9 @@ App::init()
     ->inject('queueForStatsUsage')
     ->inject('dbForProject')
     ->inject('timelimit')
-    ->inject('resourceToken')
     ->inject('mode')
     ->inject('apiKey')
-    ->inject('plan')
-    ->inject('devKey')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, 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) use ($usageDatabaseListener, $eventDatabaseListener) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Publisher $publisher, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, StatsUsage $queueForStatsUsage, Database $dbForProject, callable $timelimit, string $mode, ?Key $apiKey) use ($usageDatabaseListener, $eventDatabaseListener) {
 
         $route = $utopia->getRoute();
 
@@ -487,7 +457,6 @@ App::init()
                 $enabled                // Abuse is enabled
                 && !$isAppUser          // User is not API key
                 && !$isPrivilegedUser   // User is not an admin
-                && $devKey->isEmpty()  // request doesn't not contain development key
                 && $abuse->check()      // Route is rate-limited
             ) {
                 throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED);
@@ -539,9 +508,6 @@ App::init()
         $dbForProject
             ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
             ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENTS_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENTS_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
-            ->on(Database::EVENT_DOCUMENTS_UPSERT, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForStatsUsage))
             ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
                 $project,
                 $document,
@@ -554,11 +520,7 @@ App::init()
 
         $useCache = $route->getLabel('cache', false);
         if ($useCache) {
-            $route = $utopia->match($request);
-            $isImageTransformation = $route->getPath() === '/v1/storage/buckets/:bucketId/files/:fileId/preview';
-            $isDisabled = isset($plan['imageTransformations']) && $plan['imageTransformations'] === -1 && !Auth::isPrivilegedUser(Authorization::getRoles());
-
-            $key = $request->cacheIdentifier();
+            $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
             $cacheLog  = Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
             $cache = new Cache(
                 new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
@@ -567,17 +529,13 @@ App::init()
             $data = $cache->load($key, $timestamp);
 
             if (!empty($data) && !$cacheLog->isEmpty()) {
-                $parts = explode('/', $cacheLog->getAttribute('resourceType', ''));
+                $parts = explode('/', $cacheLog->getAttribute('resourceType'));
                 $type = $parts[0] ?? null;
 
-                if ($type === 'bucket' && (!$isImageTransformation || !$isDisabled)) {
+                if ($type === 'bucket') {
                     $bucketId = $parts[1] ?? null;
                     $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
-                    $isToken = !$resourceToken->isEmpty() && $resourceToken->getAttribute('bucketInternalId') === $bucket->getInternalId();
-                    $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-                    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-
                     if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAppUser && !$isPrivilegedUser)) {
                         throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
                     }
@@ -585,23 +543,20 @@ App::init()
                     $fileSecurity = $bucket->getAttribute('fileSecurity', false);
                     $validator = new Authorization(Database::PERMISSION_READ);
                     $valid = $validator->isValid($bucket->getRead());
-                    if (!$fileSecurity && !$valid && !$isToken) {
+
+                    if (!$fileSecurity && !$valid) {
                         throw new Exception(Exception::USER_UNAUTHORIZED);
                     }
 
                     $parts = explode('/', $cacheLog->getAttribute('resource'));
                     $fileId = $parts[1] ?? null;
 
-                    if ($fileSecurity && !$valid && !$isToken) {
+                    if ($fileSecurity && !$valid) {
                         $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
                     } else {
                         $file = Authorization::skip(fn () => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
                     }
 
-                    if (!$resourceToken->isEmpty() && $resourceToken->getAttribute('fileInternalId') !== $file->getInternalId()) {
-                        throw new Exception(Exception::USER_UNAUTHORIZED);
-                    }
-
                     if ($file->isEmpty()) {
                         throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                     }
@@ -618,10 +573,8 @@ App::init()
                 $response
                     ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
                     ->addHeader('X-Appwrite-Cache', 'hit')
-                    ->setContentType($cacheLog->getAttribute('mimeType'));
-                if (!$isImageTransformation || !$isDisabled) {
-                    $response->send($data);
-                }
+                    ->setContentType($cacheLog->getAttribute('mimeType'))
+                    ->send($data);
             } else {
                 $response
                     ->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
@@ -824,10 +777,10 @@ App::shutdown()
                     $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                 }
 
-                $key = $request->cacheIdentifier();
+                $key = md5($request->getURI() . '*' . implode('*', $request->getParams()) . '*' . APP_CACHE_BUSTER);
                 $signature = md5($data['payload']);
                 $cacheLog  =  Authorization::skip(fn () => $dbForProject->getDocument('cache', $key));
-                $accessedAt = $cacheLog->getAttribute('accessedAt', 0);
+                $accessedAt = $cacheLog->getAttribute('accessedAt', '');
                 $now = DateTime::now();
                 if ($cacheLog->isEmpty()) {
                     Authorization::skip(fn () => $dbForProject->createDocument('cache', new Document([

app/http.php

@@ -13,13 +13,10 @@ use Swoole\Table;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
-use Utopia\Compression\Compression;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
@@ -31,8 +28,6 @@ use Utopia\Pools\Group;
 use Utopia\Swoole\Files;
 use Utopia\System\System;
 
-Files::load(__DIR__.'/../public');
-
 const DOMAIN_SYNC_TIMER = 30; // 30 seconds
 
 $domains = new Table(1_000_000); // 1 million rows
@@ -48,6 +43,29 @@ $http = new Server(
 $payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
 $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 
+$http
+    ->set([
+        'worker_num' => $totalWorkers,
+        'dispatch_func' => 'dispatch',
+        'open_http2_protocol' => true,
+        'http_compression' => false,
+        'package_max_length' => $payloadSize,
+        'buffer_output_size' => $payloadSize,
+        'task_worker_num' => 1, // required for the task to fetch domains background
+    ]);
+
+$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
+    Console::success('Worker ' . ++$workerId . ' started successfully');
+});
+
+$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
+    Console::success('Starting reload...');
+});
+
+$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
+    Console::success('Reload completed...');
+});
+
 /**
  * Assigns HTTP requests to worker threads by analyzing its payload/content.
  *
@@ -65,105 +83,76 @@ $totalWorkers = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intva
  */
 function dispatch(Server $server, int $fd, int $type, $data = null): int
 {
-    $resolveWorkerId = function (Server $server, $data = null) {
-        global $totalWorkers, $domains;
+    global $totalWorkers, $domains;
 
-        // If data is not set we can send request to any worker
-        // first we try to pick idle worker, if not we randomly pick a worker
-        if ($data === null) {
-            for ($i = 0; $i < $totalWorkers; $i++) {
-                if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
-                    return $i;
-                }
-            }
-            return rand(0, $totalWorkers - 1);
-        }
-
-        $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
-
-        // Each worker has numeric ID, starting from 0 and incrementing
-        // From 0 to riskyWorkers, we consider safe workers
-        // From riskyWorkers to totalWorkers, we consider risky workers
-        $riskyWorkers = (int)floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
-
-        $domain = '';
-        // max up to 3 as first line has request details and second line has host
-        $lines = explode("\n", $data, 3);
-        $request = $lines[0];
-        if (count($lines) > 1) {
-            $domain = trim(explode('Host: ', $lines[1])[1]);
-        }
-
-        // Sync executions are considered risky
-        $risky = false;
-        if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
-            $risky = true;
-        } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
-            $risky = true;
-        } elseif ($domains->get(md5($domain), 'value') === 1) {
-            // executions request coming from custom domain
-            $risky = true;
-        }
-
-        if ($risky) {
-            // If risky request, only consider risky workers
-            for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
-                /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
-                if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
-                    // If idle worker found, give to him
-                    return $j;
-                }
-            }
-
-            // If no idle workers, give to random risky worker
-            $worker = rand($riskyWorkers, $totalWorkers - 1);
-            Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
-            return $worker;
-        }
-
-        // If safe request, give to any idle worker
-        // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
+    // If data is not set we can send request to any worker
+    // first we try to pick idle worker, if not we randomly pick a worker
+    if ($data === null) {
         for ($i = 0; $i < $totalWorkers; $i++) {
             if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
                 return $i;
             }
         }
+        return rand(0, $totalWorkers - 1);
+    }
 
-        // If no idle worker found, give to random safe worker
-        // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
-        $worker = rand(0, $riskyWorkers - 1);
-        Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
+    $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
+
+    // Each worker has numeric ID, starting from 0 and incrementing
+    // From 0 to riskyWorkers, we consider safe workers
+    // From riskyWorkers to totalWorkers, we consider risky workers
+    $riskyWorkers = (int) floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
+
+    $domain = '';
+    // max up to 3 as first line has request details and second line has host
+    $lines = explode("\n", $data, 3);
+    $request = $lines[0];
+    if (count($lines) > 1) {
+        $domain = trim(explode('Host: ', $lines[1])[1]);
+    }
+
+    // Sync executions are considered risky
+    $risky = false;
+    if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
+        $risky = true;
+    } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+        $risky = true;
+    } elseif ($domains->get(md5($domain), 'value') === 1) {
+        // executions request coming from custom domain
+        $risky = true;
+    }
+
+    if ($risky) {
+        // If risky request, only consider risky workers
+        for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
+            /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
+            if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
+                // If idle worker found, give to him
+                return $j;
+            }
+        }
+
+        // If no idle workers, give to random risky worker
+        $worker = rand($riskyWorkers, $totalWorkers - 1);
+        Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
         return $worker;
-    };
-    $workerId = $resolveWorkerId($server, $data);
-    $server->bind($fd, $workerId);
-    return $workerId;
+    }
+
+    // If safe request, give to any idle worker
+    // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
+    for ($i = 0; $i < $totalWorkers; $i++) {
+        if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
+            return $i;
+        }
+    }
+
+    // If no idle worker found, give to random safe worker
+    // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
+    $worker = rand(0, $riskyWorkers - 1);
+    Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
+    return $worker;
 }
 
-
-$http
-    ->set([
-        Constant::OPTION_WORKER_NUM => $totalWorkers,
-        Constant::OPTION_DISPATCH_FUNC => dispatch(...),
-        Constant::OPTION_DISPATCH_MODE => SWOOLE_DISPATCH_UIDMOD,
-        Constant::OPTION_HTTP_COMPRESSION => false,
-        Constant::OPTION_PACKAGE_MAX_LENGTH => $payloadSize,
-        Constant::OPTION_OUTPUT_BUFFER_SIZE => $payloadSize,
-        Constant::OPTION_TASK_WORKER_NUM => 1, // required for the task to fetch domains background
-    ]);
-
-$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
-    Console::success('Worker ' . ++$workerId . ' started successfully');
-});
-
-$http->on(Constant::EVENT_BEFORE_RELOAD, function ($server, $workerId) {
-    Console::success('Starting reload...');
-});
-
-$http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
-    Console::success('Reload completed...');
-});
-
 include __DIR__ . '/controllers/general.php';
 
 function createDatabase(App $app, string $resourceKey, string $dbName, array $collections, mixed $pools, callable $extraSetup = null): void
@@ -172,7 +161,7 @@ function createDatabase(App $app, string $resourceKey, string $dbName, array $co
     $sleep = 1;
     $attempts = 0;
 
-    while (true) {
+    do {
         try {
             $attempts++;
             $resource = $app->getResource($resourceKey);
@@ -181,12 +170,13 @@ function createDatabase(App $app, string $resourceKey, string $dbName, array $co
             break; // exit loop on success
         } catch (\Exception $e) {
             Console::warning("  └── Database not ready. Retrying connection ({$attempts})...");
+            $pools->reclaim();
             if ($attempts >= $max) {
                 throw new \Exception('  └── Failed to connect to database: ' . $e->getMessage());
             }
             sleep($sleep);
         }
-    }
+    } while ($attempts < $max);
 
     Console::success("[Setup] - $dbName database init started...");
 
@@ -259,7 +249,8 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                 $audit->setup();
             }
 
-            if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty()) {
+            if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty() &&
+                !$dbForPlatform->exists($dbForPlatform->getDatabase(), 'bucket_1')) {
                 Console::info("    └── Creating default bucket...");
                 $dbForPlatform->createDocument('buckets', new Document([
                     '$id' => ID::custom('default'),
@@ -311,54 +302,6 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
 
                 $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
             }
-
-            if (Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
-                Console::info("    └── Creating screenshots bucket...");
-                Authorization::skip(fn () => $dbForPlatform->createDocument('buckets', new Document([
-                    '$id' => ID::custom('screenshots'),
-                    '$collection' => ID::custom('buckets'),
-                    'name' => 'Screenshots',
-                    'maximumFileSize' => 20000000, // ~20MB
-                    'allowedFileExtensions' => [ 'png' ],
-                    'enabled' => true,
-                    'compression' => Compression::GZIP,
-                    'encryption' => false,
-                    'antivirus' => false,
-                    'fileSecurity' => true,
-                    '$permissions' => [],
-                    'search' => 'buckets Screenshots',
-                ])));
-
-                $bucket = Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots'));
-
-                Console::info("    └── Creating files collection for screenshots bucket...");
-                $files = $collections['buckets']['files'] ?? [];
-                if (empty($files)) {
-                    throw new Exception('Files collection is not configured.');
-                }
-
-                $attributes = array_map(fn ($attr) => new Document([
-                    '$id' => ID::custom($attr['$id']),
-                    'type' => $attr['type'],
-                    'size' => $attr['size'],
-                    'required' => $attr['required'],
-                    'signed' => $attr['signed'],
-                    'array' => $attr['array'],
-                    'filters' => $attr['filters'],
-                    'default' => $attr['default'] ?? null,
-                    'format' => $attr['format'] ?? ''
-                ]), $files['attributes']);
-
-                $indexes = array_map(fn ($index) => new Document([
-                    '$id' => ID::custom($index['$id']),
-                    'type' => $index['type'],
-                    'attributes' => $index['attributes'],
-                    'lengths' => $index['lengths'],
-                    'orders' => $index['orders'],
-                ]), $files['indexes']);
-
-                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes));
-            }
         });
 
         $projectCollections = $collections['projects'];
@@ -369,7 +312,11 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
         $cache = $app->getResource('cache');
 
         foreach ($sharedTablesV2 as $hostname) {
-            $adapter = new DatabasePool($pools->get($hostname));
+            $adapter = $pools
+                ->get($hostname)
+                ->pop()
+                ->getResource();
+
             $dbForProject = (new Database($adapter, $cache))
                 ->setDatabase('appwrite')
                 ->setSharedTables(true)
@@ -379,7 +326,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
             try {
                 Console::success('[Setup] - Creating project database: ' . $hostname . '...');
                 $dbForProject->create();
-            } catch (DuplicateException) {
+            } catch (Duplicate) {
                 Console::success('[Setup] - Skip: metadata table already exists');
             }
 
@@ -405,6 +352,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
             }
         }
 
+        $pools->reclaim();
         Console::success('[Setup] - Server database init completed...');
     });
 
@@ -519,7 +467,6 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
         Console::error('[Error] Message: ' . $th->getMessage());
         Console::error('[Error] File: ' . $th->getFile());
         Console::error('[Error] Line: ' . $th->getLine());
-        Console::error('[Error] Trace: ' . $th->getTraceAsString());
 
         $swooleResponse->setStatusCode(500);
 
@@ -537,11 +484,13 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
         ];
 
         $swooleResponse->end(\json_encode($output));
+    } finally {
+        $pools->reclaim();
     }
 });
 
 // Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
-$http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
+$http->on('Task', function () use ($register, $domains) {
     $lastSyncUpdate = null;
     $pools = $register->get('pools');
     App::setResource('pools', fn () => $pools);
@@ -565,6 +514,7 @@ $http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
                 if ($lastSyncUpdate != null) {
                     $queries[] = Query::greaterThanEqual('$updatedAt', $lastSyncUpdate);
                 }
+                $queries[] = Query::equal('resourceType', ['function']);
                 $results = [];
                 try {
                     $results = Authorization::skip(fn () =>  $dbForPlatform->find('rules', $queries));
@@ -575,7 +525,7 @@ $http->on(Constant::EVENT_TASK, function () use ($register, $domains) {
                 $sum = count($results);
                 foreach ($results as $document) {
                     $domain = $document->getAttribute('domain');
-                    if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS')) || str_ends_with($domain, System::getEnv('_APP_DOMAIN_SITES'))) {
+                    if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
                         continue;
                     }
                     $domains->set(md5($domain), ['value' => 1]);

app/init/configs.php

@@ -1,40 +0,0 @@
-<?php
-
-use Utopia\Config\Config;
-
-Config::load('template-runtimes', __DIR__ . '/../config/template-runtimes.php');
-Config::load('events', __DIR__ . '/../config/events.php');
-Config::load('auth', __DIR__ . '/../config/auth.php');
-Config::load('apis', __DIR__ . '/../config/apis.php');  // List of APIs
-Config::load('errors', __DIR__ . '/../config/errors.php');
-Config::load('oAuthProviders', __DIR__ . '/../config/oAuthProviders.php');
-Config::load('platforms', __DIR__ . '/../config/platforms.php');
-Config::load('console', __DIR__ . '/../config/console.php');
-Config::load('collections', __DIR__ . '/../config/collections.php');
-Config::load('frameworks', __DIR__ . '/../config/frameworks.php');
-Config::load('runtimes', __DIR__ . '/../config/runtimes.php');
-Config::load('runtimes-v2', __DIR__ . '/../config/runtimes-v2.php');
-Config::load('usage', __DIR__ . '/../config/usage.php');
-Config::load('roles', __DIR__ . '/../config/roles.php');  // User roles and scopes
-Config::load('scopes', __DIR__ . '/../config/scopes.php');  // User roles and scopes
-Config::load('services', __DIR__ . '/../config/services.php');  // List of services
-Config::load('variables', __DIR__ . '/../config/variables.php');  // List of env variables
-Config::load('regions', __DIR__ . '/../config/regions.php'); // List of available regions
-Config::load('avatar-browsers', __DIR__ . '/../config/avatars/browsers.php');
-Config::load('avatar-credit-cards', __DIR__ . '/../config/avatars/credit-cards.php');
-Config::load('avatar-flags', __DIR__ . '/../config/avatars/flags.php');
-Config::load('locale-codes', __DIR__ . '/../config/locale/codes.php');
-Config::load('locale-currencies', __DIR__ . '/../config/locale/currencies.php');
-Config::load('locale-eu', __DIR__ . '/../config/locale/eu.php');
-Config::load('locale-languages', __DIR__ . '/../config/locale/languages.php');
-Config::load('locale-phones', __DIR__ . '/../config/locale/phones.php');
-Config::load('locale-countries', __DIR__ . '/../config/locale/countries.php');
-Config::load('locale-continents', __DIR__ . '/../config/locale/continents.php');
-Config::load('locale-templates', __DIR__ . '/../config/locale/templates.php');
-Config::load('storage-logos', __DIR__ . '/../config/storage/logos.php');
-Config::load('storage-mimes', __DIR__ . '/../config/storage/mimes.php');
-Config::load('storage-inputs', __DIR__ . '/../config/storage/inputs.php');
-Config::load('storage-outputs', __DIR__ . '/../config/storage/outputs.php');
-Config::load('specifications', __DIR__ . '/../config/specifications.php');
-Config::load('templates-function', __DIR__ . '/../config/templates/function.php');
-Config::load('templates-site', __DIR__ . '/../config/templates/site.php');

app/init/constants.php

@@ -1,273 +0,0 @@
-<?php
-
-use Appwrite\Platform\Modules\Compute\Specification;
-
-const APP_NAME = 'Appwrite';
-const APP_DOMAIN = 'appwrite.io';
-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_USERAGENT = APP_NAME . '-Server v%s. Please report abuse at %s';
-const APP_MODE_DEFAULT = 'default';
-const APP_MODE_ADMIN = 'admin';
-const APP_PAGING_LIMIT = 12;
-const APP_LIMIT_COUNT = 5000;
-const APP_LIMIT_USERS = 10_000;
-const APP_LIMIT_USER_PASSWORD_HISTORY = 20;
-const APP_LIMIT_USER_SESSIONS_MAX = 100;
-const APP_LIMIT_USER_SESSIONS_DEFAULT = 10;
-const APP_LIMIT_ANTIVIRUS = 20_000_000; //20MB
-const APP_LIMIT_ENCRYPTION = 20_000_000; //20MB
-const APP_LIMIT_COMPRESSION = 20_000_000; //20MB
-const APP_LIMIT_ARRAY_PARAMS_SIZE = 100; // Default maximum of how many elements can there be in API parameter that expects array value
-const APP_LIMIT_ARRAY_LABELS_SIZE = 1000; // Default maximum of how many labels elements can there be in API parameter that expects array value
-const APP_LIMIT_ARRAY_ELEMENT_SIZE = 4096; // Default maximum length of element in array parameter represented by maximum URL length.
-const APP_LIMIT_SUBQUERY = 1000;
-const APP_LIMIT_SUBSCRIBERS_SUBQUERY = 1_000_000;
-const APP_LIMIT_WRITE_RATE_DEFAULT = 60; // Default maximum write rate per rate period
-const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate period in seconds
-const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
-const APP_LIMIT_DATABASE_BATCH = 100; // Default maximum batch size for database operations
-const APP_KEY_ACCESS = 24 * 60 * 60; // 24 hours
-const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
-const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
-const APP_RESOURCE_TOKEN_ACCESS = 24 * 60 * 60; // 24 hours
-const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
-const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 4319;
-const APP_VERSION_STABLE = '1.7.2';
-const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
-const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
-const APP_DATABASE_ATTRIBUTE_IP = 'ip';
-const APP_DATABASE_ATTRIBUTE_DATETIME = 'datetime';
-const APP_DATABASE_ATTRIBUTE_URL = 'url';
-const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
-const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
-const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4 bits per char
-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_STORAGE_UPLOADS = '/storage/uploads';
-const APP_STORAGE_SITES = '/storage/sites';
-const APP_STORAGE_FUNCTIONS = '/storage/functions';
-const APP_STORAGE_BUILDS = '/storage/builds';
-const APP_STORAGE_CACHE = '/storage/cache';
-const APP_STORAGE_IMPORTS = '/storage/imports'; // Temporary storage for csv imports
-const APP_STORAGE_CERTIFICATES = '/storage/certificates';
-const APP_STORAGE_CONFIG = '/storage/config';
-const APP_STORAGE_READ_BUFFER = 20 * (1000 * 1000); //20MB other names `APP_STORAGE_MEMORY_LIMIT`, `APP_STORAGE_MEMORY_BUFFER`, `APP_STORAGE_READ_LIMIT`, `APP_STORAGE_BUFFER_LIMIT`
-const APP_SOCIAL_TWITTER = 'https://twitter.com/appwrite';
-const APP_SOCIAL_TWITTER_HANDLE = 'appwrite';
-const APP_SOCIAL_FACEBOOK = 'https://www.facebook.com/appwrite.io';
-const APP_SOCIAL_LINKEDIN = 'https://www.linkedin.com/company/appwrite';
-const APP_SOCIAL_INSTAGRAM = 'https://www.instagram.com/appwrite.io';
-const APP_SOCIAL_GITHUB = 'https://github.com/appwrite';
-const APP_SOCIAL_GITHUB_APPWRITE = 'https://github.com/appwrite/appwrite';
-const APP_SOCIAL_DISCORD = 'https://appwrite.io/discord';
-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_PLATFORM_SERVER = 'server';
-const APP_PLATFORM_CLIENT = 'client';
-const APP_PLATFORM_CONSOLE = 'console';
-
-// Database Reconnect
-const DATABASE_RECONNECT_SLEEP = 2;
-const DATABASE_RECONNECT_MAX_ATTEMPTS = 10;
-
-// Database Worker Types
-const DATABASE_TYPE_CREATE_ATTRIBUTE = 'createAttribute';
-const DATABASE_TYPE_CREATE_INDEX = 'createIndex';
-const DATABASE_TYPE_DELETE_ATTRIBUTE = 'deleteAttribute';
-const DATABASE_TYPE_DELETE_INDEX = 'deleteIndex';
-const DATABASE_TYPE_DELETE_COLLECTION = 'deleteCollection';
-const DATABASE_TYPE_DELETE_DATABASE = 'deleteDatabase';
-
-// Build Worker Types
-const BUILD_TYPE_DEPLOYMENT = 'deployment';
-const BUILD_TYPE_RETRY = 'retry';
-
-// Deletion Types
-const DELETE_TYPE_DATABASES = 'databases';
-const DELETE_TYPE_DOCUMENT = 'document';
-const DELETE_TYPE_COLLECTIONS = 'collections';
-const DELETE_TYPE_PROJECTS = 'projects';
-const DELETE_TYPE_SITES = 'sites';
-const DELETE_TYPE_FUNCTIONS = 'functions';
-const DELETE_TYPE_DEPLOYMENTS = 'deployments';
-const DELETE_TYPE_USERS = 'users';
-const DELETE_TYPE_TEAM_PROJECTS = 'teams_projects';
-const DELETE_TYPE_EXECUTIONS = 'executions';
-const DELETE_TYPE_AUDIT = 'audit';
-const DELETE_TYPE_ABUSE = 'abuse';
-const DELETE_TYPE_USAGE = 'usage';
-const DELETE_TYPE_REALTIME = 'realtime';
-const DELETE_TYPE_BUCKETS = 'buckets';
-const DELETE_TYPE_INSTALLATIONS = 'installations';
-const DELETE_TYPE_RULES = 'rules';
-const DELETE_TYPE_SESSIONS = 'sessions';
-const DELETE_TYPE_CACHE_BY_TIMESTAMP = 'cacheByTimeStamp';
-const DELETE_TYPE_CACHE_BY_RESOURCE  = 'cacheByResource';
-const DELETE_TYPE_SCHEDULES = 'schedules';
-const DELETE_TYPE_TOPIC = 'topic';
-const DELETE_TYPE_TARGET = 'target';
-const DELETE_TYPE_EXPIRED_TARGETS = 'invalid_targets';
-const DELETE_TYPE_SESSION_TARGETS = 'session_targets';
-const DELETE_TYPE_MAINTENANCE = 'maintenance';
-
-// Message types
-const MESSAGE_SEND_TYPE_INTERNAL = 'internal';
-const MESSAGE_SEND_TYPE_EXTERNAL = 'external';
-// Mail Types
-const MAIL_TYPE_VERIFICATION = 'verification';
-const MAIL_TYPE_MAGIC_SESSION = 'magicSession';
-const MAIL_TYPE_RECOVERY = 'recovery';
-const MAIL_TYPE_INVITATION = 'invitation';
-const MAIL_TYPE_CERTIFICATE = 'certificate';
-// Auth Types
-const APP_AUTH_TYPE_SESSION = 'Session';
-const APP_AUTH_TYPE_JWT = 'JWT';
-const APP_AUTH_TYPE_KEY = 'Key';
-const APP_AUTH_TYPE_ADMIN = 'Admin';
-// Response related
-const MAX_OUTPUT_CHUNK_SIZE = 10 * 1024 * 1024; // 10MB
-// Function headers
-const FUNCTION_ALLOWLIST_HEADERS_REQUEST = ['content-type', 'agent', 'content-length', 'host'];
-const FUNCTION_ALLOWLIST_HEADERS_RESPONSE = ['content-type', 'content-length'];
-// Message types
-const MESSAGE_TYPE_EMAIL = 'email';
-const MESSAGE_TYPE_SMS = 'sms';
-const MESSAGE_TYPE_PUSH = 'push';
-// API key types
-const API_KEY_STANDARD = 'standard';
-const API_KEY_DYNAMIC = 'dynamic';
-// Usage metrics
-const METRIC_TEAMS = 'teams';
-const METRIC_USERS = 'users';
-const METRIC_WEBHOOKS_SENT  = 'webhooks.events.sent';
-const METRIC_WEBHOOKS_FAILED  = 'webhooks.events.failed';
-const METRIC_WEBHOOK_ID_SENT = '{webhookInternalId}.webhooks.events.sent';
-const METRIC_WEBHOOK_ID_FAILED = '{webhookInternalId}.webhooks.events.failed';
-const METRIC_AUTH_METHOD_PHONE  = 'auth.method.phone';
-const METRIC_AUTH_METHOD_PHONE_COUNTRY_CODE  = METRIC_AUTH_METHOD_PHONE . '.{countryCode}';
-const METRIC_MESSAGES = 'messages';
-const METRIC_MESSAGES_SENT = METRIC_MESSAGES . '.sent';
-const METRIC_MESSAGES_FAILED = METRIC_MESSAGES . '.failed';
-const METRIC_MESSAGES_TYPE = METRIC_MESSAGES . '.{type}';
-const METRIC_MESSAGES_TYPE_SENT  = METRIC_MESSAGES . '.{type}.sent';
-const METRIC_MESSAGES_TYPE_FAILED  = METRIC_MESSAGES . '.{type}.failed';
-const METRIC_MESSAGES_TYPE_PROVIDER = METRIC_MESSAGES . '.{type}.{provider}';
-const METRIC_MESSAGES_TYPE_PROVIDER_SENT  = METRIC_MESSAGES . '.{type}.{provider}.sent';
-const METRIC_MESSAGES_TYPE_PROVIDER_FAILED  = METRIC_MESSAGES . '.{type}.{provider}.failed';
-const METRIC_SESSIONS  = 'sessions';
-const METRIC_DATABASES = 'databases';
-const METRIC_COLLECTIONS = 'collections';
-const METRIC_DATABASES_STORAGE = 'databases.storage';
-const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections';
-const METRIC_DATABASE_ID_STORAGE = '{databaseInternalId}.databases.storage';
-const METRIC_DOCUMENTS = 'documents';
-const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents';
-const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE = '{databaseInternalId}.{collectionInternalId}.databases.storage';
-const METRIC_DATABASES_OPERATIONS_READS  = 'databases.operations.reads';
-const METRIC_DATABASE_ID_OPERATIONS_READS = '{databaseInternalId}.databases.operations.reads';
-const METRIC_DATABASES_OPERATIONS_WRITES  = 'databases.operations.writes';
-const METRIC_DATABASE_ID_OPERATIONS_WRITES = '{databaseInternalId}.databases.operations.writes';
-const METRIC_BUCKETS = 'buckets';
-const METRIC_FILES  = 'files';
-const METRIC_FILES_STORAGE  = 'files.storage';
-const METRIC_FILES_TRANSFORMATIONS  = 'files.transformations';
-const METRIC_BUCKET_ID_FILES_TRANSFORMATIONS  = '{bucketInternalId}.files.transformations';
-const METRIC_FILES_IMAGES_TRANSFORMED = 'files.imagesTransformed';
-const METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED = '{bucketInternalId}.files.imagesTransformed';
-const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files';
-const METRIC_BUCKET_ID_FILES_STORAGE  = '{bucketInternalId}.files.storage';
-const METRIC_SITES = 'sites';
-const METRIC_FUNCTIONS  = 'functions';
-const METRIC_DEPLOYMENTS  = 'deployments';
-const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
-const METRIC_BUILDS  = 'builds';
-const METRIC_BUILDS_SUCCESS  = 'builds.success';
-const METRIC_BUILDS_FAILED  = 'builds.failed';
-const METRIC_BUILDS_STORAGE  = 'builds.storage';
-const METRIC_BUILDS_COMPUTE  = 'builds.compute';
-const METRIC_BUILDS_COMPUTE_SUCCESS  = 'builds.compute.success';
-const METRIC_BUILDS_COMPUTE_FAILED  = 'builds.compute.failed';
-const METRIC_BUILDS_MB_SECONDS = 'builds.mbSeconds';
-const METRIC_EXECUTIONS  = 'executions';
-const METRIC_EXECUTIONS_COMPUTE  = 'executions.compute';
-const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
-const METRIC_RESOURCE_TYPE_ID_EXECUTIONS  = '{resourceType}.{resourceInternalId}.executions';
-const METRIC_RESOURCE_TYPE_ID_EXECUTIONS_COMPUTE  = '{resourceType}.{resourceInternalId}.executions.compute';
-const METRIC_RESOURCE_TYPE_ID_EXECUTIONS_MB_SECONDS = '{resourceType}.{resourceInternalId}.executions.mbSeconds';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_SUCCESS  = '{resourceType}.{resourceInternalId}.builds.success';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_FAILED  = '{resourceType}.{resourceInternalId}.builds.failed';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_COMPUTE  = '{resourceType}.{resourceInternalId}.builds.compute';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_COMPUTE_SUCCESS  = '{resourceType}.{resourceInternalId}.builds.compute.success';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_COMPUTE_FAILED  = '{resourceType}.{resourceInternalId}.builds.compute.failed';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_MB_SECONDS = '{resourceType}.{resourceInternalId}.builds.mbSeconds';
-const METRIC_RESOURCE_TYPE_ID_BUILDS  = '{resourceType}.{resourceInternalId}.builds';
-const METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE = '{resourceType}.{resourceInternalId}.builds.storage';
-const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
-const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
-const METRIC_RESOURCE_TYPE_EXECUTIONS  = '{resourceType}.executions';
-const METRIC_RESOURCE_TYPE_EXECUTIONS_COMPUTE  = '{resourceType}.executions.compute';
-const METRIC_RESOURCE_TYPE_EXECUTIONS_MB_SECONDS = '{resourceType}.executions.mbSeconds';
-const METRIC_RESOURCE_TYPE_BUILDS_SUCCESS  = '{resourceType}.builds.success';
-const METRIC_RESOURCE_TYPE_BUILDS_FAILED  = '{resourceType}.builds.failed';
-const METRIC_RESOURCE_TYPE_BUILDS_COMPUTE  = '{resourceType}.builds.compute';
-const METRIC_RESOURCE_TYPE_BUILDS_COMPUTE_SUCCESS  = '{resourceType}.builds.compute.success';
-const METRIC_RESOURCE_TYPE_BUILDS_COMPUTE_FAILED  = '{resourceType}.builds.compute.failed';
-const METRIC_RESOURCE_TYPE_BUILDS_MB_SECONDS = '{resourceType}.builds.mbSeconds';
-const METRIC_RESOURCE_TYPE_BUILDS  = '{resourceType}.builds';
-const METRIC_RESOURCE_TYPE_BUILDS_STORAGE = '{resourceType}.builds.storage';
-const METRIC_RESOURCE_TYPE_DEPLOYMENTS  = '{resourceType}.deployments';
-const METRIC_RESOURCE_TYPE_DEPLOYMENTS_STORAGE  = '{resourceType}.deployments.storage';
-const METRIC_NETWORK_REQUESTS  = 'network.requests';
-const METRIC_NETWORK_INBOUND  = 'network.inbound';
-const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
-const METRIC_MAU = 'users.mau';
-const METRIC_DAU = 'users.dau';
-const METRIC_WAU = 'users.wau';
-const METRIC_WEBHOOKS = 'webhooks';
-const METRIC_PLATFORMS = 'platforms';
-const METRIC_PROVIDERS = 'providers';
-const METRIC_TOPICS = 'topics';
-const METRIC_TARGETS = 'targets';
-const METRIC_PROVIDER_TYPE_TARGETS = '{providerType}.targets';
-const METRIC_KEYS = 'keys';
-const METRIC_DOMAINS = 'domains';
-const METRIC_SITES_REQUESTS = 'sites.requests';
-const METRIC_SITES_INBOUND = 'sites.inbound';
-const METRIC_SITES_OUTBOUND = 'sites.outbound';
-const METRIC_SITES_ID_REQUESTS = 'sites.{siteInternalId}.requests';
-const METRIC_SITES_ID_INBOUND = 'sites.{siteInternalId}.inbound';
-const METRIC_SITES_ID_OUTBOUND = 'sites.{siteInternalId}.outbound';
-
-// Resource types
-
-const RESOURCE_TYPE_PROJECTS = 'projects';
-const RESOURCE_TYPE_FUNCTIONS = 'functions';
-const RESOURCE_TYPE_SITES = 'sites';
-const RESOURCE_TYPE_DATABASES = 'databases';
-const RESOURCE_TYPE_BUCKETS = 'buckets';
-const RESOURCE_TYPE_PROVIDERS = 'providers';
-const RESOURCE_TYPE_TOPICS = 'topics';
-const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
-const RESOURCE_TYPE_MESSAGES = 'messages';
-
-// Resource types for Tokens
-
-const TOKENS_RESOURCE_TYPE_FILES = 'files';
-const TOKENS_RESOURCE_TYPE_SITES = 'sites';
-const TOKENS_RESOURCE_TYPE_FUNCTIONS = 'functions';
-const TOKENS_RESOURCE_TYPE_DATABASES = 'databases';

app/init/database/filters.php

@@ -1,418 +0,0 @@
-<?php
-
-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(
-    'casting',
-    function (mixed $value) {
-        return json_encode(['value' => $value], JSON_PRESERVE_ZERO_FRACTION);
-    },
-    function (mixed $value) {
-        if (is_null($value)) {
-            return;
-        }
-
-        return json_decode($value, true)['value'];
-    }
-);
-
-Database::addFilter(
-    'enum',
-    function (mixed $value, Document $attribute) {
-        if ($attribute->isSet('elements')) {
-            $attribute->removeAttribute('elements');
-        }
-
-        return $value;
-    },
-    function (mixed $value, Document $attribute) {
-        $formatOptions = \json_decode($attribute->getAttribute('formatOptions', '[]'), true);
-        if (isset($formatOptions['elements'])) {
-            $attribute->setAttribute('elements', $formatOptions['elements']);
-        }
-
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'range',
-    function (mixed $value, Document $attribute) {
-        if ($attribute->isSet('min')) {
-            $attribute->removeAttribute('min');
-        }
-        if ($attribute->isSet('max')) {
-            $attribute->removeAttribute('max');
-        }
-
-        return $value;
-    },
-    function (mixed $value, Document $attribute) {
-        $formatOptions = json_decode($attribute->getAttribute('formatOptions', '[]'), true);
-        if (isset($formatOptions['min']) || isset($formatOptions['max'])) {
-            $attribute
-                ->setAttribute('min', $formatOptions['min'])
-                ->setAttribute('max', $formatOptions['max']);
-        }
-
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'subQueryAttributes',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        $attributes = $database->find('attributes', [
-            Query::equal('collectionInternalId', [$document->getInternalId()]),
-            Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-            Query::limit($database->getLimitForAttributes()),
-        ]);
-
-        foreach ($attributes as $attribute) {
-            if ($attribute->getAttribute('type') === Database::VAR_RELATIONSHIP) {
-                $options = $attribute->getAttribute('options');
-                foreach ($options as $key => $value) {
-                    $attribute->setAttribute($key, $value);
-                }
-                $attribute->removeAttribute('options');
-            }
-        }
-
-        return $attributes;
-    }
-);
-
-Database::addFilter(
-    'subQueryIndexes',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('indexes', [
-                Query::equal('collectionInternalId', [$document->getInternalId()]),
-                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-                Query::limit($database->getLimitForIndexes()),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryPlatforms',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('platforms', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryKeys',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('keys', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryDevKeys',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('devKeys', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQueryWebhooks',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('webhooks', [
-                Query::equal('projectInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'subQuerySessions',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database->find('sessions', [
-            Query::equal('userInternalId', [$document->getInternalId()]),
-            Query::limit(APP_LIMIT_SUBQUERY),
-        ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryTokens',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('tokens', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryChallenges',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('challenges', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryAuthenticators',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('authenticators', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryMemberships',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('memberships', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryVariables',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('variables', [
-                Query::equal('resourceInternalId', [$document->getInternalId()]),
-                Query::equal('resourceType', ['function', 'site']),
-                Query::limit(APP_LIMIT_SUBQUERY),
-            ]);
-    }
-);
-
-Database::addFilter(
-    'encrypt',
-    function (mixed $value) {
-        $key = System::getEnv('_APP_OPENSSL_KEY_V1');
-        $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
-        $tag = null;
-
-        return json_encode([
-            'data' => OpenSSL::encrypt($value, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag),
-            'method' => OpenSSL::CIPHER_AES_128_GCM,
-            'iv' => \bin2hex($iv),
-            'tag' => \bin2hex($tag ?? ''),
-            'version' => '1',
-        ]);
-    },
-    function (mixed $value) {
-        if (is_null($value)) {
-            return;
-        }
-        $value = json_decode($value, true);
-        $key = System::getEnv('_APP_OPENSSL_KEY_V' . $value['version']);
-
-        return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
-    }
-);
-
-Database::addFilter(
-    'subQueryProjectVariables',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('variables', [
-                Query::equal('resourceType', ['project']),
-                Query::limit(APP_LIMIT_SUBQUERY)
-            ]);
-    }
-);
-
-Database::addFilter(
-    'userSearch',
-    function (mixed $value, Document $user) {
-        $searchValues = [
-            $user->getId(),
-            $user->getAttribute('email', ''),
-            $user->getAttribute('name', ''),
-            $user->getAttribute('phone', '')
-        ];
-
-        foreach ($user->getAttribute('labels', []) as $label) {
-            $searchValues[] = 'label:' . $label;
-        }
-
-        $search = implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'subQueryTargets',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        return Authorization::skip(fn () => $database
-            ->find('targets', [
-                Query::equal('userInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBQUERY)
-            ]));
-    }
-);
-
-Database::addFilter(
-    'subQueryTopicTargets',
-    function (mixed $value) {
-        return;
-    },
-    function (mixed $value, Document $document, Database $database) {
-        $targetIds = Authorization::skip(fn () => \array_map(
-            fn ($document) => $document->getAttribute('targetInternalId'),
-            $database->find('subscribers', [
-                Query::equal('topicInternalId', [$document->getInternalId()]),
-                Query::limit(APP_LIMIT_SUBSCRIBERS_SUBQUERY)
-            ])
-        ));
-        if (\count($targetIds) > 0) {
-            return $database->skipValidation(fn () => $database->find('targets', [
-                Query::equal('$internalId', $targetIds)
-            ]));
-        }
-        return [];
-    }
-);
-
-Database::addFilter(
-    'providerSearch',
-    function (mixed $value, Document $provider) {
-        $searchValues = [
-            $provider->getId(),
-            $provider->getAttribute('name', ''),
-            $provider->getAttribute('provider', ''),
-            $provider->getAttribute('type', '')
-        ];
-
-        $search = \implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'topicSearch',
-    function (mixed $value, Document $topic) {
-        $searchValues = [
-            $topic->getId(),
-            $topic->getAttribute('name', ''),
-            $topic->getAttribute('description', ''),
-        ];
-
-        $search = \implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);
-
-Database::addFilter(
-    'messageSearch',
-    function (mixed $value, Document $message) {
-        $searchValues = [
-            $message->getId(),
-            $message->getAttribute('description', ''),
-            $message->getAttribute('status', ''),
-        ];
-
-        $data = \json_decode($message->getAttribute('data', []), true);
-        $providerType = $message->getAttribute('providerType', '');
-
-        switch ($providerType) {
-            case MESSAGE_TYPE_EMAIL:
-                $searchValues[] = $data['subject'];
-                $searchValues[] = MESSAGE_TYPE_EMAIL;
-                break;
-            case MESSAGE_TYPE_SMS:
-                $searchValues[] = $data['content'];
-                $searchValues[] = MESSAGE_TYPE_SMS;
-                break;
-            case MESSAGE_TYPE_PUSH:
-                $searchValues[] = $data['title'] ?? '';
-                $searchValues[] = MESSAGE_TYPE_PUSH;
-                break;
-        }
-
-        $search = \implode(' ', \array_filter($searchValues));
-
-        return $search;
-    },
-    function (mixed $value) {
-        return $value;
-    }
-);

app/init/database/formats.php

@@ -1,43 +0,0 @@
-<?php
-
-use Appwrite\Network\Validator\Email;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Datetime as DatetimeValidator;
-use Utopia\Database\Validator\Structure;
-use Utopia\Validator\IP;
-use Utopia\Validator\Range;
-use Utopia\Validator\URL;
-use Utopia\Validator\WhiteList;
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_EMAIL, function () {
-    return new Email();
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_DATETIME, function () {
-    return new DatetimeValidator();
-}, Database::VAR_DATETIME);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function ($attribute) {
-    $elements = $attribute['formatOptions']['elements'] ?? [];
-    return new WhiteList($elements, true);
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_IP, function () {
-    return new IP();
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_URL, function () {
-    return new URL();
-}, Database::VAR_STRING);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function ($attribute) {
-    $min = $attribute['formatOptions']['min'] ?? -INF;
-    $max = $attribute['formatOptions']['max'] ?? INF;
-    return new Range($min, $max, Range::TYPE_INTEGER);
-}, Database::VAR_INTEGER);
-
-Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
-    $min = $attribute['formatOptions']['min'] ?? -INF;
-    $max = $attribute['formatOptions']['max'] ?? INF;
-    return new Range($min, $max, Range::TYPE_FLOAT);
-}, Database::VAR_FLOAT);

app/init/locales.php

@@ -1,23 +0,0 @@
-<?php
-
-use Utopia\Config\Config;
-use Utopia\Locale\Locale;
-
-Locale::$exceptions = false;
-
-$locales = Config::getParam('locale-codes', []);
-
-foreach ($locales as $locale) {
-    $code = $locale['code'];
-
-    $path = __DIR__ . '/../config/locale/translations/' . $code . '.json';
-
-    if (!\file_exists($path)) {
-        $path = __DIR__ . '/../config/locale/translations/' . \substr($code, 0, 2) . '.json'; // if `ar-ae` doesn't exist, look for `ar`
-        if (!\file_exists($path)) {
-            $path = __DIR__ . '/../config/locale/translations/en.json'; // if none translation exists, use default from `en.json`
-        }
-    }
-
-    Locale::setLanguageFromJSON($code, $path);
-}

app/init/registers.php

@@ -1,341 +0,0 @@
-<?php
-
-use Appwrite\Extend\Exception;
-use Appwrite\GraphQL\Promises\Adapter\Swoole;
-use Appwrite\Hooks\Hooks;
-use Appwrite\PubSub\Adapter\Redis as PubSub;
-use Appwrite\URL\URL as AppwriteURL;
-use MaxMind\Db\Reader;
-use PHPMailer\PHPMailer\PHPMailer;
-use Swoole\Database\PDOProxy;
-use Utopia\App;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Adapter\MySQL;
-use Utopia\Database\Adapter\SQL;
-use Utopia\Database\PDO;
-use Utopia\Domains\Validator\PublicDomain;
-use Utopia\DSN\DSN;
-use Utopia\Logger\Adapter\AppSignal;
-use Utopia\Logger\Adapter\LogOwl;
-use Utopia\Logger\Adapter\Raygun;
-use Utopia\Logger\Adapter\Sentry;
-use Utopia\Logger\Logger;
-use Utopia\Pools\Group;
-use Utopia\Pools\Pool;
-use Utopia\Queue;
-use Utopia\Registry\Registry;
-use Utopia\System\System;
-
-$register = new Registry();
-
-App::setMode(System::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
-
-if (!App::isProduction()) {
-    // Allow specific domains to skip public domain validation in dev environment
-    // Useful for existing tests involving webhooks
-    PublicDomain::allow(['request-catcher']);
-}
-$register->set('logger', function () {
-    // Register error logger
-    $providerName = System::getEnv('_APP_LOGGING_PROVIDER', '');
-    $providerConfig = System::getEnv('_APP_LOGGING_CONFIG', '');
-
-    if (empty($providerConfig)) {
-        return;
-    }
-
-    try {
-        $loggingProvider = new DSN($providerConfig ?? '');
-
-        $providerName = $loggingProvider->getScheme();
-        $providerConfig = match ($providerName) {
-            'sentry' => ['key' => $loggingProvider->getPassword(), 'projectId' => $loggingProvider->getUser() ?? '', 'host' => 'https://' . $loggingProvider->getHost()],
-            'logowl' => ['ticket' => $loggingProvider->getUser() ?? '', 'host' => $loggingProvider->getHost()],
-            default => ['key' => $loggingProvider->getHost()],
-        };
-    } catch (Throwable $th) {
-        // Fallback for older Appwrite versions up to 1.5.x that use _APP_LOGGING_PROVIDER and _APP_LOGGING_CONFIG environment variables
-        Console::warning('Using deprecated logging configuration. Please update your configuration to use DSN format.' . $th->getMessage());
-        $configChunks = \explode(";", $providerConfig);
-
-        $providerConfig = match ($providerName) {
-            'sentry' => [ 'key' => $configChunks[0], 'projectId' => $configChunks[1] ?? '', 'host' => '',],
-            'logowl' => ['ticket' => $configChunks[0] ?? '', 'host' => ''],
-            default => ['key' => $providerConfig],
-        };
-    }
-
-    if (empty($providerName) || empty($providerConfig)) {
-        return;
-    }
-
-    if (!Logger::hasProvider($providerName)) {
-        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Logging provider not supported. Logging is disabled");
-    }
-
-    try {
-        $adapter = match ($providerName) {
-            'sentry' => new Sentry($providerConfig['projectId'], $providerConfig['key'], $providerConfig['host']),
-            'logowl' => new LogOwl($providerConfig['ticket'], $providerConfig['host']),
-            'raygun' => new Raygun($providerConfig['key']),
-            'appsignal' => new AppSignal($providerConfig['key']),
-            default => null
-        };
-    } catch (Throwable $th) {
-        $adapter = null;
-    }
-
-    if ($adapter === null) {
-        Console::error("Logging provider not supported. Logging is disabled");
-        return;
-    }
-
-    return new Logger($adapter);
-});
-
-$register->set('pools', function () {
-    $group = new Group();
-
-    $fallbackForDB = 'db_main=' . AppwriteURL::unparse([
-        'scheme' => 'mariadb',
-        'host' => System::getEnv('_APP_DB_HOST', 'mariadb'),
-        'port' => System::getEnv('_APP_DB_PORT', '3306'),
-        'user' => System::getEnv('_APP_DB_USER', ''),
-        'pass' => System::getEnv('_APP_DB_PASS', ''),
-        'path' => System::getEnv('_APP_DB_SCHEMA', ''),
-    ]);
-    $fallbackForRedis = 'redis_main=' . AppwriteURL::unparse([
-        'scheme' => 'redis',
-        'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
-        'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
-        'user' => System::getEnv('_APP_REDIS_USER', ''),
-        'pass' => System::getEnv('_APP_REDIS_PASS', ''),
-    ]);
-
-    $connections = [
-        'console' => [
-            'type' => 'database',
-            'dsns' => $fallbackForDB,
-            'multiple' => false,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
-        'database' => [
-            'type' => 'database',
-            'dsns' => $fallbackForDB,
-            'multiple' => true,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
-        'logs' => [
-            'type' => 'database',
-            'dsns' => System::getEnv('_APP_CONNECTIONS_DB_LOGS', $fallbackForDB),
-            'multiple' => false,
-            'schemes' => ['mariadb', 'mysql'],
-        ],
-        'publisher' => [
-            'type' => 'publisher',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'consumer' => [
-            'type' => 'consumer',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'pubsub' => [
-            'type' => 'pubsub',
-            'dsns' => $fallbackForRedis,
-            'multiple' => false,
-            'schemes' => ['redis'],
-        ],
-        'cache' => [
-            'type' => 'cache',
-            'dsns' => $fallbackForRedis,
-            'multiple' => true,
-            'schemes' => ['redis'],
-        ],
-    ];
-
-    $maxConnections = System::getEnv('_APP_CONNECTIONS_MAX', 151);
-    $instanceConnections = $maxConnections / System::getEnv('_APP_POOL_CLIENTS', 14);
-
-    $multiprocessing = System::getEnv('_APP_SERVER_MULTIPROCESS', 'disabled') === 'enabled';
-
-    if ($multiprocessing) {
-        $workerCount = intval(System::getEnv('_APP_CPU_NUM', swoole_cpu_num())) * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
-    } else {
-        $workerCount = 1;
-    }
-
-    if ($workerCount > $instanceConnections) {
-        throw new \Exception('Pool size is too small. Increase the number of allowed database connections or decrease the number of workers.', 500);
-    }
-
-    $poolSize = (int)($instanceConnections / $workerCount);
-
-    foreach ($connections as $key => $connection) {
-        $type = $connection['type'] ?? '';
-        $multiple = $connection['multiple'] ?? false;
-        $schemes = $connection['schemes'] ?? [];
-        $config = [];
-        $dsns = explode(',', $connection['dsns'] ?? '');
-        foreach ($dsns as &$dsn) {
-            $dsn = explode('=', $dsn);
-            $name = ($multiple) ? $key . '_' . $dsn[0] : $key;
-            $dsn = $dsn[1] ?? '';
-            $config[] = $name;
-            if (empty($dsn)) {
-                //throw new Exception(Exception::GENERAL_SERVER_ERROR, "Missing value for DSN connection in {$key}");
-                continue;
-            }
-
-            $dsn = new DSN($dsn);
-            $dsnHost = $dsn->getHost();
-            $dsnPort = $dsn->getPort();
-            $dsnUser = $dsn->getUser();
-            $dsnPass = $dsn->getPassword();
-            $dsnScheme = $dsn->getScheme();
-            $dsnDatabase = $dsn->getPath();
-
-            if (!in_array($dsnScheme, $schemes)) {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, "Invalid console database scheme");
-            }
-
-            /**
-             * Get Resource
-             *
-             * Creation could be reused across connection types like database, cache, queue, etc.
-             *
-             * Resource assignment to an adapter will happen below.
-             */
-            $resource = match ($dsnScheme) {
-                'mysql',
-                'mariadb' => function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                    return new PDOProxy(function () use ($dsnHost, $dsnPort, $dsnUser, $dsnPass, $dsnDatabase) {
-                        return new PDO("mysql:host={$dsnHost};port={$dsnPort};dbname={$dsnDatabase};charset=utf8mb4", $dsnUser, $dsnPass, [
-                            \PDO::ATTR_TIMEOUT => 3, // Seconds
-                            \PDO::ATTR_PERSISTENT => false,
-                            \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
-                            \PDO::ATTR_EMULATE_PREPARES => true,
-                            \PDO::ATTR_STRINGIFY_FETCHES => true
-                        ]);
-                    });
-                },
-                'redis' => function () use ($dsnHost, $dsnPort, $dsnPass) {
-                    $redis = new \Redis();
-                    @$redis->pconnect($dsnHost, (int)$dsnPort);
-                    if ($dsnPass) {
-                        $redis->auth($dsnPass);
-                    }
-                    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-                    return $redis;
-                },
-                default => throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Invalid scheme'),
-            };
-
-            $pool = new Pool($name, $poolSize, function () use ($type, $resource, $dsn) {
-                // Get Adapter
-                switch ($type) {
-                    case 'database':
-                        $adapter = match ($dsn->getScheme()) {
-                            'mariadb' => new MariaDB($resource()),
-                            'mysql' => new MySQL($resource()),
-                            default => null
-                        };
-
-                        $adapter->setDatabase($dsn->getPath());
-                        return $adapter;
-                    case 'pubsub':
-                        return match ($dsn->getScheme()) {
-                            'redis' => new PubSub($resource()),
-                            default => null
-                        };
-                    case 'publisher':
-                    case 'consumer':
-                        return match ($dsn->getScheme()) {
-                            'redis' => new Queue\Broker\Redis(new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort())),
-                            default => null
-                        };
-                    case 'cache':
-                        return match ($dsn->getScheme()) {
-                            'redis' => new RedisCache($resource()),
-                            default => null
-                        };
-                    default:
-                        throw new Exception(Exception::GENERAL_SERVER_ERROR, "Server error: Missing adapter implementation.");
-                }
-            });
-
-            $group->add($pool);
-        }
-
-        Config::setParam('pools-' . $key, $config);
-    }
-
-    return $group;
-});
-
-$register->set('db', function () {
-    // This is usually for our workers or CLI commands scope
-    $dbHost = System::getEnv('_APP_DB_HOST', '');
-    $dbPort = System::getEnv('_APP_DB_PORT', '');
-    $dbUser = System::getEnv('_APP_DB_USER', '');
-    $dbPass = System::getEnv('_APP_DB_PASS', '');
-    $dbScheme = System::getEnv('_APP_DB_SCHEMA', '');
-
-    return new PDO(
-        "mysql:host={$dbHost};port={$dbPort};dbname={$dbScheme};charset=utf8mb4",
-        $dbUser,
-        $dbPass,
-        SQL::getPDOAttributes()
-    );
-});
-
-$register->set('smtp', function () {
-    $mail = new PHPMailer(true);
-
-    $mail->isSMTP();
-
-    $username = System::getEnv('_APP_SMTP_USERNAME');
-    $password = System::getEnv('_APP_SMTP_PASSWORD');
-
-    $mail->XMailer = 'Appwrite Mailer';
-    $mail->Host = System::getEnv('_APP_SMTP_HOST', 'smtp');
-    $mail->Port = System::getEnv('_APP_SMTP_PORT', 25);
-    $mail->SMTPAuth = !empty($username) && !empty($password);
-    $mail->Username = $username;
-    $mail->Password = $password;
-    $mail->SMTPSecure = System::getEnv('_APP_SMTP_SECURE', '');
-    $mail->SMTPAutoTLS = false;
-    $mail->CharSet = 'UTF-8';
-
-    $from = \urldecode(System::getEnv('_APP_SYSTEM_EMAIL_NAME', APP_NAME . ' Server'));
-    $email = System::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
-
-    $mail->setFrom($email, $from);
-    $mail->addReplyTo($email, $from);
-
-    $mail->isHTML(true);
-
-    return $mail;
-});
-$register->set('geodb', function () {
-    return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2024-09.mmdb');
-});
-$register->set('passwordsDictionary', function () {
-    $content = \file_get_contents(__DIR__ . '/../assets/security/10k-common-passwords');
-    $content = explode("\n", $content);
-    $content = array_flip($content);
-    return $content;
-});
-$register->set('promiseAdapter', function () {
-    return new Swoole();
-});
-$register->set('hooks', function () {
-    return new Hooks();
-});

app/init/resources.php

@@ -1,943 +0,0 @@
-<?php
-
-use Ahc\Jwt\JWT;
-use Ahc\Jwt\JWTException;
-use Appwrite\Auth\Auth;
-use Appwrite\Auth\Key;
-use Appwrite\Event\Audit;
-use Appwrite\Event\Build;
-use Appwrite\Event\Certificate;
-use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-use Appwrite\Event\Func;
-use Appwrite\Event\Mail;
-use Appwrite\Event\Messaging;
-use Appwrite\Event\Migration;
-use Appwrite\Event\Realtime;
-use Appwrite\Event\StatsUsage;
-use Appwrite\Event\Webhook;
-use Appwrite\Extend\Exception;
-use Appwrite\GraphQL\Schema;
-use Appwrite\Network\Validator\Origin;
-use Appwrite\Utopia\Request;
-use Executor\Executor;
-use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
-use Utopia\App;
-use Utopia\Cache\Adapter\Pool as CachePool;
-use Utopia\Cache\Adapter\Sharding;
-use Utopia\Cache\Cache;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-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;
-use Utopia\Locale\Locale;
-use Utopia\Logger\Log;
-use Utopia\Pools\Group;
-use Utopia\Queue\Broker\Pool as BrokerPool;
-use Utopia\Queue\Publisher;
-use Utopia\Storage\Device;
-use Utopia\Storage\Device\AWS;
-use Utopia\Storage\Device\Backblaze;
-use Utopia\Storage\Device\DOSpaces;
-use Utopia\Storage\Device\Linode;
-use Utopia\Storage\Device\Local;
-use Utopia\Storage\Device\S3;
-use Utopia\Storage\Device\Wasabi;
-use Utopia\Storage\Storage;
-use Utopia\System\System;
-use Utopia\Telemetry\Adapter as Telemetry;
-use Utopia\Telemetry\Adapter\None as NoTelemetry;
-use Utopia\Validator\Hostname;
-use Utopia\Validator\WhiteList;
-use Utopia\VCS\Adapter\Git\GitHub as VcsGitHub;
-
-// Runtime Execution
-App::setResource('log', fn () => new Log());
-App::setResource('logger', function ($register) {
-    return $register->get('logger');
-}, ['register']);
-
-App::setResource('hooks', function ($register) {
-    return $register->get('hooks');
-}, ['register']);
-
-App::setResource('register', fn () => $register);
-App::setResource('locale', fn () => new Locale(System::getEnv('_APP_LOCALE', 'en')));
-
-App::setResource('localeCodes', function () {
-    return array_map(fn ($locale) => $locale['code'], Config::getParam('locale-codes', []));
-});
-
-// Queues
-App::setResource('publisher', function (Group $pools) {
-    return new BrokerPool(publisher: $pools->get('publisher'));
-}, ['pools']);
-App::setResource('consumer', function (Group $pools) {
-    return new BrokerPool(consumer: $pools->get('consumer'));
-}, ['pools']);
-App::setResource('queueForMessaging', function (Publisher $publisher) {
-    return new Messaging($publisher);
-}, ['publisher']);
-App::setResource('queueForMails', function (Publisher $publisher) {
-    return new Mail($publisher);
-}, ['publisher']);
-App::setResource('queueForBuilds', function (Publisher $publisher) {
-    return new Build($publisher);
-}, ['publisher']);
-App::setResource('queueForDatabase', function (Publisher $publisher) {
-    return new EventDatabase($publisher);
-}, ['publisher']);
-App::setResource('queueForDeletes', function (Publisher $publisher) {
-    return new Delete($publisher);
-}, ['publisher']);
-App::setResource('queueForEvents', function (Publisher $publisher) {
-    return new Event($publisher);
-}, ['publisher']);
-App::setResource('queueForWebhooks', function (Publisher $publisher) {
-    return new Webhook($publisher);
-}, ['publisher']);
-App::setResource('queueForRealtime', function () {
-    return new Realtime();
-}, []);
-App::setResource('queueForStatsUsage', function (Publisher $publisher) {
-    return new StatsUsage($publisher);
-}, ['publisher']);
-App::setResource('queueForAudits', function (Publisher $publisher) {
-    return new Audit($publisher);
-}, ['publisher']);
-App::setResource('queueForFunctions', function (Publisher $publisher) {
-    return new Func($publisher);
-}, ['publisher']);
-App::setResource('queueForCertificates', function (Publisher $publisher) {
-    return new Certificate($publisher);
-}, ['publisher']);
-App::setResource('queueForMigrations', function (Publisher $publisher) {
-    return new Migration($publisher);
-}, ['publisher']);
-App::setResource('clients', function ($request, $console, $project) {
-    $console->setAttribute('platforms', [ // Always allow current host
-        '$collection' => ID::custom('platforms'),
-        'name' => 'Current Host',
-        'type' => Origin::CLIENT_TYPE_WEB,
-        'hostname' => $request->getHostname(),
-    ], Document::SET_TYPE_APPEND);
-
-    $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' => Origin::CLIENT_TYPE_WEB,
-            'name' => $hostname,
-            'hostname' => $hostname,
-        ], Document::SET_TYPE_APPEND);
-    }
-
-    /**
-     * Get All verified client URLs for both console and current projects
-     * + Filter for duplicated entries
-     */
-    $clientsConsole = \array_map(
-        fn ($node) => $node['hostname'],
-        \array_filter(
-            $console->getAttribute('platforms', []),
-            fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB) && !empty($node['hostname']))
-        )
-    );
-
-    $clients = $clientsConsole;
-    $platforms = $project->getAttribute('platforms', []);
-
-    foreach ($platforms as $node) {
-        if (
-            isset($node['type']) &&
-            ($node['type'] === Origin::CLIENT_TYPE_WEB ||
-            $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) &&
-            !empty($node['hostname'])
-        ) {
-            $clients[] = $node['hostname'];
-        }
-    }
-
-    return \array_unique($clients);
-}, ['request', 'console', 'project']);
-
-App::setResource('user', function ($mode, $project, $console, $request, $response, $dbForProject, $dbForPlatform) {
-    /** @var Appwrite\Utopia\Request $request */
-    /** @var Appwrite\Utopia\Response $response */
-    /** @var Utopia\Database\Document $project */
-    /** @var Utopia\Database\Database $dbForProject */
-    /** @var Utopia\Database\Database $dbForPlatform */
-    /** @var string $mode */
-
-    Authorization::setDefaultStatus(true);
-
-    Auth::setCookieName('a_session_' . $project->getId());
-
-    if (APP_MODE_ADMIN === $mode) {
-        Auth::setCookieName('a_session_' . $console->getId());
-    }
-
-    $session = Auth::decodeSession(
-        $request->getCookie(
-            Auth::$cookieName, // Get sessions
-            $request->getCookie(Auth::$cookieName . '_legacy', '')
-        )
-    );
-
-    // Get session from header for SSR clients
-    if (empty($session['id']) && empty($session['secret'])) {
-        $sessionHeader = $request->getHeader('x-appwrite-session', '');
-
-        if (!empty($sessionHeader)) {
-            $session = Auth::decodeSession($sessionHeader);
-        }
-    }
-
-    // Get fallback session from old clients (no SameSite support) or clients who block 3rd-party cookies
-    if ($response) {
-        $response->addHeader('X-Debug-Fallback', 'false');
-    }
-
-    if (empty($session['id']) && empty($session['secret'])) {
-        if ($response) {
-            $response->addHeader('X-Debug-Fallback', 'true');
-        }
-        $fallback = $request->getHeader('x-fallback-cookies', '');
-        $fallback = \json_decode($fallback, true);
-        $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
-    }
-
-    Auth::$unique = $session['id'] ?? '';
-    Auth::$secret = $session['secret'] ?? '';
-
-    if (APP_MODE_ADMIN !== $mode) {
-        if ($project->isEmpty()) {
-            $user = new Document([]);
-        } else {
-            if ($project->getId() === 'console') {
-                $user = $dbForPlatform->getDocument('users', Auth::$unique);
-            } else {
-                $user = $dbForProject->getDocument('users', Auth::$unique);
-            }
-        }
-    } else {
-        $user = $dbForPlatform->getDocument('users', Auth::$unique);
-    }
-
-    if (
-        $user->isEmpty() // Check a document has been found in the DB
-        || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret)
-    ) { // Validate user has valid login token
-        $user = new Document([]);
-    }
-
-    // if (APP_MODE_ADMIN === $mode) {
-    //     if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
-    //         Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
-    //     } else {
-    //         $user = new Document([]);
-    //     }
-    // }
-
-    $authJWT = $request->getHeader('x-appwrite-jwt', '');
-
-    if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
-        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 3600, 0);
-
-        try {
-            $payload = $jwt->decode($authJWT);
-        } catch (JWTException $error) {
-            throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
-        }
-
-        $jwtUserId = $payload['userId'] ?? '';
-        if (!empty($jwtUserId)) {
-            $user = $dbForProject->getDocument('users', $jwtUserId);
-        }
-
-        $jwtSessionId = $payload['sessionId'] ?? '';
-        if (!empty($jwtSessionId)) {
-            if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
-                $user = new Document([]);
-            }
-        }
-    }
-
-    $dbForProject->setMetadata('user', $user->getId());
-    $dbForPlatform->setMetadata('user', $user->getId());
-
-    return $user;
-}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForPlatform']);
-
-App::setResource('project', function ($dbForPlatform, $request, $console) {
-    /** @var Appwrite\Utopia\Request $request */
-    /** @var Utopia\Database\Database $dbForPlatform */
-    /** @var Utopia\Database\Document $console */
-
-    $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', ''));
-
-    if (empty($projectId) || $projectId === 'console') {
-        return $console;
-    }
-
-    $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
-
-    return $project;
-}, ['dbForPlatform', 'request', 'console']);
-
-App::setResource('session', function (Document $user) {
-    if ($user->isEmpty()) {
-        return;
-    }
-
-    $sessions = $user->getAttribute('sessions', []);
-    $sessionId = Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret);
-
-    if (!$sessionId) {
-        return;
-    }
-
-    foreach ($sessions as $session) {/** @var Document $session */
-        if ($sessionId === $session->getId()) {
-            return $session;
-        }
-    }
-
-    return;
-}, ['user']);
-
-App::setResource('console', function () {
-    return new Document(Config::getParam('console'));
-}, []);
-
-App::setResource('dbForProject', function (Group $pools, Database $dbForPlatform, Cache $cache, Document $project) {
-    if ($project->isEmpty() || $project->getId() === 'console') {
-        return $dbForPlatform;
-    }
-
-    try {
-        $dsn = new DSN($project->getAttribute('database'));
-    } catch (\InvalidArgumentException) {
-        // TODO: Temporary until all projects are using shared tables
-        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-    }
-
-    $adapter = new DatabasePool($pools->get($dsn->getHost()));
-    $database = new Database($adapter, $cache);
-
-    $database
-        ->setMetadata('host', \gethostname())
-        ->setMetadata('project', $project->getId())
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-        ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-    $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-    if (\in_array($dsn->getHost(), $sharedTables)) {
-        $database
-            ->setSharedTables(true)
-            ->setTenant($project->getInternalId())
-            ->setNamespace($dsn->getParam('namespace'));
-    } else {
-        $database
-            ->setSharedTables(false)
-            ->setTenant(null)
-            ->setNamespace('_' . $project->getInternalId());
-    }
-
-    return $database;
-}, ['pools', 'dbForPlatform', 'cache', 'project']);
-
-App::setResource('dbForPlatform', function (Group $pools, Cache $cache) {
-    $adapter = new DatabasePool($pools->get('console'));
-    $database = new Database($adapter, $cache);
-
-    $database
-        ->setNamespace('_console')
-        ->setMetadata('host', \gethostname())
-        ->setMetadata('project', 'console')
-        ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-        ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-    return $database;
-}, ['pools', 'cache']);
-
-App::setResource('getProjectDB', function (Group $pools, Database $dbForPlatform, $cache) {
-    $databases = [];
-
-    return function (Document $project) use ($pools, $dbForPlatform, $cache, &$databases) {
-        if ($project->isEmpty() || $project->getId() === 'console') {
-            return $dbForPlatform;
-        }
-
-        try {
-            $dsn = new DSN($project->getAttribute('database'));
-        } catch (\InvalidArgumentException) {
-            // TODO: Temporary until all projects are using shared tables
-            $dsn = new DSN('mysql://' . $project->getAttribute('database'));
-        }
-
-        $configure = (function (Database $database) use ($project, $dsn) {
-            $database
-                ->setMetadata('host', \gethostname())
-                ->setMetadata('project', $project->getId())
-                ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-                ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-            $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
-
-            if (\in_array($dsn->getHost(), $sharedTables)) {
-                $database
-                    ->setSharedTables(true)
-                    ->setTenant($project->getInternalId())
-                    ->setNamespace($dsn->getParam('namespace'));
-            } else {
-                $database
-                    ->setSharedTables(false)
-                    ->setTenant(null)
-                    ->setNamespace('_' . $project->getInternalId());
-            }
-        });
-
-        if (isset($databases[$dsn->getHost()])) {
-            $database = $databases[$dsn->getHost()];
-            $configure($database);
-            return $database;
-        }
-
-        $adapter = new DatabasePool($pools->get($dsn->getHost()));
-        $database = new Database($adapter, $cache);
-        $databases[$dsn->getHost()] = $database;
-        $configure($database);
-
-        return $database;
-    };
-}, ['pools', 'dbForPlatform', 'cache']);
-
-App::setResource('getLogsDB', function (Group $pools, Cache $cache) {
-    $database = null;
-
-    return function (?Document $project = null) use ($pools, $cache, &$database) {
-        if ($database !== null && $project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-            return $database;
-        }
-
-        $adapter = new DatabasePool($pools->get('logs'));
-        $database = new Database($adapter, $cache);
-
-        $database
-            ->setSharedTables(true)
-            ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_API)
-            ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
-
-        // set tenant
-        if ($project !== null && !$project->isEmpty() && $project->getId() !== 'console') {
-            $database->setTenant($project->getInternalId());
-        }
-
-        return $database;
-    };
-}, ['pools', 'cache']);
-
-App::setResource('telemetry', fn () => new NoTelemetry());
-
-App::setResource('cache', function (Group $pools) {
-    $list = Config::getParam('pools-cache', []);
-    $adapters = [];
-
-    foreach ($list as $value) {
-        $adapters[] = new CachePool($pools->get($value));
-    }
-
-    return new Cache(new Sharding($adapters));
-}, ['pools']);
-
-App::setResource('redis', function () {
-    $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
-    $port = System::getEnv('_APP_REDIS_PORT', 6379);
-    $pass = System::getEnv('_APP_REDIS_PASS', '');
-
-    $redis = new \Redis();
-    @$redis->pconnect($host, (int)$port);
-    if ($pass) {
-        $redis->auth($pass);
-    }
-    $redis->setOption(\Redis::OPT_READ_TIMEOUT, -1);
-
-    return $redis;
-});
-
-App::setResource('timelimit', function (\Redis $redis) {
-    return function (string $key, int $limit, int $time) use ($redis) {
-        return new TimeLimitRedis($key, $limit, $time, $redis);
-    };
-}, ['redis']);
-
-App::setResource('deviceForLocal', function (Telemetry $telemetry) {
-    return new Local();
-}, ['telemetry']);
-
-App::setResource('deviceForFiles', function ($project) {
-    return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForSites', function ($project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForImports', function ($project) {
-    return getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForFunctions', function ($project) {
-    return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
-}, ['project']);
-App::setResource('deviceForBuilds', function ($project) {
-    return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
-}, ['project']);
-
-function getDevice(string $root, string $connection = ''): Device
-{
-    $connection = !empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
-
-    if (!empty($connection)) {
-        $acl = 'private';
-        $device = Storage::DEVICE_LOCAL;
-        $accessKey = '';
-        $accessSecret = '';
-        $bucket = '';
-        $region = '';
-        $url = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
-
-        try {
-            $dsn = new DSN($connection);
-            $device = $dsn->getScheme();
-            $accessKey = $dsn->getUser() ?? '';
-            $accessSecret = $dsn->getPassword() ?? '';
-            $bucket = $dsn->getPath() ?? '';
-            $region = $dsn->getParam('region');
-        } catch (\Throwable $e) {
-            Console::warning($e->getMessage() . 'Invalid DSN. Defaulting to Local device.');
-        }
-
-        switch ($device) {
-            case Storage::DEVICE_S3:
-                if (!empty($url)) {
-                    return new S3($root, $accessKey, $accessSecret, $url, $region, $acl);
-                } else {
-                    return new AWS($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-                }
-                // no break
-            case STORAGE::DEVICE_DO_SPACES:
-                $device = new DOSpaces($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
-                return $device;
-            case Storage::DEVICE_BACKBLAZE:
-                return new Backblaze($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case Storage::DEVICE_LINODE:
-                return new Linode($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case Storage::DEVICE_WASABI:
-                return new Wasabi($root, $accessKey, $accessSecret, $bucket, $region, $acl);
-            case Storage::DEVICE_LOCAL:
-            default:
-                return new Local($root);
-        }
-    } else {
-        switch (strtolower(System::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL) ?? '')) {
-            case Storage::DEVICE_LOCAL:
-            default:
-                return new Local($root);
-            case Storage::DEVICE_S3:
-                $s3AccessKey = System::getEnv('_APP_STORAGE_S3_ACCESS_KEY', '');
-                $s3SecretKey = System::getEnv('_APP_STORAGE_S3_SECRET', '');
-                $s3Region = System::getEnv('_APP_STORAGE_S3_REGION', '');
-                $s3Bucket = System::getEnv('_APP_STORAGE_S3_BUCKET', '');
-                $s3Acl = 'private';
-                $s3EndpointUrl = System::getEnv('_APP_STORAGE_S3_ENDPOINT', '');
-                if (!empty($s3EndpointUrl)) {
-                    return new S3($root, $s3AccessKey, $s3SecretKey, $s3EndpointUrl, $s3Region, $s3Acl);
-                } else {
-                    return new AWS($root, $s3AccessKey, $s3SecretKey, $s3Bucket, $s3Region, $s3Acl);
-                }
-                // no break
-            case Storage::DEVICE_DO_SPACES:
-                $doSpacesAccessKey = System::getEnv('_APP_STORAGE_DO_SPACES_ACCESS_KEY', '');
-                $doSpacesSecretKey = System::getEnv('_APP_STORAGE_DO_SPACES_SECRET', '');
-                $doSpacesRegion = System::getEnv('_APP_STORAGE_DO_SPACES_REGION', '');
-                $doSpacesBucket = System::getEnv('_APP_STORAGE_DO_SPACES_BUCKET', '');
-                $doSpacesAcl = 'private';
-                $device = new DOSpaces($root, $doSpacesAccessKey, $doSpacesSecretKey, $doSpacesBucket, $doSpacesRegion, $doSpacesAcl);
-                $device->setHttpVersion(S3::HTTP_VERSION_1_1);
-                return $device;
-            case Storage::DEVICE_BACKBLAZE:
-                $backblazeAccessKey = System::getEnv('_APP_STORAGE_BACKBLAZE_ACCESS_KEY', '');
-                $backblazeSecretKey = System::getEnv('_APP_STORAGE_BACKBLAZE_SECRET', '');
-                $backblazeRegion = System::getEnv('_APP_STORAGE_BACKBLAZE_REGION', '');
-                $backblazeBucket = System::getEnv('_APP_STORAGE_BACKBLAZE_BUCKET', '');
-                $backblazeAcl = 'private';
-                return new Backblaze($root, $backblazeAccessKey, $backblazeSecretKey, $backblazeBucket, $backblazeRegion, $backblazeAcl);
-            case Storage::DEVICE_LINODE:
-                $linodeAccessKey = System::getEnv('_APP_STORAGE_LINODE_ACCESS_KEY', '');
-                $linodeSecretKey = System::getEnv('_APP_STORAGE_LINODE_SECRET', '');
-                $linodeRegion = System::getEnv('_APP_STORAGE_LINODE_REGION', '');
-                $linodeBucket = System::getEnv('_APP_STORAGE_LINODE_BUCKET', '');
-                $linodeAcl = 'private';
-                return new Linode($root, $linodeAccessKey, $linodeSecretKey, $linodeBucket, $linodeRegion, $linodeAcl);
-            case Storage::DEVICE_WASABI:
-                $wasabiAccessKey = System::getEnv('_APP_STORAGE_WASABI_ACCESS_KEY', '');
-                $wasabiSecretKey = System::getEnv('_APP_STORAGE_WASABI_SECRET', '');
-                $wasabiRegion = System::getEnv('_APP_STORAGE_WASABI_REGION', '');
-                $wasabiBucket = System::getEnv('_APP_STORAGE_WASABI_BUCKET', '');
-                $wasabiAcl = 'private';
-                return new Wasabi($root, $wasabiAccessKey, $wasabiSecretKey, $wasabiBucket, $wasabiRegion, $wasabiAcl);
-        }
-    }
-}
-
-App::setResource('mode', function ($request) {
-    /** @var Appwrite\Utopia\Request $request */
-
-    /**
-     * Defines the mode for the request:
-     * - 'default' => Requests for Client and Server Side
-     * - 'admin' => Request from the Console on non-console projects
-     */
-    return $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
-}, ['request']);
-
-App::setResource('geodb', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('geodb');
-}, ['register']);
-
-App::setResource('passwordsDictionary', function ($register) {
-    /** @var Utopia\Registry\Registry $register */
-    return $register->get('passwordsDictionary');
-}, ['register']);
-
-
-App::setResource('servers', function () {
-    $platforms = Config::getParam('platforms');
-    $server = $platforms[APP_PLATFORM_SERVER];
-
-    $languages = array_map(function ($language) {
-        return strtolower($language['name']);
-    }, $server['sdks']);
-
-    return $languages;
-});
-
-App::setResource('promiseAdapter', function ($register) {
-    return $register->get('promiseAdapter');
-}, ['register']);
-
-App::setResource('schema', function ($utopia, $dbForProject) {
-
-    $complexity = function (int $complexity, array $args) {
-        $queries = Query::parseQueries($args['queries'] ?? []);
-        $query = Query::getByType($queries, [Query::TYPE_LIMIT])[0] ?? null;
-        $limit = $query ? $query->getValue() : APP_LIMIT_LIST_DEFAULT;
-
-        return $complexity * $limit;
-    };
-
-    $attributes = function (int $limit, int $offset) use ($dbForProject) {
-        $attrs = Authorization::skip(fn () => $dbForProject->find('attributes', [
-            Query::limit($limit),
-            Query::offset($offset),
-        ]));
-
-        return \array_map(function ($attr) {
-            return $attr->getArrayCopy();
-        }, $attrs);
-    };
-
-    $urls = [
-        'list' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents";
-        },
-        'create' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents";
-        },
-        'read' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
-        },
-        'update' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
-        },
-        'delete' => function (string $databaseId, string $collectionId, array $args) {
-            return "/v1/databases/$databaseId/collections/$collectionId/documents/{$args['documentId']}";
-        },
-    ];
-
-    $params = [
-        'list' => function (string $databaseId, string $collectionId, array $args) {
-            return [ 'queries' => $args['queries']];
-        },
-        'create' => function (string $databaseId, string $collectionId, array $args) {
-            $id = $args['id'] ?? 'unique()';
-            $permissions = $args['permissions'] ?? null;
-
-            unset($args['id']);
-            unset($args['permissions']);
-
-            // Order must be the same as the route params
-            return [
-                'databaseId' => $databaseId,
-                'documentId' => $id,
-                'collectionId' => $collectionId,
-                'data' => $args,
-                'permissions' => $permissions,
-            ];
-        },
-        'update' => function (string $databaseId, string $collectionId, array $args) {
-            $documentId = $args['id'];
-            $permissions = $args['permissions'] ?? null;
-
-            unset($args['id']);
-            unset($args['permissions']);
-
-            // Order must be the same as the route params
-            return [
-                'databaseId' => $databaseId,
-                'collectionId' => $collectionId,
-                'documentId' => $documentId,
-                'data' => $args,
-                'permissions' => $permissions,
-            ];
-        },
-    ];
-
-    return Schema::build(
-        $utopia,
-        $complexity,
-        $attributes,
-        $urls,
-        $params,
-    );
-}, ['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);
-}, ['cache']);
-
-App::setResource('requestTimestamp', function ($request) {
-    //TODO: Move this to the Request class itself
-    $timestampHeader = $request->getHeader('x-appwrite-timestamp');
-    $requestTimestamp = null;
-    if (!empty($timestampHeader)) {
-        try {
-            $requestTimestamp = new \DateTime($timestampHeader);
-        } catch (\Throwable $e) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid X-Appwrite-Timestamp header value');
-        }
-    }
-    return $requestTimestamp;
-}, ['request']);
-
-App::setResource('plan', function (array $plan = []) {
-    return [];
-});
-
-App::setResource('smsRates', function () {
-    return [];
-});
-
-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
-    $key = $project->find('secret', $devKey, 'devKeys');
-    if (!$key) {
-        return new Document([]);
-    }
-
-    // check expiration
-    $expire = $key->getAttribute('expire');
-    if (!empty($expire) && $expire < DatabaseDateTime::formatTz(DatabaseDateTime::now())) {
-        return new Document([]);
-    }
-
-    // update access time
-    $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));
-        $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-    }
-
-    // add sdk to key
-    $sdkValidator = new WhiteList($servers, true);
-    $sdk = \strtolower($request->getHeader('x-sdk-name', 'UNKNOWN'));
-
-    if ($sdk !== 'UNKNOWN' && $sdkValidator->isValid($sdk)) {
-        $sdks = $key->getAttribute('sdks', []);
-
-        if (!in_array($sdk, $sdks)) {
-            $sdks[] = $sdk;
-            $key->setAttribute('sdks', $sdks);
-
-            /** Update access time as well */
-            $key->setAttribute('accessedAt', DatabaseDateTime::now());
-            $key = Authorization::skip(fn () => $dbForPlatform->updateDocument('devKeys', $key->getId(), $key));
-            $dbForPlatform->purgeCachedDocument('projects', $project->getId());
-        }
-    }
-    return $key;
-}, ['request', 'project', 'servers', 'dbForPlatform']);
-
-App::setResource('team', function (Document $project, Database $dbForPlatform, App $utopia, Request $request) {
-    $teamInternalId = '';
-    if ($project->getId() !== 'console') {
-        $teamInternalId = $project->getAttribute('teamInternalId', '');
-    } else {
-        $route = $utopia->match($request);
-        $path = $route->getPath();
-        if (str_starts_with($path, '/v1/projects/:projectId')) {
-            $uri = $request->getURI();
-            $pid = explode('/', $uri)[3];
-            $p = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $pid));
-            $teamInternalId = $p->getAttribute('teamInternalId', '');
-        } elseif ($path === '/v1/projects') {
-            $teamId = $request->getParam('teamId', '');
-            $team = Authorization::skip(fn () => $dbForPlatform->getDocument('teams', $teamId));
-            return $team;
-        }
-    }
-
-    $team = Authorization::skip(function () use ($dbForPlatform, $teamInternalId) {
-        return $dbForPlatform->findOne('teams', [
-            Query::equal('$internalId', [$teamInternalId]),
-        ]);
-    });
-
-    return $team;
-}, ['project', 'dbForPlatform', 'utopia', 'request']);
-
-App::setResource(
-    'isResourceBlocked',
-    fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
-);
-
-App::setResource('previewHostname', function (Request $request, ?Key $apiKey) {
-    $allowed = false;
-
-    if (App::isDevelopment()) {
-        $allowed = true;
-    } elseif (!\is_null($apiKey) && $apiKey->getHostnameOverride() === true) {
-        $allowed = true;
-    }
-
-    if ($allowed) {
-        $host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', '')) ?? '';
-        if (!empty($host)) {
-            return $host;
-        }
-    }
-
-    return '';
-}, ['request', 'apiKey']);
-
-App::setResource('apiKey', function (Request $request, Document $project): ?Key {
-    $key = $request->getHeader('x-appwrite-key');
-
-    if (empty($key)) {
-        return null;
-    }
-
-    return Key::decode($project, $key);
-}, ['request', 'project']);
-
-App::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
-App::setResource('resourceToken', function ($project, $dbForProject, $request) {
-    $tokenJWT = $request->getParam('token');
-
-    if (!empty($tokenJWT) && !$project->isEmpty()) { // JWT authentication
-        $jwt = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
-
-        try {
-            $payload = $jwt->decode($tokenJWT);
-        } catch (JWTException $error) {
-            return new Document([]);
-        }
-
-        $tokenId = $payload['tokenId'] ?? '';
-        if (empty($tokenId)) {
-            return new Document([]);
-        }
-
-        $token = Authorization::skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));
-
-        if ($token->isEmpty()) {
-            return new Document([]);
-        }
-
-        $expiry = $token->getAttribute('expire');
-
-        if ($expiry !== null) {
-            $now = new \DateTime();
-            $expiryDate = new \DateTime($expiry);
-
-            if ($expiryDate < $now) {
-                return new Document([]);
-            }
-        }
-
-        return match ($token->getAttribute('resourceType')) {
-            TOKENS_RESOURCE_TYPE_FILES => (function () use ($token, $dbForProject) {
-                $internalIds = explode(':', $token->getAttribute('resourceInternalId'));
-                $ids = explode(':', $token->getAttribute('resourceId'));
-
-                if (count($internalIds) !== 2 || count($ids) !== 2) {
-                    return new Document([]);
-                }
-
-                $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));
-                }
-
-                return new Document([
-                    'bucketId' => $ids[0],
-                    'fileId' => $ids[1],
-                    'bucketInternalId' => $internalIds[0],
-                    'fileInternalId' => $internalIds[1],
-                ]);
-            })(),
-
-            default => throw new Exception(Exception::TOKEN_RESOURCE_TYPE_INVALID),
-        };
-    }
-    return new Document([]);
-}, ['project', 'dbForProject', 'request']);

app/realtime.php

@@ -5,7 +5,6 @@ use Appwrite\Extend\Exception;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\PubSub\Adapter\Pool as PubSubPool;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Swoole\Http\Request as SwooleRequest;
@@ -16,12 +15,10 @@ use Swoole\Timer;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
 use Utopia\App;
-use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -31,15 +28,13 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\DSN\DSN;
 use Utopia\Logger\Log;
-use Utopia\Pools\Group;
-use Utopia\Registry\Registry;
 use Utopia\System\System;
 use Utopia\Telemetry\Adapter\None as NoTelemetry;
 use Utopia\WebSocket\Adapter;
 use Utopia\WebSocket\Server;
 
 /**
- * @var Registry $register
+ * @var \Utopia\Registry\Registry $register
  */
 require_once __DIR__ . '/init.php';
 
@@ -51,17 +46,17 @@ if (!function_exists('getConsoleDB')) {
     {
         global $register;
 
-        static $database = null;
-
-        if ($database !== null) {
-            return $database;
-        }
-
-        /** @var Group $pools */
+        /** @var \Utopia\Pools\Group $pools */
         $pools = $register->get('pools');
 
-        $adapter = new DatabasePool($pools->get('console'));
-        $database = new Database($adapter, getCache());
+        $dbAdapter = $pools
+            ->get('console')
+            ->pop()
+            ->getResource()
+        ;
+
+        $database = new Database($dbAdapter, getCache());
+
         $database
             ->setNamespace('_console')
             ->setMetadata('host', \gethostname())
@@ -77,13 +72,7 @@ if (!function_exists('getProjectDB')) {
     {
         global $register;
 
-        static $databases = [];
-
-        if (isset($databases[$project->getInternalId()])) {
-            return $databases[$project->getInternalId()];
-        }
-
-        /** @var Group $pools */
+        /** @var \Utopia\Pools\Group $pools */
         $pools = $register->get('pools');
 
         if ($project->isEmpty() || $project->getId() === 'console') {
@@ -97,7 +86,11 @@ if (!function_exists('getProjectDB')) {
             $dsn = new DSN('mysql://' . $project->getAttribute('database'));
         }
 
-        $adapter = new DatabasePool($pools->get($dsn->getHost()));
+        $adapter = $pools
+            ->get($dsn->getHost())
+            ->pop()
+            ->getResource();
+
         $database = new Database($adapter, getCache());
 
         $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
@@ -118,7 +111,7 @@ if (!function_exists('getProjectDB')) {
             ->setMetadata('host', \gethostname())
             ->setMetadata('project', $project->getId());
 
-        return $databases[$project->getInternalId()] = $database;
+        return $database;
     }
 }
 
@@ -128,22 +121,20 @@ if (!function_exists('getCache')) {
     {
         global $register;
 
-        static $cache = null;
-
-        if ($cache !== null) {
-            return $cache;
-        }
-
-        $pools = $register->get('pools'); /** @var Group $pools */
+        $pools = $register->get('pools'); /** @var \Utopia\Pools\Group $pools */
 
         $list = Config::getParam('pools-cache', []);
         $adapters = [];
 
         foreach ($list as $value) {
-            $adapters[] = new CachePool($pools->get($value));
+            $adapters[] = $pools
+                ->get($value)
+                ->pop()
+                ->getResource()
+            ;
         }
 
-        return $cache = new Cache(new Sharding($adapters));
+        return new Cache(new Sharding($adapters));
     }
 }
 
@@ -151,12 +142,6 @@ if (!function_exists('getCache')) {
 if (!function_exists('getRedis')) {
     function getRedis(): \Redis
     {
-        static $redis = null;
-
-        if ($redis !== null) {
-            return $redis;
-        }
-
         $host = System::getEnv('_APP_REDIS_HOST', 'localhost');
         $port = System::getEnv('_APP_REDIS_PORT', 6379);
         $pass = System::getEnv('_APP_REDIS_PASS', '');
@@ -175,39 +160,21 @@ if (!function_exists('getRedis')) {
 if (!function_exists('getTimelimit')) {
     function getTimelimit(): TimeLimitRedis
     {
-        static $timelimit = null;
-
-        if ($timelimit !== null) {
-            return $timelimit;
-        }
-
-        return $timelimit = new TimeLimitRedis("", 0, 1, getRedis());
+        return new TimeLimitRedis("", 0, 1, getRedis());
     }
 }
 
 if (!function_exists('getRealtime')) {
     function getRealtime(): Realtime
     {
-        static $realtime = null;
-
-        if ($realtime !== null) {
-            return $realtime;
-        }
-
-        return $realtime = new Realtime();
+        return new Realtime();
     }
 }
 
 if (!function_exists('getTelemetry')) {
     function getTelemetry(int $workerId): Utopia\Telemetry\Adapter
     {
-        static $telemetry = null;
-
-        if ($telemetry !== null) {
-            return $telemetry;
-        }
-
-        return $telemetry = new NoTelemetry();
+        return new NoTelemetry();
     }
 }
 
@@ -306,6 +273,7 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
                 sleep(DATABASE_RECONNECT_SLEEP);
             }
         } while (true);
+        $register->get('pools')->reclaim();
     });
 
     /**
@@ -331,7 +299,9 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
 
                 Authorization::skip(fn () => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
             } catch (Throwable $th) {
-                $logError($th, "updateWorkerDocument");
+                call_user_func($logError, $th, "updateWorkerDocument");
+            } finally {
+                $register->get('pools')->reclaim();
             }
         });
     }
@@ -400,6 +370,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         'data' => $event['data']
                     ]));
                 }
+
+                $register->get('pools')->reclaim();
             }
         }
         /**
@@ -435,8 +407,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
             }
             $start = time();
 
-            $pubsub = new PubSubPool($register->get('pools')->get('pubsub'));
-
+            /** @var \Appwrite\PubSub\Adapter $pubsub */
+            $pubsub = $register->get('pools')->get('pubsub')->pop()->getResource();
             if ($pubsub->ping(true)) {
                 $attempts = 0;
                 Console::success('Pub/sub connection established (worker: ' . $workerId . ')');
@@ -464,6 +436,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
 
                         $realtime->unsubscribe($connection);
                         $realtime->subscribe($projectId, $connection, $roles, $channels);
+
+                        $register->get('pools')->reclaim();
                     }
                 }
 
@@ -489,12 +463,14 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 }
             });
         } catch (Throwable $th) {
-            $logError($th, "pubSubConnection");
+            call_user_func($logError, $th, "pubSubConnection");
 
             Console::error('Pub/sub error: ' . $th->getMessage());
             $attempts++;
             sleep(DATABASE_RECONNECT_SLEEP);
             continue;
+        } finally {
+            $register->get('pools')->reclaim();
         }
     }
 
@@ -596,7 +572,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         $stats->incr($project->getId(), 'connections');
         $stats->incr($project->getId(), 'connectionsTotal');
     } catch (Throwable $th) {
-        $logError($th, "initServer");
+        call_user_func($logError, $th, "initServer");
 
         // Handle SQL error code is 'HY000'
         $code = $th->getCode();
@@ -620,6 +596,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
             Console::error('[Error] Code: ' . $response['data']['code']);
             Console::error('[Error] Message: ' . $response['data']['message']);
         }
+    } finally {
+        $register->get('pools')->reclaim();
     }
 });
 
@@ -718,6 +696,8 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         if ($th->getCode() === 1008) {
             $server->close($connection, $th->getCode());
         }
+    } finally {
+        $register->get('pools')->reclaim();
     }
 });
 

app/views/general/404.phtml

@@ -1,187 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>404 Not Found</title>
-
-    <style>
-        @import url(https://fonts.bunny.net/css?family=fira-code:400|inter:400);
-
-        * {
-            margin: 0;
-            padding: 0;
-        }
-
-        body {
-            background-color: #FFFFFF;
-        }
-
-        .main {
-            display: flex;
-            min-height: 100vh;
-            width: 100vw;
-            align-items: center;
-            justify-content: center;
-        }
-
-        .content {
-            margin-left: auto;
-            margin-right: auto;
-            max-width: 400px;
-        }
-
-        span {
-            padding: var(--space-1, 2px) var(--space-3, 6px);
-            border-radius: var(--border-radius-XS, 6px);
-            background: var(--color-overlay-on-neutral, rgba(0, 0, 0, 0.06));
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-            text-align: center;
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-        }
-
-        h1 {
-            color: var(--color-fgColor-neutral-primary, #2D2D31);
-            text-align: center;
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-XXXL, 32px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.144px;
-            margin-top: 8px;
-            margin-bottom: 32px;
-        }
-
-        button {
-            border-radius: var(--border-radius-S, 8px);
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 500;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-            padding: var(--space-3, 6px) var(--space-5, 10px);
-            cursor: pointer;
-            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #D8D8DB);
-            background: var(--color-bgColor-neutral-primary, #FFF);
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .center {
-            display: flex;
-            justify-content: center;
-        }
-
-        .brand {
-            position: absolute;
-            width: 100%;
-            bottom: 32px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            gap: 8px;
-        }
-
-        .brand p {
-            font-family: var(--font-family-monospace, "Fira Code"), monospace;
-            font-size: var(--font-size-XS, 12px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 130%;
-            letter-spacing: 0.96px;
-            text-transform: uppercase;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .brand svg {
-            height: 20px;
-        }
-
-        .logo-dark {
-            display: none;
-        }
-
-        @media (prefers-color-scheme: dark) {
-            body {
-                background-color: #1D1D21;
-            }
-
-            h1 {
-                color: var(--color-fgColor-neutral-primary, #EDEDF0);
-            }
-
-            button {
-                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #414146);
-                background: var(--color-bgColor-neutral-primary, #1D1D21);
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .brand p {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            span {
-                background: var(--color-overlay-on-neutral, rgba(255, 255, 255, 0.20));
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .logo-light {
-                display: none;
-            }
-
-            .logo-dark {
-                display: block;
-            }
-        }
-    </style>
-</head>
-
-<body>
-    <div class="main">
-        <div class="content">
-            <div class="center"><span>Page not found</span></div>
-            <h1>The page you’re looking for doesn’t exist.</h1>
-            <div class="center"><a href="/"><button>Go to homepage</button></a></div>
-        </div>
-    </div>
-
-    <div class="brand">
-        <p>Powered by</p>
-        <svg class="logo-dark" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8649 16.2461C33.6492 16.2461 34.5511 15.3184 34.9433 14.6867H35.1197C35.1981 15.3578 35.6687 15.9895 36.5903 15.9895H38.3353V14.0156H37.8843C37.5706 14.0156 37.4138 13.838 37.4138 13.5617V5.64661H35.1001V6.90986H34.9236C34.4727 6.27823 33.5315 5.39001 31.8061 5.39001C29.0611 5.39001 27.022 7.67965 27.022 10.818C27.022 13.9564 29.1003 16.2461 31.8649 16.2461ZM32.2767 13.9959C30.6493 13.9959 29.3748 12.7919 29.3748 10.8378C29.3748 8.92316 30.6101 7.62044 32.2571 7.62044C33.8256 7.62044 35.1393 8.78499 35.1393 10.8378C35.1393 12.5945 34.0217 13.9959 32.2767 13.9959Z" fill="#EDEDF0" />
-            <path d="M39.7013 20H42.0149V14.6867H42.1914C42.6227 15.3184 43.5443 16.2461 45.3677 16.2461C48.1127 16.2461 50.1127 13.9169 50.1127 10.818C50.1127 7.69939 47.9755 5.39001 45.2109 5.39001C43.4462 5.39001 42.5835 6.35719 42.1718 6.89012H41.9953V5.64661H39.7013V20ZM44.8776 14.0551C43.2894 14.0551 41.9757 12.8708 41.9757 10.818C41.9757 9.06133 43.0933 7.58096 44.8383 7.58096C46.4657 7.58096 47.7402 8.86395 47.7402 10.818C47.7402 12.7326 46.5049 14.0551 44.8776 14.0551Z" fill="#EDEDF0" />
-            <path d="M51.3065 20H53.6202V14.6867H53.7966C54.228 15.3184 55.1495 16.2461 56.973 16.2461C59.718 16.2461 61.5273 13.9169 61.5273 10.818C61.5273 7.69939 59.5807 5.39001 56.8161 5.39001C55.0515 5.39001 54.1888 6.35719 53.777 6.89012H53.6005V5.64661H51.3065V20ZM56.4828 14.0551C54.8946 14.0551 53.5809 12.8708 53.5809 10.818C53.5809 9.06133 54.6985 7.58096 56.4436 7.58096C58.071 7.58096 59.3454 8.86395 59.3454 10.818C59.3454 12.7326 58.1102 14.0551 56.4828 14.0551Z" fill="#EDEDF0" />
-            <path d="M64.5857 16.2296H67.8601L69.7227 8.11721H69.8404L71.7031 16.2296H74.9579L77.5642 5.88678H75.2323L73.3697 14.0189H73.1932L71.3305 5.88678H68.2522L66.3699 14.0189H66.1935L64.3504 5.88678H61.8799L64.5857 16.2296Z" fill="#EDEDF0" />
-            <path d="M78.7363 16.2296H81.0499V11.1174C81.0499 9.16334 81.9519 7.9593 83.6381 7.9593H84.6576V5.63019H83.893C82.5793 5.63019 81.5793 6.53815 81.1872 7.40663H81.0303V5.88678H78.7363V16.2296Z" fill="#EDEDF0" />
-            <path d="M96.1391 16.2296H97.943V14.1571H96.1587C95.4529 14.1571 95.1588 13.8413 95.1588 13.111V7.93956H98.0606V5.88678H95.1588V2.98526H92.9628V5.88678H91.0413V7.93956H92.8255V13.1307C92.8255 15.3217 94.1392 16.2296 96.1391 16.2296Z" fill="#EDEDF0" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.17 15.1802 108.836 13.0287L106.719 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.327 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.915 7.58096 98.915 10.8378C98.915 13.9959 101.013 16.2461 104.15 16.2461ZM101.327 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.621 8.31128 106.738 9.71269H101.327Z" fill="#EDEDF0" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0125 16.2296H87.6989V7.93956H85.895V5.88678H90.0125V16.2296Z" fill="#EDEDF0" />
-            <path d="M88.6834 4.45145C89.5265 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5265 1.54993 88.6834 1.54993C87.8403 1.54993 87.2129 2.18155 87.2129 2.99082C87.2129 3.81983 87.8403 4.45145 88.6834 4.45145Z" fill="#EDEDF0" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2006 7.88412V12.4486H11.9414C12.8021 11.6166 13.3389 10.4373 13.3389 9.12899C13.3389 8.69744 13.2806 8.27999 13.1713 7.88412H20.2006Z" fill="#FD366E" />
-        </svg>
-        <svg class="logo-light" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8648 16.2461C33.649 16.2461 34.5509 15.3184 34.9431 14.6867H35.1195C35.198 15.3578 35.6685 15.9895 36.5901 15.9895H38.3351V14.0156H37.8841C37.5704 14.0156 37.4136 13.838 37.4136 13.5617V5.64661H35.0999V6.90986H34.9235C34.4725 6.27823 33.5314 5.39001 31.8059 5.39001C29.0609 5.39001 27.0218 7.67965 27.0218 10.818C27.0218 13.9564 29.1001 16.2461 31.8648 16.2461ZM32.2765 13.9959C30.6491 13.9959 29.3746 12.7919 29.3746 10.8378C29.3746 8.92316 30.6099 7.62044 32.2569 7.62044C33.8255 7.62044 35.1391 8.78499 35.1391 10.8378C35.1391 12.5945 34.0215 13.9959 32.2765 13.9959Z" fill="#2D2D31" />
-            <path d="M39.7011 20H42.0147V14.6867H42.1912C42.6226 15.3184 43.5441 16.2461 45.3676 16.2461C48.1126 16.2461 50.1125 13.9169 50.1125 10.818C50.1125 7.69939 47.9753 5.39001 45.2107 5.39001C43.4461 5.39001 42.5833 6.35719 42.1716 6.89012H41.9951V5.64661H39.7011V20ZM44.8774 14.0551C43.2892 14.0551 41.9755 12.8708 41.9755 10.818C41.9755 9.06133 43.0931 7.58096 44.8382 7.58096C46.4656 7.58096 47.74 8.86395 47.74 10.818C47.74 12.7326 46.5048 14.0551 44.8774 14.0551Z" fill="#2D2D31" />
-            <path d="M51.3063 20H53.62V14.6867H53.7964C54.2278 15.3184 55.1493 16.2461 56.9728 16.2461C59.7178 16.2461 61.5271 13.9169 61.5271 10.818C61.5271 7.69939 59.5805 5.39001 56.8159 5.39001C55.0513 5.39001 54.1886 6.35719 53.7768 6.89012H53.6004V5.64661H51.3063V20ZM56.4826 14.0551C54.8944 14.0551 53.5808 12.8708 53.5808 10.818C53.5808 9.06133 54.6984 7.58096 56.4434 7.58096C58.0708 7.58096 59.3453 8.86395 59.3453 10.818C59.3453 12.7326 58.11 14.0551 56.4826 14.0551Z" fill="#2D2D31" />
-            <path d="M64.5855 16.2296H67.8599L69.7226 8.11721H69.8402L71.7029 16.2296H74.9577L77.564 5.88678H75.2322L73.3695 14.0189H73.193L71.3303 5.88678H68.252L66.3697 14.0189H66.1933L64.3502 5.88678H61.8797L64.5855 16.2296Z" fill="#2D2D31" />
-            <path d="M78.7361 16.2296H81.0498V11.1174C81.0498 9.16334 81.9517 7.9593 83.6379 7.9593H84.6575V5.63019H83.8928C82.5791 5.63019 81.5791 6.53815 81.187 7.40663H81.0301V5.88678H78.7361V16.2296Z" fill="#2D2D31" />
-            <path d="M96.1389 16.2296H97.9428V14.1571H96.1585C95.4527 14.1571 95.1586 13.8413 95.1586 13.111V7.93956H98.0604V5.88678H95.1586V2.98526H92.9626V5.88678H91.0411V7.93956H92.8253V13.1307C92.8253 15.3217 94.139 16.2296 96.1389 16.2296Z" fill="#2D2D31" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.169 15.1802 108.836 13.0287L106.718 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.326 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.9148 7.58096 98.9148 10.8378C98.9148 13.9959 101.013 16.2461 104.15 16.2461ZM101.326 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.62 8.31128 106.738 9.71269H101.326Z" fill="#2D2D31" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0123 16.2296H87.6987V7.93956H85.8948V5.88678H90.0123V16.2296Z" fill="#2D2D31" />
-            <path d="M88.6835 4.45145C89.5266 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5266 1.54993 88.6835 1.54993C87.8404 1.54993 87.213 2.18155 87.213 2.99082C87.213 3.81983 87.8404 4.45145 88.6835 4.45145Z" fill="#2D2D31" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2007 7.88412V12.4486H11.9415C12.8022 11.6166 13.339 10.4373 13.339 9.12899C13.339 8.69744 13.2807 8.27999 13.1714 7.88412H20.2007Z" fill="#FD366E" />
-        </svg>
-
-    </div>
-</body>
-
-</html>

app/views/general/error.phtml

@@ -1,112 +1,22 @@
 <?php
-use Utopia\System\System;
-
 $development = $this->getParam('development', false);
 $type = $this->getParam('type', 'general_server_error');
 $code = $this->getParam('code', 500);
+$errorID = $this->getParam('errorID', 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx');
 $message = $this->getParam('message', '');
 $trace = $this->getParam('trace', []);
-$title = $this->getParam('title', 'Error'); 
-$exception = $this->getParam('exception', null);
-
-$isSimpleMessage = true;
-$label = '';
-$labelClass = '';
-$buttons = [];
-
-$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-$hostname = System::getEnv('_APP_DOMAIN');
-// TODO: remove this later
-if (System::getEnv('_APP_ENV') === 'development') {
-    $hostname = 'localhost';
-}
-
-$url = $protocol . '://' . $hostname;
-
-if($exception !== null && method_exists($exception, 'getCTAs')) {
-    foreach ($exception->getCTAs() as $index => $cta) {
-        $class = ($index === 0) ? 'bordered-button' : 'button';
-    
-        $buttons[] = [
-            'text' => $cta['label'],
-            'url' => $cta['url'],
-            'class' => $class
-        ];
-    }
-}
-
-switch ($type) {
-    case 'proxy_error_override':
-        $type = '';
-        $label = 'Error ' . $code;
-        
-        $message = $code >= 500 ? 'An unexpected server error occured.' : 'An unexpected client error occured.';
-        switch($code) {
-            case 401:
-                $message = 'You must sign in to access this page.';
-                break;
-            case 403:
-                $message = 'You are not authorized to access this page.';
-                break;
-            case 404:
-                $message = 'The page you are looking for does not exist.';
-                break;
-            case 504:
-                $message = 'The server did not respond in time.';
-                break;
-            case 501:
-                $message = 'This page is not implemented yet.';
-                break;
-        }
-        
-        break;
-    case 'function_execute_permission_missing':
-        $label = 'Execution not permitted';
-        $labelClass = 'warning';
-        break;
-    case 'build_not_ready':
-        $label = 'Deployment is still building';
-        $message = 'The page will update after the build completes.';
-        $labelClass = 'warning';
-        break;
-    case 'build_failed':
-        $label = 'Deployment build failed';
-        $message = 'An error occurred during the build process.';
-        $labelClass = 'error';
-        break;
-    case 'rule_not_found':
-        $label = 'Nothing is here yet';
-        $message = 'This page is empty, but you can make it yours.';
-        break;
-    case 'deployment_not_found':
-        $label = 'No active deployments';
-        $message = 'This page is empty, activate a deployment to make it live.';
-        break;
-    case 'build_canceled':
-        $label = 'Deployment build canceled';
-        $message = 'This build was canceled and won\'t be deployed.';
-        break;
-    case 'general_route_not_found':
-        $label = 'Page not found';
-        $message = 'The page you\'re looking for doesn\'t exist.';
-        break;
-    default:
-        $label = 'Error ' . $code;
-        $message = $message;
-        $isSimpleMessage = false;
-        break;
-}
+$projectName = $this->getParam('projectName', '');
+$projectURL = $this->getParam('projectURL', '');
+$title = $this->getParam('title', '')
 ?>
 
 <!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <script src="https://cdn.jsdelivr.net/gh/alpinejs/alpine@v2.x.x/dist/alpine.min.js" defer></script>
-    <link rel="icon" type="image/svg+xml" href="<?php echo $url; ?>/images/logos/appwrite-icon.svg" />
-    <link rel="mask-icon" type="image/png" href="<?php echo $url; ?>/images/logos/appwrite-icon.png" />
+    <meta charset="utf-8" />
+    <meta name="description" content="" />
+    <link rel="icon" href="/favicon.png" />
     <link
         rel="preload"
         href="/fonts/inter/inter-v8-latin-600.woff2"
@@ -119,427 +29,102 @@ switch ($type) {
         as="font"
         type="font/woff2"
         crossorigin />
+    <link
+        rel="preload"
+        href="/fonts/poppins/poppins-v19-latin-500.woff2"
+        as="font"
+        type="font/woff2"
+        crossorigin />
+    <link
+        rel="preload"
+        href="/fonts/poppins/poppins-v19-latin-600.woff2"
+        as="font"
+        type="font/woff2"
+        crossorigin />
+    <link
+        rel="preload"
+        href="/fonts/poppins/poppins-v19-latin-700.woff2"
+        as="font"
+        type="font/woff2"
+        crossorigin />
+    <link
+        rel="preload"
+        href="/fonts/source-code-pro/source-code-pro-v20-latin-regular.woff2"
+        as="font"
+        type="font/woff2"
+        crossorigin />
+
+    <link rel="stylesheet" href="https://unpkg.com/@appwrite.io/pink" />
+    <link rel="preload" as="style" type="text/css" href="/fonts/main.css" />
+    <link rel="stylesheet" href="/fonts/main.css" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta http-equiv="content-security-policy" content="">
     <title><?php echo $this->print($title); ?></title>
 
     <style>
-        @import url(https://fonts.bunny.net/css?family=fira-code:400|inter:400);
-
-        * {
-            margin: 0;
-            padding: 0;
-        }
-
-        body {
-            background-color: #FFFFFF;
-        }
-
-        .main {
-            display: flex;
-            min-height: 100vh;
-            width: 100vw;
-            align-items: center;
-            justify-content: center;
-        }
-
-        .content {
-            margin-left: auto;
-            margin-right: auto;
-            max-width: 400px;
-        }
-
-        span {
-            padding: var(--space-1, 2px) var(--space-3, 6px);
-            border-radius: var(--border-radius-XS, 6px);
-            background: var(--color-overlay-on-neutral, rgba(0, 0, 0, 0.06));
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-            text-align: center;
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-        }
-
-        h1 {
-            color: var(--color-fgColor-neutral-primary, #2D2D31);
-            text-align: center;
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-XXXL, 32px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.144px;
-            margin-top: 8px;
-            margin-bottom: 32px;
-        }
-    
-        .content h1 {
-            margin-bottom: 20px;
-        }
-
-        .content.small-error h1 {
-            font-size: var(--font-size-M, 20px);
-        }
-        
-        .content.large-error h1 {
-            font-size: var(--font-size-XXXL, 32px);
-        }
-
-        .bordered-button {
-            border-radius: var(--border-radius-S, 8px);
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 500;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-            padding: var(--space-3, 6px) var(--space-5, 10px);
-            cursor: pointer;
-            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #D8D8DB);
-            background: var(--color-bgColor-neutral-primary, #FFF);
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        button {
-            border-radius: var(--border-radius-S, 8px);
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 500;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-            padding: var(--space-3, 6px) var(--space-5, 10px);
-            cursor: pointer;
-            border: var(--border-width-S, 1px) solid transparent;
-            background: var(--color-bgColor-neutral-primary, #FFF);
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .center {
-            display: flex;
-            justify-content: center;
-            gap: 8px;
-        }
-
-        .brand {
-            position: absolute;
-            width: 100%;
-            bottom: 32px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            gap: 8px;
-        }
-
-        .brand p {
-            font-family: var(--font-family-monospace, "Fira Code"), monospace;
-            font-size: var(--font-size-XS, 12px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 130%;
-            letter-spacing: 0.96px;
-            text-transform: uppercase;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .brand svg {
-            height: 20px;
-        }
-
-        .warning {
-            background: var(--color-overlay-on-neutral, rgba(254, 124, 67, 0.16));
-            color: var(--color-fgColor-neutral-secondary, #61250A);
-        }
-
-        .error {
-            background: var(--color-overlay-on-neutral, rgba(255, 69, 58, 0.16));
-            color: var(--color-fgColor-neutral-secondary, #B31212);
-        }
-
-        .logo-dark {
-            display: none;
-        }
-
-        .logo-light {
-            display: block;
-        }
-
-        .type {
-            padding: var(--space-1, 2px) var(--space-3, 6px);
-            border-radius: var(--border-radius-XS, 6px);
-            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #EDEDF0);
-            background: var(--color-overlay-on-neutral, rgba(250, 250, 251, 1));
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-            text-align: center;
-            font-family: var(--font-family-monospace, "Fira Code"), monospace;
-            font-size: var(--font-size-XS, 12px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: 0px;
-        }
-
-        .error-trace {
-            max-width: 900px;
-            padding: 20px;
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-        }
-
-        .back-button {
-            margin-bottom: 12px;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 500;
-            line-height: 140%;
-            letter-spacing: -0.45px;
-        }
-        
-        .back-button:hover {
-            text-decoration: underline;
-        }
-
-        .trace-grid {
-            display: grid;
-            grid-template-columns: auto 1fr;
-            gap: 16px;
-            background: var(--color-bgColor-neutral-secondary, #FFFFFF);
-            padding: 10px 12px;
-            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #EDEDF0);
-        }
-
-        .trace-grid-header {
-            display: flex;
-            align-items: center;
-            padding: 10px 12px;
-            background: var(--color-bgColor-neutral-secondary, #FAFAFB);
-            border-radius: 8px 8px 0 0;
-            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #EDEDF0);
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.45px;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .trace-label {
-            font-family: var(--font-family-sansSerif, Inter), sans-serif;
-            font-size: var(--font-size-S, 14px);
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.45px;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .trace-value {
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-            font-family: var(--font-family-monospace, "Fira Code"), monospace;
-            font-size: var(--font-size-S, 14px);
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: 0px;
-        }
-
-        .trace-args {
-            /* grid-column: 1 / -1; */
-            padding: 10px 12px;
-            /* white-space: pre-wrap; */
-            overflow-x: auto;
-            font-family: var(--font-family-monospace, "Fira Code"), monospace;
-            font-size: var(--font-size-S, 14px);
-            font-weight: 400;
-            line-height: 140%;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        @media (max-width: 768px) {
-            .content {
-                margin-left: 16px;
-                margin-right: 16px;
-            }
-
-            h1 {
-                font-size: 28px;
-            }
-        }
-
-        @media (prefers-color-scheme: dark) {
-            body {
-                background-color: #1D1D21;
-            }
-
-            h1 {
-                color: var(--color-fgColor-neutral-primary, #EDEDF0);
-            }
-
-            span {
-                background: var(--color-overlay-on-neutral, rgba(255, 255, 255, 0.2));
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .bordered-button {
-                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #414146);
-                background: var(--color-bgColor-neutral-primary, #1D1D21);
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            button {
-                background: var(--color-bgColor-neutral-primary, #1D1D21);
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .brand p {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .warning {
-                background: var(--color-overlay-on-neutral, rgba(254, 124, 67, 0.24));
-                color: var(--color-fgColor-neutral-secondary, #FFD5C2);
-            }
-
-            .error {
-                background: var(--color-overlay-on-neutral, rgba(255, 69, 58, 0.28));
-                color: var(--color-fgColor-neutral-secondary, #FFD5D4);
-            }
-
-            .logo-light {
-                display: none;
-            }
-
-            .logo-dark {
-                display: block;
-            }
-
-            .type {
-                background: var(--color-overlay-on-neutral, rgba(25, 25, 28, 1));
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #414146);
-            }
-
-            .back-button {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .trace-grid {
-                background: var(--color-bgColor-neutral-secondary, #1D1D21);
-                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #2D2D31);
-            }
-
-            .trace-grid-header {
-                background: var(--color-bgColor-neutral-secondary, #19191C);
-                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #2D2D31);
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .trace-label {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .trace-value {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .trace-args {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
+        @media(min-width:768px) {
+            article.card {
+                padding: 2rem !important;
             }
         }
     </style>
 </head>
 
-<body x-data="{ page: 'error' }">
-    <div class="main">
-        <div x-show="page === 'error'" class="content <?php echo $isSimpleMessage ? 'large-error' : 'small-error' ?>">
-            <div class="center"><span class="<?php echo $this->print($labelClass); ?>"><?php echo $this->print($label); ?></span></div>
-            <h1><?php echo $this->print($message); ?></h1>
-            <?php if (!empty($type)): ?>
-                <div class="center">
-                    <span class='type'><?php echo $this->print($type); ?></span>
+<body>
+    <div class="container u-margin-block-start-24">
+        <article class="card u-padding-16">
+            <div class="u-flex u-flex-vertical u-gap-16">
+                <h1 class="heading-level-4 u-trim-1">Error <?php echo $this->print($code); ?></h1>
+                <p class="text"><?php echo $this->print($message); ?></p>
+                <div class="u-flex u-flex-vertical u-gap-8">
+                    <p class="text">Type</p>
+                    <p><code class="inline-code"><?php echo $this->print($type); ?></code></p>
                 </div>
-            <?php endif; ?>
-            <div class="center" style="margin-top: 20px;">
-                <?php if (!empty($buttons)): ?>
-                    <?php foreach ($buttons as $button): ?>
-                        <a href="<?php echo htmlspecialchars($button['url']); ?>">
-                            <button class="<?php echo htmlspecialchars($button['class']); ?>">
-                                <?php echo htmlspecialchars($button['text']); ?>
-                            </button>
-                        </a>
+                <?php if ($development) : ?>
+                    <h2 class="heading-level-5 u-trim-1">Error Trace</h2>
+                    <?php foreach ($trace as $log) : ?>
+                        <div class="table-with-scroll">
+  <div class="table-wrapper">
+                        <table class="table is-remove-outer-styles">
+                        <tbody class="table-tbody">
+                            <?php foreach ($log as $key => $value) : ?>
+                                <tr>
+                                    <td class="table-col" style="width: 120px"><?php echo $this->print($key, self::FILTER_ESCAPE); ?></td>
+                                    <td class="table-col"><code class="grid-code u-max-height-200 u-overflow-x-auto u-overflow-y-auto">
+                                        <?php if (is_array($value)) : ?>
+                                            
+                                            <pre><?php echo $this->print(var_export($value, true), self::FILTER_ESCAPE); ?></pre>
+                                        <?php else : ?>
+                                            <pre><?php echo $this->print($value, self::FILTER_ESCAPE); ?></pre>
+                                        <?php endif; ?>
+                                        </code>
+                                    </td>
+                                </tr>
+
+                            <?php endforeach; ?>
+                            </tbody>
+                        </table>
+                                        </div>
+                                        </div>
                     <?php endforeach; ?>
                 <?php endif; ?>
-                    
-                <?php if ($development) : ?>
-                        <button class="<?php echo count($buttons) === 0 ? 'bordered-button' : 'button' ?>" x-on:click="page = 'trace'">View error trace</button>
-                <?php endif; ?>
             </div>
-        </div>
-
-        <div x-show="page === 'trace'" class="error-trace">
-            <button class="back-button" x-on:click="page = 'error'">
-                Back
-            </button>
-            <div class="trace-grid-header">Error trace</div>
-            <?php foreach ($trace as $index => $traceItem): ?>
-                <div class="trace-grid">
-                    <?php if (isset($traceItem['file'])): ?>
-                        <div class="trace-label">file</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['file']); ?></div>
-                    <?php endif; ?>
-
-                    <?php if (isset($traceItem['line'])): ?>
-                        <div class="trace-label">line</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['line']); ?></div>
-                    <?php endif; ?>
-
-                    <?php if (isset($traceItem['function'])): ?>
-                        <div class="trace-label">function</div>
-                        <div class="trace-value"><?php echo $this->print($traceItem['function']); ?></div>
-                    <?php endif; ?>
-
-                    <?php if (isset($traceItem['args'])): ?>
-                        <div class="trace-label">args</div>
-                        <div class="trace-args"><pre><?php echo $this->print(\var_export($traceItem['args'], true)); ?></pre></div>
-                    <?php endif; ?>
-                </div>
-            <?php endforeach; ?>
-        </div>
-    </div>
-
-    <div x-show="page === 'error'" class="brand">
-        <p>Powered by</p>
-        <svg class="logo-dark" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8649 16.2461C33.6492 16.2461 34.5511 15.3184 34.9433 14.6867H35.1197C35.1981 15.3578 35.6687 15.9895 36.5903 15.9895H38.3353V14.0156H37.8843C37.5706 14.0156 37.4138 13.838 37.4138 13.5617V5.64661H35.1001V6.90986H34.9236C34.4727 6.27823 33.5315 5.39001 31.8061 5.39001C29.0611 5.39001 27.022 7.67965 27.022 10.818C27.022 13.9564 29.1003 16.2461 31.8649 16.2461ZM32.2767 13.9959C30.6493 13.9959 29.3748 12.7919 29.3748 10.8378C29.3748 8.92316 30.6101 7.62044 32.2571 7.62044C33.8256 7.62044 35.1393 8.86395 35.1393 10.8378C35.1393 12.5945 34.0217 13.9959 32.2767 13.9959Z" fill="#EDEDF0" />
-            <path d="M39.7013 20H42.0149V14.6867H42.1914C42.6227 15.3184 43.5443 16.2461 45.3677 16.2461C48.1127 16.2461 50.1127 13.9169 50.1127 10.818C50.1127 7.69939 47.9755 5.39001 45.2109 5.39001C43.4462 5.39001 42.5835 6.35719 42.1718 6.89012H41.9953V5.63019H39.7013V20ZM44.8776 14.0551C43.2894 14.0551 41.9757 12.8708 41.9757 10.818C41.9757 9.06133 43.0933 7.58096 44.8383 7.58096C46.4657 7.58096 47.7402 8.86395 47.7402 10.818C47.7402 12.7326 46.5049 14.0551 44.8776 14.0551Z" fill="#EDEDF0" />
-            <path d="M51.3065 20H53.6202V14.6867H53.7966C54.228 15.3184 55.1495 16.2461 56.973 16.2461C59.718 16.2461 61.5273 13.9169 61.5273 10.818C61.5273 7.69939 59.5807 5.39001 56.8161 5.39001C55.0515 5.39001 54.1888 6.35719 53.777 6.89012H53.6005V5.64661H51.3065V20ZM56.4828 14.0551C54.8946 14.0551 53.5809 12.8708 53.5809 10.818C53.5809 9.06133 54.6985 7.58096 56.4436 7.58096C58.071 7.58096 59.3454 8.86395 59.3454 10.818C59.3454 12.7326 58.1102 14.0551 56.4828 14.0551Z" fill="#EDEDF0" />
-            <path d="M64.5857 16.2296H67.8601L69.7227 8.11721H69.8404L71.7031 16.2296H74.9579L77.5642 5.88678H75.2323L73.3697 14.0189H73.1932L71.3305 5.88678H68.2522L66.3699 14.0189H66.1935L64.3504 5.88678H61.8799L64.5857 16.2296Z" fill="#EDEDF0" />
-            <path d="M78.7363 16.2296H81.0499V11.1174C81.0499 9.16334 81.9519 7.9593 83.6381 7.9593H84.6576V5.63019H83.893C82.5793 5.63019 81.5793 6.53815 81.1872 7.40663H81.0303V5.88678H78.7363V16.2296Z" fill="#EDEDF0" />
-            <path d="M96.1391 16.2296H97.943V14.1571H96.1587C95.4529 14.1571 95.1588 13.8413 95.1588 13.111V7.93956H98.0606V5.88678H95.1588V2.98526H92.9628V5.88678H91.0413V7.93956H92.8255V13.1307C92.8255 15.3217 94.1392 16.2296 96.1391 16.2296Z" fill="#EDEDF0" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.17 15.1802 108.836 13.0287L106.719 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.327 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.915 7.58096 98.915 10.8378C98.915 13.9959 101.013 16.2461 104.15 16.2461ZM101.327 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.621 8.31128 106.738 9.71269H101.327Z" fill="#EDEDF0" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0125 16.2296H87.6989V7.93956H85.895V5.88678H90.0125V16.2296Z" fill="#EDEDF0" />
-            <path d="M88.6834 4.45145C89.5265 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5265 1.54993 88.6834 1.54993C87.8403 1.54993 87.2129 2.18155 87.2129 2.99082C87.2129 3.81983 87.8403 4.45145 88.6834 4.45145Z" fill="#EDEDF0" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2006 7.88412V12.4486H11.9414C12.8021 11.6166 13.3389 10.4373 13.3389 9.12899C13.3389 8.69744 13.2806 8.27999 13.1713 7.88412H20.2006Z" fill="#FD366E" />
-        </svg>
-        <svg class="logo-light" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8648 16.2461C33.649 16.2461 34.5509 15.3184 34.9431 14.6867H35.1195C35.198 15.3578 35.6685 15.9895 36.5901 15.9895H38.3351V14.0156H37.8841C37.5704 14.0156 37.4136 13.838 37.4136 13.5617V5.64661H35.0999V6.90986H34.9235C34.4725 6.27823 33.5314 5.39001 31.8059 5.39001C29.0609 5.39001 27.0218 7.67965 27.0218 10.818C27.0218 13.9564 29.1001 16.2461 31.8648 16.2461ZM32.2765 13.9959C30.6491 13.9959 29.3746 12.7919 29.3746 10.8378C29.3746 8.92316 30.6099 7.62044 32.2569 7.62044C33.8255 7.62044 35.1391 8.78499 35.1391 10.8378C35.1391 12.5945 34.0215 13.9959 32.2765 13.9959Z" fill="#2D2D31" />
-            <path d="M39.7011 20H42.0147V14.6867H42.1912C42.6226 15.3184 43.5441 16.2461 45.3676 16.2461C48.1126 16.2461 50.1125 13.9169 50.1125 10.818C50.1125 7.69939 47.9753 5.39001 45.2107 5.39001C43.4461 5.39001 42.5833 6.35719 42.1716 6.89012H41.9951V5.64661H39.7011V20ZM44.8774 14.0551C43.2892 14.0551 41.9755 12.8708 41.9755 10.818C41.9755 9.06133 43.0931 7.58096 44.8382 7.58096C46.4656 7.58096 47.74 8.86395 47.74 10.818C47.74 12.7326 46.5048 14.0551 44.8774 14.0551Z" fill="#2D2D31" />
-            <path d="M51.3063 20H53.62V14.6867H53.7964C54.2278 15.3184 55.1493 16.2461 56.9728 16.2461C59.7178 16.2461 61.5271 13.9169 61.5271 10.818C61.5271 7.69939 59.5805 5.39001 56.8159 5.39001C55.0513 5.39001 54.1886 6.35719 53.7768 6.89012H53.6004V5.64661H51.3063V20ZM56.4826 14.0551C54.8944 14.0551 53.5808 12.8708 53.5808 10.818C53.5808 9.06133 54.6984 7.58096 56.4434 7.58096C58.0708 7.58096 59.3453 8.86395 59.3453 10.818C59.3453 12.7326 58.11 14.0551 56.4826 14.0551Z" fill="#2D2D31" />
-            <path d="M64.5855 16.2296H67.8599L69.7226 8.11721H69.8402L71.7029 16.2296H74.9577L77.564 5.88678H75.2322L73.3695 14.0189H73.193L71.3303 5.88678H68.252L66.3697 14.0189H66.1933L64.3502 5.88678H61.8797L64.5855 16.2296Z" fill="#2D2D31" />
-            <path d="M78.7361 16.2296H81.0498V11.1174C81.0498 9.16334 81.9517 7.9593 83.6379 7.9593H84.6575V5.63019H83.8928C82.5791 5.63019 81.5791 6.53815 81.187 7.40663H81.0301V5.88678H78.7361V16.2296Z" fill="#2D2D31" />
-            <path d="M96.1389 16.2296H97.9428V14.1571H96.1585C95.4527 14.1571 95.1586 13.8413 95.1586 13.111V7.93956H98.0604V5.88678H95.1586V2.98526H92.9626V5.88678H91.0411V7.93956H92.8253V13.1307C92.8253 15.3217 94.139 16.2296 96.1389 16.2296Z" fill="#2D2D31" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.169 15.1802 108.836 13.0287L106.718 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.326 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.9148 7.58096 98.9148 10.8378C98.9148 13.9959 101.013 16.2461 104.15 16.2461ZM101.326 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.62 8.31128 106.738 9.71269H101.326Z" fill="#2D2D31" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0123 16.2296H87.6987V7.93956H85.8948V5.88678H90.0123V16.2296Z" fill="#2D2D31" />
-            <path d="M88.6835 4.45145C89.5266 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5266 1.54993 88.6835 1.54993C87.8404 1.54993 87.213 2.18155 87.213 2.99082C87.213 3.81983 87.8404 4.45145 88.6835 4.45145Z" fill="#2D2D31" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2007 7.88412V12.4486H11.9415C12.8022 11.6166 13.339 10.4373 13.339 9.12899C13.339 8.69744 13.2807 8.27999 13.1714 7.88412H20.2007Z" fill="#FD366E" />
-        </svg>
-
+        </article>
     </div>
+    <script type="text/javascript">
+        const app = (JSON.parse(localStorage.getItem('appwrite')) ?? {});
+        const theme = app.theme ?? 'auto';
+        if (theme === 'auto') {
+            const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)');
+            if (darkThemeMq.matches) {
+                document.body.setAttribute('class', `theme-dark`);
+            } else {
+                document.body.setAttribute('class', `theme-light`);
+            }
+        } else {
+            document.body.setAttribute('class', `theme-${theme}`);
+        }
+    </script>
 </body>
 
 </html>

app/views/install/compose.phtml

@@ -61,13 +61,10 @@ $image = $this->getParam('image', '');
       - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
       - appwrite-uploads:/storage/uploads:rw
-      - appwrite-imports:/storage/imports:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
-      - appwrite-builds:/storage/builds:rw
     depends_on:
       - mariadb
       - redis
@@ -89,12 +86,10 @@ $image = $this->getParam('image', '');
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_ROUTER_PROTECTION
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_ROUTER_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_DOMAIN_FUNCTIONS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
@@ -138,26 +133,21 @@ $image = $this->getParam('image', '');
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_SITES_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
-      - _APP_SITES_RUNTIMES
-      - _APP_DOMAIN_SITES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_CONFIG
       - _APP_MAINTENANCE_INTERVAL
       - _APP_MAINTENANCE_DELAY
-      - _APP_MAINTENANCE_START_TIME
       - _APP_MAINTENANCE_RETENTION_EXECUTION
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -174,10 +164,11 @@ $image = $this->getParam('image', '');
       - _APP_MIGRATIONS_FIREBASE_CLIENT_ID
       - _APP_MIGRATIONS_FIREBASE_CLIENT_SECRET
       - _APP_ASSISTANT_OPENAI_API_KEY
+
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: <?php echo $organization; ?>/console:6.0.8
+    image: <?php echo $organization; ?>/console:5.2.27
     restart: unless-stopped
     networks:
       - appwrite
@@ -308,7 +299,6 @@ $image = $this->getParam('image', '');
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
     environment:
@@ -351,10 +341,7 @@ $image = $this->getParam('image', '');
       - _APP_EXECUTOR_HOST
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_EXECUTION
-      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
-      - _APP_EMAIL_CERTIFICATES
 
   appwrite-worker-databases:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -395,9 +382,7 @@ $image = $this->getParam('image', '');
       - mariadb
     volumes:
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
-      - appwrite-uploads:/storage/uploads:rw
     environment:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
@@ -418,13 +403,12 @@ $image = $this->getParam('image', '');
       - _APP_VCS_GITHUB_PRIVATE_KEY
       - _APP_VCS_GITHUB_APP_ID
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_SITES_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_ROUTER_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
@@ -448,7 +432,6 @@ $image = $this->getParam('image', '');
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
-      - _APP_DOMAIN_SITES
 
   appwrite-worker-certificates:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -469,9 +452,7 @@ $image = $this->getParam('image', '');
       - _APP_WORKER_PER_CORE
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_DOMAIN_FUNCTIONS
       - _APP_EMAIL_CERTIFICATES
       - _APP_REDIS_HOST
@@ -513,10 +494,9 @@ $image = $this->getParam('image', '');
       - _APP_DB_USER
       - _APP_DB_PASS
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_SITES_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_USAGE_STATS
@@ -617,8 +597,6 @@ $image = $this->getParam('image', '');
     restart: unless-stopped
     networks:
       - appwrite
-    volumes:
-      - appwrite-imports:/storage/imports:rw
     depends_on:
       - mariadb
     environment:
@@ -626,9 +604,7 @@ $image = $this->getParam('image', '');
       - _APP_WORKER_PER_CORE
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_EMAIL_SECURITY
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
@@ -657,9 +633,7 @@ $image = $this->getParam('image', '');
       - _APP_ENV
       - _APP_WORKER_PER_CORE
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_DOMAIN_FUNCTIONS
       - _APP_OPENSSL_KEY_V1
       - _APP_REDIS_HOST
@@ -676,7 +650,6 @@ $image = $this->getParam('image', '');
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
 
@@ -685,9 +658,11 @@ $image = $this->getParam('image', '');
     container_name: appwrite-task-stats-resources
     entrypoint: stats-resources
     <<: *x-logging
-    restart: unless-stopped
     networks:
       - appwrite
+    volumes:
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
     depends_on:
       - redis
       - mariadb
@@ -765,6 +740,34 @@ $image = $this->getParam('image', '');
       - _APP_LOGGING_CONFIG
       - _APP_USAGE_AGGREGATION_INTERVAL
 
+  appwrite-worker-stats-usage-dump:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: worker-stats-usage-dump
+    <<: *x-logging
+    container_name: appwrite-worker-stats-usage-dump
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_CONFIG
+      - _APP_USAGE_AGGREGATION_INTERVAL
+
   appwrite-task-scheduler-functions:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: schedule-functions
@@ -849,14 +852,6 @@ $image = $this->getParam('image', '');
       - appwrite
     environment:
       - _APP_ASSISTANT_OPENAI_API_KEY
-      
-  appwrite-browser:
-    image: appwrite/browser:0.2.4
-    container_name: appwrite-browser
-    <<: *x-logging
-    restart: unless-stopped
-    networks:
-      - appwrite
 
   openruntimes-executor:
     container_name: openruntimes-executor
@@ -864,7 +859,7 @@ $image = $this->getParam('image', '');
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
-    image: openruntimes/executor:0.7.14
+    image: openruntimes/executor:0.6.11
     networks:
       - appwrite
       - runtimes
@@ -872,20 +867,18 @@ $image = $this->getParam('image', '');
       - /var/run/docker.sock:/var/run/docker.sock
       - appwrite-builds:/storage/builds:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       # Host mount nessessary to share files between executor and runtimes.
       # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
       - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v5
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
       - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
       - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
@@ -964,9 +957,7 @@ volumes:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads:
-  appwrite-imports:
   appwrite-certificates:
   appwrite-functions:
-  appwrite-sites:
   appwrite-builds:
   appwrite-config:

app/worker.php

@@ -15,17 +15,17 @@ use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
 use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
+use Appwrite\Event\StatsUsageDump;
+/** remove */
+/** /remove */
 use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
-use Executor\Executor;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
-use Utopia\Cache\Adapter\Pool as CachePool;
 use Utopia\Cache\Adapter\Sharding;
 use Utopia\Cache\Cache;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Database\Adapter\Pool as DatabasePool;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
@@ -35,26 +35,28 @@ use Utopia\Logger\Log;
 use Utopia\Logger\Logger;
 use Utopia\Platform\Service;
 use Utopia\Pools\Group;
-use Utopia\Queue\Broker\Pool as BrokerPool;
 use Utopia\Queue\Message;
 use Utopia\Queue\Publisher;
 use Utopia\Queue\Server;
 use Utopia\Registry\Registry;
 use Utopia\System\System;
-use Utopia\Telemetry\Adapter\None as NoTelemetry;
 
 Authorization::disable();
-Runtime::enableCoroutine();
+Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
 
 Server::setResource('register', fn () => $register);
 
 Server::setResource('dbForPlatform', function (Cache $cache, Registry $register) {
     $pools = $register->get('pools');
-    $adapter = new DatabasePool($pools->get('console'));
-    $dbForPlatform = new Database($adapter, $cache);
-    $dbForPlatform->setNamespace('_console');
+    $database = $pools
+        ->get('console')
+        ->pop()
+        ->getResource();
 
-    return $dbForPlatform;
+    $adapter = new Database($database, $cache);
+    $adapter->setNamespace('_console');
+
+    return $adapter;
 }, ['cache', 'register']);
 
 Server::setResource('project', function (Message $message, Database $dbForPlatform) {
@@ -82,9 +84,20 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
         $dsn = new DSN('mysql://' . $project->getAttribute('database'));
     }
 
-    $adapter = new DatabasePool($pools->get($dsn->getHost()));
+    $adapter = $pools
+        ->get($dsn->getHost())
+        ->pop()
+        ->getResource();
+
     $database = new Database($adapter, $cache);
 
+    try {
+        $dsn = new DSN($project->getAttribute('database'));
+    } catch (\InvalidArgumentException) {
+        // TODO: Temporary until all projects are using shared tables
+        $dsn = new DSN('mysql://' . $project->getAttribute('database'));
+    }
+
     $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
 
     if (\in_array($dsn->getHost(), $sharedTables)) {
@@ -99,8 +112,6 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
             ->setNamespace('_' . $project->getInternalId());
     }
 
-    $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
     return $database;
 }, ['cache', 'register', 'message', 'project', 'dbForPlatform']);
 
@@ -139,8 +150,12 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
             return $database;
         }
 
-        $adapter = new DatabasePool($pools->get($dsn->getHost()));
-        $database = new Database($adapter, $cache);
+        $dbAdapter = $pools
+            ->get($dsn->getHost())
+            ->pop()
+            ->getResource();
+
+        $database = new Database($dbAdapter, $cache);
 
         $databases[$dsn->getHost()] = $database;
 
@@ -158,8 +173,6 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForPlatf
                 ->setNamespace('_' . $project->getInternalId());
         }
 
-        $database->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER);
-
         return $database;
     };
 }, ['pools', 'dbForPlatform', 'cache']);
@@ -172,13 +185,20 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
             return $database;
         }
 
-        $adapter = new DatabasePool($pools->get('logs'));
-        $database = new Database($adapter, $cache);
+        $dbAdapter = $pools
+            ->get('logs')
+            ->pop()
+            ->getResource();
+
+        $database = new Database(
+            $dbAdapter,
+            $cache
+        );
 
         $database
             ->setSharedTables(true)
             ->setNamespace('logsV1')
-            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS_WORKER)
+            ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
             ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
 
         // set tenant
@@ -191,18 +211,15 @@ Server::setResource('getLogsDB', function (Group $pools, Cache $cache) {
 }, ['pools', 'cache']);
 
 Server::setResource('abuseRetention', function () {
-    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400); // 1 day
+    return time() - (int) System::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', 86400);
 });
 
-Server::setResource('auditRetention', function (Document $project) {
-    if ($project->getId() === 'console') {
-        return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE', 15778800)); // 6 months
-    }
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600)); // 14 days
-}, ['project']);
+Server::setResource('auditRetention', function () {
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 1209600));
+});
 
 Server::setResource('executionRetention', function () {
-    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600)); // 14 days
+    return DateTime::addSeconds(new \DateTime(), -1 * System::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', 1209600));
 });
 
 Server::setResource('cache', function (Registry $register) {
@@ -211,7 +228,11 @@ Server::setResource('cache', function (Registry $register) {
     $adapters = [];
 
     foreach ($list as $value) {
-        $adapters[] = new CachePool($pools->get($value));
+        $adapters[] = $pools
+            ->get($value)
+            ->pop()
+            ->getResource()
+        ;
     }
 
     return new Cache(new Sharding($adapters));
@@ -241,17 +262,21 @@ Server::setResource('timelimit', function (\Redis $redis) {
 Server::setResource('log', fn () => new Log());
 
 Server::setResource('publisher', function (Group $pools) {
-    return new BrokerPool(publisher: $pools->get('publisher'));
+    return $pools->get('publisher')->pop()->getResource();
 }, ['pools']);
 
 Server::setResource('consumer', function (Group $pools) {
-    return new BrokerPool(consumer: $pools->get('consumer'));
+    return $pools->get('consumer')->pop()->getResource();
 }, ['pools']);
 
 Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
     return new StatsUsage($publisher);
 }, ['publisher']);
 
+Server::setResource('queueForStatsUsageDump', function (Publisher $publisher) {
+    return new StatsUsageDump($publisher);
+}, ['publisher']);
+
 Server::setResource('queueForDatabase', function (Publisher $publisher) {
     return new EventDatabase($publisher);
 }, ['publisher']);
@@ -308,16 +333,6 @@ Server::setResource('pools', function (Registry $register) {
     return $register->get('pools');
 }, ['register']);
 
-Server::setResource('telemetry', fn () => new NoTelemetry());
-
-Server::setResource('deviceForSites', function (Document $project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-
-Server::setResource('deviceForImports', function (Document $project) {
-    return getDevice(APP_STORAGE_IMPORTS . '/app-' . $project->getId());
-}, ['project']);
-
 Server::setResource('deviceForFunctions', function (Document $project) {
     return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -339,10 +354,6 @@ Server::setResource(
     fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );
 
-Server::setResource('plan', function (array $plan = []) {
-    return [];
-});
-
 Server::setResource('certificates', function () {
     $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
     if (empty($email)) {
@@ -353,7 +364,7 @@ Server::setResource('certificates', function () {
 });
 
 Server::setResource('logError', function (Registry $register, Document $project) {
-    return function (Throwable $error, string $namespace, string $action, ?array $extras = null) use ($register, $project) {
+    return function (Throwable $error, string $namespace, string $action, ?array $extras) use ($register, $project) {
         $logger = $register->get('logger');
 
         if ($logger) {
@@ -375,7 +386,7 @@ Server::setResource('logError', function (Registry $register, Document $project)
             $log->addExtra('trace', $error->getTraceAsString());
 
 
-            foreach (($extras ?? []) as $key => $value) {
+            foreach ($extras as $key => $value) {
                 $log->addExtra($key, $value);
             }
 
@@ -397,8 +408,6 @@ Server::setResource('logError', function (Registry $register, Document $project)
     };
 }, ['register', 'project']);
 
-Server::setResource('executor', fn () => new Executor(fn (string $projectId, string $deploymentId) => System::getEnv('_APP_EXECUTOR_HOST')));
-
 $pools = $register->get('pools');
 $platform = new Appwrite();
 $args = $platform->getEnv('argv');
@@ -436,6 +445,13 @@ try {
 
 $worker = $platform->getWorker();
 
+$worker
+    ->shutdown()
+    ->inject('pools')
+    ->action(function (Group $pools) {
+        $pools->reclaim();
+    });
+
 $worker
     ->error()
     ->inject('error')
@@ -443,7 +459,8 @@ $worker
     ->inject('log')
     ->inject('pools')
     ->inject('project')
-    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project) use ($worker, $queueName) {
+    ->action(function (Throwable $error, ?Logger $logger, Log $log, Group $pools, Document $project) use ($queueName) {
+        $pools->reclaim();
         $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
 
         if ($logger) {

bin/screenshot

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/cli.php screenshot $@

bin/worker-stats-usage-dump

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+php /usr/src/code/app/worker.php stats-usage-dump $@

composer.json

@@ -14,8 +14,7 @@
         "test": "vendor/bin/phpunit",
         "lint": "vendor/bin/pint --test",
         "format": "vendor/bin/pint",
-        "bench": "vendor/bin/phpbench run --report=benchmark",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
+        "bench": "vendor/bin/phpbench run --report=benchmark"
     },
     "autoload": {
         "psr-4": {
@@ -31,7 +30,7 @@
         }
     },
     "require": {
-        "php": ">=8.3.0",
+        "php": ">=8.0.0",
         "ext-curl": "*",
         "ext-imagick": "*",
         "ext-mbstring": "*",
@@ -44,37 +43,36 @@
         "ext-openssl": "*",
         "ext-zlib": "*",
         "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.19.*",
+        "appwrite/php-runtimes": "0.16.*",
         "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.52.*",
+        "utopia-php/abuse": "0.51.*",
         "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.55.*",
-        "utopia-php/cache": "0.13.*",
+        "utopia-php/audit": "0.54.0",
+        "utopia-php/cache": "0.11.*",
         "utopia-php/cli": "0.15.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/detector": "0.1.*",
-        "utopia-php/database": "0.69.*",
-        "utopia-php/domains": "0.8.0",
+        "utopia-php/database": "0.60.*",
+        "utopia-php/domains": "0.5.*",
         "utopia-php/dsn": "0.2.1",
-        "utopia-php/framework": "0.33.*",
-        "utopia-php/fetch": "0.4.*",
+        "utopia-php/framework": "0.33.17",
+        "utopia-php/fetch": "0.3.*",
         "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.17.*",
-        "utopia-php/migration": "0.9.*",
+        "utopia-php/messaging": "0.16.*",
+        "utopia-php/migration": "0.6.*",
         "utopia-php/orchestration": "0.9.*",
-        "utopia-php/platform": "0.7.*",
-        "utopia-php/pools": "0.8.*",
+        "utopia-php/platform": "0.7.3",
+        "utopia-php/pools": "0.5.*",
         "utopia-php/preloader": "0.2.*",
-        "utopia-php/queue": "0.10.*",
+        "utopia-php/queue": "0.8.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/storage": "0.18.*",
         "utopia-php/swoole": "0.8.*",
         "utopia-php/system": "0.9.*",
         "utopia-php/telemetry": "0.1.*",
-        "utopia-php/vcs": "0.10.*",
-        "utopia-php/websocket": "0.3.*",
+        "utopia-php/vcs": "0.8.*",
+        "utopia-php/websocket": "0.1.*",
         "matomo/device-detector": "6.1.*",
         "dragonmantank/cron-expression": "3.3.2",
         "phpmailer/phpmailer": "6.9.1",
@@ -89,7 +87,6 @@
         "appwrite/sdk-generator": "0.40.*",
         "phpunit/phpunit": "9.*",
         "swoole/ide-helper": "5.1.2",
-        "phpstan/phpstan": "1.8.*",
         "textalk/websocket": "1.5.*",
         "laravel/pint": "1.*",
         "phpbench/phpbench": "1.*"
@@ -102,8 +99,8 @@
             "php": "8.3"
         },
         "allow-plugins": {
-            "php-http/discovery": true,
-            "tbachert/spi": true
+            "php-http/discovery": false,
+            "tbachert/spi": false
         }
     }
 }

docker-compose.yml

@@ -72,13 +72,10 @@ services:
       - traefik.http.routers.appwrite_api_https.tls=true
     volumes:
       - appwrite-uploads:/storage/uploads:rw
-      - appwrite-imports:/storage/imports:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
-      - appwrite-builds:/storage/builds:rw
       - ./phpunit.xml:/usr/src/code/phpunit.xml
       - ./tests:/usr/src/code/tests
       - ./app:/usr/src/code/app
@@ -113,12 +110,10 @@ services:
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_ROUTER_PROTECTION
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_ROUTER_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_DOMAIN_FUNCTIONS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
@@ -162,15 +157,12 @@ services:
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_SITES_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
-      - _APP_SITES_RUNTIMES
-      - _APP_DOMAIN_SITES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_CONFIG
@@ -179,7 +171,6 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
       - _APP_SMS_PROVIDER
@@ -206,14 +197,11 @@ services:
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_DATABASE_SHARED_NAMESPACE
       - _APP_FUNCTIONS_CREATION_ABUSE_LIMIT
-      - _APP_CUSTOM_DOMAIN_DENY_LIST
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
 
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:6.0.8
+    image: appwrite/console:5.2.27
     restart: unless-stopped
     networks:
       - appwrite
@@ -356,7 +344,6 @@ services:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
@@ -402,8 +389,6 @@ services:
       - _APP_DATABASE_SHARED_TABLES
       - _APP_DATABASE_SHARED_TABLES_V1
       - _APP_EMAIL_CERTIFICATES
-      - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
 
   appwrite-worker-databases:
     entrypoint: worker-databases
@@ -445,9 +430,7 @@ services:
       - appwrite
     volumes:
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
-      - appwrite-uploads:/storage/uploads:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
@@ -473,13 +456,12 @@ services:
       - _APP_VCS_GITHUB_PRIVATE_KEY
       - _APP_VCS_GITHUB_APP_ID
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_SITES_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_ROUTER_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
@@ -504,9 +486,6 @@ services:
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
       - _APP_DATABASE_SHARED_TABLES
-      - _APP_DOMAIN_SITES
-    extra_hosts:
-      - "host.docker.internal:host-gateway"
 
   appwrite-worker-certificates:
     entrypoint: worker-certificates
@@ -528,9 +507,7 @@ services:
       - _APP_WORKER_PER_CORE
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_DOMAIN_FUNCTIONS
       - _APP_EMAIL_CERTIFICATES
       - _APP_REDIS_HOST
@@ -575,10 +552,9 @@ services:
       - _APP_DB_USER
       - _APP_DB_PASS
       - _APP_FUNCTIONS_TIMEOUT
-      - _APP_SITES_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_USAGE_STATS
@@ -686,7 +662,6 @@ services:
     networks:
       - appwrite
     volumes:
-      - appwrite-imports:/storage/imports:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
       - ./tests:/usr/src/code/tests
@@ -697,9 +672,7 @@ services:
       - _APP_WORKER_PER_CORE
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_EMAIL_SECURITY
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
@@ -731,9 +704,7 @@ services:
       - _APP_ENV
       - _APP_WORKER_PER_CORE
       - _APP_DOMAIN
-      - _APP_DOMAIN_TARGET_CNAME
-      - _APP_DOMAIN_TARGET_AAAA
-      - _APP_DOMAIN_TARGET_A
+      - _APP_DOMAIN_TARGET
       - _APP_DOMAIN_FUNCTIONS
       - _APP_OPENSSL_KEY_V1
       - _APP_REDIS_HOST
@@ -750,10 +721,9 @@ services:
       - _APP_MAINTENANCE_RETENTION_CACHE
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
-      - _APP_MAINTENANCE_RETENTION_AUDIT_CONSOLE
       - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
       - _APP_MAINTENANCE_RETENTION_SCHEDULES
-      - _APP_MAINTENANCE_START_TIME
+      - _APP_MAINTENANCE_DELAY
       - _APP_DATABASE_SHARED_TABLES
 
   appwrite-task-stats-resources:
@@ -786,7 +756,7 @@ services:
       - _APP_LOGGING_CONFIG
       - _APP_DATABASE_SHARED_TABLES
       - _APP_STATS_RESOURCES_INTERVAL
-
+  
   appwrite-worker-stats-resources:
     entrypoint: worker-stats-resources
     <<: *x-logging
@@ -817,7 +787,7 @@ services:
       - _APP_LOGGING_CONFIG
       - _APP_USAGE_AGGREGATION_INTERVAL
       - _APP_DATABASE_SHARED_TABLES
-
+  
   appwrite-worker-stats-usage:
     entrypoint: worker-stats-usage
     <<: *x-logging
@@ -849,6 +819,38 @@ services:
       - _APP_USAGE_AGGREGATION_INTERVAL
       - _APP_DATABASE_SHARED_TABLES
 
+  appwrite-worker-stats-usage-dump:
+    entrypoint: worker-stats-usage-dump
+    <<: *x-logging
+    container_name: appwrite-worker-stats-usage-dump
+    image: appwrite-dev
+    networks:
+      - appwrite
+    volumes:
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
+    depends_on:
+      - redis
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_WORKER_PER_CORE
+      - _APP_OPENSSL_KEY_V1
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_USAGE_STATS
+      - _APP_LOGGING_CONFIG
+      - _APP_USAGE_AGGREGATION_INTERVAL
+      - _APP_DATABASE_SHARED_TABLES
+      - _APP_STATS_USAGE_DUAL_WRITING_DBS
+  
   appwrite-task-scheduler-functions:
     entrypoint: schedule-functions
     <<: *x-logging
@@ -940,18 +942,12 @@ services:
     environment:
       - _APP_ASSISTANT_OPENAI_API_KEY
 
-  appwrite-browser:
-    container_name: appwrite-browser
-    image: appwrite/browser:0.2.4
-    networks:
-      - appwrite
-
   openruntimes-executor:
     container_name: openruntimes-executor
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.7.16
+    image: openruntimes/executor:0.6.11
     restart: unless-stopped
     networks:
       - appwrite
@@ -960,21 +956,19 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - appwrite-builds:/storage/builds:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       # Host mount nessessary to share files between executor and runtimes.
       # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_IMAGE_PULL=enabled
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
       - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v5
+      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
       - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
       - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
@@ -1130,9 +1124,7 @@ volumes:
   appwrite-redis:
   appwrite-cache:
   appwrite-uploads:
-  appwrite-imports:
   appwrite-certificates:
   appwrite-functions:
-  appwrite-sites:
   appwrite-builds:
-  appwrite-config:
+  appwrite-config:

docs/examples/1.1.x/client-android/java/account/create-anonymous-session.md

@@ -13,7 +13,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
 
         Client client = new Client(getApplicationContext())
-            .setEndpoint("https://<REGION>.cloud.appwrite.io/v1") // Your API Endpoint
+            .setEndpoint("https://cloud.appwrite.io/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
         Account account = new Account(client);