Update create-document description and improve error message for unknown attribute.

ci: release action

.env

@@ -56,7 +56,7 @@ _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
 _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
-_APP_SMS_PROVIDER=sms://mock
+_APP_SMS_PROVIDER=sms://username:password@mock
 _APP_SMS_FROM=+123456789
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
@@ -76,11 +76,14 @@ _APP_MAINTENANCE_RETENTION_CACHE=2592000
 _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
-_APP_USAGE_TIMESERIES_INTERVAL=2
-_APP_USAGE_DATABASE_INTERVAL=15
+_APP_USAGE_AGGREGATION_INTERVAL=5
+_APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000
 _APP_USAGE_STATS=enabled
 _APP_LOGGING_PROVIDER=
 _APP_LOGGING_CONFIG=
+_APP_GRAPHQL_MAX_BATCH_SIZE=10
+_APP_GRAPHQL_MAX_COMPLEXITY=250
+_APP_GRAPHQL_MAX_DEPTH=3
 DOCKERHUB_PULL_USERNAME=
 DOCKERHUB_PULL_PASSWORD=
 DOCKERHUB_PULL_EMAIL=

.gitattributes

@@ -1,24 +1,7 @@
-app/config/* linguist-detectable=false
-app/config/*/* linguist-detectable=false
-app/config/*/*/* linguist-detectable=false
-app/config/*/*/*/* linguist-detectable=false
-app/views/* linguist-detectable=false
-app/views/*/* linguist-detectable=false
-app/views/*/*/* linguist-detectable=false
-app/views/*/*/*/* linguist-detectable=false
-app/controllers/* linguist-detectable=false
-app/controllers/*/* linguist-detectable=false
-app/controllers/*/*/* linguist-detectable=false
-app/controllers/*/*/*/* linguist-detectable=false
-app/controllers/*/*/*/*/* linguist-detectable=false
-src/* linguist-detectable=false
-src/*/* linguist-detectable=false
-src/*/*/* linguist-detectable=false
-src/*/*/*/* linguist-detectable=false
-src/*/*/*/*/* linguist-detectable=false
-tests/* linguist-detectable=false
-tests/*/* linguist-detectable=false
-tests/*/*/* linguist-detectable=false
-tests/*/*/*/* linguist-detectable=false
-tests/*/*/*/*/* linguist-detectable=false
-tests/*/*/*/*/*/* linguist-detectable=false
+app/config/** linguist-detectable=false
+app/views/** linguist-detectable=false
+app/controllers/** linguist-detectable=false
+src/** linguist-detectable=false
+tests/** linguist-detectable=false
+public/scripts/** linguist-detectable=false
+public/dist/scripts/** linguist-detectable=false

.github/ISSUE_TEMPLATE/bug.yaml

@@ -1,88 +0,0 @@
-name: "🐛 Bug Report"
-description: "Submit a bug report to help us improve"
-title: "🐛 Bug Report: "
-labels: [bug]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out our bug report form 🙏
-  - type: textarea
-    id: steps-to-reproduce
-    validations:
-      required: true
-    attributes:
-      label: "👟 Reproduction steps"
-      description: "How do you trigger this bug? Please walk us through it step by step."
-      placeholder: "When I ..."
-  - type: textarea
-    id: expected-behavior
-    validations:
-      required: true
-    attributes:
-      label: "👍 Expected behavior"
-      description: "What did you think would happen?"
-      placeholder: "It should ..."
-  - type: textarea
-    id: actual-behavior
-    validations:
-      required: true
-    attributes:
-      label: "👎 Actual Behavior"
-      description: "What did actually happen? Add screenshots, if applicable."
-      placeholder: "It actually ..."
-  - type: dropdown
-    id: appwrite-version
-    attributes:
-      label: "🎲 Appwrite version"
-      description: "What version of Appwrite are you running?"
-      options:
-        - Version 1.0.0-RC1
-        - Version 0.15.x
-        - Version 0.14.x
-        - Version 0.13.x
-        - Version 0.12.x
-        - Version 0.11.x
-        - Version 0.10.x
-        - Version 0.9.x
-        - Version 0.8.x
-        - Version 0.7.x
-        - Version 0.6.x
-        - Different version (specify in environment)
-    validations:
-      required: true
-  - type: dropdown
-    id: operating-system
-    attributes:
-      label: "💻 Operating system"
-      description: "What OS is your server / device running on?"
-      options:
-        - Linux
-        - MacOS
-        - Windows
-        - Something else
-    validations:
-      required: true
-  - type: textarea
-    id: environment
-    validations:
-      required: false
-    attributes:
-      label: "🧱 Your Environment"
-      description: "Is your environment customized in any way?"
-      placeholder: "I use Cloudflare for ..."
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "👀 Have you spent some time to check if this issue has been raised before?"
-      description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
-      options:
-        - label: "I checked and didn't find similar issue"
-          required: true
-  - type: checkboxes
-    id: read-code-of-conduct
-    attributes:
-      label: "🏢 Have you read the Code of Conduct?"
-      options:
-        - label: "I have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/HEAD/CODE_OF_CONDUCT.md)"
-          required: true

.github/ISSUE_TEMPLATE/documentation.yaml

@@ -1,32 +0,0 @@
-name: "📚 Documentation"
-description: "Report an issue related to documentation"
-title: "📚 Documentation: "
-labels: [documentation]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to make our documentation better 🙏
-  - type: textarea
-    id: issue-description
-    validations:
-      required: true
-    attributes:
-      label: "💭 Description"
-      description: "A clear and concise description of what the issue is."
-      placeholder: "Documentation should not ..."
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "👀 Have you spent some time to check if this issue has been raised before?"
-      description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
-      options:
-        - label: "I checked and didn't find similar issue"
-          required: true
-  - type: checkboxes
-    id: read-code-of-conduct
-    attributes:
-      label: "🏢 Have you read the Code of Conduct?"
-      options:
-        - label: "I have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/HEAD/CODE_OF_CONDUCT.md)"
-          required: true

.github/ISSUE_TEMPLATE/feature.yaml

@@ -1,40 +0,0 @@
-name: 🚀 Feature
-description: "Submit a proposal for a new feature"
-title: "🚀 Feature: "
-labels: [feature]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thanks for taking the time to fill out our feature request form 🙏
-  - type: textarea
-    id: feature-description
-    validations:
-      required: true
-    attributes:
-      label: "🔖 Feature description"
-      description: "A clear and concise description of what the feature is."
-      placeholder: "You should add ..."
-  - type: textarea
-    id: pitch
-    validations:
-      required: true
-    attributes:
-      label: "🎤 Pitch"
-      description: "Please explain why this feature should be implemented and how it would be used. Add examples, if applicable."
-      placeholder: "In my use-case, ..."
-  - type: checkboxes
-    id: no-duplicate-issues
-    attributes:
-      label: "👀 Have you spent some time to check if this issue has been raised before?"
-      description: "Have you Googled for a similar issue or checked our older issues for a similar bug?"
-      options:
-        - label: "I checked and didn't find similar issue"
-          required: true
-  - type: checkboxes
-    id: read-code-of-conduct
-    attributes:
-      label: "🏢 Have you read the Code of Conduct?"
-      options:
-        - label: "I have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/HEAD/CODE_OF_CONDUCT.md)"
-          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,16 +11,17 @@ Happy contributing!
 
 ## What does this PR do?
 
-(Provide a description of what this PR does.)
+(Provide a description of what this PR does and why it's needed.)
 
 ## Test Plan
 
-(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work.)
+(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Screenshots may also be helpful.)
 
 ## Related PRs and Issues
 
-(If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.)
+- (Related PR or issue)
 
-### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+## Checklist
 
-(Write your answer here.)
+- [ ] Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
+- [ ] If the PR includes a change to an API's metadata (desc, label, params, etc.), does it also include updated API specs and example docs?

.github/workflows/codeql-analysis.yml

@@ -1,5 +1,9 @@
 name: "CodeQL"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   push:
     branches: [master]
@@ -25,7 +29,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      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.
@@ -38,14 +42,14 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -59,4 +63,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/linter.yml

@@ -1,5 +1,9 @@
 name: "Linter"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on: [pull_request]
 jobs:
   lint:

.github/workflows/release.yml

@@ -0,0 +1,53 @@
+name: "Release"
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  tests:
+    name: Unit & E2E
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      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.
+        fetch-depth: 2
+        # Fetch submodules
+        submodules: recursive
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+    - name: Extract metadata (tags, labels) for Docker
+      id: meta
+      uses: docker/metadata-action@v4
+      with:
+        images: appwrite/appwrite
+        tags: |
+          type=semver,pattern={{major}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}.{{minor}}.{{patch}}
+
+    - name: Build and push
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        platforms: linux/amd64,linux/arm64
+        build-args: |
+          VERSION=${{ steps.meta.outputs.version }}
+        push: true
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}

.github/workflows/tests.yml

@@ -1,34 +1,53 @@
 name: "Tests"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 on: [pull_request]
 jobs:
   tests:
     name: Unit & E2E
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      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.
         fetch-depth: 2
+        # Fetch submodules
+        submodules: recursive
 
     # If this run was triggered by a pull request event, then checkout
     # the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}
 
+    # This is a separate action that sets up buildx runner
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Build Appwrite
-      # Upstream bug causes buildkit pulls to fail so prefetch base images
-      # https://github.com/moby/moby/issues/41864
+      uses: docker/build-push-action@v3
+      with:
+        context: .
+        push: false
+        tags: appwrite-dev
+        load: true
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        build-args: |
+          DEBUG=false
+          TESTING=true
+          VERSION=dev
+
+    - name: Start Appwrite
       run:  |
-        echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env
-        docker pull composer:2.0
-        docker pull php:8.0-cli-alpine
-        docker compose build --progress=plain
         docker compose up -d
-        sleep 10
+        sleep 30
+
     - name: Doctor
       run: docker compose exec -T appwrite doctor
 
@@ -36,11 +55,4 @@ jobs:
       run:  docker compose exec -T appwrite vars
 
     - name: Run Tests
-      run: docker compose exec -T appwrite test --debug
-
-    - name: Teardown
-      if: always()
-      run: |
-        docker ps -aq | xargs docker rm --force || true
-        docker volume prune --force || true
-        docker network prune --force || true
+      run: docker compose exec -T appwrite test --debug

.gitignore

@@ -5,6 +5,8 @@
 /tests/resources/functions/**/code.tar.gz
 /app/sdks/*
 /.idea/
+!/.idea/workspace.xml
+!/.idea/php.xml
 .DS_Store
 .php_cs.cache
 debug/

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "app/console"]
+	path = app/console
+	url = https://github.com/appwrite/console
+	branch = 2.3.3

.gitpod.yml

@@ -1,8 +1,9 @@
 tasks:
   - name: Run Appwrite Docker Stack
     init: |
-      docker compose pull
+      git submodule update --init
       docker compose build
+      docker compose pull
       docker pull composer
     command: |
       docker run --rm --interactive --tty \

CHANGES.md

@@ -1,3 +1,112 @@
+# Version 1.3.1
+
+## Bugs
+- Fixed Migration issue regarding 500 error [4906](https://github.com/appwrite/appwrite/pull/5356)
+
+# Version 1.3.0
+
+## Features
+- Password dictionary setting allows to compare user's password against command password database [4906](https://github.com/appwrite/appwrite/pull/4906)
+- Password history setting allows to save user's last used password so that it may not be used again.  Maximum number of history saved is 20, which can be configured. Minimum is 0 which means disabled. [#4866](https://github.com/appwrite/appwrite/pull/4866)
+- Update APIs to check X-Appwrite-Timestamp header [#5024](https://github.com/appwrite/appwrite/pull/5024)
+- Database relationships [#5238](https://github.com/appwrite/appwrite/pull/5238)
+- New query operators [#5238](https://github.com/appwrite/appwrite/pull/5238)
+- Team preferences [#5196](https://github.com/appwrite/appwrite/pull/5196)
+- Update attribute metadata [#5164](https://github.com/appwrite/appwrite/pull/5164)
+
+## Bugs
+- Fix not storing function's response on response codes 5xx [#4610](https://github.com/appwrite/appwrite/pull/4610)
+- Fix expire to formatTz in create account session [#4985](https://github.com/appwrite/appwrite/pull/4985)
+- Fix deleting projects when organization is deleted [#5335](https://github.com/appwrite/appwrite/pull/5335)
+- Fix deleting collections from a project [#4983](https://github.com/appwrite/appwrite/pull/4983)
+- Fix cleaning up project databases [#4984](https://github.com/appwrite/appwrite/pull/4984)
+- Fix creating documents with attributes with special characters [#246](https://github.com/utopia-php/database/pull/246)
+- Fix deleting attribute not deleting metadata index [#246](https://github.com/utopia-php/database/pull/246)
+- Fix create attribute event payload [#246](https://github.com/utopia-php/database/pull/246)
+
+# Version 1.2.1
+## Changes
+- Upgrade Console to [2.2.0](https://github.com/appwrite/console/releases/tag/2.2.0)
+- Update DBIP Database [#5049](https://github.com/appwrite/appwrite/pull/5049)
+
+## Bugs
+- Fix a few null safety warnings [#4654](https://github.com/appwrite/appwrite/pull/4654)
+- Fix timestamp format in Realtime response [#4515](https://github.com/appwrite/appwrite/pull/4515)
+- Add flutter-web as a platform type [#4992](https://github.com/appwrite/appwrite/pull/4992)
+- Fix typo in Model/Locale.php [#4669](https://github.com/appwrite/appwrite/pull/4669)
+- Fix deletes worker not deleting project database tables [#4984](https://github.com/appwrite/appwrite/pull/4984)
+- Fix deletes worker not deleting database collections [#4983](https://github.com/appwrite/appwrite/pull/4983)
+- Fix restart policy for worker-messaging container [#4994](https://github.com/appwrite/appwrite/pull/4994)
+- Fix validating origin for apple platforms [#5089](https://github.com/appwrite/appwrite/pull/5089)
+
+# Version 1.2.0
+## Features
+- Added GraphQL API [#974](https://github.com/appwrite/appwrite/pull/974)
+- Added GraphQL Explorer [#974](https://github.com/appwrite/appwrite/pull/974)
+- Added ability to set max sessions per user per project [#4831](https://github.com/appwrite/appwrite/pull/4831)
+
+## Changes
+- Get default region from environment on project create [#4780](https://github.com/appwrite/appwrite/pull/4780)
+- Fix french translation [#4782](https://github.com/appwrite/appwrite/pull/4782)
+- Fix max mimetype size [#4814](https://github.com/appwrite/appwrite/pull/4814)
+
+## Bugs
+- Fix invited account verified status [#4776](https://github.com/appwrite/appwrite/pull/4776)
+
+# Version 1.1.2
+## Changes
+- Released `appwrite/console` [2.0.2](https://github.com/appwrite/console/releases/tag/2.0.2)
+- Make `region` parameter optional with default for project create [#4763](https://github.com/appwrite/appwrite/pull/4763)
+
+## Bugs
+- Fix default oauth paths [#4725](https://github.com/appwrite/appwrite/pull/4725)
+- Fix session expiration, and expired session deletion [#4739](https://github.com/appwrite/appwrite/pull/4739)
+- Fix processing status on sync executions [#4737](https://github.com/appwrite/appwrite/pull/4737)
+- Fix Locale API returning Unknown continent [#4761](https://github.com/appwrite/appwrite/pull/4761)
+
+# Version 1.1.1
+## Bugs
+- Fix Deletes worker using incorrect device for file deletion [#4662](https://github.com/appwrite/appwrite/pull/4662)
+- Fix Migration for Stats adding the region attribute [#4704](https://github.com/appwrite/appwrite/pull/4704)
+- Fix Migration stopping scheduled functions [#4704](https://github.com/appwrite/appwrite/pull/4704)
+- Fix Migration enabling OAuth providers with data by default [#4704](https://github.com/appwrite/appwrite/pull/4704)
+- Fix Error pages when OAuth providers are disabled [#4704](https://github.com/appwrite/appwrite/pull/4704)
+
+# Version 1.1.0
+## Features
+- Added support for the new Appwrite Console [#4655](https://github.com/appwrite/appwrite/pull/4655)
+- Added new property to projects configuration: `authDuration` which allows you to alter the duration of signed in sessions for your project. [#4618](https://github.com/appwrite/appwrite/pull/4618)
+
+## Bugs
+- Fix license detection for Flutter and Dart SDKs [#4435](https://github.com/appwrite/appwrite/pull/4435)
+- Fix missing realtime event for create function deployment [#4574](https://github.com/appwrite/appwrite/pull/4574)
+- Fix missing `status`, `buildStderr` and `buildStderr` from get deployment response [#4611](https://github.com/appwrite/appwrite/pull/4611)
+- Fix project pagination in DB usage aggregation [#4517](https://github.com/appwrite/appwrite/pull/4517)
+- Fix missing file permissions due to cache [#4661](https://github.com/appwrite/appwrite/pull/4661)
+- Fix usage stats for async function executions [#4674](https://github.com/appwrite/appwrite/pull/4674)
+
+# Version 1.0.3
+## Bugs
+- Fix document audit deletion [#4429](https://github.com/appwrite/appwrite/pull/4429)
+- Fix attribute and index deletion when deleting a collection [#4429](https://github.com/appwrite/appwrite/pull/4429)
+
+# Version 1.0.2
+## Bugs
+- Fixed nullable values in functions variables [#3885](https://github.com/appwrite/appwrite/pull/3885)
+- Fixed migration for audit by migrating the `time` attribute [#4038](https://github.com/appwrite/appwrite/pull/4038)
+- Fixed default value for creating Boolean Attribute [#4040](https://github.com/appwrite/appwrite/pull/4040)
+- Fixed phone authentication code to be hashed in the internal database [#3906](https://github.com/appwrite/appwrite/pull/3906)
+- Fixed `/v1/teams/:teamId/memberships/:membershipId` response [#3883](https://github.com/appwrite/appwrite/pull/3883)
+- Fixed removing variables when function is deleted [#3884](https://github.com/appwrite/appwrite/pull/3884)
+- Fixed scheduled function not being triggered [#3908](https://github.com/appwrite/appwrite/pull/3908)
+- Fixed Phone Provider configuration [#3862](https://github.com/appwrite/appwrite/pull/3883)
+- Fixed Queries with `0` values [utopia-php/database#194](https://github.com/utopia-php/database/pull/194)
+
+# Version 1.0.1
+## Bugs
+- Fixed migration for abuse by migrating the `time` attribute [#3839](https://github.com/appwrite/appwrite/pull/3839)
+
+# Version 1.0.0
 ## BREAKING CHANGES
 - All Date values are now stored as ISO-8601 instead of UNIX timestamps [#3516](https://github.com/appwrite/appwrite/pull/3516)
 - Permission levels and syntax have been reworked. See the Permissions V2 section in the document for more information [#3700](https://github.com/appwrite/appwrite/pull/3700)

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity, expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at team@appwrite.io. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -1,14 +1,14 @@
 # Contributing
 
-We would ❤️ for you to contribute to Appwrite and help make it better! We want contributing to Appwrite to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, new docs as well as updates and tweaks, blog posts, workshops, and more.
+We would ❤️ you to contribute to Appwrite and help make it better! We want contributing to Appwrite to be fun, enjoyable, and educational for anyone and everyone. All contributions are welcome, including issues, and new docs, as well as updates and tweaks, blog posts, workshops, and more.
 
 ## How to Start?
 
-If you are worried or don’t know where to start, check out our next section explaining what kind of help we could use and where can you get involved. You can reach out with questions to [Eldad Fux (@eldadfux)](https://twitter.com/eldadfux) or [@appwrite](https://twitter.com/appwrite) on Twitter, and anyone from the [Appwrite team on Discord](https://discord.gg/GSeTUeA). You can also submit an issue, and a maintainer can guide you!
+If you are worried or don’t know where to start, check out the next section that explains what kind of help we could use and where you can get involved. You can send your questions to [@appwrite](https://twitter.com/appwrite) on Twitter or to anyone from the [Appwrite team on Discord](https://appwrite.io/discord). You can also submit an issue, and a maintainer can guide you!
 
 ## Code of Conduct
 
-Help us keep Appwrite open and inclusive. Please read and follow our [Code of Conduct](/CODE_OF_CONDUCT.md).
+Help us keep Appwrite open and inclusive. Please read and follow our [Code of Conduct](https://github.com/appwrite/.github/blob/main/CODE_OF_CONDUCT.md).
 
 ## Submit a Pull Request 🚀
 
@@ -24,13 +24,13 @@ doc-548-submit-a-pull-request-section-to-contribution-guide
 
 When `TYPE` can be:
 
-- **feat** - is a new feature
+- **feat** - a new feature
 - **doc** - documentation only changes
 - **cicd** - changes related to CI/CD system
 - **fix** - a bug fix
 - **refactor** - code change that neither fixes a bug nor adds a feature
 
-**All PRs must include a commit message with the changes description!**
+**All PRs must include a commit message with the description of the changes made!**
 
 For the initial start, fork the project and use git clone command to download the repository to your computer. A standard procedure for working on an issue would be to:
 
@@ -40,33 +40,33 @@ For the initial start, fork the project and use git clone command to do
 $ git pull
 ```
 
-2. Create new branch from `master` like: `doc-548-submit-a-pull-request-section-to-contribution-guide`<br/>
+2. Create a new branch from `master` like: `doc-548-submit-a-pull-request-section-to-contribution-guide`.<br/>
 
 ```
 $ git checkout -b [name_of_your_new_branch]
 ```
 
-3. Work - commit - repeat ( be sure to be in your branch )
+3. Work - commit - repeat (make sure you're on the correct branch!)
 
-4. Before you push your changes, make sure your code follows the `PSR12` coding standards , which is the standard Appwrite follows currently. You can easily do this by running the formatter.
+4. Before you push your changes, make sure your code follows the `PSR12` coding standards, which is the standard that Appwrite currently follows. You can easily do this by running the formatter.
 
 ```bash
 composer format <your file path>
 ```
 
-Now, go a step further by running the linter by the following command to manually fix the issues the formatter wasn't able to fix.
+Now, go a step further by running the linter using the following command to manually fix the issues the formatter wasn't able to.
 
 ```bash
 composer lint <your file path>
 ```
 
-This will give you a list of errors for you to rectify , if there is an instance you need more information on the errors being displayed you can pass in additional command line arguments. More list of available arguments can be found [here](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.
+This will give you a list of errors to rectify. If you need more information on the errors, you can pass in additional command line arguments to get more verbose information. More lists of available arguments can be found [here](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.
 
 ```bash
 composer lint --report=diff <your file path>
 ```
 
-5. Push changes to GitHub
+5. Push changes to GitHub.
 
 ```
 $ git push origin [name_of_your_new_branch]
@@ -76,23 +76,24 @@ $ git push origin [name_of_your_new_branch]
    If you go to your repository on GitHub, you'll see a `Compare & pull request` button. Click on that button.
 7. Start a Pull Request
    Now submit the pull request and click on `Create pull request`.
-8. Get a code review approval/reject
-9. After approval, merge your PR
+8. Get a code review approval/reject.
+9. After approval, merge your PR.
 10. GitHub will automatically delete the branch after the merge is done. (they can still be restored).
 
 ## Setup From Source
 
 To set up a working **development environment**, just fork the project git repository and install the backend and frontend dependencies using the proper package manager and create run the docker-compose stack.
 
-> If you just want to install Appwrite for day-to-day usage and not as a code maintainer use this [installation guide](https://github.com/appwrite/appwrite#installation).
-
-Please note that these instructions are for setting a functional dev environment. If you want to set up an Appwrite instance to integrate into your app, you should probably try and install Appwrite by using the instructions in the [getting started guide](https://appwrite.io/docs/getting-started-for-web) or in the main [README](README.md) file.
+> If you just want to install Appwrite for day-to-day use and not as a contributor, you can reference the [installation guide](https://github.com/appwrite/appwrite#installation), the [getting started guide](https://appwrite.io/docs/getting-started-for-web), or the main [README](README.md) file.
 
 ```bash
 git clone git@github.com:[YOUR_FORK_HERE]/appwrite.git
 
 cd appwrite
 
+git submodule update --init
+
+docker compose build
 docker compose up -d
 ```
 
@@ -116,7 +117,7 @@ After finishing the installation process, you can start writing and editing code
 
 #### Advanced Topics
 
-We love to create issues that are good for beginners and label them as `good first issue` or `hacktoberfest`, but some more advanced topics might require extra knowledge. Below is a list of links you can use to learn more about some of the more advance topics that will help you master the Appwrite codebase.
+We love to create issues that are good for beginners and label them as `good first issue` or `hacktoberfest`, but some more advanced topics might require extra knowledge. Below is a list of links you can use to learn about the more advanced topics that will help you master the Appwrite codebase.
 
 ##### Tools and Libs
 
@@ -149,7 +150,7 @@ Learn more at our [Technology Stack](#technology-stack) section.
 
 ## 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, but our final goal, as we grow, is to be using only microservices.
+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.
 
 ---
 
@@ -187,20 +188,23 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 ├── src # Supporting libraries (each lib has one role, common libs are released as individual projects)
 │   └── Appwrite
 │       ├── Auth
-│       ├── Database
 │       ├── Detector
 │       ├── Docker
+|       ├── DSN
 │       ├── Event
 │       ├── Extend
+│       ├── GraphQL
+│       ├── Messaging
 │       ├── Migration
 │       ├── Network
 │       ├── OpenSSL
-│       ├── Realtime
+│       ├── Promises
 │       ├── Resque
 │       ├── Specification
 │       ├── Task
 │       ├── Template
 │       ├── URL
+│       ├── Usage
 │       └── Utopia
 └── tests # End to end & unit tests
     ├── e2e
@@ -212,13 +216,13 @@ Appwrite's current structure is a combination of both [Monolithic](https://en.wi
 
 Appwrite's main API container is designed as a monolithic app. This is a decision we made to allow us to develop the project faster while still being a very small team.
 
-Although the Appwrite API is a monolithic app, it has a very clear separation of concern as each internal service or worker is separated by its container, which will allow us as we grow to start breaking services for better maintenance and scalability.
+Although the Appwrite API is a monolithic app, it has a very clear separation of concern as each internal service or worker is separated by its container, which allows us to start breaking services for better maintenance and scalability as we grow.
 
 ### The Microservice Part
 
 Each container in Appwrite is a microservice on its own. Each service is an independent process that can scale without regard to any of the other services.
 
-Currently, all of the Appwrite microservices are intended to communicate using the TCP protocol over a private network. You should be aware to not expose any of the services to the public-facing network, besides the public port 80 and 443, who, by default, are used to expose the Appwrite HTTP API.
+Currently, all the Appwrite microservices are intended to communicate using the TCP protocol over a private network. With the exception of the public-facing port 80 and 443, which by default are used to expose the Appwrite HTTP API, you should **avoid exposing any other services' ports**.
 
 ## Ports
 
@@ -226,43 +230,43 @@ Appwrite dev version uses ports 80 and 443 as an entry point to the Appwrite API
 
 ## Technology Stack
 
-To start helping us to improve the Appwrite server by submitting code, prior knowledge of Appwrite's technology stack can help you with getting started.
+To start helping us to improve the Appwrite server by submitting code, prior knowledge of Appwrite's technology stack can help you get started.
 
-Appwrite stack is combined from a variety of open-source technologies and tools. Appwrite backend API is written primarily with PHP version 7 and above on top of the [Utopia PHP framework](https://github.com/utopia-php/framework). The Appwrite frontend is built with tools like gulp, less, and [litespeed.js](https://github.com/litespeed-js). We use Docker as the container technology to package the Appwrite server for easy integration on-cloud, on-premise, or on-localhosts.
+Appwrite stack is a combination of a variety of open-source technologies and tools. Appwrite backend API is written primarily with PHP version 7 and above, on top of the [Utopia PHP framework](https://github.com/utopia-php/framework). The Appwrite frontend is built with tools like gulp, less, and [litespeed.js](https://github.com/litespeed-js). We use Docker as the container technology to package the Appwrite server for easy on-cloud, on-premise, or on-localhost integration.
 
 ### Other Technologies
 
-- Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data)
-- MariaDB - for database storage and queries
-- InfluxDB - for managing stats and time-series based data
-- Statsd - for sending data over UDP protocol (using Telegraf)
-- ClamAV - for validating and scanning storage files
+- Redis - for managing cache and in-memory data (currently, we do not use Redis for persistent data).
+- MariaDB - for database storage and queries.
+- InfluxDB - for managing stats and time-series based data.
+- Statsd - for sending data over UDP protocol (using Telegraf).
+- ClamAV - for validating and scanning storage files.
 - Imagemagick - for manipulating and managing image media files.
-- Webp - for better compression of images on supporting clients
-- SMTP - for sending email messages and alerts
-- Resque - for managing data queues and scheduled tasks over a Redis server
+- Webp - for better compression of images on supporting clients.
+- SMTP - for sending email messages and alerts.
+- Resque - for managing data queues and scheduled tasks over a Redis server.
 
 ## Package Managers
 
-Appwrite uses a package manager for managing code dependencies for both backend and frontend development. We try our best to avoid creating any unnecessary, and any new dependency to the project is subjected to a lead developer review and approval.
+Appwrite uses a package manager for managing code dependencies for both backend and frontend development. We try our best to avoid creating any unnecessary dependencies. New dependency to the project is subjected to a lead developer's review and approval.
 
-Many of Appwrite's internal modules are also used as dependencies to allow other Appwrite's projects to reuse them and as a way to contribute them back to the community.
+Many of Appwrite's internal modules are also used as dependencies to allow other Appwrite projects to reuse them and as a way to contribute back to the community.
 
 Appwrite uses [PHP's Composer](https://getcomposer.org/) for managing dependencies on the server-side and [JS NPM](https://www.npmjs.com/) for managing dependencies on the frontend side.
 
 ## Coding Standards
 
-Appwrite is following the [PHP-FIG standards](https://www.php-fig.org/). Currently, we are using both PSR-0 and PSR-12 for coding standards and autoloading standards.
+Appwrite follows the [PHP-FIG standards](https://www.php-fig.org/). Currently, we use both PSR-0 and PSR-12 for coding standards and autoloading standards.
 
-We use prettier for our JS coding standards and auto-formatting our code.
+We use prettier for our JS coding standards and auto-formatting for our code.
 
 ## Scalability, Speed, and Performance
 
 Appwrite is built to scale. Please keep in mind that the Appwrite stack can run in different environments and different scales.
 
-We wish Appwrite will be as easy to set up and in a single, localhost, and easy to grow to a large environment with dozens and even hundreds of instances.
+We intend Appwrite to be as easy to set up as possible in a single localhost, and to grow easily into a large environment with dozens and even hundreds of instances.
 
-When contributing code, please take into account the following considerations:
+When contributing code, please take into account the following:
 
 - Response Time
 - Throughput
@@ -273,25 +277,25 @@ When contributing code, please take into account the following considerations:
 - Background Jobs
 - Task Execution Time
 
-## Security & Privacy
+## Security and Privacy
 
 Security and privacy are extremely important to Appwrite, developers, and users alike. Make sure to follow the best industry standards and practices.
 
 ## Dependencies
 
-Please avoid introducing new dependencies to Appwrite without consulting the team. New dependencies can be very helpful but also introduce new security and privacy issues, complexity, and impact total docker image size.
+Please avoid introducing new dependencies to Appwrite without consulting the team. New dependencies can be very helpful, but they also introduce new security and privacy risks, add complexity, and impact the total docker image size.
 
-Adding a new dependency should have vital value on the product with minimum possible risk.
+Adding a new dependency should have vital value for the product with minimum possible risk.
 
 ## Introducing New Features
 
-We would 💖 you to contribute to Appwrite, but we would also like to make sure Appwrite is as great as possible and loyal to its vision and mission statement 🙏.
+We would 💖 you to contribute to Appwrite, but we also want to ensure Appwrite is loyal to its vision and mission statement 🙏.
 
 For us to find the right balance, please open an issue explaining your ideas before introducing a new pull request.
 
-This will allow the Appwrite community to have sufficient discussion about the new feature value and how it fits in the product roadmap and vision.
+This will allow the Appwrite community to sufficiently discuss the new feature value and how it fits within the product roadmap and vision.
 
-This is also important for the Appwrite lead developers to be able to give technical input and different emphasis regarding the feature design and architecture. Some bigger features might need to go through our [RFC process](https://github.com/appwrite/rfc).
+This is also important for the Appwrite lead developers to be able to provide technical input and potentially a different emphasis regarding the feature design and architecture. Some bigger features might need to go through our [RFC process](https://github.com/appwrite/rfc).
 
 ## Build
 
@@ -315,30 +319,34 @@ The Runtimes for all supported cloud functions (multicore builds) can be found a
 
 ## Generate SDK
 
-For generating a new console SDK follow the next steps:
+The following steps are used to generate a new console SDK:
 
 1. Update the console spec file located at `app/config/specs/swagger2-<version-number>.console.json` using Appwrite Tasks. Run the `php app/cli.php specs <version-number> normal` command in a running `appwrite/appwrite` container.
-2. Generate a new SDK using the command `php app/cli.php sdks`
-3. Change your working dir using `cd app/sdks/console-web`
-4. Build the new SDK `npm run build`
-5. Copy `iife/sdk.js` to `appwrite.js`
-6. Go back to the root of the project `run npm run build`
+2. Generate a new SDK using the command `php app/cli.php sdks`.
+3. Change your working dir using `cd app/sdks/console-web`.
+4. Build the new SDK `npm run build`.
+5. Copy `iife/sdk.js` to `appwrite.js`.
+6. Go back to the root of the project `run npm run build`.
 
 ## Checklist for Releasing SDKs
 
-Things to remember when releasing SDKs
+Things to remember when releasing SDKs:
 
-- Update the Changelogs in **docs/sdks** (right now only Dart and Flutter are using these)
-- Update **GETTING_STARTED.md** in **docs/sdks** for each SDKs if any changes in the related APIs in there
-- Update SDK versions as required on **app/config/platforms.php**
-- Generate SDKs using the command `php app/cli.php sdks` and follow the instructions
-- Release new tags on GitHub repository for each SDKs
+- Update the Changelogs in **docs/sdks** (right now only Dart and Flutter are using these).
+- Update **GETTING_STARTED.md** in **docs/sdks** for each SDKs if any changes in the related APIs are in there.
+- Update SDK versions as required on **app/config/platforms.php**.
+- Generate SDKs using the command `php app/cli.php sdks` and follow the instructions.
+- Release new tags on GitHub repository for each SDK.
 
 ## Debug
 
-Appwrite uses [yasd](https://github.com/swoole/yasd) debugger, which can be made available during build of Appwrite. You can connect to the debugger using VS Code [PHP Debug](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-debug) extension or if you are in PHP Storm you don't need any plugin. Below are the settings required for remote debugger connection.
+Appwrite uses [yasd](https://github.com/swoole/yasd) debugger, which can be made available during build of Appwrite. You can connect to the debugger using VS Code's [PHP Debug](https://marketplace.visualstudio.com/items?itemName=felixfbecker.php-debug) extension. 
 
-First, you need to create an init file. Duplicate **dev/yasd_init.php.stub** file and name it **dev/yasd_init.php** and there change the IP address to your development machine's IP. Without the proper IP address debugger wont connect. And you also need to set **DEBUG** build arg in **appwrite** service in **docker-compose.yml** file.
+If you are in PHP Storm you don't need any plugin. Below are the settings required for remote debugger connection: 
+
+1. Create an init file. 
+2. Duplicate **dev/yasd_init.php.stub** file and name it **dev/yasd_init.php**.
+3. Set **DEBUG** build arg in **appwrite** service in **docker-compose.yml** file.
 
 ### VS Code Launch Configuration
 
@@ -356,7 +364,7 @@ First, you need to create an init file. Duplicate **dev/yasd_init.php.stub** fil
 
 ### PHPStorm Setup
 
-In settings, go to **Languages & Frameworks** > **PHP** > **Debug**, there under **Xdebug** set the debug port to **9005** and enable **can accept external connections** checkbox.
+In settings, go to **Languages & Frameworks** > **PHP** > **Debug**, under **Xdebug** set the debug port to **9005** and enable the **can accept external connections** checkbox.
 
 ## Tests
 
@@ -378,7 +386,7 @@ To run end-2-end tests use:
 docker compose exec appwrite test /usr/src/code/tests/e2e
 ```
 
-To run end-2-end tests for a spcific service use:
+To run end-2-end tests for a specific service use:
 
 ```bash
 docker compose exec appwrite test /usr/src/code/tests/e2e/Services/[ServiceName]
@@ -427,39 +435,47 @@ composer lint
 composer lint <your file path>
 ```
 
+## Clearing the Cache
+
+If you need to clear the cache, you can do so by running the following command:
+
+```bash
+docker compose exec redis redis-cli FLUSHALL
+```
+
 ## Tutorials
 
 From time to time, our team will add tutorials that will help contributors find their way in the Appwrite source code. Below is a list of currently available tutorials:
 
 - [Adding Support for a New OAuth2 Provider](./docs/tutorials/add-oauth2-provider.md)
-- [Appwrite Environment Variables](./docs/tutorials/environment-variables.md)
-- [Running in Production](./docs/tutorials/running-in-production.md)
+- [Appwrite Environment Variables](./docs/tutorials/add-environment-variable.md)
+- [Running in Production](https://appwrite.io/docs/production)
 - [Adding Storage Adapter](./docs/tutorials/add-storage-adapter.md)
 
 ## Other Ways to Help
 
-Pull requests are great, but there are many other areas where you can help Appwrite.
+Pull requests are great, but there are many other ways you can help Appwrite.
 
 ### Blogging & Speaking
 
-Blogging, speaking about, or creating tutorials about one of Appwrite’s many features. Mention [@appwrite](https://twitter.com/appwrite) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
+Blogging, speaking about, or creating tutorials about one of Appwrite’s many features are great ways to get the word out about Appwrite. Mention [@appwrite](https://twitter.com/appwrite) on Twitter and/or [email team@appwrite.io](mailto:team@appwrite.io) so we can give pointers and tips and help you spread the word by promoting your content on the different Appwrite communication channels. Please add your blog posts and videos of talks to our [Awesome Appwrite](https://github.com/appwrite/awesome-appwrite) repo on GitHub.
 
 ### Presenting at Meetups
 
-Presenting at meetups and conferences about your Appwrite projects. Your unique challenges and successes in building things with Appwrite can provide great speaking material. We’d love to review your talk abstract/CFP, so get in touch with us if you’d like some help!
+We encourage our contributors to present at meetups and conferences about your Appwrite projects. Your unique challenges and successes in building things with Appwrite can provide great speaking material. We’d love to review your talk abstract/CFP, so get in touch with us if you’d like some help!
 
-### Sending Feedbacks & Reporting Bugs
+### Sending Feedbacks and Reporting Bugs
 
-Sending feedback is a great way for us to understand your different use cases of Appwrite better. If you had any issues, bugs, or want to share about your experience, feel free to do so on our GitHub issues page or at our [Discord channel](https://discord.gg/GSeTUeA).
+Sending feedback is a great way for us to understand your different use cases of Appwrite better. If you had any issues, bugs, or want to share your experience, feel free to do so on our GitHub issues page or at our [Discord channel](https://discord.gg/GSeTUeA).
 
 ### Submitting New Ideas
 
-If you think Appwrite could use a new feature, please open an issue on our GitHub repository, stating as much information as you can think about your new idea and it's implications. We would also use this issue to gather more information, get more feedback from the community, and have a proper discussion about the new feature.
+If you think Appwrite could use a new feature, please open an issue on our GitHub repository, stating as much information as you have about your new idea and its implications. We would also use this issue to gather more information, get more feedback from the community, and have a proper discussion about the new feature.
 
 ### Improving Documentation
 
-Submitting documentation updates, enhancements, designs, or bug fixes. Spelling or grammar fixes will be very much appreciated.
+Submitting documentation updates, enhancements, designs, or bug fixes, as well as spelling or grammar fixes is much appreciated.
 
 ### Helping Someone
 
-Searching for Appwrite on Discord, GitHub, or StackOverflow and helping someone else who needs help. You can also help by teaching others how to contribute to Appwrite's repo!
+Consider searching for Appwrite on Discord, GitHub, or StackOverflow to help someone who needs help. You can also help by teaching others how to contribute to Appwrite's repo!

Dockerfile

@@ -12,157 +12,24 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-FROM node:16.14.2-alpine3.15 as node
+FROM --platform=$BUILDPLATFORM node:16.14.2-alpine3.15 as node
 
-WORKDIR /usr/local/src/
+COPY app/console /usr/local/src/console
 
-COPY package-lock.json /usr/local/src/
-COPY package.json /usr/local/src/
-COPY gulpfile.js /usr/local/src/
-COPY public /usr/local/src/public
+WORKDIR /usr/local/src/console
+
+ARG VITE_GA_PROJECT
+ARG VITE_CONSOLE_MODE
+ARG VITE_APPWRITE_GROWTH_ENDPOINT=https://growth.appwrite.io/v1
+
+ENV VITE_GA_PROJECT=$VITE_GA_PROJECT
+ENV VITE_CONSOLE_MODE=$VITE_CONSOLE_MODE
+ENV VITE_APPWRITE_GROWTH_ENDPOINT=$VITE_APPWRITE_GROWTH_ENDPOINT
 
 RUN npm ci
 RUN npm run build
 
-FROM php:8.0.18-cli-alpine3.15 as compile
-
-ARG DEBUG=false
-ENV DEBUG=$DEBUG
-
-ENV PHP_REDIS_VERSION=5.3.7 \
-    PHP_MONGODB_VERSION=1.13.0 \
-    PHP_SWOOLE_VERSION=v4.8.10 \
-    PHP_IMAGICK_VERSION=3.7.0 \
-    PHP_YAML_VERSION=2.2.2 \
-    PHP_MAXMINDDB_VERSION=v1.11.0 \
-    PHP_ZSTD_VERSION="4504e4186e79b197cfcb75d4d09aa47ef7d92fe9 "
-
-RUN \
-  apk add --no-cache --virtual .deps \
-  make \
-  automake \
-  autoconf \
-  gcc \
-  g++ \
-  git \
-  zlib-dev \
-  brotli-dev \
-  openssl-dev \
-  yaml-dev \
-  imagemagick \
-  imagemagick-dev \
-  libmaxminddb-dev \
-  zstd-dev
-
-RUN docker-php-ext-install sockets
-
-FROM compile AS redis
-RUN \
-  # Redis Extension
-  git clone --depth 1 --branch $PHP_REDIS_VERSION https://github.com/phpredis/phpredis.git && \
-  cd phpredis && \
-  phpize && \
-  ./configure && \
-  make && make install
-
-## Swoole Extension
-FROM compile AS swoole
-RUN \
-  git clone --depth 1 --branch $PHP_SWOOLE_VERSION https://github.com/swoole/swoole-src.git && \
-  cd swoole-src && \
-  phpize && \
-  ./configure --enable-sockets --enable-http2 --enable-openssl && \
-  make && make install && \
-  cd ..
-
-## Swoole Debugger setup
-RUN if [ "$DEBUG" == "true" ]; then \
-    cd /tmp && \
-    apk add boost-dev && \
-    git clone --depth 1 https://github.com/swoole/yasd && \
-    cd yasd && \
-    phpize && \
-    ./configure && \
-    make && make install && \
-    cd ..;\
-  fi
-
-## Imagick Extension
-FROM compile AS imagick
-RUN \
-  git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/imagick/imagick && \
-  cd imagick && \
-  phpize && \
-  ./configure && \
-  make && make install
-
-## YAML Extension
-FROM compile AS yaml
-RUN \
-  git clone --depth 1 --branch $PHP_YAML_VERSION https://github.com/php/pecl-file_formats-yaml && \
-  cd pecl-file_formats-yaml && \
-  phpize && \
-  ./configure && \
-  make && make install
-
-## Maxminddb extension
-FROM compile AS maxmind
-RUN \
-  git clone --depth 1 --branch $PHP_MAXMINDDB_VERSION https://github.com/maxmind/MaxMind-DB-Reader-php.git && \
-  cd MaxMind-DB-Reader-php && \
-  cd ext && \
-  phpize && \
-  ./configure && \
-  make && make install
-
-# Mongodb Extension
-FROM compile as mongodb
-RUN \
-  git clone --depth 1 --branch $PHP_MONGODB_VERSION https://github.com/mongodb/mongo-php-driver.git && \
-  cd mongo-php-driver && \
-  git submodule update --init && \
-  phpize && \
-  ./configure && \
-  make && make install
-
-# Zstd Compression
-FROM compile as zstd
-RUN git clone --recursive -n https://github.com/kjdev/php-ext-zstd.git \
-  && cd php-ext-zstd \
-  && git checkout $PHP_ZSTD_VERSION \
-  && phpize \
-  && ./configure --with-libzstd \
-  && make && make install
-
-
-# Rust Extensions Compile Image
-FROM php:8.0.18-cli as rust_compile
-
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
-ENV PATH=/root/.cargo/bin:$PATH
-
-RUN apt-get update && apt-get install musl-tools build-essential clang-11 git -y
-RUN rustup target add $(uname -m)-unknown-linux-musl
-
-# Install ZigBuild for easier cross-compilation
-RUN curl https://ziglang.org/builds/zig-linux-$(uname -m)-0.10.0-dev.2674+d980c6a38.tar.xz --output /tmp/zig.tar.xz
-RUN tar -xf /tmp/zig.tar.xz -C /tmp/ && cp -r /tmp/zig-linux-$(uname -m)-0.10.0-dev.2674+d980c6a38 /tmp/zig/
-ENV PATH=/tmp/zig:$PATH
-RUN cargo install cargo-zigbuild
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-
-FROM rust_compile as scrypt
-
-WORKDIR /usr/local/lib/php/extensions/
-
-RUN \
-  git clone --depth 1 https://github.com/appwrite/php-scrypt.git && \
-  cd php-scrypt && \
-  cargo zigbuild --workspace --all-targets --target $(uname -m)-unknown-linux-musl --release && \
-  mv target/$(uname -m)-unknown-linux-musl/release/libphp_scrypt.so target/libphp_scrypt.so
-
-FROM php:8.0.18-cli-alpine3.15 as final
+FROM appwrite/base:0.2.2 as final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -246,49 +113,17 @@ ENV _APP_SERVER=swoole \
     _APP_SETUP=self-hosted \
     _APP_VERSION=$VERSION \
     _APP_USAGE_STATS=enabled \
-    _APP_USAGE_TIMESERIES_INTERVAL=30 \
-    _APP_USAGE_DATABASE_INTERVAL=900 \
+    _APP_USAGE_AGGREGATION_INTERVAL=30 \
     # 14 Days = 1209600 s
     _APP_MAINTENANCE_RETENTION_EXECUTION=1209600 \
     _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
     # 1 Day = 86400 s
     _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
+    _APP_MAINTENANCE_RETENTION_USAGE_HOURLY=8640000 \
     _APP_MAINTENANCE_INTERVAL=86400 \
     _APP_LOGGING_PROVIDER= \
     _APP_LOGGING_CONFIG=
 
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN \
-  apk update \
-  && apk add --no-cache --virtual .deps \
-  make \
-  automake \
-  autoconf \
-  gcc \
-  g++ \
-  curl-dev \
-  && apk add --no-cache \
-  libstdc++ \
-  certbot \
-  brotli-dev \
-  yaml-dev \
-  imagemagick \
-  imagemagick-dev \
-  libmaxminddb-dev \
-  certbot \
-  docker-cli \
-  libgomp \
-  && docker-php-ext-install sockets opcache pdo_mysql \
-  && apk del .deps \
-  && rm -rf /var/cache/apk/*
-
-RUN \
-  mkdir -p $DOCKER_CONFIG/cli-plugins \
-  && ARCH=$(uname -m) && if [ $ARCH == "armv7l" ]; then ARCH="armv7"; fi \
-  && curl -SL https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-linux-$ARCH -o $DOCKER_CONFIG/cli-plugins/docker-compose \
-  && chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
-
 RUN \
   if [ "$DEBUG" == "true" ]; then \
     apk add boost boost-dev; \
@@ -297,22 +132,12 @@ RUN \
 WORKDIR /usr/src/code
 
 COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
-COPY --from=node /usr/local/src/public/dist /usr/src/code/public/dist
-COPY --from=swoole /usr/local/lib/php/extensions/no-debug-non-zts-20200930/swoole.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/yasd.so* /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=redis /usr/local/lib/php/extensions/no-debug-non-zts-20200930/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=imagick /usr/local/lib/php/extensions/no-debug-non-zts-20200930/imagick.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=yaml /usr/local/lib/php/extensions/no-debug-non-zts-20200930/yaml.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=maxmind /usr/local/lib/php/extensions/no-debug-non-zts-20200930/maxminddb.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20200930/mongodb.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=scrypt  /usr/local/lib/php/extensions/php-scrypt/target/libphp_scrypt.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
-COPY --from=zstd /usr/local/lib/php/extensions/no-debug-non-zts-20200930/zstd.so /usr/local/lib/php/extensions/no-debug-non-zts-20200930/
+COPY --from=node /usr/local/src/console/build /usr/src/code/console
 
 # Add Source Code
 COPY ./app /usr/src/code/app
 COPY ./bin /usr/local/bin
 COPY ./docs /usr/src/code/docs
-COPY ./public/fonts /usr/src/code/public/fonts
-COPY ./public/images /usr/src/code/public/images
 COPY ./src /usr/src/code/src
 
 # Set Volumes
@@ -357,14 +182,7 @@ RUN chmod +x /usr/local/bin/doctor && \
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
 
 # Enable Extensions
-RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
-RUN echo extension=redis.so >> /usr/local/etc/php/conf.d/redis.ini
-RUN echo extension=imagick.so >> /usr/local/etc/php/conf.d/imagick.ini
-RUN echo extension=yaml.so >> /usr/local/etc/php/conf.d/yaml.ini
-RUN echo extension=maxminddb.so >> /usr/local/etc/php/conf.d/maxminddb.ini
-RUN echo extension=libphp_scrypt.so >> /usr/local/etc/php/conf.d/libphp_scrypt.ini
-RUN echo extension=zstd.so >> /usr/local/etc/php/conf.d/zstd.ini
-RUN if [ "$DEBUG" == "true" ]; then printf "zend_extension=yasd \nyasd.debug_mode=remote \nyasd.init_file=/usr/local/dev/yasd_init.php \nyasd.remote_port=9005 \nyasd.log_level=-1" >> /usr/local/etc/php/conf.d/yasd.ini; fi
+RUN if [ "$DEBUG" == "true" ]; then printf "zend_extension=yasd \nyasd.debug_mode=remote \nyasd.init_file=/usr/src/code/dev/yasd_init.php \nyasd.remote_port=9005 \nyasd.log_level=-1" >> /usr/local/etc/php/conf.d/yasd.ini; fi
 
 RUN if [ "$DEBUG" == "true" ]; then echo "opcache.enable=0" >> /usr/local/etc/php/conf.d/appwrite.ini; fi
 RUN echo "opcache.preload_user=www-data" >> /usr/local/etc/php/conf.d/appwrite.ini
@@ -376,4 +194,4 @@ RUN echo "opcache.jit=1235" >> /usr/local/etc/php/conf.d/appwrite.ini
 
 EXPOSE 80
 
-CMD [ "php", "app/http.php", "-dopcache.preload=opcache.preload=/usr/src/code/app/preload.php" ]
+CMD [ "php", "app/http.php", "-dopcache.preload=opcache.preload=/usr/src/code/app/preload.php" ]

README-CN.md

@@ -1,3 +1,6 @@
+> 准备好迎接狂风暴'云'了吗? 🌩 ☂️
+> Appwrite Cloud即将到来!你能够通过https://appwrite.io/cloud了解更多的资讯, 注册即可领取试用额度哦
+
 <br />
 <p align="center">
     <a href="https://appwrite.io" target="_blank"><img width="260" height="39" src="https://appwrite.io/images/appwrite.svg" alt="Appwrite Logo"></a>
@@ -8,17 +11,22 @@
     <br />
 </p>
 
-<!-- [![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=90a88b&style=flat-square)](https://hacktoberfest.appwrite.io) -->
+<!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
+[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
+[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
-[![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite)
-[![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
-[![翻译](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md)
-[![周边商店](https://img.shields.io/badge/swag%20store-f02e65?style=flat-square)](https://store.appwrite.io)
+
+<!-- [![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite) -->
+<!-- [![Translate](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md) -->
+<!-- [![Swag Store](https://img.shields.io/badge/swag%20store-f02e65?style=flat-square)](https://store.appwrite.io) -->
 
 [English](README.md) | 简体中文
 
-Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面极简了从零编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
+[**宣布带有数据库关系的 Appwrite 1.3！了解最新消息！**](https://dev.to/appwrite/join-celebrations-appwrite-13-ships-relationships-57fc)
+
+Appwrite是一个基于Docker的端到端开发者平台，其容器化的微服务库可应用于网页端，移动端，以及后端。Appwrite 通过视觉化界面简化了从零开始编写 API 的繁琐过程，在保证软件安全的前提下为开发者创造了一个高效的开发环境。
 
 Appwrite 可以提供给开发者用户验证，外部授权，用户数据读写检索，文件储存，图像处理，云函数计算，[等多种服务](https://appwrite.io/docs).
 
@@ -50,7 +58,7 @@ Appwrite 可以提供给开发者用户验证，外部授权，用户数据读
 
 Appwrite 的容器化服务器只需要一行指令就可以运行。您可以使用 docker-compose 在本地主机上运行 Appwrite，也可以在任何其他容器化工具（如 Kubernetes、Docker Swarm 或 Rancher）上运行 Appwrite。
 
-开始运行 Appwrite 服务器的最简单方法是运行我们的 docker-compose 文件。在运行安装命令之前，请确保您的机器上安装了 [Docker](https://dockerdocs.cn/get-docker/index.html)：
+启动 Appwrite 服务器的最简单方法是运行我们的 docker-compose 文件。在运行安装命令之前，请确保您的机器上安装了 [Docker](https://dockerdocs.cn/get-docker/index.html)：
 
 ### Unix
 
@@ -59,7 +67,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:0.15.3
+    appwrite/appwrite:1.3.1
 ```
 
 ### Windows
@@ -71,17 +79,17 @@ 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:0.15.3
+    appwrite/appwrite:1.3.1
 ```
 
 #### PowerShell
 
 ```powershell
-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:0.15.3
+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.3.1
 ```
 
 运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
@@ -128,7 +136,7 @@ docker run -it --rm ,
 
 #### 服务器
 * ✅  &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (由 Appwrite 团队维护)
-* ✅  &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwr实验 团队维护)
+* ✅  &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (由 Appwrite 团队维护)
 * ✅  &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (由 Appwrite 团队维护)
 * ✅  &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **公测** (由 Appwrite 团队维护)
 * ✅  &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (由 Appwrite 团队维护)
@@ -154,7 +162,7 @@ Appwrite API 界面层利用后台缓存和任务委派来提供极速的响应
 
 ## 贡献代码
 
-所有代码贡献 - 包括来自具有直接提交更改权限的贡献者 - 都必须提交PR请求并在合并分支之前得到核心开发人员的批准。这是为了确保正确审查所有代码。
+为了确保正确审查，所有代码贡献 - 包括来自具有直接提交更改权限的贡献者 - 都必须提交PR请求并在合并分支之前得到核心开发人员的批准。
 
 我们欢迎所有人提交PR！如果您愿意提供帮助，可以在 [贡献指南](CONTRIBUTING.md) 中了解有关如何为项目做出贡献的更多信息。
 
@@ -164,7 +172,7 @@ Appwrite API 界面层利用后台缓存和任务委派来提供极速的响应
 
 ## 订阅我们
 
-加入我们在世界各地不断发展的社区！请参阅我们的官方 [博客](https://medium.com/appwrite-io)。在 [Twitter](https://twitter.com/appwrite)、[Facebook 页面](https://www.facebook.com/appwrite.io)、[Facebook 群组](https://www.facebook)、[开发者社区](https://dev.to/appwrite) 等平台订阅我们或加入我们的 [Discord 社区](https://discord.gg/GSeTUeA) 以获得更多帮助，想法和讨论。
+加入我们在世界各地不断发展的社区！请参阅我们的官方 [博客](https://medium.com/appwrite-io)。在 [Twitter](https://twitter.com/appwrite)、[Facebook 页面](https://www.facebook.com/appwrite.io)、[Facebook 群组](https://www.facebook.com/appwrite.io/groups/)、[开发者社区](https://dev.to/appwrite) 等平台订阅我们或加入我们的 [Discord 社区](https://discord.gg/GSeTUeA) 以获得更多帮助，想法和讨论。
 
 ## 版权说明
 

README.md

@@ -11,22 +11,33 @@
     <br />
 </p>
 
-<!-- [![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=90a88b&style=flat-square)](https://hacktoberfest.appwrite.io) -->
+
 <!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
+
+[![We're Hiring](https://img.shields.io/static/v1?label=We're&message=Hiring&color=blue&style=flat-square)](https://appwrite.io/company/careers)
+[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
-[![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite)
-[![Build Status](https://img.shields.io/github/workflow/status/appwrite/appwrite/Tests?label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/appwrite/appwrite/tests.yml?branch=master&label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
-[![Translate](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md)
-[![Swag Store](https://img.shields.io/badge/swag%20store-f02e65?style=flat-square)](https://store.appwrite.io)
+
+<!-- [![Docker Pulls](https://img.shields.io/docker/pulls/appwrite/appwrite?color=f02e65&style=flat-square)](https://hub.docker.com/r/appwrite/appwrite) -->
+<!-- [![Translate](https://img.shields.io/badge/translate-f02e65?style=flat-square)](docs/tutorials/add-translations.md) -->
+<!-- [![Swag Store](https://img.shields.io/badge/swag%20store-f02e65?style=flat-square)](https://store.appwrite.io) -->
 
 English | [简体中文](README-CN.md)
 
-[**Appwrite 0.15 has been released! Learn what's new!**](https://dev.to/appwrite/announcing-appwrite-015-with-phone-authentication-more-5cjj)
+[**Announcing Appwrite 1.3 with Database Relationships! Learn what's new!**](https://dev.to/appwrite/join-celebrations-appwrite-13-ships-relationships-57fc)
 
 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 & 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).
+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 />
+    <a href="https://www.producthunt.com/posts/appwrite-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-appwrite-2" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=360315&theme=light&period=daily" alt="Appwrite - 100&#0037;&#0032;open&#0032;source&#0032;alternative&#0032;for&#0032;Firebase | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+    <br />
+    <br />
+</p>
 
 ![Appwrite](public/images/github.png)
 
@@ -54,7 +65,7 @@ Table of Contents:
 
 ## Installation
 
-Appwrite backend server is designed to run in a container environment. Running your server is as easy as running one command from your terminal. You can either run Appwrite on your localhost using docker-compose or on any other container orchestration tool like Kubernetes, Docker Swarm, or Rancher.
+Appwrite is designed to run in a containerized environment. Running your server is as easy as running one command from your terminal. You can either run Appwrite on your localhost using docker-compose or on any other container orchestration tool, such as Kubernetes, Docker Swarm, or Rancher.
 
 The easiest way to start running your Appwrite server is by running our docker-compose file. Before running the installation command, make sure you have [Docker](https://www.docker.com/products/docker-desktop) installed on your machine:
 
@@ -65,7 +76,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:0.15.3
+    appwrite/appwrite:1.3.1
 ```
 
 ### Windows
@@ -77,21 +88,20 @@ 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:0.15.3
+    appwrite/appwrite:1.3.1
 ```
 
 #### PowerShell
 
 ```powershell
-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:0.15.3
+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.3.1
 ```
 
-Once the Docker installation completes, 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 installation completes.
-
+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.
 
 For advanced production and custom installation, check out our Docker [environment variables](https://appwrite.io/docs/environment-variables) docs. You can also use our public [docker-compose.yml](https://appwrite.io/install/compose) and [.env](https://appwrite.io/install/env) files to manually set up an environment.
 
@@ -99,10 +109,9 @@ For advanced production and custom installation, check out our Docker [environme
 
 If you are upgrading your Appwrite server from an older version, you should use the Appwrite migration tool once your setup is completed. For more information regarding this, check out the [Installation Docs](https://appwrite.io/docs/installation).
 
-
 ## One-Click Setups
 
-In addition to running Appwrite locally, you can also launch Appwrite using a pre-configured setup. This allows you to get up and running with Appwrite quickly without installing Docker on your local machine.
+In addition to running Appwrite locally, you can also launch Appwrite using a pre-configured setup. This allows you to get up and running quickly with Appwrite without installing Docker on your local machine.
 
 Choose from one of the providers below:
 
@@ -127,66 +136,68 @@ Choose from one of the providers below:
 
 Getting started with Appwrite is as easy as creating a new project, choosing your platform, and integrating its SDK into your code. You can easily get started with your platform of choice by reading one of our Getting Started tutorials.
 
-* [Getting Started for Web](https://appwrite.io/docs/getting-started-for-web)
-* [Getting Started for Flutter](https://appwrite.io/docs/getting-started-for-flutter)
-* [Getting Started for Apple](https://appwrite.io/docs/getting-started-for-apple)
-* [Getting Started for Android](https://appwrite.io/docs/getting-started-for-android)
-* [Getting Started for Server](https://appwrite.io/docs/getting-started-for-server)
-* [Getting Started for CLI](https://appwrite.io/docs/command-line)
+- [Getting Started for Web](https://appwrite.io/docs/getting-started-for-web)
+- [Getting Started for Flutter](https://appwrite.io/docs/getting-started-for-flutter)
+- [Getting Started for Apple](https://appwrite.io/docs/getting-started-for-apple)
+- [Getting Started for Android](https://appwrite.io/docs/getting-started-for-android)
+- [Getting Started for Server](https://appwrite.io/docs/getting-started-for-server)
+- [Getting Started for CLI](https://appwrite.io/docs/command-line)
 
 ### Services
 
-* [**Account**](https://appwrite.io/docs/client/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
-* [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when in admin mode.
-* [**Teams**](https://appwrite.io/docs/client/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
-* [**Databases**](https://appwrite.io/docs/client/databases) - Manage databases, collections and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
-* [**Storage**](https://appwrite.io/docs/client/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to fit your app perfectly. All files are scanned by ClamAV and stored in a secure and encrypted way.
-* [**Functions**](https://appwrite.io/docs/server/functions) - Customize your Appwrite server by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event, manually or using a CRON schedule.
-* [**Realtime**](https://appwrite.io/docs/realtime) - Listen to real-time events for any of your Appwrite services including users, storage, functions, databases and more.
-* [**Locale**](https://appwrite.io/docs/client/locale) - Track your user's location, and manage your app locale-based data.
-* [**Avatars**](https://appwrite.io/docs/client/avatars) - Manage your users' avatars, countries' flags, browser icons, credit card symbols, and generate QR codes.
+- [**Account**](https://appwrite.io/docs/client/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
+- [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when building backend integrations with Server SDKs.
+- [**Teams**](https://appwrite.io/docs/client/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
+- [**Databases**](https://appwrite.io/docs/client/databases) - Manage databases, collections, and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
+- [**Storage**](https://appwrite.io/docs/client/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to perfectly fit your app. All files are scanned by ClamAV and stored in a secure and encrypted way.
+- [**Functions**](https://appwrite.io/docs/server/functions) - Customize your Appwrite server by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event either manually or using a CRON schedule.
+- [**Realtime**](https://appwrite.io/docs/realtime) - Listen to real-time events for any of your Appwrite services including users, storage, functions, databases, and more.
+- [**Locale**](https://appwrite.io/docs/client/locale) - Track your user's location and manage your app locale-based data.
+- [**Avatars**](https://appwrite.io/docs/client/avatars) - Manage your users' avatars, countries' flags, browser icons, and credit card symbols. Generate QR codes from links or plaintext strings.
 
 For the complete API documentation, visit [https://appwrite.io/docs](https://appwrite.io/docs). For more tutorials, news and announcements check out our [blog](https://medium.com/appwrite-io) and [Discord Server](https://discord.gg/GSeTUeA).
 
 ### SDKs
 
-Below is a list of currently supported platforms and languages. If you wish to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
+Below is a list of currently supported platforms and languages. If you would like to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
 
 #### Client
-* ✅  &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **Beta** (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
+
+- ✅ &nbsp; [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Android](https://github.com/appwrite/sdk-for-android) (Maintained by the Appwrite Team)
 
 #### Server
-* ✅  &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
-* ✅  &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **Beta** (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) - **Beta** (Maintained by the Appwrite Team)
-* ✅  &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **Beta** (Maintained by the Appwrite Team)
-* ✅  &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Experimental** (Maintained by the Appwrite Team)
+
+- ✅ &nbsp; [NodeJS](https://github.com/appwrite/sdk-for-node) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [PHP](https://github.com/appwrite/sdk-for-php) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Dart](https://github.com/appwrite/sdk-for-dart) - (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Deno](https://github.com/appwrite/sdk-for-deno) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Ruby](https://github.com/appwrite/sdk-for-ruby) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Python](https://github.com/appwrite/sdk-for-python) (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Kotlin](https://github.com/appwrite/sdk-for-kotlin) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [Apple](https://github.com/appwrite/sdk-for-apple) - **Beta** (Maintained by the Appwrite Team)
+- ✅ &nbsp; [.NET](https://github.com/appwrite/sdk-for-dotnet) - **Experimental** (Maintained by the Appwrite Team)
 
 #### Community
-* ✅  &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
-* ✅  &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
+
+- ✅ &nbsp; [Appcelerator Titanium](https://github.com/m1ga/ti.appwrite) (Maintained by [Michael Gangolf](https://github.com/m1ga/))
+- ✅ &nbsp; [Godot Engine](https://github.com/GodotNuts/appwrite-sdk) (Maintained by [fenix-hub @GodotNuts](https://github.com/fenix-hub))
 
 Looking for more SDKs? - Help us by contributing a pull request to our [SDK Generator](https://github.com/appwrite/sdk-generator)!
 
-
 ## Architecture
 
 ![Appwrite Architecture](docs/specs/overview.drawio.svg)
 
-Appwrite uses a microservices architecture that was designed for easy scaling and delegation of responsibilities. In addition, Appwrite supports multiple APIs (REST, WebSocket, and GraphQL-soon) to allow you to interact with your resources leveraging your existing knowledge and protocols of choice.
+Appwrite uses a microservices architecture that was designed for easy scaling and delegation of responsibilities. In addition, Appwrite supports multiple APIs, such as REST, WebSocket, and GraphQL to allow you to interact with your resources by leveraging your existing knowledge and protocols of choice.
 
 The Appwrite API layer was designed to be extremely fast by leveraging in-memory caching and delegating any heavy-lifting tasks to the Appwrite background workers. The background workers also allow you to precisely control your compute capacity and costs using a message queue to handle the load. You can learn more about our architecture in the [contribution guide](CONTRIBUTING.md#architecture-1).
 
 ## Contributing
 
-All code contributions - including those of people having commit access - must go through a pull request and be approved by a core developer before being merged. This is to ensure a proper review of all the code.
+All code contributions, including those of people having commit access, must go through a pull request and be approved by a core developer before being merged. This is to ensure a proper review of all the code.
 
 We truly ❤️ pull requests! If you wish to help, you can learn more about how you can contribute to this project in the [contribution guide](CONTRIBUTING.md).
 
@@ -196,7 +207,7 @@ For security issues, kindly email us at [security@appwrite.io](mailto:security@a
 
 ## Follow Us
 
-Join our growing community around the world! See our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/) , [Dev Community](https://dev.to/appwrite) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions.
+Join our growing community around the world! Check out our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/), [Dev Community](https://dev.to/appwrite) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions.
 
 ## License
 

SECURITY.md

@@ -2,11 +2,13 @@
 
 ## Supported Versions
 
-| Version | Supported          |
-| ------- | ------------------ |
-| <= 0.10   | :x:                |
-| 0.11.x   | :white_check_mark: |
-| 0.12.x   | :white_check_mark: |
+| Version   | Supported          |
+| --------- | ------------------ |
+| <= 0.15.x | :x:                |
+| 1.0.x     | :white_check_mark: |
+| 1.1.x     | :white_check_mark: |
+| 1.2.x     | :white_check_mark: |
+| 1.3.x     | :white_check_mark: |
 
 ## Reporting a Vulnerability
 

app/config/collections.php

@@ -3,7 +3,7 @@
 use Appwrite\Auth\Auth;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
-use Utopia\Database\ID;
+use Utopia\Database\Helpers\ID;
 
 $providers = Config::getParam('providers', []);
 $auth = Config::getParam('auth', []);
@@ -346,6 +346,16 @@ $collections = [
                 'array' => true,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('options'),
+                'type' => Database::VAR_STRING,
+                'size' => 16384,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['json'],
+            ],
         ],
         'indexes' => [
             [
@@ -523,6 +533,17 @@ $collections = [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('region'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 128,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
             [
                 '$id' => ID::custom('description'),
                 'type' => Database::VAR_STRING,
@@ -737,6 +758,13 @@ $collections = [
                 'lengths' => [128],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => ID::custom('_key_team'),
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['teamId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 
@@ -1216,6 +1244,17 @@ $collections = [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('passwordHistory'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => true,
+                'filters' => [],
+            ],
             [
                 '$id' => ID::custom('password'),
                 'type' => Database::VAR_STRING,
@@ -1614,17 +1653,6 @@ $collections = [
                 '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('userAgent'),
                 'type' => Database::VAR_STRING,
@@ -1847,6 +1875,17 @@ $collections = [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('prefs'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 65535,
+                'signed' => true,
+                'required' => false,
+                'default' => new \stdClass(),
+                'array' => false,
+                'filters' => ['json'],
+            ],
         ],
         'indexes' => [
             [
@@ -2209,14 +2248,14 @@ $collections = [
                 '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['search'],
-                'lengths' => [2048],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_name'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['name'],
-                'lengths' => [2048],
+                'lengths' => [768],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -2230,21 +2269,21 @@ $collections = [
                 '$id' => ID::custom('_key_runtime'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['runtime'],
-                'lengths' => [2048],
+                'lengths' => [768],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_deployment'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['deployment'],
-                'lengths' => [Database::LENGTH_KEY],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_schedule'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['schedule'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -2403,14 +2442,14 @@ $collections = [
                 '$id' => ID::custom('_key_resource'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['resourceId'],
-                'lengths' => [Database::LENGTH_KEY],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_resource_type'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['resourceType'],
-                'lengths' => [Database::LENGTH_KEY],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -2424,7 +2463,7 @@ $collections = [
                 '$id' => ID::custom('_key_entrypoint'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['entrypoint'],
-                'lengths' => [2048],
+                'lengths' => [768],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -2438,7 +2477,7 @@ $collections = [
                 '$id' => ID::custom('_key_buildId'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['buildId'],
-                'lengths' => [Database::LENGTH_KEY],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -2939,14 +2978,14 @@ $collections = [
                 '$id' => ID::custom('_fulltext_name'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['name'],
-                'lengths' => [1024],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['search'],
-                'lengths' => [2048],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -2960,7 +2999,7 @@ $collections = [
                 '$id' => ID::custom('_key_name'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['name'],
-                'lengths' => [128],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -3010,6 +3049,17 @@ $collections = [
                 'array' => false,
                 'filters' => [],
             ],
+            [
+                '$id' => ID::custom('region'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 255,
+                'signed' => true,
+                'required' => true,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
             [
                 '$id' => ID::custom('value'),
                 'type' => Database::VAR_INTEGER,
@@ -3238,7 +3288,7 @@ $collections = [
                 '$id' => ID::custom('mimeType'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 127, // https://tools.ietf.org/html/rfc4288#section-4.2
+                'size' => 255, // https://tools.ietf.org/html/rfc4288#section-4.2
                 'signed' => true,
                 'required' => false,
                 'default' => null,
@@ -3383,7 +3433,7 @@ $collections = [
                 '$id' => ID::custom('_key_search'),
                 'type' => Database::INDEX_FULLTEXT,
                 'attributes' => ['search'],
-                'lengths' => [2048],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
@@ -3397,21 +3447,21 @@ $collections = [
                 '$id' => ID::custom('_key_name'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['name'],
-                'lengths' => [2048],
+                'lengths' => [768],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_signature'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['signature'],
-                'lengths' => [2048],
+                'lengths' => [768],
                 'orders' => [Database::ORDER_ASC],
             ],
             [
                 '$id' => ID::custom('_key_mimeType'),
                 'type' => Database::INDEX_KEY,
                 'attributes' => ['mimeType'],
-                'lengths' => [127],
+                'lengths' => [],
                 'orders' => [Database::ORDER_ASC],
             ],
             [

app/config/errors.php

@@ -70,7 +70,7 @@ return [
     ],
     Exception::GENERAL_ROUTE_NOT_FOUND => [
         'name' => Exception::GENERAL_ROUTE_NOT_FOUND,
-        'description' => 'The requested route was not found. Please refer to the docs and try again.',
+        'description' => 'The requested route was not found. Please refer to the API docs and try again.',
         'code' => 404,
     ],
     Exception::GENERAL_CURSOR_NOT_FOUND => [
@@ -408,6 +408,16 @@ return [
         'description' => 'Document with the requested ID already exists.',
         'code' => 409,
     ],
+    Exception::DOCUMENT_UPDATE_CONFLICT => [
+        'name' => Exception::DOCUMENT_UPDATE_CONFLICT,
+        'description' => 'Remote document is newer than local.',
+        'code' => 409,
+    ],
+    Exception::DOCUMENT_DELETE_RESTRICTED => [
+        'name' => Exception::DOCUMENT_DELETE_RESTRICTED,
+        'description' => 'Document cannot be deleted because it is referenced by another document.',
+        'code' => 403,
+    ],
 
     /** Attributes */
     Exception::ATTRIBUTE_NOT_FOUND => [
@@ -417,12 +427,12 @@ return [
     ],
     Exception::ATTRIBUTE_UNKNOWN => [
         'name' => Exception::ATTRIBUTE_UNKNOWN,
-        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the <span class="tag">available</span> state.',
+        'description' => 'The attribute required for the index could not be found. Please confirm all your attributes are in the available state.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_NOT_AVAILABLE => [
         'name' => Exception::ATTRIBUTE_NOT_AVAILABLE,
-        'description' => 'The requested attribute is not yet <span class="tag">available</span>. Please try again later.',
+        'description' => 'The requested attribute is not yet available. Please try again later.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_FORMAT_UNSUPPORTED => [
@@ -432,7 +442,7 @@ return [
     ],
     Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED => [
         'name' => Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED,
-        'description' => 'Default values cannot be set for <span class="tag">array</span> and <span class="tag">required</span> attributes.',
+        'description' => 'Default values cannot be set for array or required attributes.',
         'code' => 400,
     ],
     Exception::ATTRIBUTE_ALREADY_EXISTS => [
@@ -450,6 +460,11 @@ return [
         'description' => 'The attribute value is invalid. Please check the type, range and value of the attribute.',
         'code' => 400,
     ],
+    Exception::ATTRIBUTE_TYPE_INVALID => [
+        'name' => Exception::ATTRIBUTE_TYPE_INVALID,
+        'description' => 'The attribute type is invalid.',
+        'code' => 400,
+    ],
 
     /** Indexes */
     Exception::INDEX_NOT_FOUND => [
@@ -486,7 +501,7 @@ return [
     ],
     Exception::PROJECT_PROVIDER_UNSUPPORTED => [
         'name' => Exception::PROJECT_PROVIDER_UNSUPPORTED,
-        'description' => 'The chosen OAuth provider is unsupported. Please check <a href="/docs/client/account?sdk=web-default#accountCreateOAuth2Session"> the docs</a> for the complete list of supported OAuth providers.',
+        'description' => 'The chosen OAuth provider is unsupported. Please check the <a href="/docs/client/account?sdk=web-default#accountCreateOAuth2Session">Create OAuth2 Session docs</a> for the complete list of supported OAuth providers.',
         'code' => 501,
     ],
     Exception::PROJECT_INVALID_SUCCESS_URL => [
@@ -549,4 +564,19 @@ return [
         'description' => 'Domain verification for the requested domain has failed.',
         'code' => 401,
     ],
+    Exception::DOMAIN_TARGET_INVALID => [
+        'name' => Exception::DOMAIN_TARGET_INVALID,
+        'description' => 'Your Appwrite instance is not publicly accessible. Please check the _APP_DOMAIN_TARGET environment variable of your Appwrite server.',
+        'code' => 501,
+    ],
+    Exception::GRAPHQL_NO_QUERY => [
+        'name' => Exception::GRAPHQL_NO_QUERY,
+        'description' => 'Param "query" is not optional.',
+        'code' => 400,
+    ],
+    Exception::GRAPHQL_TOO_MANY_QUERIES => [
+        'name' => Exception::GRAPHQL_TOO_MANY_QUERIES,
+        'description' => 'Too many queries.',
+        'code' => 400,
+    ],
 ];

app/config/events.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * List of publicly accessiable system events
+ * List of publicly accessible system events
  */
 
 use Appwrite\Utopia\Response;
@@ -183,13 +183,16 @@ return [
             ],
         ],
         'create' => [
-            '$description' => 'This event triggers when a bucket is created.'
+            '$description' => 'This event triggers when a team is created.'
         ],
         'delete' => [
-            '$description' => 'This event triggers when a bucket is deleted.',
+            '$description' => 'This event triggers when a team is deleted.',
         ],
         'update' => [
-            '$description' => 'This event triggers when a bucket is updated.',
+            '$description' => 'This event triggers when a team is updated.',
+            'prefs' => [
+                '$description' => 'This event triggers when a team\'s preferences are updated.',
+            ],
         ]
     ],
     'functions' => [

app/config/locale/translations/fr.json

@@ -17,7 +17,7 @@
     "emails.magicSession.signature": "L'équipe {{project}}",
     "emails.recovery.subject": "Réinitialisation du mot de passe",
     "emails.recovery.hello": "Bonjour {{name}}",
-    "emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{projet}}.",
+    "emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{project}}.",
     "emails.recovery.footer": "Si vous n'avez pas demandé à réinitialiser votre mot de passe, vous pouvez ignorer ce message.",
     "emails.recovery.thanks": "Merci",
     "emails.recovery.signature": "L'équipe {{project}}",
@@ -29,7 +29,7 @@
     "emails.invitation.signature": "L'équipe {{project}}",
     "emails.certificate.subject": "Échec du certificat pour %s",
     "emails.certificate.hello": "Bonjour",
-    "emails.certificate.body": "Le certificate pour votre domaine '{{domain}}' n'a pas pu être généré. Ceci est la tentative {{tentative}} et l'échec a été causé par : {{erreur}}",
+    "emails.certificate.body": "Le certificate pour votre domaine '{{domain}}' n'a pas pu être généré. Ceci est la tentative {{attempt}} et l'échec a été causé par : {{error}}",
     "emails.certificate.footer": "Votre certificat précédent sera valide pendant 30 jours à compter de la première défaillance. Nous vous recommandons fortement d'enquêter sur ce cas, sinon votre domaine se retrouvera sans communication SSL valide.",
     "emails.certificate.thanks": "Merci",
     "emails.certificate.signature": "L'équipe {{project}}",

app/config/locale/translations/hi.json

@@ -6,25 +6,25 @@
     "emails.verification.subject": "अकाउंट वेरिफिकेशन ",
     "emails.verification.hello": "नमस्ते {{name}}",
     "emails.verification.body": "इस लिंक के माध्यम से अपने ईमेल को सत्यापित कीजिये।",
-    "emails.verification.footer": "यदि आपने इस पते को सत्यापित नहीं करना चाहते है, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
+    "emails.verification.footer": "यदि आप इस पते को सत्यापित नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
     "emails.verification.thanks": "धन्यवाद",
     "emails.verification.signature": "{{project}} टीम",
     "emails.magicSession.subject": "लॉग इन",
     "emails.magicSession.hello": "नमस्ते,",
     "emails.magicSession.body": "इस लिंक के माध्यम से लॉग-इन करें।",
-    "emails.magicSession.footer": "यदि आप इस ईमेल द्वारा लॉगिन नहीं करना चाहते है, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
+    "emails.magicSession.footer": "यदि आप इस ईमेल द्वारा लॉगिन नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
     "emails.magicSession.thanks": "धन्यवाद",
     "emails.magicSession.signature": "{{project}} टीम",
     "emails.recovery.subject": "पासवर्ड रीसेट",
     "emails.recovery.hello": "नमस्ते {{name}}",
     "emails.recovery.body": "इस लिंक के माध्यम से अपना {{project}} पासवर्ड रीसेट करें।",
-    "emails.recovery.footer": "यदि आप अपना पासवर्ड रिसेट नहीं करना चाहते है, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
+    "emails.recovery.footer": "यदि आप अपना पासवर्ड रीसेट नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
     "emails.recovery.thanks": "धन्यवाद",
     "emails.recovery.signature": "{{project}} टीम",
     "emails.invitation.subject": "%s टीम का यहाँ %s पर आमंत्रण",
     "emails.invitation.hello": "नमस्ते",
-    "emails.invitation.body": "यह मेल आपको इसलिए भेजा गया था क्योंकि {{owner}} आपको {{team}} टीम का सदस्य बनाना चाहते थे, जो {{project}} से जुड़ा हुआ है।",
-    "emails.invitation.footer": "यदि आप इसमे रूचि नहीं रखते, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
+    "emails.invitation.body": "यह मेल आपको इसलिए भेजा गया है क्योंकि {{owner}} आपको {{team}} टीम का सदस्य बनाना चाहते है, जो {{project}} से जुड़ा हुआ है।",
+    "emails.invitation.footer": "यदि आप इसमें रूचि नहीं रखते, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
     "emails.invitation.thanks": "धन्यवाद",
     "emails.invitation.signature": "{{project}} टीम",
     "locale.country.unknown": "अज्ञात",
@@ -35,7 +35,7 @@
     "countries.ae": "संयुक्त अरब अमीरात",
     "countries.ar": "अर्जेंटीना",
     "countries.am": "आर्मीनिया",
-    "countries.ag": "अंटीगुआ और बारबूडा",
+    "countries.ag": "एंटीगुआ और बारबूडा",
     "countries.au": "ऑस्ट्रेलिया",
     "countries.at": "ऑस्ट्रिया",
     "countries.az": "अज़रबैजान",
@@ -46,7 +46,7 @@
     "countries.bd": "बांग्लादेश",
     "countries.bg": "बुल्गारिया",
     "countries.bh": "बहरीन",
-    "countries.bs": "बहामास",
+    "countries.bs": "द बाहामास",
     "countries.ba": "बॉस्निया और हर्ज़ेगोविना",
     "countries.by": "बेलारूस",
     "countries.bz": "बेलीज़",

app/config/locale/translations/zh-tw.json

@@ -5,57 +5,63 @@
     "emails.sender": "%s 小組",
     "emails.verification.subject": "帳戶驗證",
     "emails.verification.hello": "嗨 {{name}}",
-    "emails.verification.body": "按照此鏈接驗證您的電子郵件地址。",
+    "emails.verification.body": "按照此連結驗證您的電子郵件地址。",
     "emails.verification.footer": "如果您沒有要求驗證此地址，則可以忽略此消息。",
     "emails.verification.thanks": "謝謝",
     "emails.verification.signature": "{{project}} 團隊",
-    "emails.magicSession.subject": "登錄",
-    "emails.magicSession.hello": "嗨",
-    "emails.magicSession.body": "點此鏈接登錄。",
-    "emails.magicSession.footer": "如果您沒有要求使用此電子郵件登錄，則可以忽略此消息。",
+    "emails.magicSession.subject": "登入",
+    "emails.magicSession.hello": "嗨，",
+    "emails.magicSession.body": "點此連結登入。",
+    "emails.magicSession.footer": "如果您沒有要求使用此電子郵件登入，則可以忽略此消息。",
     "emails.magicSession.thanks": "謝謝",
     "emails.magicSession.signature": "{{project}} 團隊",
     "emails.recovery.subject": "重設密碼",
-    "emails.recovery.hello": "你好 {{name}}",
-    "emails.recovery.body": "按照此鏈接重置您的 {{project}} 密碼.",
+    "emails.recovery.hello": "您好 {{name}}",
+    "emails.recovery.body": "按照此連結重置您的 {{project}} 密碼。",
     "emails.recovery.footer": "如果您沒有要求重置密碼，則可以忽略此消息。",
     "emails.recovery.thanks": "謝謝",
     "emails.recovery.signature": "{{project}} 團隊",
     "emails.invitation.subject": "邀請 %s 團隊在 %s",
-    "emails.invitation.hello": "你好",
-    "emails.invitation.body": "這封郵件發送給您是因為 {{owner}} 想邀請您成為 {{team}} 團隊在 {{project}}.",
+    "emails.invitation.hello": "您好",
+    "emails.invitation.body": "發送這封郵件給您是因為 {{owner}} 想邀請您成為 {{team}} 團隊在 {{project}}。",
     "emails.invitation.footer": "如果您不感興趣，可以忽略此消息。",
     "emails.invitation.thanks": "謝謝",
     "emails.invitation.signature": "{{project}} 團隊",
+    "emails.certificate.subject": "%s 的憑證更新失敗",
+    "emails.certificate.hello": "您好",
+    "emails.certificate.body": "無法產生您的域名 '{{domain}}' 的憑證。這是第 {{attempt}} 次嘗試，失敗原因是：{{error}}",
+    "emails.certificate.footer": "您的上一個憑證將會在第一次失敗的 30 天後失效。我們強烈建議您調查這件事情，否則您的域名將會無法進行有效的 SSL 通訊。",
+    "emails.certificate.thanks": "謝謝",
+    "emails.certificate.signature": "{{project}} 團隊",
     "locale.country.unknown": "未知",
     "countries.af": "阿富汗",
     "countries.ao": "安哥拉",
     "countries.al": "阿爾巴尼亞",
     "countries.ad": "安道爾",
-    "countries.ae": "阿拉伯聯合酋長國",
+    "countries.ae": "阿拉伯聯合大公國",
     "countries.ar": "阿根廷",
     "countries.am": "亞美尼亞",
-    "countries.ag": "安提瓜和巴布達",
-    "countries.au": "澳大利亞",
+    "countries.ag": "安地卡及巴布達",
+    "countries.au": "澳洲",
     "countries.at": "奧地利",
-    "countries.az": "阿塞拜疆",
-    "countries.bi": "布隆迪",
+    "countries.az": "亞塞拜然",
+    "countries.bi": "蒲隆地",
     "countries.be": "比利時",
-    "countries.bj": "貝甯",
-    "countries.bf": "布基納法索",
-    "countries.bd": "孟加拉國",
+    "countries.bj": "貝南",
+    "countries.bf": "布吉納法索",
+    "countries.bd": "孟加拉",
     "countries.bg": "保加利亞",
     "countries.bh": "巴林",
     "countries.bs": "巴哈馬",
-    "countries.ba": "波黑",
-    "countries.by": "白羅斯",
-    "countries.bz": "伯利茲",
+    "countries.ba": "波士尼亞與赫塞哥維納",
+    "countries.by": "白俄羅斯",
+    "countries.bz": "貝里斯",
     "countries.bo": "玻利維亞",
     "countries.br": "巴西",
-    "countries.bb": "巴巴多斯",
-    "countries.bn": "文萊",
+    "countries.bb": "巴貝多",
+    "countries.bn": "汶萊",
     "countries.bt": "不丹",
-    "countries.bw": "博茨瓦納",
+    "countries.bw": "波札那",
     "countries.cf": "中非共和國",
     "countries.ca": "加拿大",
     "countries.ch": "瑞士",
@@ -66,42 +72,42 @@
     "countries.cd": "剛果民主共和國",
     "countries.cg": "剛果共和國",
     "countries.co": "哥倫比亞",
-    "countries.km": "科摩",
-    "countries.cv": "佛得角",
-    "countries.cr": "哥斯達黎加",
+    "countries.km": "葛摩",
+    "countries.cv": "維德角",
+    "countries.cr": "哥斯大黎加",
     "countries.cu": "古巴",
-    "countries.cy": "塞浦路斯",
+    "countries.cy": "賽普勒斯",
     "countries.cz": "捷克",
     "countries.de": "德國",
-    "countries.dj": "吉布提",
+    "countries.dj": "吉布地",
     "countries.dm": "多米尼克",
     "countries.dk": "丹麥",
     "countries.do": "多明尼加共和國",
     "countries.dz": "阿爾及利亞",
-    "countries.ec": "厄瓜多爾",
+    "countries.ec": "厄瓜多",
     "countries.eg": "埃及",
-    "countries.er": "厄立特裏亞",
+    "countries.er": "厄利垂亞",
     "countries.es": "西班牙",
     "countries.ee": "愛沙尼亞",
-    "countries.et": "埃塞俄比亞",
+    "countries.et": "衣索比亞",
     "countries.fi": "芬蘭",
     "countries.fj": "斐濟",
     "countries.fr": "法國",
     "countries.fm": "密克羅尼西亞",
-    "countries.ga": "加蓬",
+    "countries.ga": "加彭",
     "countries.gb": "英國",
-    "countries.ge": "格魯吉亞",
-    "countries.gh": "加納",
+    "countries.ge": "喬治亞",
+    "countries.gh": "迦納",
     "countries.gn": "幾內亞",
-    "countries.gm": "岡比亞",
-    "countries.gw": "幾內亞比紹",
+    "countries.gm": "甘比亞",
+    "countries.gw": "幾內亞比索",
     "countries.gq": "赤道幾內亞",
     "countries.gr": "希臘",
-    "countries.gd": "格林納達",
-    "countries.gt": "危地馬拉",
-    "countries.gy": "圭亞那",
-    "countries.hn": "洪都拉斯",
-    "countries.hr": "克羅地亞",
+    "countries.gd": "格瑞那達",
+    "countries.gt": "瓜地馬拉",
+    "countries.gy": "蓋亞那",
+    "countries.hn": "宏都拉斯",
+    "countries.hr": "克羅埃西亞",
     "countries.ht": "海地",
     "countries.hu": "匈牙利",
     "countries.id": "印度尼西亞",
@@ -111,26 +117,26 @@
     "countries.iq": "伊拉克",
     "countries.is": "冰島",
     "countries.il": "以色列",
-    "countries.it": "意大利",
+    "countries.it": "義大利",
     "countries.jm": "牙買加",
     "countries.jo": "約旦",
     "countries.jp": "日本",
-    "countries.kz": "哈薩克斯坦",
-    "countries.ke": "肯尼亞",
-    "countries.kg": "吉爾吉斯斯坦",
+    "countries.kz": "哈薩克",
+    "countries.ke": "肯亞",
+    "countries.kg": "吉爾吉斯",
     "countries.kh": "柬埔寨",
-    "countries.ki": "基裏巴斯",
-    "countries.kn": "聖基茨和尼維斯",
+    "countries.ki": "吉里巴斯",
+    "countries.kn": "聖克里斯多福及尼維斯",
     "countries.kr": "韓國",
     "countries.kw": "科威特",
-    "countries.la": "老撾",
+    "countries.la": "寮國",
     "countries.lb": "黎巴嫩",
-    "countries.lr": "利比裏亞",
+    "countries.lr": "賴比瑞亞",
     "countries.ly": "利比亞",
-    "countries.lc": "聖盧西亞",
-    "countries.li": "列支敦士登",
-    "countries.lk": "斯裏蘭卡",
-    "countries.ls": "萊索托",
+    "countries.lc": "聖露西亞",
+    "countries.li": "列支敦斯登",
+    "countries.lk": "斯里蘭卡",
+    "countries.ls": "賴索托",
     "countries.lt": "立陶宛",
     "countries.lu": "盧森堡",
     "countries.lv": "拉脫維亞",
@@ -138,90 +144,90 @@
     "countries.mc": "摩納哥",
     "countries.md": "摩爾多瓦",
     "countries.mg": "馬達加斯加",
-    "countries.mv": "馬爾代夫",
+    "countries.mv": "馬爾地夫",
     "countries.mx": "墨西哥",
     "countries.mh": "馬紹爾群島",
     "countries.mk": "馬其頓共和國",
-    "countries.ml": "馬裏",
-    "countries.mt": "馬耳他",
+    "countries.ml": "馬利",
+    "countries.mt": "馬爾他",
     "countries.mm": "緬甸",
-    "countries.me": "黑山",
+    "countries.me": "蒙特內哥羅",
     "countries.mn": "蒙古",
-    "countries.mz": "莫桑比克",
-    "countries.mr": "毛裏塔尼亞",
-    "countries.mu": "毛裏求斯",
-    "countries.mw": "馬拉維",
+    "countries.mz": "莫三比克",
+    "countries.mr": "茅利塔尼亞",
+    "countries.mu": "模里西斯",
+    "countries.mw": "馬拉威",
     "countries.my": "馬來西亞",
     "countries.na": "納米比亞",
-    "countries.ne": "尼日爾",
-    "countries.ng": "尼日利亞",
+    "countries.ne": "尼日",
+    "countries.ng": "奈及利亞",
     "countries.ni": "尼加拉瓜",
     "countries.nl": "荷蘭",
     "countries.no": "挪威",
     "countries.np": "尼泊爾",
-    "countries.nr": "瑙魯",
-    "countries.nz": "新西蘭",
+    "countries.nr": "諾魯",
+    "countries.nz": "紐西蘭",
     "countries.om": "阿曼",
     "countries.pk": "巴基斯坦",
     "countries.pa": "巴拿馬",
     "countries.pe": "秘魯",
     "countries.ph": "菲律賓",
-    "countries.pw": "帕勞",
-    "countries.pg": "巴布亞新幾內亞",
+    "countries.pw": "帛琉",
+    "countries.pg": "巴布亞紐幾內亞",
     "countries.pl": "波蘭",
-    "countries.kp": "北朝鮮",
+    "countries.kp": "北韓",
     "countries.pt": "葡萄牙",
     "countries.py": "巴拉圭",
-    "countries.qa": "卡塔爾",
+    "countries.qa": "卡達",
     "countries.ro": "羅馬尼亞",
     "countries.ru": "俄羅斯",
-    "countries.rw": "盧旺達",
-    "countries.sa": "沙特阿拉伯",
+    "countries.rw": "盧安達",
+    "countries.sa": "沙烏地阿拉伯",
     "countries.sd": "蘇丹",
     "countries.sn": "塞內加爾",
     "countries.sg": "新加坡",
-    "countries.sb": "所羅門群島",
-    "countries.sl": "塞拉利昂",
+    "countries.sb": "索羅門群島",
+    "countries.sl": "獅子山",
     "countries.sv": "薩爾瓦多",
-    "countries.sm": "聖馬力諾",
-    "countries.so": "索馬裏",
+    "countries.sm": "聖馬利諾",
+    "countries.so": "索馬利亞",
     "countries.rs": "塞爾維亞",
     "countries.ss": "南蘇丹",
-    "countries.st": "聖多美和普林西比",
-    "countries.sr": "蘇裏南",
+    "countries.st": "聖多美普林西比",
+    "countries.sr": "蘇利南",
     "countries.sk": "斯洛伐克",
-    "countries.si": "斯洛文尼亞",
+    "countries.si": "斯洛維尼亞",
     "countries.se": "瑞典",
-    "countries.sz": "斯威士蘭",
-    "countries.sc": "塞舌爾",
+    "countries.sz": "史瓦帝尼",
+    "countries.sc": "塞席爾",
     "countries.sy": "敘利亞",
-    "countries.td": "乍得",
+    "countries.td": "查德",
     "countries.tg": "多哥",
     "countries.th": "泰國",
-    "countries.tj": "塔吉克斯坦",
-    "countries.tm": "土庫曼斯坦",
+    "countries.tj": "塔吉克",
+    "countries.tm": "土庫曼",
     "countries.tl": "東帝汶",
-    "countries.to": "湯加",
-    "countries.tt": "特立尼達和多巴哥",
-    "countries.tn": "突尼斯",
+    "countries.to": "東加",
+    "countries.tt": "千里達及托巴哥",
+    "countries.tn": "突尼西亞",
     "countries.tr": "土耳其",
-    "countries.tv": "圖瓦盧",
-    "countries.tz": "坦桑尼亞",
-    "countries.ug": "烏幹達",
+    "countries.tv": "吐瓦魯",
+    "countries.tz": "坦尚尼亞",
+    "countries.ug": "烏干達",
     "countries.ua": "烏克蘭",
     "countries.uy": "烏拉圭",
     "countries.us": "美國",
-    "countries.uz": "烏茲別克斯",
+    "countries.uz": "烏茲別克",
     "countries.va": "梵蒂岡",
-    "countries.vc": "聖文森特和格林納丁斯",
+    "countries.vc": "聖文森及格瑞那丁",
     "countries.ve": "委內瑞拉",
     "countries.vn": "越南",
-    "countries.vu": "瓦努阿圖",
+    "countries.vu": "萬那杜",
     "countries.ws": "薩摩亞",
-    "countries.ye": "也門",
+    "countries.ye": "葉門",
     "countries.za": "南非",
-    "countries.zm": "贊比亞",
-    "countries.zw": "津巴布韋",
+    "countries.zm": "尚比亞",
+    "countries.zw": "辛巴威",
     "continents.af": "非洲",
     "continents.an": "南極洲",
     "continents.as": "亞洲",
@@ -229,4 +235,4 @@
     "continents.na": "北美洲",
     "continents.oc": "大洋洲",
     "continents.sa": "南美洲"
-}
+}

app/config/platforms.php

@@ -11,11 +11,11 @@ return [
         'description' => 'Client libraries for integrating with Appwrite to build client-based applications and websites. Read the [getting started for web](/docs/getting-started-for-web) or [getting started for Flutter](/docs/getting-started-for-flutter) tutorials to start building your first application.',
         'enabled' => true,
         'beta' => false,
-        'languages' => [ // TODO change key to 'sdks'
+        'sdks' => [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '10.0.0',
+                'version' => '11.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-web',
                 'package' => 'https://www.npmjs.com/package/appwrite',
                 'enabled' => true,
@@ -63,7 +63,7 @@ return [
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '8.0.0',
+                'version' => '9.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -81,11 +81,11 @@ return [
             [
                 'key' => 'apple',
                 'name' => 'Apple',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
-                'beta' => true,
+                'beta' => false,
                 'dev' => false,
                 'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
@@ -116,11 +116,11 @@ return [
             [
                 'key' => 'android',
                 'name' => 'Android',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-android',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                 'enabled' => true,
-                'beta' => true,
+                'beta' => false,
                 'dev' => false,
                 'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
@@ -135,21 +135,44 @@ return [
                     'Java' => 'java',
                 ],
             ],
-            // [
-            //     'key' => 'java',
-            //     'name' => 'Java',
-            //     'url' => '',
-            //     'enabled' => false,
-            //     'beta' => false,
-            //     'dev' => false,
-            //     'hidden' => false,
-            //     'family' => APP_PLATFORM_CLIENT,
-            //     'prism' => 'java',
-            //     'source' => false,
-            //     'gitUrl' => 'git@github.com:appwrite/sdk-for-java.git',
-            //     'gitRepoName' => 'sdk-for-java',
-            //     'gitUserName' => 'appwrite',
-            // ],
+            [
+                'key' => 'graphql',
+                'name' => 'GraphQL',
+                'version' => 'October 2021',
+                'url' => '',
+                'package' => '',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => false,
+                'hidden' => true,
+                'family' => APP_PLATFORM_CLIENT,
+                'prism' => 'graphql',
+                'source' => \realpath(__DIR__ . '/../sdks/client-graphql'),
+                'gitUrl' => '',
+                'gitRepoName' => '',
+                'gitUserName' => '',
+                'gitBranch' => '',
+                'isSDK' => false,
+            ],
+            [
+                'key' => 'rest',
+                'name' => 'REST',
+                'version' => '',
+                'url' => '',
+                'package' => '',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => false,
+                'hidden' => true,
+                'family' => APP_PLATFORM_CLIENT,
+                'prism' => 'http',
+                'source' => \realpath(__DIR__ . '/../sdks/client-rest'),
+                'gitUrl' => '',
+                'gitRepoName' => '',
+                'gitUserName' => '',
+                'gitBranch' => '',
+                'isSDK' => false,
+            ],
         ],
     ],
 
@@ -158,11 +181,11 @@ return [
         'name' => 'Console',
         'enabled' => false,
         'beta' => false,
-        'languages' => [
+        'sdks' => [
             [
                 'key' => 'web',
                 'name' => 'Console',
-                'version' => '7.0.0',
+                'version' => '0.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-console',
                 'package' => '',
                 'enabled' => true,
@@ -170,17 +193,17 @@ return [
                 'dev' => false,
                 'hidden' => true,
                 'family' => APP_PLATFORM_CONSOLE,
-                'prism' => 'console',
+                'prism' => 'javascript',
                 'source' => \realpath(__DIR__ . '/../sdks/console-web'),
-                'gitUrl' => null,
-                'gitBranch' => null,
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-console.git',
+                'gitBranch' => 'main',
                 'gitRepoName' => 'sdk-for-console',
                 'gitUserName' => 'appwrite',
             ],
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://www.npmjs.com/package/appwrite-cli',
                 'enabled' => true,
@@ -204,11 +227,11 @@ return [
         'description' => 'Libraries for integrating with Appwrite to build server side integrations. Read the [getting started for server](/docs/getting-started-for-server) tutorial to start building your first server integration.',
         'enabled' => true,
         'beta' => false,
-        'languages' => [
+        'sdks' => [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '8.0.0',
+                'version' => '9.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -226,7 +249,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '6.0.0',
+                'version' => '7.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -244,7 +267,7 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '7.0.0',
+                'version' => '8.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -262,7 +285,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -280,7 +303,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '7.0.0',
+                'version' => '8.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -298,7 +321,7 @@ return [
             [
                 'key' => 'go',
                 'name' => 'Go',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-go',
                 'package' => '',
                 'enabled' => false,
@@ -316,7 +339,7 @@ return [
             [
                 'key' => 'java',
                 'name' => 'Java',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-java',
                 'package' => '',
                 'enabled' => false,
@@ -334,7 +357,7 @@ return [
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => false,
@@ -352,7 +375,7 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '7.0.0',
+                'version' => '8.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
@@ -370,11 +393,11 @@ return [
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,
-                'beta' => true,
+                'beta' => false,
                 'dev' => false,
                 'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
@@ -392,11 +415,11 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,
-                'beta' => true,
+                'beta' => false,
                 'dev' => false,
                 'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
@@ -407,6 +430,44 @@ return [
                 'gitUserName' => 'appwrite',
                 'gitBranch' => 'main',
             ],
+            [
+                'key' => 'graphql',
+                'name' => 'GraphQL',
+                'version' => 'October 2021',
+                'url' => '',
+                'package' => '',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => false,
+                'hidden' => true,
+                'family' => APP_PLATFORM_SERVER,
+                'prism' => 'graphql',
+                'source' => \realpath(__DIR__ . '/../sdks/server-graphql'),
+                'gitUrl' => '',
+                'gitRepoName' => '',
+                'gitUserName' => '',
+                'gitBranch' => '',
+                'isSDK' => false,
+            ],
+            [
+                'key' => 'rest',
+                'name' => 'REST',
+                'version' => '',
+                'url' => '',
+                'package' => '',
+                'enabled' => true,
+                'beta' => false,
+                'dev' => false,
+                'hidden' => true,
+                'family' => APP_PLATFORM_SERVER,
+                'prism' => 'http',
+                'source' => \realpath(__DIR__ . '/../sdks/server-rest'),
+                'gitUrl' => '',
+                'gitRepoName' => '',
+                'gitUserName' => '',
+                'gitBranch' => '',
+                'isSDK' => false,
+            ],
         ],
     ],
 ];

app/config/providers.php

@@ -17,7 +17,7 @@ return [ // Ordered by ABC.
         'icon' => 'icon-apple',
         'enabled' => true,
         'sandbox' => false,
-        'form' => 'apple.phtml', // Perperation for adding ability to customized OAuth UI forms, currently handled hardcoded.
+        'form' => 'apple.phtml', // Preparation for adding ability to customized OAuth UI forms, currently handled hardcoded.
         'beta' => true,
         'mock' => false,
     ],

app/config/regions.php

@@ -0,0 +1,9 @@
+<?php
+
+return [
+    'default' => [
+        'name' => 'Default',
+        'default' => true,
+        'disabled' => false,
+    ]
+];

app/config/roles.php

@@ -6,6 +6,7 @@ $member = [
     'public',
     'home',
     'console',
+    'graphql',
     'account',
     'teams.read',
     'teams.write',
@@ -22,6 +23,7 @@ $member = [
 ];
 
 $admins = [
+    'graphql',
     'teams.read',
     'teams.write',
     'documents.read',
@@ -58,6 +60,7 @@ return [
             'public',
             'home',
             'console',
+            'graphql',
             'documents.read',
             'documents.write',
             'files.read',
@@ -85,6 +88,6 @@ return [
     ],
     Auth::USER_ROLE_APPS => [
         'label' => 'Applications',
-        'scopes' => ['health.read'],
+        'scopes' => ['health.read', 'graphql'],
     ],
 ];

app/config/services.php

@@ -1,9 +1,9 @@
 <?php
 
 return [
-    '/' => [
-        'key' => 'homepage',
-        'name' => 'Homepage',
+    'web/home' => [
+        'key' => 'web/home',
+        'name' => 'Home',
         'subtitle' => '',
         'description' => '',
         'controller' => 'web/home.php',
@@ -14,8 +14,8 @@ return [
         'optional' => false,
         'icon' => '',
     ],
-    'console' => [
-        'key' => 'console',
+    'web/console' => [
+        'key' => 'web/console',
         'name' => 'Console',
         'subtitle' => '',
         'description' => '',
@@ -176,13 +176,26 @@ return [
     'graphql' => [
         'key' => 'graphql',
         'name' => 'GraphQL',
-        'subtitle' => 'Appwrite\'s GraphQL Endpoint',
-        'description' => 'GraphQL Endpoint',
+        'subtitle' => 'The GraphQL API allows you to query and mutate your Appwrite server using GraphQL.',
+        'description' => '/docs/services/graphql.md',
         'controller' => 'api/graphql.php',
-        'sdk' => false,
-        'docs' => false,
-        'docsUrl' => '',
+        'sdk' => true,
+        'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/graphql',
         'tests' => true,
+        'optional' => true,
+        'icon' => '/images/services/graphql.png',
+    ],
+    'console' => [
+        'key' => 'console',
+        'name' => 'Console',
+        'subtitle' => 'The Console service allows you to interact with console relevant informations.',
+        'description' => '',
+        'controller' => 'api/console.php',
+        'sdk' => true,
+        'docs' => true,
+        'docsUrl' => '',
+        'tests' => false,
         'optional' => false,
         'icon' => '',
     ],

app/config/variables.php

@@ -170,8 +170,8 @@ return [
             ],
             [
                 'name' => '_APP_USAGE_AGGREGATION_INTERVAL',
-                'description' => 'Deprecated since 1.0.0, use `_APP_USAGE_TIMESERIES_INTERVAL` and `_APP_USAGE_DATABASE_INTERVAL` instead.',
-                'introduction' => '0.10.0',
+                'description' => 'Interval value containing the number of seconds that the Appwrite usage process should wait before aggregating stats and syncing it to Database from TimeSeries data. The default value is 30 seconds. Reintroduced in 1.1.0.',
+                'introduction' => '1.1.0',
                 'default' => '30',
                 'required' => false,
                 'question' => '',
@@ -179,7 +179,7 @@ return [
             ],
             [
                 'name' => '_APP_USAGE_TIMESERIES_INTERVAL',
-                'description' => 'Interval value containing the number of seconds that the Appwrite usage process should wait before aggregating stats and syncing it to Appwrite Database from Timeseries Database. The default value is 30 seconds.',
+                'description' => 'Deprecated since 1.1.0 use _APP_USAGE_AGGREGATION_INTERVAL instead.',
                 'introduction' => '1.0.0',
                 'default' => '30',
                 'required' => false,
@@ -188,7 +188,7 @@ return [
             ],
             [
                 'name' => '_APP_USAGE_DATABASE_INTERVAL',
-                'description' => 'Interval value containing the number of seconds that the Appwrite usage process should wait before aggregating stats from data in Appwrite Database. The default value is 15 minutes.',
+                'description' => 'Deprecated since 1.1.0 use _APP_USAGE_AGGREGATION_INTERVAL instead.',
                 'introduction' => '1.0.0',
                 'default' => '900',
                 'required' => false,
@@ -413,7 +413,7 @@ return [
         'variables' => [
             [
                 'name' => '_APP_SMS_PROVIDER',
-                'description' => "Provider used for delivering SMS for Phone authentication. Use the following format: 'sms://[USER]:[SECRET]@[PROVIDER]'. \n\nAvailable providers are twilio, text-magic and telesign.",
+                'description' => "Provider used for delivering SMS for Phone authentication. Use the following format: 'sms://[USER]:[SECRET]@[PROVIDER]'. \n\nAvailable providers are twilio, text-magic, telesign, msg91, and vonage.",
                 'introduction' => '0.15.0',
                 'default' => '',
                 'required' => false,
@@ -482,9 +482,9 @@ return [
             ],
             [
                 'name' => '_APP_STORAGE_DEVICE',
-                'description' => 'Select default storage device. The default value is \'Local\'. List of supported adapters are \'Local\', \'S3\', \'DOSpaces\', \'Backblaze\', \'Linode\' and \'Wasabi\'.',
+                'description' => 'Select default storage device. The default value is \'local\'. List of supported adapters are \'local\', \'s3\', \'dospaces\', \'backblaze\', \'linode\' and \'wasabi\'.',
                 'introduction' => '0.13.0',
-                'default' => 'Local',
+                'default' => 'local',
                 'required' => false,
                 'question' => '',
             ],
@@ -764,7 +764,7 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_INACTIVE_THRESHOLD',
-                'description' => 'The minimum time a function can be inactive before it\'s container is shutdown and put to sleep. The default value 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,
@@ -857,7 +857,49 @@ return [
                 'required' => false,
                 'question' => '',
                 'filter' => ''
-            ]
+            ],
+            [
+                'name' => '_APP_MAINTENANCE_RETENTION_USAGE_HOURLY',
+                'description' => 'The maximum duration (in seconds) upto which to retain hourly usage metrics. The default value is 8640000 seconds (100 days).',
+                'introduction' => '',
+                'default' => '8640000',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+        ],
+    ],
+    [
+        'category' => 'GraphQL',
+        'description' => '',
+        'variables' => [
+            [
+                'name' => '_APP_GRAPHQL_MAX_BATCH_SIZE',
+                'description' => 'Maximum number of batched queries per request. The default value is 10.',
+                'introduction' => '1.2.0',
+                'default' => '10',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_GRAPHQL_MAX_COMPLEXITY',
+                'description' => 'Maximum complexity of a GraphQL query. One field adds one to query complexity. Lists multiply the complexity by the number of items requested. The default value is 250.',
+                'introduction' => '1.2.0',
+                'default' => '250',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_GRAPHQL_MAX_DEPTH',
+                'description' => 'Maximum depth of a GraphQL query. One nested field level adds one to query depth. The default value is 3.',
+                'introduction' => '1.2.0',
+                'default' => '3',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
         ],
     ],
 ];

app/controllers/api/avatars.php

@@ -1,7 +1,7 @@
 <?php
 
 use Appwrite\Extend\Exception;
-use Appwrite\Network\Validator\URL;
+use Utopia\Validator\URL;
 use Appwrite\URL\URL as URLParse;
 use Appwrite\Utopia\Response;
 use chillerlan\QRCode\QRCode;
@@ -242,8 +242,8 @@ App::get('/v1/avatars/favicon')
                         case 'jpeg':
                             $size = \explode('x', \strtolower($sizes));
 
-                            $sizeWidth = (int) $size[0] ?? 0;
-                            $sizeHeight = (int) $size[1] ?? 0;
+                            $sizeWidth = (int) ($size[0] ?? 0);
+                            $sizeHeight = (int) ($size[1] ?? 0);
 
                             if (($sizeWidth * $sizeHeight) >= $space) {
                                 $space = $sizeWidth * $sizeHeight;
@@ -342,7 +342,6 @@ App::get('/v1/avatars/initials')
     ->desc('Get User Initials')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
-    ->label('cache', true)
     ->label('cache.resource', 'avatar/initials')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'avatars')
@@ -399,8 +398,8 @@ App::get('/v1/avatars/initials')
 
         $punch->newImage($width, $height, 'transparent');
 
-        $draw->setFont(__DIR__ . "/../../../public/fonts/poppins-v9-latin-500.ttf");
-        $image->setFont(__DIR__ . "/../../../public/fonts/poppins-v9-latin-500.ttf");
+        $draw->setFont(__DIR__ . "/../../assets/fonts/poppins-v9-latin-500.ttf");
+        $image->setFont(__DIR__ . "/../../assets/fonts/poppins-v9-latin-500.ttf");
 
         $draw->setFillColor(new ImagickPixel('black'));
         $draw->setFontSize($fontSize);

app/controllers/api/console.php

@@ -0,0 +1,40 @@
+<?php
+
+use Appwrite\Extend\Exception;
+use Appwrite\Utopia\Response;
+use Utopia\App;
+use Utopia\Database\Document;
+
+App::init()
+    ->groups(['console'])
+    ->inject('project')
+    ->action(function (Document $project) {
+        if ($project->getId() !== 'console') {
+            throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN);
+        }
+    });
+
+
+App::get('/v1/console/variables')
+    ->desc('Get Variables')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'console')
+    ->label('sdk.method', 'variables')
+    ->label('sdk.description', '/docs/references/console/variables.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_CONSOLE_VARIABLES)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $variables = new Document([
+            '_APP_DOMAIN_TARGET' => App::getEnv('_APP_DOMAIN_TARGET'),
+            '_APP_STORAGE_LIMIT' => +App::getEnv('_APP_STORAGE_LIMIT'),
+            '_APP_FUNCTIONS_SIZE_LIMIT' => +App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
+            '_APP_USAGE_STATS' => App::getEnv('_APP_USAGE_STATS'),
+        ]);
+
+        $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
+    });

app/controllers/api/functions.php

@@ -9,9 +9,9 @@ use Appwrite\Event\Func;
 use Appwrite\Event\Validator\Event as ValidatorEvent;
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Database\Validator\CustomId;
-use Utopia\Database\ID;
-use Utopia\Database\Permission;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\UID;
 use Appwrite\Usage\Stats;
 use Utopia\Storage\Device;
@@ -25,7 +25,6 @@ use Appwrite\Task\Validator\Cron;
 use Appwrite\Utopia\Database\Validator\Queries\Deployments;
 use Appwrite\Utopia\Database\Validator\Queries\Executions;
 use Appwrite\Utopia\Database\Validator\Queries\Functions;
-use Appwrite\Utopia\Database\Validator\Queries\Variables;
 use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -33,7 +32,6 @@ use Utopia\Database\DateTime;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\ArrayList;
-use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
@@ -61,9 +59,9 @@ App::post('/v1/functions')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION)
-    ->param('functionId', '', new CustomId(), 'Function ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('functionId', '', new CustomId(), 'Function 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('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.')
+    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
     ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.')
     ->param('events', [], new ArrayList(new ValidatorEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
@@ -71,8 +69,13 @@ App::post('/v1/functions')
     ->param('enabled', true, new Boolean(), 'Is function enabled?', true)
     ->inject('response')
     ->inject('dbForProject')
+    ->inject('project')
+    ->inject('user')
     ->inject('events')
-    ->action(function (string $functionId, string $name, array $execute, string $runtime, array $events, string $schedule, int $timeout, bool $enabled, Response $response, Database $dbForProject, Event $eventsInstance) {
+    ->action(function (string $functionId, string $name, array $execute, string $runtime, array $events, string $schedule, int $timeout, bool $enabled, Response $response, Database $dbForProject, Document $project, Document $user, Event $eventsInstance) {
+
+        $cron = !empty($schedule) ? new CronExpression($schedule) : null;
+        $next = !empty($schedule) ? DateTime::format($cron->getNextRunDate()) : null;
 
         $functionId = ($functionId == 'unique()') ? ID::unique() : $functionId;
         $function = $dbForProject->createDocument('functions', new Document([
@@ -86,11 +89,22 @@ App::post('/v1/functions')
             'schedule' => $schedule,
             'scheduleUpdatedAt' => DateTime::now(),
             'schedulePrevious' => null,
-            'scheduleNext' => null,
+            'scheduleNext' => $next,
             'timeout' => $timeout,
             'search' => implode(' ', [$functionId, $name, $runtime])
         ]));
 
+        if ($next) {
+            // Async task reschedule
+            $functionEvent = new Func();
+            $functionEvent
+                ->setFunction($function)
+                ->setType('schedule')
+                ->setUser($user)
+                ->setProject($project)
+                ->schedule(new \DateTime($next));
+        }
+
         $eventsInstance->setParam('functionId', $function->getId());
 
         $response
@@ -109,7 +123,7 @@ App::get('/v1/functions')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION_LIST)
-    ->param('queries', [], new Functions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Functions::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Functions(), '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(', ', Functions::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -221,8 +235,8 @@ App::get('/v1/functions/:functionId/usage')
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
             $periods = [
                 '24h' => [
-                    'period' => '30m',
-                    'limit' => 48,
+                    'period' => '1h',
+                    'limit' => 24,
                 ],
                 '7d' => [
                     'period' => '1d',
@@ -276,12 +290,12 @@ App::get('/v1/functions/:functionId/usage')
                     while ($backfill > 0) {
                         $last = $limit - $backfill - 1; // array index of last added metric
                         $diff = match ($period) { // convert period to seconds for unix timestamp math
-                            '30m' => 1800,
+                            '1h' => 3600,
                             '1d' => 86400,
                         };
                         $stats[$metric][] = [
                             'value' => 0,
-                            'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
                         ];
                         $backfill--;
                     }
@@ -324,8 +338,8 @@ App::get('/v1/functions/usage')
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
             $periods = [
                 '24h' => [
-                    'period' => '30m',
-                    'limit' => 48,
+                    'period' => '1h',
+                    'limit' => 24,
                 ],
                 '7d' => [
                     'period' => '1d',
@@ -379,12 +393,12 @@ App::get('/v1/functions/usage')
                     while ($backfill > 0) {
                         $last = $limit - $backfill - 1; // array index of last added metric
                         $diff = match ($period) { // convert period to seconds for unix timestamp math
-                            '30m' => 1800,
+                            '1h' => 3600,
                             '1d' => 86400,
                         };
                         $stats[$metric][] = [
                             'value' => 0,
-                            'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
                         ];
                         $backfill--;
                     }
@@ -424,7 +438,7 @@ App::put('/v1/functions/:functionId')
     ->label('sdk.response.model', Response::MODEL_FUNCTION)
     ->param('functionId', '', new UID(), 'Function ID.')
     ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.')
+    ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings with execution roles. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
     ->param('events', [], new ArrayList(new ValidatorEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
     ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Maximum execution time in seconds.', true)
@@ -442,11 +456,9 @@ App::put('/v1/functions/:functionId')
             throw new Exception(Exception::FUNCTION_NOT_FOUND);
         }
 
-        $original = $function->getAttribute('schedule', '');
-        $cron = (!empty($function->getAttribute('deployment')) && !empty($schedule)) ? new CronExpression($schedule) : null;
-        $next = (!empty($function->getAttribute('deployment')) && !empty($schedule)) ? DateTime::format($cron->getNextRunDate()) : null;
+        $cron = !empty($schedule) ? new CronExpression($schedule) : null;
+        $next = !empty($schedule) ? DateTime::format($cron->getNextRunDate()) : null;
 
-        $scheduleUpdatedAt = $schedule !== $original ? DateTime::now() : $function->getAttribute('scheduleUpdatedAt');
         $enabled ??= $function->getAttribute('enabled', true);
 
         $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
@@ -454,14 +466,14 @@ App::put('/v1/functions/:functionId')
             'name' => $name,
             'events' => $events,
             'schedule' => $schedule,
-            'scheduleUpdatedAt' => $scheduleUpdatedAt,
+            'scheduleUpdatedAt' => DateTime::now(),
             'scheduleNext' => $next,
             'timeout' => $timeout,
             'enabled' => $enabled,
             'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
         ])));
 
-        if ($next && $schedule !== $original) {
+        if ($next) {
             // Async task reschedule
             $functionEvent = new Func();
             $functionEvent
@@ -519,24 +531,10 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
             throw new Exception(Exception::BUILD_NOT_READY);
         }
 
-        $schedule = $function->getAttribute('schedule', '');
-        $cron = (empty($function->getAttribute('deployment')) && !empty($schedule)) ? new CronExpression($schedule) : null;
-        $next = (empty($function->getAttribute('deployment')) && !empty($schedule)) ? DateTime::format($cron->getNextRunDate()) : null;
-
         $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
-            'deployment' => $deployment->getId(),
-            'scheduleNext' => $next,
+            'deployment' => $deployment->getId()
         ])));
 
-        if ($next) { // Init first schedule
-            $functionEvent = new Func();
-            $functionEvent
-                ->setType('schedule')
-                ->setFunction($function)
-                ->setProject($project)
-                ->schedule(new \DateTime($next));
-        }
-
         $events
             ->setParam('functionId', $function->getId())
             ->setParam('deploymentId', $deployment->getId());
@@ -601,8 +599,8 @@ App::post('/v1/functions/:functionId/deployments')
     ->label('sdk.response.model', Response::MODEL_DEPLOYMENT)
     ->param('functionId', '', new UID(), 'Function ID.')
     ->param('entrypoint', '', new Text('1028'), 'Entrypoint File.')
-    ->param('code', [], new File(), 'Gzip file with your code package. When used with the Appwrite CLI, pass the path to your code directory, and the CLI will automatically package your code. Use a path that is within the current directory.', false)
-    ->param('activate', false, new Boolean(true), 'Automatically activate the deployment when it is finished building.', false)
+    ->param('code', [], new File(), 'Gzip file with your code package. When used with the Appwrite CLI, pass the path to your code directory, and the CLI will automatically package your code. Use a path that is within the current directory.', skipValidation: true)
+    ->param('activate', false, new Boolean(true), 'Automatically activate the deployment when it is finished building.')
     ->inject('request')
     ->inject('response')
     ->inject('dbForProject')
@@ -619,14 +617,20 @@ App::post('/v1/functions/:functionId/deployments')
         }
 
         $file = $request->getFiles('code');
-        $fileExt = new FileExt([FileExt::TYPE_GZIP]);
-        $fileSizeValidator = new FileSize(App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', 0));
-        $upload = new Upload();
+
+        // GraphQL multipart spec adds files with index keys
+        if (empty($file)) {
+            $file = $request->getFiles(0);
+        }
 
         if (empty($file)) {
             throw new Exception(Exception::STORAGE_FILE_EMPTY, 'No file sent');
         }
 
+        $fileExt = new FileExt([FileExt::TYPE_GZIP]);
+        $fileSizeValidator = new FileSize(App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', 0));
+        $upload = new Upload();
+
         // Make sure we handle a single file and multiple files the same way
         $fileName = (\is_array($file['name']) && isset($file['name'][0])) ? $file['name'][0] : $file['name'];
         $fileTmpName = (\is_array($file['tmp_name']) && isset($file['tmp_name'][0])) ? $file['tmp_name'][0] : $file['tmp_name'];
@@ -785,7 +789,7 @@ App::get('/v1/functions/:functionId/deployments')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_DEPLOYMENT_LIST)
     ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('queries', [], new Deployments(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Deployments::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Deployments(), '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(', ', Deployments::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -832,6 +836,7 @@ App::get('/v1/functions/:functionId/deployments')
             $result->setAttribute('status', $build->getAttribute('status', 'processing'));
             $result->setAttribute('buildStderr', $build->getAttribute('stderr', ''));
             $result->setAttribute('buildStdout', $build->getAttribute('stdout', ''));
+            $result->setAttribute('buildTime', $build->getAttribute('duration', 0));
         }
 
         $response->dynamic(new Document([
@@ -873,6 +878,11 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId')
             throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
         }
 
+        $build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', ''));
+        $deployment->setAttribute('status', $build->getAttribute('status', 'processing'));
+        $deployment->setAttribute('buildStderr', $build->getAttribute('stderr', ''));
+        $deployment->setAttribute('buildStdout', $build->getAttribute('stdout', ''));
+
         $response->dynamic($deployment, Response::MODEL_DEPLOYMENT);
     });
 
@@ -935,6 +945,67 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
         $response->noContent();
     });
 
+App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
+    ->groups(['api', 'functions'])
+    ->desc('Create Build')
+    ->label('scope', 'functions.write')
+    ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
+    ->label('audits.event', 'deployment.update')
+    ->label('audits.resource', 'function/{request.functionId}')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'functions')
+    ->label('sdk.method', 'createBuild')
+    ->label('sdk.description', '/docs/references/functions/create-build.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('deploymentId', '', new UID(), 'Deployment ID.')
+    ->param('buildId', '', new UID(), 'Build unique ID.')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('project')
+    ->inject('events')
+    ->action(function (string $functionId, string $deploymentId, string $buildId, Response $response, Database $dbForProject, Document $project, Event $events) {
+
+        $function = $dbForProject->getDocument('functions', $functionId);
+        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
+
+        if ($function->isEmpty()) {
+            throw new Exception(Exception::FUNCTION_NOT_FOUND);
+        }
+
+        if ($deployment->isEmpty()) {
+            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
+        }
+
+        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $buildId));
+
+        if ($build->isEmpty()) {
+            throw new Exception(Exception::BUILD_NOT_FOUND);
+        }
+
+        if ($build->getAttribute('status') !== 'failed') {
+            throw new Exception(Exception::BUILD_IN_PROGRESS, 'Build not failed');
+        }
+
+        $events
+            ->setParam('functionId', $function->getId())
+            ->setParam('deploymentId', $deployment->getId());
+
+        // Retry the build
+        $buildEvent = new Build();
+        $buildEvent
+            ->setType(BUILD_TYPE_RETRY)
+            ->setResource($function)
+            ->setDeployment($deployment)
+            ->setProject($project)
+            ->trigger();
+
+        $response->noContent();
+    });
+
+
+
 App::post('/v1/functions/:functionId/executions')
     ->groups(['api', 'functions'])
     ->desc('Create Execution')
@@ -1013,7 +1084,7 @@ App::post('/v1/functions/:functionId/executions')
             'functionId' => $function->getId(),
             'deploymentId' => $deployment->getId(),
             'trigger' => 'http', // http / schedule / event
-            'status' => 'waiting', // waiting / processing / completed / failed
+            'status' => $async ? 'waiting' : 'processing', // waiting / processing / completed / failed
             'statusCode' => 0,
             'response' => '',
             'stderr' => '',
@@ -1066,21 +1137,21 @@ App::post('/v1/functions/:functionId/executions')
         }
 
         $vars = array_reduce($function['vars'] ?? [], function (array $carry, Document $var) {
-            $carry[$var->getAttribute('key')] = $var->getAttribute('value');
+            $carry[$var->getAttribute('key')] = $var->getAttribute('value') ?? '';
             return $carry;
         }, []);
 
         $vars = \array_merge($vars, [
             'APPWRITE_FUNCTION_ID' => $function->getId(),
-            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name', ''),
+            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
             'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
-            'APPWRITE_FUNCTION_TRIGGER' => 'http',
-            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'],
-            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'],
-            'APPWRITE_FUNCTION_DATA' => $data,
             'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
-            'APPWRITE_FUNCTION_USER_ID' => $user->getId(),
-            'APPWRITE_FUNCTION_JWT' => $jwt,
+            'APPWRITE_FUNCTION_TRIGGER' => 'http',
+            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
+            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
+            'APPWRITE_FUNCTION_DATA' => $data ?? '',
+            'APPWRITE_FUNCTION_USER_ID' => $user->getId() ?? '',
+            'APPWRITE_FUNCTION_JWT' => $jwt ?? '',
         ]);
 
         /** Execute function */
@@ -1150,7 +1221,7 @@ App::get('/v1/functions/:functionId/executions')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_EXECUTION_LIST)
     ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('queries', [], new Executions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Executions(), '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(', ', Executions::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -1258,65 +1329,6 @@ App::get('/v1/functions/:functionId/executions/:executionId')
         $response->dynamic($execution, Response::MODEL_EXECUTION);
     });
 
-App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
-    ->groups(['api', 'functions'])
-    ->desc('Retry Build')
-    ->label('scope', 'functions.write')
-    ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
-    ->label('audits.event', 'deployment.update')
-    ->label('audits.resource', 'function/{request.functionId}')
-    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
-    ->label('sdk.namespace', 'functions')
-    ->label('sdk.method', 'retryBuild')
-    ->label('sdk.description', '/docs/references/functions/retry-build.md')
-    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('deploymentId', '', new UID(), 'Deployment ID.')
-    ->param('buildId', '', new UID(), 'Build unique ID.')
-    ->inject('response')
-    ->inject('dbForProject')
-    ->inject('project')
-    ->inject('events')
-    ->action(function (string $functionId, string $deploymentId, string $buildId, Response $response, Database $dbForProject, Document $project, Event $events) {
-
-        $function = $dbForProject->getDocument('functions', $functionId);
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $buildId));
-
-        if ($build->isEmpty()) {
-            throw new Exception(Exception::BUILD_NOT_FOUND);
-        }
-
-        if ($build->getAttribute('status') !== 'failed') {
-            throw new Exception(Exception::BUILD_IN_PROGRESS, 'Build not failed');
-        }
-
-        $events
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        // Retry the build
-        $buildEvent = new Build();
-        $buildEvent
-            ->setType(BUILD_TYPE_RETRY)
-            ->setResource($function)
-            ->setDeployment($deployment)
-            ->setProject($project)
-            ->trigger();
-
-        $response->noContent();
-    });
-
 // Variables
 
 App::post('/v1/functions/:functionId/variables')
@@ -1332,9 +1344,9 @@ App::post('/v1/functions/:functionId/variables')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_VARIABLE)
-    ->param('functionId', null, new UID(), 'Function unique ID.', false)
+    ->param('functionId', '', new UID(), 'Function unique ID.', false)
     ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
-    ->param('value', null, new Text(8192), 'Variable value. Max length: 8192 chars.', false)
+    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $functionId, string $key, string $value, Response $response, Database $dbForProject) {
@@ -1384,7 +1396,7 @@ App::get('/v1/functions/:functionId/variables')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_VARIABLE_LIST)
-    ->param('functionId', null, new UID(), 'Function unique ID.', false)
+    ->param('functionId', '', new UID(), 'Function unique ID.', false)
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $functionId, Response $response, Database $dbForProject) {
@@ -1411,8 +1423,8 @@ App::get('/v1/functions/:functionId/variables/:variableId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_VARIABLE)
-    ->param('functionId', null, new UID(), 'Function unique ID.', false)
-    ->param('variableId', null, new UID(), 'Variable unique ID.', false)
+    ->param('functionId', '', new UID(), 'Function unique ID.', false)
+    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $functionId, string $variableId, Response $response, Database $dbForProject) {
@@ -1447,10 +1459,10 @@ App::put('/v1/functions/:functionId/variables/:variableId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_VARIABLE)
-    ->param('functionId', null, new UID(), 'Function unique ID.', false)
-    ->param('variableId', null, new UID(), 'Variable unique ID.', false)
+    ->param('functionId', '', new UID(), 'Function unique ID.', false)
+    ->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), 'Variable value. Max length: 8192 chars.', true)
+    ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $functionId, string $variableId, string $key, ?string $value, Response $response, Database $dbForProject) {
@@ -1499,8 +1511,8 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
     ->label('sdk.description', '/docs/references/functions/delete-variable.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('functionId', null, new UID(), 'Function unique ID.', false)
-    ->param('variableId', null, new UID(), 'Variable unique ID.', false)
+    ->param('functionId', '', new UID(), 'Function unique ID.', false)
+    ->param('variableId', '', new UID(), 'Variable unique ID.', false)
     ->inject('response')
     ->inject('dbForProject')
     ->action(function (string $functionId, string $variableId, Response $response, Database $dbForProject) {

app/controllers/api/graphql.php

@@ -1,24 +1,297 @@
 <?php
 
-/**
- * TODO:
- *  1. Map all objects, object-params, object-fields
- *  2. Parse GraphQL request payload (use: https://github.com/webonyx/graphql-php)
- *  3. Route request to relevant controllers (of REST API?) / resolvers and aggergate data
- *  4. Handle errors if any
- *  5. Returen JSON response
- *  6. Write tests!
- */
-
 use Appwrite\Extend\Exception;
+use Appwrite\GraphQL\Promises\Adapter;
+use Appwrite\GraphQL\Schema;
+use Appwrite\Utopia\Request;
+use Appwrite\Utopia\Response;
+use GraphQL\Error\DebugFlag;
+use GraphQL\GraphQL;
+use GraphQL\Type\Schema as GQLSchema;
+use GraphQL\Validator\Rules\DisableIntrospection;
+use GraphQL\Validator\Rules\QueryComplexity;
+use GraphQL\Validator\Rules\QueryDepth;
+use Swoole\Coroutine\WaitGroup;
 use Utopia\App;
+use Utopia\Database\Document;
+use Utopia\Validator\JSON;
+use Utopia\Validator\Text;
+
+App::get('/v1/graphql')
+    ->desc('GraphQL Endpoint')
+    ->groups(['graphql'])
+    ->label('scope', 'graphql')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'graphql')
+    ->label('sdk.hide', true)
+    ->label('sdk.description', '/docs/references/graphql/get.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ANY)
+    ->label('abuse-limit', 60)
+    ->label('abuse-time', 60)
+    ->param('query', '', new Text(0, 0), 'The query to execute.')
+    ->param('operationName', '', new Text(256), 'The name of the operation to execute.', true)
+    ->param('variables', '', new Text(0), 'The JSON encoded variables to use in the query.', true)
+    ->inject('request')
+    ->inject('response')
+    ->inject('schema')
+    ->inject('promiseAdapter')
+    ->action(function (string $query, string $operationName, string $variables, Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) {
+        $query = [
+            'query' => $query,
+        ];
+
+        if (!empty($operationName)) {
+            $query['operationName'] = $operationName;
+        }
+
+        if (!empty($variables)) {
+            $query['variables'] = \json_decode($variables, true);
+        }
+
+        $output = execute($schema, $promiseAdapter, $query);
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_OK)
+            ->json($output);
+    });
+
+App::post('/v1/graphql/mutation')
+    ->desc('GraphQL Endpoint')
+    ->groups(['graphql'])
+    ->label('scope', 'graphql')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'graphql')
+    ->label('sdk.method', 'mutation')
+    ->label('sdk.methodType', 'graphql')
+    ->label('sdk.description', '/docs/references/graphql/post.md')
+    ->label('sdk.parameters', [
+        'query' => ['default' => [], 'validator' => new JSON(), 'description' => 'The query or queries to execute.', 'optional' => false],
+    ])
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ANY)
+    ->label('abuse-limit', 60)
+    ->label('abuse-time', 60)
+    ->inject('request')
+    ->inject('response')
+    ->inject('schema')
+    ->inject('promiseAdapter')
+    ->action(function (Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) {
+        $query = $request->getParams();
+
+        if ($request->getHeader('x-sdk-graphql') == 'true') {
+            $query = $query['query'];
+        }
+
+        $type = $request->getHeader('content-type');
+
+        if (\str_starts_with($type, 'application/graphql')) {
+            $query = parseGraphql($request);
+        }
+
+        if (\str_starts_with($type, 'multipart/form-data')) {
+            $query = parseMultipart($query, $request);
+        }
+
+        $output = execute($schema, $promiseAdapter, $query);
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_OK)
+            ->json($output);
+    });
 
 App::post('/v1/graphql')
     ->desc('GraphQL Endpoint')
-    ->groups(['api', 'graphql'])
-    ->label('scope', 'public')
-    ->action(
-        function () {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'GraphQL support is coming soon!', 503);
+    ->groups(['graphql'])
+    ->label('scope', 'graphql')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'graphql')
+    ->label('sdk.method', 'query')
+    ->label('sdk.methodType', 'graphql')
+    ->label('sdk.description', '/docs/references/graphql/post.md')
+    ->label('sdk.parameters', [
+        'query' => ['default' => [], 'validator' => new JSON(), 'description' => 'The query or queries to execute.', 'optional' => false],
+    ])
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ANY)
+    ->label('abuse-limit', 60)
+    ->label('abuse-time', 60)
+    ->inject('request')
+    ->inject('response')
+    ->inject('schema')
+    ->inject('promiseAdapter')
+    ->action(function (Request $request, Response $response, GQLSchema $schema, Adapter $promiseAdapter) {
+        $query = $request->getParams();
+
+        if ($request->getHeader('x-sdk-graphql') == 'true') {
+            $query = $query['query'];
+        }
+
+        $type = $request->getHeader('content-type');
+
+        if (\str_starts_with($type, 'application/graphql')) {
+            $query = parseGraphql($request);
+        }
+
+        if (\str_starts_with($type, 'multipart/form-data')) {
+            $query = parseMultipart($query, $request);
+        }
+
+        $output = execute($schema, $promiseAdapter, $query);
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_OK)
+            ->json($output);
+    });
+
+/**
+ * Execute a GraphQL request
+ *
+ * @param GQLSchema $schema
+ * @param Adapter $promiseAdapter
+ * @param array $query
+ * @return array
+ * @throws Exception
+ */
+function execute(
+    GQLSchema $schema,
+    Adapter $promiseAdapter,
+    array $query
+): array {
+    $maxBatchSize = App::getEnv('_APP_GRAPHQL_MAX_BATCH_SIZE', 10);
+    $maxComplexity = App::getEnv('_APP_GRAPHQL_MAX_COMPLEXITY', 250);
+    $maxDepth = App::getEnv('_APP_GRAPHQL_MAX_DEPTH', 3);
+
+    if (!empty($query) && !isset($query[0])) {
+        $query = [$query];
+    }
+    if (empty($query)) {
+        throw new Exception(Exception::GRAPHQL_NO_QUERY);
+    }
+    if (\count($query) > $maxBatchSize) {
+        throw new Exception(Exception::GRAPHQL_TOO_MANY_QUERIES);
+    }
+    foreach ($query as $item) {
+        if (empty($item['query'])) {
+            throw new Exception(Exception::GRAPHQL_NO_QUERY);
+        }
+    }
+
+    $flags = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::INCLUDE_TRACE;
+    $validations = GraphQL::getStandardValidationRules();
+
+    if (App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {
+        $validations[] = new DisableIntrospection();
+        $validations[] = new QueryComplexity($maxComplexity);
+        $validations[] = new QueryDepth($maxDepth);
+    }
+    if (App::getMode() === App::MODE_TYPE_PRODUCTION) {
+        $flags = DebugFlag::NONE;
+    }
+
+    $promises = [];
+    foreach ($query as $indexed) {
+        $promises[] = GraphQL::promiseToExecute(
+            $promiseAdapter,
+            $schema,
+            $indexed['query'],
+            variableValues: $indexed['variables'] ?? null,
+            operationName: $indexed['operationName'] ?? null,
+            validationRules: $validations
+        );
+    }
+
+    $output = [];
+    $wg = new WaitGroup();
+    $wg->add();
+    $promiseAdapter->all($promises)->then(
+        function (array $results) use (&$output, &$wg, $flags) {
+            try {
+                $output = processResult($results, $flags);
+            } finally {
+                $wg->done();
+            }
         }
     );
+    $wg->wait();
+
+    return $output;
+}
+
+/**
+ * Parse an "application/graphql" type request
+ *
+ * @param Request $request
+ * @return array
+ */
+function parseGraphql(Request $request): array
+{
+    return ['query' => $request->getRawPayload()];
+}
+
+/**
+ * Parse an "multipart/form-data" type request
+ *
+ * @param array $query
+ * @param Request $request
+ * @return array
+ */
+function parseMultipart(array $query, Request $request): array
+{
+    $operations = \json_decode($query['operations'], true);
+    $map = \json_decode($query['map'], true);
+
+    foreach ($map as $fileKey => $locations) {
+        foreach ($locations as $location) {
+            $items = &$operations;
+            foreach (\explode('.', $location) as $key) {
+                if (!isset($items[$key]) || !\is_array($items[$key])) {
+                    $items[$key] = [];
+                }
+                $items = &$items[$key];
+            }
+            $items = $request->getFiles($fileKey);
+        }
+    }
+
+    $query['query'] = $operations['query'];
+    $query['variables'] = $operations['variables'];
+
+    unset($query['operations']);
+    unset($query['map']);
+
+    return $query;
+}
+
+/**
+ * Process an array of results for output.
+ *
+ * @param $result
+ * @param $debugFlags
+ * @return array
+ */
+function processResult($result, $debugFlags): array
+{
+    // Only one query, return the result
+    if (!isset($result[1])) {
+        return $result[0]->toArray($debugFlags);
+    }
+
+    // Batched queries, return an array of results
+    return \array_map(
+        static function ($item) use ($debugFlags) {
+            return $item->toArray($debugFlags);
+        },
+        $result
+    );
+}
+
+App::shutdown()
+    ->groups(['schema'])
+    ->inject('project')
+    ->action(function (Document $project) {
+        Schema::setDirty($project->getId());
+    });

app/controllers/api/locale.php

@@ -19,6 +19,8 @@ App::get('/v1/locale')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOCALE)
+    ->label('sdk.offline.model', '/locale')
+    ->label('sdk.offline.key', 'current')
     ->inject('request')
     ->inject('response')
     ->inject('locale')
@@ -40,7 +42,6 @@ App::get('/v1/locale')
             $output['countryCode'] = $record['country']['iso_code'];
             $output['country'] = $locale->getText('countries.' . strtolower($record['country']['iso_code']), $locale->getText('locale.country.unknown'));
             $output['continent'] = $locale->getText('continents.' . strtolower($record['continent']['code']), $locale->getText('locale.country.unknown'));
-            $output['continent'] = (isset($continents[$record['continent']['code']])) ? $continents[$record['continent']['code']] : $locale->getText('locale.country.unknown');
             $output['continentCode'] = $record['continent']['code'];
             $output['eu'] = (\in_array($record['country']['iso_code'], $eu)) ? true : false;
 
@@ -78,6 +79,8 @@ App::get('/v1/locale/countries')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
+    ->label('sdk.offline.model', '/locale/countries')
+    ->label('sdk.offline.response.key', 'code')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
@@ -109,6 +112,8 @@ App::get('/v1/locale/countries/eu')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
+    ->label('sdk.offline.model', '/locale/countries/eu')
+    ->label('sdk.offline.response.key', 'code')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
@@ -142,6 +147,8 @@ App::get('/v1/locale/countries/phones')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PHONE_LIST)
+    ->label('sdk.offline.model', '/locale/countries/phones')
+    ->label('sdk.offline.response.key', 'countryCode')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
@@ -174,6 +181,8 @@ App::get('/v1/locale/continents')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST)
+    ->label('sdk.offline.model', '/locale/continents')
+    ->label('sdk.offline.response.key', 'code')
     ->inject('response')
     ->inject('locale')
     ->action(function (Response $response, Locale $locale) {
@@ -204,6 +213,8 @@ App::get('/v1/locale/currencies')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_CURRENCY_LIST)
+    ->label('sdk.offline.model', '/locale/currencies')
+    ->label('sdk.offline.response.key', 'code')
     ->inject('response')
     ->action(function (Response $response) {
         $list = Config::getParam('locale-currencies');
@@ -225,6 +236,8 @@ App::get('/v1/locale/languages')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LANGUAGE_LIST)
+    ->label('sdk.offline.model', '/locale/languages')
+    ->label('sdk.offline.response.key', 'code')
     ->inject('response')
     ->action(function (Response $response) {
         $list = Config::getParam('locale-languages');

app/controllers/api/projects.php

@@ -6,9 +6,9 @@ use Appwrite\Event\Certificate;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Validator\Event;
 use Appwrite\Network\Validator\CNAME;
-use Appwrite\Network\Validator\Domain as DomainValidator;
+use Utopia\Validator\Domain as DomainValidator;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\Network\Validator\URL;
+use Utopia\Validator\URL;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Response;
 use Utopia\Abuse\Adapters\TimeLimit;
@@ -17,13 +17,13 @@ use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
-use Utopia\Database\ID;
+use Utopia\Database\Helpers\ID;
 use Utopia\Database\DateTime;
-use Utopia\Database\Permission;
+use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Query;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\DatetimeValidator;
+use Utopia\Database\Validator\Datetime as DatetimeValidator;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
 use Utopia\Registry\Registry;
@@ -55,9 +55,10 @@ App::post('/v1/projects')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROJECT)
-    ->param('projectId', '', new CustomId(), 'Unique Id. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('projectId', '', 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('name', null, new Text(128), 'Project name. Max length: 128 chars.')
     ->param('teamId', '', new UID(), 'Team unique ID.')
+    ->param('region', App::getEnv('_APP_REGION', 'default'), new Whitelist(array_keys(array_filter(Config::getParam('regions'), fn($config) => !$config['disabled']))), 'Project Region.', true)
     ->param('description', '', new Text(256), 'Project description. Max length: 256 chars.', true)
     ->param('logo', '', new Text(1024), 'Project logo.', true)
     ->param('url', '', new URL(), 'Project URL.', true)
@@ -70,7 +71,7 @@ App::post('/v1/projects')
     ->inject('response')
     ->inject('dbForConsole')
     ->inject('dbForProject')
-    ->action(function (string $projectId, string $name, string $teamId, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Response $response, Database $dbForConsole, Database $dbForProject) {
+    ->action(function (string $projectId, string $name, string $teamId, string $region, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Response $response, Database $dbForConsole, Database $dbForProject) {
 
         $team = $dbForConsole->getDocument('teams', $teamId);
 
@@ -79,7 +80,7 @@ App::post('/v1/projects')
         }
 
         $auth = Config::getParam('auth', []);
-        $auths = ['limit' => 0];
+        $auths = ['limit' => 0, 'maxSessions' => APP_LIMIT_USER_SESSIONS_DEFAULT, 'passwordHistory' => 0, 'passwordDictionary' => false, 'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG];
         foreach ($auth as $index => $method) {
             $auths[$method['key'] ?? ''] = true;
         }
@@ -102,6 +103,7 @@ App::post('/v1/projects')
             'name' => $name,
             'teamInternalId' => $team->getInternalId(),
             'teamId' => $team->getId(),
+            'region' => $region,
             'description' => $description,
             'logo' => $logo,
             'url' => $url,
@@ -125,7 +127,7 @@ App::post('/v1/projects')
         $collections = Config::getParam('collections', []);
 
         $dbForProject->setNamespace("_{$project->getInternalId()}");
-        $dbForProject->create(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        $dbForProject->create();
 
         $audit = new Audit($dbForProject);
         $audit->setup();
@@ -182,7 +184,7 @@ App::get('/v1/projects')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROJECT_LIST)
-    ->param('queries', [], new Projects(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Projects::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Projects(), '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(', ', Projects::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
@@ -269,8 +271,8 @@ App::get('/v1/projects/:projectId/usage')
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
             $periods = [
                 '24h' => [
-                    'period' => '30m',
-                    'limit' => 48,
+                    'period' => '1h',
+                    'limit' => 24,
                 ],
                 '7d' => [
                     'period' => '1d',
@@ -293,9 +295,10 @@ App::get('/v1/projects/:projectId/usage')
                 'project.$all.network.bandwidth',
                 'project.$all.storage.size',
                 'users.$all.count.total',
-                'collections.$all.count.total',
+                'databases.$all.count.total',
                 'documents.$all.count.total',
                 'executions.$all.compute.total',
+                'buckets.$all.count.total'
             ];
 
             $stats = [];
@@ -325,12 +328,12 @@ App::get('/v1/projects/:projectId/usage')
                     while ($backfill > 0) {
                         $last = $limit - $backfill - 1; // array index of last added metric
                         $diff = match ($period) { // convert period to seconds for unix timestamp math
-                            '30m' => 1800,
+                            '1h' => 3600,
                             '1d' => 86400,
                         };
                         $stats[$metric][] = [
                             'value' => 0,
-                            'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
                         ];
                         $backfill--;
                     }
@@ -344,9 +347,10 @@ App::get('/v1/projects/:projectId/usage')
                 'network' => $stats[$metrics[1]] ?? [],
                 'storage' => $stats[$metrics[2]] ?? [],
                 'users' => $stats[$metrics[3]] ?? [],
-                'collections' => $stats[$metrics[4]] ?? [],
+                'databases' => $stats[$metrics[4]] ?? [],
                 'documents' => $stats[$metrics[5]] ?? [],
                 'executions' => $stats[$metrics[6]] ?? [],
+                'buckets' => $stats[$metrics[7]] ?? [],
             ]);
         }
 
@@ -442,12 +446,13 @@ App::patch('/v1/projects/:projectId/oauth2')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROJECT)
     ->param('projectId', '', new UID(), 'Project unique ID.')
-    ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'Provider Name', false)
-    ->param('appId', '', new Text(256), 'Provider app ID. Max length: 256 chars.', true)
-    ->param('secret', '', new text(512), 'Provider secret key. Max length: 512 chars.', true)
+    ->param('provider', '', new WhiteList(\array_keys(Config::getParam('providers')), true), 'Provider Name')
+    ->param('appId', null, new Text(256), 'Provider app ID. Max length: 256 chars.', true)
+    ->param('secret', null, new text(512), 'Provider secret key. Max length: 512 chars.', true)
+    ->param('enabled', null, new Boolean(), 'Provider status. Set to \'false\' to disable new session creation.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function (string $projectId, string $provider, string $appId, string $secret, Response $response, Database $dbForConsole) {
+    ->action(function (string $projectId, string $provider, ?string $appId, ?string $secret, ?bool $enabled, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -456,8 +461,18 @@ App::patch('/v1/projects/:projectId/oauth2')
         }
 
         $providers = $project->getAttribute('authProviders', []);
-        $providers[$provider . 'Appid'] = $appId;
-        $providers[$provider . 'Secret'] = $secret;
+
+        if ($appId !== null) {
+            $providers[$provider . 'Appid'] = $appId;
+        }
+
+        if ($secret !== null) {
+            $providers[$provider . 'Secret'] = $secret;
+        }
+
+        if ($enabled !== null) {
+            $providers[$provider . 'Enabled'] = $enabled;
+        }
 
         $project = $dbForConsole->updateDocument('projects', $project->getId(), $project->setAttribute('authProviders', $providers));
 
@@ -495,6 +510,37 @@ App::patch('/v1/projects/:projectId/auth/limit')
         $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
+App::patch('/v1/projects/:projectId/auth/duration')
+    ->desc('Update Project Authentication Duration')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'projects')
+    ->label('sdk.method', 'updateAuthDuration')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROJECT)
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('duration', 31536000, new Range(0, 31536000), 'Project session length in seconds. Max length: 31536000 seconds.')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $projectId, int $duration, Response $response, Database $dbForConsole) {
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $auths = $project->getAttribute('auths', []);
+        $auths['duration'] = $duration;
+
+        $dbForConsole->updateDocument('projects', $project->getId(), $project
+            ->setAttribute('auths', $auths));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
 App::patch('/v1/projects/:projectId/auth/:method')
     ->desc('Update Project auth method status. Use this endpoint to enable or disable a given auth method for this project.')
     ->groups(['api', 'projects'])
@@ -529,6 +575,99 @@ App::patch('/v1/projects/:projectId/auth/:method')
         $response->dynamic($project, Response::MODEL_PROJECT);
     });
 
+App::patch('/v1/projects/:projectId/auth/password-history')
+    ->desc('Update authentication password history. Use this endpoint to set the number of password history to save and 0 to disable password history.')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'projects')
+    ->label('sdk.method', 'updateAuthPasswordHistory')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROJECT)
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('limit', 0, new Range(0, APP_LIMIT_USER_PASSWORD_HISTORY), 'Set the max number of passwords to store in user history. User can\'t choose a new password that is already stored in the password history list.  Max number of passwords allowed in history is' . APP_LIMIT_USER_PASSWORD_HISTORY . '. Default value is 0')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $auths = $project->getAttribute('auths', []);
+        $auths['passwordHistory'] = $limit;
+
+        $dbForConsole->updateDocument('projects', $project->getId(), $project
+            ->setAttribute('auths', $auths));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
+App::patch('/v1/projects/:projectId/auth/password-dictionary')
+    ->desc('Update authentication password disctionary status. Use this endpoint to enable or disable the dicitonary check for user password')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'projects')
+    ->label('sdk.method', 'updateAuthPasswordDictionary')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROJECT)
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('enabled', false, new Boolean(false), 'Set whether or not to enable checking user\'s password against most commonly used passwords. Default is false.')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $projectId, bool $enabled, Response $response, Database $dbForConsole) {
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $auths = $project->getAttribute('auths', []);
+        $auths['passwordDictionary'] = $enabled;
+
+        $dbForConsole->updateDocument('projects', $project->getId(), $project
+            ->setAttribute('auths', $auths));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
+App::patch('/v1/projects/:projectId/auth/max-sessions')
+    ->desc('Update Project user sessions limit')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'projects')
+    ->label('sdk.method', 'updateAuthSessionsLimit')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PROJECT)
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('limit', false, new Range(1, APP_LIMIT_USER_SESSIONS_MAX), 'Set the max number of users allowed in this project. Value allowed is between 1-' . APP_LIMIT_USER_SESSIONS_MAX . '. Default is ' . APP_LIMIT_USER_SESSIONS_DEFAULT)
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception(Exception::PROJECT_NOT_FOUND);
+        }
+
+        $auths = $project->getAttribute('auths', []);
+        $auths['maxSessions'] = $limit;
+
+        $dbForConsole->updateDocument('projects', $project->getId(), $project
+            ->setAttribute('auths', $auths));
+
+        $response->dynamic($project, Response::MODEL_PROJECT);
+    });
+
 App::delete('/v1/projects/:projectId')
     ->desc('Delete Project')
     ->groups(['api', 'projects'])
@@ -561,10 +700,6 @@ App::delete('/v1/projects/:projectId')
             ->setDocument($project)
         ;
 
-        if (!$dbForConsole->deleteDocument('teams', $project->getAttribute('teamId', null))) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove project team from DB');
-        }
-
         if (!$dbForConsole->deleteDocument('projects', $projectId)) {
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove project from DB');
         }
@@ -584,7 +719,7 @@ App::post('/v1/projects/:projectId/webhooks')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_WEBHOOK)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('name', null, new Text(128), 'Webhook name. Max length: 128 chars.')
     ->param('events', null, new ArrayList(new Event(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
     ->param('url', null, new URL(['http', 'https']), 'Webhook URL.')
@@ -672,8 +807,8 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_WEBHOOK)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('webhookId', null, new UID(), 'Webhook unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('webhookId', '', new UID(), 'Webhook unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
@@ -706,8 +841,8 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_WEBHOOK)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('webhookId', null, new UID(), 'Webhook unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('webhookId', '', new UID(), 'Webhook unique ID.')
     ->param('name', null, new Text(128), 'Webhook name. Max length: 128 chars.')
     ->param('events', null, new ArrayList(new Event(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
     ->param('url', null, new URL(['http', 'https']), 'Webhook URL.')
@@ -760,8 +895,8 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_WEBHOOK)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('webhookId', null, new UID(), 'Webhook unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('webhookId', '', new UID(), 'Webhook unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
@@ -798,8 +933,8 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('sdk.method', 'deleteWebhook')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('webhookId', null, new UID(), 'Webhook unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('webhookId', '', new UID(), 'Webhook unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
@@ -838,7 +973,7 @@ App::post('/v1/projects/:projectId/keys')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_KEY)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.')
     ->param('expire', null, new DatetimeValidator(), 'Expiration time in ISO 8601 format. Use null for unlimited expiration.', true)
@@ -888,7 +1023,7 @@ App::get('/v1/projects/:projectId/keys')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_KEY_LIST)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, Response $response, Database $dbForConsole) {
@@ -920,8 +1055,8 @@ App::get('/v1/projects/:projectId/keys/:keyId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_KEY)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('keyId', null, new UID(), 'Key unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('keyId', '', new UID(), 'Key unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $keyId, Response $response, Database $dbForConsole) {
@@ -954,8 +1089,8 @@ App::put('/v1/projects/:projectId/keys/:keyId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_KEY)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('keyId', null, new UID(), 'Key unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('keyId', '', new UID(), 'Key unique ID.')
     ->param('name', null, new Text(128), 'Key name. Max length: 128 chars.')
     ->param('scopes', null, new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Key scopes list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.')
     ->param('expire', null, new DatetimeValidator(), 'Expiration time in ISO 8601 format. Use null for unlimited expiration.', true)
@@ -1000,8 +1135,8 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
     ->label('sdk.method', 'deleteKey')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('keyId', null, new UID(), 'Key unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('keyId', '', new UID(), 'Key unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $keyId, Response $response, Database $dbForConsole) {
@@ -1040,8 +1175,8 @@ App::post('/v1/projects/:projectId/platforms')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PLATFORM)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS,  Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY], true), 'Platform type.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('type', null, new WhiteList([Origin::CLIENT_TYPE_WEB, Origin::CLIENT_TYPE_FLUTTER_WEB, Origin::CLIENT_TYPE_FLUTTER_IOS, Origin::CLIENT_TYPE_FLUTTER_ANDROID, Origin::CLIENT_TYPE_FLUTTER_LINUX, Origin::CLIENT_TYPE_FLUTTER_MACOS, Origin::CLIENT_TYPE_FLUTTER_WINDOWS, Origin::CLIENT_TYPE_APPLE_IOS, Origin::CLIENT_TYPE_APPLE_MACOS,  Origin::CLIENT_TYPE_APPLE_WATCHOS, Origin::CLIENT_TYPE_APPLE_TVOS, Origin::CLIENT_TYPE_ANDROID, Origin::CLIENT_TYPE_UNITY], true), 'Platform type.')
     ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
     ->param('key', '', new Text(256), 'Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.', true)
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
@@ -1122,8 +1257,8 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PLATFORM)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('platformId', null, new UID(), 'Platform unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('platformId', '', new UID(), 'Platform unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $platformId, Response $response, Database $dbForConsole) {
@@ -1156,8 +1291,8 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PLATFORM)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('platformId', null, new UID(), 'Platform unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('platformId', '', new UID(), 'Platform unique ID.')
     ->param('name', null, new Text(128), 'Platform name. Max length: 128 chars.')
     ->param('key', '', new Text(256), 'Package name for android or bundle ID for iOS. Max length: 256 chars.', true)
     ->param('store', '', new Text(256), 'App store or Google Play store ID. Max length: 256 chars.', true)
@@ -1203,8 +1338,8 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
     ->label('sdk.method', 'deletePlatform')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('platformId', null, new UID(), 'Platform unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('platformId', '', new UID(), 'Platform unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $platformId, Response $response, Database $dbForConsole) {
@@ -1243,7 +1378,7 @@ App::post('/v1/projects/:projectId/domains')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_DOMAIN)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('domain', null, new DomainValidator(), 'Domain name.')
     ->inject('response')
     ->inject('dbForConsole')
@@ -1267,7 +1402,7 @@ App::post('/v1/projects/:projectId/domains')
         $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
 
         if (!$target->isKnown() || $target->isTest()) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Unreachable CNAME target (' . $target->get() . '), please use a domain with a public suffix.');
+            throw new Exception(Exception::DOMAIN_TARGET_INVALID, 'Unreachable CNAME target (' . $target->get() . '). Please check the _APP_DOMAIN_TARGET environment variable of your Appwrite server.');
         }
 
         $domain = new Domain($domain);
@@ -1340,8 +1475,8 @@ App::get('/v1/projects/:projectId/domains/:domainId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_DOMAIN)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('domainId', null, new UID(), 'Domain unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('domainId', '', new UID(), 'Domain unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $domainId, Response $response, Database $dbForConsole) {
@@ -1374,8 +1509,8 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_DOMAIN)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('domainId', null, new UID(), 'Domain unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('domainId', '', new UID(), 'Domain unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->action(function (string $projectId, string $domainId, Response $response, Database $dbForConsole) {
@@ -1433,8 +1568,8 @@ App::delete('/v1/projects/:projectId/domains/:domainId')
     ->label('sdk.method', 'deleteDomain')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('projectId', null, new UID(), 'Project unique ID.')
-    ->param('domainId', null, new UID(), 'Domain unique ID.')
+    ->param('projectId', '', new UID(), 'Project unique ID.')
+    ->param('domainId', '', new UID(), 'Domain unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
     ->inject('deletes')

app/controllers/api/storage.php

@@ -16,10 +16,10 @@ use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate as DuplicateException;
 use Utopia\Database\Exception\Structure as StructureException;
-use Utopia\Database\ID;
-use Utopia\Database\Permission;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Query;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Permissions;
 use Utopia\Database\Validator\UID;
@@ -58,14 +58,14 @@ App::post('/v1/storage/buckets')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_BUCKET)
-    ->param('bucketId', '', new CustomId(), 'Unique Id. Choose your own unique ID or pass the string `unique()` to auto generate it. 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('bucketId', '', 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('name', '', new Text(128), 'Bucket name')
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default no user is granted with any permissions. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, no user is granted with any permissions. [Learn more about permissions](/docs/permissions).', true)
     ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](/docs/permissions).', true)
     ->param('enabled', true, new Boolean(true), 'Is bucket enabled?', true)
-    ->param('maximumFileSize', (int) App::getEnv('_APP_STORAGE_LIMIT', 0), new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self-hosted setups you can change the max limit by changing the `_APP_STORAGE_LIMIT` environment variable. [Learn more about storage environment variables](docs/environment-variables#storage)', true)
+    ->param('maximumFileSize', (int) App::getEnv('_APP_STORAGE_LIMIT', 0), new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self-hosted setups you can change the max limit by changing the `_APP_STORAGE_LIMIT` environment variable. [Learn more about storage environment variables](/docs/environment-variables#storage)', true)
     ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
-    ->param('compression', 'none', new WhiteList([COMPRESSION_TYPE_NONE, COMPRESSION_TYPE_GZIP, COMPRESSION_TYPE_ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . COMPRESSION_TYPE_NONE . ',  [' . COMPRESSION_TYPE_GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . COMPRESSION_TYPE_ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
+    ->param('compression', COMPRESSION_TYPE_NONE, new WhiteList([COMPRESSION_TYPE_NONE, COMPRESSION_TYPE_GZIP, COMPRESSION_TYPE_ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . COMPRESSION_TYPE_NONE . ',  [' . COMPRESSION_TYPE_GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . COMPRESSION_TYPE_ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
     ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
     ->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
     ->inject('response')
@@ -154,7 +154,7 @@ App::get('/v1/storage/buckets')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_BUCKET_LIST)
-    ->param('queries', [], new Buckets(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Buckets::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Buckets(), '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(', ', Buckets::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -232,12 +232,12 @@ App::put('/v1/storage/buckets/:bucketId')
     ->label('sdk.response.model', Response::MODEL_BUCKET)
     ->param('bucketId', '', new UID(), 'Bucket unique ID.')
     ->param('name', null, new Text(128), 'Bucket name', false)
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of permission strings. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
     ->param('fileSecurity', false, new Boolean(true), 'Enables configuring permissions for individual file. A user needs one of file or bucket level permissions to access a file. [Learn more about permissions](/docs/permissions).', true)
     ->param('enabled', true, new Boolean(true), 'Is bucket enabled?', true)
-    ->param('maximumFileSize', null, new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human((int)App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self hosted version you can change the limit by changing _APP_STORAGE_LIMIT environment variable. [Learn more about storage environment variables](docs/environment-variables#storage)', true)
+    ->param('maximumFileSize', null, new Range(1, (int) App::getEnv('_APP_STORAGE_LIMIT', 0)), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human((int)App::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '. For self hosted version you can change the limit by changing _APP_STORAGE_LIMIT environment variable. [Learn more about storage environment variables](/docs/environment-variables#storage)', true)
     ->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
-    ->param('compression', 'none', new WhiteList([COMPRESSION_TYPE_NONE, COMPRESSION_TYPE_GZIP, COMPRESSION_TYPE_ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . COMPRESSION_TYPE_NONE . ', [' . COMPRESSION_TYPE_GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . COMPRESSION_TYPE_ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
+    ->param('compression', COMPRESSION_TYPE_NONE, new WhiteList([COMPRESSION_TYPE_NONE, COMPRESSION_TYPE_GZIP, COMPRESSION_TYPE_ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . COMPRESSION_TYPE_NONE . ', [' . COMPRESSION_TYPE_GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . COMPRESSION_TYPE_ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
     ->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
     ->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
     ->inject('response')
@@ -346,10 +346,10 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FILE)
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
-    ->param('fileId', '', new CustomId(), 'File ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('file', [], new File(), 'Binary file.', false)
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission strings. By default the current user is granted with all permissions. [Learn more about permissions](/docs/permissions).', true)
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/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.')
+    ->param('file', [], new File(), 'Binary file. Appwrite SDKs provide helpers to handle file input. [Learn about file input](/docs/storage#file-input).', skipValidation: true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission strings. By default, only the current user is granted all permissions. [Learn more about permissions](/docs/permissions).', true)
     ->inject('request')
     ->inject('response')
     ->inject('dbForProject')
@@ -417,7 +417,14 @@ App::post('/v1/storage/buckets/:bucketId/files')
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Maximum bucket file size is larger than _APP_STORAGE_LIMIT');
         }
 
+
         $file = $request->getFiles('file');
+
+        // GraphQL multipart spec adds files with index keys
+        if (empty($file)) {
+            $file = $request->getFiles(0);
+        }
+
         if (empty($file)) {
             throw new Exception(Exception::STORAGE_FILE_EMPTY);
         }
@@ -494,7 +501,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
         }
 
         if ($chunksUploaded === $chunks) {
-            if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled' && $bucket->getAttribute('antivirus', true) && $fileSize <= APP_LIMIT_ANTIVIRUS && App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL) === Storage::DEVICE_LOCAL) {
+            if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled' && $bucket->getAttribute('antivirus', true) && $fileSize <= APP_LIMIT_ANTIVIRUS && strtolower(App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL)) === Storage::DEVICE_LOCAL) {
                 $antivirus = new Network(
                     App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
                     (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310)
@@ -509,14 +516,14 @@ App::post('/v1/storage/buckets/:bucketId/files')
             $mimeType = $deviceFiles->getFileMimeType($path); // Get mime-type before compression and encryption
             $data = '';
             // Compression
-            $algorithm = $bucket->getAttribute('compression', 'none');
-            if ($fileSize <= APP_STORAGE_READ_BUFFER && $algorithm != 'none') {
+            $algorithm = $bucket->getAttribute('compression', COMPRESSION_TYPE_NONE);
+            if ($fileSize <= APP_STORAGE_READ_BUFFER && $algorithm != COMPRESSION_TYPE_NONE) {
                 $data = $deviceFiles->read($path);
                 switch ($algorithm) {
-                    case 'zstd':
+                    case COMPRESSION_TYPE_ZSTD:
                         $compressor = new Zstd();
                         break;
-                    case 'gzip':
+                    case COMPRESSION_TYPE_GZIP:
                     default:
                         $compressor = new GZIP();
                         break;
@@ -542,6 +549,11 @@ App::post('/v1/storage/buckets/:bucketId/files')
             $sizeActual = $deviceFiles->getFileSize($path);
             $fileHash = $deviceFiles->getFileHash($path);
 
+            $openSSLVersion = null;
+            $openSSLCipher = null;
+            $openSSLTag = null;
+            $openSSLIV = null;
+
             if ($bucket->getAttribute('encryption', true) && $fileSize <= APP_STORAGE_READ_BUFFER) {
                 $openSSLVersion = '1';
                 $openSSLCipher = OpenSSL::CIPHER_AES_128_GCM;
@@ -667,8 +679,8 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FILE_LIST)
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
-    ->param('queries', [], new Files(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Files::ALLOWED_ATTRIBUTES), true)
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('queries', [], new Files(), '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(', ', Files::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -744,7 +756,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FILE)
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
     ->inject('dbForProject')
@@ -783,6 +795,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('cache', true)
+    ->label('cache.resourceType', 'bucket/{request.bucketId}')
     ->label('cache.resource', 'file/{request.fileId}')
     ->label('usage.metric', 'files.{scope}.requests.read')
     ->label('usage.params', ['bucketId:{request.bucketId}'])
@@ -793,7 +806,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
     ->label('sdk.methodType', 'location')
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID')
     ->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)
@@ -840,9 +853,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
         $outputs = Config::getParam('storage-outputs');
         $fileLogos = Config::getParam('storage-logos');
 
-        $date = \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT'; // 45 days cache
-        $key = \md5($fileId . $width . $height . $gravity . $quality . $borderWidth . $borderColor . $borderRadius . $opacity . $rotation . $background . $output);
-
         if ($fileSecurity && !$valid) {
             $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
         } else {
@@ -959,7 +969,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', '*/*')
     ->label('sdk.methodType', 'location')
-    ->param('bucketId', null, new UID(), 'Storage bucket ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('bucketId', '', new UID(), 'Storage bucket ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->inject('request')
     ->inject('response')
@@ -1099,7 +1109,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', '*/*')
     ->label('sdk.methodType', 'location')
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
     ->inject('request')
@@ -1256,9 +1266,9 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FILE)
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File unique ID.')
-    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission string. By default the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
+    ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permission string. By default, the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('user')
@@ -1358,7 +1368,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->label('sdk.description', '/docs/references/storage/delete-file.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('bucketId', null, new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
+    ->param('bucketId', '', new UID(), 'Storage bucket unique ID. You can create a new storage bucket using the Storage service [server integration](/docs/server/storage#createBucket).')
     ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
     ->inject('dbForProject')
@@ -1454,8 +1464,8 @@ App::get('/v1/storage/usage')
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
             $periods = [
                 '24h' => [
-                    'period' => '30m',
-                    'limit' => 48,
+                    'period' => '1h',
+                    'limit' => 24,
                 ],
                 '7d' => [
                     'period' => '1d',
@@ -1513,12 +1523,12 @@ App::get('/v1/storage/usage')
                     while ($backfill > 0) {
                         $last = $limit - $backfill - 1; // array index of last added metric
                         $diff = match ($period) { // convert period to seconds for unix timestamp math
-                            '30m' => 1800,
+                            '1h' => 3600,
                             '1d' => 86400,
                         };
                         $stats[$metric][] = [
                             'value' => 0,
-                            'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
                         ];
                         $backfill--;
                     }
@@ -1571,8 +1581,8 @@ App::get('/v1/storage/:bucketId/usage')
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
             $periods = [
                 '24h' => [
-                    'period' => '30m',
-                    'limit' => 48,
+                    'period' => '1h',
+                    'limit' => 24,
                 ],
                 '7d' => [
                     'period' => '1d',
@@ -1624,12 +1634,12 @@ App::get('/v1/storage/:bucketId/usage')
                     while ($backfill > 0) {
                         $last = $limit - $backfill - 1; // array index of last added metric
                         $diff = match ($period) { // convert period to seconds for unix timestamp math
-                            '30m' => 1800,
+                            '1h' => 3600,
                             '1d' => 86400,
                         };
                         $stats[$metric][] = [
                             'value' => 0,
-                            'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
                         ];
                         $backfill--;
                     }

app/controllers/api/teams.php

@@ -1,13 +1,15 @@
 <?php
 
 use Appwrite\Auth\Auth;
+use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
+use Appwrite\Event\Phone as EventPhone;
 use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Network\Validator\Host;
+use Utopia\Validator\Host;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\Utopia\Database\Validator\Queries;
@@ -20,25 +22,23 @@ use Appwrite\Utopia\Response;
 use MaxMind\Db\Reader;
 use Utopia\App;
 use Utopia\Audit\Audit;
-use Utopia\CLI\Console;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Duplicate;
-use Utopia\Database\ID;
-use Utopia\Database\Permission;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Query;
 use Utopia\Database\DateTime;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\UID;
 use Utopia\Locale\Locale;
-use Utopia\Validator\Text;
-use Utopia\Validator\Range;
 use Utopia\Validator\ArrayList;
-use Utopia\Validator\WhiteList;
+use Utopia\Validator\Assoc;
+use Utopia\Validator\Text;
 
 App::post('/v1/teams')
     ->desc('Create Team')
@@ -54,7 +54,7 @@ App::post('/v1/teams')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TEAM)
-    ->param('teamId', '', new CustomId(), 'Team ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('teamId', '', new CustomId(), 'Team 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('name', null, new Text(128), 'Team name. Max length: 128 chars.')
     ->param('roles', ['owner'], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the roles in the team for the user who created it. The default role is **owner**. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', true)
     ->inject('response')
@@ -76,6 +76,7 @@ App::post('/v1/teams')
             ],
             'name' => $name,
             'total' => ($isPrivilegedUser || $isAppUser) ? 0 : 1,
+            'prefs' => new \stdClass(),
             'search' => implode(' ', [$teamId, $name]),
         ])));
 
@@ -133,7 +134,8 @@ App::get('/v1/teams')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TEAM_LIST)
-    ->param('queries', [], new Teams(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Teams::ALLOWED_ATTRIBUTES), true)
+    ->label('sdk.offline.model', '/teams')
+    ->param('queries', [], new Teams(), '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(', ', Teams::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -182,6 +184,8 @@ App::get('/v1/teams/:teamId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TEAM)
+    ->label('sdk.offline.model', '/teams')
+    ->label('sdk.offline.key', '{teamId}')
     ->param('teamId', '', new UID(), 'Team ID.')
     ->inject('response')
     ->inject('dbForProject')
@@ -196,26 +200,22 @@ App::get('/v1/teams/:teamId')
         $response->dynamic($team, Response::MODEL_TEAM);
     });
 
-App::put('/v1/teams/:teamId')
-    ->desc('Update Team')
+App::get('/v1/teams/:teamId/prefs')
+    ->desc('Get Team Preferences')
     ->groups(['api', 'teams'])
-    ->label('event', 'teams.[teamId].update')
-    ->label('scope', 'teams.write')
-    ->label('audits.event', 'team.update')
-    ->label('audits.resource', 'team/{response.$id}')
-    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('scope', 'teams.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'teams')
-    ->label('sdk.method', 'update')
-    ->label('sdk.description', '/docs/references/teams/update-team.md')
+    ->label('sdk.method', 'getPrefs')
+    ->label('sdk.description', '/docs/references/teams/get-team-prefs.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_TEAM)
+    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
+    ->label('sdk.offline.model', '/teams/{teamId}/prefs')
     ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
     ->inject('response')
     ->inject('dbForProject')
-    ->inject('events')
-    ->action(function (string $teamId, string $name, Response $response, Database $dbForProject, Event $events) {
+    ->action(function (string $teamId, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -223,15 +223,90 @@ App::put('/v1/teams/:teamId')
             throw new Exception(Exception::TEAM_NOT_FOUND);
         }
 
-        $team = $dbForProject->updateDocument('teams', $team->getId(), $team
+        $prefs = $team->getAttribute('prefs', []);
+
+        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
+    });
+
+App::put('/v1/teams/:teamId')
+    ->desc('Update Name')
+    ->groups(['api', 'teams'])
+    ->label('event', 'teams.[teamId].update')
+    ->label('scope', 'teams.write')
+    ->label('audits.event', 'team.update')
+    ->label('audits.resource', 'team/{response.$id}')
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'updateName')
+    ->label('sdk.description', '/docs/references/teams/update-team-name.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_TEAM)
+    ->label('sdk.offline.model', '/teams')
+    ->label('sdk.offline.key', '{teamId}')
+    ->param('teamId', '', new UID(), 'Team ID.')
+    ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
+    ->inject('requestTimestamp')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('events')
+    ->action(function (string $teamId, string $name, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $events) {
+
+        $team = $dbForProject->getDocument('teams', $teamId);
+
+        if ($team->isEmpty()) {
+            throw new Exception(Exception::TEAM_NOT_FOUND);
+        }
+
+        $team
             ->setAttribute('name', $name)
-            ->setAttribute('search', implode(' ', [$teamId, $name])));
+            ->setAttribute('search', implode(' ', [$teamId, $name]));
+
+        $team = $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $team) {
+            return $dbForProject->updateDocument('teams', $team->getId(), $team);
+        });
 
         $events->setParam('teamId', $team->getId());
 
         $response->dynamic($team, Response::MODEL_TEAM);
     });
 
+App::put('/v1/teams/:teamId/prefs')
+    ->desc('Update Preferences')
+    ->groups(['api', 'teams'])
+    ->label('event', 'teams.[teamId].update.prefs')
+    ->label('scope', 'teams.write')
+    ->label('audits.event', 'team.update')
+    ->label('audits.resource', 'team/{response.$id}')
+    ->label('audits.userId', '{response.$id}')
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'updatePrefs')
+    ->label('sdk.description', '/docs/references/teams/update-team-prefs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_PREFERENCES)
+    ->label('sdk.offline.model', '/teams/{teamId}/prefs')
+    ->param('teamId', '', new UID(), 'Team ID.')
+    ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('events')
+    ->action(function (string $teamId, array $prefs, Response $response, Database $dbForProject, Event $events) {
+
+        $team = $dbForProject->getDocument('teams', $teamId);
+
+        if ($team->isEmpty()) {
+            throw new Exception(Exception::TEAM_NOT_FOUND);
+        }
+
+        $team = $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('prefs', $prefs));
+
+        $events->setParam('teamId', $team->getId());
+
+        $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
+    });
+
 App::delete('/v1/teams/:teamId')
     ->desc('Delete Team')
     ->groups(['api', 'teams'])
@@ -304,7 +379,9 @@ App::post('/v1/teams/:teamId/memberships')
     ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
     ->label('abuse-limit', 10)
     ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('email', '', new Email(), 'Email of the new team member.')
+    ->param('email', '', new Email(), 'Email of the new team member.', true)
+    ->param('userId', '', new UID(), 'ID of the user to be added to a team.', true)
+    ->param('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
     ->param('roles', [], 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](/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
     ->param('url', '', fn($clients) => new Host($clients), 'URL to redirect the user back to your app from the invitation 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 our own built-in confirm page
     ->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
@@ -314,9 +391,13 @@ App::post('/v1/teams/:teamId/memberships')
     ->inject('dbForProject')
     ->inject('locale')
     ->inject('mails')
+    ->inject('messaging')
     ->inject('events')
-    ->action(function (string $teamId, string $email, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $mails, Event $events) {
+    ->action(function (string $teamId, string $email, string $userId, string $phone, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Mail $mails, EventPhone $messaging, Event $events) {
 
+        if (empty($userId) && empty($email) && empty($phone)) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'At least one of userId, email, or phone is required');
+        }
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
         $isAppUser = Auth::isAppUser(Authorization::getRoles());
 
@@ -331,8 +412,31 @@ App::post('/v1/teams/:teamId/memberships')
         if ($team->isEmpty()) {
             throw new Exception(Exception::TEAM_NOT_FOUND);
         }
-
-        $invitee = $dbForProject->findOne('users', [Query::equal('email', [$email])]); // Get user by email address
+        if (!empty($userId)) {
+            $invitee = $dbForProject->getDocument('users', $userId);
+            if ($invitee->isEmpty()) {
+                throw new Exception(Exception::USER_NOT_FOUND, 'User with given userId doesn\'t exist.', 404);
+            }
+            if (!empty($email) && $invitee->getAttribute('email', '') !== $email) {
+                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given userId and email doesn\'t match', 409);
+            }
+            if (!empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
+                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given userId and phone doesn\'t match', 409);
+            }
+            $email = $invitee->getAttribute('email', '');
+            $phone = $invitee->getAttribute('phone', '');
+            $name = empty($name) ? $invitee->getAttribute('name', '') : $name;
+        } elseif (!empty($email)) {
+            $invitee = $dbForProject->findOne('users', [Query::equal('email', [$email])]); // Get user by email address
+            if (!empty($invitee) && !empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
+                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given email and phone doesn\'t match', 409);
+            }
+        } elseif (!empty($phone)) {
+            $invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
+            if (!empty($invitee) && !empty($email) && $invitee->getAttribute('email', '') !== $email) {
+                throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
+            }
+        }
 
         if (empty($invitee)) { // Create new user if no user with same email found
             $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -355,7 +459,8 @@ App::post('/v1/teams/:teamId/memberships')
                         Permission::update(Role::user($userId)),
                         Permission::delete(Role::user($userId)),
                     ],
-                    'email' => $email,
+                    'email' => empty($email) ? null : $email,
+                    'phone' => empty($phone) ? null : $phone,
                     'emailVerification' => false,
                     'status' => true,
                     'password' => Auth::passwordHash(Auth::passwordGenerator(), Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS),
@@ -427,23 +532,50 @@ App::post('/v1/teams/:teamId/memberships')
             } catch (Duplicate $th) {
                 throw new Exception(Exception::TEAM_INVITE_ALREADY_EXISTS);
             }
-        }
 
-        $url = Template::parseURL($url);
-        $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
-        $url = Template::unParseURL($url);
+            $url = Template::parseURL($url);
+            $url['query'] = Template::mergeQuery(((isset($url['query'])) ? $url['query'] : ''), ['membershipId' => $membership->getId(), 'userId' => $invitee->getId(), 'secret' => $secret, 'teamId' => $teamId]);
+            $url = Template::unParseURL($url);
+            if (!empty($email)) {
+                $projectName = $project->isEmpty() ? 'Console' : $project->getAttribute('name', '[APP-NAME]');
 
-        if (!$isPrivilegedUser && !$isAppUser) { // No need of confirmation when in admin or app mode
-            $mails
-                ->setType(MAIL_TYPE_INVITATION)
-                ->setRecipient($email)
-                ->setUrl($url)
-                ->setName($name)
-                ->setLocale($locale->default)
-                ->setTeam($team)
-                ->setUser($user)
-                ->trigger()
-            ;
+                $from = $project->isEmpty() || $project->getId() === 'console' ? '' : \sprintf($locale->getText('emails.sender'), $projectName);
+                $body = Template::fromFile(__DIR__ . '/../../config/locale/templates/email-base.tpl');
+                $subject = \sprintf($locale->getText("emails.invitation.subject"), $team->getAttribute('name'), $projectName);
+                $body->setParam('{{owner}}', $user->getAttribute('name'));
+                $body->setParam('{{team}}', $team->getAttribute('name'));
+
+                $body
+                    ->setParam('{{subject}}', $subject)
+                    ->setParam('{{hello}}', $locale->getText("emails.invitation.hello"))
+                    ->setParam('{{name}}', $user->getAttribute('name'))
+                    ->setParam('{{body}}', $locale->getText("emails.invitation.body"))
+                    ->setParam('{{redirect}}', $url)
+                    ->setParam('{{footer}}', $locale->getText("emails.invitation.footer"))
+                    ->setParam('{{thanks}}', $locale->getText("emails.invitation.thanks"))
+                    ->setParam('{{signature}}', $locale->getText("emails.invitation.signature"))
+                    ->setParam('{{project}}', $projectName)
+                    ->setParam('{{direction}}', $locale->getText('settings.direction'))
+                    ->setParam('{{bg-body}}', '#f7f7f7')
+                    ->setParam('{{bg-content}}', '#ffffff')
+                    ->setParam('{{text-content}}', '#000000');
+
+                $body = $body->render();
+
+                $mails
+                    ->setSubject($subject)
+                    ->setBody($body)
+                    ->setFrom($from)
+                    ->setRecipient($invitee->getAttribute('email'))
+                    ->setName($invitee->getAttribute('name'))
+                    ->trigger()
+                ;
+            } elseif (!empty($phone)) {
+                $messaging
+                    ->setRecipient($phone)
+                    ->setMessage($url)
+                    ->trigger();
+            }
         }
 
         $events
@@ -473,8 +605,9 @@ App::get('/v1/teams/:teamId/memberships')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
+    ->label('sdk.offline.model', '/teams/{teamId}/memberships')
     ->param('teamId', '', new UID(), 'Team 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/databases#querying-documents). 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('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')
@@ -553,7 +686,9 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     ->label('sdk.description', '/docs/references/teams/get-team-member.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP_LIST)
+    ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
+    ->label('sdk.offline.model', '/teams/{teamId}/memberships')
+    ->label('sdk.offline.key', '{membershipId}')
     ->param('teamId', '', new UID(), 'Team ID.')
     ->param('membershipId', '', new UID(), 'Membership ID.')
     ->inject('response')
@@ -677,9 +812,10 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->inject('response')
     ->inject('user')
     ->inject('dbForProject')
+    ->inject('project')
     ->inject('geodb')
     ->inject('events')
-    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Reader $geodb, Event $events) {
+    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Document $project, Reader $geodb, Event $events) {
         $protocol = $request->getProtocol();
 
         $membership = $dbForProject->getDocument('memberships', $membershipId);
@@ -723,7 +859,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
             ->setAttribute('confirm', true)
         ;
 
-        $user->setAttribute('emailVerification', true);
+        $user = Authorization::skip(fn() => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));
 
         // Log user in
 
@@ -731,7 +867,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
 
         $detector = new Detector($request->getUserAgent('UNKNOWN'));
         $record = $geodb->get($request->getIP());
-        $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_LOGIN_LONG);
+        $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
+        $expire = DateTime::addSeconds(new \DateTime(), $authDuration);
         $secret = Auth::tokenGenerator();
         $session = new Document(array_merge([
             '$id' => ID::unique(),
@@ -740,7 +877,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
             'provider' => Auth::SESSION_PROVIDER_EMAIL,
             'providerUid' => $user->getAttribute('email'),
             'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
-            'expire' => $expire,
             'userAgent' => $request->getUserAgent('UNKNOWN'),
             'ip' => $request->getIP(),
             'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
@@ -865,8 +1001,8 @@ App::get('/v1/teams/:teamId/logs')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
-    ->param('teamId', null, new UID(), 'Team ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
+    ->param('teamId', '', new UID(), 'Team ID.')
+    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('locale')

app/controllers/api/users.php

@@ -16,9 +16,9 @@ use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
-use Utopia\Database\ID;
-use Utopia\Database\Permission;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
 use Utopia\Locale\Locale;
 use Appwrite\Extend\Exception;
 use Utopia\Database\Document;
@@ -34,11 +34,14 @@ use Utopia\Validator\Text;
 use Utopia\Validator\Boolean;
 use MaxMind\Db\Reader;
 use Utopia\Validator\Integer;
+use Appwrite\Auth\Validator\PasswordHistory;
+use Appwrite\Auth\Validator\PasswordDictionary;
 
 /** TODO: Remove function when we move to using utopia/platform */
-function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Database $dbForProject, Event $events): Document
+function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Event $events): Document
 {
     $hashOptionsObject = (\is_string($hashOptions)) ? \json_decode($hashOptions, true) : $hashOptions; // Cast to JSON array
+    $passwordHistory = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
 
     if (!empty($email)) {
         $email = \strtolower($email);
@@ -49,6 +52,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
             ? ID::unique()
             : ID::custom($userId);
 
+        $password = (!empty($password)) ? ($hash === 'plaintext' ? Auth::passwordHash($password, $hash, $hashOptionsObject) : $password) : null;
         $user = $dbForProject->createDocument('users', new Document([
             '$id' => $userId,
             '$permissions' => [
@@ -61,10 +65,11 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
             'phone' => $phone,
             'phoneVerification' => false,
             'status' => true,
-            'password' => (!empty($password)) ? ($hash === 'plaintext' ? Auth::passwordHash($password, $hash, $hashOptionsObject) : $password) : null,
-            'hash' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO : $hash,
-            'hashOptions' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO_OPTIONS : $hashOptions,
+            'password' => $password,
+            'passwordHistory' => is_null($password) && $passwordHistory === 0 ? [] : [$password],
             'passwordUpdate' => (!empty($password)) ? DateTime::now() : null,
+            'hash' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO : $hash,
+            'hashOptions' => $hash === 'plaintext' ? Auth::DEFAULT_ALGO_OPTIONS : $hashOptionsObject + ['type' => $hash],
             'registration' => DateTime::now(),
             'reset' => false,
             'name' => $name,
@@ -98,16 +103,18 @@ App::post('/v1/users')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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', null, new Email(), 'User email.', true)
     ->param('phone', null, new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
-    ->param('password', null, new Password(), 'Plain text user password. Must be at least 8 chars.', true)
+    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'Plain text user password. Must be at least 8 chars.', true, ['project', 'passwordsDictionary'])
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Database $dbForProject, Event $events) {
-        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $dbForProject, $events);
+    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+
+        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -129,15 +136,16 @@ App::post('/v1/users/bcrypt')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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('password', '', new Password(), 'User password hashed using Bcrypt.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
-        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -159,15 +167,16 @@ App::post('/v1/users/md5')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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('password', '', new Password(), 'User password hashed using MD5.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
-        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -189,15 +198,16 @@ App::post('/v1/users/argon2')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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('password', '', new Password(), 'User password hashed using Argon2.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
-        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -219,22 +229,23 @@ App::post('/v1/users/sha')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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('password', '', new Password(), 'User password hashed using SHA.')
     ->param('passwordVersion', '', new WhiteList(['sha1', 'sha224', 'sha256', 'sha384', 'sha512/224', 'sha512/256', 'sha512', 'sha3-224', 'sha3-256', 'sha3-384', 'sha3-512']), "Optional SHA version used to hash password. Allowed values are: 'sha1', 'sha224', 'sha256', 'sha384', 'sha512/224', 'sha512/256', 'sha512', 'sha3-224', 'sha3-256', 'sha3-384', 'sha3-512'", true)
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Database $dbForProject, Event $events) {
+    ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
         $options = '{}';
 
         if (!empty($passwordVersion)) {
             $options = '{"version":"' . $passwordVersion . '"}';
         }
 
-        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $dbForProject, $events);
+        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -256,15 +267,16 @@ App::post('/v1/users/phpass')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('userId', '', new CustomId(), 'User ID. Choose a custom ID or pass the string `ID.unique()`to auto generate it. 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('password', '', new Password(), 'User password hashed using PHPass.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
-        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -286,19 +298,20 @@ App::post('/v1/users/scrypt')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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('password', '', new Password(), 'User password hashed using Scrypt.')
     ->param('passwordSalt', '', new Text(128), 'Optional salt used to hash password.')
-    ->param('passwordCpu', '', new Integer(), 'Optional CPU cost used to hash password.')
-    ->param('passwordMemory', '', new Integer(), 'Optional memory cost used to hash password.')
-    ->param('passwordParallel', '', new Integer(), 'Optional parallelization cost used to hash password.')
-    ->param('passwordLength', '', new Integer(), 'Optional hash length used to hash password.')
+    ->param('passwordCpu', 8, new Integer(), 'Optional CPU cost used to hash password.')
+    ->param('passwordMemory', 14, new Integer(), 'Optional memory cost used to hash password.')
+    ->param('passwordParallel', 1, new Integer(), 'Optional parallelization cost used to hash password.')
+    ->param('passwordLength', 64, new Integer(), 'Optional hash length used to hash password.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Database $dbForProject, Event $events) {
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
         $options = [
             'salt' => $passwordSalt,
             'costCpu' => $passwordCpu,
@@ -307,7 +320,7 @@ App::post('/v1/users/scrypt')
             'length' => $passwordLength
         ];
 
-        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $dbForProject, $events);
+        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -329,7 +342,7 @@ App::post('/v1/users/scrypt-modified')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new CustomId(), 'User ID. Choose your own unique ID or pass the string "unique()" to auto generate it. 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('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('password', '', new Password(), 'User password hashed using Scrypt Modified.')
     ->param('passwordSalt', '', new Text(128), 'Salt used to hash password.')
@@ -337,10 +350,11 @@ App::post('/v1/users/scrypt-modified')
     ->param('passwordSignerKey', '', new Text(128), 'Signer key used to hash password.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Database $dbForProject, Event $events) {
-        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $dbForProject, $events);
+    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Event $events) {
+        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $project, $dbForProject, $events);
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -359,7 +373,7 @@ App::get('/v1/users')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER_LIST)
-    ->param('queries', [], new Users(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Users::ALLOWED_ATTRIBUTES), true)
+    ->param('queries', [], new Users(), '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(', ', Users::ALLOWED_ATTRIBUTES), true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForProject')
@@ -414,7 +428,7 @@ App::get('/v1/users/:userId')
         $user = $dbForProject->getDocument('users', $userId);
 
         if ($user->isEmpty()) {
-            throw new Exception('User not found', 404, Exception::USER_NOT_FOUND);
+            throw new Exception(Exception::USER_NOT_FOUND);
         }
 
         $response->dynamic($user, Response::MODEL_USER);
@@ -443,7 +457,7 @@ App::get('/v1/users/:userId/prefs')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
-        $prefs = $user->getAttribute('prefs', new \stdClass());
+        $prefs = $user->getAttribute('prefs', []);
 
         $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
     });
@@ -543,7 +557,7 @@ App::get('/v1/users/:userId/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LOG_LIST)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
+    ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Only supported methods are limit and offset', true)
     ->inject('response')
     ->inject('dbForProject')
     ->inject('locale')
@@ -779,11 +793,12 @@ App::patch('/v1/users/:userId/password')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('password', '', new Password(), 'New user password. Must be at least 8 chars.')
+    ->param('password', '', fn ($project, $passwordsDictionary) => new PasswordDictionary($passwordsDictionary, $project->getAttribute('auths', [])['passwordDictionary'] ?? false), 'New user password. Must be at least 8 chars.', false, ['project', 'passwordsDictionary'])
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function (string $userId, string $password, Response $response, Database $dbForProject, Event $events) {
+    ->action(function (string $userId, string $password, Response $response, Document $project, Database $dbForProject, Event $events) {
 
         $user = $dbForProject->getDocument('users', $userId);
 
@@ -791,11 +806,27 @@ App::patch('/v1/users/:userId/password')
             throw new Exception(Exception::USER_NOT_FOUND);
         }
 
+        $newPassword = Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS);
+
+        $historyLimit = $project->getAttribute('auths', [])['passwordHistory'] ?? 0;
+        $history = [];
+        if ($historyLimit > 0) {
+            $history = $user->getAttribute('passwordHistory', []);
+            $validator = new PasswordHistory($history, $user->getAttribute('hash'), $user->getAttribute('hashOptions'));
+            if (!$validator->isValid($password)) {
+                throw new Exception(Exception::USER_PASSWORD_RECENTLY_USED, 'The password was recently used', 409);
+            }
+
+            $history[] = $newPassword;
+            array_slice($history, (count($history) - $historyLimit), $historyLimit);
+        }
+
         $user
-            ->setAttribute('password', Auth::passwordHash($password, Auth::DEFAULT_ALGO, Auth::DEFAULT_ALGO_OPTIONS))
+            ->setAttribute('password', $newPassword)
+            ->setAttribute('passwordHistory', $history)
+            ->setAttribute('passwordUpdate', DateTime::now())
             ->setAttribute('hash', Auth::DEFAULT_ALGO)
-            ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS)
-            ->setAttribute('passwordUpdate', DateTime::now());
+            ->setAttribute('hashOptions', Auth::DEFAULT_ALGO_OPTIONS);
 
         $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
@@ -888,7 +919,7 @@ App::patch('/v1/users/:userId/phone')
         try {
             $user = $dbForProject->updateDocument('users', $user->getId(), $user);
         } catch (Duplicate $th) {
-            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
+            throw new Exception(Exception::USER_PHONE_ALREADY_EXISTS);
         }
 
         $events->setParam('userId', $user->getId());
@@ -981,7 +1012,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('userId', '', new UID(), 'User ID.')
-    ->param('sessionId', null, new UID(), 'Session ID.')
+    ->param('sessionId', '', new UID(), 'Session ID.')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('events')
@@ -1004,7 +1035,8 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
 
         $events
             ->setParam('userId', $user->getId())
-            ->setParam('sessionId', $sessionId);
+            ->setParam('sessionId', $sessionId)
+            ->setPayload($response->output($session, Response::MODEL_SESSION));
 
         $response->noContent();
     });
@@ -1116,8 +1148,8 @@ App::get('/v1/users/usage')
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
             $periods = [
                 '24h' => [
-                    'period' => '30m',
-                    'limit' => 48,
+                    'period' => '1h',
+                    'limit' => 24,
                 ],
                 '7d' => [
                     'period' => '1d',
@@ -1171,12 +1203,12 @@ App::get('/v1/users/usage')
                     while ($backfill > 0) {
                         $last = $limit - $backfill - 1; // array index of last added metric
                         $diff = match ($period) { // convert period to seconds for unix timestamp math
-                            '30m' => 1800,
+                            '1h' => 3600,
                             '1d' => 86400,
                         };
                         $stats[$metric][] = [
                             'value' => 0,
-                            'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+                            'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
                         ];
                         $backfill--;
                     }

app/controllers/general.php

@@ -3,7 +3,7 @@
 require_once __DIR__ . '/../init.php';
 
 use Utopia\App;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\Role;
 use Utopia\Locale\Locale;
 use Utopia\Logger\Logger;
 use Utopia\Logger\Log;
@@ -223,7 +223,9 @@ App::init()
 
                 return $response->redirect('https://' . $request->getHostname() . $request->getURI());
             }
+        }
 
+        if ($request->getProtocol() === 'https') {
             $response->addHeader('Strict-Transport-Security', 'max-age=' . (60 * 60 * 24 * 126)); // 126 days
         }
 
@@ -231,7 +233,7 @@ App::init()
             ->addHeader('Server', 'Appwrite')
             ->addHeader('X-Content-Type-Options', 'nosniff')
             ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma')
             ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
             ->addHeader('Access-Control-Allow-Origin', $refDomain)
             ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -382,7 +384,7 @@ App::options()
         $response
             ->addHeader('Server', 'Appwrite')
             ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-Appwrite-ID, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
+            ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, X-SDK-Name, X-SDK-Language, X-SDK-Platform, X-SDK-GraphQL, X-Appwrite-ID, X-Appwrite-Timestamp, Content-Range, Range, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
             ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
             ->addHeader('Access-Control-Allow-Origin', $origin)
             ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -394,20 +396,14 @@ App::error()
     ->inject('utopia')
     ->inject('request')
     ->inject('response')
-    ->inject('layout')
     ->inject('project')
     ->inject('logger')
     ->inject('loggerBreadcrumbs')
-    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, View $layout, Document $project, ?Logger $logger, array $loggerBreadcrumbs) {
+    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, Document $project, ?Logger $logger, array $loggerBreadcrumbs) {
 
         $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
         $route = $utopia->match($request);
 
-        /** Delegate PDO exceptions to the global handler so the database connection can be returned to the pool */
-        if ($error instanceof PDOException) {
-            throw $error;
-        }
-
         if ($logger) {
             if ($error->getCode() >= 500 || $error->getCode() === 0) {
                 try {
@@ -489,6 +485,10 @@ App::error()
                     $error->setType(AppwriteException::GENERAL_ROUTE_NOT_FOUND);
                     break;
             }
+        } elseif ($error instanceof Utopia\Database\Exception\Conflict) {
+            $error = new AppwriteException(AppwriteException::DOCUMENT_UPDATE_CONFLICT, null, null, $error);
+            $code = $error->getCode();
+            $message = $error->getMessage();
         }
 
         /** Wrap all exceptions inside Appwrite\Extend\Exception */
@@ -543,9 +543,10 @@ App::error()
         $template = ($route) ? $route->getLabel('error', null) : null;
 
         if ($template) {
-            $comp = new View($template);
+            $layout = new View($template);
 
-            $comp
+            $layout
+                ->setParam('title', $project->getAttribute('name') . ' - Error')
                 ->setParam('development', App::isDevelopment())
                 ->setParam('projectName', $project->getAttribute('name'))
                 ->setParam('projectURL', $project->getAttribute('url'))
@@ -554,14 +555,6 @@ App::error()
                 ->setParam('trace', $trace)
             ;
 
-            $layout
-                ->setParam('title', $project->getAttribute('name') . ' - Error')
-                ->setParam('description', 'No Description')
-                ->setParam('body', $comp)
-                ->setParam('version', $version)
-                ->setParam('litespeed', false)
-            ;
-
             $response->html($layout->render());
         }
 
@@ -571,32 +564,6 @@ App::error()
         );
     });
 
-App::get('/manifest.json')
-    ->desc('Progressive app manifest file')
-    ->label('scope', 'public')
-    ->label('docs', false)
-    ->inject('response')
-    ->action(function (Response $response) {
-
-        $response->json([
-            'name' => APP_NAME,
-            'short_name' => APP_NAME,
-            'start_url' => '.',
-            'url' => 'https://appwrite.io/',
-            'display' => 'standalone',
-            'background_color' => '#fff',
-            'theme_color' => '#f02e65',
-            'description' => 'End to end backend server for frontend and mobile apps. 👩‍💻👨‍💻',
-            'icons' => [
-                [
-                    'src' => 'images/favicon.png',
-                    'sizes' => '256x256',
-                    'type' => 'image/png',
-                ],
-            ],
-        ]);
-    });
-
 App::get('/robots.txt')
     ->desc('Robots.txt File')
     ->label('scope', 'public')
@@ -627,7 +594,7 @@ App::get('/.well-known/acme-challenge')
         $uriChunks = \explode('/', $request->getURI());
         $token = $uriChunks[\count($uriChunks) - 1];
 
-        $validator = new Text(100, [
+        $validator = new Text(100, allowList: [
             ...Text::NUMBERS,
             ...Text::ALPHABET_LOWER,
             ...Text::ALPHABET_UPPER,
@@ -668,7 +635,6 @@ App::get('/.well-known/acme-challenge')
     });
 
 include_once __DIR__ . '/shared/api.php';
-include_once __DIR__ . '/shared/web.php';
 
 foreach (Config::getParam('services', []) as $service) {
     include_once $service['controller'];

app/controllers/mock.php

@@ -4,7 +4,7 @@ global $utopia, $request, $response;
 
 use Appwrite\Extend\Exception;
 use Utopia\Database\Document;
-use Appwrite\Network\Validator\Host;
+use Utopia\Validator\Host;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Response\Model;
@@ -14,7 +14,8 @@ use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
 use Utopia\Storage\Validator\File;
 use Utopia\Validator\WhiteList;
-use Utopia\Database\ID;
+use Utopia\Database\Helpers\ID;
+use Utopia\Validator\Nullable;
 
 App::get('/v1/mock/tests/foo')
     ->desc('Get Foo')
@@ -135,6 +136,8 @@ App::post('/v1/mock/tests/bar')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MOCK)
+    ->label('sdk.offline.model', '/mock/tests/bar')
+    ->label('sdk.offline.key', '{required}')
     ->label('sdk.mock', true)
     ->param('required', '', new Text(100), 'Sample string param')
     ->param('default', '', new Integer(true), 'Sample numeric param')
@@ -265,7 +268,7 @@ App::post('/v1/mock/tests/general/upload')
     ->param('x', '', new Text(100), 'Sample string param')
     ->param('y', '', new Integer(true), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Sample array param')
-    ->param('file', [], new File(), 'Sample file param', false)
+    ->param('file', [], new File(), 'Sample file param', skipValidation: true)
     ->inject('request')
     ->inject('response')
     ->action(function (string $x, int $y, array $z, mixed $file, Request $request, Response $response) {
@@ -426,6 +429,21 @@ App::get('/v1/mock/tests/general/empty')
         $response->noContent();
     });
 
+App::post('/v1/mock/tests/general/nullable')
+    ->desc('Nullable Test')
+    ->groups(['mock'])
+    ->label('scope', 'public')
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'general')
+    ->label('sdk.method', 'nullable')
+    ->label('sdk.description', 'Mock a nullable parameter.')
+    ->label('sdk.mock', true)
+    ->param('required', '', new Text(100), 'Sample string param')
+    ->param('nullable', '', new Nullable(new Text(100)), 'Sample string param')
+    ->param('optional', '', new Text(100), 'Sample string param', true)
+    ->action(function (string $required, string $nullable, ?string $optional) {
+    });
+
 /** Endpoint to test if required headers are sent from the SDK */
 App::get('/v1/mock/tests/general/headers')
     ->desc('Get headers')

app/controllers/shared/api.php

@@ -5,13 +5,12 @@ use Appwrite\Event\Audit;
 use Appwrite\Event\Database as EventDatabase;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\Mail;
+use Appwrite\Extend\Exception;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Usage\Stats;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Request;
 use Utopia\App;
-use Appwrite\Extend\Exception;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\Cache\Adapter\Filesystem;
@@ -47,6 +46,47 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
     return $label;
 };
 
+$databaseListener = function (string $event, Document $document, Stats $usage) {
+    $multiplier = 1;
+    if ($event === Database::EVENT_DOCUMENT_DELETE) {
+        $multiplier = -1;
+    }
+
+    $collection = $document->getCollection();
+    switch ($collection) {
+        case 'users':
+            $usage->setParam('users.{scope}.count.total', 1 * $multiplier);
+            break;
+        case 'databases':
+            $usage->setParam('databases.{scope}.count.total', 1 * $multiplier);
+            break;
+        case 'buckets':
+            $usage->setParam('buckets.{scope}.count.total', 1 * $multiplier);
+            break;
+        case 'deployments':
+            $usage->setParam('deployments.{scope}.storage.size', $document->getAttribute('size') * $multiplier);
+            break;
+        default:
+            if (strpos($collection, 'bucket_') === 0) {
+                $usage
+                    ->setParam('bucketId', $document->getAttribute('bucketId'))
+                    ->setParam('files.{scope}.storage.size', $document->getAttribute('sizeOriginal') * $multiplier)
+                    ->setParam('files.{scope}.count.total', 1 * $multiplier);
+            } elseif (strpos($collection, 'database_') === 0) {
+                $usage
+                    ->setParam('databaseId', $document->getAttribute('databaseId'));
+                if (strpos($collection, '_collection_') !== false) {
+                    $usage
+                        ->setParam('collectionId', $document->getAttribute('$collectionId'))
+                        ->setParam('documents.{scope}.count.total', 1 * $multiplier);
+                } else {
+                    $usage->setParam('collections.{scope}.count.total', 1 * $multiplier);
+                }
+            }
+            break;
+    }
+};
+
 App::init()
     ->groups(['api'])
     ->inject('utopia')
@@ -56,13 +96,12 @@ App::init()
     ->inject('user')
     ->inject('events')
     ->inject('audits')
-    ->inject('mails')
     ->inject('usage')
     ->inject('deletes')
     ->inject('database')
     ->inject('dbForProject')
     ->inject('mode')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Mail $mails, Stats $usage, Delete $deletes, EventDatabase $database, Database $dbForProject, string $mode) {
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, Database $dbForProject, string $mode) use ($databaseListener) {
 
         $route = $utopia->match($request);
 
@@ -136,10 +175,6 @@ App::init()
             ->setProject($project)
             ->setUser($user);
 
-        $mails
-            ->setProject($project)
-            ->setUser($user);
-
         $audits
             ->setMode($mode)
             ->setUserAgent($request->getUserAgent(''))
@@ -149,6 +184,7 @@ App::init()
             ->setUser($user);
 
         $usage
+            ->setParam('projectInternalId', $project->getInternalId())
             ->setParam('projectId', $project->getId())
             ->setParam('project.{scope}.network.requests', 1)
             ->setParam('httpMethod', $request->getMethod())
@@ -158,22 +194,59 @@ App::init()
         $deletes->setProject($project);
         $database->setProject($project);
 
+        $dbForProject->on(Database::EVENT_DOCUMENT_CREATE, fn ($event, Document $document) => $databaseListener($event, $document, $usage));
+
+        $dbForProject->on(Database::EVENT_DOCUMENT_DELETE, fn ($event, Document $document) => $databaseListener($event, $document, $usage));
+
         $useCache = $route->getLabel('cache', false);
 
         if ($useCache) {
-            $key = md5($request->getURI() . implode('*', $request->getParams()));
+            $key = md5($request->getURI() . implode('*', $request->getParams())) . '*' . APP_CACHE_BUSTER;
             $cache = new Cache(
                 new Filesystem(APP_STORAGE_CACHE . DIRECTORY_SEPARATOR . 'app-' . $project->getId())
             );
             $timestamp = 60 * 60 * 24 * 30;
             $data = $cache->load($key, $timestamp);
+
             if (!empty($data)) {
                 $data = json_decode($data, true);
+                $parts = explode('/', $data['resourceType']);
+                $type = $parts[0] ?? null;
+
+                if ($type === 'bucket') {
+                    $bucketId = $parts[1] ?? null;
+
+                    $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+
+                    if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && $mode !== APP_MODE_ADMIN)) {
+                        throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
+                    }
+
+                    $fileSecurity = $bucket->getAttribute('fileSecurity', false);
+                    $validator = new Authorization(Database::PERMISSION_READ);
+                    $valid = $validator->isValid($bucket->getRead());
+                    if (!$fileSecurity && !$valid) {
+                        throw new Exception(Exception::USER_UNAUTHORIZED);
+                    }
+
+                    $parts = explode('/', $data['resource']);
+                    $fileId = $parts[1] ?? null;
+
+                    if ($fileSecurity && !$valid) {
+                        $file = $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId);
+                    } else {
+                        $file = Authorization::skip(fn() => $dbForProject->getDocument('bucket_' . $bucket->getInternalId(), $fileId));
+                    }
+
+                    if ($file->isEmpty()) {
+                        throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
+                    }
+                }
 
                 $response
                     ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $timestamp) . ' GMT')
                     ->addHeader('X-Appwrite-Cache', 'hit')
-                    ->setContentType($data['content-type'])
+                    ->setContentType($data['contentType'])
                     ->send(base64_decode($data['payload']))
                 ;
 
@@ -238,6 +311,45 @@ App::init()
         }
     });
 
+/**
+ * Limit user session
+ *
+ * Delete older sessions if the number of sessions have crossed
+ * the session limit set for the project
+ */
+App::shutdown()
+    ->groups(['session'])
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('response')
+    ->inject('project')
+    ->inject('dbForProject')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Database $dbForProject) {
+        $sessionLimit = $project->getAttribute('auths', [])['maxSessions'] ?? APP_LIMIT_USER_SESSIONS_DEFAULT;
+        $session = $response->getPayload();
+        $userId = $session['userId'] ?? '';
+        if (empty($userId)) {
+            return;
+        }
+
+        $user = $dbForProject->getDocument('users', $userId);
+        if ($user->isEmpty()) {
+            return;
+        }
+
+        $sessions = $user->getAttribute('sessions', []);
+        $count = \count($sessions);
+        if ($count <= $sessionLimit) {
+            return;
+        }
+
+        for ($i = 0; $i < ($count - $sessionLimit); $i++) {
+            $session = array_shift($sessions);
+            $dbForProject->deleteDocument('sessions', $session->getId());
+        }
+        $dbForProject->deleteCachedDocument('users', $userId);
+    });
+
 App::shutdown()
     ->groups(['api'])
     ->inject('utopia')
@@ -361,7 +473,7 @@ App::shutdown()
          */
         $useCache = $route->getLabel('cache', false);
         if ($useCache) {
-            $resource = null;
+            $resource = $resourceType = null;
             $data = $response->getPayload();
 
             if (!empty($data['payload'])) {
@@ -370,9 +482,16 @@ App::shutdown()
                     $resource = $parseLabel($pattern, $responsePayload, $requestParams, $user);
                 }
 
-                $key = md5($request->getURI() . implode('*', $request->getParams()));
+                $pattern = $route->getLabel('cache.resourceType', null);
+                if (!empty($pattern)) {
+                    $resourceType = $parseLabel($pattern, $responsePayload, $requestParams, $user);
+                }
+
+                $key = md5($request->getURI() . implode('*', $request->getParams())) . '*' . APP_CACHE_BUSTER;
                 $data = json_encode([
-                'content-type' => $response->getContentType(),
+                'resourceType' => $resourceType,
+                'resource' => $resource,
+                'contentType' => $response->getContentType(),
                 'payload' => base64_encode($data['payload']),
                 ]) ;
 
@@ -404,7 +523,6 @@ App::shutdown()
         if (
             App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled'
             && $project->getId()
-            && $mode !== APP_MODE_ADMIN // TODO: add check to make sure user is admin
             && !empty($route->getLabel('sdk.namespace', null))
         ) { // Don't calculate console usage on admin mode
             $metric = $route->getLabel('usage.metric', '');

app/controllers/shared/web.php

@@ -1,64 +0,0 @@
-<?php
-
-use Utopia\App;
-use Utopia\Config\Config;
-use Appwrite\Utopia\Response;
-use Appwrite\Utopia\Request;
-use Appwrite\Utopia\View;
-
-App::init()
-    ->groups(['web'])
-    ->inject('utopia')
-    ->inject('request')
-    ->inject('response')
-    ->inject('layout')
-    ->action(function (App $utopia, Request $request, Response $response, View $layout) {
-        /* AJAX check  */
-        if (!empty($request->getQuery('version', ''))) {
-            $layout->setPath(__DIR__ . '/../../views/layouts/empty.phtml');
-        }
-
-        $port = $request->getPort();
-        $protocol = $request->getProtocol();
-        $domain = $request->getHostname();
-
-        $layout
-            ->setParam('title', APP_NAME)
-            ->setParam('protocol', $protocol)
-            ->setParam('domain', $domain)
-            ->setParam('endpoint', $protocol . '://' . $domain . ($port != 80 && $port != 443 ? ':' . $port : ''))
-            ->setParam('home', App::getEnv('_APP_HOME'))
-            ->setParam('setup', App::getEnv('_APP_SETUP'))
-            ->setParam('class', 'unknown')
-            ->setParam('icon', '/images/favicon.png')
-            ->setParam('roles', [
-                ['type' => 'owner', 'label' => 'Owner'],
-                ['type' => 'developer', 'label' => 'Developer'],
-                ['type' => 'admin', 'label' => 'Admin'],
-            ])
-            ->setParam('runtimes', Config::getParam('runtimes'))
-            ->setParam('mode', App::getMode())
-        ;
-
-        $time = (60 * 60 * 24 * 45); // 45 days cache
-
-        $response
-            ->addHeader('Cache-Control', 'public, max-age=' . $time)
-            ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time) . ' GMT') // 45 days cache
-            ->addHeader('X-Frame-Options', 'SAMEORIGIN') // Avoid console and homepage from showing in iframes
-            ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url=' . \urlencode($request->getURI()))
-            ->addHeader('X-UA-Compatible', 'IE=Edge') // Deny IE browsers from going into quirks mode
-        ;
-
-        $route = $utopia->match($request);
-
-        $route->label('error', __DIR__ . '/../../views/general/error.phtml');
-
-        $scope = $route->getLabel('scope', '');
-
-        $layout
-            ->setParam('version', App::getEnv('_APP_VERSION', 'UNKNOWN'))
-            ->setParam('isDev', App::isDevelopment())
-            ->setParam('class', $scope)
-        ;
-    });

app/controllers/web/console.php

@@ -1,605 +1,19 @@
 <?php
 
-use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Response;
-use Appwrite\Utopia\View;
 use Utopia\App;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Domains\Domain;
-use Utopia\Database\Validator\UID;
-use Utopia\Storage\Storage;
-
-App::init()
-    ->groups(['console'])
-    ->inject('layout')
-    ->action(function (View $layout) {
-        $layout
-            ->setParam('description', 'Appwrite Console allows you to easily manage, monitor, and control your entire backend API and tools.')
-            ->setParam('analytics', 'UA-26264668-5')
-        ;
-    });
-
-App::shutdown()
-    ->groups(['console'])
-    ->inject('response')
-    ->inject('layout')
-    ->action(function (Response $response, View $layout) {
-        $header = new View(__DIR__ . '/../../views/console/comps/header.phtml');
-        $footer = new View(__DIR__ . '/../../views/console/comps/footer.phtml');
-
-        $footer
-            ->setParam('home', App::getEnv('_APP_HOME', ''))
-            ->setParam('version', App::getEnv('_APP_VERSION', 'UNKNOWN'))
-        ;
-
-        $layout
-            ->setParam('header', [$header])
-            ->setParam('footer', [$footer])
-        ;
-
-        $response->html($layout->render());
-    });
-
-App::get('/error/:code')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->param('code', null, new \Utopia\Validator\Numeric(), 'Valid status code number', false)
-    ->inject('layout')
-    ->action(function (int $code, View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/error.phtml');
-
-        $page
-            ->setParam('code', $code)
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Error')
-            ->setParam('body', $page);
-    });
 
 App::get('/console')
-    ->groups(['web', 'console'])
+    ->alias('/')
+    ->alias('/invite')
+    ->alias('/login')
+    ->alias('/recover')
+    ->alias('/register')
+    ->groups(['web'])
     ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/index.phtml');
-
-        $page
-            ->setParam('home', App::getEnv('_APP_HOME', ''))
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Console')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/account')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/account/index.phtml');
-
-        $cc = new View(__DIR__ . '/../../views/console/forms/credit-card.phtml');
-
-        $page
-            ->setParam('cc', $cc)
-        ;
-
-        $layout
-            ->setParam('title', 'Account - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/console/notifications')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/v1/console/notifications/index.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Notifications')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/home')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/home/index.phtml');
-        $page
-            ->setParam('usageStatsEnabled', App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled');
-        $layout
-            ->setParam('title', APP_NAME . ' - Console')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/settings')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
-
-        $page = new View(__DIR__ . '/../../views/console/settings/index.phtml');
-
-        $page->setParam('services', array_filter(Config::getParam('services'), fn($element) => $element['optional']))
-            ->setParam('customDomainsEnabled', ($target->isKnown() && !$target->isTest()))
-            ->setParam('customDomainsTarget', $target->get())
-            ->setParam('smtpEnabled', (!empty(App::getEnv('_APP_SMTP_HOST'))))
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Settings')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/webhooks')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/webhooks/index.phtml');
-
-        $page->setParam('events', Config::getParam('events', []));
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Webhooks')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/webhooks/webhook')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->param('id', '', new UID(), 'Webhook unique ID.')
-    ->inject('layout')
-    ->action(function (string $id, View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/webhooks/webhook.phtml');
-
-        $page
-            ->setParam('events', Config::getParam('events', []))
-            ->setParam('new', false)
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Webhooks')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/webhooks/webhook/new')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/webhooks/webhook.phtml');
-
-        $page
-            ->setParam('events', Config::getParam('events', []))
-            ->setParam('new', true)
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Webhooks')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/keys')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $scopes = array_keys(Config::getParam('scopes'));
-        $page = new View(__DIR__ . '/../../views/console/keys/index.phtml');
-
-        $page->setParam('scopes', $scopes);
-
-        $layout
-            ->setParam('title', APP_NAME . ' - API Keys')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/databases')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/databases/index.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Database')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/databases/database')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->param('id', '', new UID(), 'Database unique ID.')
+    ->label('scope', 'home')
     ->inject('response')
-    ->inject('layout')
-    ->action(function (string $id, Response $response, View $layout) {
-
-        $logs = new View(__DIR__ . '/../../views/console/comps/logs.phtml');
-
-        $logs
-            ->setParam('interval', App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 0))
-            ->setParam('method', 'database.listLogs')
-            ->setParam('params', [
-                'database-id' => '{{router.params.id}}',
-            ])
-        ;
-
-        $page = new View(__DIR__ . '/../../views/console/databases/database.phtml');
-
-        $page->setParam('logs', $logs);
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Database')
-            ->setParam('body', $page)
-        ;
-
-        $response
-            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-            ->addHeader('Expires', 0)
-            ->addHeader('Pragma', 'no-cache')
-        ;
-    });
-
-App::get('/console/databases/collection')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->param('id', '', new UID(), 'Collection unique ID.')
-    ->inject('response')
-    ->inject('layout')
-    ->action(function (string $id, Response $response, View $layout) {
-
-        $logs = new View(__DIR__ . '/../../views/console/comps/logs.phtml');
-
-        $logs
-            ->setParam('interval', App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 0))
-            ->setParam('method', 'databases.listCollectionLogs')
-            ->setParam('params', [
-                'collection-id' => '{{router.params.id}}',
-                'database-id' => '{{router.params.databaseId}}'
-            ])
-        ;
-
-        $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-        $permissions
-            ->setParam('method', 'databases.getCollection')
-            ->setParam('events', 'load,databases.updateCollection')
-            ->setParam('form', 'collectionPermissions')
-            ->setParam('data', 'project-collection')
-            ->setParam('params', [
-                'collection-id' => '{{router.params.id}}',
-                'database-id' => '{{router.params.databaseId}}'
-            ]);
-
-        $page = new View(__DIR__ . '/../../views/console/databases/collection.phtml');
-
-        $page
-            ->setParam('permissions', $permissions)
-            ->setParam('logs', $logs)
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Database Collection')
-            ->setParam('body', $page)
-        ;
-
-        $response
-            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-            ->addHeader('Expires', 0)
-            ->addHeader('Pragma', 'no-cache')
-        ;
-    });
-
-App::get('/console/databases/document')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->param('databaseId', '', new UID(), 'Database unique ID.')
-    ->param('collectionId', '', new UID(), 'Collection unique ID.')
-    ->inject('layout')
-    ->action(function (string $databaseId, string $collectionId, View $layout) {
-
-        $logs = new View(__DIR__ . '/../../views/console/comps/logs.phtml');
-        $logs
-            ->setParam('interval', App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 0))
-            ->setParam('method', 'databases.listDocumentLogs')
-            ->setParam('params', [
-                'database-id' => '{{router.params.databaseId}}',
-                'collection-id' => '{{router.params.collectionId}}',
-                'document-id' => '{{router.params.id}}',
-            ])
-        ;
-
-        $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-        $permissions
-            ->setParam('method', 'databases.getDocument')
-            ->setParam('events', 'load,databases.updateDocument')
-            ->setParam('form', 'documentPermissions')
-            ->setParam('data', 'project-document')
-            ->setParam('permissions', [
-                Database::PERMISSION_READ,
-                Database::PERMISSION_UPDATE,
-                Database::PERMISSION_DELETE,
-            ])
-            ->setParam('params', [
-                'collection-id' => '{{router.params.collectionId}}',
-                'database-id' => '{{router.params.databaseId}}',
-                'document-id' => '{{router.params.id}}',
-            ]);
-
-        $page = new View(__DIR__ . '/../../views/console/databases/document.phtml');
-
-        $page
-            ->setParam('new', false)
-            ->setParam('database', $databaseId)
-            ->setParam('collection', $collectionId)
-            ->setParam('permissions', $permissions)
-            ->setParam('logs', $logs)
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Database Document')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/databases/document/new')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->param('databaseId', '', new UID(), 'Database unique ID.')
-    ->param('collectionId', '', new UID(), 'Collection unique ID.')
-    ->inject('layout')
-    ->action(function (string $databaseId, string $collectionId, View $layout) {
-
-        $permissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-
-        $permissions
-            ->setParam('data', 'project-document')
-            ->setParam('form', 'documentPermissions')
-            ->setParam('permissions', [
-                Database::PERMISSION_READ,
-                Database::PERMISSION_UPDATE,
-                Database::PERMISSION_DELETE,
-            ])
-            ->setParam('params', [
-                'collection-id' => '{{router.params.collectionId}}',
-                'database-id' => '{{router.params.databaseId}}',
-                'document-id' => '{{router.params.id}}',
-            ]);
-
-        $page = new View(__DIR__ . '/../../views/console/databases/document.phtml');
-
-        $page
-            ->setParam('new', true)
-            ->setParam('database', $databaseId)
-            ->setParam('collection', $collectionId)
-            ->setParam('permissions', $permissions)
-            ->setParam('logs', new View())
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Database Document')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/storage')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/storage/index.phtml');
-
-        $page
-            ->setParam('home', App::getEnv('_APP_HOME', 0))
-            ->setParam('fileLimit', App::getEnv('_APP_STORAGE_LIMIT', 0))
-            ->setParam('fileLimitHuman', Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0)))
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Storage')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/storage/bucket')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->param('id', '', new UID(), 'Bucket unique ID.')
-    ->inject('response')
-    ->inject('layout')
-    ->action(function (string $id, Response $response, View $layout) {
-
-        $bucketPermissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-        $bucketPermissions
-            ->setParam('method', 'databases.getBucket')
-            ->setParam('events', 'load,databases.updateBucket')
-            ->setParam('data', 'project-bucket')
-            ->setParam('form', 'bucketPermissions')
-            ->setParam('params', [
-                'bucket-id' => '{{router.params.id}}',
-            ]);
-
-        $fileCreatePermissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-        $fileCreatePermissions
-            ->setParam('form', 'fileCreatePermissions')
-            ->setParam('permissions', [
-                Database::PERMISSION_READ,
-                Database::PERMISSION_UPDATE,
-                Database::PERMISSION_DELETE,
-            ]);
-
-        $fileUpdatePermissions = new View(__DIR__ . '/../../views/console/comps/permissions-matrix.phtml');
-        $fileUpdatePermissions
-            ->setParam('method', 'storage.getFile')
-            ->setParam('data', 'file')
-            ->setParam('form', 'fileUpdatePermissions')
-            ->setParam('permissions', [
-                Database::PERMISSION_READ,
-                Database::PERMISSION_UPDATE,
-                Database::PERMISSION_DELETE,
-            ])
-            ->setParam('params', [
-                'bucket-id' => '{{router.params.id}}',
-            ]);
-
-        $page = new View(__DIR__ . '/../../views/console/storage/bucket.phtml');
-        $page
-            ->setParam('home', App::getEnv('_APP_HOME', 0))
-            ->setParam('fileLimit', App::getEnv('_APP_STORAGE_LIMIT', 0))
-            ->setParam('fileLimitHuman', Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0)))
-            ->setParam('bucketPermissions', $bucketPermissions)
-            ->setParam('fileCreatePermissions', $fileCreatePermissions)
-            ->setParam('fileUpdatePermissions', $fileUpdatePermissions)
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Storage Buckets')
-            ->setParam('body', $page)
-        ;
-
-        $response
-            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-            ->addHeader('Expires', 0)
-            ->addHeader('Pragma', 'no-cache')
-        ;
-    });
-
-App::get('/console/users')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/users/index.phtml');
-
-        $page
-            ->setParam('auth', Config::getParam('auth'))
-            ->setParam('providers', Config::getParam('providers'))
-            ->setParam('smtpEnabled', (!empty(App::getEnv('_APP_SMTP_HOST'))))
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Users')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/users/user')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/users/user.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME . ' - User')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/users/teams/team')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/console/users/team.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Team')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/functions')
-    ->groups(['web', 'console'])
-    ->desc('Platform console project functions')
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-        $page = new View(__DIR__ . '/../../views/console/functions/index.phtml');
-
-        $page
-            ->setParam('runtimes', Config::getParam('runtimes'))
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Functions')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/functions/function')
-    ->groups(['web', 'console'])
-    ->desc('Platform console project function')
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function (View $layout) {
-        $page = new View(__DIR__ . '/../../views/console/functions/function.phtml');
-
-        $page
-            ->setParam('events', Config::getParam('events', []))
-            ->setParam('fileLimit', App::getEnv('_APP_STORAGE_LIMIT', 0))
-            ->setParam('fileLimitHuman', Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0)))
-            ->setParam('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900))
-            ->setParam('usageStatsEnabled', App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled');
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME . ' - Function')
-            ->setParam('body', $page);
-    });
-
-App::get('/console/version')
-    ->groups(['web', 'console'])
-    ->desc('Check for new version')
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('response')
-    ->action(function ($response) {
-        try {
-            $version = \json_decode(@\file_get_contents(App::getEnv('_APP_HOME', 'http://localhost') . '/v1/health/version'), true);
-
-            if ($version && isset($version['version'])) {
-                return $response->json(['version' => $version['version']]);
-            } else {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to check for a newer version');
-            }
-        } catch (\Throwable $th) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to check for a newer version');
-        }
+    ->action(function (Response $response) {
+        $fallback = file_get_contents(__DIR__ . '/../../../console/index.html');
+        $response->html($fallback);
     });

app/controllers/web/home.php

@@ -1,236 +1,8 @@
 <?php
 
-use Appwrite\Utopia\View;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-
-App::init()
-    ->groups(['home'])
-    ->inject('layout')
-    ->action(function (View $layout) {
-        $header = new View(__DIR__ . '/../../views/home/comps/header.phtml');
-        $footer = new View(__DIR__ . '/../../views/home/comps/footer.phtml');
-
-        $footer
-            ->setParam('version', App::getEnv('_APP_VERSION', 'UNKNOWN'))
-        ;
-
-        $layout
-            ->setParam('title', APP_NAME)
-            ->setParam('description', '')
-            ->setParam('class', 'home')
-            ->setParam('platforms', Config::getParam('platforms'))
-            ->setParam('header', [$header])
-            ->setParam('footer', [$footer])
-        ;
-    });
-
-App::shutdown()
-    ->groups(['home'])
-    ->inject('response')
-    ->inject('layout')
-    ->action(function (Response $response, View $layout) {
-        $response->html($layout->render());
-    });
-
-App::get('/')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('response')
-    ->inject('dbForConsole')
-    ->inject('project')
-    ->action(function (Response $response, Database $dbForConsole, Document $project) {
-
-        $response
-            ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
-            ->addHeader('Expires', 0)
-            ->addHeader('Pragma', 'no-cache')
-        ;
-
-        if ('console' === $project->getId() || $project->isEmpty()) {
-            $whitelistRoot = App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled');
-
-            if ($whitelistRoot !== 'disabled') {
-                $count = $dbForConsole->count('users', [], 1);
-
-                if ($count !== 0) {
-                    return $response->redirect('/auth/signin');
-                }
-            }
-        }
-
-        $response->redirect('/auth/signup');
-    });
-
-App::get('/auth/signin')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/signin.phtml');
-
-        $page
-            ->setParam('root', App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled'))
-        ;
-
-        $layout
-            ->setParam('title', 'Sign In - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/auth/signup')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/signup.phtml');
-
-        $page
-            ->setParam('root', App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled'))
-        ;
-
-        $layout
-            ->setParam('title', 'Sign Up - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/auth/recovery')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/recovery.phtml');
-
-        $page
-            ->setParam('smtpEnabled', (!empty(App::getEnv('_APP_SMTP_HOST'))))
-        ;
-
-        $layout
-            ->setParam('title', 'Password Recovery - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/auth/confirm')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/confirm.phtml');
-
-        $layout
-            ->setParam('title', 'Account Confirmation - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/auth/join')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/join.phtml');
-
-        $layout
-            ->setParam('title', 'Invitation - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/auth/recovery/reset')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/recovery/reset.phtml');
-
-        $layout
-            ->setParam('title', 'Password Reset - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
-
-App::get('/auth/oauth2/success')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/oauth2.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME)
-            ->setParam('body', $page)
-            ->setParam('header', [])
-            ->setParam('footer', [])
-        ;
-    });
-
-App::get('/auth/magic-url')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/magicURL.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME)
-            ->setParam('body', $page)
-            ->setParam('header', [])
-            ->setParam('footer', [])
-        ;
-    });
-
-App::get('/auth/oauth2/failure')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->inject('layout')
-    ->action(function (View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/home/auth/oauth2.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME)
-            ->setParam('body', $page)
-            ->setParam('header', [])
-            ->setParam('footer', [])
-        ;
-    });
-
-App::get('/error/:code')
-    ->groups(['web', 'home'])
-    ->label('permission', 'public')
-    ->label('scope', 'home')
-    ->param('code', null, new \Utopia\Validator\Numeric(), 'Valid status code number', false)
-    ->inject('layout')
-    ->action(function (int $code, View $layout) {
-
-        $page = new View(__DIR__ . '/../../views/error.phtml');
-
-        $page
-            ->setParam('code', $code)
-        ;
-
-        $layout
-            ->setParam('title', 'Error' . ' - ' . APP_NAME)
-            ->setParam('body', $page);
-    });
 
 App::get('/versions')
     ->desc('Get Version')
@@ -238,7 +10,6 @@ App::get('/versions')
     ->label('scope', 'public')
     ->inject('response')
     ->action(function (Response $response) {
-
         $platforms = Config::getParam('platforms');
 
         $versions = [
@@ -246,7 +17,7 @@ App::get('/versions')
         ];
 
         foreach ($platforms as $platform) {
-            $languages = $platform['languages'] ?? [];
+            $languages = $platform['sdks'] ?? [];
 
             foreach ($languages as $key => $language) {
                 if (isset($language['dev']) && $language['dev']) {

app/executor.php

@@ -119,7 +119,7 @@ function logError(Throwable $error, string $action, Utopia\Route $route = null)
 
 function getStorageDevice($root): Device
 {
-    switch (App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL)) {
+    switch (strtolower(App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL))) {
         case Storage::DEVICE_LOCAL:
         default:
             return new Local($root);
@@ -165,14 +165,14 @@ App::post('/v1/runtimes')
     ->desc("Create a new runtime server")
     ->param('runtimeId', '', new Text(64), 'Unique runtime ID.')
     ->param('source', '', new Text(0), 'Path to source files.')
-    ->param('destination', '', new Text(0), 'Destination folder to store build files into.', true)
+    ->param('destination', '', new Text(0, 0), 'Destination folder to store build files into.', true)
     ->param('vars', [], new Assoc(), 'Environment Variables required for the build.')
     ->param('commands', [], new ArrayList(new Text(1024), 100), 'Commands required to build the container. Maximum of 100 commands are allowed, each 1024 characters long.')
     ->param('runtime', '', new Text(128), 'Runtime for the cloud function.')
     ->param('baseImage', '', new Text(128), 'Base image name of the runtime.')
     ->param('entrypoint', '', new Text(256), 'Entrypoint of the code file.', true)
     ->param('remove', false, new Boolean(), 'Remove a runtime after execution.')
-    ->param('workdir', '', new Text(256), 'Working directory.', true)
+    ->param('workdir', '', new Text(256, 0), 'Working directory.', true)
     ->inject('orchestrationPool')
     ->inject('activeRuntimes')
     ->inject('response')
@@ -459,7 +459,7 @@ App::post('/v1/execution')
     ->desc('Create an execution')
     ->param('runtimeId', '', new Text(64), 'The runtimeID to execute.')
     ->param('vars', [], new Assoc(), 'Environment variables required for the build.')
-    ->param('data', '', new Text(8192), 'Data to be forwarded to the function, this is user specified.', true)
+    ->param('data', '', new Text(8192, 0), 'Data to be forwarded to the function, this is user specified.', true)
     ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Function maximum execution time in seconds.')
     ->inject('activeRuntimes')
     ->inject('response')
@@ -548,6 +548,10 @@ App::post('/v1/execution')
                 case $statusCode >= 500:
                     $stderr = ($executorResponse ?? [])['stderr'] ?? 'Internal Runtime error.';
                     $stdout = ($executorResponse ?? [])['stdout'] ?? 'Internal Runtime error.';
+                    $res = ($executorResponse ?? [])['response'] ?? '';
+                    if (is_array($res)) {
+                        $res = json_encode($res, JSON_UNESCAPED_UNICODE);
+                    }
                     break;
                 case $statusCode >= 100:
                     $stdout = $executorResponse['stdout'];

app/http.php

@@ -10,9 +10,9 @@ use Swoole\Http\Response as SwooleResponse;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Database\ID;
-use Utopia\Database\Permission;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Permission;
+use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Audit\Audit;
 use Utopia\Abuse\Adapters\TimeLimit;
@@ -52,7 +52,7 @@ $http->on('AfterReload', function ($server, $workerId) {
     Console::success('Reload completed...');
 });
 
-Files::load(__DIR__ . '/../public');
+Files::load(__DIR__ . '/../console');
 
 include __DIR__ . '/controllers/general.php';
 
@@ -91,18 +91,10 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
         /** @var array $collections */
         $collections = Config::getParam('collections', []);
 
-        if (!$dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'))) {
-            $redis->flushAll();
-
-            Console::success('[Setup] - Creating database: appwrite...');
-
-            $dbForConsole->create(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-        }
-
         try {
-            Console::success('[Setup] - Creating metadata table: appwrite...');
-            $dbForConsole->createMetadata();
-        } catch (\Throwable $th) {
+            Console::success('[Setup] - Creating database: appwrite...');
+            $dbForConsole->create();
+        } catch (\Exception $e) {
             Console::success('[Setup] - Skip: metadata table already exists');
         }
 
@@ -303,7 +295,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
             $log->addExtra('line', $th->getLine());
             $log->addExtra('trace', $th->getTraceAsString());
             $log->addExtra('detailedTrace', $th->getTrace());
-            $log->addExtra('roles', Authorization::$roles);
+            $log->addExtra('roles', Authorization::getRoles());
 
             $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
             $log->setAction($action);
@@ -324,13 +316,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
         Console::error('[Error] File: ' . $th->getFile());
         Console::error('[Error] Line: ' . $th->getLine());
 
-        /**
-         * Reset Database connection if PDOException was thrown.
-         */
-        if ($th instanceof PDOException) {
-            $db = null;
-        }
-
         $swooleResponse->setStatusCode(500);
 
         $output = ((App::isDevelopment())) ? [

app/init.php

@@ -18,17 +18,9 @@ ini_set('display_startup_errors', 1);
 ini_set('default_socket_timeout', -1);
 error_reporting(E_ALL);
 
-use Appwrite\Extend\PDO;
 use Ahc\Jwt\JWT;
 use Ahc\Jwt\JWTException;
-use Appwrite\Extend\Exception;
 use Appwrite\Auth\Auth;
-use Appwrite\SMS\Adapter\Mock;
-use Appwrite\SMS\Adapter\Telesign;
-use Appwrite\SMS\Adapter\TextMagic;
-use Appwrite\SMS\Adapter\Twilio;
-use Appwrite\SMS\Adapter\Msg91;
-use Appwrite\SMS\Adapter\Vonage;
 use Appwrite\DSN\DSN;
 use Appwrite\Event\Audit;
 use Appwrite\Event\Database as EventDatabase;
@@ -36,43 +28,53 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Phone;
+use Appwrite\Extend\Exception;
+use Appwrite\Extend\PDO;
+use Appwrite\GraphQL\Promises\Adapter\Swoole;
+use Appwrite\GraphQL\Schema;
 use Appwrite\Network\Validator\Email;
-use Appwrite\Network\Validator\IP;
-use Appwrite\Network\Validator\URL;
+use Appwrite\Network\Validator\Origin;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Usage\Stats;
-use Appwrite\Utopia\View;
-use Utopia\App;
-use Utopia\Database\ID;
-use Utopia\Logger\Logger;
-use Utopia\Config\Config;
-use Utopia\Locale\Locale;
-use Utopia\Registry\Registry;
 use MaxMind\Db\Reader;
 use PHPMailer\PHPMailer\PHPMailer;
-use Utopia\Cache\Adapter\Redis as RedisCache;
-use Utopia\Cache\Cache;
-use Utopia\Database\Adapter\MariaDB;
-use Utopia\Database\Document;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Structure;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Validator\Range;
-use Utopia\Validator\WhiteList;
 use Swoole\Database\PDOConfig;
 use Swoole\Database\PDOPool;
 use Swoole\Database\RedisConfig;
 use Swoole\Database\RedisPool;
+use Utopia\App;
+use Utopia\Database\Helpers\ID;
+use Utopia\Logger\Logger;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Cache;
+use Utopia\Config\Config;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\DatetimeValidator;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\Structure;
+use Utopia\Locale\Locale;
+use Utopia\Messaging\Adapters\SMS\Mock;
+use Utopia\Messaging\Adapters\SMS\Msg91;
+use Utopia\Messaging\Adapters\SMS\Telesign;
+use Utopia\Messaging\Adapters\SMS\TextMagic;
+use Utopia\Messaging\Adapters\SMS\Twilio;
+use Utopia\Messaging\Adapters\SMS\Vonage;
+use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
-use Utopia\Storage\Storage;
 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\Linode;
 use Utopia\Storage\Device\Wasabi;
+use Utopia\Storage\Storage;
+use Utopia\Validator\Range;
+use Utopia\Validator\IP;
+use Utopia\Validator\URL;
+use Utopia\Validator\WhiteList;
 
 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
@@ -84,6 +86,9 @@ const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 12;
 const APP_LIMIT_COUNT = 5000;
 const APP_LIMIT_USERS = 10000;
+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 = 20000000; //20MB
 const APP_LIMIT_ENCRYPTION = 20000000; //20MB
 const APP_LIMIT_COMPRESSION = 20000000; //20MB
@@ -92,10 +97,11 @@ const APP_LIMIT_ARRAY_ELEMENT_SIZE = 4096; // Default maximum length of element
 const APP_LIMIT_SUBQUERY = 1000;
 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_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
-const APP_CACHE_BUSTER = 500;
-const APP_VERSION_STABLE = '1.0.0';
+const APP_CACHE_BUSTER = 503;
+const APP_VERSION_STABLE = '1.3.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -188,6 +194,7 @@ 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');
@@ -278,12 +285,23 @@ Database::addFilter(
         return null;
     },
     function (mixed $value, Document $document, Database $database) {
-        return $database
-            ->find('attributes', [
-                Query::equal('collectionInternalId', [$document->getInternalId()]),
-                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-                Query::limit($database->getAttributeLimit()),
-            ]);
+        $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;
     }
 );
 
@@ -599,7 +617,13 @@ $register->set('smtp', function () {
     return $mail;
 });
 $register->set('geodb', function () {
-    return new Reader(__DIR__ . '/db/DBIP/dbip-country-lite-2022-06.mmdb');
+    return new Reader(__DIR__ . '/assets/dbip/dbip-country-lite-2023-01.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('db', function () {
  // This is usually for our workers or CLI commands scope
@@ -628,6 +652,9 @@ $register->set('cache', function () {
 
     return $redis;
 });
+$register->set('promiseAdapter', function () {
+    return new Swoole();
+});
 
 /*
  * Localization
@@ -729,13 +756,6 @@ App::setResource('loggerBreadcrumbs', function () {
 
 App::setResource('register', fn() => $register);
 
-App::setResource('layout', function ($locale) {
-    $layout = new View(__DIR__ . '/views/layouts/default.phtml');
-    $layout->setParam('locale', $locale);
-
-    return $layout;
-}, ['locale']);
-
 App::setResource('locale', fn() => new Locale(App::getEnv('_APP_LOCALE', 'en')));
 
 // Queues
@@ -753,7 +773,7 @@ App::setResource('clients', function ($request, $console, $project) {
     $console->setAttribute('platforms', [ // Always allow current host
         '$collection' => ID::custom('platforms'),
         'name' => 'Current Host',
-        'type' => 'web',
+        'type' => Origin::CLIENT_TYPE_WEB,
         'hostname' => $request->getHostname(),
     ], Document::SET_TYPE_APPEND);
 
@@ -765,7 +785,7 @@ App::setResource('clients', function ($request, $console, $project) {
         fn ($node) => $node['hostname'],
         \array_filter(
             $console->getAttribute('platforms', []),
-            fn ($node) => (isset($node['type']) && $node['type'] === 'web' && isset($node['hostname']) && !empty($node['hostname']))
+            fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB) && isset($node['hostname']) && !empty($node['hostname']))
         )
     );
 
@@ -776,7 +796,7 @@ App::setResource('clients', function ($request, $console, $project) {
                 fn ($node) => $node['hostname'],
                 \array_filter(
                     $project->getAttribute('platforms', []),
-                    fn ($node) => (isset($node['type']) && $node['type'] === 'web' && isset($node['hostname']) && !empty($node['hostname']))
+                    fn ($node) => (isset($node['type']) && ($node['type'] === Origin::CLIENT_TYPE_WEB || $node['type'] === Origin::CLIENT_TYPE_FLUTTER_WEB) && isset($node['hostname']) && !empty($node['hostname']))
                 )
             )
         )
@@ -796,9 +816,11 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
     Authorization::setDefaultStatus(true);
 
     Auth::setCookieName('a_session_' . $project->getId());
+    $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
 
     if (APP_MODE_ADMIN === $mode) {
         Auth::setCookieName('a_session_' . $console->getId());
+        $authDuration = Auth::TOKEN_EXPIRATION_LOGIN_LONG;
     }
 
     $session = Auth::decodeSession(
@@ -837,7 +859,7 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
 
     if (
         $user->isEmpty() // Check a document has been found in the DB
-        || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret)
+        || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret, $authDuration)
     ) { // Validate user has valid login token
         $user = new Document(['$id' => ID::custom(''), '$collection' => 'users']);
     }
@@ -907,7 +929,7 @@ App::setResource('console', function () {
             [
                 '$collection' => ID::custom('platforms'),
                 'name' => 'Localhost',
-                'type' => 'web',
+                'type' => Origin::CLIENT_TYPE_WEB,
                 'hostname' => 'localhost',
             ], // Current host is added on app init
         ],
@@ -919,6 +941,7 @@ App::setResource('console', function () {
         'legalTaxId' => '',
         'auths' => [
             'limit' => (App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
+            'duration' => Auth::TOKEN_EXPIRATION_LOGIN_LONG, // 1 Year in seconds
         ],
         'authWhitelistEmails' => (!empty(App::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null))) ? \explode(',', App::getEnv('_APP_CONSOLE_WHITELIST_EMAILS', null)) : [],
         'authWhitelistIPs' => (!empty(App::getEnv('_APP_CONSOLE_WHITELIST_IPS', null))) ? \explode(',', App::getEnv('_APP_CONSOLE_WHITELIST_IPS', null)) : [],
@@ -964,7 +987,7 @@ App::setResource('deviceBuilds', function ($project) {
 
 function getDevice($root): Device
 {
-    switch (App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL)) {
+    switch (strtolower(App::getEnv('_APP_STORAGE_DEVICE', Storage::DEVICE_LOCAL))) {
         case Storage::DEVICE_LOCAL:
         default:
             return new Local($root);
@@ -1022,13 +1045,18 @@ App::setResource('geodb', function ($register) {
     return $register->get('geodb');
 }, ['register']);
 
+App::setResource('passwordsDictionary', function ($register) {
+    /** @var Utopia\Registry\Registry $register */
+    return $register->get('passwordsDictionary');
+}, ['register']);
+
 App::setResource('sms', function () {
     $dsn = new DSN(App::getEnv('_APP_SMS_PROVIDER'));
     $user = $dsn->getUser();
     $secret = $dsn->getPassword();
 
     return match ($dsn->getHost()) {
-        'mock' => new Mock('', ''), // used for tests
+        'mock' => new Mock($user, $secret), // used for tests
         'twilio' => new Twilio($user, $secret),
         'text-magic' => new TextMagic($user, $secret),
         'telesign' => new Telesign($user, $secret),
@@ -1044,7 +1072,111 @@ App::setResource('servers', function () {
 
     $languages = array_map(function ($language) {
         return strtolower($language['name']);
-    }, $server['languages']);
+    }, $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('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/preload.php

@@ -35,6 +35,7 @@ foreach (
     realpath(__DIR__ . '/../vendor/symfony'),
     realpath(__DIR__ . '/../vendor/mongodb'),
     realpath(__DIR__ . '/../vendor/utopia-php/websocket'), // TODO: remove workerman autoload
+    realpath(__DIR__ . '/../vendor/utopia-php/cache'), // TODO: remove memcache autoload
     ] as $key => $value
 ) {
     if ($value !== false) {

app/realtime.php

@@ -13,8 +13,8 @@ use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\App;
 use Utopia\CLI\Console;
-use Utopia\Database\ID;
-use Utopia\Database\Role;
+use Utopia\Database\Helpers\ID;
+use Utopia\Database\Helpers\Role;
 use Utopia\Logger\Log;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -237,7 +237,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                     'data' => [
                         'events' => ['stats.connections'],
                         'channels' => ['project'],
-                        'timestamp' => DateTime::now(),
+                        'timestamp' => DateTime::formatTz(DateTime::now()),
                         'payload' => [
                             $projectId => $payload[$projectId]
                         ]
@@ -264,7 +264,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 'data' => [
                     'events' => ['test.event'],
                     'channels' => ['tests'],
-                    'timestamp' => DateTime::now(),
+                    'timestamp' => DateTime::formatTz(DateTime::now()),
                     'payload' => $payload
                 ]
             ];
@@ -306,7 +306,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                     if ($realtime->hasSubscriber($projectId, 'user:' . $userId)) {
                         $connection = array_key_first(reset($realtime->subscriptions[$projectId]['user:' . $userId]));
                         [$consoleDatabase, $returnConsoleDatabase] = getDatabase($register, '_console');
-                        $project = Authorization::skip(fn() => $consoleDatabase->getDocument('projects', $projectId));
+                        $project = Authorization::skip(fn () => $consoleDatabase->getDocument('projects', $projectId));
                         [$database, $returnDatabase] = getDatabase($register, "_{$project->getInternalId()}");
 
                         $user = $database->getDocument('users', $userId);
@@ -484,6 +484,7 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 
 $server->onMessage(function (int $connection, string $message) use ($server, $register, $realtime, $containerId) {
     try {
+        $app = new App('UTC');
         $response = new Response(new SwooleResponse());
         $db = $register->get('dbPool')->get();
         $redis = $register->get('redisPool')->get();
@@ -493,12 +494,8 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
         $database->setNamespace("_console");
         $projectId = $realtime->connections[$connection]['projectId'];
-
-        if ($projectId !== 'console') {
-            $project = Authorization::skip(fn() => $database->getDocument('projects', $projectId));
-            $database->setNamespace("_{$project->getInternalId()}");
-        }
-
+        $project = $projectId === 'console' ? $app->getResource('console') : Authorization::skip(fn () => $database->getDocument('projects', $projectId));
+        $database->setNamespace("_{$project->getInternalId()}");
         /*
          * Abuse Check
          *
@@ -536,10 +533,11 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 Auth::$secret = $session['secret'] ?? '';
 
                 $user = $database->getDocument('users', Auth::$unique);
+                $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
 
                 if (
                     empty($user->getId()) // Check a document has been found in the DB
-                    || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret) // Validate user has valid login token
+                    || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret, $authDuration) // Validate user has valid login token
                 ) {
                     // cookie not valid
                     throw new Exception('Session is not valid.', 1003);

app/tasks/maintenance.php

@@ -78,12 +78,11 @@ $cli
                 ->trigger();
         }
 
-        function notifyDeleteUsageStats(int $interval30m, int $interval1d)
+        function notifyDeleteUsageStats(int $usageStatsRetentionHourly)
         {
             (new Delete())
                 ->setType(DELETE_TYPE_USAGE)
-                ->setDateTime1d(DateTime::addSeconds(new \DateTime(), -1 * $interval1d))
-                ->setDateTime30m(DateTime::addSeconds(new \DateTime(), -1 * $interval30m))
+                ->setUsageRetentionHourlyDateTime(DateTime::addSeconds(new \DateTime(), -1 * $usageStatsRetentionHourly))
                 ->trigger();
         }
 
@@ -99,7 +98,6 @@ $cli
         {
             (new Delete())
                 ->setType(DELETE_TYPE_SESSIONS)
-                ->setDatetime(DateTime::addSeconds(new \DateTime(), -1 * Auth::TOKEN_EXPIRATION_LOGIN_LONG))
                 ->trigger();
         }
 
@@ -144,11 +142,11 @@ $cli
         $executionLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_EXECUTION', '1209600');
         $auditLogRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', '1209600');
         $abuseLogsRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_ABUSE', '86400');
-        $usageStatsRetention30m = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_30M', '129600'); //36 hours
-        $usageStatsRetention1d = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_1D', '8640000'); // 100 days
+        $usageStatsRetentionHourly = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_USAGE_HOURLY', '8640000'); //100 days
+
         $cacheRetention = (int) App::getEnv('_APP_MAINTENANCE_RETENTION_CACHE', '2592000'); // 30 days
 
-        Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetention30m, $usageStatsRetention1d, $cacheRetention) {
+        Console::loop(function () use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetentionHourly, $cacheRetention) {
             $database = getConsoleDB();
 
             $time = DateTime::now();
@@ -157,7 +155,7 @@ $cli
             notifyDeleteExecutionLogs($executionLogsRetention);
             notifyDeleteAbuseLogs($abuseLogsRetention);
             notifyDeleteAuditLogs($auditLogRetention);
-            notifyDeleteUsageStats($usageStatsRetention30m, $usageStatsRetention1d);
+            notifyDeleteUsageStats($usageStatsRetentionHourly);
             notifyDeleteConnections();
             notifyDeleteExpiredSessions();
             renewCertificates($database);

app/tasks/migrate.php

@@ -9,10 +9,20 @@ use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Redis as RedisCache;
 use Utopia\Database\Adapter\MariaDB;
 use Utopia\Database\Database;
+use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\Text;
 
+function clearProjectsCache(Redis $redis, Document $project)
+{
+    try {
+        $redis->del($redis->keys("cache-_{$project->getInternalId()}:*"));
+    } catch (\Throwable $th) {
+        Console::error('Failed to clear project ("' . $project->getId() . '") cache with error: ' . $th->getMessage());
+    }
+}
+
 $cli
     ->task('migrate')
     ->param('version', APP_VERSION_STABLE, new Text(32), 'Version to migrate to.', true)
@@ -30,7 +40,7 @@ $cli
 
         $db = $register->get('db', true);
         $redis = $register->get('cache', true);
-        $redis->flushAll();
+
         $cache = new Cache(new RedisCache($redis));
 
         $projectDB = new Database(new MariaDB($db), $cache);
@@ -70,14 +80,19 @@ $cli
                     continue;
                 }
 
+                clearProjectsCache($redis, $project);
+
                 try {
                     $migration
                         ->setProject($project, $projectDB, $consoleDB)
+                        ->setPDO($register->get('db'))
                         ->execute();
                 } catch (\Throwable $th) {
-                    throw $th;
                     Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
+                    throw $th;
                 }
+
+                clearProjectsCache($redis, $project);
             }
 
             $sum = \count($projects);
@@ -90,6 +105,5 @@ $cli
         }
 
         Swoole\Event::wait(); // Wait for Coroutines to finish
-        $redis->flushAll();
         Console::success('Data Migration Completed');
     });

app/tasks/sdks.php

@@ -1,42 +1,49 @@
 <?php
 
-use Utopia\Config\Config;
-use Utopia\CLI\Console;
-use Appwrite\Spec\Swagger2;
-use Appwrite\SDK\SDK;
+use Appwrite\SDK\Language\Android;
 use Appwrite\SDK\Language\CLI;
-use Appwrite\SDK\Language\PHP;
-use Appwrite\SDK\Language\Web;
-use Appwrite\SDK\Language\Node;
-use Appwrite\SDK\Language\Python;
-use Appwrite\SDK\Language\Ruby;
 use Appwrite\SDK\Language\Dart;
 use Appwrite\SDK\Language\Deno;
 use Appwrite\SDK\Language\DotNet;
 use Appwrite\SDK\Language\Flutter;
 use Appwrite\SDK\Language\Go;
+use Appwrite\SDK\Language\GraphQL;
 use Appwrite\SDK\Language\Kotlin;
-use Appwrite\SDK\Language\Android;
+use Appwrite\SDK\Language\Node;
+use Appwrite\SDK\Language\PHP;
+use Appwrite\SDK\Language\Python;
+use Appwrite\SDK\Language\REST;
+use Appwrite\SDK\Language\Ruby;
 use Appwrite\SDK\Language\Swift;
-use Appwrite\SDK\Language\SwiftClient;
+use Appwrite\SDK\Language\Apple;
+use Appwrite\SDK\Language\Web;
+use Appwrite\SDK\SDK;
+use Appwrite\Spec\Swagger2;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
 
 $cli
     ->task('sdks')
     ->action(function () {
         $platforms = Config::getParam('platforms');
-        $selected = \strtolower(Console::confirm('Choose SDK ("*" for all):'));
+        $selectedPlatform = Console::confirm('Choose Platform ("' . APP_PLATFORM_CLIENT . '", "' . APP_PLATFORM_SERVER . '", "' . APP_PLATFORM_CONSOLE . '" or "*" for all):');
+        $selectedSDK = \strtolower(Console::confirm('Choose SDK ("*" for all):'));
         $version = Console::confirm('Choose an Appwrite version');
         $git = (Console::confirm('Should we use git push? (yes/no)') == 'yes');
         $production = ($git) ? (Console::confirm('Type "Appwrite" to push code to production git repos') == 'Appwrite') : false;
         $message = ($git) ? Console::confirm('Please enter your commit message:') : '';
 
-        if (!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', '1.0.x', 'latest'])) {
+        if (!in_array($version, ['0.6.x', '0.7.x', '0.8.x', '0.9.x', '0.10.x', '0.11.x', '0.12.x', '0.13.x', '0.14.x', '0.15.x', '1.0.x', '1.1.x', '1.2.x', '1.3.x', 'latest'])) {
             throw new Exception('Unknown version given');
         }
 
         foreach ($platforms as $key => $platform) {
-            foreach ($platform['languages'] as $language) {
-                if ($selected !== $language['key'] && $selected !== '*') {
+            if ($selectedPlatform !== $key && $selectedPlatform !== '*') {
+                continue;
+            }
+
+            foreach ($platform['sdks'] as $language) {
+                if ($selectedSDK !== $language['key'] && $selectedSDK !== '*') {
                     continue;
                 }
 
@@ -72,15 +79,20 @@ Redistribution and use in source and binary forms, with or without modification,
 
     2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-    3. Neither the name Appwrite nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+    3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.';
 
                 switch ($language['key']) {
                     case 'web':
                         $config = new Web();
-                        $config->setNPMPackage('appwrite');
-                        $config->setBowerPackage('appwrite');
+                        if ($platform['key'] === APP_PLATFORM_CONSOLE) {
+                            $config->setNPMPackage('@appwrite.io/console');
+                            $config->setBowerPackage('@appwrite.io/console');
+                        } else {
+                            $config->setNPMPackage('appwrite');
+                            $config->setBowerPackage('appwrite');
+                        }
                         break;
                     case 'cli':
                         $config = new CLI();
@@ -148,7 +160,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $warning = $warning . "\n\n > This is the Swift SDK for integrating with Appwrite from your Swift server-side code. If you're looking for the Apple SDK you should check [appwrite/sdk-for-apple](https://github.com/appwrite/sdk-for-apple)";
                         break;
                     case 'apple':
-                        $config = new SwiftClient();
+                        $config = new Apple();
                         break;
                     case 'dotnet':
                         $cover = '';
@@ -161,9 +173,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $config = new Kotlin();
                         $warning = $warning . "\n\n > This is the Kotlin SDK for integrating with Appwrite from your Kotlin server-side code. If you're looking for the Android SDK you should check [appwrite/sdk-for-android](https://github.com/appwrite/sdk-for-android)";
                         break;
+                    case 'graphql':
+                        $config = new GraphQL();
+                        break;
+                    case 'rest':
+                        $config = new REST();
+                        break;
                     default:
                         throw new Exception('Language "' . $language['key'] . '" not supported');
-                        break;
                 }
 
                 Console::info("Generating {$language['name']} SDK...");

app/tasks/usage.php

@@ -2,10 +2,6 @@
 
 global $cli, $register;
 
-use Appwrite\Stats\Usage;
-use Appwrite\Stats\UsageDB;
-use Appwrite\Usage\Calculators\Aggregator;
-use Appwrite\Usage\Calculators\Database;
 use Appwrite\Usage\Calculators\TimeSeries;
 use InfluxDB\Database as InfluxDatabase;
 use Utopia\App;
@@ -114,63 +110,29 @@ $logError = function (Throwable $error, string $action = 'syncUsageStats') use (
     Console::warning($error->getTraceAsString());
 };
 
-
-function aggregateTimeseries(UtopiaDatabase $database, InfluxDatabase $influxDB, callable $logError): void
-{
-    $interval = (int) App::getEnv('_APP_USAGE_TIMESERIES_INTERVAL', '30'); // 30 seconds (by default)
-    $usage = new TimeSeries($database, $influxDB, $logError);
-
-    Console::loop(function () use ($interval, $usage) {
-        $now = date('d-m-Y H:i:s', time());
-        Console::info("[{$now}] Aggregating Timeseries Usage data every {$interval} seconds");
-        $loopStart = microtime(true);
-
-        $usage->collect();
-
-        $loopTook = microtime(true) - $loopStart;
-        $now = date('d-m-Y H:i:s', time());
-        Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-    }, $interval);
-}
-
-function aggregateDatabase(UtopiaDatabase $database, callable $logError): void
-{
-    $interval = (int) App::getEnv('_APP_USAGE_DATABASE_INTERVAL', '900'); // 15 minutes (by default)
-    $usage = new Database($database, $logError);
-    $aggregrator = new Aggregator($database, $logError);
-
-    Console::loop(function () use ($interval, $usage, $aggregrator) {
-        $now = date('d-m-Y H:i:s', time());
-        Console::info("[{$now}] Aggregating database usage every {$interval} seconds.");
-        $loopStart = microtime(true);
-        $usage->collect();
-        $aggregrator->collect();
-        $loopTook = microtime(true) - $loopStart;
-        $now = date('d-m-Y H:i:s', time());
-
-        Console::info("[{$now}] Aggregation took {$loopTook} seconds");
-    }, $interval);
-}
-
 $cli
     ->task('usage')
-    ->param('type', 'timeseries', new WhiteList(['timeseries', 'database']))
     ->desc('Schedules syncing data from influxdb to Appwrite console db')
-    ->action(function (string $type) use ($register, $logError) {
+    ->action(function () use ($register, $logError) {
         Console::title('Usage Aggregation V1');
         Console::success(APP_NAME . ' usage aggregation process v1 has started');
 
         $database = getDatabase($register, '_console');
         $influxDB = getInfluxDB($register);
 
-        switch ($type) {
-            case 'timeseries':
-                aggregateTimeseries($database, $influxDB, $logError);
-                break;
-            case 'database':
-                aggregateDatabase($database, $logError);
-                break;
-            default:
-                Console::error("Unsupported usage aggregation type");
-        }
+        $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
+        $region = App::getEnv('region', 'default');
+        $usage = new TimeSeries($region, $database, $influxDB, $logError);
+
+        Console::loop(function () use ($interval, $usage) {
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregating Timeseries Usage data every {$interval} seconds");
+            $loopStart = microtime(true);
+
+            $usage->collect();
+
+            $loopTook = microtime(true) - $loopStart;
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregation took {$loopTook} seconds");
+        }, $interval);
     });

app/views/console/account/index.phtml

@@ -1,369 +0,0 @@
-<div class="cover">
-    <h1 class="zone xl margin-bottom-large">
-        <a data-ls-attrs="href=/console" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> Home</a>
-        <br />
-
-        <span>Your Account</span>
-    </h1>
-</div>
-
-<div class="zone xl">
-    <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
-        <li data-state="/console/account">
-            <h2 class="margin-bottom">Overview</h2>
-            
-            <div
-                data-service="account.get"
-                data-scope="console"
-                data-name="account"
-                data-event="load"
-                data-failure="trigger"
-                data-failure-param-trigger-events="account.deleteSession">
-
-                <div class="row responsive force-reverse">
-                    <div class="col span-3 text-align-center margin-bottom">
-                        <img src="" data-ls-attrs="src={{account|avatar}}" data-size="200" height="150" alt="User Avatar" class="avatar huge huge margin-bottom-small" />
-                    </div>
-
-                    <div class="col span-9">
-                        <div class="box margin-bottom-xl">
-                            <div>
-                                <form name="account.update"
-                                    data-analytics
-                                    data-analytics-activity
-                                    data-analytics-event="submit"
-                                    data-analytics-category="console"
-                                    data-analytics-label="Update Account Name"
-                                    data-service="account.updateName"
-                                    data-scope="console"
-                                    data-event="submit"
-                                    data-success="trigger,alert"
-                                    data-success-param-alert-text="Your name was updated successfully"
-                                    data-success-param-trigger-events="account.update"
-                                    data-failure="alert"
-                                    data-failure-param-alert-text="Failed to update your name"
-                                    data-failure-param-alert-classname="error">
-
-                                    <label for="name">Name</label>
-
-                                    <div class="row responsive">
-                                        <div class="col span-8 margin-bottom-small">
-                                            <input name="name" id="name" type="text" autocomplete="off" data-ls-bind="{{account.name}}" required class="margin-bottom-no" maxlength="128">
-                                        </div>
-                                        <div class="col span-4">
-                                            <button type="submit" class="fill margin-bottom-no">Update Name</button>
-                                        </div>
-                                    </div>
-                                </form>
-                            </div>
-
-                            <hr />
-
-                            <form name="update-email"
-                                data-analytics
-                                data-analytics-activity
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Update Account Email"
-                                data-service="account.updateEmail"
-                                data-scope="console"
-                                data-event="submit"
-                                data-success="trigger,alert"
-                                data-success-param-alert-text="Email address updated successfully"
-                                data-success-param-trigger-events="account-update,modal-close" 
-                                data-failure="alert"
-                                data-failure-param-alert-text="Failed updating email address"
-                                data-failure-param-alert-classname="error">
-
-                                <label>Email</label>
-                                <div class="row responsive">
-                                    <div class="col span-8 margin-bottom-small">
-                                        <input name="email" type="email" class="margin-bottom-no" autocomplete="off" placeholder="me@example.com" data-ls-bind="{{account.email}}" required>
-                                    </div>
-                                    <div class="col span-4">
-                                        <div data-ui-modal class="modal box close width-small height-small" data-button-text="Update Email" data-button-class="fill">
-                                            <h3>Confirm Password</h3>
-                                            
-                                            <hr />
-
-                                            <label>Password</label>
-                                            <input name="password" type="password" class="full-width" autocomplete="off" placeholder="" required>
-                                            
-                                            <hr />
-
-                                            <button type="submit" class="margin-bottom-no">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                                        </div>
-                                    </div>
-                                </div>
-                            </form>
-
-                            <hr />
-
-                            <div data-ui-modal class="modal box close width-small" data-button-text="Update Password" data-button-class="">
-                                <h1>Update Password</h1>
-
-                                <form name="update-password"
-                                    data-analytics
-                                    data-analytics-activity
-                                    data-analytics-event="submit"
-                                    data-analytics-category="console"
-                                    data-analytics-label="Update Account Password"
-                                    data-service="account.updatePassword"
-                                    data-scope="console"
-                                    data-event="submit"
-                                    data-success="trigger,alert,reset"
-                                    data-success-param-trigger-events="account-update"
-                                    data-success-param-alert-text="Password updated successfully"
-                                    data-failure="alert"
-                                    data-failure-param-alert-text="Failed updating password"
-                                    data-failure-param-alert-classname="error">
-
-                                    <label>Current Password</label>
-                                    <input name="oldPassword" type="password" class="full-width" autocomplete="off" placeholder="" required>
-
-                                    <label>New Password</label>
-                                    <input name="password" type="password" class="full-width" autocomplete="off" placeholder="" required data-forms-password-meter>
-
-                                    <hr />
-
-                                    <footer>
-                                        <button type="submit">Update Password</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                                    </footer>
-                                </form>
-                            </div>
-
-                            <hr />
-
-                            <form class="margin-top"
-                                data-analytics
-                                data-analytics-activity
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Delete Account Current Session"
-                                data-service="account.deleteSession"
-                                data-scope="console"
-                                data-event="submit"
-                                data-success="trigger"
-                                data-success-param-trigger-events="account.deleteSession"
-                                data-failure="alert"
-                                data-failure-param-alert-text="Logout failed"
-                                data-failure-param-alert-classname="error">
-
-                                <input type="hidden" name="sessionId" value="current">
-
-                                <button class="fill danger icon fill"><i class="icon-login"></i> Logout</button>
-                            </form>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div class="row responsive">
-                    <div class="col span-9">
-
-                        <h3 class="text-danger">Danger Zone</h3>
-
-                        <div class="box danger">
-                            <p>This is the area where you can delete your account.</p>
-
-                            <p>By deleting your account you will lose access to any of your teams and shared data.</p>
-
-                            <p>PLEASE NOTE: Account deletion is irreversible.</p>
-
-                            <form class="inline"
-                                data-analytics
-                                data-analytics-activity
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Delete Account"
-                                data-service="account.delete"
-                                data-scope="console"
-                                data-event="submit"
-                                data-confirm="Are you sure you want to delete your account?"
-                                data-success="trigger"
-                                data-success-param-trigger-events="account.delete"
-                                data-failure="alert"
-                                data-failure-param-alert-text="Account deactivation failed"
-                                data-failure-param-alert-classname="error">
-                                <button class="danger reverse">Delete Account</button>
-                            </form>
-                        </div>
-                    </div>
-                    <div class="col span-3"></div>
-                </div>
-            </div>
-        </li>
-        <li data-state="/console/account/sessions">
-            <h2>Sessions</h2>
-
-            <div class="box margin-bottom"
-                data-service="account.listSessions"
-                data-scope="console"
-                data-name="sessions"
-                data-event="load,account.deleteRemoteSession">
-
-                <ul data-ls-loop="sessions.sessions" data-ls-as="session" class="list">
-                    <li class="clear">
-                        <span data-ls-if="true != {{session.current}}">
-                            <!-- From remote session (-logout event) -->
-                            <form class="pull-end"
-                                data-analytics
-                                data-analytics-activity
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Delete Account Session"
-                                data-service="account.deleteSession"
-                                data-scope="console"
-                                data-event="submit"
-                                data-loading="Loading..."
-                                data-success="trigger"
-                                data-success-param-trigger-events="account.deleteRemoteSession"
-                                data-failure="alert"
-                                data-failure-param-alert-text="Logout from Session Failed"
-                                data-failure-param-alert-classname="error">
-
-                                <input type="hidden" name="sessionId" data-ls-bind="{{session.$id}}">
-                                <button class="danger">Logout</button>
-                            </form>
-                        </span>
-
-                        <span data-ls-if="true == {{session.current}}">
-                            <!-- From current session (+logout event) -->
-                            <form class="pull-end"
-                                data-analytics
-                                data-analytics-activity
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Delete Account Current Session"
-                                data-service="account.deleteSession"
-                                data-scope="console"
-                                data-event="submit"
-                                data-loading="Loading..."
-                                data-success="trigger,redirect"
-                                data-success-param-trigger-events="account.deleteSession"
-                                data-success-param-redirect-url="/"
-                                data-failure="alert"
-                                data-failure-param-alert-text="Logout from Session Failed"
-                                data-failure-param-alert-classname="error">
-                                <input type="hidden" name="sessionId" data-ls-bind="{{session.$id}}">
-                                <button class="danger">Logout</button>
-                            </form>
-                        </span>
-
-                        <div class="pull-start margin-end avatar-container">
-                            <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-attrs="src={{env.API}}/avatars/browsers/{{session.clientCode|lowercase}}?width=120&height=120&project={{env.PROJECT}},title={{session.clientName}},alt={{session.clientName}}" class="avatar" loading="lazy" width="60" height="60" data-ls-if="{{session.clientCode|lowercase}} !== 'cli'"/>
-
-                            <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-attrs="src=/images/clients/terminal.png?buster=<?php echo APP_CACHE_BUSTER; ?>,title={{session.clientName}},alt={{session.clientName}}" class="avatar" loading="lazy" width="60" height="60" data-ls-if="{{session.clientCode|lowercase}} === 'cli'" >
-
-                            <div data-ls-if="{{session.provider}} !== 'email'" class="corner">
-                                <img data-ls-attrs="src=/images/users/{{session.provider}}.png?buster=<?php echo APP_CACHE_BUSTER; ?>,title={{session.provider}},alt={{session.provider}}"  class="avatar xs" loading="lazy" width="30" height="30" />
-                            </div>
-                        </div>
-
-                        <span data-ls-if="(!{{log.clientName}})">Unknown</span>
-                        <span data-ls-if="({{log.clientName}})" data-ls-bind="{{session.clientName}}"></span> <span data-ls-bind="{{session.clientVersion}}"></span> on <span data-ls-bind="{{session.deviceModel}}"></span> <span data-ls-bind="{{session.osName}}"></span> <span data-ls-bind="{{session.osVersion}}"></span>
-                        &nbsp;
-                        <span data-ls-if="true == {{session.current}}">
-                            <span class="tag green">Current Session</span>
-                        </span>
-
-                        <div class="margin-top-small">
-                            <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-if="{{session.countryCode}} !== '--'" data-ls-attrs="src={{env.API}}/avatars/flags/{{session.countryCode}}?width=80&height=80&project={{env.PROJECT}}" class="avatar xxs margin-end-small inline" />
-                            <small data-ls-bind="{{session.ip}}"></small> / <small data-ls-bind="{{session.countryName}}"></small>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <form class="inline margin-bottom-large"
-                data-analytics
-                data-analytics-activity
-                data-analytics-event="submit"
-                data-analytics-category="console"
-                data-analytics-label="Delete Account Sessions"
-                data-service="account.deleteSessions"
-                data-scope="console"
-                data-event="submit"
-                data-success="trigger,redirect"
-                data-success-param-trigger-events="account.deleteSession"
-                data-success-param-redirect-url="/"
-                data-failure="alert"
-                data-failure-param-alert-text="Logout from All Sessions Failed"
-                data-failure-param-alert-classname="error">
-                <input type="hidden" name="id" value="0">
-                <button class="danger">Logout from all sessions</button>
-            </form>
-        </li>
-        <li data-state="/console/account/activity">
-            <h2>Activity</h2>
-
-            <div
-                data-service="account.listLogs"
-                data-scope="console"
-                data-param-queries="limit(<?php echo APP_PAGING_LIMIT; ?>),offset({{router.params.offset|orZero}})"
-                data-param-queries-cast-to="array"
-                data-param-queries-cast-from="csv"
-                data-name="securityLogs"
-                data-event="load">
-
-                <div class="box margin-bottom">
-                    <table class="vertical small">
-                        <thead>
-                            <tr>
-                                <th width="120">Date</th>
-                                <th width="175">Event</th>
-                                <th>Client</th>
-                                <th width="110">Location</th>
-                                <th width="90">IP</th>
-                            </tr>
-                        </thead>
-                        <tbody data-ls-loop="securityLogs.logs" data-ls-as="log">
-                            <tr>
-                                <td data-title="Date: "><span data-ls-bind="{{log.time|dateTime}}"></span></td>
-                                <td data-title="Event: "><span data-ls-bind="{{log.event}}"></span></td>
-                                <td data-title="Client: ">
-                                    <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-attrs="src={{env.API}}/avatars/browsers/{{log.clientCode|lowercase}}?width=80&height=80&project={{env.PROJECT}},title={{log.clientName}},alt={{log.clientName}}" class="avatar xxs inline margin-end-small" data-ls-if="{{log.clientCode|lowercase}} !== 'cli'"/>
-                                        
-                                    <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-attrs="src=/images/clients/terminal.png?buster=<?php echo APP_CACHE_BUSTER; ?>,title={{log.clientName}},alt={{log.clientName}}" class="avatar xxs inline margin-end-small" data-ls-if="{{log.clientCode|lowercase}} === 'cli'" />
-
-                                    <span data-ls-if="(!{{log.clientName}})">Unknown</span>
-                                    <span data-ls-if="({{log.clientName}})" data-ls-bind="{{log.clientName}} {{log.clientVersion}} on {{log.model}} {{log.osName}} {{log.osVersion}}"></span>
-                                </td>
-                                <td data-title="Location: ">
-                                    <img onerror="this.onerror=null;this.className='avatar xxs hide'" data-ls-attrs="src={{env.API}}/avatars/flags/{{log.countryCode}}?width=80&height=80&project={{env.PROJECT}}" class="avatar xxs inline margin-end-small" />
-                                    <span data-ls-bind="{{log.countryName}}"></span>
-                                </td>
-                                <td data-title="IP: "><span data-ls-bind="{{log.ip}}"></span></td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-                <div class="pull-end text-align-center paging">
-                    <form
-                        data-service="account.listLogs"
-                        data-event="submit"
-                        data-scope="console"
-                        data-name="securityLogs"
-                        data-success="state"
-                        data-success-param-state-keys="offset">
-                        <input type="hidden" name="offset">
-                        <button name="queries" data-cast-to="array" data-cast-from="csv" data-paging-back data-offset="{{router.params.offset}}" data-total="{{securityLogs.total}}" class="margin-end round small" aria-label="Back"><i class="icon-left-open"></i></button>
-                    </form>
-
-                    <span data-ls-bind="{{router.params.offset|pageCurrent}} / {{securityLogs.total|pageTotal}}"></span>
-
-                    <form
-                        data-service="account.listLogs"
-                        data-event="submit"
-                        data-scope="console"
-                        data-name="securityLogs"
-                        data-success="state"
-                        data-success-param-state-keys="offset">
-                        <input type="hidden" name="offset">
-                        <button name="queries" data-cast-to="array" data-cast-from="csv" data-paging-next data-offset="{{router.params.offset}}" data-total="{{securityLogs.total}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
-                    </form>
-                </div>
-            </div>
-        </li>
-    </ul>
-</div>

app/views/console/comps/footer.phtml

@@ -1,43 +0,0 @@
-<?php
-$home = $this->getParam('home', '');
-$version = $this->getParam('version', '') . '.' . APP_CACHE_BUSTER;
-?>
-<footer class="clear margin-top-large">
-    <ul class="copyright pull-start">
-        <li>
-            <a class="link-animation-enabled"
-                data-analytics
-                data-analytics-event="click"
-                data-analytics-category="console/footer"
-                data-analytics-label="GitHub Link"
-                href="https://github.com/appwrite/appwrite" target="_blank" rel="noopener"><i class="icon-github"></i> GitHub</a>
-        </li>
-        <li>
-            <a class="link-animation-enabled"
-                data-analytics
-                data-analytics-event="click"
-                data-analytics-category="console/footer"
-                data-analytics-label="Discord Link"
-                href="https://appwrite.io/discord" target="_blank" rel="noopener"><i class="icon-discord"></i> Discord</a>
-        </li>
-        <li>
-            <a class="link-animation-enabled"
-                data-analytics
-                data-analytics-event="click"
-                data-analytics-category="console/footer"
-                data-analytics-label="New GitHub Issue"
-                href="https://github.com/appwrite/appwrite/issues/new?assignees=&labels=bug&template=bug.yaml&title=[<?php echo $version; ?>]%20%F0%9F%90%9B+Bug+Report%3A+" target="_blank" rel="noopener">Open an Issue</a>
-        </li>
-        <li>
-            <a class="link-animation-enabled"
-                data-analytics
-                data-analytics-event="click"
-                data-analytics-category="console/footer"
-                data-analytics-label="Docs Link"
-                href="<?php echo $home; ?>/docs" target="_blank" rel="noopener">Docs</a>
-        </li>
-        <li>
-            v:<?php echo $version; ?>
-        </li>
-    </ul>
-</footer>

app/views/console/comps/header.phtml

@@ -1,259 +0,0 @@
-<header class="clear" data-version>
-    <a href="/console" class="logo pull-start">
-        <img src="/images/appwrite.svg" alt="Appwrite Light Logo" class="force-light" loading="lazy" />
-        <img src="/images/appwrite-footer-dark.svg" alt="Appwrite Dark Logo" class="force-dark" loading="lazy" />
-    </a>
-
-    <div class="change-project pull-start desktops-only">
-        <div class="list project-only margin-end-small">
-            <label class="margin-bottom-no">
-                <select class="margin-bottom-no"
-                    data-xanalytics-event="change"
-                    data-xanalytics-category="console/header"
-                    data-xanalytics-label="Project Switch"
-                    data-switch
-                    data-ls-bind="{{router.params.project}}"
-                    data-unsync="1"
-                    data-ls-loop="projects.projects" data-ls-as="option" aria-label="Switch Project">
-                    <option data-ls-attrs="value={{option.$id}}" data-ls-bind="{{option.name}}"></option>
-                </select>
-            </label>
-        </div>
-
-        <button style="overflow: visible;" class="project-only setup-new tooltip round down pull-end" aria-label="Quick Start" data-tooltip="Create a new project"><i class="icon-plus"></i></button>
-    </div>
-
-    <div class="account-box pull-end"
-        data-service="account.get"
-        data-name="account"
-        data-scope="console"
-        data-event="load"
-        data-success="trigger"
-        data-success-param-trigger-events="account.get"
-        data-failure="trigger"
-        data-failure-param-trigger-events="account.deleteSession">
-
-        <div class="console-back">
-            <a href="/console" class="link-return-animation--end">Back to Console &nbsp;<i class="icon-right-open"></i></a>
-        </div>
-
-        <div class="account link pull-end clear">
-            <img src="" data-ls-attrs="src={{account|avatar}}" alt="User Avatar" class="avatar margin-start pull-end" />
-            <span class="name pull-end desktops-only" data-ls-bind="{{account.name}}"></span>
-        </div>
-
-        <div class="console-index drop-list bottom end" data-ls-ui-open="" data-button-text="" data-button-aria="Account Options" data-button-icon="" data-button-selector="[data-toggler]" data-button-class="account-button" data-blur="1">
-            <ul class="margin-top-large arrow-end">
-                <li>
-                    <a href="/console/account"><i class="icon-user"></i> &nbsp; Your Account</a>
-                </li>
-                <li>
-                    <span class="link"><i class="icon-sun-inv force-dark pull-start"></i><i class="icon-moon-inv force-light pull-start"></i> &nbsp; Change Theme
-                        <div class="pull-end switch-theme">
-                            <button data-general-theme
-                                data-analytics
-                                data-analytics-event="click"
-                                data-analytics-category="console/header"
-                                data-analytics-label="Switch Theme">
-                                <i class="icon-sun-inv force-light"></i>
-                                <i class="icon-moon-inv force-dark"></i>
-                            </button>
-                        </div>
-                    </span>
-                </li>
-            </ul>
-        </div>
-
-    </div>
-
-    <nav class="project-only" data-ls-ui-open="" data-button-class="round icon-btn phones-only tablets-only" data-button-aria="Navigation" data-button-icon="icon-dot-3">
-        <a class="logo" href="/console"
-            data-analytics
-            data-analytics-event="click"
-            data-analytics-category="console/navigation"
-            data-analytics-label="Logo Link">
-            <img src="/images/appwrite-nav.svg" loading="lazy" alt="Appwrite Logo" class="nav" />
-
-            <img src="/images/appwrite.svg" loading="lazy" alt="Appwrite Light Logo" class="top force-light" loading="lazy" />
-            <img src="/images/appwrite-footer-dark.svg" loading="lazy" alt="Appwrite Dark Logo" class="top force-dark" loading="lazy" />
-        </a>
-
-        <div data-ui-highlight class="container">
-
-            <ul class="links">
-                <li>
-                    <a data-ls-attrs="href=/console/home?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Home Link">
-                        <i class="icon-home"></i>
-                        Home
-                    </a>
-                </li>
-            </ul>
-
-            <b class="subtitle">DEVELOP</b>
-
-            <ul class="links">
-                <li>
-                    <a data-ls-attrs="href=/console/databases?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Database Link">
-                        <i class="icon-database"></i>
-                        Database
-                    </a>
-                </li>
-                <li>
-                    <a data-ls-attrs="href=/console/storage?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Storage Link">
-                        <i class="icon-folder"></i>
-                        Storage
-                    </a>
-                </li>
-                <li>
-                    <a data-ls-attrs="href=/console/users?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Users Link">
-                        <i class="icon-users"></i>
-                        Authentication
-                    </a>
-                </li>
-                <li>
-                    <a data-ls-attrs="href=/console/functions?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Functions Link"
-                        class="link-animation-disabled">
-                        <i class="icon-lightning"></i>
-                        Functions
-                    </a>
-                </li>
-            </ul>
-
-            <b class="subtitle">MANAGE</b>
-
-            <ul class="links">
-                <li>
-                    <a data-ls-attrs="href=/console/webhooks?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Webhooks Links">
-                        <i class="icon-link"></i>
-                        Webhooks
-                    </a>
-                </li>
-                <li>
-                    <a data-ls-attrs="href=/console/keys?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="API Keys Link">
-                        <i class="icon-key-inv"></i>
-                        API Keys
-                    </a>
-                </li>
-            </ul>
-        </div>
-
-        <ul class="links bottom">
-            <li>
-                <a data-ls-attrs="href=/console/settings?project={{router.params.project}}"
-                    data-analytics
-                    data-analytics-event="click"
-                    data-analytics-category="console/navigation"
-                    data-analytics-label="Settings Link">
-                    <i class="icon-cog"></i> Settings</a>
-            </li>
-        </ul>
-    </nav>
-</header>
-
-<div class=""
-    data-service="projects.list"
-    data-event="load,projects.update"
-    data-name="projects"
-    data-scope="console"></div>
-
-<div class="load-screen" data-ls-ui-loader>
-    <div class="animation"><div></div><div></div><div></div><div></div></div>
-    <img src="/images/appwrite.svg" alt="Appwrite Light Logo" class="force-light" loading="lazy" />
-    <img src="/images/appwrite-footer-dark.svg" alt="Appwrite Dark Logo" class="force-dark" loading="lazy" />
-</div>
-
-<div data-ui-modal class="modal box close sticky-footer" data-button-alias=".setup-new" data-button-icon="icon-plus" data-button-class="project-only" data-open-event="create-project">
-    <h1>Create Project</h1>
-
-    <form
-        data-setup
-        data-analytics
-        data-analytics-activity
-        data-analytics-event="submit"
-        data-analytics-category="console"
-        data-analytics-label="Create Project">
-        <p>Appwrite projects are containers for your resources and apps across different platforms.</p>
-
-        <label>Project ID</label>
-        <input
-            type="hidden"
-            data-custom-id
-            data-id-type="auto"
-            data-validator="projects.get"
-            required
-            maxlength="36"
-            class=""
-            pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{0,35}$"
-            name="projectId" />
-
-        <label>Name</label>
-        <input type="text" class="full-width margin-bottom-xl" name="name" required autocomplete="off" maxlength="128" />
-
-        <footer>
-            <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-        </footer>
-    </form>
-</div>
-
-<section class="upload-box" x-data x-show="$store.uploader.files().length > 0">
-    <div class="upload-box-header">
-        <h4 class="upload-box-title">
-            <span class="text">Uploading files</span>
-            <span class="amount" x-text="$store.uploader.files().length"></span>
-        </h4>
-        <button class="icon-button" :class="$store.uploader.isOpen ? '' : 'is-open'" aria-label="toggle upload box" @click="$store.uploader.toggle()"><span class="icon-chevron-down" aria-hidden="true"></span></button>
-        <button class="icon-button" @click="$store.uploader.cancelAll()" aria-label="close upload box"><span class="icon-x" aria-hidden="true"></span></button>
-    </div>
-    <div class="upload-box-content" :class="$store.uploader.isOpen ? 'is-open' : ''">
-        <ul class="upload-box-list">
-            <template x-if="$store.uploader.files().length > 0">
-                <template x-for="file in $store.uploader.files()" :key="file.id">
-                    <li x-show="!file.cancelled" class="upload-box-item">
-                        <div class="upload-image u-margin-inline-end-16" :class="file.completed ? 'is-finished' : ''">
-                            <div class="progress"
-                                :style="'--progress-value:' + file.progress"
-                                :aria-valuenow="file.progress"
-                                role="progressbar"
-                                aria-valuemin="0"
-                                aria-valuemax="100"></div>
-                            <span x-show="!file.completed" class="icon" x-text="file.progress + '%'"></span>
-                            <span x-show="file.completed" class="icon icon-file"></span>
-                        </div>
-                        <label for="file1" class="file-name trim-inner-text" x-text="file.name" :title="file.name"></label>
-                        <span class="pill is-failed" x-show="file.failed" :title="file.error">failed</span>
-                        <button x-show="file.completed" class="icon-button is-success" aria-label="Uploading"><span class="icon-check"></span></button>
-                        <button x-show="!file.completed" class="icon-button" aria-label="Uploading" @click="$store.uploader.removeFile(file.id)"><span class="icon-x"></span></button>
-                    </li>
-                </template>
-            </template>
-        </ul>
-    </div>
-</section>

app/views/console/comps/logs.phtml

@@ -1,96 +0,0 @@
-<?php
-$interval = floor((int)$this->getParam('interval', 0) / 86400);
-$method = $this->getParam('method', '');
-$params = $this->getParam('params', []);
-?>
-<div
-    data-service="<?php echo $method; ?>"
-    <?php foreach($params as $key => $value): ?>
-    data-param-<?php echo $key; ?>="<?php echo $value; ?>"
-    <?php endforeach; ?>
-    data-param-queries="limit(<?php echo APP_PAGING_LIMIT; ?>),offset({{router.params.offset|orZero}})"
-    data-param-queries-cast-to="array"
-    data-param-queries-cast-from="csv"
-    data-scope="sdk"
-    data-event="load"
-    data-name="logs">
-    <div data-ls-if="0 == {{logs.logs.length}}">
-        <div class="box margin-bottom">
-            <h3 class="margin-bottom-small text-bold">No Logs Found</h3>
-
-            <p class="margin-bottom-no">Logs are retained for <?php echo $this->escape($interval); ?> days.</p>
-        </div>
-    </div>
-
-    <div data-ls-if="0 != {{logs.total}}">
-        <div class="margin-bottom-small margin-top-negative text-align-end text-size-small text-fade">Showing logs from the last <?php echo $this->escape($interval); ?> days</div>
-
-        <div class="box margin-bottom">
-            <table class="vertical small">
-                <thead>
-                    <tr>
-                        <th width="120">Date</th>
-                        <th width="180">By</th>
-                        <th>Event</th>
-                        <th width="110">Location</th>
-                        <th width="90">IP</th>
-                    </tr>
-                </thead>
-                <tbody data-ls-loop="logs.logs" data-ls-as="log" class="text-size-small">
-                    <tr>
-                        <td data-title="Date: "><span class="text-fade" data-ls-bind="{{log.time|dateTime}}"></span></td>
-                        <td data-title="By: ">
-                            <span data-ls-if="{{log.userName|escape}} !== '' && {{log.mode}} === ''"><i class="icon-user"></i>&nbsp; <a data-ls-attrs="href=/console/users/user?id={{log.userId}}&project={{router.params.project}}" data-ls-bind="{{log.userName}}"></a></span>
-                            <span data-ls-if="{{log.userName|escape}} === '' && {{log.userEmail}} !== '' && {{log.mode}} !== 'key'"><i class="icon-user"></i>&nbsp; Unknown</span>
-                            <span data-ls-if="{{log.userName|escape}} === '' && {{log.userEmail}} === '' && {{log.mode}} !== 'key'"><i class="icon-user"></i>&nbsp; Anonymous User</span>
-                            <span data-ls-if="{{log.mode}} === 'admin'">
-                                <img src="" data-ls-attrs="src={{log.userName|avatar}}" data-size="45" alt="User Avatar" class="avatar xxs inline margin-end-small" loading="lazy" width="30" height="30" /> <span data-ls-bind="{{log.userName}}"></span> <span class="text-fade text-size-xs">(Admin)</span>
-                            </span>
-                            <span data-ls-if="{{log.mode}} === 'key'"> <i class="icon-key"></i>&nbsp; API Key</span>
-                        </td>
-                        <td data-title="Event: "><span data-ls-bind="{{log.event}}"></span></td>
-                        <td data-title="Location: ">
-                            <img onerror="this.onerror=null;this.className='avatar xxs hide'" data-ls-attrs="src={{env.API}}/avatars/flags/{{log.countryCode}}?width=80&height=80&project={{env.PROJECT}}" class="avatar xxs inline margin-end-small" />
-                            <span data-ls-bind="{{log.countryName}}"></span>
-                        </td>
-                        <td data-title="IP: "><span data-ls-bind="{{log.ip}}"></span></td>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-
-        <div class="pull-end text-align-center paging">
-            <form
-                data-service="<?php echo $method; ?>"
-                <?php foreach($params as $key => $value): ?>
-                data-param-<?php echo $key; ?>="<?php echo $value; ?>"
-                <?php endforeach; ?> 
-                data-event="submit"
-                data-param-collection-id="{{router.params.id}}"
-                data-scope="sdk"
-                data-name="logs"
-                data-success="state"
-                data-success-param-state-keys="search,offset">
-                <input type="hidden" name="offset">
-                <button name="queries" data-cast-to="array" data-cast-from="csv" data-paging-back data-offset="{{router.params.offset}}" data-total="{{logs.total}}" class="margin-end-small round small" aria-label="Back"><i class="icon-left-open"></i></button>
-            </form>
-
-            <span data-ls-bind="{{router.params.offset|pageCurrent}} / {{logs.total|pageTotal}}"></span>
-
-            <form
-                data-service="<?php echo $method; ?>"
-                <?php foreach($params as $key => $value): ?>
-                data-param-<?php echo $key; ?>="<?php echo $value; ?>"
-                <?php endforeach; ?> 
-                data-event="submit"
-                data-param-collection-id="{{router.params.id}}"
-                data-scope="sdk"
-                data-name="logs"
-                data-success="state"
-                data-success-param-state-keys="search,offset">
-                <input type="hidden" name="offset">
-                <button name="queries" data-cast-to="array" data-cast-from="csv" data-paging-next data-offset="{{router.params.offset}}" data-total="{{logs.total}}" class="margin-start-small round small" aria-label="Next"><i class="icon-right-open"></i></button>
-            </form>
-        </div>
-    </div>
-</div>

app/views/console/comps/permissions-matrix.phtml

@@ -1,111 +0,0 @@
-<?php
-
-use Utopia\Database\Database;
-
-$method = $this->getParam('method', '');
-$params = $this->getParam('params', []);
-$events = $this->getParam('events', '');
-$permissions = $this->getParam('permissions', Database::PERMISSIONS);
-$data = $this->getParam('data', '');
-$form = $this->getParam('form');
-
-$escapedPermissions = \array_map(function ($perm) {
-    // Alpine won't bind to a parameter named delete
-    if ($perm == 'delete') {
-        return 'xdelete';
-    }
-    return $perm;
-}, $permissions);
-
-?>
-<div
-    x-data="permissionsMatrix"
-    class="permissions-matrix margin-bottom-large"
-    data-scope="sdk"
-    <?php if (!empty($method)): ?>
-        data-method="<?php echo $method; ?>"
-    <?php endif; ?>
-    <?php foreach ($params as $key => $value): ?>
-        data-param-<?php echo $key; ?>="<?php echo $value; ?>"
-    <?php endforeach; ?>
-    <?php if (!empty($events)): ?>
-        data-events="<?php echo $events; ?>"
-    <?php endif; ?>
-    <?php if (!empty($data)): ?>
-        data-name="<?php echo $data; ?>"
-    <?php endif; ?>
-    @reset.window="permissions.length = rawPermissions.length = 0">
-
-    <input
-        type="hidden"
-        name="permissions"
-        data-cast-from="csv"
-        data-cast-to="array"
-        <?php if (!empty(($data))): ?>
-            data-ls-bind="{{<?php echo $data ?>.$permissions}}"
-        <?php endif; ?>
-        :value="rawPermissions"/>
-
-    <datalist id="types">
-        <option value="user:">
-        <option value="team:">
-        <option value="member:">
-        <option value="users">
-        <option value="guests">
-        <option value="any">
-    </datalist>
-
-    <table
-        class="u-table-layout-normal"
-        data-ls-attrs="x-init=load({{<?php if (!empty($data)) echo $data . '.$permissions' ?>}})">
-
-        <thead x-show="permissions.length > 0">
-        <tr>
-            <th>Role</th>
-            <?php foreach ($permissions as $permission): ?>
-                <th class="u-no-trim"><?php echo \ucfirst($permission); ?></th>
-            <?php endforeach; ?>
-            <th></th>
-        </tr>
-        </thead>
-        <tbody>
-        <template x-for="(permission, index) in permissions">
-            <tr>
-                <td>
-                    <input
-                        required
-                        autocomplete="off"
-                        :id="'<?php echo $form; ?>Input' + index"
-                        name="<?php echo $form; ?>"
-                        form="<?php echo $form ?>"
-                        list="types"
-                        type="text"
-                        x-model="permission.role"
-                        @keyup="updatePermission(index)"/>
-                </td>
-                <?php foreach ($escapedPermissions as $permission): ?>
-                    <td>
-                        <input
-                            type="checkbox"
-                            name="<?php echo $permission ?>"
-                            x-model="permission.<?php echo $permission; ?>"
-                            @click="updatePermission(index)"/>
-                    </td>
-                <?php endforeach; ?>
-                <td>
-                    <span class="action" @click="removePermission(index)">
-                        <i class="icon-trash"></i>
-                    </span>
-                </td>
-            </tr>
-        </template>
-        </tbody>
-        <tfoot>
-        <tr>
-            <td colspan="<?php \count($permissions) + 2 ?>">
-                <button type="button" class="margin-top reverse" @click="addPermission('<?php echo $form  ?>')">Add Role</button>
-            </td>
-        </tr>
-        </tfoot>
-    </table>
-</div>

app/views/console/comps/upload-modal.phtml

@@ -1,6 +0,0 @@
-<div x-data id="upload-modal">
-      <template x-for="$store.uploader.files as file">
-        <p x-text="file"></p>
-    </template>
-    <button @click="$store.uploader.addFile('file-x')">add</button>
-</div>