Merge pull request #1281 from appwrite/feat-database-indexing

Feat database indexing

.env

@@ -43,3 +43,5 @@ _APP_MAINTENANCE_RETENTION_EXECUTION=1209600
 _APP_MAINTENANCE_RETENTION_ABUSE=86400
 _APP_MAINTENANCE_RETENTION_AUDIT=1209600
 _APP_USAGE_STATS=enabled
+_APP_LOGGING_PROVIDER=
+_APP_LOGGING_CONFIG=

.gitattributes

@@ -1,34 +1,16 @@
-; app/* linguist-detectable=false
-; app/* linguist-detectable=false
-; app/*/* linguist-detectable=false
-; app/*/*/* linguist-detectable=false
-; app/*/*/*/* linguist-detectable=false
-; app/*/*/*/*/* linguist-detectable=false
-app/config/* linguist-detectable=false
 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/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
 app/controllers/*/*/*/*/* linguist-detectable=false
-; app/workers/* linguist-detectable=false
-; app/workers/* linguist-detectable=false
-; app/workers/*/* linguist-detectable=false
-; app/workers/*/*/* linguist-detectable=false
-; app/workers/*/*/*/* linguist-detectable=false
-; src/Appwrite/Auth/* linguist-detectable=false
-; src/Appwrite/Auth/*/* linguist-detectable=false
-; src/Appwrite/Auth/*/*/* linguist-detectable=false
-src/* linguist-detectable=false
 src/* linguist-detectable=false
 src/*/* linguist-detectable=false
 src/*/*/* linguist-detectable=false

.github/workflows/tests.yml.tmp

@@ -0,0 +1,45 @@
+name: "Tests"
+
+on: [pull_request]
+jobs:
+  tests:
+    name: Unit & E2E
+    runs-on: self-hosted
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      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
+
+    # 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' }}
+
+    - name: Build Appwrite
+      # Upstream bug causes buildkit pulls to fail so prefetch base images
+      # https://github.com/moby/moby/issues/41864
+      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 30
+    - name: Doctor
+      run: docker compose exec -T appwrite doctor
+
+    - name: Environment Variables
+      run:  docker compose exec -T appwrite vars
+
+    - name: Run Tests
+      run: docker compose exec -T appwrite test --debug
+
+    - name: Teardown
+      if: always()
+      run: |
+        docker compose down -v
+        docker ps -aq | xargs docker rm --force

.travis-ci/build.sh

@@ -15,7 +15,7 @@ then
       exit 1
 fi
 
-if test $(find "./app/db/DBIP/dbip-country-lite-2021-10.mmdb" -mmin +259200)
+if test $(find "./app/db/DBIP/dbip-country-lite-2021-12.mmdb" -mmin +259200)
 then
     printf "${RED}GEO country DB has not been updated for more than 6 months. Go to https://db-ip.com/db/download/ip-to-country-lite to download a newer version${NC}\n"
 fi

.travis.yml

@@ -2,12 +2,11 @@ dist: focal
 
 arch:
   - amd64
-  - arm64-graviton2
 
 os: linux
 
 vm:
-  size: large
+  size: large 
 
 language: shell
 
@@ -54,11 +53,19 @@ install:
 - docker pull php:8.0-cli-alpine
 - docker-compose build
 - docker-compose up -d
-- sleep 10
+- sleep 60
 
 script:
-- docker ps
+- docker ps -a
+# Tests should fail if any container is in exited status
+# - ALL_UP=`docker ps -aq --filter "status=exited"`
+# - >
+#   if [[ "$ALL_UP" != "" ]]; then
+#     exit 1
+#   fi
 - docker-compose logs appwrite
+- docker-compose logs appwrite-realtime
+- docker-compose logs mariadb
 - docker-compose logs appwrite-worker-functions
 - docker-compose exec appwrite doctor
 - docker-compose exec appwrite vars

CHANGES.md

@@ -1,3 +1,79 @@
+# Version 0.12.0
+
+## Features
+
+- Completely rewritten Database service: **Breaking Change**
+  - Collection rules are now attributes
+  - Filters for have been replaced with a new, more powerful syntax
+  - Custom indexes for more performant queries
+  - Enum Attributes
+  - Maximum `sum` returned does not exceed 5000 documents anymore **Breaking Change**
+  - **DEPRECATED** Nested documents has been removed
+  - **DEPRECATED** Wildcard rule has been removed
+- You can now set custom ID’s when creating following resources:
+  - User
+  - Team
+  - Function
+  - Project
+  - File
+  - Collection
+  - Document
+- All resources with custom ID support required you to set an ID now
+  - Passing `unique()` will generate a unique ID
+- Auto-generated ID's are now 20 characters long
+- Wildcard permissions `*` are now `role:all` **Breaking Change**
+- Collections can be enabled and disabled
+- Permissions are now found as top-level keys `$read` and `$write` instead of nested under `$permissions`
+- Accessing collections with insufficient permissions now return a `401` isntead of `404` status code
+- Offset cannot be higher than 5000 now and cursor pagination is required
+- Added Cursor pagination to all endpoints that provide pagination by offset
+- Added new Usage worker to aggregate usage statistics
+- Added new Database worker to handle heavy database tasks in the background
+- Added detailed Usage statistics to following services in the Console:
+  - Users
+  - Storage
+  - Database
+- You can now disable/enable following services in the Console:
+  - Account
+  - Avatars
+  - Database
+  - Locale
+  - Health
+  - Storage
+  - Teams
+  - Users
+  - Functions
+- Fixed several memory leaks in the Console
+- Added pagination to account activities in the Console
+- Added following events from User service to Webhooks and Functions:
+  - `users.update.email`
+  - `users.update.name`
+  - `users.update.password`
+- Added new environment variables to enable error logging:
+  - The `_APP_LOGGING_PROVIDER` variable allows you to enable the logger set the value to one of `sentry`, `raygun`, `appsignal`.
+  - The `_APP_LOGGING_CONFIG` variable configures authentication to 3rd party error logging providers. If using Sentry, this should be 'SENTRY_API_KEY;SENTRY_APP_ID'. If using Raygun, this should be Raygun API key. If using AppSignal, this should be AppSignal API key.
+- Added new environment variable `_APP_USAGE_AGGREGATION_INTERVAL` to configure the usage worker interval
+- Added negative rotation values to file preview endpoint
+- Multiple responses from the Health service were changed to new (better) schema  **Breaking Change**
+- Method `health.getAntiVirus()` has been renamed to `health.getAntivirus()`
+- Added following langauges to the Locale service:
+  - Latin
+  - Sindhi
+  - Telugu
+- **DEPRECATED** Tasks service **Breaking Change**
+
+## Bugs
+- Fixed `/v1/avatars/initials` when no space in the name, will try to split by `_`
+- Fixed all audit logs now saving all relevant informations
+- Fixed Health endpoints for `db` and `cache`
+
+## Security
+- Increased minimum password length to 8 and removed maximum length
+- Limited User Preferences to 65kb total size
+- Upgraded Redis to 6.2
+- Upgraded InfluxDB to 1.4.0
+- Upgraded Telegraf to 1.3.0
+
 # Version 0.11.0
 
 ## Features
@@ -9,6 +85,8 @@
   - Deno 1.12
   - Deno 1.13
   - Deno 1.14
+  - PHP 8.1
+  - Node 17
 - Added translations:
   - German `de` by @SoftCreatR in https://github.com/appwrite/appwrite/pull/1790
   - Hebrew `he` by @Kokoden in https://github.com/appwrite/appwrite/pull/1846

CONTRIBUTING.md

@@ -284,6 +284,27 @@ docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
 
 The Runtimes for all supported cloud functions (multicore builds) can be found at the [appwrite/php-runtimes](https://github.com/appwrite/php-runtimes) repository.
 
+## Generate SDK
+
+For generating a new console SDK follow the next steps:
+
+1. Update the console spec file located at `app/config/specs/swagger2-0.12.x.console.json` from the dynamic version located at `https://localhost/specs/swagger2?platform=console`
+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
+
+* 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
+
 ## 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.

Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /usr/local/src/
 COPY composer.lock /usr/local/src/
 COPY composer.json /usr/local/src/
 
-RUN composer update --ignore-platform-reqs --optimize-autoloader \
+RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
@@ -29,11 +29,12 @@ FROM php:8.0-cli-alpine as compile
 ARG DEBUG=false
 ENV DEBUG=$DEBUG
 
-ENV PHP_REDIS_VERSION=5.3.4 \
-    PHP_SWOOLE_VERSION=v4.8.0 \
+ENV PHP_REDIS_VERSION=5.3.5 \
+    PHP_MONGODB_VERSION=1.9.1 \
+    PHP_SWOOLE_VERSION=v4.8.5 \
     PHP_IMAGICK_VERSION=3.5.1 \
-    PHP_YAML_VERSION=2.2.1 \
-    PHP_MAXMINDDB_VERSION=v1.10.1
+    PHP_YAML_VERSION=2.2.2 \
+    PHP_MAXMINDDB_VERSION=v1.11.0
 
 RUN \
   apk add --no-cache --virtual .deps \
@@ -112,6 +113,16 @@ RUN \
   ./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
+
 FROM php:8.0-cli-alpine as final
 
 LABEL maintainer="team@appwrite.io"
@@ -170,7 +181,9 @@ ENV _APP_SERVER=swoole \
     _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
     # 1 Day = 86400 s
     _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
-    _APP_MAINTENANCE_INTERVAL=86400
+    _APP_MAINTENANCE_INTERVAL=86400 \
+    _APP_LOGGING_PROVIDER= \
+    _APP_LOGGING_CONFIG=
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
@@ -213,6 +226,7 @@ COPY --from=redis /usr/local/lib/php/extensions/no-debug-non-zts-20200930/redis.
 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/
 
 # Add Source Code
 COPY ./app /usr/src/code/app
@@ -239,21 +253,22 @@ RUN mkdir -p /storage/uploads && \
 # Executables
 RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/maintenance && \
+    chmod +x /usr/local/bin/usage && \
     chmod +x /usr/local/bin/install && \
     chmod +x /usr/local/bin/migrate && \
     chmod +x /usr/local/bin/realtime && \
     chmod +x /usr/local/bin/schedule && \
     chmod +x /usr/local/bin/sdks && \
+    chmod +x /usr/local/bin/specs && \
     chmod +x /usr/local/bin/ssl && \
     chmod +x /usr/local/bin/test && \
     chmod +x /usr/local/bin/vars && \
     chmod +x /usr/local/bin/worker-audits && \
     chmod +x /usr/local/bin/worker-certificates && \
+    chmod +x /usr/local/bin/worker-database && \
     chmod +x /usr/local/bin/worker-deletes && \
     chmod +x /usr/local/bin/worker-functions && \
     chmod +x /usr/local/bin/worker-mails && \
-    chmod +x /usr/local/bin/worker-tasks && \
-    chmod +x /usr/local/bin/worker-usage && \
     chmod +x /usr/local/bin/worker-webhooks
 
 # Letsencrypt Permissions

README.md

@@ -58,7 +58,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.11.0
+    appwrite/appwrite:0.12.0
 ```
 
 ### Windows
@@ -70,7 +70,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:0.11.0
+    appwrite/appwrite:0.12.0
 ```
 
 #### PowerShell
@@ -80,7 +80,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.11.0
+    appwrite/appwrite:0.12.0
 ```
 
 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.

app/cli.php

@@ -1,6 +1,6 @@
 <?php
-
-require_once __DIR__.'/workers.php';
+require_once __DIR__.'/init.php';
+require_once __DIR__.'/controllers/general.php';
 
 use Utopia\App;
 use Utopia\CLI\CLI;
@@ -13,8 +13,10 @@ include 'tasks/maintenance.php';
 include 'tasks/install.php';
 include 'tasks/migrate.php';
 include 'tasks/sdks.php';
+include 'tasks/specs.php';
 include 'tasks/ssl.php';
 include 'tasks/vars.php';
+include 'tasks/usage.php';
 
 $cli
     ->task('version')

app/config/auth.php

@@ -5,7 +5,7 @@
 return [
     'email-password' => [
         'name' => 'Email/Password',
-        'key' => 'usersAuthEmailPassword',
+        'key' => 'emailPassword',
         'icon' => '/images/users/email.png',
         'docs' => 'https://appwrite.io/docs/client/account?sdk=web#accountCreateSession',
         'enabled' => true,
@@ -19,28 +19,28 @@ return [
     ],
     'anonymous' => [
         'name' => 'Anonymous',
-        'key' => 'usersAuthAnonymous',
+        'key' => 'anonymous',
         'icon' => '/images/users/anonymous.png',
         'docs' => 'https://appwrite.io/docs/client/account?sdk=web#accountCreateAnonymousSession',
         'enabled' => true,
     ],
     'invites' => [
         'name' => 'Invites',
-        'key' => 'usersAuthInvites',
+        'key' => 'invites',
         'icon' => '/images/users/invites.png',
         'docs' => 'https://appwrite.io/docs/client/teams?sdk=web#teamsCreateMembership',
         'enabled' => true,
     ],
     'jwt' => [
         'name' => 'JWT',
-        'key' => 'usersAuthJWT',
+        'key' => 'JWT',
         'icon' => '/images/users/jwt.png',
         'docs' => 'https://appwrite.io/docs/client/account?sdk=web#accountCreateJWT',
         'enabled' => true,
     ],
     'phone' => [
         'name' => 'Phone',
-        'key' => 'usersAuthPhone',
+        'key' => 'phone',
         'icon' => '/images/users/phone.png',
         'docs' => '',
         'enabled' => false,

app/config/events.php

@@ -27,6 +27,21 @@ return [
         'model' => Response::MODEL_USER,
         'note' => '',
     ],
+    'users.update.email' => [
+        'description' => 'This event triggers when the user email address is updated.',
+        'model' => Response::MODEL_USER,
+        'note' => '',
+    ],
+    'users.update.name' => [
+        'description' => 'This event triggers when the user name is updated.',
+        'model' => Response::MODEL_USER,
+        'note' => '',
+    ],
+    'users.update.password' => [
+        'description' => 'This event triggers when the user password is updated.',
+        'model' => Response::MODEL_USER,
+        'note' => '',
+    ],
     'account.update.prefs' => [
         'description' => 'This event triggers when the account preferences are updated.',
         'model' => Response::MODEL_USER,
@@ -82,6 +97,26 @@ return [
         'model' => Response::MODEL_COLLECTION,
         'note' => '',
     ],
+    'database.attributes.create' => [
+        'description' => 'This event triggers when a collection attribute is created.',
+        'model' => Response::MODEL_ATTRIBUTE,
+        'note' => '',
+    ],
+    'database.attributes.delete' => [
+        'description' => 'This event triggers when a collection attribute is deleted.',
+        'model' => Response::MODEL_ATTRIBUTE,
+        'note' => '',
+    ],
+    'database.indexes.create' => [
+        'description' => 'This event triggers when a collection index is created.',
+        'model' => Response::MODEL_INDEX,
+        'note' => '',
+    ],
+    'database.indexes.delete' => [
+        'description' => 'This event triggers when a collection index is deleted.',
+        'model' => Response::MODEL_INDEX,
+        'note' => '',
+    ],
     'database.documents.create' => [
         'description' => 'This event triggers when a database document is created.',
         'model' => Response::MODEL_DOCUMENT,

app/config/platforms.php

@@ -15,7 +15,7 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '5.0.0',
+                'version' => '6.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' => '2.1.0',
+                'version' => '3.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -81,7 +81,7 @@ return [
             [
                 'key' => 'apple',
                 'name' => 'Apple',
-                'version' => '0.1.1',
+                'version' => '0.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-apple',
                 'package' => 'https://github.com/appwrite/sdk-for-apple',
                 'enabled' => true,
@@ -116,7 +116,7 @@ return [
             [
                 'key' => 'android',
                 'name' => 'Android',
-                'version' => '0.2.1',
+                'version' => '0.3.0',
                 'url' => 'https://github.com/appwrite/sdk-for-android',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-android',
                 'enabled' => true,
@@ -158,7 +158,7 @@ return [
         'name' => 'Console',
         'enabled' => false,
         'beta' => false,
-        'languages' => [ // TODO change key to 'sdks'
+        'languages' => [
             [
                 'key' => 'web',
                 'name' => 'Console',
@@ -186,11 +186,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' => [ // TODO change key to 'sdks'
+        'languages' => [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '3.0.0',
+                'version' => '4.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
@@ -208,7 +208,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '1.0.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -226,7 +226,7 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '2.3.2',
+                'version' => '3.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
@@ -244,7 +244,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '0.5.1',
+                'version' => '0.6.0',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -262,7 +262,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '2.4.1',
+                'version' => '3.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -316,7 +316,7 @@ return [
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '0.3.0',
+                'version' => '0.4.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => false,
@@ -334,7 +334,7 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '2.0.0',
+                'version' => '3.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
@@ -352,7 +352,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '0.12.1',
+                'version' => '0.13.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://github.com/appwrite/sdk-for-cli',
                 'enabled' => true,
@@ -370,7 +370,7 @@ return [
             [
                 'key' => 'kotlin',
                 'name' => 'Kotlin',
-                'version' => '0.1.1',
+                'version' => '0.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-kotlin',
                 'package' => 'https://search.maven.org/artifact/io.appwrite/sdk-for-kotlin',
                 'enabled' => true,
@@ -392,7 +392,7 @@ return [
             [
                 'key' => 'swift',
                 'name' => 'Swift',
-                'version' => '0.1.0',
+                'version' => '0.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-swift',
                 'package' => 'https://github.com/appwrite/sdk-for-swift',
                 'enabled' => true,

app/config/roles.php

@@ -36,8 +36,6 @@ $admins = [
     'platforms.write',
     'keys.read',
     'keys.write',
-    'tasks.read',
-    'tasks.write',
     'webhooks.read',
     'webhooks.write',
     'locale.read',

app/config/scopes.php

@@ -19,6 +19,18 @@ return [ // List of publicly visible scopes
     'collections.write' => [
         'description' => 'Access to create, update, and delete your project\'s database collections',
     ],
+    'attributes.read' => [
+        'description' => 'Access to read your project\'s database collection\'s attributes',
+    ],
+    'attributes.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database collection\'s attributes',
+    ],
+    'indexes.read' => [
+        'description' => 'Access to read your project\'s database collection\'s indexes',
+    ],
+    'indexes.write' => [
+        'description' => 'Access to create, update, and delete your project\'s database collection\'s indexes',
+    ],
     'documents.read'  => [
         'description' => 'Access to read your project\'s database documents',
     ],

app/config/services.php

@@ -5,20 +5,29 @@ return [
         'key' => 'homepage',
         'name' => 'Homepage',
         'subtitle' => '',
+        'description' => '',
         'controller' => 'web/home.php',
         'sdk' => false,
         'docs' => false,
+        'docsUrl' => '',
         'tests' => false,
+        'optional' => false,
+        'icon' => '',
     ],
-    'console/' => [
+    'console' => [
         'key' => 'console',
         'name' => 'Console',
+        'subtitle' => '',
+        'description' => '',
         'controller' => 'web/console.php',
         'sdk' => false,
         'docs' => false,
+        'docsUrl' => '',
         'tests' => false,
+        'optional' => false,
+        'icon' => '',
     ],
-    'v1/account' => [
+    'account' => [
         'key' => 'account',
         'name' => 'Account',
         'subtitle' => 'The Account service allows you to authenticate and manage a user account.',
@@ -26,9 +35,12 @@ return [
         'controller' => 'api/account.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/client/account',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/account.png',
     ],
-    'v1/avatars' => [
+    'avatars' => [
         'key' => 'avatars',
         'name' => 'Avatars',
         'subtitle'=> 'The Avatars service aims to help you complete everyday tasks related to your app image, icons, and avatars.',
@@ -36,9 +48,12 @@ return [
         'controller' => 'api/avatars.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/client/avatars',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/avatars.png',
     ],
-    'v1/database' => [
+    'database' => [
         'key' => 'database',
         'name' => 'Database',
         'subtitle' => 'The Database service allows you to create structured collections of documents, query and filter lists of documents',
@@ -46,9 +61,12 @@ return [
         'controller' => 'api/database.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/client/database',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/database.png',
     ],
-    'v1/locale' => [
+    'locale' => [
         'key' => 'locale',
         'name' => 'Locale',
         'subtitle' => 'The Locale service allows you to customize your app based on your users\' location.',
@@ -56,9 +74,12 @@ return [
         'controller' => 'api/locale.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/client/locale',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/locale.png',
     ],
-    'v1/health' => [
+    'health' => [
         'key' => 'health',
         'name' => 'Health',
         'subtitle' => 'The Health service allows you to both validate and monitor your Appwrite server\'s health.',
@@ -66,18 +87,25 @@ return [
         'controller' => 'api/health.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/server/health',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/health.png',
     ],
-    'v1/projects' => [
+    'projects' => [
         'key' => 'projects',
         'name' => 'Projects',
         'subtitle' => 'The Project service allows you to manage all the projects in your Appwrite server.',
+        'description' => '',
         'controller' => 'api/projects.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => '',
         'tests' => false,
+        'optional' => false,
+        'icon' => '',
     ],
-    'v1/storage' => [
+    'storage' => [
         'key' => 'storage',
         'name' => 'Storage',
         'subtitle' => 'The Storage service allows you to manage your project files.',
@@ -85,9 +113,12 @@ return [
         'controller' => 'api/storage.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/client/storage',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/storage.png',
     ],
-    'v1/teams' => [
+    'teams' => [
         'key' => 'teams',
         'name' => 'Teams',
         'subtitle' => 'The Teams service allows you to group users of your project and to enable them to share read and write access to your project resources',
@@ -95,9 +126,12 @@ return [
         'controller' => 'api/teams.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/client/teams',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/teams.png',
     ],
-    'v1/users' => [
+    'users' => [
         'key' => 'users',
         'name' => 'Users',
         'subtitle' => 'The Users service allows you to manage your project users.',
@@ -105,9 +139,12 @@ return [
         'controller' => 'api/users.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/server/users',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/users.png',
     ],
-    'v1/functions' => [
+    'functions' => [
         'key' => 'functions',
         'name' => 'Functions',
         'subtitle' => 'The Functions Service allows you view, create and manage your Cloud Functions.',
@@ -115,9 +152,12 @@ return [
         'controller' => 'api/functions.php',
         'sdk' => true,
         'docs' => true,
+        'docsUrl' => 'https://appwrite.io/docs/functions',
         'tests' => false,
+        'optional' => true,
+        'icon' => '/images/services/functions.png',
     ],
-    'v1/mock' => [
+    'mock' => [
         'key' => 'mock',
         'name' => 'Mock',
         'subtitle' => '',
@@ -125,9 +165,12 @@ return [
         'controller' => 'mock.php',
         'sdk' => false,
         'docs' => false,
+        'docsUrl' => '',
         'tests' => true,
+        'optional' => false,
+        'icon' => '',
     ],
-    'v1/graphql' => [
+    'graphql' => [
         'key' => 'graphql',
         'name' => 'GraphQL',
         'subtitle' => 'Appwrite\'s GraphQL Endpoint',
@@ -135,6 +178,9 @@ return [
         'controller' => 'api/graphql.php',
         'sdk' => false,
         'docs' => false,
-        'tests' => false,
+        'docsUrl' => '',
+        'tests' => true,
+        'optional' => false,
+        'icon' => '',
     ],
 ];

app/config/variables.php

@@ -149,6 +149,33 @@ return [
                 'required' => false,
                 'question' => '',
                 'filter' => ''
+            ],
+            [
+                'name' => '_APP_LOGGING_PROVIDER',
+                'description' => 'This variable allows you to enable logging errors to 3rd party providers. This value is empty by default, to enable the logger set the value to one of \'sentry\', \'raygun\', \'appsignal\'',
+                'introduction' => '0.12.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_LOGGING_CONFIG',
+                'description' => 'This variable configures authentication to 3rd party error logging providers. If using Sentry, this should be \'SENTRY_API_KEY;SENTRY_APP_ID\'. If using Raygun, this should be Raygun API key. If using AppSignal, this should be AppSignal API key.',
+                'introduction' => '0.12.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_USAGE_AGGREGATION_INTERVAL',
+                'description' => 'Interval value containing the number of seconds that the Appwrite usage process should wait before aggregating stats and syncing it to mariadb from InfluxDB. The default value is 30 seconds.',
+                'introduction' => '0.10.0',
+                'default' => '30',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
             ]
         ],
     ],

app/controllers/api/avatars.php

@@ -95,9 +95,7 @@ App::get('/v1/avatars/credit-cards/:code')
     ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->inject('response')
-    ->action(function ($code, $width, $height, $quality, $response) use ($avatarCallback) {
-        return $avatarCallback('credit-cards', $code, $width, $height, $quality, $response);
-    });
+    ->action(fn($code, $width, $height, $quality, $response) =>  $avatarCallback('credit-cards', $code, $width, $height, $quality, $response));
 
 App::get('/v1/avatars/browsers/:code')
     ->desc('Get Browser Icon')
@@ -115,9 +113,7 @@ App::get('/v1/avatars/browsers/:code')
     ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->inject('response')
-    ->action(function ($code, $width, $height, $quality, $response) use ($avatarCallback) {
-        return $avatarCallback('browsers', $code, $width, $height, $quality, $response);
-    });
+    ->action(fn($code, $width, $height, $quality, $response) => $avatarCallback('browsers', $code, $width, $height, $quality, $response));
 
 App::get('/v1/avatars/flags/:code')
     ->desc('Get Country Flag')
@@ -135,9 +131,7 @@ App::get('/v1/avatars/flags/:code')
     ->param('height', 100, new Range(0, 2000), 'Image height. Pass an integer between 0 to 2000. Defaults to 100.', true)
     ->param('quality', 100, new Range(0, 100), 'Image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
     ->inject('response')
-    ->action(function ($code, $width, $height, $quality, $response) use ($avatarCallback) {
-        return $avatarCallback('flags', $code, $width, $height, $quality, $response);
-    });
+    ->action(fn($code, $width, $height, $quality, $response) => $avatarCallback('flags', $code, $width, $height, $quality, $response));
 
 App::get('/v1/avatars/image')
     ->desc('Get Image from URL')
@@ -424,7 +418,7 @@ App::get('/v1/avatars/initials')
     ->inject('user')
     ->action(function ($name, $width, $height, $color, $background, $response, $user) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $user */
 
         $themes = [
             ['color' => '#27005e', 'background' => '#e1d2f6'], // VIOLET
@@ -443,6 +437,9 @@ App::get('/v1/avatars/initials')
 
         $name = (!empty($name)) ? $name : $user->getAttribute('name', $user->getAttribute('email', ''));
         $words = \explode(' ', \strtoupper($name));
+        // if there is no space, try to split by `_` underscore
+        $words = (count($words) == 1 ) ? \explode('_', \strtoupper($name)) : $words;
+        
         $initials = null;
         $code = 0;
 
@@ -455,7 +452,6 @@ App::get('/v1/avatars/initials')
             }
         }
 
-        $length = \count($words);
         $rand = \substr($code, -1);
         $background = (!empty($background)) ? '#' . $background : $themes[$rand]['background'];
         $color = (!empty($color)) ? '#' . $color : $themes[$rand]['color'];

app/controllers/api/functions.php

@@ -2,10 +2,8 @@
 
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Database;
-use Appwrite\Database\Document;
-use Appwrite\Database\Validator\Authorization;
-use Appwrite\Database\Validator\UID;
+use Appwrite\Database\Validator\CustomId;
+use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 use Utopia\Storage\Validator\File;
 use Utopia\Storage\Validator\FileExt;
@@ -14,6 +12,11 @@ use Utopia\Storage\Validator\Upload;
 use Appwrite\Utopia\Response;
 use Appwrite\Task\Validator\Cron;
 use Utopia\App;
+use Utopia\Exception;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
@@ -21,7 +24,6 @@ use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 use Utopia\Config\Config;
 use Cron\CronExpression;
-use Utopia\Exception;
 
 include_once __DIR__ . '/../shared/api.php';
 
@@ -37,24 +39,24 @@ 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('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-    ->param('execute', [], new ArrayList(new Text(64)), 'An array of strings with execution permissions. By default no user is granted with any execute permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
+    ->param('execute', [], new ArrayList(new Text(64)), 'An array of strings with execution permissions. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
     ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.')
-    ->param('vars', [], new Assoc(), 'Key-value JSON object.', true)
+    ->param('vars', [], new Assoc(), 'Key-value JSON object that will be passed to the function as environment variables.', true)
     ->param('events', [], new ArrayList(new WhiteList(array_keys(Config::getParam('events')), true)), 'Events list.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
     ->param('timeout', 15, new Range(1, 900), 'Function maximum execution time in seconds.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($name, $execute, $runtime, $vars, $events, $schedule, $timeout, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $name, $execute, $runtime, $vars, $events, $schedule, $timeout, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $function = $projectDB->createDocument([
-            '$collection' => Database::SYSTEM_COLLECTION_FUNCTIONS,
-            '$permissions' => [
-                'execute' => $execute,
-            ],
+        $functionId = ($functionId == 'unique()') ? $dbForProject->getId() : $functionId;
+        $function = $dbForProject->createDocument('functions', new Document([
+            '$id' => $functionId,
+            'execute' => $execute,
             'dateCreated' => time(),
             'dateUpdated' => time(),
             'status' => 'disabled',
@@ -64,19 +66,14 @@ App::post('/v1/functions')
             'vars' => $vars,
             'events' => $events,
             'schedule' => $schedule,
-            'schedulePrevious' => null,
-            'scheduleNext' => null,
+            'schedulePrevious' => 0,
+            'scheduleNext' => 0,
             'timeout' => $timeout,
-        ]);
+            'search' => implode(' ', [$functionId, $name, $runtime]),
+        ]));
 
-        if (false === $function) {
-            throw new Exception('Failed saving function to DB', 500);
-        }
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($function, Response::MODEL_FUNCTION)
-        ;
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
 App::get('/v1/functions')
@@ -91,31 +88,65 @@ App::get('/v1/functions')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION_LIST)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of functions to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this value to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursor', '', new UID(), 'ID of the function used as the starting point for the query, excluding the function itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $results = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_FUNCTIONS,
-            ],
-        ]);
+        if (!empty($cursor)) {
+            $cursorFunction = $dbForProject->getDocument('functions', $cursor);
+
+            if ($cursorFunction->isEmpty()) {
+                throw new Exception("Function '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $queries = [];
+
+        if (!empty($search)) {
+            $queries[] = new Query('search', Query::TYPE_SEARCH, [$search]);
+        }
 
         $response->dynamic(new Document([
-            'sum' => $projectDB->getSum(),
-            'functions' => $results
+            'functions' => $dbForProject->find('functions', $queries, $limit, $offset, [], [$orderType], $cursorFunction ?? null, $cursorDirection),
+            'sum' => $dbForProject->count('functions', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_FUNCTION_LIST);
     });
 
+App::get('/v1/functions/runtimes')
+    ->groups(['api', 'functions'])
+    ->desc('List the currently active function runtimes.')
+    ->label('scope', 'functions.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'functions')
+    ->label('sdk.method', 'listRuntimes')
+    ->label('sdk.description', '/docs/references/functions/list-runtimes.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_RUNTIME_LIST)
+    ->inject('response')
+    ->action(function ($response) {
+        /** @var Appwrite\Utopia\Response $response */
+
+        $runtimes = Config::getParam('runtimes');
+
+        $runtimes = array_map(function ($key) use ($runtimes) {
+            $runtimes[$key]['$id'] = $key;
+            return $runtimes[$key];
+        }, array_keys($runtimes));
+
+        $response->dynamic(new Document([ 
+            'sum' => count($runtimes),
+            'runtimes' => $runtimes
+        ]), Response::MODEL_RUNTIME_LIST);
+    });
+
 App::get('/v1/functions/:functionId')
     ->groups(['api', 'functions'])
     ->desc('Get Function')
@@ -127,16 +158,16 @@ App::get('/v1/functions/:functionId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($functionId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
@@ -150,118 +181,99 @@ App::get('/v1/functions/:functionId/usage')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'getUsage')
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_FUNCTIONS)
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d']), 'Date range.', true)
     ->inject('response')
-    ->inject('project')
-    ->inject('projectDB')
-    ->inject('register')
-    ->action(function ($functionId, $range, $response, $project, $projectDB, $register) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $range, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
-        /** @var Appwrite\Database\Database $consoleDB */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Utopia\Registry\Registry $register */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
         
+        $usage = [];
         if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
-            $period = [
+            $periods = [
                 '24h' => [
-                    'start' => DateTime::createFromFormat('U', \strtotime('-24 hours')),
-                    'end' => DateTime::createFromFormat('U', \strtotime('+1 hour')),
-                    'group' => '30m',
+                    'period' => '30m',
+                    'limit' => 48,
                 ],
                 '7d' => [
-                    'start' => DateTime::createFromFormat('U', \strtotime('-7 days')),
-                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                    'group' => '1d',
+                    'period' => '1d',
+                    'limit' => 7,
                 ],
                 '30d' => [
-                    'start' => DateTime::createFromFormat('U', \strtotime('-30 days')),
-                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                    'group' => '1d',
+                    'period' => '1d',
+                    'limit' => 30,
                 ],
                 '90d' => [
-                    'start' => DateTime::createFromFormat('U', \strtotime('-90 days')),
-                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                    'group' => '1d',
+                    'period' => '1d',
+                    'limit' => 90,
                 ],
             ];
+            
+            $metrics = [
+                "functions.$functionId.executions", 
+                "functions.$functionId.failures", 
+                "functions.$functionId.compute"
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function() use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
     
-            $client = $register->get('influxdb');
-    
-            $executions = [];
-            $failures = [];
-            $compute = [];
-    
-            if ($client) {
-                $start = $period[$range]['start']->format(DateTime::RFC3339);
-                $end = $period[$range]['end']->format(DateTime::RFC3339);
-                $database = $client->selectDB('telegraf');
-    
-                // Executions
-                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_executions_all" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' AND "functionId"=\''.$function->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
-                $points = $result->getPoints();
-    
-                foreach ($points as $point) {
-                    $executions[] = [
-                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
-                        'date' => \strtotime($point['time']),
-                    ];
-                }
-    
-                // Failures
-                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_executions_all" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' AND "functionId"=\''.$function->getId().'\' AND "functionStatus"=\'failed\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
-                $points = $result->getPoints();
-    
-                foreach ($points as $point) {
-                    $failures[] = [
-                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
-                        'date' => \strtotime($point['time']),
-                    ];
-                }
-    
-                // Compute
-                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_executions_time" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' AND "functionId"=\''.$function->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
-                $points = $result->getPoints();
-    
-                foreach ($points as $point) {
-                    $compute[] = [
-                        'value' => round((!empty($point['value'])) ? $point['value'] / 1000 : 0, 2), // minutes
-                        'date' => \strtotime($point['time']),
-                    ];
-                }
-            }
-    
-            $response->json([
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    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,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
+
+            $usage = new Document([
                 'range' => $range,
-                'executions' => [
-                    'data' => $executions,
-                    'total' => \array_sum(\array_map(function ($item) {
-                        return $item['value'];
-                    }, $executions)),
-                ],
-                'failures' => [
-                    'data' => $failures,
-                    'total' => \array_sum(\array_map(function ($item) {
-                        return $item['value'];
-                    }, $failures)),
-                ],
-                'compute' => [
-                    'data' => $compute,
-                    'total' => \array_sum(\array_map(function ($item) {
-                        return $item['value'];
-                    }, $compute)),
-                ],
+                'functionsExecutions' => $stats["functions.$functionId.executions"],
+                'functionsFailures' => $stats["functions.$functionId.failures"],
+                'functionsCompute' => $stats["functions.$functionId.compute"]
             ]);
-        } else {
-            $response->json([]);
         }
+
+        $response->dynamic($usage, Response::MODEL_USAGE_FUNCTIONS);
     });
 
 App::put('/v1/functions/:functionId')
@@ -276,47 +288,42 @@ App::put('/v1/functions/:functionId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-    ->param('execute', [], new ArrayList(new Text(64)), 'An array of strings with execution permissions. By default no user is granted with any execute permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
-    ->param('vars', [], new Assoc(), 'Key-value JSON object.', true)
+    ->param('execute', [], new ArrayList(new Text(64)), 'An array of strings with execution permissions. By default no user is granted with any execute permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
+    ->param('vars', [], new Assoc(), 'Key-value JSON object that will be passed to the function as environment variables.', true)
     ->param('events', [], new ArrayList(new WhiteList(array_keys(Config::getParam('events')), true)), 'Events list.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
-    ->param('timeout', 15, new Range(1, 900), 'Function maximum execution time in seconds.', true)
+    ->param('timeout', 15, new Range(1, 900), 'Maximum execution time in seconds.', true)
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('project')
-    ->action(function ($functionId, $name, $execute, $vars, $events, $schedule, $timeout, $response, $projectDB, $project) {
+    ->action(function ($functionId, $name, $execute, $vars, $events, $schedule, $timeout, $response, $dbForProject, $project) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Utopia\Database\Document $project */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
         $original = $function->getAttribute('schedule', '');
         $cron = (!empty($function->getAttribute('tag', null)) && !empty($schedule)) ? new CronExpression($schedule) : null;
-        $next = (!empty($function->getAttribute('tag', null)) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : null;
+        $next = (!empty($function->getAttribute('tag', null)) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : 0;
 
-        $function = $projectDB->updateDocument(array_merge($function->getArrayCopy(), [
-            '$permissions' => [
-                'execute' => $execute,
-            ],
+        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
+            'execute' => $execute,
             'dateUpdated' => time(),
             'name' => $name,
             'vars' => $vars,
             'events' => $events,
             'schedule' => $schedule,
-            'scheduleNext' => $next,
+            'scheduleNext' => (int)$next,
             'timeout' => $timeout,
-        ]));
-
-        if (false === $function) {
-            throw new Exception('Failed saving function to DB', 500);
-        }
+            'search' => implode(' ', [$functionId, $name, $function->getAttribute('runtime')]),
+        ])));
 
         if ($next && $schedule !== $original) {
             ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
@@ -343,35 +350,35 @@ App::patch('/v1/functions/:functionId/tag')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FUNCTION)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
-    ->param('tag', '', new UID(), 'Tag unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('tag', '', new UID(), 'Tag ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('project')
-    ->action(function ($functionId, $tag, $response, $projectDB, $project) {
+    ->action(function ($functionId, $tag, $response, $dbForProject, $project) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Utopia\Database\Document $project */
 
-        $function = $projectDB->getDocument($functionId);
-        $tag = $projectDB->getDocument($tag);
+        $function = $dbForProject->getDocument('functions', $functionId);
+        $tag = $dbForProject->getDocument('tags', $tag);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
-        if (empty($tag->getId()) || Database::SYSTEM_COLLECTION_TAGS != $tag->getCollection()) {
+        if ($tag->isEmpty()) {
             throw new Exception('Tag not found', 404);
         }
 
         $schedule = $function->getAttribute('schedule', '');
         $cron = (empty($function->getAttribute('tag')) && !empty($schedule)) ? new CronExpression($schedule) : null;
-        $next = (empty($function->getAttribute('tag')) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : null;
+        $next = (empty($function->getAttribute('tag')) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : 0;
 
-        $function = $projectDB->updateDocument(array_merge($function->getArrayCopy(), [
+        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
             'tag' => $tag->getId(),
-            'scheduleNext' => $next,
-        ]));
+            'scheduleNext' => (int)$next,
+        ])));
 
         if ($next) { // Init first schedule
             ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
@@ -383,10 +390,6 @@ App::patch('/v1/functions/:functionId/tag')
             ]);  // Async task rescheduale
         }
 
-        if (false === $function) {
-            throw new Exception('Failed saving function to DB', 500);
-        }
-
         $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
@@ -401,28 +404,28 @@ App::delete('/v1/functions/:functionId')
     ->label('sdk.description', '/docs/references/functions/delete-function.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('deletes')
-    ->action(function ($functionId, $response, $projectDB, $deletes) {
+    ->action(function ($functionId, $response, $dbForProject, $deletes) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $deletes */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
-        if (!$projectDB->deleteDocument($function->getId())) {
+        if (!$dbForProject->deleteDocument('functions', $function->getId())) {
             throw new Exception('Failed to remove function from DB', 500);
         }
 
         $deletes
             ->setParam('type', DELETE_TYPE_DOCUMENT)
-            ->setParam('document', $function->getArrayCopy())
+            ->setParam('document', $function)
         ;
 
         $response->noContent();
@@ -442,22 +445,22 @@ App::post('/v1/functions/:functionId/tags')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TAG)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->param('command', '', new Text('1028'), 'Code execution command.')
     ->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)
     ->inject('request')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('usage')
-    ->action(function ($functionId, $command, $file, $request, $response, $projectDB, $usage) {
-        /** @var Utopia\Swoole\Request $request */
+    ->action(function ($functionId, $command, $file, $request, $response, $dbForProject, $usage) {
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $usage */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
@@ -496,31 +499,25 @@ App::post('/v1/functions/:functionId/tags')
             throw new Exception('Failed moving file', 500);
         }
         
-        $tag = $projectDB->createDocument([
-            '$collection' => Database::SYSTEM_COLLECTION_TAGS,
-            '$permissions' => [
-                'read' => [],
-                'write' => [],
-            ],
+        $tagId = $dbForProject->getId();
+        $tag = $dbForProject->createDocument('tags', new Document([
+            '$id' => $tagId,
+            '$read' => [],
+            '$write' => [],
             'functionId' => $function->getId(),
             'dateCreated' => time(),
             'command' => $command,
             'path' => $path,
             'size' => $size,
-        ]);
-
-        if (false === $tag) {
-            throw new Exception('Failed saving tag to DB', 500);
-        }
+            'search' => implode(' ', [$tagId, $command]),
+        ]));
 
         $usage
             ->setParam('storage', $tag->getAttribute('size', 0))
         ;
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($tag, Response::MODEL_TAG)
-        ;
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($tag, Response::MODEL_TAG);
     });
 
 App::get('/v1/functions/:functionId/tags')
@@ -534,37 +531,47 @@ App::get('/v1/functions/:functionId/tags')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TAG_LIST)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of tags to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this value to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursor', '', new UID(), 'ID of the tag used as the starting point for the query, excluding the tag itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($functionId, $search, $limit, $offset, $orderType, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
-        
-        $results = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_TAGS,
-                'functionId='.$function->getId(),
-            ],
-        ]);
+
+        if (!empty($cursor)) {
+            $cursorTag = $dbForProject->getDocument('tags', $cursor);
+
+            if ($cursorTag->isEmpty()) {
+                throw new Exception("Tag '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $queries = [];
+
+        if (!empty($search)) {
+            $queries[] = new Query('search', Query::TYPE_SEARCH, [$search]);
+        }
+
+        $queries[] = new Query('functionId', Query::TYPE_EQUAL, [$function->getId()]);
+
+        $results = $dbForProject->find('tags', $queries, $limit, $offset, [], [$orderType], $cursorTag ?? null, $cursorDirection);
+        $sum = $dbForProject->count('tags', $queries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
-            'sum' => $projectDB->getSum(),
-            'tags' => $results
+            'tags' => $results,
+            'sum' => $sum,
         ]), Response::MODEL_TAG_LIST);
     });
 
@@ -579,27 +586,27 @@ App::get('/v1/functions/:functionId/tags/:tagId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_TAG)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
-    ->param('tagId', '', new UID(), 'Tag unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('tagId', '', new UID(), 'Tag ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($functionId, $tagId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $tagId, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
-        $tag = $projectDB->getDocument($tagId);
+        $tag = $dbForProject->getDocument('tags', $tagId);
 
         if ($tag->getAttribute('functionId') !== $function->getId()) {
             throw new Exception('Tag not found', 404);
         }
 
-        if (empty($tag->getId()) || Database::SYSTEM_COLLECTION_TAGS != $tag->getCollection()) {
+        if ($tag->isEmpty()) {
             throw new Exception('Tag not found', 404);
         }
 
@@ -617,48 +624,44 @@ App::delete('/v1/functions/:functionId/tags/:tagId')
     ->label('sdk.description', '/docs/references/functions/delete-tag.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
-    ->param('tagId', '', new UID(), 'Tag unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('tagId', '', new UID(), 'Tag ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('usage')
-    ->action(function ($functionId, $tagId, $response, $projectDB, $usage) {
+    ->action(function ($functionId, $tagId, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $usage */
 
-        $function = $projectDB->getDocument($functionId);
+        $function = $dbForProject->getDocument('functions', $functionId);
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
         
-        $tag = $projectDB->getDocument($tagId);
+        $tag = $dbForProject->getDocument('tags', $tagId);
 
         if ($tag->getAttribute('functionId') !== $function->getId()) {
             throw new Exception('Tag not found', 404);
         }
 
-        if (empty($tag->getId()) || Database::SYSTEM_COLLECTION_TAGS != $tag->getCollection()) {
+        if ($tag->isEmpty()) {
             throw new Exception('Tag not found', 404);
         }
 
         $device = Storage::getDevice('functions');
 
         if ($device->delete($tag->getAttribute('path', ''))) {
-            if (!$projectDB->deleteDocument($tag->getId())) {
+            if (!$dbForProject->deleteDocument('tags', $tag->getId())) {
                 throw new Exception('Failed to remove tag from DB', 500);
             }
         }
 
         if($function->getAttribute('tag') === $tag->getId()) { // Reset function tag
-            $function = $projectDB->updateDocument(array_merge($function->getArrayCopy(), [
+            $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
                 'tag' => '',
-            ]));
-    
-            if (false === $function) {
-                throw new Exception('Failed saving function to DB', 500);
-            }
+            ])));
         }
 
         $usage
@@ -682,76 +685,66 @@ App::post('/v1/functions/:functionId/executions')
     ->label('sdk.response.model', Response::MODEL_EXECUTION)
     ->label('abuse-limit', 60)
     ->label('abuse-time', 60)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
     ->param('data', '', new Text(8192), 'String of custom data to send to function.', true)
     // ->param('async', 1, new Range(0, 1), 'Execute code asynchronously. Pass 1 for true, 0 for false. Default value is 1.', true)
     ->inject('response')
     ->inject('project')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('user')
-    ->action(function ($functionId, $data, /*$async,*/ $response, $project, $projectDB, $user) {
+    ->action(function ($functionId, $data, /*$async,*/ $response, $project, $dbForProject, $user) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
-        /** @var Appwrite\Database\Database $projectDB */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Utopia\Database\Document $user */
 
-        Authorization::disable();
+        $function = Authorization::skip(fn() => $dbForProject->getDocument('functions', $functionId));
 
-        $function = $projectDB->getDocument($functionId);
-
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
-        $tag = $projectDB->getDocument($function->getAttribute('tag'));
+        $tag = Authorization::skip(fn() => $dbForProject->getDocument('tags', $function->getAttribute('tag')));
 
         if ($tag->getAttribute('functionId') !== $function->getId()) {
             throw new Exception('Tag not found. Deploy tag before trying to execute a function', 404);
         }
 
-        if (empty($tag->getId()) || Database::SYSTEM_COLLECTION_TAGS != $tag->getCollection()) {
+        if ($tag->isEmpty()) {
             throw new Exception('Tag not found. Deploy tag before trying to execute a function', 404);
         }
 
-        Authorization::reset();
-
         $validator = new Authorization($function, 'execute');
 
-        if (!$validator->isValid($function->getPermissions())) { // Check if user has write access to execute function
+        if (!$validator->isValid($function->getAttribute('execute'))) { // Check if user has write access to execute function
             throw new Exception($validator->getDescription(), 401);
         }
 
-        Authorization::disable();
+        $executionId = $dbForProject->getId();
 
-        $execution = $projectDB->createDocument([
-            '$collection' => Database::SYSTEM_COLLECTION_EXECUTIONS,
-            '$permissions' => [
-                'read' => (!empty($user->getId())) ? ['user:' . $user->getId()] : [],
-                'write' => [],
-            ],
+        $execution = Authorization::skip(fn() => $dbForProject->createDocument('executions', new Document([
+            '$id' => $executionId,
+            '$read' => (!$user->isEmpty()) ? ['user:' . $user->getId()] : [],
+            '$write' => [],
             'dateCreated' => time(),
             'functionId' => $function->getId(),
+            'tagId' => $tag->getId(),
             'trigger' => 'http', // http / schedule / event
             'status' => 'waiting', // waiting / processing / completed / failed
             'exitCode' => 0,
             'stdout' => '',
             'stderr' => '',
-            'time' => 0,
-        ]);
+            'time' => 0.0,
+            'search' => implode(' ', [$functionId, $executionId]),
+        ])));
 
-        Authorization::reset();
-
-        if (false === $execution) {
-            throw new Exception('Failed saving execution to DB', 500);
-        }
-        
         $jwt = ''; // initialize
-        if (!empty($user->getId())) { // If userId exists, generate a JWT for function
-            
+        if (!$user->isEmpty()) { // If userId exists, generate a JWT for function
+
             $sessions = $user->getAttribute('sessions', []);
             $current = new Document();
 
-            foreach ($sessions as $session) { /** @var Appwrite\Database\Document $session */
+            foreach ($sessions as $session) { /** @var Utopia\Database\Document $session */
                 if ($session->getAttribute('secret') == Auth::hash(Auth::$secret)) { // If current session delete the cookies too
                     $current = $session;
                 }
@@ -777,10 +770,8 @@ App::post('/v1/functions/:functionId/executions')
             'jwt' => $jwt,
         ]);
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($execution, Response::MODEL_EXECUTION)
-        ;
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($execution, Response::MODEL_EXECUTION);
     });
 
 App::get('/v1/functions/:functionId/executions')
@@ -794,39 +785,46 @@ App::get('/v1/functions/:functionId/executions')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_EXECUTION_LIST)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of executions to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this value to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
-    ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
+    ->param('cursor', '', new UID(), 'ID of the execution used as the starting point for the query, excluding the execution itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($functionId, $search, $limit, $offset, $orderType, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $limit, $offset, $search, $cursor, $cursorDirection, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
-        
-        Authorization::disable();
-        $function = $projectDB->getDocument($functionId);
-        Authorization::reset();
+        /** @var Utopia\Database\Database $dbForProject */
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        $function = Authorization::skip(fn() => $dbForProject->getDocument('functions', $functionId));
+
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
-        
-        $results = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_EXECUTIONS,
-                'functionId='.$function->getId(),
-            ],
-        ]);
+
+        if (!empty($cursor)) {
+            $cursorExecution = $dbForProject->getDocument('executions', $cursor);
+
+            if ($cursorExecution->isEmpty()) {
+                throw new Exception("Execution '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $queries = [
+            new Query('functionId', Query::TYPE_EQUAL, [$function->getId()])
+        ];
+
+        if (!empty($search)) {
+            $queries[] = new Query('search', Query::TYPE_SEARCH, [$search]);
+        }
+
+        $results = $dbForProject->find('executions', $queries, $limit, $offset, [], [Database::ORDER_DESC], $cursorExecution ?? null, $cursorDirection);
+        $sum = $dbForProject->count('executions', $queries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
-            'sum' => $projectDB->getSum(),
-            'executions' => $results
+            'executions' => $results,
+            'sum' => $sum,
         ]), Response::MODEL_EXECUTION_LIST);
     });
 
@@ -841,29 +839,27 @@ App::get('/v1/functions/:functionId/executions/:executionId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_EXECUTION)
-    ->param('functionId', '', new UID(), 'Function unique ID.')
-    ->param('executionId', '', new UID(), 'Execution unique ID.')
+    ->param('functionId', '', new UID(), 'Function ID.')
+    ->param('executionId', '', new UID(), 'Execution ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($functionId, $executionId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($functionId, $executionId, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
-        
-        Authorization::disable();
-        $function = $projectDB->getDocument($functionId);
-        Authorization::reset();
+        /** @var Utopia\Database\Database $dbForProject */
 
-        if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+        $function = Authorization::skip(fn() => $dbForProject->getDocument('functions', $functionId));
+
+        if ($function->isEmpty()) {
             throw new Exception('Function not found', 404);
         }
 
-        $execution = $projectDB->getDocument($executionId);
+        $execution = $dbForProject->getDocument('executions', $executionId);
 
         if ($execution->getAttribute('functionId') !== $function->getId()) {
             throw new Exception('Execution not found', 404);
         }
 
-        if (empty($execution->getId()) || Database::SYSTEM_COLLECTION_EXECUTIONS != $execution->getCollection()) {
+        if ($execution->isEmpty()) {
             throw new Exception('Execution not found', 404);
         }
 

app/controllers/api/health.php

@@ -1,11 +1,13 @@
 <?php
 
+use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
+use Utopia\Database\Document;
 
 App::get('/v1/health')
     ->desc('Get HTTP')
@@ -15,22 +17,33 @@ App::get('/v1/health')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'get')
     ->label('sdk.description', '/docs/references/health/get.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['status' => 'OK']);
+        $output = [
+            'status' => 'pass',
+            'ping' => 0
+        ];
+
+        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
     });
 
 App::get('/v1/health/version')
     ->desc('Get Version')
     ->groups(['api', 'health'])
     ->label('scope', 'public')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_VERSION)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['version' => APP_VERSION_STABLE]);
+        $response->dynamic(new Document([ 'version' => APP_VERSION_STABLE ]), Response::MODEL_HEALTH_VERSION);
     });
 
 App::get('/v1/health/db')
@@ -41,11 +54,17 @@ App::get('/v1/health/db')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getDB')
     ->label('sdk.description', '/docs/references/health/get-db.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
     ->inject('utopia')
     ->action(function ($response, $utopia) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\App $utopia */
+
+        $checkStart = \microtime(true);
+
         try {
             $db = $utopia->getResource('db'); /* @var $db PDO */
 
@@ -59,7 +78,12 @@ App::get('/v1/health/db')
             throw new Exception('Database is not available', 500);
         }
 
-        return $response->json(['status' => 'OK']);
+        $output = [
+            'status' => 'pass',
+            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+        ];
+
+        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
     });
 
 App::get('/v1/health/cache')
@@ -70,19 +94,30 @@ App::get('/v1/health/cache')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getCache')
     ->label('sdk.description', '/docs/references/health/get-cache.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
     ->inject('utopia')
     ->action(function ($response, $utopia) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\App $utopia */
         /** @var Redis */
+
+        $checkStart = \microtime(true);
+
         $redis = $utopia->getResource('cache');
 
-        if ($redis->ping(true)) {
-            return $response->json(['status' => 'OK']);
-        } else {
+        if (!$redis->ping(true)) {
             throw new Exception('Cache is not available', 500);
         }
+
+        $output = [
+            'status' => 'pass',
+            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+        ];
+
+        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
     });
 
 App::get('/v1/health/time')
@@ -93,6 +128,9 @@ App::get('/v1/health/time')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getTime')
     ->label('sdk.description', '/docs/references/health/get-time.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_TIME)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
@@ -131,7 +169,13 @@ App::get('/v1/health/time')
             throw new Exception('Server time gaps detected');
         }
 
-        $response->json(['remote' => $timestamp, 'local' => \time(), 'diff' => $diff]);
+        $output = [
+            'remoteTime' => $timestamp,
+            'localTime' => \time(),
+            'diff' => $diff
+        ];
+
+        $response->dynamic(new Document($output), Response::MODEL_HEALTH_TIME);
     });
 
 App::get('/v1/health/queue/webhooks')
@@ -142,26 +186,14 @@ App::get('/v1/health/queue/webhooks')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getQueueWebhooks')
     ->label('sdk.description', '/docs/references/health/get-queue-webhooks.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size(Event::WEBHOOK_QUEUE_NAME)]);
-    }, ['response']);
-
-App::get('/v1/health/queue/tasks')
-    ->desc('Get Tasks Queue')
-    ->groups(['api', 'health'])
-    ->label('scope', 'health.read')
-    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
-    ->label('sdk.namespace', 'health')
-    ->label('sdk.method', 'getQueueTasks')
-    ->label('sdk.description', '/docs/references/health/get-queue-tasks.md')
-    ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
-
-        $response->json(['size' => Resque::size(Event::TASK_QUEUE_NAME)]);
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::WEBHOOK_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
 
 App::get('/v1/health/queue/logs')
@@ -172,11 +204,14 @@ App::get('/v1/health/queue/logs')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getQueueLogs')
     ->label('sdk.description', '/docs/references/health/get-queue-logs.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size(Event::AUDITS_QUEUE_NAME)]);
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::AUDITS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
 
 App::get('/v1/health/queue/usage')
@@ -187,11 +222,14 @@ App::get('/v1/health/queue/usage')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getQueueUsage')
     ->label('sdk.description', '/docs/references/health/get-queue-usage.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size(Event::USAGE_QUEUE_NAME)]);
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::USAGE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
 
 App::get('/v1/health/queue/certificates')
@@ -202,11 +240,14 @@ App::get('/v1/health/queue/certificates')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getQueueCertificates')
     ->label('sdk.description', '/docs/references/health/get-queue-certificates.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size(Event::CERTIFICATES_QUEUE_NAME)]);
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::CERTIFICATES_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
 
 App::get('/v1/health/queue/functions')
@@ -217,11 +258,14 @@ App::get('/v1/health/queue/functions')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getQueueFunctions')
     ->label('sdk.description', '/docs/references/health/get-queue-functions.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
-        $response->json(['size' => Resque::size(Event::FUNCTIONS_QUEUE_NAME)]);
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::FUNCTIONS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
 
 App::get('/v1/health/storage/local')
@@ -232,10 +276,15 @@ App::get('/v1/health/storage/local')
     ->label('sdk.namespace', 'health')
     ->label('sdk.method', 'getStorageLocal')
     ->label('sdk.description', '/docs/references/health/get-storage-local.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
+        $checkStart = \microtime(true);
+
         foreach ([
             'Uploads' => APP_STORAGE_UPLOADS,
             'Cache' => APP_STORAGE_CACHE,
@@ -253,41 +302,50 @@ App::get('/v1/health/storage/local')
             }
         }
 
-        $response->json(['status' => 'OK']);
+        $output = [
+            'status' => 'pass',
+            'ping' => \round((\microtime(true) - $checkStart) / 1000)
+        ];
+
+        $response->dynamic(new Document($output), Response::MODEL_HEALTH_STATUS);
     });
 
 App::get('/v1/health/anti-virus')
-    ->desc('Get Anti virus')
+    ->desc('Get Antivirus')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'health')
-    ->label('sdk.method', 'getAntiVirus')
+    ->label('sdk.method', 'getAntivirus')
     ->label('sdk.description', '/docs/references/health/get-storage-anti-virus.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_ANTIVIRUS)
     ->inject('response')
     ->action(function ($response) {
         /** @var Appwrite\Utopia\Response $response */
 
+        $output = [
+            'status' => '',
+            'version' => ''
+        ];
+
         if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'disabled') { // Check if scans are enabled
-            return $response->json([
-                'status' => 'disabled',
-                'version' => '',
-            ]);
+            $output['status'] = 'disabled';
+            $output['version'] = '';
+        } else {
+            $antivirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
+                (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310));
+
+            try {
+                $output['version'] = @$antivirus->version();
+                $output['status'] = (@$antivirus->ping()) ? 'pass' : 'fail';
+            } catch( \Exception $e) {
+                throw new Exception('Antivirus is not available', 500);
+            }
         }
 
-        $antiVirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
-            (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310));
-        try {
-            $response->json([
-                'status' => (@$antiVirus->ping()) ? 'online' : 'offline',
-                'version' => @$antiVirus->version(),
-            ]);
-        } catch( \Exception $e) {
-            $response->json([
-                'status' => 'offline',
-                'version' => '',
-            ]);
-        }
+        $response->dynamic(new Document($output), Response::MODEL_HEALTH_ANTIVIRUS);
     });
 
 App::get('/v1/health/stats') // Currently only used internally

app/controllers/api/locale.php

@@ -1,6 +1,6 @@
 <?php
 
-use Appwrite\Database\Document;
+use Utopia\Database\Document;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Config\Config;
@@ -21,7 +21,7 @@ App::get('/v1/locale')
     ->inject('locale')
     ->inject('geodb')
     ->action(function ($request, $response, $locale, $geodb) {
-        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Appwrite\Utopia\Response $response */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
@@ -224,9 +224,7 @@ App::get('/v1/locale/currencies')
 
         $list = Config::getParam('locale-currencies');
 
-        $list = array_map(function($node) {
-            return new Document($node);
-        }, $list);
+        $list = array_map(fn($node) => new Document($node), $list);
 
         $response->dynamic(new Document(['currencies' => $list, 'sum' => \count($list)]), Response::MODEL_CURRENCY_LIST);
     });
@@ -249,9 +247,7 @@ App::get('/v1/locale/languages')
 
         $list = Config::getParam('locale-languages');
 
-        $list = array_map(function($node) {
-            return new Document($node);
-        }, $list);
+        $list = array_map(fn ($node) => new Document($node), $list);
 
         $response->dynamic(new Document(['languages' => $list, 'sum' => \count($list)]), Response::MODEL_LANGUAGE_LIST);
     });

app/controllers/api/storage.php

@@ -1,5 +1,6 @@
 <?php
 
+use Appwrite\Auth\Auth;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Validator\ArrayList;
@@ -10,9 +11,10 @@ use Utopia\Validator\HexColor;
 use Utopia\Cache\Cache;
 use Utopia\Cache\Adapter\Filesystem;
 use Appwrite\ClamAV\Network;
-use Appwrite\Database\Database;
-use Appwrite\Database\Document;
-use Appwrite\Database\Validator\UID;
+use Utopia\Database\Validator\Authorization;
+use Appwrite\Database\Validator\CustomId;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 use Utopia\Storage\Validator\File;
 use Utopia\Storage\Validator\FileSize;
@@ -22,6 +24,8 @@ use Utopia\Image\Image;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Utopia\Response;
 use Utopia\Config\Config;
+use Utopia\Database\Database;
+use Utopia\Database\Query;
 
 App::post('/v1/storage/files')
     ->desc('Create File')
@@ -37,22 +41,42 @@ App::post('/v1/storage/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('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('read', null, new ArrayList(new Text(64)), 'An array of strings with read permissions. By default only the current user is granted with read permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.', true)
-    ->param('write', null, new ArrayList(new Text(64)), 'An array of strings with write permissions. By default only the current user is granted with write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.', true)
+    ->param('read', null, new ArrayList(new Text(64)), 'An array of strings with read permissions. By default only the current user is granted with read permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.', true)
+    ->param('write', null, new ArrayList(new Text(64)), 'An array of strings with write permissions. By default only the current user is granted with write permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.', true)
     ->inject('request')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('user')
     ->inject('audits')
     ->inject('usage')
-    ->action(function ($file, $read, $write, $request, $response, $projectDB, $user, $audits, $usage) {
-        /** @var Utopia\Swoole\Request $request */
+    ->action(function ($fileId, $file, $read, $write, $request, $response, $dbForProject, $user, $audits, $usage) {
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
-        /** @var Appwrite\Database\Document $user */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Utopia\Database\Document $user */
         /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Event\Event $usage */
+        /** @var Appwrite\Stats\Stats $usage */
+
+        $read = (is_null($read) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $read ?? []; // By default set read permissions for user
+        $write = (is_null($write) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $write ?? []; 
+
+        // Users can only add their roles to files, API keys and Admin users can add any
+        $roles = Authorization::getRoles();
+
+        if (!Auth::isAppUser($roles) && !Auth::isPrivilegedUser($roles)) {
+            foreach ($read as $role) {
+                if (!Authorization::isRole($role)) {
+                    throw new Exception('Read permissions must be one of: ('.\implode(', ', $roles).')', 400);
+                }
+            }
+            foreach ($write as $role) {
+                if (!Authorization::isRole($role)) {
+                    throw new Exception('Write permissions must be one of: ('.\implode(', ', $roles).')', 400);
+                }
+            }
+        }
 
         $file = $request->getFiles('file');
 
@@ -90,7 +114,7 @@ App::post('/v1/storage/files')
         // Save to storage
         $size = $device->getFileSize($file['tmp_name']);
         $path = $device->getPath(\uniqid().'.'.\pathinfo($file['name'], PATHINFO_EXTENSION));
-        
+
         if (!$device->upload($file['tmp_name'], $path)) { // TODO deprecate 'upload' and replace with 'move'
             throw new Exception('Failed moving file', 500);
         }
@@ -98,10 +122,10 @@ App::post('/v1/storage/files')
         $mimeType = $device->getFileMimeType($path); // Get mime-type before compression and encryption
 
         if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled') { // Check if scans are enabled
-            $antiVirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
+            $antivirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
                 (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310));
 
-            if (!$antiVirus->fileScan($path)) {
+            if (!$antivirus->fileScan($path)) {
                 $device->delete($path);
                 throw new Exception('Invalid file', 403);
             }
@@ -113,6 +137,7 @@ App::post('/v1/storage/files')
         $data = $compressor->compress($data);
         $key = App::getEnv('_APP_OPENSSL_KEY_V1');
         $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
+        $tag = null;
         $data = OpenSSL::encrypt($data, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag);
 
         if (!$device->write($path, $data, $mimeType)) {
@@ -120,46 +145,42 @@ App::post('/v1/storage/files')
         }
 
         $sizeActual = $device->getFileSize($path);
-        
-        $file = $projectDB->createDocument([
-            '$collection' => Database::SYSTEM_COLLECTION_FILES,
-            '$permissions' => [
-                'read' => (is_null($read) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $read ?? [], // By default set read permissions for user
-                'write' => (is_null($write) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $write ?? [], // By default set write permissions for user
-            ],
+
+        $fileId = ($fileId == 'unique()') ? $dbForProject->getId() : $fileId;
+        $file = $dbForProject->createDocument('files', new Document([
+            '$id' => $fileId,
+            '$read' => (is_null($read) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $read ?? [], // By default set read permissions for user
+            '$write' => (is_null($write) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $write ?? [], // By default set write permissions for user
             'dateCreated' => \time(),
-            'folderId' => '',
-            'name' => $file['name'],
+            'bucketId' => '',
+            'name' => $file['name'] ?? '',
             'path' => $path,
             'signature' => $device->getFileHash($path),
             'mimeType' => $mimeType,
             'sizeOriginal' => $size,
             'sizeActual' => $sizeActual,
             'algorithm' => $compressor->getName(),
-            'token' => \bin2hex(\random_bytes(64)),
             'comment' => '',
-            'fileOpenSSLVersion' => '1',
-            'fileOpenSSLCipher' => OpenSSL::CIPHER_AES_128_GCM,
-            'fileOpenSSLTag' => \bin2hex($tag),
-            'fileOpenSSLIV' => \bin2hex($iv),
-        ]);
-
-        if (false === $file) {
-            throw new Exception('Failed saving file to DB', 500);
-        }
+            'openSSLVersion' => '1',
+            'openSSLCipher' => OpenSSL::CIPHER_AES_128_GCM,
+            'openSSLTag' => \bin2hex($tag ?? ''),
+            'openSSLIV' => \bin2hex($iv),
+            'search' => implode(' ', [$fileId, $file['name'] ?? '',]),
+        ]));
 
         $audits
             ->setParam('event', 'storage.files.create')
-            ->setParam('resource', 'storage/files/'.$file->getId())
+            ->setParam('resource', 'file/'.$file->getId())
         ;
 
         $usage
             ->setParam('storage', $sizeActual)
+            ->setParam('storage.files.create', 1)
+            ->setParam('bucketId', 'default')
         ;
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($file, Response::MODEL_FILE)
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($file, Response::MODEL_FILE);
         ;
     });
 
@@ -175,28 +196,41 @@ App::get('/v1/storage/files')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_FILE_LIST)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of files to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this param to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursor', '', new UID(), 'ID of the file used as the starting point for the query, excluding the file itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $results = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_FILES,
-            ],
-        ]);
+        if (!empty($cursor)) {
+            $cursorFile = $dbForProject->getDocument('files', $cursor);
+
+            if ($cursorFile->isEmpty()) {
+                throw new Exception("File '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $queries = [];
+
+        if (!empty($search)) {
+            $queries[] = new Query('search', Query::TYPE_SEARCH, [$search]);
+        }
+
+        $usage
+            ->setParam('storage.files.read', 1)
+            ->setParam('bucketId', 'default')
+        ;
 
         $response->dynamic(new Document([
-            'sum' => $projectDB->getSum(),
-            'files' => $results
+            'files' => $dbForProject->find('files', $queries, $limit, $offset, [], [$orderType], $cursorFile ?? null, $cursorDirection),
+            'sum' => $dbForProject->count('files', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_FILE_LIST);
     });
 
@@ -211,19 +245,24 @@ App::get('/v1/storage/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('fileId', '', new UID(), 'File unique ID.')
+    ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($fileId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($fileId, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $file = $projectDB->getDocument($fileId);
+        $file = $dbForProject->getDocument('files', $fileId);
 
-        if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
+        if (empty($file->getId())) {
             throw new Exception('File not found', 404);
         }
-
+        $usage
+            ->setParam('storage.files.read', 1)
+            ->setParam('bucketId', 'default')
+        ;
         $response->dynamic($file, Response::MODEL_FILE);
     });
 
@@ -238,7 +277,7 @@ App::get('/v1/storage/files/:fileId/preview')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
     ->label('sdk.methodType', 'location')
-    ->param('fileId', '', new UID(), 'File unique ID')
+    ->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)
     ->param('gravity', Image::GRAVITY_CENTER, new WhiteList(Image::getGravityTypes()), 'Image crop gravity. Can be one of ' . implode(",", Image::getGravityTypes()), true)
@@ -253,12 +292,14 @@ App::get('/v1/storage/files/:fileId/preview')
     ->inject('request')
     ->inject('response')
     ->inject('project')
-    ->inject('projectDB')
-    ->action(function ($fileId, $width, $height, $gravity, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $projectDB) {
-        /** @var Utopia\Swoole\Request $request */
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($fileId, $width, $height, $gravity, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $dbForProject, $usage) {
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $stats */
 
         $storage = 'files';
 
@@ -281,16 +322,16 @@ App::get('/v1/storage/files/:fileId/preview')
         $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.$storage.$output);
 
-        $file = $projectDB->getDocument($fileId);
+        $file = $dbForProject->getDocument('files', $fileId);
 
-        if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
+        if (empty($file->getId())) {
             throw new Exception('File not found', 404);
         }
 
         $path = $file->getAttribute('path');
         $type = \strtolower(\pathinfo($path, PATHINFO_EXTENSION));
         $algorithm = $file->getAttribute('algorithm');
-        $cipher = $file->getAttribute('fileOpenSSLCipher');
+        $cipher = $file->getAttribute('openSSLCipher');
         $mime = $file->getAttribute('mimeType');
 
         if (!\in_array($mime, $inputs)) {
@@ -328,11 +369,11 @@ App::get('/v1/storage/files/:fileId/preview')
         if (!empty($cipher)) { // Decrypt
             $source = OpenSSL::decrypt(
                 $source,
-                $file->getAttribute('fileOpenSSLCipher'),
-                App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('fileOpenSSLVersion')),
+                $file->getAttribute('openSSLCipher'),
+                App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('openSSLVersion')),
                 0,
-                \hex2bin($file->getAttribute('fileOpenSSLIV')),
-                \hex2bin($file->getAttribute('fileOpenSSLTag'))
+                \hex2bin($file->getAttribute('openSSLIV')),
+                \hex2bin($file->getAttribute('openSSLTag'))
             );
         }
 
@@ -371,6 +412,11 @@ App::get('/v1/storage/files/:fileId/preview')
 
         $cache->save($key, $data);
 
+        $usage
+            ->setParam('storage.files.read', 1)
+            ->setParam('bucketId', 'default')
+        ;
+
         $response
             ->setContentType($outputs[$output])
             ->addHeader('Expires', $date)
@@ -392,16 +438,18 @@ App::get('/v1/storage/files/:fileId/download')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', '*/*')
     ->label('sdk.methodType', 'location')
-    ->param('fileId', '', new UID(), 'File unique ID.')
+    ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($fileId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($fileId, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $file = $projectDB->getDocument($fileId);
+        $file = $dbForProject->getDocument('files', $fileId);
 
-        if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
+        if (empty($file->getId())) {
             throw new Exception('File not found', 404);
         }
 
@@ -416,19 +464,24 @@ App::get('/v1/storage/files/:fileId/download')
 
         $source = $device->read($path);
 
-        if (!empty($file->getAttribute('fileOpenSSLCipher'))) { // Decrypt
+        if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
             $source = OpenSSL::decrypt(
                 $source,
-                $file->getAttribute('fileOpenSSLCipher'),
-                App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('fileOpenSSLVersion')),
+                $file->getAttribute('openSSLCipher'),
+                App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('openSSLVersion')),
                 0,
-                \hex2bin($file->getAttribute('fileOpenSSLIV')),
-                \hex2bin($file->getAttribute('fileOpenSSLTag'))
+                \hex2bin($file->getAttribute('openSSLIV')),
+                \hex2bin($file->getAttribute('openSSLTag'))
             );
         }
 
         $source = $compressor->decompress($source);
 
+        $usage
+            ->setParam('storage.files.read', 1)
+            ->setParam('bucketId', 'default')
+        ;
+
         // Response
         $response
             ->setContentType($file->getAttribute('mimeType'))
@@ -450,17 +503,19 @@ App::get('/v1/storage/files/:fileId/view')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', '*/*')
     ->label('sdk.methodType', 'location')
-    ->param('fileId', '', new UID(), 'File unique ID.')
+    ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($fileId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($fileId, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $file  = $projectDB->getDocument($fileId);
+        $file  = $dbForProject->getDocument('files', $fileId);
         $mimes = Config::getParam('storage-mimes');
 
-        if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
+        if (empty($file->getId())) {
             throw new Exception('File not found', 404);
         }
 
@@ -481,20 +536,25 @@ App::get('/v1/storage/files/:fileId/view')
 
         $source = $device->read($path);
 
-        if (!empty($file->getAttribute('fileOpenSSLCipher'))) { // Decrypt
+        if (!empty($file->getAttribute('openSSLCipher'))) { // Decrypt
             $source = OpenSSL::decrypt(
                 $source,
-                $file->getAttribute('fileOpenSSLCipher'),
-                App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('fileOpenSSLVersion')),
+                $file->getAttribute('openSSLCipher'),
+                App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('openSSLVersion')),
                 0,
-                \hex2bin($file->getAttribute('fileOpenSSLIV')),
-                \hex2bin($file->getAttribute('fileOpenSSLTag'))
+                \hex2bin($file->getAttribute('openSSLIV')),
+                \hex2bin($file->getAttribute('openSSLTag'))
             );
         }
 
         $output = $compressor->decompress($source);
         $fileName = $file->getAttribute('name', '');
 
+        $usage
+            ->setParam('storage.files.read', 1)
+            ->setParam('bucketId', 'default')
+        ;
+
         // Response
         $response
             ->setContentType($contentType)
@@ -519,38 +579,59 @@ App::put('/v1/storage/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('fileId', '', new UID(), 'File unique ID.')
-    ->param('read', [], new ArrayList(new Text(64)), 'An array of strings with read permissions. By default no user is granted with any read permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
-    ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](/docs/permissions) and get a full list of available permissions.')
+    ->param('fileId', '', new UID(), 'File ID.')
+    ->param('read', [], new ArrayList(new Text(64)), 'An array of strings with read permissions. By default no user is granted with any read permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
+    ->param('write', [], new ArrayList(new Text(64)), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
+    ->inject('user')
     ->inject('audits')
-    ->action(function ($fileId, $read, $write, $response, $projectDB, $audits) {
+    ->inject('usage')
+    ->action(function ($fileId, $read, $write, $response, $dbForProject, $user, $audits, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Utopia\Database\Document $user */
         /** @var Appwrite\Event\Event $audits */
 
-        $file = $projectDB->getDocument($fileId);
+        $read = (is_null($read) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $read ?? []; // By default set read permissions for user
+        $write = (is_null($write) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $write ?? []; 
 
-        if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
+        // Users can only add their roles to files, API keys and Admin users can add any
+        $roles = Authorization::getRoles();
+
+        if (!Auth::isAppUser($roles) && !Auth::isPrivilegedUser($roles)) {
+            foreach ($read as $role) {
+                if (!Authorization::isRole($role)) {
+                    throw new Exception('Read permissions must be one of: ('.\implode(', ', $roles).')', 400);
+                }
+            }
+            foreach ($write as $role) {
+                if (!Authorization::isRole($role)) {
+                    throw new Exception('Write permissions must be one of: ('.\implode(', ', $roles).')', 400);
+                }
+            }
+        }
+
+        $file = $dbForProject->getDocument('files', $fileId);
+
+        if (empty($file->getId())) {
             throw new Exception('File not found', 404);
         }
 
-        $file = $projectDB->updateDocument(\array_merge($file->getArrayCopy(), [
-            '$permissions' => [
-                'read' => $read,
-                'write' => $write,
-            ],
-            'folderId' => '',
-        ]));
-
-        if (false === $file) {
-            throw new Exception('Failed saving file to DB', 500);
-        }
+        $file = $dbForProject->updateDocument('files', $fileId, new Document(\array_merge($file->getArrayCopy(), [
+            '$read' => $read,
+            '$write' => $write,
+            'bucketId' => '',
+        ])));
 
         $audits
             ->setParam('event', 'storage.files.update')
-            ->setParam('resource', 'storage/files/'.$file->getId())
+            ->setParam('resource', 'file/'.$file->getId())
+        ;
+
+        $usage
+            ->setParam('storage.files.update', 1)
+            ->setParam('bucketId', 'default')
         ;
 
         $response->dynamic($file, Response::MODEL_FILE);
@@ -567,40 +648,42 @@ App::delete('/v1/storage/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('fileId', '', new UID(), 'File unique ID.')
+    ->param('fileId', '', new UID(), 'File ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('events')
     ->inject('audits')
     ->inject('usage')
-    ->action(function ($fileId, $response, $projectDB, $events, $audits, $usage) {
+    ->action(function ($fileId, $response, $dbForProject, $events, $audits, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $events */
         /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Event\Event $usage */
+        /** @var Appwrite\Stats\Stats $usage */
         
-        $file = $projectDB->getDocument($fileId);
+        $file = $dbForProject->getDocument('files', $fileId);
 
-        if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
+        if (empty($file->getId())) {
             throw new Exception('File not found', 404);
         }
 
         $device = Storage::getDevice('files');
 
         if ($device->delete($file->getAttribute('path', ''))) {
-            if (!$projectDB->deleteDocument($fileId)) {
+            if (!$dbForProject->deleteDocument('files', $fileId)) {
                 throw new Exception('Failed to remove file from DB', 500);
             }
         }
         
         $audits
             ->setParam('event', 'storage.files.delete')
-            ->setParam('resource', 'storage/files/'.$file->getId())
+            ->setParam('resource', 'file/'.$file->getId())
         ;
 
         $usage
             ->setParam('storage', $file->getAttribute('size', 0) * -1)
+            ->setParam('storage.files.delete', 1)
+            ->setParam('bucketId', 'default')
         ;
 
         $events
@@ -610,53 +693,193 @@ App::delete('/v1/storage/files/:fileId')
         $response->noContent();
     });
 
-// App::get('/v1/storage/files/:fileId/scan')
-//     ->desc('Scan Storage')
-//     ->groups(['api', 'storage'])
-//     ->label('scope', 'root')
-//     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
-//     ->label('sdk.namespace', 'storage')
-//     ->label('sdk.method', 'getFileScan')
-//     ->label('sdk.hide', true)
-//     ->param('fileId', '', new UID(), 'File unique ID.')
-//     ->param('storage', 'files', new WhiteList(['files']);})
-//     ->action(
-//         function ($fileId, $storage) use ($response, $request, $projectDB) {
-//             $file = $projectDB->getDocument($fileId);
+App::get('/v1/storage/usage')
+    ->desc('Get usage stats for storage')
+    ->groups(['api', 'storage'])
+    ->label('scope', 'files.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_STORAGE)
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function ($range, $response, $dbForProject) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForProject */
 
-//             if (empty($file->getId()) || Database::SYSTEM_COLLECTION_FILES != $file->getCollection()) {
-//                 throw new Exception('File not found', 404);
-//             }
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '30m',
+                    'limit' => 48,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
 
-//             $path = $file->getAttribute('path', '');
+            $metrics = [
+                'storage.total',
+                'storage.files.count'
+            ];
 
-//             if (!file_exists($path)) {
-//                 throw new Exception('File not found in '.$path, 404);
-//             }
+            $stats = [];
 
-//             $compressor = new GZIP();
-//             $device = Storage::getDevice($storage);
+            Authorization::skip(function() use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
 
-//             $source = $device->read($path);
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
 
-//             if (!empty($file->getAttribute('fileOpenSSLCipher'))) { // Decrypt
-//                 $source = OpenSSL::decrypt(
-//                     $source,
-//                     $file->getAttribute('fileOpenSSLCipher'),
-//                     App::getEnv('_APP_OPENSSL_KEY_V'.$file->getAttribute('fileOpenSSLVersion')),
-//                     0,
-//                     hex2bin($file->getAttribute('fileOpenSSLIV')),
-//                     hex2bin($file->getAttribute('fileOpenSSLTag'))
-//                 );
-//             }
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
 
-//             $source = $compressor->decompress($source);
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    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,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
 
-//             $antiVirus = new Network('clamav', 3310);
+            $usage = new Document([
+                'range' => $range,
+                'storage' => $stats['storage.total'],
+                'files' => $stats['storage.files.count']
+            ]);
+        }
 
-//             //var_dump($antiVirus->ping());
-//             //var_dump($antiVirus->version());
-//             //var_dump($antiVirus->fileScan('/storage/uploads/app-1/5/9/f/e/59fecaed49645.pdf'));
+        $response->dynamic($usage, Response::MODEL_USAGE_STORAGE);
+    });
 
-//         }
-//     );
+App::get('/v1/storage/:bucketId/usage')
+    ->desc('Get usage stats for a storage bucket')
+    ->groups(['api', 'storage'])
+    ->label('scope', 'files.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'storage')
+    ->label('sdk.method', 'getBucketUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_BUCKETS)
+    ->param('bucketId', '', new UID(), 'Bucket ID.')
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function ($bucketId, $range, $response, $dbForProject) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForProject */
+
+        // TODO: Check if the storage bucket exists else throw 404 
+        
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '30m',
+                    'limit' => 48,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
+
+            $metrics = [
+                "storage.buckets.$bucketId.files.count",
+                "storage.buckets.$bucketId.files.create",
+                "storage.buckets.$bucketId.files.read",
+                "storage.buckets.$bucketId.files.update",
+                "storage.buckets.$bucketId.files.delete"
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function() use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
+
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    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,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'filesCount' => $stats["storage.buckets.$bucketId.files.count"],
+                'filesCreate' => $stats["storage.buckets.$bucketId.files.create"],
+                'filesRead' => $stats["storage.buckets.$bucketId.files.read"],
+                'filesUpdate' => $stats["storage.buckets.$bucketId.files.update"],
+                'filesDelete' => $stats["storage.buckets.$bucketId.files.delete"]
+            ]);
+        }
+
+        $response->dynamic($usage, Response::MODEL_USAGE_BUCKETS);
+    });

app/controllers/api/teams.php

@@ -1,24 +1,26 @@
 <?php
 
-use Utopia\App;
-use Utopia\Exception;
-use Utopia\Config\Config;
-use Appwrite\Network\Validator\Email;
-use Utopia\Validator\Text;
-use Appwrite\Network\Validator\Host;
-use Utopia\Validator\Range;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\WhiteList;
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Database;
-use Appwrite\Database\Document;
-use Appwrite\Database\Validator\UID;
-use Appwrite\Database\Validator\Authorization;
-use Appwrite\Database\Exception\Duplicate;
-use Appwrite\Database\Validator\Key;
+use Appwrite\Database\Validator\CustomId;
 use Appwrite\Detector\Detector;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Response;
+use Appwrite\Network\Validator\Email;
+use Appwrite\Network\Validator\Host;
+use Utopia\App;
+use Utopia\Exception;
+use Utopia\Config\Config;
+use Utopia\Validator\Text;
+use Utopia\Validator\Range;
+use Utopia\Validator\ArrayList;
+use Utopia\Validator\WhiteList;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Key;
+use Utopia\Database\Validator\UID;
 
 App::post('/v1/teams')
     ->desc('Create Team')
@@ -32,47 +34,37 @@ 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('name', null, new Text(128), 'Team name. Max length: 128 chars.')
     ->param('roles', ['owner'], new ArrayList(new Key()), '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). Max length for each role is 32 chars.', true)
     ->inject('response')
     ->inject('user')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('events')
-    ->action(function ($name, $roles, $response, $user, $projectDB, $events) {
+    ->action(function ($teamId, $name, $roles, $response, $user, $dbForProject, $events) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $user */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $events */
 
-        Authorization::disable();
+        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAppUser = Auth::isAppUser(Authorization::getRoles());
 
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
-        $isAppUser = Auth::isAppUser(Authorization::$roles);
-
-        $team = $projectDB->createDocument([
-            '$collection' => Database::SYSTEM_COLLECTION_TEAMS,
-            '$permissions' => [
-                'read' => ['team:{self}'],
-                'write' => ['team:{self}/owner'],
-            ],
+        $teamId = $teamId == 'unique()' ? $dbForProject->getId() : $teamId;
+        $team = Authorization::skip(fn() => $dbForProject->createDocument('teams', new Document([
+            '$id' => $teamId ,
+            '$read' => ['team:'.$teamId],
+            '$write' => ['team:'.$teamId .'/owner'],
             'name' => $name,
             'sum' => ($isPrivilegedUser || $isAppUser) ? 0 : 1,
             'dateCreated' => \time(),
-        ]);
-
-        Authorization::reset();
-
-        if (false === $team) {
-            throw new Exception('Failed saving team to DB', 500);
-        }
+            'search' => implode(' ', [$teamId, $name]),
+        ])));
 
         if (!$isPrivilegedUser && !$isAppUser) { // Don't add user on server mode
             $membership = new Document([
-                '$collection' => Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-                '$permissions' => [
-                    'read' => ['user:'.$user->getId(), 'team:'.$team->getId()],
-                    'write' => ['user:'.$user->getId(), 'team:'.$team->getId().'/owner'],
-                ],
+                '$read' => ['user:'.$user->getId(), 'team:'.$team->getId()],
+                '$write' => ['user:'.$user->getId(), 'team:'.$team->getId().'/owner'],
                 'userId' => $user->getId(),
                 'teamId' => $team->getId(),
                 'roles' => $roles,
@@ -82,24 +74,19 @@ App::post('/v1/teams')
                 'secret' => '',
             ]);
 
+            $membership = $dbForProject->createDocument('memberships', $membership);
+
             // Attach user to team
             $user->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
-
-            $user = $projectDB->updateDocument($user->getArrayCopy());
-
-            if (false === $user) {
-                throw new Exception('Failed saving user to DB', 500);
-            }
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
         }
 
         if (!empty($user->getId())) {
             $events->setParam('userId', $user->getId());
         }
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($team, Response::MODEL_TEAM)
-        ;
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($team, Response::MODEL_TEAM);
     });
 
 App::get('/v1/teams')
@@ -113,29 +100,38 @@ 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('search', '', new Text(256), 'Search term to filter results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Limit how many results will be returned. Returns up to 25 results by default. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this value to manage pagination.', true)
+    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of teams to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this param to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursor', '', new UID(), 'ID of the team used as the starting point for the query, excluding the team itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $results = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_TEAMS,
-            ],
-        ]);
+        if (!empty($cursor)) {
+            $cursorTeam = $dbForProject->getDocument('teams', $cursor);
+
+            if ($cursorTeam->isEmpty()) {
+                throw new Exception("Team '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $queries = [];
+
+        if (!empty($search)) {
+            $queries[] = new Query('search', Query::TYPE_SEARCH, [$search]);
+        }
+
+        $results = $dbForProject->find('teams', $queries, $limit, $offset, [], [$orderType], $cursorTeam ?? null, $cursorDirection);
+        $sum = $dbForProject->count('teams', $queries, APP_LIMIT_COUNT);
 
         $response->dynamic(new Document([
-            'sum' => $projectDB->getSum(),
-            'teams' => $results
+            'teams' => $results,
+            'sum' => $sum,
         ]), Response::MODEL_TEAM_LIST);
     });
 
@@ -152,14 +148,14 @@ App::get('/v1/teams/:teamId')
     ->label('sdk.response.model', Response::MODEL_TEAM)
     ->param('teamId', '', new UID(), 'Team ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($teamId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($teamId, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $team = $projectDB->getDocument($teamId);
+        $team = $dbForProject->getDocument('teams', $teamId);
 
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
@@ -181,25 +177,22 @@ App::put('/v1/teams/:teamId')
     ->param('teamId', '', new UID(), 'Team ID.')
     ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($teamId, $name, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->action(function ($teamId, $name, $response, $dbForProject) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
 
-        $team = $projectDB->getDocument($teamId);
+        $team = $dbForProject->getDocument('teams', $teamId);
 
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
-        $team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [
-            'name' => $name,
-        ]));
+        $team = $dbForProject->updateDocument('teams', $team->getId(),$team
+            ->setAttribute('name', $name)
+            ->setAttribute('search', implode(' ', [$teamId, $name]))
+        );
 
-        if (false === $team) {
-            throw new Exception('Failed saving team to DB', 500);
-        }
-        
         $response->dynamic($team, Response::MODEL_TEAM);
     });
 
@@ -216,21 +209,33 @@ App::delete('/v1/teams/:teamId')
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('teamId', '', new UID(), 'Team ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('events')
     ->inject('deletes')
-    ->action(function ($teamId, $response, $projectDB, $events, $deletes) {
+    ->action(function ($teamId, $response, $dbForProject, $events, $deletes) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $events */
+        /** @var Appwrite\Event\Event $deletes */
 
-        $team = $projectDB->getDocument($teamId);
+        $team = $dbForProject->getDocument('teams', $teamId);
 
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
-        if (!$projectDB->deleteDocument($teamId)) {
+        $memberships = $dbForProject->find('memberships', [
+            new Query('teamId', Query::TYPE_EQUAL, [$teamId]),
+        ], 2000, 0); // TODO fix members limit
+
+        // TODO delete all members individually from the user object
+        foreach ($memberships as $membership) {
+            if (!$dbForProject->deleteDocument('memberships', $membership->getId())) {
+                throw new Exception('Failed to remove membership for team from DB', 500);
+            }
+        }
+
+        if (!$dbForProject->deleteDocument('teams', $teamId)) {
             throw new Exception('Failed to remove team from DB', 500);
         }
 
@@ -261,87 +266,63 @@ 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 address of the new team member.')
-    ->param('roles', [], new ArrayList(new Key()), 'An 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). Max length for each role is 32 chars.')
+    ->param('email', '', new Email(), 'Email of the new team member.')
+    ->param('roles', [], new ArrayList(new Key()), '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). Max length for each role is 32 chars.')
     ->param('url', '', function ($clients) { return 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)
     ->inject('response')
     ->inject('project')
     ->inject('user')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('locale')
     ->inject('audits')
     ->inject('mails')
-    ->action(function ($teamId, $email, $roles, $url, $name, $response, $project, $user, $projectDB, $locale, $audits, $mails) {
+    ->action(function ($teamId, $email, $roles, $url, $name, $response, $project, $user, $dbForProject, $locale, $audits, $mails) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
-        /** @var Appwrite\Database\Document $user */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $project */
+        /** @var Utopia\Database\Document $user */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $audits */
         /** @var Appwrite\Event\Event $mails */
 
         if(empty(App::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception('SMTP Disabled', 503);
         }
-        
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
-        $isAppUser = Auth::isAppUser(Authorization::$roles);
-        
+
+        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAppUser = Auth::isAppUser(Authorization::getRoles());
+
         $email = \strtolower($email);
         $name = (empty($name)) ? $email : $name;
-        $team = $projectDB->getDocument($teamId);
+        $team = $dbForProject->getDocument('teams', $teamId);
 
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
-        $memberships = $projectDB->getCollection([
-            'limit' => 2000,
-            'offset' => 0,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-                'teamId='.$team->getId(),
-            ],
-        ]);
-
-        $invitee = $projectDB->getCollectionFirst([ // Get user by email address
-            'limit' => 1,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_USERS,
-                'email='.$email,
-            ],
-        ]);
+        $invitee = $dbForProject->findOne('users', [new Query('email', Query::TYPE_EQUAL, [$email])]); // Get user by email address
 
         if (empty($invitee)) { // Create new user if no user with same email found
 
-            $limit = $project->getAttribute('usersAuthLimit', 0);
-        
+            $limit = $project->getAttribute('auths', [])['limit'] ?? 0;
+
             if ($limit !== 0 && $project->getId() !== 'console') { // check users limit, console invites are allways allowed.
-                $projectDB->getCollection([ // Count users
-                    'filters' => [
-                        '$collection='.Database::SYSTEM_COLLECTION_USERS,
-                    ],
-                ]);
-    
-                $sum = $projectDB->getSum();
-    
+                $sum = $dbForProject->count('users', [], APP_LIMIT_USERS);
+
                 if($sum >= $limit) {
                     throw new Exception('Project registration is restricted. Contact your administrator for more information.', 501);
                 }
             }
 
-            Authorization::disable();
-
             try {
-                $invitee = $projectDB->createDocument([
-                    '$collection' => Database::SYSTEM_COLLECTION_USERS,
-                    '$permissions' => [
-                        'read' => ['user:{self}', '*'],
-                        'write' => ['user:{self}'],
-                    ],
+                $userId = $dbForProject->getId();
+                $invitee = Authorization::skip(fn() => $dbForProject->createDocument('users', new Document([
+                    '$id' => $userId,
+                    '$read' => ['user:'.$userId, 'role:all'],
+                    '$write' => ['user:'.$userId],
                     'email' => $email,
                     'emailVerification' => false,
-                    'status' => Auth::USER_STATUS_UNACTIVATED,
+                    'status' => true,
                     'password' => Auth::passwordHash(Auth::passwordGenerator()),
                     /** 
                      * Set the password update time to 0 for users created using 
@@ -352,31 +333,18 @@ App::post('/v1/teams/:teamId/memberships')
                     'registration' => \time(),
                     'reset' => false,
                     'name' => $name,
+                    'prefs' => new \stdClass(),
                     'sessions' => [],
                     'tokens' => [],
-                ], ['email' => $email]);
+                    'memberships' => [],
+                    'search' => implode(' ', [$userId, $email, $name]),
+                ])));
             } catch (Duplicate $th) {
                 throw new Exception('Account already exists', 409);
             }
-
-            Authorization::reset();
-
-            if (false === $invitee) {
-                throw new Exception('Failed saving user to DB', 500);
-            }
         }
 
-        $isOwner = false;
-
-        foreach ($memberships as $member) {
-            if ($member->getAttribute('userId') ==  $invitee->getId()) {
-                throw new Exception('User has already been invited or is already a member of this team', 409);
-            }
-
-            if ($member->getAttribute('userId') == $user->getId() && \in_array('owner', $member->getAttribute('roles', []))) {
-                $isOwner = true;
-            }
-        }
+        $isOwner = Authorization::isRole('team:'.$team->getId().'/owner');;
 
         if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
             throw new Exception('User is not allowed to send invitations for this team', 401);
@@ -385,11 +353,9 @@ App::post('/v1/teams/:teamId/memberships')
         $secret = Auth::tokenGenerator();
 
         $membership = new Document([
-            '$collection' => Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-            '$permissions' => [
-                'read' => ['*'],
-                'write' => ['user:'.$invitee->getId(), 'team:'.$team->getId().'/owner'],
-            ],
+            '$id' => $dbForProject->getId(),
+            '$read' => ['role:all'],
+            '$write' => ['user:'.$invitee->getId(), 'team:'.$team->getId().'/owner'],
             'userId' => $invitee->getId(),
             'teamId' => $team->getId(),
             'roles' => $roles,
@@ -400,29 +366,24 @@ App::post('/v1/teams/:teamId/memberships')
         ]);
 
         if ($isPrivilegedUser || $isAppUser) { // Allow admin to create membership
-            Authorization::disable();
-            $membership = $projectDB->createDocument($membership->getArrayCopy());
-
-            $team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [
-                'sum' => $team->getAttribute('sum', 0) + 1,
-            ]));
+            try {
+                $membership = Authorization::skip(fn() => $dbForProject->createDocument('memberships', $membership));
+            } catch (Duplicate $th) {
+                throw new Exception('User has already been invited or is already a member of this team', 409);
+            }
+            $team->setAttribute('sum', $team->getAttribute('sum', 0) + 1);
+            $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team));
 
             // Attach user to team
             $invitee->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
 
-            $invitee = $projectDB->updateDocument($invitee->getArrayCopy());
-
-            if (false === $invitee) {
-                throw new Exception('Failed saving user to DB', 500);
-            }
-
-            Authorization::reset();
+            $invitee = Authorization::skip(fn() => $dbForProject->updateDocument('users', $invitee->getId(), $invitee));
         } else {
-            $membership = $projectDB->createDocument($membership->getArrayCopy());
-        }
-
-        if (false === $membership) {
-            throw new Exception('Failed saving membership to DB', 500);
+            try {
+                $membership = $dbForProject->createDocument('memberships', $membership);
+            } catch (Duplicate $th) {
+                throw new Exception('User has already been invited or is already a member of this team', 409);
+            }
         }
 
         $url = Template::parseURL($url);
@@ -448,16 +409,115 @@ App::post('/v1/teams/:teamId/memberships')
         $audits
             ->setParam('userId', $invitee->getId())
             ->setParam('event', 'teams.memberships.create')
-            ->setParam('resource', 'teams/'.$teamId)
+            ->setParam('resource', 'team/'.$teamId)
         ;
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic(new Document(\array_merge($membership->getArrayCopy(), [
-                'email' => $email,
-                'name' => $name,
-            ])), Response::MODEL_MEMBERSHIP)
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($membership
+            ->setAttribute('email', $email)
+            ->setAttribute('name', $name)
+        , Response::MODEL_MEMBERSHIP);
+    });
+
+App::get('/v1/teams/:teamId/memberships')
+    ->desc('Get Team Memberships')
+    ->groups(['api', 'teams'])
+    ->label('scope', 'teams.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'getMemberships')
+    ->label('sdk.description', '/docs/references/teams/get-team-members.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)
+    ->param('teamId', '', new UID(), 'Team ID.')
+    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of memberships to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this value to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursor', '', new UID(), 'ID of the membership used as the starting point for the query, excluding the membership itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
+    ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function ($teamId, $search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForProject */
+
+        $team = $dbForProject->getDocument('teams', $teamId);
+
+        if ($team->isEmpty()) {
+            throw new Exception('Team not found', 404);
+        }
+
+        if (!empty($cursor)) {
+            $cursorMembership = $dbForProject->getDocument('memberships', $cursor);
+
+            if ($cursorMembership->isEmpty()) {
+                throw new Exception("Membership '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $memberships = $dbForProject->find('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], $limit, $offset, [], [$orderType], $cursorMembership ?? null, $cursorDirection);
+        $sum = $dbForProject->count('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], APP_LIMIT_COUNT);
+
+        $memberships = array_filter($memberships, fn(Document $membership) => !empty($membership->getAttribute('userId')));
+
+        $memberships = array_map(function($membership) use ($dbForProject) {
+            $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
+
+            $membership
+                ->setAttribute('name', $user->getAttribute('name'))
+                ->setAttribute('email', $user->getAttribute('email'))
+            ;
+
+            return $membership;
+        }, $memberships);
+
+        $response->dynamic(new Document([
+            'memberships' => $memberships,
+            'sum' => $sum,
+        ]), Response::MODEL_MEMBERSHIP_LIST);
+    });
+
+App::get('/v1/teams/:teamId/memberships/:membershipId')
+    ->desc('Get Team Membership')
+    ->groups(['api', 'teams'])
+    ->label('scope', 'teams.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
+    ->label('sdk.namespace', 'teams')
+    ->label('sdk.method', 'getMembership')
+    ->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)
+    ->param('teamId', '', new UID(), 'Team ID.')
+    ->param('membershipId', '', new UID(), 'Membership ID.')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function ($teamId, $membershipId, $response, $dbForProject) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForProject */
+
+        $team = $dbForProject->getDocument('teams', $teamId);
+
+        if ($team->isEmpty()) {
+            throw new Exception('Team not found', 404);
+        }
+
+        $membership = $dbForProject->getDocument('memberships', $membershipId);
+
+        if($membership->isEmpty() || empty($membership->getAttribute('userId'))) {
+            throw new Exception('Membership not found', 404);
+        }
+
+        $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
+
+        $membership
+            ->setAttribute('name', $user->getAttribute('name'))
+            ->setAttribute('email', $user->getAttribute('email'))
         ;
+
+        $response->dynamic($membership, Response::MODEL_MEMBERSHIP );
     });
 
 App::patch('/v1/teams/:teamId/memberships/:membershipId')
@@ -474,106 +534,55 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
     ->param('teamId', '', new UID(), 'Team ID.')
     ->param('membershipId', '', new UID(), 'Membership ID.')
-    ->param('roles', [], new ArrayList(new Key()), 'An array of strings. Use this param to set the user\'s roles in the team. A role can be any string. Learn more about [roles and permissions](/docs/permissions). Max length for each role is 32 chars.')
+    ->param('roles', [], new ArrayList(new Key()), 'An array of strings. Use this param to set the user\'s roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Max length for each role is 32 chars.')
     ->inject('request')
     ->inject('response')
     ->inject('user')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('audits')
-    ->action(function ($teamId, $membershipId, $roles, $request, $response, $user, $projectDB,$audits) {
-        /** @var Utopia\Swoole\Request $request */
+    ->action(function ($teamId, $membershipId, $roles, $request, $response, $user, $dbForProject, $audits) {
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $user */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $audits */
 
-        $team = $projectDB->getDocument($teamId);
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        $team = $dbForProject->getDocument('teams', $teamId);
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
-        $membership = $projectDB->getDocument($membershipId);
-        if (empty($membership->getId()) || Database::SYSTEM_COLLECTION_MEMBERSHIPS != $membership->getCollection()) {
+        $membership = $dbForProject->getDocument('memberships', $membershipId);
+        if ($membership->isEmpty()) {
             throw new Exception('Membership not found', 404);
         }
 
+        $profile = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
+        if ($profile->isEmpty()) {
+            throw new Exception('User not found', 404);
+        }
 
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
-        $isAppUser = Auth::isAppUser(Authorization::$roles);
+        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+        $isAppUser = Auth::isAppUser(Authorization::getRoles());
         $isOwner = Authorization::isRole('team:'.$team->getId().'/owner');;
-        
+
         if (!$isOwner && !$isPrivilegedUser && !$isAppUser) { // Not owner, not admin, not app (server)
             throw new Exception('User is not allowed to modify roles', 401);
         }
 
         // Update the roles
         $membership->setAttribute('roles', $roles);
-        $membership = $projectDB->updateDocument($membership->getArrayCopy());
+        $membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
 
-        if (false === $membership) {
-            throw new Exception('Failed updating membership', 500);
-        }
+        // TODO sync updated membership in the user $profile object using TYPE_REPLACE
 
         $audits
             ->setParam('userId', $user->getId())
             ->setParam('event', 'teams.memberships.update')
-            ->setParam('resource', 'teams/'.$teamId)
+            ->setParam('resource', 'team/'.$teamId)
         ;
 
-        $response->dynamic(new Document($membership->getArrayCopy()), Response::MODEL_MEMBERSHIP);
-    });
-
-App::get('/v1/teams/:teamId/memberships')
-    ->desc('Get Team Memberships')
-    ->groups(['api', 'teams'])
-    ->label('scope', 'teams.read')
-    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
-    ->label('sdk.namespace', 'teams')
-    ->label('sdk.method', 'getMemberships')
-    ->label('sdk.description', '/docs/references/teams/get-team-members.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)
-    ->param('teamId', '', new UID(), 'Team ID.')
-    ->param('search', '', new Text(256), 'Search term to filter your results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Limit how many results will be returned. By default will return a maximum of 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this value to manage pagination.', true)
-    ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order results by ASC or DESC order.', true)
-    ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($teamId, $search, $limit, $offset, $orderType, $response, $projectDB) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
-
-        $team = $projectDB->getDocument($teamId);
-
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
-            throw new Exception('Team not found', 404);
-        }
-
-        $memberships = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-                'teamId='.$teamId,
-            ],
-        ]);
-        $users = [];
-
-        foreach ($memberships as $membership) {
-            if (empty($membership->getAttribute('userId', null))) {
-                continue;
-            }
-
-            $temp = $projectDB->getDocument($membership->getAttribute('userId', null))->getArrayCopy(['email', 'name']);
-
-            $users[] = new Document(\array_merge($temp, $membership->getArrayCopy()));
-        }
-
-        $response->dynamic(new Document(['sum' => $projectDB->getSum(), 'memberships' => $users]), Response::MODEL_MEMBERSHIP_LIST);
+        $response->dynamic($membership, Response::MODEL_MEMBERSHIP);
     });
 
 App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
@@ -595,35 +604,32 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->inject('request')
     ->inject('response')
     ->inject('user')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('geodb')
     ->inject('audits')
-    ->action(function ($teamId, $membershipId, $userId, $secret, $request, $response, $user, $projectDB, $geodb, $audits) {
-        /** @var Utopia\Swoole\Request $request */
+    ->action(function ($teamId, $membershipId, $userId, $secret, $request, $response, $user, $dbForProject, $geodb, $audits) {
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $user */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $user */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var MaxMind\Db\Reader $geodb */
         /** @var Appwrite\Event\Event $audits */
 
         $protocol = $request->getProtocol();
-        $membership = $projectDB->getDocument($membershipId);
 
-        if (empty($membership->getId()) || Database::SYSTEM_COLLECTION_MEMBERSHIPS != $membership->getCollection()) {
-            throw new Exception('Invite not found', 404);
+        $membership = $dbForProject->getDocument('memberships', $membershipId);
+
+        if ($membership->isEmpty()) {
+            throw new Exception('Membership not found', 404);
         }
 
         if ($membership->getAttribute('teamId') !== $teamId) {
             throw new Exception('Team IDs don\'t match', 404);
         }
 
-        Authorization::disable();
+        $team = Authorization::skip(fn() => $dbForProject->getDocument('teams', $teamId));
 
-        $team = $projectDB->getDocument($teamId);
-        
-        Authorization::reset();
-
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
@@ -635,14 +641,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
             throw new Exception('Invite does not belong to current user ('.$user->getAttribute('email').')', 401);
         }
 
-        if (empty($user->getId())) {
-            $user = $projectDB->getCollectionFirst([ // Get user
-                'limit' => 1,
-                'filters' => [
-                    '$collection='.Database::SYSTEM_COLLECTION_USERS,
-                    '$id='.$userId,
-                ],
-            ]);
+        if ($user->isEmpty()) {
+            $user = $dbForProject->getDocument('users', $userId); // Get user
         }
 
         if ($membership->getAttribute('userId') !== $user->getId()) {
@@ -661,13 +661,14 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
 
         // Log user in
 
+        Authorization::setRole('user:'.$user->getId());
+
         $detector = new Detector($request->getUserAgent('UNKNOWN'));
         $record = $geodb->get($request->getIP());
         $expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG;
         $secret = Auth::tokenGenerator();
         $session = new Document(array_merge([
-            '$collection' => Database::SYSTEM_COLLECTION_SESSIONS,
-            '$permissions' => ['read' => ['user:'.$user->getId()], 'write' => ['user:'.$user->getId()]],
+            '$id' => $dbForProject->getId(),
             'userId' => $user->getId(),
             'provider' => Auth::SESSION_PROVIDER_EMAIL,
             'providerUid' => $user->getAttribute('email'),
@@ -678,32 +679,24 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
             'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
         ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
 
+        $session = $dbForProject->createDocument('sessions', $session
+            ->setAttribute('$read', ['user:'.$user->getId()])
+            ->setAttribute('$write', ['user:'.$user->getId()])
+        );
+
         $user->setAttribute('sessions', $session, Document::SET_TYPE_APPEND);
 
         Authorization::setRole('user:'.$userId);
 
-        $user = $projectDB->updateDocument($user->getArrayCopy());
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+        $membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
 
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
-
-        Authorization::disable();
-
-        $team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [
-            'sum' => $team->getAttribute('sum', 0) + 1,
-        ]));
-
-        Authorization::reset();
-
-        if (false === $team) {
-            throw new Exception('Failed saving team to DB', 500);
-        }
+        $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('sum', $team->getAttribute('sum', 0) + 1)));
 
         $audits
             ->setParam('userId', $user->getId())
             ->setParam('event', 'teams.memberships.update.status')
-            ->setParam('resource', 'teams/'.$teamId)
+            ->setParam('resource', 'team/'.$teamId)
         ;
 
         if (!Config::getParam('domainVerification')) {
@@ -717,10 +710,10 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
             ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), $expiry, '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
         ;
 
-        $response->dynamic(new Document(\array_merge($membership->getArrayCopy(), [
-            'email' => $user->getAttribute('email'),
-            'name' => $user->getAttribute('name'),
-        ])), Response::MODEL_MEMBERSHIP);
+        $response->dynamic($membership
+            ->setAttribute('email', $user->getAttribute('email'))
+            ->setAttribute('name', $user->getAttribute('name'))
+        , Response::MODEL_MEMBERSHIP);
     });
 
 App::delete('/v1/teams/:teamId/memberships/:membershipId')
@@ -737,18 +730,18 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     ->param('teamId', '', new UID(), 'Team ID.')
     ->param('membershipId', '', new UID(), 'Membership ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('audits')
     ->inject('events')
-    ->action(function ($teamId, $membershipId, $response, $projectDB, $audits, $events) {
+    ->action(function ($teamId, $membershipId, $response, $dbForProject, $audits, $events) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $audits */
         /** @var Appwrite\Event\Event $events */
 
-        $membership = $projectDB->getDocument($membershipId);
+        $membership = $dbForProject->getDocument('memberships', $membershipId);
 
-        if (empty($membership->getId()) || Database::SYSTEM_COLLECTION_MEMBERSHIPS != $membership->getCollection()) {
+        if ($membership->isEmpty()) {
             throw new Exception('Invite not found', 404);
         }
 
@@ -756,30 +749,46 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             throw new Exception('Team IDs don\'t match', 404);
         }
 
-        $team = $projectDB->getDocument($teamId);
+        $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
 
-        if (empty($team->getId()) || Database::SYSTEM_COLLECTION_TEAMS != $team->getCollection()) {
+        if ($user->isEmpty()) {
+            throw new Exception('User not found', 404);
+        }
+
+        $team = $dbForProject->getDocument('teams', $teamId);
+
+        if ($team->isEmpty()) {
             throw new Exception('Team not found', 404);
         }
 
-        if (!$projectDB->deleteDocument($membership->getId())) {
+        if (!$dbForProject->deleteDocument('memberships', $membership->getId())) {
             throw new Exception('Failed to remove membership from DB', 500);
         }
 
-        if ($membership->getAttribute('confirm')) { // Count only confirmed members
-            $team = $projectDB->updateDocument(\array_merge($team->getArrayCopy(), [
-                'sum' => \max($team->getAttribute('sum', 0) - 1, 0), // Ensure that sum >= 0
-            ]));
+        $memberships = $user->getAttribute('memberships', []);
+
+        foreach ($memberships as $key => $child) { 
+            /** @var Document $child */
+
+            if ($membershipId == $child->getId()) {
+                unset($memberships[$key]);
+                break;
+            }
         }
 
-        if (false === $team) {
-            throw new Exception('Failed saving team to DB', 500);
+        $user->setAttribute('memberships', $memberships);
+
+        Authorization::skip(fn() => $dbForProject->updateDocument('users', $user->getId(), $user));
+
+        if ($membership->getAttribute('confirm')) { // Count only confirmed members
+            $team->setAttribute('sum', \max($team->getAttribute('sum', 0) - 1, 0));
+            $team = $dbForProject->updateDocument('teams', $team->getId(), $team);
         }
 
         $audits
             ->setParam('userId', $membership->getAttribute('userId'))
             ->setParam('event', 'teams.memberships.delete')
-            ->setParam('resource', 'teams/'.$teamId)
+            ->setParam('resource', 'team/'.$teamId)
         ;
 
         $events

app/controllers/api/users.php

@@ -1,8 +1,10 @@
 <?php
 
+use Appwrite\Auth\Auth;
+use Appwrite\Auth\Validator\Password;
+use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Exception;
-use Utopia\Validator;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\WhiteList;
 use Appwrite\Network\Validator\Email;
@@ -10,15 +12,15 @@ use Utopia\Validator\Text;
 use Utopia\Validator\Range;
 use Utopia\Validator\Boolean;
 use Utopia\Audit\Audit;
-use Utopia\Audit\Adapters\MySQL as AuditAdapter;
-use Appwrite\Auth\Auth;
-use Appwrite\Auth\Validator\Password;
-use Appwrite\Database\Database;
-use Appwrite\Database\Document;
-use Appwrite\Database\Exception\Duplicate;
-use Appwrite\Database\Validator\UID;
-use Appwrite\Utopia\Response;
-use DeviceDetector\DeviceDetector;
+use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Validator\UID;
+use Appwrite\Detector\Detector;
+use Appwrite\Database\Validator\CustomId;
+use Utopia\Config\Config;
+use Utopia\Database\Database;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
 
 App::post('/v1/users')
     ->desc('Create User')
@@ -32,52 +34,51 @@ 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('email', '', new Email(), 'User email.')
     ->param('password', '', new Password(), 'User password. Must be at least 8 chars.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($email, $password, $name, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($userId, $email, $password, $name, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
         $email = \strtolower($email);
-        $profile = $projectDB->getCollectionFirst([ // Get user by email address
-            'limit' => 1,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_USERS,
-                'email='.$email,
-            ],
-        ]);
-
-        if (!empty($profile)) {
-            throw new Exception('User already registered', 409);
-        }
 
         try {
-            $user = $projectDB->createDocument([
-                '$collection' => Database::SYSTEM_COLLECTION_USERS,
-                '$permissions' => [
-                    'read' => ['*'],
-                    'write' => ['user:{self}'],
-                ],
+            $userId = $userId == 'unique()' ? $dbForProject->getId() : $userId;
+            $user = $dbForProject->createDocument('users', new Document([
+                '$id' => $userId,
+                '$read' => ['role:all'],
+                '$write' => ['user:'.$userId],
                 'email' => $email,
                 'emailVerification' => false,
-                'status' => Auth::USER_STATUS_UNACTIVATED,
+                'status' => true,
                 'password' => Auth::passwordHash($password),
                 'passwordUpdate' => \time(),
                 'registration' => \time(),
                 'reset' => false,
                 'name' => $name,
-            ], ['email' => $email]);
+                'prefs' => new \stdClass(),
+                'sessions' => [],
+                'tokens' => [],
+                'memberships' => [],
+                'search' => implode(' ', [$userId, $email, $name]),
+                'deleted' => false
+            ]));
         } catch (Duplicate $th) {
             throw new Exception('Account already exists', 409);
         }
 
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($user, Response::MODEL_USER)
+        $usage
+            ->setParam('users.create', 1)
         ;
+
+        $response->setStatusCode(Response::STATUS_CODE_CREATED);
+        $response->dynamic($user, Response::MODEL_USER);
     });
 
 App::get('/v1/users')
@@ -92,28 +93,42 @@ App::get('/v1/users')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER_LIST)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
-    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of users to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this param to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursor', '', new UID(), 'ID of the user used as the starting point for the query, excluding the user itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $results = $projectDB->getCollection([
-            'limit' => $limit,
-            'offset' => $offset,
-            'orderType' => $orderType,
-            'search' => $search,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_USERS,
-            ],
-        ]);
+        if (!empty($cursor)) {
+            $cursorUser = $dbForProject->getDocument('users', $cursor);
+
+            if ($cursorUser->isEmpty()) {
+                throw new Exception("User '{$cursor}' for the 'cursor' value not found.", 400);
+            }
+        }
+
+        $queries = [
+            new Query('deleted', Query::TYPE_EQUAL, [false])
+        ];
+
+        if (!empty($search)) {
+            $queries[] = new Query('search', Query::TYPE_SEARCH, [$search]);
+        }
+
+        $usage
+            ->setParam('users.read', 1)
+        ;
 
         $response->dynamic(new Document([
-            'sum' => $projectDB->getSum(),
-            'users' => $results
+            'users' => $dbForProject->find('users', $queries, $limit, $offset, [], [$orderType], $cursorUser ?? null, $cursorDirection),
+            'sum' => $dbForProject->count('users', $queries, APP_LIMIT_COUNT),
         ]), Response::MODEL_USER_LIST);
     });
 
@@ -128,19 +143,24 @@ App::get('/v1/users/:userId')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($userId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($userId, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */ 
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
+        $usage
+            ->setParam('users.read', 1)
+        ;
         $response->dynamic($user, Response::MODEL_USER);
     });
 
@@ -155,21 +175,26 @@ App::get('/v1/users/:userId/prefs')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PREFERENCES)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($userId, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($userId, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
         $prefs = $user->getAttribute('prefs', new \stdClass());
 
+        $usage
+            ->setParam('users.read', 1)
+        ;
         $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
     });
 
@@ -184,18 +209,20 @@ App::get('/v1/users/:userId/sessions')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_SESSION_LIST)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('locale')
-    ->action(function ($userId, $response, $projectDB, $locale) {
+    ->inject('usage')
+    ->action(function ($userId, $response, $dbForProject, $locale, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Utopia\Locale\Locale $locale */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
@@ -211,11 +238,14 @@ App::get('/v1/users/:userId/sessions')
             $sessions[$key] = $session;
         }
 
+        $usage
+            ->setParam('users.read', 1)
+        ;
         $response->dynamic(new Document([
+            'sessions' => $sessions,
             'sum' => count($sessions),
-            'sessions' => $sessions
         ]), Response::MODEL_SESSION_LIST);
-    }, ['response', 'projectDB', 'locale']);
+    });
 
 App::get('/v1/users/:userId/logs')
     ->desc('Get User Logs')
@@ -228,33 +258,30 @@ App::get('/v1/users/:userId/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('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
+    ->param('limit', 25, new Range(0, 100), 'Maximum number of logs to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
+    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this value to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
     ->inject('response')
-    ->inject('project')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('locale')
     ->inject('geodb')
-    ->inject('utopia')
-    ->action(function ($userId, $response, $project, $projectDB, $locale, $geodb, $utopia) {
+    ->inject('usage')
+    ->action(function ($userId, $limit, $offset, $response, $dbForProject, $locale, $geodb, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Document $project */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Utopia\Locale\Locale $locale */
         /** @var MaxMind\Db\Reader $geodb */
-        /** @var Utopia\App $utopia */
-        
-        $user = $projectDB->getDocument($userId);
+        /** @var Appwrite\Stats\Stats $usage */
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        $user = $dbForProject->getDocument('users', $userId);
+
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
-        $adapter = new AuditAdapter($utopia->getResource('db'));
-        $adapter->setNamespace('app_'.$project->getId());
-
-        $audit = new Audit($adapter);
-
-        $logs = $audit->getLogsByUserAndActions($user->getId(), [
+        $audit = new Audit($dbForProject);
+        $auditEvents = [
             'account.create',
             'account.delete',
             'account.update.name',
@@ -270,49 +297,38 @@ App::get('/v1/users/:userId/logs')
             'teams.membership.create',
             'teams.membership.update',
             'teams.membership.delete',
-        ]);
+        ];
+
+        $logs = $audit->getLogsByUserAndEvents($user->getId(), $auditEvents, $limit, $offset);
 
         $output = [];
 
         foreach ($logs as $i => &$log) {
             $log['userAgent'] = (!empty($log['userAgent'])) ? $log['userAgent'] : 'UNKNOWN';
 
-            $dd = new DeviceDetector($log['userAgent']);
+            $detector = new Detector($log['userAgent']);
+            $detector->skipBotDetection(); // OPTIONAL: If called, bot detection will completely be skipped (bots will be detected as regular devices then)
 
-            $dd->skipBotDetection(); // OPTIONAL: If called, bot detection will completely be skipped (bots will be detected as regular devices then)
-
-            $dd->parse();
-
-            $os = $dd->getOs();
-            $osCode = (isset($os['short_name'])) ? $os['short_name'] : '';
-            $osName = (isset($os['name'])) ? $os['name'] : '';
-            $osVersion = (isset($os['version'])) ? $os['version'] : '';
-
-            $client = $dd->getClient();
-            $clientType = (isset($client['type'])) ? $client['type'] : '';
-            $clientCode = (isset($client['short_name'])) ? $client['short_name'] : '';
-            $clientName = (isset($client['name'])) ? $client['name'] : '';
-            $clientVersion = (isset($client['version'])) ? $client['version'] : '';
-            $clientEngine = (isset($client['engine'])) ? $client['engine'] : '';
-            $clientEngineVersion = (isset($client['engine_version'])) ? $client['engine_version'] : '';
+            $os = $detector->getOS();
+            $client = $detector->getClient();
+            $device = $detector->getDevice();
 
             $output[$i] = new Document([
                 'event' => $log['event'],
                 'ip' => $log['ip'],
-                'time' => \strtotime($log['time']),
-
-                'osCode' => $osCode,
-                'osName' => $osName,
-                'osVersion' => $osVersion,
-                'clientType' => $clientType,
-                'clientCode' => $clientCode,
-                'clientName' => $clientName,
-                'clientVersion' => $clientVersion,
-                'clientEngine' => $clientEngine,
-                'clientEngineVersion' => $clientEngineVersion,
-                'deviceName' => $dd->getDeviceName(),
-                'deviceBrand' => $dd->getBrandName(),
-                'deviceModel' => $dd->getModel(),
+                'time' => $log['time'],
+                'osCode' => $os['osCode'],
+                'osName' => $os['osName'],
+                'osVersion' => $os['osVersion'],
+                'clientType' => $client['clientType'],
+                'clientCode' => $client['clientCode'],
+                'clientName' => $client['clientName'],
+                'clientVersion' => $client['clientVersion'],
+                'clientEngine' => $client['clientEngine'],
+                'clientEngineVersion' => $client['clientEngineVersion'],
+                'deviceName' => $device['deviceName'],
+                'deviceBrand' => $device['deviceBrand'],
+                'deviceModel' => $device['deviceModel']
             ]);
 
             $record = $geodb->get($log['ip']);
@@ -326,7 +342,14 @@ App::get('/v1/users/:userId/logs')
             }
         }
 
-        $response->dynamic(new Document(['logs' => $output]), Response::MODEL_LOG_LIST);
+        $usage
+            ->setParam('users.read', 1)
+        ;
+
+        $response->dynamic(new Document([
+            'sum' => $audit->countLogsByUserAndEvents($user->getId(), $auditEvents),
+            'logs' => $output,
+        ]), Response::MODEL_LOG_LIST);
     });
 
 App::patch('/v1/users/:userId/status')
@@ -341,28 +364,27 @@ App::patch('/v1/users/:userId/status')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new UID(), 'User unique ID.')
-    ->param('status', '', new WhiteList([Auth::USER_STATUS_ACTIVATED, Auth::USER_STATUS_BLOCKED, Auth::USER_STATUS_UNACTIVATED], true, Validator::TYPE_INTEGER), 'User Status code. To activate the user pass '.Auth::USER_STATUS_ACTIVATED.', to block the user pass '.Auth::USER_STATUS_BLOCKED.' and for disabling the user pass '.Auth::USER_STATUS_UNACTIVATED)
+    ->param('userId', '', new UID(), 'User ID.')
+    ->param('status', null, new Boolean(true), 'User Status. To activate the user pass `true` and to block the user pass `false`.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($userId, $status, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($userId, $status, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'status' => (int)$status,
-        ]));
-
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('status', (bool) $status));
 
+        $usage
+            ->setParam('users.update', 1)
+        ;
         $response->dynamic($user, Response::MODEL_USER);
     });
 
@@ -378,28 +400,27 @@ App::patch('/v1/users/:userId/verification')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new UID(), 'User unique ID.')
-    ->param('emailVerification', false, new Boolean(), 'User Email Verification Status.')
+    ->param('userId', '', new UID(), 'User ID.')
+    ->param('emailVerification', false, new Boolean(), 'User email verification status.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($userId, $emailVerification, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($userId, $emailVerification, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'emailVerification' => $emailVerification,
-        ]));
-
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', $emailVerification));
 
+        $usage
+            ->setParam('users.update', 1)
+        ;
         $response->dynamic($user, Response::MODEL_USER);
     });
 
@@ -415,34 +436,28 @@ App::patch('/v1/users/:userId/name')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->param('name', '', new Text(128), 'User name. Max length: 128 chars.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('audits')
-    ->action(function ($userId, $name, $response, $projectDB, $audits) {
+    ->action(function ($userId, $name, $response, $dbForProject, $audits) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $audits */
-        
-        $user = $projectDB->getDocument($userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        $user = $dbForProject->getDocument('users', $userId);
+
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'name' => $name,
-        ]));
-
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('name', $name));
 
         $audits
             ->setParam('userId', $user->getId())
             ->setParam('event', 'users.update.name')
-            ->setParam('resource', 'users/'.$user->getId())
+            ->setParam('resource', 'user/'.$user->getId())
         ;
 
         $response->dynamic($user, Response::MODEL_USER);
@@ -460,35 +475,32 @@ App::patch('/v1/users/:userId/password')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new UID(), 'User unique ID.')
-    ->param('password', '', new Password(), 'New user password. Must be between 6 to 32 chars.')
+    ->param('userId', '', new UID(), 'User ID.')
+    ->param('password', '', new Password(), 'New user password. Must be at least 8 chars.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('audits')
-    ->action(function ($userId, $password, $response, $projectDB, $audits) {
+    ->action(function ($userId, $password, $response, $dbForProject, $audits) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $audits */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'password' => Auth::passwordHash($password),
-            'passwordUpdate' => \time(),
-        ]));
+        $user
+            ->setAttribute('password', Auth::passwordHash($password))
+            ->setAttribute('passwordUpdate', \time());
 
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user);
 
         $audits
             ->setParam('userId', $user->getId())
             ->setParam('event', 'users.update.password')
-            ->setParam('resource', 'users/'.$user->getId())
+            ->setParam('resource', 'user/'.$user->getId())
         ;
 
         $response->dynamic($user, Response::MODEL_USER);
@@ -506,55 +518,39 @@ App::patch('/v1/users/:userId/email')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_USER)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->param('email', '', new Email(), 'User email.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('audits')
-    ->action(function ($userId, $email, $response, $projectDB, $audits) {
+    ->action(function ($userId, $email, $response, $dbForProject, $audits) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $audits */
 
-        $user = $projectDB->getDocument($userId);
-        
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        $user = $dbForProject->getDocument('users', $userId);
+
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
-        
+
         $isAnonymousUser = is_null($user->getAttribute('email')) && is_null($user->getAttribute('password')); // Check if request is from an anonymous account for converting
-        $email = \strtolower($email);
-        $profile = $projectDB->getCollectionFirst([ // Get user by email address
-            'limit' => 1,
-            'filters' => [
-                '$collection='.Database::SYSTEM_COLLECTION_USERS,
-                'email='.$email,
-            ],
-        ]);
-
-        if (!empty($profile)) {
-            throw new Exception('User already registered', 400);
-        }
-
         if (!$isAnonymousUser) {
-            // Remove previous unique ID.
-            $projectDB->deleteUniqueKey(\md5($user->getArrayCopy()['$collection'].':'.'email'.'='.$user->getAttribute('email')));
+            //TODO: Remove previous unique ID.
         }
 
-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'email' => $email,
-        ]));
+        $email = \strtolower($email);
 
-        $projectDB->addUniqueKey(\md5($user['$collection'].':'.'email'.'='.$email));
-
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
+        try {
+            $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('email', $email));
+        } catch(Duplicate $th) {
+            throw new Exception('Email already exists', 409);
         }
-        
+
         $audits
             ->setParam('userId', $user->getId())
-            ->setParam('event', 'account.update.email')
-            ->setParam('resource', 'users/'.$user->getId())
+            ->setParam('event', 'users.update.email')
+            ->setParam('resource', 'user/'.$user->getId())
         ;
 
         $response->dynamic($user, Response::MODEL_USER);
@@ -572,28 +568,27 @@ App::patch('/v1/users/:userId/prefs')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PREFERENCES)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->param('prefs', '', new Assoc(), 'Prefs key-value JSON object.')
     ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($userId, $prefs, $response, $projectDB) {
+    ->inject('dbForProject')
+    ->inject('usage')
+    ->action(function ($userId, $prefs, $response, $dbForProject, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'prefs' => $prefs,
-        ]));
-
-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
+        $user = $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('prefs', $prefs));
 
+        $usage
+            ->setParam('users.update', 1)
+        ;
         $response->dynamic(new Document($prefs), Response::MODEL_PREFERENCES);
     });
 
@@ -608,39 +603,48 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->label('sdk.description', '/docs/references/users/delete-user-session.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('userId', '', new UID(), 'User unique ID.')
-    ->param('sessionId', null, new UID(), 'User unique session ID.')
+    ->param('userId', '', new UID(), 'User ID.')
+    ->param('sessionId', null, new UID(), 'Session ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('events')
-    ->action(function ($userId, $sessionId, $response, $projectDB, $events) {
+    ->inject('usage')
+    ->action(function ($userId, $sessionId, $response, $dbForProject, $events, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $events */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
         $sessions = $user->getAttribute('sessions', []);
 
-        foreach ($sessions as $session) { 
-            /** @var Document $session */
+        foreach ($sessions as $key => $session) { /** @var Document $session */
 
             if ($sessionId == $session->getId()) {
-                if (!$projectDB->deleteDocument($session->getId())) {
-                    throw new Exception('Failed to remove token from DB', 500);
-                }
+                unset($sessions[$key]);
+
+                $dbForProject->deleteDocument('sessions', $session->getId());
+
+                $user->setAttribute('sessions', $sessions);
 
                 $events
                     ->setParam('eventData', $response->output($user, Response::MODEL_USER))
                 ;
+
+                $dbForProject->updateDocument('users', $user->getId(), $user);
             }
         }
 
-        // TODO : Response filter implementation
+        $usage
+            ->setParam('users.update', 1)
+            ->setParam('users.sessions.delete', 1)
+        ;
+
         $response->noContent();
     });
 
@@ -655,36 +659,39 @@ App::delete('/v1/users/:userId/sessions')
     ->label('sdk.description', '/docs/references/users/delete-user-sessions.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('userId', '', new UID(), 'User unique ID.')
+    ->param('userId', '', new UID(), 'User ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('events')
-    ->action(function ($userId, $response, $projectDB, $events) {
+    ->inject('usage')
+    ->action(function ($userId, $response, $dbForProject, $events, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $events */
+        /** @var Appwrite\Stats\Stats $usage */
 
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
 
         $sessions = $user->getAttribute('sessions', []);
 
-        foreach ($sessions as $session) { 
-            /** @var Document $session */
-
-            if (!$projectDB->deleteDocument($session->getId())) {
-                throw new Exception('Failed to remove token from DB', 500);
-            }
+        foreach ($sessions as $key => $session) { /** @var Document $session */
+            $dbForProject->deleteDocument('sessions', $session->getId());
         }
 
+        $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('sessions', []));
+
         $events
             ->setParam('eventData', $response->output($user, Response::MODEL_USER))
         ;
 
-        // TODO : Response filter implementation
+        $usage
+            ->setParam('users.update', 1)
+            ->setParam('users.sessions.delete', 1)
+        ;
         $response->noContent();
     });
 
@@ -699,51 +706,156 @@ App::delete('/v1/users/:userId')
     ->label('sdk.description', '/docs/references/users/delete.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('userId', '', function () {return new UID();}, 'User unique ID.')
+    ->param('userId', '', function () {return new UID();}, 'User ID.')
     ->inject('response')
-    ->inject('projectDB')
+    ->inject('dbForProject')
     ->inject('events')
     ->inject('deletes')
-    ->action(function ($userId, $response, $projectDB, $events, $deletes) {
+    ->inject('usage')
+    ->action(function ($userId, $response, $dbForProject, $events, $deletes, $usage) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForProject */
         /** @var Appwrite\Event\Event $events */
         /** @var Appwrite\Event\Event $deletes */
+        /** @var Appwrite\Stats\Stats $usage */
         
-        $user = $projectDB->getDocument($userId);
+        $user = $dbForProject->getDocument('users', $userId);
 
-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty() || $user->getAttribute('deleted')) {
             throw new Exception('User not found', 404);
         }
-        if (!$projectDB->deleteDocument($userId)) {
-            throw new Exception('Failed to remove user from DB', 500);
-        }
 
-        if (!$projectDB->deleteUniqueKey(md5('users:email='.$user->getAttribute('email', null)))) {
-            throw new Exception('Failed to remove unique key from DB', 500);
-        }
-        
-        $reservedId = $projectDB->createDocument([
-            '$collection' => Database::SYSTEM_COLLECTION_RESERVED,
-            '$id' => $userId,
-            '$permissions' => [
-                'read' => ['*'],
-            ],
-        ]);
+        // clone user object to send to workers
+        $clone = clone $user;
 
-        if (false === $reservedId) {
-            throw new Exception('Failed saving reserved id to DB', 500);
-        }
+        $user
+            ->setAttribute("name", null)
+            ->setAttribute("email", null)
+            ->setAttribute("password", null)
+            ->setAttribute("deleted", true)
+        ;
+
+        $dbForProject->updateDocument('users', $userId, $user);
 
         $deletes
             ->setParam('type', DELETE_TYPE_DOCUMENT)
-            ->setParam('document', $user)
+            ->setParam('document', $clone)
         ;
 
         $events
-            ->setParam('eventData', $response->output($user, Response::MODEL_USER))
+            ->setParam('eventData', $response->output($clone, Response::MODEL_USER))
+        ;
+
+        $usage
+            ->setParam('users.delete', 1)
         ;
 
-        // TODO : Response filter implementation
         $response->noContent();
     });
+
+App::get('/v1/users/usage')
+    ->desc('Get usage stats for the users API')
+    ->groups(['api', 'users'])
+    ->label('scope', 'users.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'users')
+    ->label('sdk.method', 'getUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_USERS)
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
+    ->param('provider', '', new WhiteList(\array_merge(['email', 'anonymous'], \array_map(fn($value) => "oauth-".$value, \array_keys(Config::getParam('providers', [])))), true), 'Provider Name.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->inject('register')
+    ->action(function ($range, $provider, $response, $dbForProject) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Utopia\Database\Database $dbForProject */
+
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '30m',
+                    'limit' => 48,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
+
+            $metrics = [
+                "users.count",
+                "users.create",
+                "users.read",
+                "users.update",
+                "users.delete",
+                "users.sessions.create",
+                "users.sessions.$provider.create",
+                "users.sessions.delete"
+            ];
+
+            $stats = [];
+
+            Authorization::skip(function() use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
+
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
+    
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    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,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
+                }    
+            });
+
+            $usage = new Document([
+                'range' => $range,
+                'usersCount' => $stats["users.count"],
+                'usersCreate' => $stats["users.create"],
+                'usersRead' => $stats["users.read"],
+                'usersUpdate' => $stats["users.update"],
+                'usersDelete' => $stats["users.delete"],
+                'sessionsCreate' => $stats["users.sessions.create"],
+                'sessionsProviderCreate' => $stats["users.sessions.$provider.create"],
+                'sessionsDelete' => $stats["users.sessions.delete"]
+            ]);
+
+        }
+
+        $response->dynamic($usage, Response::MODEL_USAGE_USERS);
+    });

app/controllers/general.php

@@ -3,37 +3,60 @@
 require_once __DIR__.'/../init.php';
 
 use Utopia\App;
-use Utopia\Swoole\Request;
+use Utopia\Logger\Log;
+use Utopia\Logger\Log\User;
+use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
-use Utopia\View;
+use Appwrite\Utopia\View;
 use Utopia\Exception;
 use Utopia\Config\Config;
 use Utopia\Domains\Domain;
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Database;
-use Appwrite\Database\Document;
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Network\Validator\Origin;
 use Appwrite\Utopia\Response\Filters\V06;
 use Appwrite\Utopia\Response\Filters\V07;
 use Appwrite\Utopia\Response\Filters\V08;
+use Appwrite\Utopia\Response\Filters\V11;
 use Utopia\CLI\Console;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
+use Appwrite\Utopia\Request\Filters\V12;
 
 Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-App::init(function ($utopia, $request, $response, $console, $project, $consoleDB, $user, $locale, $clients) {
+App::init(function ($utopia, $request, $response, $console, $project, $dbForConsole, $user, $locale, $clients) {
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $console */
-    /** @var Appwrite\Database\Document $project */
-    /** @var Appwrite\Database\Database $consoleDB */
-    /** @var Appwrite\Database\Document $user */
+    /** @var Utopia\Database\Document $console */
+    /** @var Utopia\Database\Document $project */
+    /** @var Utopia\Database\Database $dbForConsole */
+    /** @var Utopia\Database\Document $user */
     /** @var Utopia\Locale\Locale $locale */
     /** @var array $clients */
 
+    /*
+     * Request format
+    */
+    $route = $utopia->match($request);
+    Request::setRoute($route);
+
+    $requestFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
+    if ($requestFormat) {
+        switch($requestFormat) {
+            case version_compare ($requestFormat , '0.12.0', '<') :
+                Request::setFilter(new V12());
+                break;
+            default:
+                Request::setFilter(null);
+        }
+    } else {
+        Request::setFilter(null);
+    }
+
     $domain = $request->getHostname();
     $domains = Config::getParam('domains', []);
     if (!array_key_exists($domain, $domains)) {
@@ -46,50 +69,49 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
             Console::warning('Skipping SSL certificates generation on ACME challenge.');
         } else {
             Authorization::disable();
-            $dbDomain = $consoleDB->getCollectionFirst([
-                'limit' => 1,
-                'offset' => 0,
-                'filters' => [
-                    '$collection=' . Database::SYSTEM_COLLECTION_CERTIFICATES,
-                    'domain=' . $domain->get(),
-                ],
+
+            $domainDocument = $dbForConsole->findOne('domains', [
+                new Query('domain', QUERY::TYPE_EQUAL, [$domain->get()])
             ]);
 
-            if (empty($dbDomain)) {
-                $dbDomain = [
-                    '$collection' => Database::SYSTEM_COLLECTION_CERTIFICATES,
-                    '$permissions' => [
-                        'read' => [],
-                        'write' => [],
-                    ],
+            if (!$domainDocument) {
+                $domainDocument = new Document([
                     'domain' => $domain->get(),
-                ];
-                $dbDomain = $consoleDB->createDocument($dbDomain);
-                Authorization::enable();
+                    'tld' => $domain->getSuffix(),
+                    'registerable' => $domain->getRegisterable(),
+                    'verification' => false,
+                    'certificateId' => null,
+                ]);
 
-                Console::info('Issuing a TLS certificate for the master domain (' . $domain->get() . ') in a few seconds...'); // TODO move this to installation script
+                $domainDocument = $dbForConsole->createDocument('domains', $domainDocument);
+
+                Console::info('Issuing a TLS certificate for the master domain (' . $domain->get() . ') in a few seconds...');
 
                 Resque::enqueue('v1-certificates', 'CertificatesV1', [
-                    'document' => $dbDomain,
+                    'document' => $domainDocument,
                     'domain' => $domain->get(),
                     'validateTarget' => false,
                     'validateCNAME' => false,
                 ]);
             }
+
             $domains[$domain->get()] = true;
+
+            Authorization::reset(); // ensure authorization is re-enabled
         }
         Config::setParam('domains', $domains);
     }
 
-    $localeParam = (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
-
+    $localeParam = (string) $request->getParam('locale', $request->getHeader('x-appwrite-locale', ''));
     if (\in_array($localeParam, Config::getParam('locale-codes'))) {
         $locale->setDefault($localeParam);
-    };
+    }
 
-    $route = $utopia->match($request);
+    if ($project->isEmpty()) {
+        throw new Exception('Project not found', 404);
+    }
 
-    if (!empty($route->getLabel('sdk.auth', [])) && empty($project->getId()) && ($route->getLabel('scope', '') !== 'public')) {
+    if (!empty($route->getLabel('sdk.auth', [])) && $project->isEmpty() && ($route->getLabel('scope', '') !== 'public')) {
         throw new Exception('Missing or unknown project ID', 400);
     }
 
@@ -132,8 +154,8 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
     );
 
     /* 
-    * Response format
-    */
+     * Response format
+     */
     $responseFormat = $request->getHeader('x-appwrite-response-format', App::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', ''));
     if ($responseFormat) {
         switch($responseFormat) {
@@ -145,6 +167,8 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
                 break;
             case version_compare ($responseFormat , '0.8.0', '<=') :
                 Response::setFilter(new V08());
+            case version_compare ($responseFormat , '0.11.0', '<=') :
+                Response::setFilter(new V11());
                 break;
             default:
                 Response::setFilter(null);
@@ -198,10 +222,10 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
     $role = ($user->isEmpty()) ? Auth::USER_ROLE_GUEST : Auth::USER_ROLE_MEMBER;
 
     // Add user roles
-    $membership = $user->search('teamId', $project->getAttribute('teamId', null), $user->getAttribute('memberships', []));
+    $memberships = $user->find('teamId', $project->getAttribute('teamId', null), 'memberships');
 
-    if ($membership) {
-        foreach ($membership->getAttribute('roles', []) as $memberRole) {
+    if ($memberships) {
+        foreach ($memberships->getAttribute('roles', []) as $memberRole) {
             switch ($memberRole) {
                 case 'owner':
                     $role = Auth::USER_ROLE_OWNER;
@@ -224,7 +248,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
 
     if (!empty($authKey)) { // API Key authentication
         // Check if given key match project API keys
-        $key = $project->search('secret', $authKey, $project->getAttribute('keys', []));
+        $key = $project->find('secret', $authKey, 'keys');
 
         /*
          * Try app auth when we have project key and no user
@@ -233,7 +257,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
         if ($key && $user->isEmpty()) {
             $user = new Document([
                 '$id' => '',
-                'status' => Auth::USER_STATUS_ACTIVATED,
+                'status' => true,
                 'email' => 'app.'.$project->getId().'@service.'.$request->getHostname(),
                 'password' => '',
                 'name' => $project->getAttribute('name', 'Untitled'),
@@ -253,28 +277,35 @@ App::init(function ($utopia, $request, $response, $console, $project, $consoleDB
         Authorization::setRole($authRole);
     }
 
-    // TDOO Check if user is root
+    $service = $route->getLabel('sdk.namespace','');
+    if(!empty($service)) {
+        if(array_key_exists($service, $project->getAttribute('services',[]))
+            && !$project->getAttribute('services',[])[$service]
+            && !Auth::isPrivilegedUser(Authorization::getRoles())) {
+            throw new Exception('Service is disabled', 503);
+        }
+    }
 
     if (!\in_array($scope, $scopes)) {
-        if (empty($project->getId()) || Database::SYSTEM_COLLECTION_PROJECTS !== $project->getCollection()) { // Check if permission is denied because project is missing
+        if ($project->isEmpty()) { // Check if permission is denied because project is missing
             throw new Exception('Project not found', 404);
         }
 
         throw new Exception($user->getAttribute('email', 'User').' (role: '.\strtolower($roles[$role]['label']).') missing scope ('.$scope.')', 401);
     }
 
-    if (Auth::USER_STATUS_BLOCKED == $user->getAttribute('status')) { // Account has not been activated
-        throw new Exception('Invalid credentials. User is blocked', 401); // User is in status blocked
+    if (false === $user->getAttribute('status')) { // Account is blocked
+        throw new Exception('Invalid credentials. User is blocked', 401);
     }
 
     if ($user->getAttribute('reset')) {
         throw new Exception('Password reset is required', 412);
     }
 
-}, ['utopia', 'request', 'response', 'console', 'project', 'consoleDB', 'user', 'locale', 'clients']);
+}, ['utopia', 'request', 'response', 'console', 'project', 'dbForConsole', 'user', 'locale', 'clients']);
 
 App::options(function ($request, $response) {
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
 
     $origin = $request->getOrigin();
@@ -289,19 +320,72 @@ App::options(function ($request, $response) {
         ->noContent();
 }, ['request', 'response']);
 
-App::error(function ($error, $utopia, $request, $response, $layout, $project) {
+App::error(function ($error, $utopia, $request, $response, $layout, $project, $logger, $loggerBreadcrumbs) {
     /** @var Exception $error */
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Utopia\View $layout */
-    /** @var Appwrite\Database\Document $project */
+    /** @var Appwrite\Utopia\View $layout */
+    /** @var Utopia\Database\Document $project */
+    /** @var Utopia\Logger\Logger $logger */
+    /** @var Utopia\Logger\Log\Breadcrumb[] $loggerBreadcrumbs */
+
+    $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
+    $route = $utopia->match($request);
+
+    if($logger) {
+        if($error->getCode() >= 500 || $error->getCode() === 0) {
+            try {
+                $user = $utopia->getResource('user');
+                /** @var Appwrite\Database\Document $user */
+            } catch(\Throwable $th) {
+                // All good, user is optional information for logger
+            }
+
+            $log = new Utopia\Logger\Log();
+
+            if(isset($user) && !$user->isEmpty()) {
+                $log->setUser(new User($user->getId()));
+            }
+
+            $log->setNamespace("http");
+            $log->setServer(\gethostname());
+            $log->setVersion($version);
+            $log->setType(Log::TYPE_ERROR);
+            $log->setMessage($error->getMessage());
+
+            $log->addTag('method', $route->getMethod());
+            $log->addTag('url',  $route->getPath());
+            $log->addTag('verboseType', get_class($error));
+            $log->addTag('code', $error->getCode());
+            $log->addTag('projectId', $project->getId());
+            $log->addTag('hostname', $request->getHostname());
+            $log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));
+
+            $log->addExtra('file', $error->getFile());
+            $log->addExtra('line', $error->getLine());
+            $log->addExtra('trace', $error->getTraceAsString());
+            $log->addExtra('roles', Authorization::$roles);
+
+            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
+            $log->setAction($action);
+
+            $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            foreach($loggerBreadcrumbs as $loggerBreadcrumb) {
+                $log->addBreadcrumb($loggerBreadcrumb);
+            }
+
+            $responseCode = $logger->addLog($log);
+            Console::info('Log pushed with status code: '.$responseCode);
+        }
+    }
 
     if ($error instanceof PDOException) {
         throw $error;
     }
 
-    $route = $utopia->match($request);
     $template = ($route) ? $route->getLabel('error', null) : null;
 
     if (php_sapi_name() === 'cli') {
@@ -318,8 +402,6 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
         Console::error('[Error] Line: '.$error->getLine());
     }
 
-    $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
-
     switch ($error->getCode()) { // Don't show 500 errors!
         case 400: // Error allowed publicly
         case 401: // Error allowed publicly
@@ -365,10 +447,12 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
         $comp = new View($template);
 
         $comp
+            ->setParam('development', App::isDevelopment())
             ->setParam('projectName', $project->getAttribute('name'))
             ->setParam('projectURL', $project->getAttribute('url'))
             ->setParam('message', $error->getMessage())
             ->setParam('code', $code)
+            ->setParam('trace', $error->getTrace())
         ;
 
         $layout
@@ -384,7 +468,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
 
     $response->dynamic(new Document($output),
         $utopia->isDevelopment() ? Response::MODEL_ERROR_DEV : Response::MODEL_ERROR);
-}, ['error', 'utopia', 'request', 'response', 'layout', 'project']);
+}, ['error', 'utopia', 'request', 'response', 'layout', 'project', 'logger', 'loggerBreadcrumbs']);
 
 App::get('/manifest.json')
     ->desc('Progressive app manifest file')

app/controllers/mock.php

@@ -2,7 +2,7 @@
 
 global $utopia, $request, $response;
 
-use Appwrite\Database\Document;
+use Utopia\Database\Document;
 use Appwrite\Network\Validator\Host;
 use Appwrite\Utopia\Response;
 use Utopia\App;
@@ -205,7 +205,7 @@ App::get('/v1/mock/tests/general/download')
     ->label('sdk.mock', true)
     ->inject('response')
     ->action(function ($response) {
-        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Request $request */
         
         $response
             ->setContentType('text/plain')
@@ -236,7 +236,7 @@ App::post('/v1/mock/tests/general/upload')
     ->inject('request')
     ->inject('response')
     ->action(function ($x, $y, $z, $file, $request, $response) {
-        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Request $request */
         /** @var Utopia\Swoole\Response $response */
         
         $file = $request->getFiles('file');
@@ -373,7 +373,7 @@ App::get('/v1/mock/tests/general/get-cookie')
     ->label('sdk.mock', true)
     ->inject('request')
     ->action(function ($request) {
-        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Request $request */
 
         if ($request->getCookie('cookieName', '') !== 'cookieValue') {
             throw new Exception('Missing cookie value', 400);
@@ -551,7 +551,7 @@ App::get('/v1/mock/tests/general/oauth2/failure')
 
 App::shutdown(function($utopia, $response, $request) {
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
 
     $result = [];
@@ -568,7 +568,7 @@ App::shutdown(function($utopia, $response, $request) {
     $tests = \array_merge($tests, $result);
 
     if (!\file_put_contents($path, \json_encode($tests), LOCK_EX)) {
-        throw new Exception('Failed to save resutls', 500);
+        throw new Exception('Failed to save results', 500);
     }
 
     $response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getPath() . ':passed']), Response::MODEL_MOCK);

app/controllers/shared/api.php

@@ -1,36 +1,37 @@
 <?php
 
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Messaging\Adapter\Realtime;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
+use Utopia\Database\Document;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 
-App::init(function ($utopia, $request, $response, $project, $user, $register, $events, $audits, $usage, $deletes, $db) {
+App::init(function ($utopia, $request, $response, $project, $user, $events, $audits, $usage, $deletes, $database, $dbForProject, $mode) {
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
-    /** @var Appwrite\Database\Document $user */
+    /** @var Utopia\Database\Document $project */
+    /** @var Utopia\Database\Document $user */
     /** @var Utopia\Registry\Registry $register */
     /** @var Appwrite\Event\Event $events */
     /** @var Appwrite\Event\Event $audits */
-    /** @var Appwrite\Event\Event $usage */
+    /** @var Appwrite\Stats\Stats $usage */
     /** @var Appwrite\Event\Event $deletes */
+    /** @var Appwrite\Event\Event $database */
     /** @var Appwrite\Event\Event $functions */
-    /** @var PDO $db */
+    /** @var Utopia\Database\Database $dbForProject */
 
     Storage::setDevice('files', new Local(APP_STORAGE_UPLOADS.'/app-'.$project->getId()));
     Storage::setDevice('functions', new Local(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId()));
 
     $route = $utopia->match($request);
 
-    if (empty($project->getId()) && $route->getLabel('abuse-limit', 0) > 0) { // Abuse limit requires an active project scope
+    if ($project->isEmpty() && $route->getLabel('abuse-limit', 0) > 0) { // Abuse limit requires an active project scope
         throw new Exception('Missing or unknown project ID', 400);
     }
 
@@ -43,8 +44,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
     $abuseKeyLabel = (!is_array($abuseKeyLabel)) ? [$abuseKeyLabel] : $abuseKeyLabel;
 
     foreach ($abuseKeyLabel as $abuseKey) {
-        $timeLimit = new TimeLimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600), $db);
-        $timeLimit->setNamespace('app_'.$project->getId());
+        $timeLimit = new TimeLimit($abuseKey, $route->getLabel('abuse-limit', 0), $route->getLabel('abuse-time', 3600), $dbForProject);
         $timeLimit
             ->setParam('{userId}', $user->getId())
             ->setParam('{userAgent}', $request->getUserAgent(''))
@@ -54,8 +54,10 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
     }
 
     $closestLimit = null;
-    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
-    $isAppUser = Auth::isAppUser(Authorization::$roles);
+
+    $roles = Authorization::getRoles();
+    $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+    $isAppUser = Auth::isAppUser($roles);
 
     foreach ($timeLimitArray as $timeLimit) {
         foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys
@@ -74,7 +76,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
                 ->addHeader('X-RateLimit-Reset', $timeLimit->time() + $route->getLabel('abuse-time', 3600))
             ;
         }
-    
+
         if (($abuse->check() // Route is rate-limited
         && App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') // Abuse is not disabled
         && (!$isAppUser && !$isPrivilegedUser)) // User is not an admin or API key
@@ -100,6 +102,9 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
     $audits
         ->setParam('projectId', $project->getId())
         ->setParam('userId', $user->getId())
+        ->setParam('userEmail', $user->getAttribute('email'))
+        ->setParam('userName', $user->getAttribute('name'))
+        ->setParam('mode', $mode)
         ->setParam('event', '')
         ->setParam('resource', '')
         ->setParam('userAgent', $request->getUserAgent(''))
@@ -112,6 +117,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
         ->setParam('httpRequest', 1)
         ->setParam('httpUrl', $request->getHostname().$request->getURI())
         ->setParam('httpMethod', $request->getMethod())
+        ->setParam('httpPath', $route->getPath())
         ->setParam('networkRequestSize', 0)
         ->setParam('networkResponseSize', 0)
         ->setParam('storage', 0)
@@ -121,33 +127,29 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
         ->setParam('projectId', $project->getId())
     ;
 
-}, ['utopia', 'request', 'response', 'project', 'user', 'register', 'events', 'audits', 'usage', 'deletes', 'db'], 'api');
+    $database
+        ->setParam('projectId', $project->getId())
+    ;
+}, ['utopia', 'request', 'response', 'project', 'user', 'events', 'audits', 'usage', 'deletes', 'database', 'dbForProject', 'mode'], 'api');
 
-App::init(function ($utopia, $request, $response, $project, $user) {
+App::init(function ($utopia, $request, $project) {
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
-    /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
-    /** @var Appwrite\Database\Document $user */
-    /** @var Utopia\Registry\Registry $register */
-    /** @var Appwrite\Event\Event $events */
-    /** @var Appwrite\Event\Event $audits */
-    /** @var Appwrite\Event\Event $usage */
-    /** @var Appwrite\Event\Event $deletes */
-    /** @var Appwrite\Event\Event $functions */
+    /** @var Appwrite\Utopia\Request $request */
+    /** @var Utopia\Database\Document $project */
 
     $route = $utopia->match($request);
 
-    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
-    $isAppUser = Auth::isAppUser(Authorization::$roles);
+    $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
+    $isAppUser = Auth::isAppUser(Authorization::getRoles());
 
     if($isAppUser || $isPrivilegedUser) { // Skip limits for app and console devs
         return;
     }
 
+    $auths = $project->getAttribute('auths', []);
     switch ($route->getLabel('auth.type', '')) {
         case 'emailPassword':
-            if($project->getAttribute('usersAuthEmailPassword', true) === false) {
+            if(($auths['emailPassword'] ?? true) === false) {
                 throw new Exception('Email / Password authentication is disabled for this project', 501);
             }
             break;
@@ -159,43 +161,44 @@ App::init(function ($utopia, $request, $response, $project, $user) {
             break;
 
         case 'anonymous':
-            if($project->getAttribute('usersAuthAnonymous', true) === false) {
+            if(($auths['anonymous'] ?? true) === false) {
                 throw new Exception('Anonymous authentication is disabled for this project', 501);
             }
             break;
 
         case 'invites':
-            if($project->getAttribute('usersAuthInvites', true) === false) {
+            if(($auths['invites'] ?? true) === false) {
                 throw new Exception('Invites authentication is disabled for this project', 501);
             }
             break;
 
         case 'jwt':
-            if($project->getAttribute('usersAuthJWT', true) === false) {
+            if(($auths['JWT'] ?? true) === false) {
                 throw new Exception('JWT authentication is disabled for this project', 501);
             }
             break;
-        
+
         default:
             throw new Exception('Unsupported authentication route');
             break;
     }
 
-}, ['utopia', 'request', 'response', 'project', 'user'], 'auth');
+}, ['utopia', 'request', 'project'], 'auth');
 
-App::shutdown(function ($utopia, $request, $response, $project, $events, $audits, $usage, $deletes, $mode) {
+App::shutdown(function ($utopia, $request, $response, $project, $events, $audits, $usage, $deletes, $database, $mode) {
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
+    /** @var Utopia\Database\Document $project */
     /** @var Appwrite\Event\Event $events */
     /** @var Appwrite\Event\Event $audits */
-    /** @var Appwrite\Event\Event $usage */
+    /** @var Appwrite\Stats\Stats $usage */
     /** @var Appwrite\Event\Event $deletes */
+    /** @var Appwrite\Event\Event $database */
     /** @var bool $mode */
 
     if (!empty($events->getParam('event'))) {
-        if(empty($events->getParam('eventData'))) {
+        if (empty($events->getParam('eventData'))) {
             $events->setParam('eventData', $response->getPayload());
         }
 
@@ -214,14 +217,21 @@ App::shutdown(function ($utopia, $request, $response, $project, $events, $audits
 
         if ($project->getId() !== 'console') {
             $payload = new Document($response->getPayload());
-            $target = Realtime::fromPayload($events->getParam('event'), $payload);
+            $collection = new Document($events->getParam('collection') ?? []);
+
+            $target = Realtime::fromPayload(
+                event: $events->getParam('event'), 
+                payload: $payload, 
+                project: $project, 
+                collection: $collection
+            );
 
             Realtime::send(
-                $project->getId(), 
-                $response->getPayload(), 
-                $events->getParam('event'), 
-                $target['channels'], 
-                $target['roles'], 
+                $target['projectId'] ?? $project->getId(),
+                $response->getPayload(),
+                $events->getParam('event'),
+                $target['channels'],
+                $target['roles'],
                 [
                     'permissionsChanged' => $target['permissionsChanged'], 
                     'userId' => $events->getParam('userId')
@@ -229,26 +239,30 @@ App::shutdown(function ($utopia, $request, $response, $project, $events, $audits
             );
         }
     }
-    
+
     if (!empty($audits->getParam('event'))) {
         $audits->trigger();
     }
-    
+
     if (!empty($deletes->getParam('type')) && !empty($deletes->getParam('document'))) {
         $deletes->trigger();
     }
-    
+
+    if (!empty($database->getParam('type')) && !empty($database->getParam('document'))) {
+        $database->trigger();
+    }
+
     $route = $utopia->match($request);
     if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled' 
         && $project->getId()
-        && $mode !== APP_MODE_ADMIN //TODO: add check to make sure user is admin
+        && $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
-        
+
         $usage
             ->setParam('networkRequestSize', $request->getSize() + $usage->getParam('storage'))
             ->setParam('networkResponseSize', $response->getSize())
-            ->trigger()
+            ->submit()
         ;
     }
 
-}, ['utopia', 'request', 'response', 'project', 'events', 'audits', 'usage', 'deletes', 'mode'], 'api');
+}, ['utopia', 'request', 'response', 'project', 'events', 'audits', 'usage', 'deletes', 'database', 'mode'], 'api');

app/controllers/shared/web.php

@@ -5,9 +5,9 @@ use Utopia\Config\Config;
 
 App::init(function ($utopia, $request, $response, $layout) {
     /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Utopia\View $layout */
+    /** @var Appwrite\Utopia\View $layout */
 
     /* AJAX check  */
     if (!empty($request->getQuery('version', ''))) {
@@ -47,7 +47,11 @@ App::init(function ($utopia, $request, $response, $layout) {
     ;
 
     $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())

app/controllers/web/console.php

@@ -1,16 +1,14 @@
 <?php
 
+use Appwrite\Utopia\View;
 use Utopia\App;
-use Utopia\View;
 use Utopia\Config\Config;
 use Utopia\Domains\Domain;
-use Appwrite\Database\Database;
-use Appwrite\Database\Validator\Authorization;
-use Appwrite\Database\Validator\UID;
+use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 
 App::init(function ($layout) {
-    /** @var Utopia\View $layout */
+    /** @var Appwrite\Utopia\View $layout */
 
     $layout
         ->setParam('description', 'Appwrite Console allows you to easily manage, monitor, and control your entire backend API and tools.')
@@ -20,7 +18,7 @@ App::init(function ($layout) {
 
 App::shutdown(function ($response, $layout) {
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Utopia\View $layout */
+    /** @var Appwrite\Utopia\View $layout */
 
     $header = new View(__DIR__.'/../../views/console/comps/header.phtml');
     $footer = new View(__DIR__.'/../../views/console/comps/footer.phtml');
@@ -45,7 +43,7 @@ App::get('/error/:code')
     ->param('code', null, new \Utopia\Validator\Numeric(), 'Valid status code number', false)
     ->inject('layout')
     ->action(function ($code, $layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/error.phtml');
 
@@ -64,7 +62,7 @@ App::get('/console')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/index.phtml');
 
@@ -83,7 +81,7 @@ App::get('/console/account')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/account/index.phtml');
 
@@ -104,7 +102,7 @@ App::get('/console/notifications')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/v1/console/notifications/index.phtml');
 
@@ -119,7 +117,7 @@ App::get('/console/home')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/home/index.phtml');
         $page
@@ -135,13 +133,14 @@ App::get('/console/settings')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\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'), function($element) {return $element['optional'];}))
             ->setParam('customDomainsEnabled', ($target->isKnown() && !$target->isTest()))
             ->setParam('customDomainsTarget', $target->get())
             ->setParam('smtpEnabled', (!empty(App::getEnv('_APP_SMTP_HOST'))))
@@ -158,7 +157,7 @@ App::get('/console/webhooks')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/webhooks/index.phtml');
 
@@ -177,7 +176,7 @@ App::get('/console/keys')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $scopes = array_keys(Config::getParam('scopes'));
         $page = new View(__DIR__.'/../../views/console/keys/index.phtml');
@@ -189,28 +188,13 @@ App::get('/console/keys')
             ->setParam('body', $page);
     });
 
-App::get('/console/tasks')
-    ->groups(['web', 'console'])
-    ->label('permission', 'public')
-    ->label('scope', 'console')
-    ->inject('layout')
-    ->action(function ($layout) {
-        /** @var Utopia\View $layout */
-
-        $page = new View(__DIR__.'/../../views/console/tasks/index.phtml');
-
-        $layout
-            ->setParam('title', APP_NAME.' - Tasks')
-            ->setParam('body', $page);
-    });
-
 App::get('/console/database')
     ->groups(['web', 'console'])
     ->label('permission', 'public')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/database/index.phtml');
 
@@ -226,25 +210,23 @@ App::get('/console/database/collection')
     ->param('id', '', new UID(), 'Collection unique ID.')
     ->inject('response')
     ->inject('layout')
-    ->inject('projectDB')
-    ->action(function ($id, $response, $layout, $projectDB) {
+    ->action(function ($id, $response, $layout) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\View $layout */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Utopia\View $layout */
 
-        Authorization::disable();
-        $collection = $projectDB->getDocument($id, false);
-        Authorization::reset();
+        $logs = new View(__DIR__.'/../../views/console/comps/logs.phtml');
 
-        if (empty($collection->getId()) || Database::SYSTEM_COLLECTION_COLLECTIONS != $collection->getCollection()) {
-            throw new Exception('Collection not found', 404);
-        }
+        $logs
+            ->setParam('interval', App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 0))
+            ->setParam('method', 'database.listCollectionLogs')
+            ->setParam('params', [
+                'collection-id' => '{{router.params.id}}',
+            ])
+        ;
 
         $page = new View(__DIR__.'/../../views/console/database/collection.phtml');
-
-        $page
-            ->setParam('collection', $collection)
-        ;
+        
+        $page->setParam('logs', $logs);
         
         $layout
             ->setParam('title', APP_NAME.' - Database Collection')
@@ -264,28 +246,48 @@ App::get('/console/database/document')
     ->label('scope', 'console')
     ->param('collection', '', new UID(), 'Collection unique ID.')
     ->inject('layout')
-    ->inject('projectDB')
-    ->action(function ($collection, $layout, $projectDB) {
-        /** @var Utopia\View $layout */
-        /** @var Appwrite\Database\Database $projectDB */
+    ->action(function ($collection, $layout) {
+        /** @var Appwrite\Utopia\View $layout */
 
-        Authorization::disable();
-        $collection = $projectDB->getDocument($collection, false);
-        Authorization::reset();
+        $logs = new View(__DIR__.'/../../views/console/comps/logs.phtml');
 
-        if (empty($collection->getId()) || Database::SYSTEM_COLLECTION_COLLECTIONS != $collection->getCollection()) {
-            throw new Exception('Collection not found', 404);
-        }
+        $logs
+            ->setParam('interval', App::getEnv('_APP_MAINTENANCE_RETENTION_AUDIT', 0))
+            ->setParam('method', 'database.listDocumentLogs')
+            ->setParam('params', [
+                'collection-id' => '{{router.params.collection}}',
+                'document-id' => '{{router.params.id}}',
+            ])
+        ;
 
         $page = new View(__DIR__.'/../../views/console/database/document.phtml');
-        $searchFiles = new View(__DIR__.'/../../views/console/database/search/files.phtml');
-        $searchDocuments = new View(__DIR__.'/../../views/console/database/search/documents.phtml');
 
         $page
-            ->setParam('db', $projectDB)
+            ->setParam('new', false)
             ->setParam('collection', $collection)
-            ->setParam('searchFiles', $searchFiles)
-            ->setParam('searchDocuments', $searchDocuments)
+            ->setParam('logs', $logs)
+        ;
+
+        $layout
+            ->setParam('title', APP_NAME.' - Database Document')
+            ->setParam('body', $page);
+    });
+
+App::get('/console/database/document/new')
+    ->groups(['web', 'console'])
+    ->label('permission', 'public')
+    ->label('scope', 'console')
+    ->param('collection', '', new UID(), 'Collection unique ID.')
+    ->inject('layout')
+    ->action(function ($collection, $layout) {
+        /** @var Appwrite\Utopia\View $layout */
+
+        $page = new View(__DIR__.'/../../views/console/database/document.phtml');
+
+        $page
+            ->setParam('new', true)
+            ->setParam('collection', $collection)
+            ->setParam('logs', new View())
         ;
 
         $layout
@@ -299,7 +301,7 @@ App::get('/console/storage')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
         $page = new View(__DIR__.'/../../views/console/storage/index.phtml');
         
         $page
@@ -319,7 +321,7 @@ App::get('/console/users')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/users/index.phtml');
 
@@ -340,7 +342,7 @@ App::get('/console/users/user')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/users/user.phtml');
 
@@ -355,7 +357,7 @@ App::get('/console/users/teams/team')
     ->label('scope', 'console')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/users/team.phtml');
 

app/controllers/web/home.php

@@ -1,19 +1,17 @@
 <?php
 
-use Appwrite\Database\Database;
 use Appwrite\Specification\Format\OpenAPI3;
 use Appwrite\Specification\Format\Swagger2;
 use Appwrite\Specification\Specification;
+use Appwrite\Utopia\View;
 use Utopia\App;
-use Utopia\View;
 use Utopia\Config\Config;
 use Utopia\Exception;
-use Utopia\Validator\Boolean;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 
 App::init(function ($layout) {
-    /** @var Utopia\View $layout */
+    /** @var Appwrite\Utopia\View $layout */
 
     $header = new View(__DIR__.'/../../views/home/comps/header.phtml');
     $footer = new View(__DIR__.'/../../views/home/comps/footer.phtml');
@@ -34,7 +32,7 @@ App::init(function ($layout) {
 
 App::shutdown(function ($response, $layout) {
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Utopia\View $layout */
+    /** @var Appwrite\Utopia\View $layout */
 
     $response->html($layout->render());
 }, ['response', 'layout'], 'home');
@@ -44,12 +42,12 @@ App::get('/')
     ->label('permission', 'public')
     ->label('scope', 'home')
     ->inject('response')
-    ->inject('consoleDB')
+    ->inject('dbForConsole')
     ->inject('project')
-    ->action(function ($response, $consoleDB, $project) {
+    ->action(function ($response, $dbForConsole, $project) {
         /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $consoleDB */
-        /** @var Appwrite\Database\Document $project */
+        /** @var Utopia\Database\Database $dbForConsole */
+        /** @var Utopia\Database\Document $project */
 
         $response
             ->addHeader('Cache-Control', 'no-store, no-cache, must-revalidate, max-age=0')
@@ -58,18 +56,12 @@ App::get('/')
         ;
 
         if ('console' === $project->getId() || $project->isEmpty()) {
-            $whitlistRoot = App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled');
+            $whitelistRoot = App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled');
 
-            if($whitlistRoot !== 'disabled') {
-                $consoleDB->getCollection([ // Count users
-                    'filters' => [
-                        '$collection='.Database::SYSTEM_COLLECTION_USERS,
-                    ],
-                ]);
-                    
-                $sum = $consoleDB->getSum();
+            if($whitelistRoot !== 'disabled') {
+                $count = $dbForConsole->count('users', [], 1);
 
-                if($sum !== 0) {
+                if($count !== 0) {
                     return $response->redirect('/auth/signin');
                 }
             }
@@ -84,7 +76,7 @@ App::get('/auth/signin')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/signin.phtml');
 
@@ -103,7 +95,7 @@ App::get('/auth/signup')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
         $page = new View(__DIR__.'/../../views/home/auth/signup.phtml');
 
         $page
@@ -121,7 +113,7 @@ App::get('/auth/recovery')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/recovery.phtml');
 
@@ -140,7 +132,7 @@ App::get('/auth/confirm')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/confirm.phtml');
 
@@ -155,7 +147,7 @@ App::get('/auth/join')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/join.phtml');
 
@@ -170,7 +162,7 @@ App::get('/auth/recovery/reset')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/recovery/reset.phtml');
 
@@ -185,7 +177,7 @@ App::get('/auth/oauth2/success')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/oauth2.phtml');
 
@@ -203,7 +195,7 @@ App::get('/auth/magic-url')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/magicURL.phtml');
 
@@ -221,7 +213,7 @@ App::get('/auth/oauth2/failure')
     ->label('scope', 'home')
     ->inject('layout')
     ->action(function ($layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/home/auth/oauth2.phtml');
 
@@ -240,7 +232,7 @@ App::get('/error/:code')
     ->param('code', null, new \Utopia\Validator\Numeric(), 'Valid status code number', false)
     ->inject('layout')
     ->action(function ($code, $layout) {
-        /** @var Utopia\View $layout */
+        /** @var Appwrite\Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/error.phtml');
 
@@ -253,232 +245,6 @@ App::get('/error/:code')
             ->setParam('body', $page);
     });
 
-App::get('/specs/:format')
-    ->groups(['web', 'home'])
-    ->label('scope', 'public')
-    ->label('docs', false)
-    ->param('format', 'swagger2', new WhiteList(['swagger2', 'open-api3'], true), 'Spec format.', true)
-    ->param('platform', APP_PLATFORM_CLIENT, new WhiteList([APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER, APP_PLATFORM_CONSOLE], true), 'Choose target platform.', true)
-    ->param('tests', 0, function () {return new Range(0, 1);}, 'Include only test services.', true)
-    ->inject('utopia')
-    ->inject('request')
-    ->inject('response')
-    ->action(function ($format, $platform, $tests, $utopia, $request, $response) {
-        /** @var Utopia\App $utopia */
-        /** @var Utopia\Swoole\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-
-        $platforms = [
-            'client' => APP_PLATFORM_CLIENT,
-            'server' => APP_PLATFORM_SERVER,
-            'console' => APP_PLATFORM_CONSOLE,
-        ];
-
-        $authCounts = [
-            'client' => 1,
-            'server' => 2,
-            'console' => 1,
-        ];
-
-        $routes = [];
-        $models = [];
-        $services = [];
-
-        $keys = [
-            APP_PLATFORM_CLIENT => [
-                'Project' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Project',
-                    'description' => 'Your project ID',
-                    'in' => 'header',
-                ],
-                'JWT' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-JWT',
-                    'description' => 'Your secret JSON Web Token',
-                    'in' => 'header',
-                ],
-                'Locale' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Locale',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-            ],
-            APP_PLATFORM_SERVER => [
-                'Project' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Project',
-                    'description' => 'Your project ID',
-                    'in' => 'header',
-                ],
-                'Key' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Key',
-                    'description' => 'Your secret API key',
-                    'in' => 'header',
-                ],
-                'JWT' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-JWT',
-                    'description' => 'Your secret JSON Web Token',
-                    'in' => 'header',
-                ],
-                'Locale' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Locale',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-            ],
-            APP_PLATFORM_CONSOLE => [
-                'Project' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Project',
-                    'description' => 'Your project ID',
-                    'in' => 'header',
-                ],
-                'Key' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Key',
-                    'description' => 'Your secret API key',
-                    'in' => 'header',
-                ],
-                'JWT' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-JWT',
-                    'description' => 'Your secret JSON Web Token',
-                    'in' => 'header',
-                ],
-                'Locale' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Locale',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-                'Mode' => [
-                    'type' => 'apiKey',
-                    'name' => 'X-Appwrite-Mode',
-                    'description' => '',
-                    'in' => 'header',
-                ],
-            ],
-        ];
-
-        foreach ($utopia->getRoutes() as $key => $method) {
-            foreach ($method as $route) { /** @var \Utopia\Route $route */
-                $routeSecurity = $route->getLabel('sdk.auth', []);
-                $sdkPlatofrms = [];
-
-                foreach ($routeSecurity as $value) {
-                    switch ($value) {
-                        case APP_AUTH_TYPE_SESSION:
-                            $sdkPlatofrms[] = APP_PLATFORM_CLIENT;
-                            break;
-                        case APP_AUTH_TYPE_KEY:
-                            $sdkPlatofrms[] = APP_PLATFORM_SERVER;
-                            break;
-                        case APP_AUTH_TYPE_JWT:
-                            $sdkPlatofrms[] = APP_PLATFORM_SERVER;
-                            break;
-                        case APP_AUTH_TYPE_ADMIN:
-                            $sdkPlatofrms[] = APP_PLATFORM_CONSOLE;
-                            break;
-                    }
-                }
-
-                if(empty($routeSecurity)) {
-                    $sdkPlatofrms[] = APP_PLATFORM_CLIENT;
-                }
-
-                if (!$route->getLabel('docs', true)) {
-                    continue;
-                }
-
-                if ($route->getLabel('sdk.mock', false) && !$tests) {
-                    continue;
-                }
-
-                if (!$route->getLabel('sdk.mock', false) && $tests) {
-                    continue;
-                }
-
-                if (empty($route->getLabel('sdk.namespace', null))) {
-                    continue;
-                }
-
-                if ($platform !== APP_PLATFORM_CONSOLE && !\in_array($platforms[$platform], $sdkPlatofrms)) {
-                    continue;
-                }
-
-                $routes[] = $route;
-                $model = $response->getModel($route->getLabel('sdk.response.model', 'none'));
-                
-                if($model) {
-                    $models[$model->getType()] = $model;
-                }
-            }
-        }
-
-        foreach (Config::getParam('services', []) as $key => $service) {
-            if(!isset($service['docs']) // Skip service if not part of the public API
-                || !isset($service['sdk'])
-                || !$service['docs']
-                || !$service['sdk']) {
-                continue;
-            }
-
-            $services[] = [
-                'name' => $service['key'] ?? '',
-                'description' => $service['subtitle'] ?? '',
-            ];
-        }
-
-        $models = $response->getModels();
-
-        foreach ($models as $key => $value) {
-            if($platform !== APP_PLATFORM_CONSOLE && !$value->isPublic()) {
-                unset($models[$key]);
-            }
-        }
-
-        switch ($format) {
-            case 'swagger2':
-                $format = new Swagger2($utopia, $services, $routes, $models, $keys[$platform], $authCounts[$platform] ?? 0);
-                break;
-
-            case 'open-api3':
-                $format = new OpenAPI3($utopia, $services, $routes, $models, $keys[$platform], $authCounts[$platform] ?? 0);
-                break;
-            
-            default:
-                throw new Exception('Format not found', 404);
-                break;
-        }
-
-        $specs = new Specification($format);
-        
-        $format
-            ->setParam('name', APP_NAME)
-            ->setParam('description', 'Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)')
-            ->setParam('endpoint', App::getEnv('_APP_HOME', $request->getProtocol().'://'.$request->getHostname()).'/v1')
-            ->setParam('version', APP_VERSION_STABLE)
-            ->setParam('terms', App::getEnv('_APP_HOME', $request->getProtocol().'://'.$request->getHostname()).'/policy/terms')
-            ->setParam('support.email', App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM))
-            ->setParam('support.url', App::getEnv('_APP_HOME', $request->getProtocol().'://'.$request->getHostname()).'/support')
-            ->setParam('contact.name', APP_NAME.' Team')
-            ->setParam('contact.email', App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM))
-            ->setParam('contact.url', App::getEnv('_APP_HOME', $request->getProtocol().'://'.$request->getHostname()).'/support')
-            ->setParam('license.name', 'BSD-3-Clause')
-            ->setParam('license.url', 'https://raw.githubusercontent.com/appwrite/appwrite/master/LICENSE')
-            ->setParam('docs.description', 'Full API docs, specs and tutorials')
-            ->setParam('docs.url', App::getEnv('_APP_HOME', $request->getProtocol().'://'.$request->getHostname()).'/docs')
-        ;
-
-        $response
-            ->json($specs->parse());
-    });
-
 App::get('/versions')
     ->desc('Get Version')
     ->groups(['web', 'home'])

app/http.php

@@ -2,7 +2,6 @@
 
 require_once __DIR__.'/../vendor/autoload.php';
 
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Utopia\Response;
 use Swoole\Process;
 use Swoole\Http\Server;
@@ -10,8 +9,15 @@ use Swoole\Http\Request as SwooleRequest;
 use Swoole\Http\Response as SwooleResponse;
 use Utopia\App;
 use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Audit\Audit;
+use Utopia\Abuse\Adapters\TimeLimit;
+use Utopia\Database\Document;
 use Utopia\Swoole\Files;
-use Utopia\Swoole\Request;
+use Appwrite\Utopia\Request;
+use Utopia\Logger\Log;
+use Utopia\Logger\Log\User;
 
 $http = new Server("0.0.0.0", App::getEnv('PORT', 80));
 
@@ -29,21 +35,118 @@ $http
     ])
 ;
 
-$http->on('WorkerStart', function($serv, $workerId) {
-    Console::success('Worker '.++$workerId.' started succefully');
+$http->on('WorkerStart', function($server, $workerId) {
+    Console::success('Worker '.++$workerId.' started successfully');
 });
 
-$http->on('BeforeReload', function($serv, $workerId) {
+$http->on('BeforeReload', function($server, $workerId) {
     Console::success('Starting reload...');
 });
 
-$http->on('AfterReload', function($serv, $workerId) {
+$http->on('AfterReload', function($server, $workerId) {
     Console::success('Reload completed...');
 });
 
-$http->on('start', function (Server $http) use ($payloadSize) {
+Files::load(__DIR__ . '/../public');
 
-    Console::success('Server started succefully (max payload is '.number_format($payloadSize).' bytes)');
+include __DIR__ . '/controllers/general.php';
+
+$http->on('start', function (Server $http) use ($payloadSize, $register) {
+    $app = new App('UTC');
+
+    go(function() use ($register, $app) {
+        // wait for database to be ready
+        $attempts = 0;
+        $max = 10;
+        $sleep = 1;
+
+        do {
+            try {
+                $attempts++;
+                $db = $register->get('dbPool')->get();
+                $redis = $register->get('redisPool')->get();
+                break; // leave the do-while if successful
+            } catch(\Exception $e) {
+                Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= $max) {
+                    throw new \Exception('Failed to connect to database: '. $e->getMessage());
+                }
+                sleep($sleep);
+            }
+        } while ($attempts < $max);
+
+        App::setResource('db', fn() => $db);
+        App::setResource('cache', fn() => $redis);
+
+        $dbForConsole = $app->getResource('dbForConsole'); /** @var Utopia\Database\Database $dbForConsole */
+
+        Console::success('[Setup] - Server database init started...');
+        $collections = Config::getParam('collections', []); /** @var array $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] - Skip: metadata table already exists');
+        }
+
+        if($dbForConsole->getCollection(Audit::COLLECTION)->isEmpty()) {
+            $audit = new Audit($dbForConsole);
+            $audit->setup();
+        }
+
+        if ($dbForConsole->getCollection(TimeLimit::COLLECTION)->isEmpty()) {
+            $adapter = new TimeLimit("", 0, 1, $dbForConsole);
+            $adapter->setup();
+        }
+
+        foreach ($collections as $key => $collection) {
+            if(!$dbForConsole->getCollection($key)->isEmpty()) {
+                continue;
+            }
+
+            Console::success('[Setup] - Creating collection: ' . $collection['$id'] . '...');
+
+            $attributes = [];
+            $indexes = [];
+
+            foreach ($collection['attributes'] as $attribute) {
+                $attributes[] = new Document([
+                    '$id' => $attribute['$id'],
+                    'type' => $attribute['type'],
+                    'size' => $attribute['size'],
+                    'required' => $attribute['required'],
+                    'signed' => $attribute['signed'],
+                    'array' => $attribute['array'],
+                    'filters' => $attribute['filters'],
+                ]);
+            }
+
+            foreach ($collection['indexes'] as $index) {
+                $indexes[] = new Document([
+                    '$id' => $index['$id'],
+                    'type' => $index['type'],
+                    'attributes' => $index['attributes'],
+                    'lengths' => $index['lengths'],
+                    'orders' => $index['orders'],
+                ]);
+            }
+
+            $dbForConsole->createCollection($key, $attributes, $indexes);
+
+        }
+        Console::success('[Setup] - Server database init completed...');
+    });
+
+    Console::success('Server started successfully (max payload is '.number_format($payloadSize).' bytes)');
 
     Console::info("Master pid {$http->master_pid}, manager pid {$http->manager_pid}");
 
@@ -54,10 +157,6 @@ $http->on('start', function (Server $http) use ($payloadSize) {
     });
 });
 
-Files::load(__DIR__ . '/../public');
-
-include __DIR__ . '/controllers/general.php';
-
 $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register) {
     $request = new Request($swooleRequest);
     $response = new Response($swooleResponse);
@@ -80,20 +179,68 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
     $db = $register->get('dbPool')->get();
     $redis = $register->get('redisPool')->get();
 
-    App::setResource('db', function () use (&$db) {
-        return $db;
-    });
+    App::setResource('db', fn() => $db);
+    App::setResource('cache', fn() => $redis);
 
-    App::setResource('cache', function () use (&$redis) {
-        return $redis;
-    });
-    
     try {
         Authorization::cleanRoles();
-        Authorization::setRole('*');
+        Authorization::setRole('role:all');
 
         $app->run($request, $response);
     } catch (\Throwable $th) {
+        $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
+
+        $logger = $app->getResource("logger");
+        if($logger) {
+            try {
+                $user = $app->getResource('user');
+                /** @var Appwrite\Database\Document $user */
+            } catch(\Throwable $_th) {
+                // All good, user is optional information for logger
+            }
+
+            $loggerBreadcrumbs = $app->getResource("loggerBreadcrumbs");
+            $route = $app->match($request);
+
+            $log = new Utopia\Logger\Log();
+
+            if(isset($user) && !$user->isEmpty()) {
+                $log->setUser(new User($user->getId()));
+            }
+
+            $log->setNamespace("http");
+            $log->setServer(\gethostname());
+            $log->setVersion($version);
+            $log->setType(Log::TYPE_ERROR);
+            $log->setMessage($th->getMessage());
+
+            $log->addTag('method', $route->getMethod());
+            $log->addTag('url',  $route->getPath());
+            $log->addTag('verboseType', get_class($th));
+            $log->addTag('code', $th->getCode());
+            // $log->addTag('projectId', $project->getId()); // TODO: Figure out how to get ProjectID, if it becomes relevant
+            $log->addTag('hostname', $request->getHostname());
+            $log->addTag('locale', (string)$request->getParam('locale', $request->getHeader('x-appwrite-locale', '')));
+
+            $log->addExtra('file', $th->getFile());
+            $log->addExtra('line', $th->getLine());
+            $log->addExtra('trace', $th->getTraceAsString());
+            $log->addExtra('roles', Authorization::$roles);
+
+            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
+            $log->setAction($action);
+
+            $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
+            $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+            foreach($loggerBreadcrumbs as $loggerBreadcrumb) {
+                $log->addBreadcrumb($loggerBreadcrumb);
+            }
+
+            $responseCode = $logger->addLog($log);
+            Console::info('Log pushed with status code: '.$responseCode);
+        }
+
         Console::error('[Error] Type: '.get_class($th));
         Console::error('[Error] Message: '.$th->getMessage());
         Console::error('[Error] File: '.$th->getFile());
@@ -106,12 +253,22 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
             $db = null;
         }
 
-        if(App::isDevelopment()) {
-            $swooleResponse->end('error: '.$th->getMessage());
-        }
-        else {
-            $swooleResponse->end('500: Server Error');
-        }
+        $swooleResponse->setStatusCode(500);
+
+        $output = ((App::isDevelopment())) ? [
+            'message' => 'Error: '. $th->getMessage(),
+            'code' => 500,
+            'file' => $th->getFile(),
+            'line' => $th->getLine(),
+            'trace' => $th->getTrace(),
+            'version' => $version,
+        ] : [
+            'message' => 'Error: Server Error',
+            'code' => 500,
+            'version' => $version,
+        ];
+
+        $swooleResponse->end(\json_encode($output));
     } finally {
         /** @var PDOPool $dbPool */
         $dbPool = $register->get('dbPool');

app/init.php

@@ -17,27 +17,39 @@ 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\Auth\Auth;
-use Appwrite\Database\Database;
-use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
-use Appwrite\Database\Adapter\Redis as RedisAdapter;
-use Appwrite\Database\Document;
-use Appwrite\Database\Validator\Authorization;
+use Appwrite\Database\Database as DatabaseOld;
 use Appwrite\Event\Event;
+use Appwrite\Network\Validator\Email;
+use Appwrite\Network\Validator\IP;
+use Appwrite\Network\Validator\URL;
 use Appwrite\OpenSSL\OpenSSL;
+use Appwrite\Stats\Stats;
+use Appwrite\Utopia\View;
 use Utopia\App;
-use Utopia\View;
+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\Database\Query;
 
 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
@@ -47,8 +59,17 @@ const APP_USERAGENT = APP_NAME.'-Server v%s. Please report abuse at %s';
 const APP_MODE_DEFAULT = 'default';
 const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 12;
-const APP_CACHE_BUSTER = 171;
-const APP_VERSION_STABLE = '0.11.0';
+const APP_LIMIT_COUNT = 5000;
+const APP_LIMIT_USERS = 10000;
+const APP_CACHE_BUSTER = 200;
+const APP_VERSION_STABLE = '0.12.0';
+const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
+const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
+const APP_DATABASE_ATTRIBUTE_IP = 'ip';
+const APP_DATABASE_ATTRIBUTE_URL = 'url';
+const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
+const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
+const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1073741824; // 2^32 bits / 4 bits per char
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_CACHE = '/storage/cache';
@@ -65,13 +86,23 @@ const APP_SOCIAL_DISCORD_CHANNEL = '564160730845151244';
 const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite'; 
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
-
+// Database Worker Types
+const DATABASE_TYPE_CREATE_ATTRIBUTE = 'createAttribute';
+const DATABASE_TYPE_CREATE_INDEX = 'createIndex';
+const DATABASE_TYPE_DELETE_ATTRIBUTE = 'deleteAttribute';
+const DATABASE_TYPE_DELETE_INDEX = 'deleteIndex';
 // Deletion Types
 const DELETE_TYPE_DOCUMENT = 'document';
+const DELETE_TYPE_COLLECTIONS = 'collections';
+const DELETE_TYPE_PROJECTS = 'projects';
+const DELETE_TYPE_FUNCTIONS = 'functions';
+const DELETE_TYPE_USERS = 'users';
+const DELETE_TYPE_TEAMS= 'teams';
 const DELETE_TYPE_EXECUTIONS = 'executions';
 const DELETE_TYPE_AUDIT = 'audit';
 const DELETE_TYPE_ABUSE = 'abuse';
 const DELETE_TYPE_CERTIFICATES = 'certificates';
+const DELETE_TYPE_USAGE = 'usage';
 const DELETE_TYPE_REALTIME = 'realtime';
 // Mail Types
 const MAIL_TYPE_VERIFICATION = 'verification';
@@ -114,7 +145,7 @@ Config::load('locale-continents', __DIR__.'/config/locale/continents.php');
 Config::load('storage-logos', __DIR__.'/config/storage/logos.php'); 
 Config::load('storage-mimes', __DIR__.'/config/storage/mimes.php'); 
 Config::load('storage-inputs', __DIR__.'/config/storage/inputs.php'); 
-Config::load('storage-outputs', __DIR__.'/config/storage/outputs.php'); 
+Config::load('storage-outputs', __DIR__.'/config/storage/outputs.php');
 
 $user = App::getEnv('_APP_REDIS_USER','');
 $pass = App::getEnv('_APP_REDIS_PASS','');
@@ -123,10 +154,11 @@ if(!empty($user) || !empty($pass)) {
 } else {
     Resque::setBackend(App::getEnv('_APP_REDIS_HOST', '').':'.App::getEnv('_APP_REDIS_PORT', ''));
 }
+
 /**
- * DB Filters
+ * Old DB Filters
  */
-Database::addFilter('json',
+DatabaseOld::addFilter('json',
     function($value) {
         if(!is_array($value)) {
             return $value;
@@ -138,12 +170,12 @@ Database::addFilter('json',
     }
 );
 
-Database::addFilter('encrypt',
+DatabaseOld::addFilter('encrypt',
     function($value) {
         $key = App::getEnv('_APP_OPENSSL_KEY_V1');
         $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
         $tag = null;
-        
+
         return json_encode([
             'data' => OpenSSL::encrypt($value, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag),
             'method' => OpenSSL::CIPHER_AES_128_GCM,
@@ -160,9 +192,206 @@ Database::addFilter('encrypt',
     }
 );
 
+/**
+ * New DB Filters
+ */
+Database::addFilter('casting',
+    function($value) {
+        return json_encode(['value' => $value]);
+    },
+    function($value) {
+        if (is_null($value)) {
+            return null;
+        }
+        return json_decode($value, true)['value'];
+    }
+);
+
+Database::addFilter('enum',
+    function($value, Document $attribute) {
+        if ($attribute->isSet('elements')) {
+            $attribute->removeAttribute('elements');
+        }
+        return $value;
+    },
+    function($value, Document $attribute) {
+        $formatOptions = json_decode($attribute->getAttribute('formatOptions', '[]'), true);
+        if (isset($formatOptions['elements'])) {
+            $attribute->setAttribute('elements', $formatOptions['elements']);
+        }
+        return $value;
+    }
+);
+
+Database::addFilter('range',
+    function($value, Document $attribute) {
+        if ($attribute->isSet('min')) {
+            $attribute->removeAttribute('min');
+        }
+        if ($attribute->isSet('max')) {
+            $attribute->removeAttribute('max');
+        }
+        return $value;
+    },
+    function($value, Document $attribute) {
+        $formatOptions = json_decode($attribute->getAttribute('formatOptions', '[]'), true);
+        if (isset($formatOptions['min']) || isset($formatOptions['max'])) {
+            $attribute
+                ->setAttribute('min', $formatOptions['min'])
+                ->setAttribute('max', $formatOptions['max'])
+            ;
+        }
+        return $value;
+    }
+);
+
+Database::addFilter('subQueryAttributes',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return $database
+            ->find('attributes', [
+                new Query('collectionId', Query::TYPE_EQUAL, [$document->getId()])
+            ], $database->getAttributeLimit(), 0, []);
+    }
+);
+
+Database::addFilter('subQueryIndexes',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return $database
+            ->find('indexes', [
+                new Query('collectionId', Query::TYPE_EQUAL, [$document->getId()])
+            ], 64, 0, []);
+    }
+);
+
+Database::addFilter('subQueryPlatforms',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return $database
+            ->find('platforms', [
+                new Query('projectId', Query::TYPE_EQUAL, [$document->getId()])
+            ], $database->getIndexLimit(), 0, []);
+    }
+);
+
+Database::addFilter('subQueryDomains',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return $database
+            ->find('domains', [
+                new Query('projectId', Query::TYPE_EQUAL, [$document->getId()])
+            ], $database->getIndexLimit(), 0, []);
+    }
+);
+
+Database::addFilter('subQueryKeys',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return $database
+            ->find('keys', [
+                new Query('projectId', Query::TYPE_EQUAL, [$document->getId()])
+            ], $database->getIndexLimit(), 0, []);
+    }
+);
+
+Database::addFilter('subQueryWebhooks',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return $database
+            ->find('webhooks', [
+                new Query('projectId', Query::TYPE_EQUAL, [$document->getId()])
+            ], $database->getIndexLimit(), 0, []);
+    }
+);
+
+Database::addFilter('encrypt',
+    function($value) {
+        $key = App::getEnv('_APP_OPENSSL_KEY_V1');
+        $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
+        $tag = null;
+        return json_encode([
+            'data' => OpenSSL::encrypt($value, OpenSSL::CIPHER_AES_128_GCM, $key, 0, $iv, $tag),
+            'method' => OpenSSL::CIPHER_AES_128_GCM,
+            'iv' => \bin2hex($iv),
+            'tag' => \bin2hex($tag ?? ''),
+            'version' => '1',
+        ]);
+    },
+    function($value) {
+        if(is_null($value)) {
+            return null;
+        }
+        $value = json_decode($value, true);
+        $key = App::getEnv('_APP_OPENSSL_KEY_V'.$value['version']);
+
+        return OpenSSL::decrypt($value['data'], $value['method'], $key, 0, hex2bin($value['iv']), hex2bin($value['tag']));
+    }
+);
+
+/**
+ * DB Formats
+ */
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_EMAIL, function() {
+    return new Email();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_ENUM, function($attribute) {
+    $elements = $attribute['formatOptions']['elements'];
+    return new WhiteList($elements, true);
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_IP, function() {
+    return new IP();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_URL, function() {
+    return new URL();
+}, Database::VAR_STRING);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_INT_RANGE, function($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_INTEGER);
+}, Database::VAR_INTEGER);
+
+Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function($attribute) {
+    $min = $attribute['formatOptions']['min'] ?? -INF;
+    $max = $attribute['formatOptions']['max'] ?? INF;
+    return new Range($min, $max, Range::TYPE_FLOAT);
+}, Database::VAR_FLOAT);
+
 /*
  * Registry
  */
+$register->set('logger', function () { // Register error logger
+    $providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
+    $providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
+
+    if(empty($providerName) || empty($providerConfig)) {
+        return null;
+    }
+
+    if(!Logger::hasProvider($providerName)) {
+        throw new Exception("Logging provider not supported. Logging disabled.");
+    }
+
+    $classname = '\\Utopia\\Logger\\Adapter\\'.\ucfirst($providerName);
+    $adapter = new $classname($providerConfig);
+    return new Logger($adapter);
+});
 $register->set('dbPool', function () { // Register DB connection
     $dbHost = App::getEnv('_APP_DB_HOST', '');
     $dbPort = App::getEnv('_APP_DB_PORT', '');
@@ -180,7 +409,7 @@ $register->set('dbPool', function () { // Register DB connection
         ->withOptions([
             PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
         ])
-    , 16);
+    , 64);
 
     return $pool;
 });
@@ -200,7 +429,7 @@ $register->set('redisPool', function () {
         ->withPort($redisPort)
         ->withAuth($redisAuth)
         ->withDbIndex(0)
-    , 16);
+    , 64);
 
     return $pool;
 });
@@ -255,7 +484,30 @@ $register->set('smtp', function () {
     return $mail;
 });
 $register->set('geodb', function () {
-    return new Reader(__DIR__.'/db/DBIP/dbip-country-lite-2021-10.mmdb');
+    return new Reader(__DIR__.'/db/DBIP/dbip-country-lite-2021-12.mmdb');
+});
+$register->set('db', function () { // This is usually for our workers or CLI commands scope
+    $dbHost = App::getEnv('_APP_DB_HOST', '');
+    $dbUser = App::getEnv('_APP_DB_USER', '');
+    $dbPass = App::getEnv('_APP_DB_PASS', '');
+    $dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
+
+    $pdo = new PDO("mysql:host={$dbHost};dbname={$dbScheme};charset=utf8mb4", $dbUser, $dbPass, array(
+        PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4',
+        PDO::ATTR_TIMEOUT => 3, // Seconds
+        PDO::ATTR_PERSISTENT => true,
+        PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+        PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+    ));
+
+    return $pdo;
+});
+$register->set('cache', function () { // This is usually for our workers or CLI commands scope
+    $redis = new Redis();
+    $redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''));
+    $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
+
+    return $redis;
 });
 
 /*
@@ -346,11 +598,16 @@ Locale::setLanguageFromJSON('zh-tw', __DIR__.'/config/locale/translations/zh-tw.
 ]);
 
 // Runtime Execution
+App::setResource('logger', function($register) {
+    return $register->get('logger');
+}, ['register']);
 
-App::setResource('register', function() use ($register) {
-    return $register;
+App::setResource('loggerBreadcrumbs', function() {
+    return [];
 });
 
+App::setResource('register', fn() => $register);
+
 App::setResource('layout', function($locale) {
     $layout = new View(__DIR__.'/views/layouts/default.phtml');
     $layout->setParam('locale', $locale);
@@ -358,73 +615,60 @@ App::setResource('layout', function($locale) {
     return $layout;
 }, ['locale']);
 
-App::setResource('locale', function() {
-    return new Locale(App::getEnv('_APP_LOCALE', 'en'));
-});
+App::setResource('locale', fn() => new Locale(App::getEnv('_APP_LOCALE', 'en')));
 
 // Queues
-App::setResource('events', function($register) {
-    return new Event('', '');
-}, ['register']);
-
-App::setResource('audits', function($register) {
-    return new Event(Event::AUDITS_QUEUE_NAME, Event::AUDITS_CLASS_NAME);
-}, ['register']);
-
+App::setResource('events', fn() => new Event('', ''));
+App::setResource('audits', fn() => new Event(Event::AUDITS_QUEUE_NAME, Event::AUDITS_CLASS_NAME));
+App::setResource('mails', fn() => new Event(Event::MAILS_QUEUE_NAME, Event::MAILS_CLASS_NAME));
+App::setResource('deletes', fn() => new Event(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME));
+App::setResource('database', fn() => new Event(Event::DATABASE_QUEUE_NAME, Event::DATABASE_CLASS_NAME));
 App::setResource('usage', function($register) {
-    return new Event(Event::USAGE_QUEUE_NAME, Event::USAGE_CLASS_NAME);
+    return new Stats($register->get('statsd'));
 }, ['register']);
 
-App::setResource('mails', function($register) {
-    return new Event(Event::MAILS_QUEUE_NAME, Event::MAILS_CLASS_NAME);
-}, ['register']);
-
-App::setResource('deletes', function($register) {
-    return new Event(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME);
-}, ['register']);
-
-// Test Mock
-App::setResource('clients', function($request, $console, $project) {
-    $console->setAttribute('platforms', [ // Allways allow current host
-        '$collection' => Database::SYSTEM_COLLECTION_PLATFORMS,
+App::setResource('clients', function ($request, $console, $project) {
+    $console->setAttribute('platforms', [ // Always allow current host
+        '$collection' => 'platforms',
         'name' => 'Current Host',
         'type' => 'web',
         'hostname' => $request->getHostname(),
     ], Document::SET_TYPE_APPEND);
-    
+
     /**
      * Get All verified client URLs for both console and current projects
      * + Filter for duplicated entries
      */
-    $clientsConsole = \array_map(function ($node) {
-        return $node['hostname'];
-    }, \array_filter($console->getAttribute('platforms', []), function ($node) {
-        if (isset($node['type']) && $node['type'] === 'web' && isset($node['hostname']) && !empty($node['hostname'])) {
-            return true;
-        }
+    $clientsConsole = \array_map(
+        fn ($node) => $node['hostname'],
+        \array_filter(
+            $console->getAttribute('platforms', []),
+            fn ($node) => (isset($node['type']) && $node['type'] === 'web' && isset($node['hostname']) && !empty($node['hostname']))
+        )
+    );
 
-        return false;
-    }));
-
-    $clients = \array_unique(\array_merge($clientsConsole, \array_map(function ($node) {
-        return $node['hostname'];
-    }, \array_filter($project->getAttribute('platforms', []), function ($node) {
-        if (isset($node['type']) && $node['type'] === 'web' && isset($node['hostname']) && !empty($node['hostname'])) {
-            return true;
-        }
-
-        return false;
-    }))));
+    $clients = \array_unique(
+        \array_merge(
+            $clientsConsole,
+            \array_map(
+                fn ($node) => $node['hostname'],
+                \array_filter(
+                    $project->getAttribute('platforms', []),
+                    fn ($node) => (isset($node['type']) && $node['type'] === 'web' && isset($node['hostname']) && !empty($node['hostname']))
+                )
+            )
+        )
+    );
 
     return $clients;
 }, ['request', 'console', 'project']);
 
-App::setResource('user', function($mode, $project, $console, $request, $response, $projectDB, $consoleDB) {
-    /** @var Utopia\Swoole\Request $request */
+App::setResource('user', function($mode, $project, $console, $request, $response, $dbForProject, $dbForConsole) {
+    /** @var Appwrite\Utopia\Request $request */
     /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
-    /** @var Appwrite\Database\Database $consoleDB */
-    /** @var Appwrite\Database\Database $projectDB */
+    /** @var Utopia\Database\Document $project */
+    /** @var Utopia\Database\Database $dbForProject */
+    /** @var Utopia\Database\Database $dbForConsole */
     /** @var string $mode */
 
     Authorization::setDefaultStatus(true);
@@ -449,36 +693,37 @@ App::setResource('user', function($mode, $project, $console, $request, $response
         $session = Auth::decodeSession(((isset($fallback[Auth::$cookieName])) ? $fallback[Auth::$cookieName] : ''));
     }
 
-    Auth::$unique = $session['id'];
-    Auth::$secret = $session['secret'];
+    Auth::$unique = $session['id'] ?? '';
+    Auth::$secret = $session['secret'] ?? '';
 
     if (APP_MODE_ADMIN !== $mode) {
-        $user = $projectDB->getDocument(Auth::$unique);
-    } else {
-        $user = $consoleDB->getDocument(Auth::$unique);
-
-        $user
-            ->setAttribute('$id', 'admin-'.$user->getAttribute('$id'))
-        ;
+        if ($project->isEmpty()) {
+            $user = new Document(['$id' => '', '$collection' => 'users']);
+        }
+        else {
+            $user = $dbForProject->getDocument('users', Auth::$unique);
+        }
+    }
+    else {
+        $user = $dbForConsole->getDocument('users', Auth::$unique);
     }
 
-    if (empty($user->getId()) // Check a document has been found in the DB
-        || Database::SYSTEM_COLLECTION_USERS !== $user->getCollection() // Validate returned document is really a user document
+    if ($user->isEmpty() // Check a document has been found in the DB
         || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret)) { // Validate user has valid login token
-        $user = new Document(['$id' => '', '$collection' => Database::SYSTEM_COLLECTION_USERS]);
+        $user = new Document(['$id' => '', '$collection' => 'users']);
     }
 
     if (APP_MODE_ADMIN === $mode) {
-        if (!empty($user->search('teamId', $project->getAttribute('teamId'), $user->getAttribute('memberships')))) {
+        if ($user->find('teamId', $project->getAttribute('teamId'), 'memberships')) {
             Authorization::setDefaultStatus(false);  // Cancel security segmentation for admin users.
         } else {
-            $user = new Document(['$id' => '', '$collection' => Database::SYSTEM_COLLECTION_USERS]);
+            $user = new Document(['$id' => '', '$collection' => 'users']);
         }
     }
 
     $authJWT = $request->getHeader('x-appwrite-jwt', '');
 
-    if (!empty($authJWT)) { // JWT authentication
+    if (!empty($authJWT) && !$project->isEmpty()) { // JWT authentication
         $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
 
         try {
@@ -491,55 +736,105 @@ App::setResource('user', function($mode, $project, $console, $request, $response
         $jwtSessionId = $payload['sessionId'] ?? '';
 
         if($jwtUserId && $jwtSessionId) {
-            $user = $projectDB->getDocument($jwtUserId);
+            $user = $dbForProject->getDocument('users', $jwtUserId);
         }
 
-        if (empty($user->search('$id', $jwtSessionId, $user->getAttribute('sessions')))) { // Match JWT to active token
-            $user = new Document(['$id' => '', '$collection' => Database::SYSTEM_COLLECTION_USERS]);
+        if (empty($user->find('$id', $jwtSessionId, 'sessions'))) { // Match JWT to active token
+            $user = new Document(['$id' => '', '$collection' => 'users']);
         }
     }
 
     return $user;
-}, ['mode', 'project', 'console', 'request', 'response', 'projectDB', 'consoleDB']);
+}, ['mode', 'project', 'console', 'request', 'response', 'dbForProject', 'dbForConsole']);
 
-App::setResource('project', function($consoleDB, $request) {
-    /** @var Utopia\Swoole\Request $request */
-    /** @var Appwrite\Database\Database $consoleDB */
+App::setResource('project', function($dbForConsole, $request, $console) {
+    /** @var Appwrite\Utopia\Request $request */
+    /** @var Utopia\Database\Database $dbForConsole */
+    /** @var Utopia\Database\Document $console */
 
-    Authorization::disable();
+    $projectId = $request->getParam('project', $request->getHeader('x-appwrite-project', 'console'));
 
-    $project = $consoleDB->getDocument($request->getParam('project',
-        $request->getHeader('x-appwrite-project', '')));
+    if($projectId === 'console') {
+        return $console;
+    }
 
-    Authorization::reset();
+    $project = Authorization::skip(fn() => $dbForConsole->getDocument('projects', $projectId));
 
     return $project;
-}, ['consoleDB', 'request']);
+}, ['dbForConsole', 'request', 'console']);
 
-App::setResource('console', function($consoleDB) {
-    return $consoleDB->getDocument('console');
-}, ['consoleDB']);
+App::setResource('console', function() {
+    return new Document([
+        '$id' => 'console',
+        'name' => 'Appwrite',
+        '$collection' => 'projects',
+        'description' => 'Appwrite core engine',
+        'logo' => '',
+        'teamId' => -1,
+        'webhooks' => [],
+        'keys' => [],
+        'platforms' => [
+            [
+                '$collection' => 'platforms',
+                'name' => 'Production',
+                'type' => 'web',
+                'hostname' => 'appwrite.io',
+            ],
+            [
+                '$collection' => 'platforms',
+                'name' => 'Development',
+                'type' => 'web',
+                'hostname' => 'appwrite.test',
+            ],
+            [
+                '$collection' => 'platforms',
+                'name' => 'Localhost',
+                'type' => 'web',
+                'hostname' => 'localhost',
+            ], // Current host is added on app init
+        ],
+        'legalName' => '',
+        'legalCountry' => '',
+        'legalState' => '',
+        'legalCity' => '',
+        'legalAddress' => '',
+        'legalTaxId' => '',
+        'auths' => [
+            'limit' => (App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled') === 'enabled') ? 1 : 0, // limit signup to 1 user
+        ],
+        '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)) : [],
+    ]);
+}, []);
 
-App::setResource('consoleDB', function($db, $cache) {
-    $consoleDB = new Database();
-    $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-    $consoleDB->setNamespace('app_console'); // Should be replaced with param if we want to have parent projects
-    $consoleDB->setMocks(Config::getParam('collections', []));
+App::setResource('dbForProject', function($db, $cache, $project) {
+    $cache = new Cache(new RedisCache($cache));
 
-    return $consoleDB;
-}, ['db', 'cache']);
+    $database = new Database(new MariaDB($db), $cache);
+    $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+    $database->setNamespace('_project_'.$project->getId());
 
-App::setResource('projectDB', function($db, $cache, $project) {
-    $projectDB = new Database();
-    $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-    $projectDB->setNamespace('app_'.$project->getId());
-    $projectDB->setMocks(Config::getParam('collections', []));
-
-    return $projectDB;
+    return $database;
 }, ['db', 'cache', 'project']);
 
+App::setResource('dbForConsole', function($db, $cache) {
+    $cache = new Cache(new RedisCache($cache));
+
+    $database = new Database(new MariaDB($db), $cache);
+    $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+    $database->setNamespace('_project_console');
+
+    return $database;
+}, ['db', 'cache']);
+
 App::setResource('mode', function($request) {
-    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Request $request */
+
+    /**
+     * Defines the mode for the request:
+     * - 'default' => Requests for Client and Server Side
+     * - 'admin' => Request from the Console on non-console projects
+     */
     return $request->getParam('mode', $request->getHeader('x-appwrite-mode', APP_MODE_DEFAULT));
 }, ['request']);
 

app/preload.php

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

app/realtime.php

@@ -1,10 +1,6 @@
 <?php
 
 use Appwrite\Auth\Auth;
-use Appwrite\Database\Adapter\Redis as RedisAdapter;
-use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
-use Appwrite\Database\Database;
-use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
 use Appwrite\Messaging\Adapter\Realtime;
 use Appwrite\Network\Validator\Origin;
@@ -18,8 +14,16 @@ use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\App;
 use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Swoole\Request;
+use Utopia\Logger\Log;
+use Utopia\Database\Database;
+use Utopia\Cache\Adapter\Redis as RedisCache;
+use Utopia\Cache\Cache;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Document;
+use Utopia\Database\Query;
+use Utopia\Database\Validator\Authorization;
+use Utopia\Registry\Registry;
+use Appwrite\Utopia\Request;
 use Utopia\WebSocket\Server;
 use Utopia\WebSocket\Adapter;
 
@@ -41,75 +45,104 @@ $stats->column('messages', Table::TYPE_INT);
 $stats->create();
 
 $containerId = uniqid();
-$documentId = null;
+$statsDocument = null;
 
 $adapter = new Adapter\Swoole(port: App::getEnv('PORT', 80));
 $adapter->setPackageMaxLength(64000); // Default maximum Package Size (64kb)
 
 $server = new Server($adapter);
 
-$server->onStart(function () use ($stats, $register, $containerId, &$documentId) {
+$logError = function(Throwable $error, string $action) use ($register) {
+    $logger = $register->get('logger');
+
+    if($logger) {
+        $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
+
+        $log = new Log();
+        $log->setNamespace("realtime");
+        $log->setServer(\gethostname());
+        $log->setVersion($version);
+        $log->setType(Log::TYPE_ERROR);
+        $log->setMessage($error->getMessage());
+
+        $log->addTag('code', $error->getCode());
+        $log->addTag('verboseType', get_class($error));
+
+        $log->addExtra('file', $error->getFile());
+        $log->addExtra('line', $error->getLine());
+        $log->addExtra('trace', $error->getTraceAsString());
+
+        $log->setAction($action);
+
+        $isProduction = App::getEnv('_APP_ENV', 'development') === 'production';
+        $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+        $responseCode = $logger->addLog($log);
+        Console::info('Realtime log pushed with status code: '.$responseCode);
+    }
+
+    Console::error('[Error] Type: ' . get_class($error));
+    Console::error('[Error] Message: ' . $error->getMessage());
+    Console::error('[Error] File: ' . $error->getFile());
+    Console::error('[Error] Line: ' . $error->getLine());
+};
+
+$server->error($logError);
+
+function getDatabase(Registry &$register, string $namespace)
+{
+    $db = $register->get('dbPool')->get();
+    $redis = $register->get('redisPool')->get();
+
+    $cache = new Cache(new RedisCache($redis));
+    $database = new Database(new MariaDB($db), $cache);
+    $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+    $database->setNamespace($namespace);
+
+    return [
+        $database,
+        function () use ($register, $db, $redis) {
+            $register->get('dbPool')->put($db);
+            $register->get('redisPool')->put($redis);
+        }
+    ];
+};
+
+$server->onStart(function () use ($stats, $register, $containerId, &$statsDocument, $logError) {
+    sleep(5); // wait for the initial database schema to be ready
     Console::success('Server started succefully');
 
-    $getConsoleDb = function () use ($register) {
-        $db = $register->get('dbPool')->get();
-        $cache = $register->get('redisPool')->get();
-
-        $consoleDb = new Database();
-        $consoleDb->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-        $consoleDb->setNamespace('app_console');
-        $consoleDb->setMocks(Config::getParam('collections', []));
-
-        return [
-            $consoleDb,
-            function () use ($register, $db, $cache) {
-                $register->get('dbPool')->put($db);
-                $register->get('redisPool')->put($cache);
-            }
-        ];
-    };
-
     /**
      * Create document for this worker to share stats across Containers.
      */
-    go(function () use ($getConsoleDb, $containerId, &$documentId) {
+    go(function () use ($register, $containerId, &$statsDocument, $logError) {
         try {
-            [$consoleDb, $returnConsoleDb] = call_user_func($getConsoleDb);
-            $document = [
-                '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
-                '$permissions' => [
-                    'read' => ['*'],
-                    'write' => ['*'],
-                ],
+            [$database, $returnDatabase] = getDatabase($register, '_project_console');
+            $document = new Document([
+                '$id' => $database->getId(),
+                '$collection' => 'realtime',
+                '$read' => [],
+                '$write' => [],
                 'container' => $containerId,
                 'timestamp' => time(),
                 'value' => '{}'
-            ];
-            Authorization::disable();
-            $document = $consoleDb->createDocument($document);
-            Authorization::enable();
-            $documentId = $document->getId();
+            ]);
+            $statsDocument = Authorization::skip(fn() => $database->createDocument('realtime', $document));
         } catch (\Throwable $th) {
-            Console::error('[Error] Type: ' . get_class($th));
-            Console::error('[Error] Message: ' . $th->getMessage());
-            Console::error('[Error] File: ' . $th->getFile());
-            Console::error('[Error] Line: ' . $th->getLine());
+            call_user_func($logError, $th, "createWorkerDocument");
         } finally {
-            call_user_func($returnConsoleDb);
+            call_user_func($returnDatabase);
         }
     });
 
     /**
      * Save current connections to the Database every 5 seconds.
      */
-    Timer::tick(5000, function () use ($stats, $getConsoleDb, $containerId, &$documentId) {
+    Timer::tick(5000, function () use ($register, $stats, &$statsDocument, $logError) {
+        /** @var Document $statsDocument */
         foreach ($stats as $projectId => $value) {
-            if (empty($value['connections']) && empty($value['messages'])) {
-                continue;
-            }
-
-            $connections = $stats->get($projectId, 'connections');
-            $messages = $stats->get($projectId, 'messages');
+            $connections = $stats->get($projectId, 'connections') ?? 0;
+            $messages = $stats->get($projectId, 'messages' ?? 0);
 
             $usage = new Event('v1-usage', 'UsageV1');
             $usage
@@ -130,65 +163,47 @@ $server->onStart(function () use ($stats, $register, $containerId, &$documentId)
         }
         $payload = [];
         foreach ($stats as $projectId => $value) {
-            if (!empty($value['connectionsTotal'])) {
-                $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
-            }
+            $payload[$projectId] = $stats->get($projectId, 'connectionsTotal');
         }
-        if (empty($payload)) {
+        if (empty($payload) || empty($statsDocument)) {
             return;
         }
 
         try {
-            [$consoleDb, $returnConsoleDb] = call_user_func($getConsoleDb);
+            [$database, $returnDatabase] = getDatabase($register, '_project_console');
 
-            $consoleDb->updateDocument([
-                '$id' => $documentId,
-                '$collection' => Database::SYSTEM_COLLECTION_CONNECTIONS,
-                '$permissions' => [
-                    'read' => ['*'],
-                    'write' => ['*'],
-                ],
-                'container' => $containerId,
-                'timestamp' => time(),
-                'value' => json_encode($payload)
-            ]);
+            $statsDocument
+                ->setAttribute('timestamp', time())
+                ->setAttribute('value', json_encode($payload));
+
+            Authorization::skip(fn() => $database->updateDocument('realtime', $statsDocument->getId(), $statsDocument));
         } catch (\Throwable $th) {
-            Console::error('[Error] Type: ' . get_class($th));
-            Console::error('[Error] Message: ' . $th->getMessage());
-            Console::error('[Error] File: ' . $th->getFile());
-            Console::error('[Error] Line: ' . $th->getLine());
+            call_user_func($logError, $th, "updateWorkerDocument");
         } finally {
-            call_user_func($returnConsoleDb);
+            call_user_func($returnDatabase);
         }
     });
 });
 
-$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime) {
+$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime, $logError) {
     Console::success('Worker ' . $workerId . ' started succefully');
 
     $attempts = 0;
     $start = time();
 
-    Timer::tick(5000, function () use ($server, $register, $realtime, $stats) {
+    Timer::tick(5000, function () use ($server, $register, $realtime, $stats, $logError) {
         /**
          * Sending current connections to project channels on the console project every 5 seconds.
          */
         if ($realtime->hasSubscriber('console', 'role:member', 'project')) {
-            $db = $register->get('dbPool')->get();
-            $cache = $register->get('redisPool')->get();
 
-            $consoleDb = new Database();
-            $consoleDb->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-            $consoleDb->setNamespace('app_console');
-            $consoleDb->setMocks(Config::getParam('collections', []));
+            [$database, $returnDatabase] = getDatabase($register, '_project_console');
 
             $payload = [];
-            $list = $consoleDb->getCollection([
-                'filters' => [
-                    '$collection=' . Database::SYSTEM_COLLECTION_CONNECTIONS,
-                    'timestamp>' . (time() - 15)
-                ],
-            ]);
+
+            $list = Authorization::skip(fn() => $database->find('realtime', [
+                    new Query('timestamp', Query::TYPE_GREATER, [(time() - 15)])
+                ]));
 
             /**
              * Aggregate stats across containers.
@@ -227,8 +242,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 ]));
             }
 
-            $register->get('dbPool')->put($db);
-            $register->get('redisPool')->put($cache);
+            call_user_func($returnDatabase);
         }
         /**
          * Sending test message for SDK E2E tests every 5 seconds.
@@ -287,22 +301,15 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                         return;
                     }
 
-                    $db = $register->get('dbPool')->get();
-                    $cache = $register->get('redisPool')->get();
+                    [$database, $returnDatabase] = getDatabase($register, '_project_' . $projectId);
 
-                    $projectDB = new Database();
-                    $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-                    $projectDB->setNamespace('app_' . $projectId);
-                    $projectDB->setMocks(Config::getParam('collections', []));
-
-                    $user = $projectDB->getDocument($userId);
+                    $user = $database->getDocument('users', $userId);
 
                     $roles = Auth::getRoles($user);
 
                     $realtime->subscribe($projectId, $connection, $roles, $realtime->connections[$connection]['channels']);
 
-                    $register->get('dbPool')->put($db);
-                    $register->get('redisPool')->put($cache);
+                    call_user_func($returnDatabase);
                 }
 
                 $receivers = $realtime->getSubscribers($event);
@@ -326,6 +333,8 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
                 }
             });
         } catch (\Throwable $th) {
+            call_user_func($logError, $th, "pubSubConnection");
+
             Console::error('Pub/sub error: ' . $th->getMessage());
             $register->get('redisPool')->put($redis);
             $attempts++;
@@ -338,7 +347,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
     Console::error('Failed to restart pub/sub...');
 });
 
-$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime) {
+$server->onOpen(function (int $connection, SwooleRequest $request) use ($server, $register, $stats, &$realtime, $logError) {
     $app = new App('UTC');
     $request = new Request($request);
     $response = new Response(new SwooleResponse());
@@ -350,32 +359,26 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
 
     Console::info("Connection open (user: {$connection})");
 
-    App::setResource('db', function () use (&$db) {
-        return $db;
-    });
-
-    App::setResource('cache', function () use (&$redis) {
-        return $redis;
-    });
-
-    App::setResource('request', function () use ($request) {
-        return $request;
-    });
-
-    App::setResource('response', function () use ($response) {
-        return $response;
-    });
+    App::setResource('db', fn() => $db);
+    App::setResource('cache', fn() => $redis);
+    App::setResource('request', fn() => $request);
+    App::setResource('response', fn() => $response);
 
     try {
-        /** @var \Appwrite\Database\Document $user */
+        /** @var \Utopia\Database\Document $user */
         $user = $app->getResource('user');
 
-        /** @var \Appwrite\Database\Document $project */
+        /** @var \Utopia\Database\Document $project */
         $project = $app->getResource('project');
 
-        /** @var \Appwrite\Database\Document $console */
+        /** @var \Utopia\Database\Document $console */
         $console = $app->getResource('console');
 
+        $cache = new Cache(new RedisCache($redis));
+        $database = new Database(new MariaDB($db), $cache);
+        $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        $database->setNamespace('_project_' . $project->getId());
+
         /*
          *  Project Check
          */
@@ -388,15 +391,14 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
          *
          * Abuse limits are connecting 128 times per minute and ip address.
          */
-        $timeLimit = new TimeLimit('url:{url},ip:{ip}', 128, 60, $db);
+        $timeLimit = new TimeLimit('url:{url},ip:{ip}', 128, 60, $database);
         $timeLimit
-            ->setNamespace('app_' . $project->getId())
             ->setParam('{ip}', $request->getIP())
             ->setParam('{url}', $request->getURI());
 
         $abuse = new Abuse($timeLimit);
 
-        if ($abuse->check() && App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled') {
+        if (App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') === 'enabled' && $abuse->check()) {
             throw new Exception('Too many requests', 1013);
         }
 
@@ -442,6 +444,8 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
         $stats->incr($project->getId(), 'connections');
         $stats->incr($project->getId(), 'connectionsTotal');
     } catch (\Throwable $th) {
+        call_user_func($logError, $th, "initServer");
+
         $response = [
             'type' => 'error',
             'data' => [
@@ -475,21 +479,21 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
     try {
         $response = new Response(new SwooleResponse());
         $db = $register->get('dbPool')->get();
-        $cache = $register->get('redisPool')->get();
+        $redis = $register->get('redisPool')->get();
 
-        $projectDB = new Database();
-        $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache));
-        $projectDB->setNamespace('app_' . $realtime->connections[$connection]['projectId']);
-        $projectDB->setMocks(Config::getParam('collections', []));
+        $cache = new Cache(new RedisCache($redis));
+        $database = new Database(new MariaDB($db), $cache);
+        $database->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        $database->setNamespace('_project_' . $realtime->connections[$connection]['projectId']);
 
         /*
          * Abuse Check
          *
          * Abuse limits are sending 32 times per minute and connection.
          */
-        $timeLimit = new TimeLimit('url:{url},connection:{connection}', 32, 60, $db);
+        $timeLimit = new TimeLimit('url:{url},connection:{connection}', 32, 60, $database);
+
         $timeLimit
-            ->setNamespace('app_' . $realtime->connections[$connection]['projectId'])
             ->setParam('{connection}', $connection)
             ->setParam('{container}', $containerId);
 
@@ -515,14 +519,13 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
                 }
 
                 $session = Auth::decodeSession($message['data']['session']);
-                Auth::$unique = $session['id'];
-                Auth::$secret = $session['secret'];
+                Auth::$unique = $session['id'] ?? '';
+                Auth::$secret = $session['secret'] ?? '';
 
-                $user = $projectDB->getDocument(Auth::$unique);
+                $user = $database->getDocument('users', Auth::$unique);
 
                 if (
                     empty($user->getId()) // Check a document has been found in the DB
-                    || Database::SYSTEM_COLLECTION_USERS !== $user->getCollection() // Validate returned document is really a user document
                     || !Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret) // Validate user has valid login token
                 ) {
                     // cookie not valid
@@ -565,7 +568,7 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
         }
     } finally {
         $register->get('dbPool')->put($db);
-        $register->get('redisPool')->put($cache);
+        $register->get('redisPool')->put($redis);
     }
 });
 

app/tasks/doctor.php

@@ -3,6 +3,7 @@
 global $cli;
 
 use Appwrite\ClamAV\Network;
+use Utopia\Logger\Logger;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 use Utopia\App;
@@ -82,6 +83,16 @@ $cli
             Console::log('🟢 HTTPS force option is enabled');
         }
 
+
+        $providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
+        $providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
+
+        if(empty($providerName) || empty($providerConfig) || !Logger::hasProvider($providerName)) {
+            Console::log('🔴 Logging adapter is disabled');
+        } else {
+            Console::log('🟢 Logging adapter is enabled (' . $providerName . ')');
+        }
+
         \sleep(0.2);
 
         try {
@@ -113,17 +124,17 @@ $cli
 
         if(App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'enabled') { // Check if scans are enabled
             try {
-                $antiVirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
+                $antivirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),
                     (int) App::getEnv('_APP_STORAGE_ANTIVIRUS_PORT', 3310));
 
-                if((@$antiVirus->ping())) {
-                    Console::success('AntiVirus...........connected 👍');
+                if((@$antivirus->ping())) {
+                    Console::success('Antivirus...........connected 👍');
                 }
                 else {
-                    Console::error('AntiVirus........disconnected 👎');
+                    Console::error('Antivirus........disconnected 👎');
                 }
             } catch (\Throwable $th) {
-                Console::error('AntiVirus........disconnected 👎');
+                Console::error('Antivirus........disconnected 👎');
             }
         }
 

app/tasks/install.php

@@ -5,10 +5,10 @@ global $cli;
 use Appwrite\Auth\Auth;
 use Appwrite\Docker\Compose;
 use Appwrite\Docker\Env;
+use Appwrite\Utopia\View;
 use Utopia\Analytics\GoogleAnalytics;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\View;
 use Utopia\Validator\Text;
 
 $cli

app/tasks/maintenance.php

@@ -2,8 +2,6 @@
 
 global $cli;
 
-require_once __DIR__.'/../init.php';
-
 use Appwrite\Event\Event;
 use Utopia\App;
 use Utopia\CLI\Console;
@@ -39,6 +37,15 @@ $cli
             ]);
         }
 
+        function notifyDeleteUsageStats(int $interval30m, int $interval1d) 
+        {
+            Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
+                'type' => DELETE_TYPE_USAGE,
+                'timestamp1d' => time() - $interval1d,
+                'timestamp30m' => time() - $interval30m,
+            ]);
+        }
+
         function notifyDeleteConnections() 
         {
             Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
@@ -52,13 +59,16 @@ $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
 
-        Console::loop(function() use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention){
+        Console::loop(function() use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention, $usageStatsRetention30m, $usageStatsRetention1d) {
             $time = date('d-m-Y H:i:s', time());
             Console::info("[{$time}] Notifying deletes workers every {$interval} seconds");
             notifyDeleteExecutionLogs($executionLogsRetention);
             notifyDeleteAbuseLogs($abuseLogsRetention);
             notifyDeleteAuditLogs($auditLogRetention);
+            notifyDeleteUsageStats($usageStatsRetention30m, $usageStatsRetention1d);
             notifyDeleteConnections();
         }, $interval);
     });

app/tasks/migrate.php

@@ -11,53 +11,106 @@ use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Migration\Migration;
 use Utopia\Validator\Text;
 
+Config::load('collections.old', __DIR__ . '/../config/collections.old.php');
+
 $cli
     ->task('migrate')
     ->param('version', APP_VERSION_STABLE, new Text(8), 'Version to migrate to.', true)
     ->action(function ($version) use ($register) {
+        Authorization::disable();
         if (!array_key_exists($version, Migration::$versions)) {
             Console::error("Version {$version} not found.");
             Console::exit(1);
             return;
         }
+        $options = [];
+        if (str_starts_with($version, '0.12.')) {
+            Console::error('--------------------');
+            Console::error('WARNING');
+            Console::error('--------------------');
+            Console::warning('Migrating to Version 0.12.x introduces a major breaking change within the Database Service!');
+            Console::warning('Before migrating, please read about the breaking changes here:');
+            Console::info('https://dev.to/appwrite/appwrite-012-migration-post-3cha');
+            $confirm = Console::confirm("If you want to proceed, type 'yes':");
+            if ($confirm != 'yes') {
+                Console::exit(1);
+                return;
+            }
+
+            Console::log('');
+            Console::log('Collections');
+            Console::log('--------------------');
+            Console::warning('Be aware that following actions will happen during the migration:');
+            Console::warning('- Nested Document rules will be migrated to String attributes');
+            Console::warning('- Numeric rules will be migrated to float attributes');
+            Console::warning('- Wildcard and Markdown rules will be converted to string attributes');
+            Console::info("Do you want to migrate your Database Collections?");
+            $options['migrateCollections'] = Console::confirm("Type 'yes' or 'no':");
+
+            if ($options['migrateCollections'] === 'yes') {
+                Console::log('');
+                Console::log('Documents');
+                Console::log('------------------');
+                Console::warning('Be aware that following actions will happen during the migration:');
+                Console::warning('- Nested Documents will be stored as JSON values');
+                Console::warning('- All Numeric values will be converted to float');
+                Console::warning('- All Wildcard and Markdown values will be converted to string');
+                Console::info("Do you want to migrate your Database Documents?");
+                $options['migrateDocuments'] = Console::confirm("Type 'yes' or 'no':");
+            } else {
+                $options['migrateDocuments'] = 'no';
+            }
+
+
+            if (
+                !in_array($options['migrateDocuments'], ['yes', 'no'])
+                || !in_array($options['migrateCollections'], ['yes', 'no'])
+            ) {
+                Console::error("You must reply with 'yes' or 'no'!");
+                Console::exit(1);
+                return;
+            }
+        }
+
+        Config::load('collectionsold', __DIR__ . '/../config/collections.old.php');
+
+        Console::success('Starting Data Migration to version ' . $version);
 
-        Console::success('Starting Data Migration to version '.$version);
         $db = $register->get('db', true);
         $cache = $register->get('cache', true);
+        $cache->flushAll();
 
         $consoleDB = new Database();
         $consoleDB
             ->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache))
             ->setNamespace('app_console') // Main DB
-            ->setMocks(Config::getParam('collections', []));
+            ->setMocks(Config::getParam('collectionsold', []));
 
         $projectDB = new Database();
         $projectDB
             ->setAdapter(new RedisAdapter(new MySQLAdapter($db, $cache), $cache))
-            ->setMocks(Config::getParam('collections', []));
+            ->setMocks(Config::getParam('collectionsold', []));
 
         $console = $consoleDB->getDocument('console');
 
-        Authorization::disable();
-
         $limit = 30;
         $sum = 30;
         $offset = 0;
         $projects = [$console];
         $count = 0;
 
-        $class = 'Appwrite\\Migration\\Version\\'.Migration::$versions[$version];
-        $migration = new $class($register->get('db'));
+        $class = 'Appwrite\\Migration\\Version\\' . Migration::$versions[$version];
+        $migration = new $class($register->get('db'), $register->get('cache'), $options);
 
         while ($sum > 0) {
             foreach ($projects as $project) {
                 try {
                     $migration
-                        ->setProject($project, $projectDB)
+                        ->setProject($project, $projectDB, $consoleDB)
                         ->execute();
                 } catch (\Throwable $th) {
                     throw $th;
-                    Console::error('Failed to update project ("'.$project->getId().'") version with error: '.$th->getMessage());
+                    Console::error('Failed to update project ("' . $project->getId() . '") version with error: ' . $th->getMessage());
                 }
             }
 
@@ -65,7 +118,7 @@ $cli
                 'limit' => $limit,
                 'offset' => $offset,
                 'filters' => [
-                    '$collection='.Database::SYSTEM_COLLECTION_PROJECTS,
+                    '$collection=' . Database::SYSTEM_COLLECTION_PROJECTS,
                 ],
             ]);
 
@@ -74,9 +127,11 @@ $cli
             $count = $count + $sum;
 
             if ($sum > 0) {
-                Console::log('Fetched '.$count.'/'.$consoleDB->getSum().' projects...');
+                Console::log('Fetched ' . $count . '/' . $consoleDB->getSum() . ' projects...');
             }
         }
+        $cache->flushAll();
 
+        Swoole\Event::wait(); // Wait for Coroutines to finish
         Console::success('Data Migration Completed');
     });

app/tasks/sdks.php

@@ -30,38 +30,38 @@ $cli
         $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'])) {
+        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', 'latest'])) {
             throw new Exception('Unknown version given');
         }
 
-        foreach($platforms as $key => $platform) {
-            foreach($platform['languages'] as $language) {
-                if($selected !== $language['key'] && $selected !== '*') {
+        foreach ($platforms as $key => $platform) {
+            foreach ($platform['languages'] as $language) {
+                if ($selected !== $language['key'] && $selected !== '*') {
                     continue;
                 }
 
-                if(!$language['enabled']) {
-                    Console::warning($language['name'].' for '.$platform['name'] . ' is disabled');
+                if (!$language['enabled']) {
+                    Console::warning($language['name'] . ' for ' . $platform['name'] . ' is disabled');
                     continue;
                 }
 
-                Console::info('Fetching API Spec for '.$language['name'].' for '.$platform['name'] . ' (version: '.$version.')');
-                
-                $spec = file_get_contents(__DIR__.'/../config/specs/'.$version.'.'.$language['family'].'.json');
+                Console::info('Fetching API Spec for ' . $language['name'] . ' for ' . $platform['name'] . ' (version: ' . $version . ')');
+
+                $spec = file_get_contents(__DIR__ . '/../config/specs/swagger2-' . $version . '-' . $language['family'] . '.json');
 
                 $cover = 'https://appwrite.io/images/github.png';
-                $result = \realpath(__DIR__.'/..').'/sdks/'.$key.'-'.$language['key'];
-                $resultExamples = \realpath(__DIR__.'/../..').'/docs/examples/'.$version.'/'.$key.'-'.$language['key'];
-                $target = \realpath(__DIR__.'/..').'/sdks/git/'.$language['key'].'/';
-                $readme = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/README.md');
+                $result = \realpath(__DIR__ . '/..') . '/sdks/' . $key . '-' . $language['key'];
+                $resultExamples = \realpath(__DIR__ . '/../..') . '/docs/examples/' . $version . '/' . $key . '-' . $language['key'];
+                $target = \realpath(__DIR__ . '/..') . '/sdks/git/' . $language['key'] . '/';
+                $readme = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/README.md');
                 $readme = ($readme) ? \file_get_contents($readme) : '';
-                $gettingStarted = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/GETTING_STARTED.md');
+                $gettingStarted = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/GETTING_STARTED.md');
                 $gettingStarted = ($gettingStarted) ? \file_get_contents($gettingStarted) : '';
-                $examples = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/EXAMPLES.md');
+                $examples = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/EXAMPLES.md');
                 $examples = ($examples) ? \file_get_contents($examples) : '';
-                $changelog = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/CHANGELOG.md');
+                $changelog = \realpath(__DIR__ . '/../../docs/sdks/' . $language['key'] . '/CHANGELOG.md');
                 $changelog = ($changelog) ? \file_get_contents($changelog) : '# Change Log';
-                $warning = '**This SDK is compatible with Appwrite server version ' . $version . '. For older versions, please check [previous releases]('.$language['url'].'/releases).**';
+                $warning = '**This SDK is compatible with Appwrite server version ' . $version . '. For older versions, please check [previous releases](' . $language['url'] . '/releases).**';
                 $license = 'BSD-3-Clause';
                 $licenseContent = 'Copyright (c) ' . date('Y') . ' Appwrite (https://appwrite.io) and individual contributors.
 All rights reserved.
@@ -105,7 +105,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $config = new Node();
                         $config->setNPMPackage('node-appwrite');
                         $config->setBowerPackage('appwrite');
-                        $warning = $warning."\n\n > This is the Node.js SDK for integrating with Appwrite from your Node.js server-side code.
+                        $warning = $warning . "\n\n > This is the Node.js SDK for integrating with Appwrite from your Node.js server-side code.
                             If you're looking to integrate from the browser, you should check [appwrite/sdk-for-web](https://github.com/appwrite/sdk-for-web)";
                         break;
                     case 'deno':
@@ -115,7 +115,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $config = new Python();
                         $config->setPipPackage('appwrite');
                         $license = 'BSD License'; // license edited due to classifiers in pypi
-                    break;
+                        break;
                     case 'ruby':
                         $config = new Ruby();
                         $config->setGemPackage('appwrite');
@@ -131,14 +131,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     case 'dart':
                         $config = new Dart();
                         $config->setPackageName('dart_appwrite');
-                        $warning = $warning."\n\n > This is the Dart SDK for integrating with Appwrite from your Dart server-side code. If you're looking for the Flutter SDK you should check [appwrite/sdk-for-flutter](https://github.com/appwrite/sdk-for-flutter)";
+                        $warning = $warning . "\n\n > This is the Dart SDK for integrating with Appwrite from your Dart server-side code. If you're looking for the Flutter SDK you should check [appwrite/sdk-for-flutter](https://github.com/appwrite/sdk-for-flutter)";
                         break;
                     case 'go':
                         $config = new Go();
                         break;
                     case 'swift':
                         $config = new Swift();
-                        $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)";
+                        $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();
@@ -152,10 +152,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         break;
                     case 'kotlin':
                         $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)";
+                        $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;
                     default:
-                        throw new Exception('Language "'.$language['key'].'" not supported');
+                        throw new Exception('Language "' . $language['key'] . '" not supported');
                         break;
                 }
 
@@ -189,10 +189,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     ->setTwitter(APP_SOCIAL_TWITTER_HANDLE)
                     ->setDiscord(APP_SOCIAL_DISCORD_CHANNEL, APP_SOCIAL_DISCORD)
                     ->setDefaultHeaders([
-                        'X-Appwrite-Response-Format' => '0.11.0',
-                    ])
-                ;
-                
+                        'X-Appwrite-Response-Format' => '0.12.0',
+                    ]);
+
                 try {
                     $sdk->generate($result);
                 } catch (Exception $exception) {
@@ -204,38 +203,43 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                 $gitUrl = $language['gitUrl'];
                 $gitBranch = $language['gitBranch'];
 
-                
-                if(!$production) {
-                    $gitUrl = 'git@github.com:aw-tests/'.$language['gitRepoName'].'.git';
+
+                if (!$production) {
+                    $gitUrl = 'git@github.com:aw-tests/' . $language['gitRepoName'] . '.git';
                 }
-                
-                if($git && !empty($gitUrl)) {
-                    \exec('rm -rf '.$target.' && \
-                        mkdir -p '.$target.' && \
-                        cd '.$target.' && \
-                        git init --initial-branch='.$gitBranch.' && \
-                        git remote add origin '.$gitUrl.' && \
+
+                if ($git && !empty($gitUrl)) {
+                    \exec('rm -rf ' . $target . ' && \
+                        mkdir -p ' . $target . ' && \
+                        cd ' . $target . ' && \
+                        git init --initial-branch=' . $gitBranch . ' && \
+                        git remote add origin ' . $gitUrl . ' && \
                         git fetch && \
-                        git pull '.$gitUrl.' && \
-                        rm -rf '.$target.'/* && \
-                        cp -r '.$result.'/* '.$target.'/ && \
+                        git pull ' . $gitUrl . ' && \
+                        rm -rf ' . $target . '/* && \
+                        cp -r ' . $result . '/* ' . $target . '/ && \
                         git add . && \
-                        git commit -m "'.$message.'" && \
-                        git push -u origin '.$gitBranch.'
+                        git commit -m "' . $message . '" && \
+                        git push -u origin ' . $gitBranch . '
                     ');
 
                     Console::success("Pushed {$language['name']} SDK to {$gitUrl}");
 
-                    \exec('rm -rf '.$target);
+                    \exec('rm -rf ' . $target);
                     Console::success("Remove temp directory '{$target}' for {$language['name']} SDK");
                 }
 
                 $docDirectories = $language['docDirectories'] ?? [''];
+
+                if ($version === 'latest') {
+                    continue;
+                }
+
                 foreach ($docDirectories as $languageTitle => $path) {
-                    $languagePath = strtolower($languageTitle !== 0 ? '/'.$languageTitle : '');
+                    $languagePath = strtolower($languageTitle !== 0 ? '/' . $languageTitle : '');
                     \exec(
-                        'mkdir -p '.$resultExamples.$languagePath.' && \
-                        cp -r '.$result.'/docs/examples'.$languagePath.' '.$resultExamples
+                        'mkdir -p ' . $resultExamples . $languagePath . ' && \
+                        cp -r ' . $result . '/docs/examples' . $languagePath . ' ' . $resultExamples
                     );
                     Console::success("Copied code examples for {$language['name']} SDK to: {$resultExamples}");
                 }

app/tasks/specs.php

@@ -0,0 +1,267 @@
+<?php
+
+global $cli;
+
+use Utopia\Validator\Text;
+use Appwrite\Specification\Format\OpenAPI3;
+use Appwrite\Specification\Format\Swagger2;
+use Appwrite\Specification\Specification;
+use Appwrite\Utopia\Response;
+use Swoole\Http\Response as HttpResponse;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Request;
+use Utopia\Validator\WhiteList;
+
+$cli
+    ->task('specs')
+    ->param('version', 'latest', new Text(8), 'Spec version', true)
+    ->param('mode', 'normal', new WhiteList(['normal', 'mocks']), 'Spec Mode', true)
+    ->action(function ($version, $mode) use ($register) {
+        $db = $register->get('db');
+        $redis = $register->get('cache');
+        $appRoutes = App::getRoutes();
+        $response = new Response(new HttpResponse());
+        $mocks = ($mode === 'mocks');
+
+        App::setResource('request', fn () => new Request);
+        App::setResource('response', fn () => $response);
+        App::setResource('db', fn () => $db);
+        App::setResource('cache', fn () => $redis);
+
+        $platforms = [
+            'client' => APP_PLATFORM_CLIENT,
+            'server' => APP_PLATFORM_SERVER,
+            'console' => APP_PLATFORM_CONSOLE,
+        ];
+
+        $authCounts = [
+            'client' => 1,
+            'server' => 2,
+            'console' => 1,
+        ];
+
+        $keys = [
+            APP_PLATFORM_CLIENT => [
+                'Project' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Project',
+                    'description' => 'Your project ID',
+                    'in' => 'header',
+                ],
+                'JWT' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-JWT',
+                    'description' => 'Your secret JSON Web Token',
+                    'in' => 'header',
+                ],
+                'Locale' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Locale',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+            ],
+            APP_PLATFORM_SERVER => [
+                'Project' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Project',
+                    'description' => 'Your project ID',
+                    'in' => 'header',
+                ],
+                'Key' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Key',
+                    'description' => 'Your secret API key',
+                    'in' => 'header',
+                ],
+                'JWT' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-JWT',
+                    'description' => 'Your secret JSON Web Token',
+                    'in' => 'header',
+                ],
+                'Locale' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Locale',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+            ],
+            APP_PLATFORM_CONSOLE => [
+                'Project' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Project',
+                    'description' => 'Your project ID',
+                    'in' => 'header',
+                ],
+                'Key' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Key',
+                    'description' => 'Your secret API key',
+                    'in' => 'header',
+                ],
+                'JWT' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-JWT',
+                    'description' => 'Your secret JSON Web Token',
+                    'in' => 'header',
+                ],
+                'Locale' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Locale',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+                'Mode' => [
+                    'type' => 'apiKey',
+                    'name' => 'X-Appwrite-Mode',
+                    'description' => '',
+                    'in' => 'header',
+                ],
+            ],
+        ];
+
+        foreach (['swagger2', 'open-api3'] as $format) {
+            foreach ($platforms as $platform) {
+
+                $routes = [];
+                $models = [];
+                $services = [];
+
+                foreach ($appRoutes as $key => $method) {
+                    foreach ($method as $route) {
+                        /** @var \Utopia\Route $route */
+                        $routeSecurity = $route->getLabel('sdk.auth', []);
+                        $sdkPlatofrms = [];
+
+                        foreach ($routeSecurity as $value) {
+                            switch ($value) {
+                                case APP_AUTH_TYPE_SESSION:
+                                    $sdkPlatofrms[] = APP_PLATFORM_CLIENT;
+                                    break;
+                                case APP_AUTH_TYPE_KEY:
+                                    $sdkPlatofrms[] = APP_PLATFORM_SERVER;
+                                    break;
+                                case APP_AUTH_TYPE_JWT:
+                                    $sdkPlatofrms[] = APP_PLATFORM_SERVER;
+                                    break;
+                                case APP_AUTH_TYPE_ADMIN:
+                                    $sdkPlatofrms[] = APP_PLATFORM_CONSOLE;
+                                    break;
+                            }
+                        }
+
+                        if (empty($routeSecurity)) {
+                            $sdkPlatofrms[] = APP_PLATFORM_CLIENT;
+                        }
+
+                        if (!$route->getLabel('docs', true)) {
+                            continue;
+                        }
+
+                        if ($route->getLabel('sdk.mock', false) && !$mocks) {
+                            continue;
+                        }
+
+                        if (!$route->getLabel('sdk.mock', false) && $mocks) {
+                            continue;
+                        }
+
+                        if (empty($route->getLabel('sdk.namespace', null))) {
+                            continue;
+                        }
+
+                        if ($platform !== APP_PLATFORM_CONSOLE && !\in_array($platforms[$platform], $sdkPlatofrms)) {
+                            continue;
+                        }
+
+                        $routes[] = $route;
+                        $modelLabel = $route->getLabel('sdk.response.model', 'none');
+                        \is_array($modelLabel) ? \array_map(function ($m) use ($response) {
+                            return $response->getModel($m);
+                        }, $modelLabel) : $response->getModel($modelLabel);
+                    }
+                }
+
+                foreach (Config::getParam('services', []) as $service) {
+                    if (
+                        !isset($service['docs']) // Skip service if not part of the public API
+                        || !isset($service['sdk'])
+                        || !$service['docs']
+                        || !$service['sdk']
+                    ) {
+                        continue;
+                    }
+
+                    $services[] = [
+                        'name' => $service['key'] ?? '',
+                        'description' => $service['subtitle'] ?? '',
+                    ];
+                }
+
+                $models = $response->getModels();
+
+                foreach ($models as $key => $value) {
+                    if ($platform !== APP_PLATFORM_CONSOLE && !$value->isPublic()) {
+                        unset($models[$key]);
+                    }
+                }
+
+                switch ($format) {
+                    case 'swagger2':
+                        $formatInstance = new Swagger2(new App('UTC'), $services, $routes, $models, $keys[$platform], $authCounts[$platform] ?? 0);
+                        break;
+
+                    case 'open-api3':
+                        $formatInstance = new OpenAPI3(new App('UTC'), $services, $routes, $models, $keys[$platform], $authCounts[$platform] ?? 0);
+                        break;
+
+                    default:
+                        throw new Exception('Format not found: ' . $format);
+                        break;
+                }
+
+                $specs = new Specification($formatInstance);
+                $endpoint = App::getEnv('_APP_HOME', '[HOSTNAME]');
+                $email = App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', APP_EMAIL_TEAM);
+
+                $formatInstance
+                    ->setParam('name', APP_NAME)
+                    ->setParam('description', 'Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)')
+                    ->setParam('endpoint', 'https://HOSTNAME/v1')
+                    ->setParam('version', APP_VERSION_STABLE)
+                    ->setParam('terms', $endpoint . '/policy/terms')
+                    ->setParam('support.email', $email)
+                    ->setParam('support.url', $endpoint . '/support')
+                    ->setParam('contact.name', APP_NAME . ' Team')
+                    ->setParam('contact.email', $email)
+                    ->setParam('contact.url', $endpoint . '/support')
+                    ->setParam('license.name', 'BSD-3-Clause')
+                    ->setParam('license.url', 'https://raw.githubusercontent.com/appwrite/appwrite/master/LICENSE')
+                    ->setParam('docs.description', 'Full API docs, specs and tutorials')
+                    ->setParam('docs.url', $endpoint . '/docs');
+
+                if ($mocks) {
+                    $path = __DIR__ . '/../config/specs/' . $format . '-mocks-' . $platform . '.json';
+
+                    if (!file_put_contents($path, json_encode($specs->parse()))) {
+                        throw new Exception('Failed to save mocks spec file: ' . $path);
+                    }
+
+                    Console::success('Saved mocks spec file: ' . realpath($path));
+
+                    continue;
+                }
+
+                $path = __DIR__ . '/../config/specs/' . $format . '-' . $version . '-' . $platform . '.json';
+
+                if (!file_put_contents($path, json_encode($specs->parse()))) {
+                    throw new Exception('Failed to save spec file: ' . $path);
+                }
+
+                Console::success('Saved spec file: ' . realpath($path));
+            }
+        }
+    });

app/tasks/usage.php

@@ -0,0 +1,615 @@
+<?php
+
+global $cli, $register;
+
+use Utopia\App;
+use Utopia\Cache\Adapter\Redis;
+use Utopia\Cache\Cache;
+use Utopia\CLI\Console;
+use Utopia\Database\Adapter\MariaDB;
+use Utopia\Database\Database;
+use Utopia\Database\Document;
+use Utopia\Database\Validator\Authorization;
+
+/**
+ * Metrics We collect
+ *
+ * General
+ *
+ * requests
+ * network
+ * executions
+ *
+ * Database
+ *
+ * database.collections.create
+ * database.collections.read
+ * database.collections.update
+ * database.collections.delete
+ * database.documents.create
+ * database.documents.read
+ * database.documents.update
+ * database.documents.delete
+ * database.collections.{collectionId}.documents.create
+ * database.collections.{collectionId}.documents.read
+ * database.collections.{collectionId}.documents.update
+ * database.collections.{collectionId}.documents.delete
+ *
+ * Storage
+ *
+ * storage.buckets.{bucketId}.files.create
+ * storage.buckets.{bucketId}.files.read
+ * storage.buckets.{bucketId}.files.update
+ * storage.buckets.{bucketId}.files.delete
+ *
+ * Users
+ *
+ * users.create
+ * users.read
+ * users.update
+ * users.delete
+ * users.sessions.create
+ * users.sessions.{provider}.create
+ * users.sessions.delete
+ *
+ * Functions
+ *
+ * functions.{functionId}.executions
+ * functions.{functionId}.failures
+ * functions.{functionId}.compute
+ *
+ * Counters
+ *
+ * users.count
+ * storage.files.count
+ * database.collections.count
+ * database.documents.count
+ * database.collections.{collectionId}.documents.count
+ *
+ * Totals
+ *
+ * storage.total
+ *
+ */
+
+$cli
+    ->task('usage')
+    ->desc('Schedules syncing data from influxdb to Appwrite console db')
+    ->action(function () use ($register) {
+        Console::title('Usage Aggregation V1');
+        Console::success(APP_NAME . ' usage aggregation process v1 has started');
+
+        $interval = (int) App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '30'); // 30 seconds (by default)
+        $periods = [
+            [
+                'key' => '30m',
+                'startTime' => '-24 hours',
+            ],
+            [
+                'key' => '1d',
+                'startTime' => '-90 days',
+            ],
+        ];
+
+        // all the metrics that we are collecting at the moment
+        $globalMetrics = [
+            'requests' => [
+                'table' => 'appwrite_usage_requests_all',
+            ],
+            'network' => [
+                'table' => 'appwrite_usage_network_all',
+            ],
+            'executions' => [
+                'table' => 'appwrite_usage_executions_all',
+            ],
+            'database.collections.create' => [
+                'table' => 'appwrite_usage_database_collections_create',
+            ],
+            'database.collections.read' => [
+                'table' => 'appwrite_usage_database_collections_read',
+            ],
+            'database.collections.update' => [
+                'table' => 'appwrite_usage_database_collections_update',
+            ],
+            'database.collections.delete' => [
+                'table' => 'appwrite_usage_database_collections_delete',
+            ],
+            'database.documents.create' => [
+                'table' => 'appwrite_usage_database_documents_create',
+            ],
+            'database.documents.read' => [
+                'table' => 'appwrite_usage_database_documents_read',
+            ],
+            'database.documents.update' => [
+                'table' => 'appwrite_usage_database_documents_update',
+            ],
+            'database.documents.delete' => [
+                'table' => 'appwrite_usage_database_documents_delete',
+            ],
+            'database.collections.collectionId.documents.create' => [
+                'table' => 'appwrite_usage_database_documents_create',
+                'groupBy' => 'collectionId',
+            ],
+            'database.collections.collectionId.documents.read' => [
+                'table' => 'appwrite_usage_database_documents_read',
+                'groupBy' => 'collectionId',
+            ],
+            'database.collections.collectionId.documents.update' => [
+                'table' => 'appwrite_usage_database_documents_update',
+                'groupBy' => 'collectionId',
+            ],
+            'database.collections.collectionId.documents.delete' => [
+                'table' => 'appwrite_usage_database_documents_delete',
+                'groupBy' => 'collectionId',
+            ],
+            'storage.buckets.bucketId.files.create' => [
+                'table' => 'appwrite_usage_storage_files_create',
+                'groupBy' => 'bucketId',
+            ],
+            'storage.buckets.bucketId.files.read' => [
+                'table' => 'appwrite_usage_storage_files_read',
+                'groupBy' => 'bucketId',
+            ],
+            'storage.buckets.bucketId.files.update' => [
+                'table' => 'appwrite_usage_storage_files_update',
+                'groupBy' => 'bucketId',
+            ],
+            'storage.buckets.bucketId.files.delete' => [
+                'table' => 'appwrite_usage_storage_files_delete',
+                'groupBy' => 'bucketId',
+            ],
+            'users.create' => [
+                'table' => 'appwrite_usage_users_create',
+            ],
+            'users.read' => [
+                'table' => 'appwrite_usage_users_read',
+            ],
+            'users.update' => [
+                'table' => 'appwrite_usage_users_update',
+            ],
+            'users.delete' => [
+                'table' => 'appwrite_usage_users_delete',
+            ],
+            'users.sessions.create' => [
+                'table' => 'appwrite_usage_users_sessions_create',
+            ],
+            'users.sessions.provider.create' => [
+                'table' => 'appwrite_usage_users_sessions_create',
+                'groupBy' => 'provider',
+            ],
+            'users.sessions.delete' => [
+                'table' => 'appwrite_usage_users_sessions_delete',
+            ],
+            'functions.functionId.executions' => [
+                'table' => 'appwrite_usage_executions_all',
+                'groupBy' => 'functionId',
+            ],
+            'functions.functionId.compute' => [
+                'table' => 'appwrite_usage_executions_time',
+                'groupBy' => 'functionId',
+            ],
+            'functions.functionId.failures' => [
+                'table' => 'appwrite_usage_executions_all',
+                'groupBy' => 'functionId',
+                'filters' => [
+                    'functionStatus' => 'failed',
+                ],
+            ],
+        ];
+
+        // TODO Maybe move this to the setResource method, and reuse in the http.php file
+        $attempts = 0;
+        $max = 10;
+        $sleep = 1;
+
+        do { // connect to db
+            try {
+                $attempts++;
+                $db = $register->get('db');
+                $redis = $register->get('cache');
+                break; // leave the do-while if successful
+            } catch (\Exception $e) {
+                Console::warning("Database not ready. Retrying connection ({$attempts})...");
+                if ($attempts >= $max) {
+                    throw new \Exception('Failed to connect to database: ' . $e->getMessage());
+                }
+                sleep($sleep);
+            }
+        } while ($attempts < $max);
+
+        // TODO use inject
+        $cacheAdapter = new Cache(new Redis($redis));
+        $dbForProject = new Database(new MariaDB($db), $cacheAdapter);
+        $dbForConsole = new Database(new MariaDB($db), $cacheAdapter);
+        $dbForProject->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        $dbForConsole->setDefaultDatabase(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        $dbForConsole->setNamespace('_project_console');
+
+        $latestTime = [];
+
+        Authorization::disable();
+
+        $iterations = 0;
+        Console::loop(function () use ($interval, $register, $dbForProject, $dbForConsole, $globalMetrics, $periods, &$latestTime, &$iterations) {
+            $now = date('d-m-Y H:i:s', time());
+            Console::info("[{$now}] Aggregating usage data every {$interval} seconds");
+
+            $loopStart = microtime(true);
+
+            /**
+             * Aggregate InfluxDB every 30 seconds
+             * @var InfluxDB\Client $client
+             */
+            $client = $register->get('influxdb');
+            if ($client) {
+                $attempts = 0;
+                $max = 10;
+                $sleep = 1;
+
+                do { // check if telegraf database is ready
+                    try {
+                        $attempts++;
+                        $database = $client->selectDB('telegraf');
+                        if(in_array('telegraf', $client->listDatabases())) {
+                            break; // leave the do-while if successful
+                        }
+                    } catch (\Throwable $th) {
+                        Console::warning("InfluxDB not ready. Retrying connection ({$attempts})...");
+                        if ($attempts >= $max) {
+                            throw new \Exception('InfluxDB database not ready yet');
+                        }
+                        sleep($sleep);
+                    }
+                } while ($attempts < $max);
+
+                // sync data
+                foreach ($globalMetrics as $metric => $options) { //for each metrics
+                    foreach ($periods as $period) { // aggregate data for each period
+                        $start = DateTime::createFromFormat('U', \strtotime($period['startTime']))->format(DateTime::RFC3339);
+                        if (!empty($latestTime[$metric][$period['key']])) {
+                            $start = DateTime::createFromFormat('U', $latestTime[$metric][$period['key']])->format(DateTime::RFC3339);
+                        }
+                        $end = DateTime::createFromFormat('U', \strtotime('now'))->format(DateTime::RFC3339);
+
+                        $table = $options['table']; //Which influxdb table to query for this metric
+                        $groupBy = empty($options['groupBy']) ? '' : ', "' . $options['groupBy'] . '"'; //Some sub level metrics may be grouped by other tags like collectionId, bucketId, etc
+
+                        $filters = $options['filters'] ?? []; // Some metrics might have additional filters, like function's status
+                        if (!empty($filters)) {
+                            $filters = ' AND ' . implode(' AND ', array_map(fn ($filter, $value) => "\"{$filter}\"='{$value}'", array_keys($filters), array_values($filters)));
+                        } else {
+                            $filters = '';
+                        }
+
+                        $query = "SELECT sum(value) AS \"value\" FROM \"{$table}\" WHERE \"time\" > '{$start}' AND \"time\" < '{$end}' AND \"metric_type\"='counter' {$filters} GROUP BY time({$period['key']}), \"projectId\" {$groupBy} FILL(null)";
+                        $result = $database->query($query);
+
+                        $points = $result->getPoints();
+                        foreach ($points as $point) {
+                            $projectId = $point['projectId'];
+
+                            if (!empty($projectId) && $projectId !== 'console') {
+                                $dbForProject->setNamespace('_project_' . $projectId);
+                                $metricUpdated = $metric;
+
+                                if (!empty($groupBy)) {
+                                    $groupedBy = $point[$options['groupBy']] ?? '';
+                                    if (empty($groupedBy)) {
+                                        continue;
+                                    }
+                                    $metricUpdated = str_replace($options['groupBy'], $groupedBy, $metric);
+                                }
+
+                                $time = \strtotime($point['time']);
+                                $id = \md5($time . '_' . $period['key'] . '_' . $metricUpdated); //Construct unique id for each metric using time, period and metric
+                                $value = (!empty($point['value'])) ? $point['value'] : 0;
+
+                                try {
+                                    $document = $dbForProject->getDocument('stats', $id);
+                                    if ($document->isEmpty()) {
+                                        $dbForProject->createDocument('stats', new Document([
+                                            '$id' => $id,
+                                            'period' => $period['key'],
+                                            'time' => $time,
+                                            'metric' => $metricUpdated,
+                                            'value' => $value,
+                                            'type' => 0,
+                                        ]));
+                                    } else {
+                                        $dbForProject->updateDocument(
+                                            'stats',
+                                            $document->getId(),
+                                            $document->setAttribute('value', $value)
+                                        );
+                                    }
+                                    $latestTime[$metric][$period['key']] = $time;
+                                } catch (\Exception $e) { // if projects are deleted this might fail
+                                    Console::warning("Failed to save data for project {$projectId} and metric {$metricUpdated}: {$e->getMessage()}");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            /**
+             * Aggregate MariaDB every 15 minutes
+             * Some of the queries here might contain full-table scans.
+             */
+            if ($iterations % 30 === 0) { // Every 15 minutes aggregate number of objects in database
+
+                $latestProject = null;
+
+                do { // Loop over all the projects
+                    $attempts = 0;
+                    $max = 10;
+                    $sleep = 1;
+
+                    do { // list projects
+                        try {
+                            $attempts++;
+                            $projects = $dbForConsole->find('projects', [], 100, cursor: $latestProject);
+                            break; // leave the do-while if successful
+                        } catch (\Exception $e) {
+                            Console::warning("Console DB not ready yet. Retrying ({$attempts})...");
+                            if ($attempts >= $max) {
+                                throw new \Exception('Failed access console db: ' . $e->getMessage());
+                            }
+                            sleep($sleep);
+                        }
+                    } while ($attempts < $max);
+
+                    if (empty($projects)) {
+                        continue;
+                    }
+
+                    $latestProject = $projects[array_key_last($projects)];
+
+                    foreach ($projects as $project) {
+                        $projectId = $project->getId();
+
+                        // Get total storage
+                        $dbForProject->setNamespace('_project_' . $projectId);
+                        $storageTotal = $dbForProject->sum('files', 'sizeOriginal') + $dbForProject->sum('tags', 'size');
+
+                        $time = (int) (floor(time() / 1800) * 1800); // Time rounded to nearest 30 minutes
+                        $id = \md5($time . '_30m_storage.total'); //Construct unique id for each metric using time, period and metric
+                        $document = $dbForProject->getDocument('stats', $id);
+                        if ($document->isEmpty()) {
+                            $dbForProject->createDocument('stats', new Document([
+                                '$id' => $id,
+                                'period' => '30m',
+                                'time' => $time,
+                                'metric' => 'storage.total',
+                                'value' => $storageTotal,
+                                'type' => 1,
+                            ]));
+                        } else {
+                            $dbForProject->updateDocument(
+                                'stats',
+                                $document->getId(),
+                                $document->setAttribute('value', $storageTotal)
+                            );
+                        }
+
+                        $time = (int) (floor(time() / 86400) * 86400); // Time rounded to nearest day
+                        $id = \md5($time . '_1d_storage.total'); //Construct unique id for each metric using time, period and metric
+                        $document = $dbForProject->getDocument('stats', $id);
+                        if ($document->isEmpty()) {
+                            $dbForProject->createDocument('stats', new Document([
+                                '$id' => $id,
+                                'period' => '1d',
+                                'time' => $time,
+                                'metric' => 'storage.total',
+                                'value' => $storageTotal,
+                                'type' => 1,
+                            ]));
+                        } else {
+                            $dbForProject->updateDocument(
+                                'stats',
+                                $document->getId(),
+                                $document->setAttribute('value', $storageTotal)
+                            );
+                        }
+
+                        $collections = [
+                            'users' => [
+                                'namespace' => 'internal',
+                            ],
+                            'collections' => [
+                                'metricPrefix' => 'database',
+                                'namespace' => 'internal',
+                                'subCollections' => [ // Some collections, like collections and later buckets have child collections that need counting
+                                    'documents' => [
+                                        'namespace' => 'external',
+                                    ],
+                                ],
+                            ],
+                            'files' => [
+                                'metricPrefix' => 'storage',
+                                'namespace' => 'internal',
+                            ],
+                        ];
+
+                        foreach ($collections as $collection => $options) {
+                            try {
+                                $dbForProject->setNamespace("_project_{$projectId}");
+                                $count = $dbForProject->count($collection);
+                                $metricPrefix = $options['metricPrefix'] ?? '';
+                                $metric = empty($metricPrefix) ? "{$collection}.count" : "{$metricPrefix}.{$collection}.count";
+
+                                $time = (int) (floor(time() / 1800) * 1800); // Time rounded to nearest 30 minutes
+                                $id = \md5($time . '_30m_' . $metric); //Construct unique id for each metric using time, period and metric
+                                $document = $dbForProject->getDocument('stats', $id);
+                                if ($document->isEmpty()) {
+                                    $dbForProject->createDocument('stats', new Document([
+                                        '$id' => $id,
+                                        'time' => $time,
+                                        'period' => '30m',
+                                        'metric' => $metric,
+                                        'value' => $count,
+                                        'type' => 1,
+                                    ]));
+                                } else {
+                                    $dbForProject->updateDocument(
+                                        'stats',
+                                        $document->getId(),
+                                        $document->setAttribute('value', $count)
+                                    );
+                                }
+
+                                $time = (int) (floor(time() / 86400) * 86400); // Time rounded to nearest day
+                                $id = \md5($time . '_1d_' . $metric); //Construct unique id for each metric using time, period and metric
+                                $document = $dbForProject->getDocument('stats', $id);
+                                if ($document->isEmpty()) {
+                                    $dbForProject->createDocument('stats', new Document([
+                                        '$id' => $id,
+                                        'time' => $time,
+                                        'period' => '1d',
+                                        'metric' => $metric,
+                                        'value' => $count,
+                                        'type' => 1,
+                                    ]));
+                                } else {
+                                    $dbForProject->updateDocument(
+                                        'stats',
+                                        $document->getId(),
+                                        $document->setAttribute('value', $count)
+                                    );
+                                }
+
+                                $subCollections = $options['subCollections'] ?? [];
+
+                                if (empty($subCollections)) {
+                                    continue;
+                                }
+
+                                $latestParent = null;
+                                $subCollectionCounts = []; //total project level count of sub collections
+
+                                do { // Loop over all the parent collection document for each sub collection
+                                    $dbForProject->setNamespace("_project_{$projectId}");
+                                    $parents = $dbForProject->find($collection, [], 100, cursor: $latestParent); // Get all the parents for the sub collections for example for documents, this will get all the collections
+
+                                    if (empty($parents)) {
+                                        continue;
+                                    }
+
+                                    $latestParent = $parents[array_key_last($parents)];
+
+                                    foreach ($parents as $parent) {
+                                        foreach ($subCollections as $subCollection => $subOptions) { // Sub collection counts, like database.collections.collectionId.documents.count
+                                            $dbForProject->setNamespace("_project_{$projectId}");
+                                            $count = $dbForProject->count($parent->getId());
+
+                                            $subCollectionCounts[$subCollection] = ($subCollectionCounts[$subCollection] ?? 0) + $count; // Project level counts for sub collections like database.documents.count
+
+                                            $dbForProject->setNamespace("_project_{$projectId}");
+
+                                            $metric = empty($metricPrefix) ? "{$collection}.{$parent->getId()}.{$subCollection}.count" : "{$metricPrefix}.{$collection}.{$parent->getId()}.{$subCollection}.count";
+                                            $time = (int) (floor(time() / 1800) * 1800); // Time rounded to nearest 30 minutes
+                                            $id = \md5($time . '_30m_' . $metric); //Construct unique id for each metric using time, period and metric
+                                            $document = $dbForProject->getDocument('stats', $id);
+                                            if ($document->isEmpty()) {
+                                                $dbForProject->createDocument('stats', new Document([
+                                                    '$id' => $id,
+                                                    'time' => $time,
+                                                    'period' => '30m',
+                                                    'metric' => $metric,
+                                                    'value' => $count,
+                                                    'type' => 1,
+                                                ]));
+                                            } else {
+                                                $dbForProject->updateDocument(
+                                                    'stats',
+                                                    $document->getId(),
+                                                    $document->setAttribute('value', $count)
+                                                );
+                                            }
+
+                                            $time = (int) (floor(time() / 86400) * 86400); // Time rounded to nearest day
+                                            $id = \md5($time . '_1d_' . $metric); //Construct unique id for each metric using time, period and metric
+                                            $document = $dbForProject->getDocument('stats', $id);
+                                            if ($document->isEmpty()) {
+                                                $dbForProject->createDocument('stats', new Document([
+                                                    '$id' => $id,
+                                                    'time' => $time,
+                                                    'period' => '1d',
+                                                    'metric' => $metric,
+                                                    'value' => $count,
+                                                    'type' => 1,
+                                                ]));
+                                            } else {
+                                                $dbForProject->updateDocument(
+                                                    'stats',
+                                                    $document->getId(),
+                                                    $document->setAttribute('value', $count)
+                                                );
+                                            }
+                                        }
+                                    }
+                                } while (!empty($parents));
+
+                                /**
+                                 * Inserting project level counts for sub collections like database.documents.count
+                                 */
+                                foreach ($subCollectionCounts as $subCollection => $count) {
+                                    $dbForProject->setNamespace("_project_{$projectId}");
+
+                                    $metric = empty($metricPrefix) ? "{$subCollection}.count" : "{$metricPrefix}.{$subCollection}.count";
+
+                                    $time = (int) (floor(time() / 1800) * 1800); // Time rounded to nearest 30 minutes
+                                    $id = \md5($time . '_30m_' . $metric); //Construct unique id for each metric using time, period and metric
+                                    $document = $dbForProject->getDocument('stats', $id);
+                                    if ($document->isEmpty()) {
+                                        $dbForProject->createDocument('stats', new Document([
+                                            '$id' => $id,
+                                            'time' => $time,
+                                            'period' => '30m',
+                                            'metric' => $metric,
+                                            'value' => $count,
+                                            'type' => 1,
+                                        ]));
+                                    } else {
+                                        $dbForProject->updateDocument(
+                                            'stats',
+                                            $document->getId(),
+                                            $document->setAttribute('value', $count)
+                                        );
+                                    }
+
+                                    $time = (int) (floor(time() / 86400) * 86400); // Time rounded to nearest day
+                                    $id = \md5($time . '_1d_' . $metric); //Construct unique id for each metric using time, period and metric
+                                    $document = $dbForProject->getDocument('stats', $id);
+                                    if ($document->isEmpty()) {
+                                        $dbForProject->createDocument('stats', new Document([
+                                            '$id' => $id,
+                                            'time' => $time,
+                                            'period' => '1d',
+                                            'metric' => $metric,
+                                            'value' => $count,
+                                            'type' => 1,
+                                        ]));
+                                    } else {
+                                        $dbForProject->updateDocument(
+                                            'stats',
+                                            $document->getId(),
+                                            $document->setAttribute('value', $count)
+                                        );
+                                    }
+                                }
+                            } catch (\Exception $e) {
+                                Console::warning("Failed to save database counters data for project {$collection}: {$e->getMessage()}");
+                            }
+                        }
+                    }
+                } while (!empty($projects));
+            }
+
+            $iterations++;
+            $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

@@ -251,7 +251,7 @@
                         </span>
 
                         <div class="pull-start margin-end avatar-container">
-                            <img onerror="this.onerror=null;this.src='/images/unknown.svg'" data-ls-attrs="src={{env.API}}/avatars/browsers/{{session.clientCode|lowercase}}?width=60&height=60&project={{env.PROJECT}},title={{session.clientName}},alt={{session.clientName}}" class="avatar" loading="lazy" width="60" height="60" />
+                            <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-attrs="src={{env.API}}/avatars/browsers/{{session.clientCode|lowercase}}?width=60&height=60&project={{env.PROJECT}},title={{session.clientName}},alt={{session.clientName}}" class="avatar" loading="lazy" width="60" height="60" />
                                 
                             <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" />
@@ -266,7 +266,7 @@
                         </span>
 
                         <div class="margin-top-small">
-                            <img onerror="this.onerror=null;this.src='/images/unknown.svg'" 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" />
+                            <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>
@@ -301,14 +301,14 @@
                 data-name="securityLogs"
                 data-event="load">
 
-                <div class="box">
+                <div class="box margin-bottom">
                     <table class="vertical small">
                         <thead>
                             <tr>
-                                <th width="140">Date</th>
+                                <th width="120">Date</th>
                                 <th width="175">Event</th>
                                 <th>Client</th>
-                                <th width="90">Location</th>
+                                <th width="110">Location</th>
                                 <th width="90">IP</th>
                             </tr>
                         </thead>
@@ -317,19 +317,46 @@
                                 <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.src='/images/unknown.svg'" 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" />
+                                    <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" />
                                     <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.src='/images/unknown.svg'" 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.geo.countryName}}"></span>
+                                    <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.getLogs"
+                        data-event="submit"
+                        data-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
+                        data-param-offset="{{router.params.offset}}"
+                        data-scope="console"
+                        data-name="securityLogs"
+                        data-success="state"
+                        data-success-param-state-keys="offset">
+                        <button name="offset" data-paging-back data-offset="{{router.params.offset}}" data-sum="{{securityLogs.sum}}" 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.sum|pageTotal}}"></span>
+
+                    <form
+                        data-service="account.getLogs"
+                        data-event="submit"
+                        data-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
+                        data-param-offset="{{router.params.offset}}"
+                        data-scope="console"
+                        data-name="securityLogs"
+                        data-success="state"
+                        data-success-param-state-keys="offset">
+                        <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{securityLogs.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
+                    </form>
+                </div>
             </div>
         </li>
     </ul>

app/views/console/comps/header.phtml

@@ -142,16 +142,6 @@
             <b class="subtitle">MANAGE</b>
 
             <ul class="links">
-                <li>
-                    <a data-ls-attrs="href=/console/tasks?project={{router.params.project}}"
-                        data-analytics
-                        data-analytics-event="click"
-                        data-analytics-category="console/navigation"
-                        data-analytics-label="Tasks Link">
-                        <i class="icon-clock"></i>
-                        Tasks
-                    </a>
-                </li>
                 <li>
                     <a data-ls-attrs="href=/console/webhooks?project={{router.params.project}}"
                         data-analytics
@@ -212,6 +202,18 @@
         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_.-]{1,36}$"
+            name="projectId" />
+
         <label>Name</label>
         <input type="text" class="full-width margin-bottom-xl" name="name" required autocomplete="off" maxlength="128" />
 

app/views/console/comps/logs.phtml

@@ -0,0 +1,96 @@
+<?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-limit="<?php echo APP_PAGING_LIMIT; ?>"
+    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.sum}}">
+        <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-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
+                data-param-order-type="DESC"
+                data-scope="sdk"
+                data-name="logs"
+                data-success="state"
+                data-success-param-state-keys="search,offset">
+                <button name="offset" data-paging-back data-offset="{{router.params.offset}}" data-sum="{{logs.sum}}" 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.sum|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-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
+                data-param-order-type="DESC"
+                data-scope="sdk"
+                data-name="logs"
+                data-success="state"
+                data-success-param-state-keys="search,offset">
+                <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{logs.sum}}" class="margin-start-small round small" aria-label="Next"><i class="icon-right-open"></i></button>
+            </form>
+        </div>
+    </div>
+</div>

app/views/console/database/document.phtml

@@ -1,322 +1,363 @@
 <?php
 
-use Appwrite\Database\Database;
-use Utopia\View;
-use Appwrite\Database\Validator\Authorization;
+$new = $this->getParam('new', false);
+$logs = $this->getParam('logs', null);
 
-$collection = $this->getParam('collection', null);
-$searchFiles = $this->getParam('searchFiles', null);
-$searchDocuments = $this->getParam('searchDocuments', null);
-$name = $collection->getAttribute('name', '');
-$db = $this->getParam('db', null);
-$rules = $collection->getAttribute('rules', []);
-$namespace = 'project-document';
-$collections = [];
 ?>
-
-<?php echo $searchFiles->render(); ?>
-
-<?php foreach($rules as $rule): // Form to append child document
-    $key = $rule['key'] ?? '';
-    $label = $rule['label'] ?? '';
-    $type = $rule['type'] ?? '';
-    $list = $rule['list'] ?? [];
-?>
-    <?php foreach($list as $item):
-        if($item === $collection->getId()) {
-            continue; // Do not allow rec recrusion
-        }
-
-        if(!isset($collections[$item])) {
-            Authorization::disable(); //TODO Try and avoid calling the DB from the template
-            $collections[$item] = $db->getDocument($item, false);
-            Authorization::reset();
-        }
-
-        $childCollection = $collections[$item];
-
-        if(!$childCollection->getId() || $childCollection->getCollection() !== Database::SYSTEM_COLLECTION_COLLECTIONS) {
-            continue;
-        }
-
-        $searchDocuments
-            ->setParam('collection', $childCollection)
-        ;
-
-        echo $searchDocuments->render(); ?>
-    <?php endforeach; ?>
-<?php endforeach; ?>
-
-<?php foreach($rules as $rule): // Form to append child document
-    $key = $rule['key'] ?? '';
-    $label = $rule['label'] ?? '';
-    $type = $rule['type'] ?? '';
-    $list = $rule['list'] ?? [];
-    $array = $rule['array'] ?? false;
-?>
-
-    <?php if($type !== 'document' && $array): ?>
-
-        <form class="margin-bottom-no"
-            data-service="container.path"
-            data-event="collection-child-<?php echo $this->escape($namespace.'.'.$key); ?>"
-            data-scope="window.ls"
-            data-success="reset">
-
-            <input type="hidden" name="path" value="<?php echo $this->escape($namespace.'.'.$key); ?>" />
-            <input type="hidden" name="type" value="append" />
-            <input type="hidden" name="value" value="" />
-        </form>
-
-    <?php endif; ?>
-    
-    <?php if($type !== 'document'): ?>
-        <?php continue; ?>
-    <?php endif; ?>
-
-    <?php foreach($list as $item):
-        if($item === $collection->getId()) {
-            continue; // Do not allow rec recrusion
-        }
-
-        if(!isset($collections[$item])) {
-            Authorization::disable(); //TODO Try and avoid calling the DB from the template
-            $collections[$item] = $db->getDocument($item, false);
-            Authorization::reset();
-        }
-
-        $childCollection = $collections[$item];
-
-        if(!$childCollection->getId() || $childCollection->getCollection() !== Database::SYSTEM_COLLECTION_COLLECTIONS) {
-            continue;
-        }
-    ?>
-        <form class="margin-bottom-no"
-            data-service="container.path"
-            data-event="collection-child-<?php echo $this->escape($namespace.'.'.$key); ?>-<?php echo $this->escape($childCollection->getId()); ?>"
-            data-scope="window.ls"
-            data-success="reset">
-
-            <input type="hidden" name="path" value="<?php echo $this->escape($namespace.'.'.$key); ?>" />
-            <input type="hidden" name="type" value="append" />
-            
-            <fieldset name="value" data-cast-to="object">                            
-                <input name="$id" type="hidden" value="" />
-                <input name="$collection" type="hidden" value="<?php echo $this->escape($childCollection->getId()); ?>" />
-            </fieldset>
-        </form>
-
-        <script type="text/html" id="collection-<?php echo ($array) ? 'array-' : ''; ?><?php echo $this->escape($childCollection->getId()); ?>">
-            <?php 
-
-            $comp = new View(__DIR__.'/form.phtml');
-                                        
-            $comp
-                ->setParam('collection', $childCollection)
-                ->setParam('namespace', ($array) ? 'node' : $namespace.'.'.$key)
-                ->setParam('key', $key)
-                ->setParam('array', $array)
-                ->setParam('parent', 0)
-            ;
-
-            echo $comp->render();
-            ?>
-        </script>
-    <?php endforeach; ?>
-<?php endforeach; ?>
-
-<?php foreach($rules as $rule): // Form to remove array $index key
-    $key = $rule['key'] ?? '';
-    $label = $rule['label'] ?? '';
-    $type = $rule['type'] ?? '';
-    $list = $rule['list'] ?? false;
-    $array = $rule['array'] ?? false;
-
-    if(!$array) {
-        continue;
-    }
-?>
-    <ul data-ls-loop="<?php echo $this->escape($namespace.'.'.$key); ?>" data-ls-as="xxx">
-        <li>
-            <form
-                data-service="container.path"
-                data-event="splice-<?php echo $this->escape($namespace.'.'.$key); ?>-{{$index}}"
-                data-scope="window.ls"
-                data-success="reset">
-
-                <input type="hidden" name="path" value="<?php echo $this->escape($namespace.'.'.$key); ?>" />
-                <input type="hidden" name="type" value="splice" />
-                <input type="hidden" name="value" data-ls-bind="{{$index}}" />
-            </form>
-        </li>
-    </ul>
-<?php endforeach; ?>
-
 <div
-    data-service="database.getDocument"
+    data-service="database.getCollection"
     data-param-collection-id="{{router.params.collection}}"
-    data-param-document-id="{{router.params.id}}"
     data-scope="sdk"
     data-event="load,database.updateDocument"
-    data-name="project-document"
-    data-success="default">
+    data-name="project-collection">
 
-    <div class="cover">
-        <h1 class="zone xl margin-bottom-large">
-            <a data-ls-attrs="href=/console/database/collection?id={{router.params.collection}}&project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> <?php echo $this->escape($name); ?></a>
+    <div
+        data-service="database.getDocument"
+        data-param-collection-id="{{router.params.collection}}"
+        data-param-document-id="{{router.params.id}}"
+        data-scope="sdk"
+        data-event="load"
+        data-name="project-document"
+        data-success="default">
 
-            <br />
+        <div class="cover">
+            <h1 class="zone xl margin-bottom-large">
+                <a data-ls-attrs="href=/console/database/collection?id={{router.params.collection}}&project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> <span data-ls-bind="{{project-collection.name}}"></span></a>
 
-            <span data-ls-if="({{project-document.$id}})" data-ls-bind="Document">&nbsp;&nbsp;</span>
-            <span data-ls-if="(!{{project-document.$id}})" data-ls-bind="Document">&nbsp;&nbsp;</span>
-        </h1>
-    </div>
+                <br />
 
-    <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
-        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
-        
-        <h2>JSON View</h2>
-
-        <div class="margin-bottom">
-            <input type="hidden" data-ls-bind="{{project-document}}" data-forms-code />
+                <span data-ls-if="({{project-document.$id}})" data-ls-bind="Document">&nbsp;&nbsp;</span>
+                <span data-ls-if="(!{{project-document.$id}})" data-ls-bind="Document">&nbsp;&nbsp;</span>
+            </h1>
         </div>
 
-        <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-    </div>
+        <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
+            <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
 
-    <div class="zone xl margin-bottom-no">
-        <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
-            <li data-state="/console/database/document?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}">
-                <h2>Update</h2>
+            <h2>JSON View</h2>
 
-                <div class="row responsive margin-top-negative">
-                    <div class="col span-8 margin-bottom">
-                        <form
-                            data-analytics
-                            data-analytics-activity
-                            data-analytics-event="submit"
-                            data-analytics-category="console"
-                            data-analytics-label="Update Database Document"
-                            data-service="{{|documentAction}}"
-                            data-name="project-document"
-                            data-scope="sdk"
-                            data-event="submit"
-                            data-success="alert,trigger{{|documentSuccess}}"
-                            data-success-param-alert-text="Updated document successfully"
-                            data-success-param-trigger-events="database.updateDocument"
-                            data-success-param-redirect-url="/console/database/document?id={{serviceData.$id}}&collection={{router.params.collection}}&project={{router.params.project}}"
-                            data-failure="alert"
-                            data-failure-param-alert-text="Failed to update document"
-                            data-failure-param-alert-classname="error">
+            <div class="margin-bottom">
+                <input type="hidden" data-ls-bind="{{project-document}}" data-forms-code />
+            </div>
 
-                            <label>&nbsp;</label>
+            <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+        </div>
 
-                            <div class="box">
+        <div class="zone xl margin-bottom-no">
+            <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
+                <li data-state="/console/database/document?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}">
+                    <h2 class="margin-bottom">Overview</h2>
 
-                                <!-- <div class="document-nav" data-forms-nav>
-                                    <ul class="text-align-end margin-end-small">
-                                        <?php foreach($rules as $rule): // Form to append child document
-                                            $key = $rule['key'] ?? '';
-                                            $label = $rule['label'] ?? '';
-                                            $type = $rule['type'] ?? '';
-                                            $list = $rule['list'] ?? [];
-                                        ?>
-                                            <li class="text-size-small">
-                                                <span class="link text-fade" data-forms-nav-link="<?php echo $this->escape($key); ?>"><?php echo $this->escape($label); ?></span>
-                                            </li>
-                                        <?php endforeach; ?>
-                                    </ul>
-                                </div> -->
-                                
-                                <?php if(empty($rules)): ?>
-                                    <div class="margin-bottom-xl margin-top-xl margin-end margin-start text-align-center">
-                                        <h4 class="text-fade text-size-small">No attribute rules added yet.<br /><br /><a data-ls-attrs="href=/console/database/collection/settings?id={{router.params.collection}}&project={{router.params.project}}">Update Collection</a></h4>
-                                    </div>
-                                <?php else: ?>
-                                    <?php
-
-                                    $comp = new View(__DIR__.'/form.phtml');
-                        
-                                    $comp
-                                        ->setParam('collection', $collection)
-                                        ->setParam('collections', $collections)
-                                        ->setParam('namespace', $namespace)
-                                        ->setParam('key', 'data')
-                                        ->setParam('parent', 1)
-                                    ;
-
-                                    echo $comp->render();
-                                    ?>
-
-                                    <div class="toggle margin-bottom" data-ls-ui-open data-button-aria="Open Permissions">
-                                        <i class="icon-plus pull-end margin-top-tiny"></i>
-                                        <i class="icon-minus pull-end margin-top-tiny"></i>
-                                        
-                                        <h3 class="margin-bottom-large">Permissions</h3>
-                                        
-                                        <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
-                                        <input type="hidden" id="collection-read" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{project-document.$permissions.read}}" placeholder="User ID, Team ID or Role" />
-                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-
-                                        <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                                        <input type="hidden" id="collection-write" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{project-document.$permissions.write}}" placeholder="User ID, Team ID or Role" />
-                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-                                    </div>
-
-                                    <button data-ls-if="({{project-document.$id}})">Update</button>
-                                    <button data-ls-if="(!{{project-document.$id}})">Create</button>
-                                <?php endif; ?>
-                            </div>
-
-                        </form>
-                    </div>
-                    <div class="col span-4 sticky-top">
-
-                        <div data-ls-if="({{project-document.$id}})">
-                            <label>Document ID</label>
-                            <div class="input-copy margin-bottom">
-                                <input type="text" autocomplete="off" placeholder="" data-ls-bind="{{project-document.$id}}" disabled data-forms-copy class="margin-bottom-no" />
-                            </div>
-                        </div>
-
-                        <label>Collection ID</label>
-                        <div class="input-copy margin-bottom">
-                            <input type="text" autocomplete="off" placeholder="" data-ls-bind="{{router.params.collection}}" disabled data-forms-copy class="margin-bottom-no" />
-                        </div>
-
-                        <ul class="margin-bottom-large text-fade text-size-small" data-ls-if="({{project-document.$id}})">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
-                        </ul>
-
-                        <div data-ls-if="({{project-document.$id}})">
-                            <form name="database.deleteDocument" class="margin-bottom"
+                    <div class="row responsive">
+                        <div class="col span-8 margin-bottom">
+                            <form
                                 data-analytics
                                 data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
-                                data-analytics-label="Delete Collection Document"
-                                data-service="database.deleteDocument"
+                                data-analytics-label="Update Database Document"
+                                data-service="{{|documentAction}}"
+                                data-name="project-document"
+                                data-scope="sdk"
                                 data-event="submit"
-                                data-param-collection-id="{{router.params.collection}}"
-                                data-param-document-id="{{project-document.$id}}"
-                                data-confirm="Are you sure you want to delete this document?"
-                                data-success="alert,trigger,redirect"
-                                data-success-param-alert-text="Document deleted successfully"
-                                data-success-param-trigger-events="database.deleteDocument"
-                                data-success-param-redirect-url="/console/database/collection?id={{router.params.collection}}&project={{router.params.project}}"
+                                data-success="trigger,redirect"
+                                data-success-param-trigger-events="database.updateDocument"
+                                data-success-param-redirect-url="/console/database/document?id={{serviceData.$id}}&collection={{project-collection.$id}}&project={{router.params.project}}"
                                 data-failure="alert"
-                                data-failure-param-alert-text="Failed to delete collection"
+                                data-failure-param-alert-text="Failed to update document"
                                 data-failure-param-alert-classname="error">
 
-                                <button type="submit" class="danger fill">Delete Document</button>
+                                <input type="hidden" name="collectionId" data-ls-bind="{{project-collection.$id}}" />
+                                <?php if(!$new): ?><input type="hidden" name="documentId" data-ls-bind="{{project-document.$id}}" /><?php endif; ?>
+
+                                <div class="box">
+                                    <?php if($new): ?>
+                                        <label for="documentId">Document ID</label>
+                                        <input
+                                            type="hidden"
+                                            data-custom-id
+                                            data-id-type="auto"
+                                            data-validator="database.getDocument"
+                                            required
+                                            maxlength="36"
+                                            name="documentId"
+                                            id="documentId"
+                                            maxlength="36"
+                                            pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{1,36}$" />
+                                    <?php endif; ?>
+
+                                    <fieldset name="data" data-cast-to="object" data-ls-attrs="x-init=doc = {{project-document}}" x-data="{doc: {}}">
+                                        <ul data-ls-attrs="x-init=attributes = {{project-collection.attributes}}" x-data="{attributes: []}">
+                                            <template x-for="attr in attributes.filter(a => a.status === 'available')">
+                                                <li>
+                                                    <label>
+                                                        <div x-text="attr.key" class="margin-bottom-tiny"></div>
+                                                        <span x-show="attr.required" class="text-size-xs text-danger text-fade">required</span>
+                                                        <span x-show="!attr.required" class="text-size-xs text-fade">optional</span>
+                                                    </label>
+                                                    <template x-if="!attr.array">
+                                                        <div>
+                                                            <template x-if="attr.type === 'integer'">
+                                                                <input
+                                                                    type="number"
+                                                                    step="1"
+                                                                    :placeholder="attr.default"
+                                                                    :name="attr.key"
+                                                                    :required="attr.required"
+                                                                    x-model="doc[attr.key]"
+                                                                    data-cast-to="integer" />
+                                                            </template>
+                                                            <template x-if="attr.type === 'double'">
+                                                                <input
+                                                                    type="number"
+                                                                    step="0.01"
+                                                                    :placeholder="attr.default"
+                                                                    :name="attr.key"
+                                                                    :required="attr.required"
+                                                                    x-model="doc[attr.key]"
+                                                                    data-cast-to="integer" />
+                                                            </template>
+                                                            <template x-if="attr.type === 'boolean'">
+                                                                <input
+                                                                    class="button switch margin-bottom"
+                                                                    type="checkbox"
+                                                                    :name="attr.key"
+                                                                    :checked="doc[attr.key]" />
+                                                            </template>
+                                                            <template x-if="attr.type === 'string' && !attr.format">
+                                                                <textarea 
+                                                                    data-forms-text-resize
+                                                                    data-forms-text-direction
+                                                                    :placeholder="attr.default"
+                                                                    :name="attr.key"
+                                                                    :required="attr.required"
+                                                                    x-model="doc[attr.key]"
+                                                                    data-cast-to="string"></textarea>
+                                                            </template>
+                                                            <template x-if="attr.format === 'ip'">
+                                                                <textarea 
+                                                                    data-forms-text-resize
+                                                                    data-forms-text-direction
+                                                                    pattern="((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))"
+                                                                    :placeholder="attr.default"
+                                                                    :name="attr.key"
+                                                                    :required="attr.required"
+                                                                    x-model="doc[attr.key]"
+                                                                    data-cast-to="string"></textarea>
+                                                            </template>
+                                                            <template x-if="attr.format === 'email'">
+                                                                <textarea 
+                                                                    data-forms-text-resize
+                                                                    data-forms-text-direction
+                                                                    type="email"
+                                                                    :placeholder="attr.default"
+                                                                    :name="attr.key"
+                                                                    :required="attr.required"
+                                                                    x-model="doc[attr.key]"
+                                                                    data-cast-to="string"></textarea>
+                                                            </template>
+                                                            <template x-if="attr.format === 'url'">
+                                                                <textarea 
+                                                                    data-forms-text-resize
+                                                                    data-forms-text-direction
+                                                                    type="url"
+                                                                    :placeholder="attr.default"
+                                                                    :name="attr.key"
+                                                                    :required="attr.required"
+                                                                    x-model="doc[attr.key]"
+                                                                    data-cast-to="string"></textarea>
+                                                            </template>
+                                                            <template x-if="attr.format === 'enum'">
+                                                                <select
+                                                                    :name="attr.key"
+                                                                    data-cast-to="string">
+                                                                    <template x-for="element in attr.elements">
+                                                                        <option
+                                                                            :value="element"
+                                                                            x-text="element"
+                                                                            :selected="doc[attr.key] === element"></option>
+                                                                    </template>
+                                                                </select>
+                                                            </template>
+                                                        </div>
+                                                    </template>
+                                                    <template x-if="attr.array">
+                                                        <div>
+                                                            <input type="hidden" :required="attr.required" :name="attr.key" data-cast-to="array-empty">
+                                                            <template x-for="(node, index) in doc[attr.key]">
+                                                                <div class="row responsive thin margin-bottom-tiny">
+                                                                    <div class="col span-11 margin-bottom-small">
+                                                                        <template x-if="attr.type === 'integer'">
+                                                                            <input
+                                                                                type="number"
+                                                                                step="1"
+                                                                                :placeholder="attr.default"
+                                                                                :name="attr.key"
+                                                                                :required="attr.required"
+                                                                                x-model="doc[attr.key][index]"
+                                                                                data-cast-to="integer" />
+                                                                        </template>
+                                                                        <template x-if="attr.type === 'double'">
+                                                                            <input
+                                                                                type="number"
+                                                                                step="0.01"
+                                                                                :placeholder="attr.default"
+                                                                                :name="attr.key"
+                                                                                :required="attr.required"
+                                                                                x-model="doc[attr.key][index]"
+                                                                                data-cast-to="integer" />
+                                                                        </template>
+                                                                        <template x-if="attr.type === 'boolean'">
+                                                                            <input
+                                                                                class="button switch"
+                                                                                :class="(doc[attr.key].length - 1) === index ? 'margin-bottom' : ''"
+                                                                                type="checkbox"
+                                                                                :name="attr.key"
+                                                                                :value="attr.key"
+                                                                                :checked="doc[attr.key][index]" />
+                                                                        </template>
+                                                                        <template x-if="attr.type === 'string' && !attr.format">
+                                                                            <textarea 
+                                                                                data-forms-text-resize
+                                                                                data-forms-text-direction
+                                                                                :placeholder="attr.default"
+                                                                                :name="attr.key"
+                                                                                :required="attr.required"
+                                                                                x-model="doc[attr.key][index]"
+                                                                                data-cast-to="string"></textarea>
+                                                                        </template>
+                                                                        <template x-if="attr.format === 'ip'">
+                                                                            <textarea 
+                                                                                data-forms-text-resize
+                                                                                data-forms-text-direction
+                                                                                pattern="((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))"
+                                                                                :placeholder="attr.default"
+                                                                                :name="attr.key"
+                                                                                :required="attr.required"
+                                                                                x-model="doc[attr.key][index]"
+                                                                                data-cast-to="string"></textarea>
+                                                                        </template>
+                                                                        <template x-if="attr.format === 'email'">
+                                                                            <textarea 
+                                                                                data-forms-text-resize
+                                                                                data-forms-text-direction
+                                                                                type="email"
+                                                                                :placeholder="attr.default"
+                                                                                :name="attr.key"
+                                                                                :required="attr.required"
+                                                                                x-model="doc[attr.key][index]"
+                                                                                data-cast-to="string"></textarea>
+                                                                        </template>
+                                                                        <template x-if="attr.format === 'url'">
+                                                                            <textarea 
+                                                                                data-forms-text-resize
+                                                                                data-forms-text-direction
+                                                                                type="url"
+                                                                                :placeholder="attr.default"
+                                                                                :name="attr.key"
+                                                                                :required="attr.required"
+                                                                                x-model="doc[attr.key][index]"
+                                                                                data-cast-to="string"></textarea>
+                                                                        </template>
+                                                                        <template x-if="attr.format === 'enum'">
+                                                                            <select
+                                                                                :name="attr.key"
+                                                                                data-cast-to="string">
+                                                                                <template x-for="element in attr.elements">
+                                                                                    <option
+                                                                                        :value="element"
+                                                                                        x-text="element"
+                                                                                        :selected="doc[attr.key][index] === element"></option>
+                                                                                </template>
+                                                                            </select>
+                                                                        </template>
+                                                                    </div>
+                                                                    <div class="col span-1 margin-bottom-small">
+                                                                        <button type="button" class="dark danger small round pull-end" style="margin-top: 10px;" @click="doc[attr.key].splice(index, 1)"><i class="icon-cancel"></i></button>
+                                                                    </div>
+                                                                </div>
+                                                            </template>
+                                                            <button type="button" class="margin-end margin-bottom-small reverse" @click="doc = addAttribute(doc, attr.key)"> Add Attribute </button>
+                                                        </div>
+                                                    </template>
+                                                </li>
+                                            </template>
+                                        </ul>
+                                    </fieldset>
+
+                                    <div class="toggle margin-bottom" data-ls-ui-open data-button-aria="Open Permissions">
+                                        <i class="icon-plus pull-end margin-top-tiny"></i>
+                                        <i class="icon-minus pull-end margin-top-tiny"></i>
+
+                                        <h3 class="margin-bottom-large">Permissions</h3>
+
+                                        <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
+                                        <input type="hidden" id="collection-read" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{project-document.$read}}" placeholder="User ID, Team ID or Role" />
+                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
+
+                                        <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
+                                        <input type="hidden" id="collection-write" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{project-document.$write}}" placeholder="User ID, Team ID or Role" />
+                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
+                                    </div>
+
+                                    <button data-ls-if="({{project-document.$id}})">Update</button>
+                                    <button data-ls-if="(!{{project-document.$id}})">Create</button>
+                                </div>
+
                             </form>
                         </div>
+                        <div class="col span-4 sticky-top">
+
+                            <div data-ls-if="({{project-document.$id}})">
+                                <label>Document ID</label>
+                                <div class="input-copy margin-bottom">
+                                    <input type="text" autocomplete="off" placeholder="" data-ls-bind="{{project-document.$id}}" disabled data-forms-copy class="margin-bottom-no" />
+                                </div>
+                            </div>
+
+                            <label>Collection ID</label>
+                            <div class="input-copy margin-bottom">
+                                <input type="text" autocomplete="off" placeholder="" data-ls-bind="{{router.params.collection}}" disabled data-forms-copy class="margin-bottom-no" />
+                            </div>
+
+                            <ul class="margin-bottom-large text-fade text-size-small" data-ls-if="({{project-document.$id}})">
+                                <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            </ul>
+
+                            <div data-ls-if="({{project-document.$id}})">
+                                <form name="database.deleteDocument" class="margin-bottom"
+                                    data-analytics
+                                    data-analytics-activity
+                                    data-analytics-event="submit"
+                                    data-analytics-category="console"
+                                    data-analytics-label="Delete Collection Document"
+                                    data-service="database.deleteDocument"
+                                    data-event="submit"
+                                    data-param-collection-id="{{router.params.collection}}"
+                                    data-param-document-id="{{project-document.$id}}"
+                                    data-confirm="Are you sure you want to delete this document?"
+                                    data-success="alert,trigger,redirect"
+                                    data-success-param-alert-text="Document deleted successfully"
+                                    data-success-param-trigger-events="database.deleteDocument"
+                                    data-success-param-redirect-url="/console/database/collection?id={{router.params.collection}}&project={{router.params.project}}"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed to delete collection"
+                                    data-failure-param-alert-classname="error">
+
+                                    <button type="submit" class="danger fill">Delete Document</button>
+                                </form>
+                            </div>
+                        </div>
                     </div>
-                </div>
-            </li>
-            <!-- <li data-ls-if="{{project-document.$id}}" data-state="/console/database/document/activity?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}">
-                <h2>Activity</h2>
-            </li> -->
-        </ul>
+                </li>
+                <?php if(!$new): ?>
+                    <li data-state="/console/database/document/activity?id={{router.params.id}}&collection={{router.params.collection}}&project={{router.params.project}}">
+                        <h2>Activity</h2>
+
+                        <?php echo $logs->render(); ?>
+                    </li>
+                <?php endif; ?>
+            </ul>
+        </div>
     </div>
 </div>

app/views/console/database/form.phtml

@@ -1,6 +1,6 @@
 <?php
 
-use Utopia\View;
+use Appwrite\Utopia\View;
 
 $collection = $this->getParam('collection', null);
 $collections = $this->getParam('collections', []);

app/views/console/database/index.phtml

@@ -29,7 +29,7 @@
                         <p class="margin-bottom-no">You haven't created any collections for your project yet.</p>
                     </div>
                 </div>
-                
+
                 <div data-ls-if="0 != {{project-collections.sum}}">
                     <ul data-ls-loop="project-collections.collections" data-ls-as="collection" data-ls-append="" class="tiles cell-3 margin-bottom-small">
                         <li class="margin-bottom">
@@ -48,7 +48,7 @@
                         data-event="submit"
                         data-param-search="{{router.params.search}}"
                         data-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
-                        data-param-order-type="DESC"
+                        data-param-order-type="ASC"
                         data-scope="sdk"
                         data-name="project-collections"
                         data-success="state"
@@ -63,7 +63,7 @@
                         data-event="submit"
                         data-param-search="{{router.params.search}}"
                         data-param-limit="<?php echo APP_PAGING_LIMIT; ?>"
-                        data-param-order-type="DESC"
+                        data-param-order-type="ASC"
                         data-scope="sdk"
                         data-name="project-collections"
                         data-success="state"
@@ -94,12 +94,23 @@
                         data-failure-param-alert-text="Failed to create collection"
                         data-failure-param-alert-classname="error">
 
-                        <label for="user-name">Name</label>
+                        <label for="collection-id">Collection ID</label>
+                        <input
+                            type="hidden"
+                            data-custom-id
+                            data-id-type="auto"
+                            data-validator="database.getCollection"
+                            required
+                            maxlength="36"
+                            pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{1,36}$"
+                            name="collectionId" />
+
+                        <label for="collection-name">Name</label>
                         <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
 
+                        <input type="hidden" id="collection-permission" name="permission" required value="document" />
                         <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
                         <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
-                        <input type="hidden" id="collection-rules" name="rules" required data-cast-to="json" value="{}" />
 
                         <hr />
 
@@ -108,9 +119,110 @@
                 </div>
 
             </li>
-            <!-- <li data-state="/console/database/usage?project={{router.params.project}}">
+            <li data-state="/console/database/usage?project={{router.params.project}}">
+                <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '90d'"
+                    data-service="database.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-range="90d">
+                    <button class="tick">90d</button>
+                </form>
+
+                <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '90d'" disabled>90d</button>
+
+                <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '30d'"
+                    data-service="database.getUsage"
+                    data-event="submit"
+                    data-name="usage">
+                    <button class="tick">30d</button>
+                </form>
+
+                <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '30d'" disabled>30d</button>
+
+                <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '24h'"
+                    data-service="database.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-range="24h">
+                    <button class="tick">24h</button>
+                </form>
+
+                <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
+
                 <h2>Usage</h2>
-            </li> -->
+
+                <div
+                    data-service="database.getUsage"
+                    data-event="load"
+                    data-name="usage">
+                    <h3 class="margin-bottom-tiny">Objects</h3>
+                    <p class="text-fade">Count of collections and documents over time</p>
+                    <div class="box margin-bottom-small">
+                        <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input 
+                                type="hidden" 
+                                data-ls-bind="{{usage}}" 
+                                data-forms-chart="Collections=collectionsCount,Documents=documentsCount" 
+                                data-show-y-axis="true"
+                                data-height="140" />
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="chart-notes margin-bottom-large">
+                        <li>Total Collections <span data-ls-bind="({{usage.collectionsCount|statsGetLast|statsTotal}})"></span></li>
+                        <li>Total Documents <span data-ls-bind="({{usage.documentsCount|statsGetLast|statsTotal}})"></span></li>
+                    </ul>
+
+
+                    <h3 class="margin-bottom-tiny">Collections</h3>
+                    <p class="text-fade">Count of collections create, read, update and delete operations over time</p>
+                    <div class="box margin-bottom-small">
+                        <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input 
+                                    type="hidden"
+                                    data-ls-bind="{{usage}}"
+                                    data-forms-chart="Created=collectionsCreate,Read=collectionsRead,Updated=collectionsUpdate,Deleted=collectionsDelete"
+                                    data-show-y-axis="true"
+                                    data-colors="create,read,update,delete"
+                                    data-height="140" />
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="chart-notes margin-bottom-large crud">
+                        <li>Created</li>
+                        <li>Read</li>
+                        <li>Updated</li>
+                        <li>Deleted</li>
+                    </ul>
+
+                    <h3 class="margin-bottom-tiny">Documents</h3>
+                    <p class="text-fade">Count of documents create, read, update and delete operations over time</p>
+                    <div class="box margin-bottom-small">
+                        <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input
+                                    type="hidden"
+                                    data-ls-bind="{{usage}}"
+                                    data-forms-chart="Created=documentsCreate,Read=documentsRead,Updated=documentsUpdate,Deleted=documentsDelete"
+                                    data-show-y-axis="true"
+                                    data-colors="create,read,update,delete"
+                                    data-height="140" />
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="chart-notes margin-bottom-large crud">
+                        <li>Created</li>
+                        <li>Read</li>
+                        <li>Updated</li>
+                        <li>Deleted</li>
+                    </ul>
+                </div>
+            </li>
         </ul>
     </div>
 </div>

app/views/console/functions/function.phtml

@@ -3,7 +3,7 @@ $fileLimit = $this->getParam('fileLimit', 0);
 $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
 $events = array_keys($this->getParam('events', []));
 $timeout = $this->getParam('timeout', 900);
-$usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
+$usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
 ?>
 <div
     data-service="functions.get"
@@ -23,8 +23,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </div>
 
     <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
-        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
-        
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
         <h2>JSON View</h2>
 
         <div class="margin-bottom">
@@ -37,9 +37,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     <div class="zone xl">
         <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
             <li data-state="/console/functions/function?id={{router.params.id}}&project={{router.params.project}}">
-                
+
                 <h2>Overview</h2>
-                
+
                 <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom">
                         <label>&nbsp;</label>
@@ -98,7 +98,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                                 <input type="hidden" name="tag" data-ls-bind="{{tag.$id}}">
                                                 <button>Activate</button>
                                             </form>
-    
+
                                             <b data-ls-bind="{{tag.$id}}"></b> &nbsp;
                                             <span class="text-fade" data-ls-bind="{{tag.command}}"></span>
                                             <div class="text-size-small margin-top-small clear">
@@ -202,9 +202,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     </div>
                 </div>
             </li>
-            <?php if($usageStatsEnabled): ?>
+            <?php if ($usageStatsEnabled): ?>
             <li data-state="/console/functions/function/monitors?id={{router.params.id}}&project={{router.params.project}}">
-                
+
                 <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '90d'"
                     data-service="functions.getUsage"
                     data-event="submit"
@@ -238,50 +238,50 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
 
                 <h2>Monitors</h2>
-                
-                <div 
+
+                <div
                     data-service="functions.getUsage"
                     data-event="load"
                     data-name="usage"
                     data-param-function-id="{{router.params.id}}">
                     <div class="box margin-bottom-small">
                         <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
-                            <div class="chart margin-bottom-no">
-                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Executions=usage.executions.data" data-height="140" />
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Executions=functionsExecutions" data-height="140" data-show-y-axis="true" />
                             </div>
                         </div>
                     </div>
 
                     <ul class="chart-notes margin-bottom-large">
-                        <li>Executions <span data-ls-bind="({{usage.executions.total}})"></span></li>
+                        <li>Executions <span data-ls-bind="({{usage.functionsExecutions|statsGetLast|statsTotal}})"></span></li>
                     </ul>
 
                     <div class="box margin-bottom-small">
                         <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
-                            <div class="chart margin-bottom-no">
-                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="CPU Time (milliseconds)=usage.compute.data" data-colors="orange" data-height="140" />
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="CPU Time (milliseconds)=functionsCompute" data-colors="orange" data-height="140" data-show-y-axis="true" />
                             </div>
                         </div>
                     </div>
 
                     <ul class="chart-notes margin-bottom-large">
-                        <li class="orange">CPU Time <span data-ls-bind="({{usage.compute.total|seconds2hum}})"></span></li>
+                        <li class="orange">CPU Time <span data-ls-bind="({{usage.functionsCompute|statsGetLast|seconds2hum}})"></span></li>
                     </ul>
 
                     <div class="box margin-bottom-small">
                         <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
-                            <div class="chart margin-bottom-no">
-                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Failures=usage.failures.data" data-colors="red" data-height="140" />
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Failures=functionsFailures" data-colors="red" data-height="140" data-show-y-axis="true" />
                             </div>
                         </div>
                     </div>
 
                     <ul class="chart-notes margin-bottom-large">
-                        <li class="red">Errors <span data-ls-bind="({{usage.failures.total}})"></span></li>
+                        <li class="red">Errors <span data-ls-bind="({{usage.functionsFailures|statsGetLast|statsTotal}})"></span></li>
                     </ul>
                 </div>
             </li>
-            <?php endif; ?>
+            <?php endif;?>
             <li data-state="/console/functions/function/logs?id={{router.params.id}}&project={{router.params.project}}">
 
                 <div class="text-fade text-size-small pull-end margin-top" data-ls-bind="{{project-function-executions.sum}} executions found"></div>
@@ -337,7 +337,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                         </td>
                                         <td data-title="">
                                             <div data-ls-if="{{execution.status}} === 'completed' || {{execution.status}} === 'failed'" data-title="">
-                                                
+
                                                 <button class="desktops-only pull-end link margin-start text-danger" data-ls-ui-trigger="execution-stderr-{{execution.$id}}">Errors</button>
                                                 <button class="desktops-only pull-end link margin-start" data-ls-ui-trigger="execution-stdout-{{execution.$id}}">Output</button>
 
@@ -452,8 +452,8 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                     <input name="name" id="function-name" type="text" autocomplete="off" data-ls-bind="{{project-function.name}}" data-forms-text-direction required placeholder="Function Name" maxlength="128" />
 
                                     <label for="execute">Execute Access <span class="tooltip small" data-tooltip="Choose who can execute this function using the client API."><i class="icon-info-circled"></i></span> <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
-                                    <input type="hidden" id="execute" name="execute" data-forms-tags data-cast-to="json" data-ls-bind="{{project-function.$permissions.execute}}" placeholder="User ID, Team ID or Role" />
-                                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                                    <input type="hidden" id="execute" name="execute" data-forms-tags data-cast-to="json" data-ls-bind="{{project-function.execute}}" placeholder="User ID, Team ID or Role" />
+                                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
 
                                     <label for="timeout">Timeout (seconds) <span class="tooltip small" data-tooltip="Limit the execution time of your function."><i class="icon-info-circled"></i></span></label>
                                     <input name="timeout" id="function-timeout" type="number" autocomplete="off" data-ls-bind="{{project-function.timeout}}" min="1" max="<?php echo $this->escape($timeout); ?>" data-cast-to="integer" />
@@ -463,18 +463,18 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                                 <section class="margin-bottom" data-forms-select-all>
                                     <label for="events" class="margin-bottom">Events <span class="tooltip small" data-tooltip="Choose which events should trigger this function."><i class="icon-info-circled"></i></span></label>
                                     <div class="row responsive thin margin-top-small">
-                                        <?php foreach ($events as $i => $event) : ?>
+                                        <?php foreach ($events as $i => $event): ?>
                                             <div class="col span-6 text-one-liner margin-bottom text-height-large text-size-small" title="<?php echo $event; ?>">
-                                                <input type="checkbox" name="events" data-ls-bind="{{project-function.events}}" id="<?php echo $event; ?>" value="<?php echo $event; ?>" />
+                                                <input type="checkbox" name="events" data-ls-bind="{{project-function.events}}" id="<?php echo $event; ?>" value="<?php echo $event; ?>" data-by-key="true" />
                                                 &nbsp;
                                                 <label class="inline" for="<?php echo $event; ?>"><?php echo $event; ?></label>
                                             </div>
-                                            <?php if (($i + 1) % 2 === 0) : ?>
+                                            <?php if (($i + 1) % 2 === 0): ?>
                                             </div>
                                             <div class="row responsive thin">
-                                            <?php endif; ?>
+                                            <?php endif;?>
 
-                                        <?php endforeach; ?>
+                                        <?php endforeach;?>
                                     </div>
                                 </section>
 
@@ -631,7 +631,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 data-failure="alert"
                 data-failure-param-alert-text="Failed to create function tag"
                 data-failure-param-alert-classname="error">
-                
+
                 <input type="hidden" name="functionId" data-ls-bind="{{router.params.id}}" />
 
                 <label for="tag-command">Command</label>
@@ -649,5 +649,5 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     </ul>
 
 
-    
+
 </div>

app/views/console/functions/index.phtml

@@ -34,8 +34,8 @@ $runtimes = $this->getParam('runtimes', []);
                 </div>
 
                 <div data-ls-if="0 != {{project-functions.functions.length}}">
-                    <div class="margin-bottom-small margin-end-small text-align-end text-size-small margin-top-negative"><span data-ls-bind="{{project-functions.sum}}"></span> functions found</div>
-                    
+                    <div class="margin-bottom-small text-align-end text-size-small margin-top-negative text-fade"><span data-ls-bind="{{project-functions.sum}}"></span> functions found</div>
+
                     <div class="box margin-bottom">
                         <ul data-ls-loop="project-functions.functions" data-ls-as="function" class="list">
                             <li class="clear">
@@ -105,18 +105,28 @@ $runtimes = $this->getParam('runtimes', []);
                             data-failure="alert"
                             data-failure-param-alert-text="Failed to create function"
                             data-failure-param-alert-classname="error">
+                            <label for="functionId">Function ID</label>
+                            <input
+                                type="hidden"
+                                data-custom-id
+                                data-id-type="auto"
+                                data-validator="functions.get"
+                                required
+                                maxlength="36"
+                                pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{1,36}$"
+                                name="functionId" />
 
                             <label for="name">Name</label>
                             <input type="text" id="name" name="name" required autocomplete="off" class="margin-bottom" maxlength="128" />
-                            
+
                             <label for="runtime">Runtimes</label>
                             <select name="runtime" id="runtime" required class="margin-bottom-xl">
-                                <?php foreach($runtimes as $key => $runtime): ?>
+                                <?php foreach ($runtimes as $key => $runtime): ?>
                                     <option value="<?php echo $this->escape($key); ?>"><?php echo $this->escape($runtime['name']); ?> <?php echo $this->escape($runtime['version']); ?></option>
-                                <?php endforeach; ?>
+                                <?php endforeach;?>
                             </select>
 
-                            <input id="execute" name="execute" value="" hidden/>
+                            <input id="execute" name="execute" value="" hidden />
 
                             <footer>
                                 <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>

app/views/console/home/index.phtml

@@ -1,6 +1,6 @@
 <?php
 $graph = $this->getParam('graph', false);
-$usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
+$usageStatsEnabled = $this->getParam('usageStatsEnabled', true);
 ?>
 
 <div class="cover margin-bottom-small">
@@ -18,7 +18,6 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <li class="pull-start margin-end margin-bottom-small"><a data-ls-attrs="href=/console/settings?project={{router.params.project}}" class="link-animation-enabled"><i class="icon-cog"></i> &nbsp;Settings</a> &nbsp;&nbsp;</li>
             <li class="pull-start margin-end margin-bottom-small"><a data-ls-attrs="href=/console/keys?project={{router.params.project}}" class="link-animation-enabled"><i class="icon-key-inv"></i> &nbsp;API Keys</a> &nbsp;&nbsp;</li>
             <li class="pull-start margin-end margin-bottom-small"><a data-ls-attrs="href=/console/webhooks?project={{router.params.project}}" class="link-animation-enabled"><i class="icon-link"></i> &nbsp;Webhooks</a> &nbsp;&nbsp;</li>
-            <li class="pull-start margin-end margin-bottom-small"><a data-ls-attrs="href=/console/tasks?project={{router.params.project}}" class="link-animation-enabled"><i class="icon-clock"></i> &nbsp;Tasks</a> &nbsp;&nbsp;</li>
         </ul>
 
         <div class="margin-bottom phones-only">&nbsp;</div>
@@ -37,6 +36,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     data-analytics-label="Usage 24h"
                     data-service="projects.getUsage"
                     data-event="submit"
+                    data-scope="console"
                     data-name="usage"
                     data-param-project-id="{{router.params.project}}"
                     data-param-range="24h"
@@ -53,6 +53,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     data-analytics-label="Usage 30d"
                     data-service="projects.getUsage"
                     data-event="submit"
+                    data-scope="console"
                     data-name="usage"
                     data-param-project-id="{{router.params.project}}"
                     data-scope="console">
@@ -68,6 +69,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     data-analytics-label="Usage 90d"
                     data-service="projects.getUsage"
                     data-event="submit"
+                    data-scope="console"
                     data-name="usage"
                     data-param-project-id="{{router.params.project}}"
                     data-param-range="90d"
@@ -77,7 +79,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '90d'" disabled>90d</button>
             </div>
-        <?php endif; ?>
+        <?php endif;?>
     </div>
     <div
         data-service="projects.getUsage"
@@ -91,11 +93,11 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <div class="row responsive">
                     <div class="col span-9">
                         <div class="chart pull-end">
-                            <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Requests=usage.requests.data" />
+                            <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Requests=requests" />
                         </div>
 
                         <div class="chart-metric">
-                            <div class="value margin-bottom-small"><span class="sum" data-ls-bind="{{usage.requests.total|statsTotal}}">N/A</span></div>
+                            <div class="value margin-bottom-small"><span class="sum" data-ls-bind="{{usage.requests|statsGetLast|statsTotal}}">N/A</span></div>
                             <div class="unit margin-start-no margin-bottom-small">Requests</div>
                         </div>
                     </div>
@@ -113,27 +115,29 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             <div class="box dashboard">
                 <div class="row responsive">
                     <div class="col span-3">
-                        <div class="value"><span class="sum" data-ls-bind="{{usage.documents.total|statsTotal}}" data-default="0">0</span></div>
+                        <div class="value"><span class="sum" data-ls-bind="{{usage.documents|statsGetLast|statsTotal}}" data-default="0">0</span></div>
                         <div class="margin-top-small"><b class="text-size-small unit">Documents</b></div>
                     </div>
                     <div class="col span-3">
                         <div class="value">
-                            <span class="sum" data-ls-bind="{{usage.storage.total|humanFileSize}}" data-default="0">0</span>
-                            <span data-ls-bind="{{usage.storage.total|humanFileUnit}}" class="text-size-small unit"></span>
+                            <span class="sum" data-ls-bind="{{usage.storage|statsGetLast|humanFileSize}}" data-default="0">0</span>
+                            <span data-ls-bind="{{usage.storage|statsGetLast|humanFileUnit}}" class="text-size-small unit"></span>
                         </div>
                         <div class="margin-top-small"><b class="text-size-small unit">Storage</b></div>
                     </div>
                     <div class="col span-3">
-                        <div class="value"><span class="sum" data-ls-bind="{{usage.users.total}}" data-default="0">0</span></div>
+                        <div class="value"><span class="sum" data-ls-bind="{{usage.users|statsGetLast|statsTotal}}" data-default="0">0</span></div>
                         <div class="margin-top-small"><b class="text-size-small unit">Users</b></div>
                     </div>
                     <div class="col span-3">
-                        <div class="value"><span class="sum" data-ls-bind="{{usage.functions.total|statsTotal}}" data-default="0">0</span></div>
+                        <div class="value"><span class="sum" data-ls-bind="{{usage.functions|statsGetLast|statsTotal}}" data-default="0">0</span></div>
                         <div class="margin-top-small"><b class="text-size-small unit">Executions</b></div>
                     </div>
                 </div>
             </div>
         </div>
+
+        <p class="margin-top-small"><i class="icon-info-circled"></i> Data is aggregated and updated every 15 minutes</p>
     </div>
     </div>
 </div>
@@ -181,11 +185,11 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <div>
                     <div class="pull-start margin-end avatar-container">
                         <img src="" data-ls-attrs="src=/images/clients/{{platform.type}}.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Platform Logo" class="avatar" loading="lazy" width="60" height="60" />
-                        
+
                         <div data-ls-if="{{platform.type}} === 'flutter-ios'" class="corner">
                             <img src="" data-ls-attrs="src=/images/clients/flutter.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Logo" class="avatar xs" loading="lazy" width="30" height="30" />
                         </div>
-                        
+
                         <div data-ls-if="{{platform.type}} === 'flutter-android'" class="corner">
                             <img src="" data-ls-attrs="src=/images/clients/flutter.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Android Logo" class="avatar xs" loading="lazy" width="30" height="30" />
                         </div>
@@ -297,7 +301,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
         <label for="hostname">Hostname <span class="tooltip large" data-tooltip="The hostname that your website will use to interact with the <?php echo APP_NAME; ?> APIs in production or development environments. No port number required."><i class="icon-question"></i></span></label>
         <input name="hostname" type="text" class="margin-bottom" autocomplete="off" placeholder="localhost" required>
-        
+
         <div class="info margin-top margin-bottom">
             <div class="text-bold margin-bottom-small">Next Steps</div>
 
@@ -308,7 +312,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             </div>
         </div>
 
-        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
     </form>
 </div>
 
@@ -337,10 +341,10 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
         <label for="hostname">Hostname <span class="tooltip large" data-tooltip="The hostname that your website will use to interact with the <?php echo APP_NAME; ?> APIs in production or development environments. No port number required."><i class="icon-question"></i></span></label>
         <input name="hostname" type="text" class="margin-bottom" autocomplete="off" placeholder="localhost" data-ls-bind="{{platform.hostname}}" required />
-        
+
         <hr />
 
-        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Back</button>
+        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Cancel</button>
     </form>
 </script>
 
@@ -376,7 +380,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
         <hr />
 
-        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
     </form>
 </div>
 
@@ -416,7 +420,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <hr />
 
-                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </form>
 
         </li>
@@ -450,7 +454,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <hr />
 
-                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </form>
         </li>
         <li>
@@ -483,7 +487,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <hr />
 
-                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </form>
         </li>
         <li>
@@ -516,7 +520,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <hr />
 
-                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </form>
         </li>
         <li>
@@ -549,7 +553,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <hr />
 
-                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+                <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </form>
         </li>
     </ul>
@@ -725,7 +729,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         
         <hr />
 
-        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Back</button>
+        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Cancel</button>
     </form>
 </script>
 
@@ -785,10 +789,42 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
         <label data-ls-attrs="for=key-{{platform.$id}}">Package Name <span class="tooltip large" data-tooltip="Your package name is generally the applicationId in your app-level build.gradle file."><i class="icon-question"></i></span></label>
         <input name="key" type="text" class="margin-bottom" autocomplete="off" placeholder="com.company.appname" data-ls-bind="{{platform.key}}" required />
-        
+
         <hr />
 
-        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Back</button>
+        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Cancel</button>
+    </form>
+</script>
+
+<script type="text/html" id="template-desktop-update">
+    <form
+        data-analytics
+        data-analytics-event="submit"
+        data-analytics-category="console"
+        data-analytics-label="Update Project Platform (Flutter / Desktop)"
+        data-service="projects.updatePlatform"
+        data-scope="console"
+        data-event="submit"
+        data-success="alert,trigger"
+        data-success-param-alert-text="Updated platform successfully"
+        data-success-param-trigger-events="projects.updatePlatform"
+        data-failure="alert"
+        data-failure-param-alert-text="Failed to update platform"
+        data-failure-param-alert-classname="error">
+
+        <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+
+        <input type="hidden" name="platformId" data-ls-bind="{{platform.$id}}" />
+
+        <label data-ls-attrs="for=name-{{platform.$id}}">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" data-ls-attrs="id=name-{{platform.$id}}" name="name" required autocomplete="off" data-ls-bind="{{platform.name}}" placeholder="My desktop app" maxlength="128" />
+
+        <label data-ls-attrs="for=key-{{platform.$id}}">App Name <span class="tooltip large" data-tooltip="Your application name"><i class="icon-question"></i></span></label>
+        <input name="key" type="text" class="margin-bottom" autocomplete="off" placeholder="appname" data-ls-bind="{{platform.key}}" required />
+
+        <hr />
+
+        <button type="submit">Update</button> &nbsp; <button data-ls-ui-trigger="modal-close" type="button" class="reverse">Cancel</button>
     </form>
 </script>
 
@@ -864,8 +900,16 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
     <div data-ls-template="template-android-update" data-type="script"></div>
 </script>
 
+<script type="text/html" id="template-flutter-linux-update">
+    <div data-ls-template="template-desktop-update" data-type="script"></div>
+</script>
+
 <script type="text/html" id="template-flutter-macos-update">
-    <div data-ls-template="template-macos-update" data-type="script"></div>
+    <div data-ls-template="template-ios-update" data-type="script"></div>
+</script>
+
+<script type="text/html" id="template-flutter-windows-update">
+    <div data-ls-template="template-desktop-update" data-type="script"></div>
 </script>
 
 <script type="text/html" id="template-apple-ios-update">

app/views/console/index.phtml

@@ -39,7 +39,7 @@ $home = $this->getParam('home', '');
             <li class="margin-bottom">
                 <a data-ls-attrs="href=/console/home?project={{project.$id}}" class="box">
                     <div data-ls-bind="{{project.name}}" class="text-one-liner margin-bottom-tiny text-bold">&nbsp;</div>
-                    
+
                     <p data-ls-if="({{project.platforms.length}})" class="text-fade text-size-small" data-ls-bind="{{project.platforms.length}} apps"></p>
                     <p data-ls-if="(!{{project.platforms.length}})" class="text-fade text-size-small">&nbsp;</p>
 
@@ -81,7 +81,7 @@ $home = $this->getParam('home', '');
                 <button name="offset" data-paging-next data-offset="{{router.params.offset}}" data-sum="{{console-projects.sum}}" class="margin-start round small" aria-label="Next"><i class="icon-right-open"></i></button>
             </form>
         </div>
-        
+
         <button data-ls-ui-trigger="create-project">Create Project</button>
     </div>
 
@@ -89,9 +89,9 @@ $home = $this->getParam('home', '');
         <div class="col span-6 margin-bottom">
             <div class="box line community">
                 <h3 class="margin-bottom-small text-size-normal">Join The Community</h3>
-        
+
                 <p class="text-fade">Join Appwrite growing developers community channels.</p>
-        
+
                 <a href="<?php echo APP_SOCIAL_TWITTER; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Twitter"
                     data-analytics
                     data-analytics-event="click"
@@ -122,7 +122,7 @@ $home = $this->getParam('home', '');
         <div class="col span-6 margin-bottom">
             <div class="box line">
                 <h3 class="margin-bottom-small text-size-normal">Read The Docs</h3>
-            
+
                 <p class="text-fade">Take full advantage of Appwrite APIs and tools for your new project.</p>
 
                 <a data-ls-attrs="href={{env.HOME}}/docs" target="_blank" rel="noopener"><i class="icon-angle-circled-right margin-start-negative-tiny margin-end-tiny"></i> Full Documentation</a>

app/views/console/keys/index.phtml

@@ -57,24 +57,24 @@ $scopes = $this->getParam('scopes', []);
                         <section data-forms-select-all>
                             <label data-ls-attrs="for=scopes-{{key.$id}}">Scopes (<a data-ls-attrs="href={{env.HOME}}/docs/keys" target="_blank" rel="noopener">Learn more</a>)</label>
                             <div class="row responsive thin">
-                                <?php foreach ($scopes as $i => $scope) : ?>
+                                <?php foreach ($scopes as $i => $scope): ?>
                                     <div class="col span-6 text-one-liner margin-bottom text-height-large text-size-small" title="<?php echo $scope; ?>">
-                                        <input data-ls-attrs="id=scope-<?php echo $scope; ?>" type="checkbox" name="scopes" data-ls-bind="{{key.scopes}}" value="<?php echo $scope; ?>" />
+                                        <input data-ls-attrs="id=scope-<?php echo $scope; ?>" type="checkbox" name="scopes" data-ls-bind="{{key.scopes}}" value="<?php echo $scope; ?>" data-by-key="true" />
                                         &nbsp;
                                         <label class="inline" for="scope-<?php echo $scope; ?>"><?php echo $scope; ?></label>
                                     </div>
-                                    <?php if (($i + 1) % 2 === 0) : ?>
+                                    <?php if (($i + 1) % 2 === 0): ?>
                                     </div>
                                     <div class="row responsive thin">
-                                    <?php endif; ?>
-    
-                                <?php endforeach; ?>
+                                    <?php endif;?>
+
+                                <?php endforeach;?>
                             </div>
                         </section>
 
                         <hr class="margin-top-no" />
 
-                        <button type="submit">Save</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                        <button type="submit">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
                     </form>
                 </div>
 
@@ -114,7 +114,7 @@ $scopes = $this->getParam('scopes', []);
                             <div class="input-copy">
                                 <textarea disabled style="height: 130px; line-height: 26px" data-forms-copy data-ls-bind="{{key.secret}}"></textarea>
                             </div>
-                            
+
                             <hr />
 
                             <div>
@@ -160,18 +160,18 @@ $scopes = $this->getParam('scopes', []);
                 <section data-forms-select-all>
                     <label for="scopes">Scopes (<a data-ls-attrs="href={{env.HOME}}/docs/keys" target="_blank" rel="noopener">Learn more</a>)</label>
                     <div class="row responsive thin">
-                        <?php foreach ($scopes as $i => $scope) : ?>
+                        <?php foreach ($scopes as $i => $scope): ?>
                             <div class="col span-6 text-one-liner margin-bottom text-height-large text-size-small" title="<?php echo $scope; ?>">
-                                <input type="checkbox" name="scopes" id="<?php echo $scope; ?>" value="<?php echo $scope; ?>" /> 
-                                &nbsp; 
+                                <input type="checkbox" name="scopes" id="<?php echo $scope; ?>" value="<?php echo $scope; ?>" data-by-key="true" />
+                                &nbsp;
                                 <label class="inline" for="<?php echo $scope; ?>"><?php echo $scope; ?></label>
                             </div>
-                            <?php if (($i + 1) % 2 === 0) : ?>
+                            <?php if (($i + 1) % 2 === 0): ?>
                             </div>
                             <div class="row responsive thin">
-                            <?php endif; ?>
+                            <?php endif;?>
 
-                        <?php endforeach; ?>
+                        <?php endforeach;?>
                     </div>
                 </section>
 

app/views/console/settings/index.phtml

@@ -1,9 +1,8 @@
 <?php
-
+$services = $this->getParam('services', []);
 $customDomainsEnabled = $this->getParam('customDomainsEnabled', false);
 $customDomainsTarget = $this->getParam('customDomainsTarget', false);
 $smtpEnabled = $this->getParam('smtpEnabled', false);
-
 ?>
 <div class="cover">
     <h1 class="zone xl margin-bottom-large">
@@ -18,7 +17,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
     data-service="projects.get"
     data-scope="console"
     data-name="console-project"
-    data-event="load"
+    data-event="load,projects.update"
     data-param-project-id="{{router.params.project}}"
     data-success="trigger"
     data-success-param-trigger-events="projects.get">
@@ -44,28 +43,28 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                 data-event="submit"
                                 data-param-project-id="{{router.params.project}}"
                                 data-success="alert,trigger"
-                                data-success-param-alert-text="Saved project successfully"
+                                data-success-param-alert-text="Updated project successfully"
                                 data-success-param-trigger-events="projects.update"
                                 data-failure="alert"
                                 data-failure-param-alert-text="Failed to update project"
                                 data-failure-param-alert-classname="error">
 
                                 <input name="$id" type="hidden" data-ls-bind="{{console-project.$id}}" />
-                                
+
                                 <label for="name">Name</label>
                                 <input name="name" id="name" type="text" autocomplete="off" data-ls-bind="{{console-project.name}}" data-forms-text-direction required maxlength="128" />
 
                                 <label for="logo">Project Logo</label>
 
                                 <div class="text-align-center clear">
-                                    <input type="hidden" name="logo" data-ls-bind="{{console-project.logo}}" data-read="<?php echo $this->escape(json_encode(['*'])); ?>" data-write="<?php echo $this->escape(json_encode(['team:{{console-project.teamId}}'])); ?>" data-accept="image/*" data-forms-upload="" data-label-button="Upload" data-preview-alt="Project Logo" data-scope="console" data-default="">
+                                    <input type="hidden" name="logo" data-ls-bind="{{console-project.logo}}" data-read="<?php echo $this->escape(json_encode(['role:all'])); ?>" data-write="<?php echo $this->escape(json_encode(['team:{{console-project.teamId}}'])); ?>" data-accept="image/*" data-forms-upload="" data-label-button="Upload" data-preview-alt="Project Logo" data-scope="console" data-default="">
                                 </div>
 
                                 <hr />
 
                                 <!-- <div data-ls-if="0 !== {{console-domains|activeDomainsCount}}">
                                     <label for="name">Custom API Endpoints</label>
-                                    
+
                                     <ul data-ls-loop="console-domains" data-ls-as="domain">
                                         <li>
                                             <div class="input-copy" data-ls-if="true === {{domain.verification}} && {{domain.certificateId}}">
@@ -74,9 +73,9 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                         </li>
                                     </ul>
                                 </div> -->
-                                
 
-                                <button class="" type="submit">Save</button>
+
+                                <button class="" type="submit">Update</button>
                             </form>
                         </div>
 
@@ -111,14 +110,14 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                                 <div data-ui-modal class="modal box close width-small height-small" data-button-text="Delete Project" data-button-class="danger reverse">
                                     <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
-                                    
+
                                     <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 danger fill">Delete Project</button>
@@ -153,7 +152,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                     data-event="submit"
                     data-param-project-id="{{router.params.project}}"
                     data-success="alert,trigger"
-                    data-success-param-alert-text="Saved project successfully"
+                    data-success-param-alert-text="Updated project successfully"
                     data-success-param-trigger-events="projects.update"
                     data-failure="alert"
                     data-failure-param-alert-text="Failed to update project"
@@ -192,22 +191,78 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                         <hr />
 
-                        <button class="" type="submit">Save</button>
+                        <button class="" type="submit">Update</button>
                     </div>
                 </form>
             </li> -->
+            <li data-state="/console/settings/services?project={{router.params.project}}">
+                <h2>Services</h2>
+
+                <p class="text-fade margin-bottom">Choose services you wish to enable or disable.</p>
+                <ul class="tiles cell-3 margin-bottom-small">
+                    <?php foreach($services as $index => $service):
+                        $key = $service['key'] ?? '';
+                        $name = $service['name'] ?? '';
+                        $icon = $service['icon'] ?? '';
+                        $docs = $service['docsUrl'] ?? '';
+                        ?>
+                    <li class="">
+                        <div class="box padding-small margin-bottom clear">
+                            <div class="clear">
+                                <form
+                                    data-analytics
+                                    data-analytics-activity
+                                    data-analytics-event="submit"
+                                    data-analytics-category="console"
+                                    data-analytics-label="Update Project service Status (<?php echo $this->escape($name); ?>)"
+                                    data-service="projects.updateServiceStatus"
+                                    data-scope="console"
+                                    data-event="change"
+                                    data-confirm="Are you sure you want to change the status of the <?php echo $this->escape($name); ?> service?"
+                                    data-param-project-id="{{router.params.project}}"
+                                    data-success="alert,trigger"
+                                    data-success-param-alert-text="Updated project service status successfully"
+                                    data-success-param-trigger-events="projects.update"
+                                    data-failure="alert"
+                                    data-failure-param-alert-text="Failed to update project service status settings"
+                                    data-failure-param-alert-classname="error">
+                                    <input name="service" id="<?php echo $this->escape($key); ?>" type="hidden" autocomplete="off" value="<?php echo $this->escape($key); ?>">
+
+                                    <input name="status" type="hidden" data-forms-switch data-ls-bind="{{console-project.serviceStatusFor<?php echo ucFirst($this->escape($key)); ?>}}" data-cast-to="boolean" class="pull-end" />
+                                </form>
+
+                                <img src="<?php echo $this->escape($icon); ?>?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="" class="pull-start provider margin-end" />
+
+                                <span class="text-size-small text-bold"><?php echo $this->escape($name); ?></span>
+
+                                <?php if($docs): ?>
+                                <p class="margin-bottom-no text-one-liner text-size-small">
+                                    <a href="<?php echo $this->escape($docs); ?>" target="_blank" rel="noopener">Docs<i class="icon-link-ext"></i></a>
+                                </p>
+                                <?php endif; ?>
+                            </div>
+
+                            <hr />
+
+                            <div class="text-align-center text-size-small text-bold text-success" data-ls-if="!!({{console-project.serviceStatusFor<?php echo ucFirst($this->escape($key)); ?>}})">Enabled</div>
+                            <div class="text-align-center text-size-small text-bold text-danger" data-ls-if="(!{{console-project.serviceStatusFor<?php echo ucFirst($this->escape($key)); ?>}})">Disabled</div>
+                        </div>
+                    </li>
+                    <?php endforeach; ?>
+                </ul>
+            </li>
             <li data-state="/console/settings/domains?project={{router.params.project}}">
-                
+
                 <?php if(!$customDomainsEnabled): ?>
                     <h2 style="display: none;">Custom Domains</h2>
 
                     <div class="box line margin-bottom">
                         <h3>Enable Custom Domains</h3>
-                        
-                        <p>To enable <?php echo APP_NAME; ?>'s custom domain feature, you have to start your server instance with a public accessable domain name.</p>
-                        
-                        <p>Start your <?php echo APP_NAME; ?> server container with the <b>_APP_DOMAIN_TARGET</b> enviornment variable set with a public accessable domain name that resolves to your <?php echo APP_NAME; ?> server setup.</p>
-                        <p class="margin-bottom-no">The <?php echo APP_NAME; ?> server will use your target domain to validate new custom domains and will automatically generate SSL certificates for your new domains using letsencrypt certbot.</p>
+
+                        <p>To enable <?php echo APP_NAME; ?>'s custom domain feature, you have to start your server instance with a public accessible domain name.</p>
+
+                        <p>Start your <?php echo APP_NAME; ?> server container with the <b>_APP_DOMAIN_TARGET</b> environment variable set with a public accessible domain name that resolves to your <?php echo APP_NAME; ?> server setup.</p>
+                        <p class="margin-bottom-no">The <?php echo APP_NAME; ?> server will use your target domain to validate new custom domains and will automatically generate SSL certificates for your new domains using Let'sencrypt Certbot.</p>
                     </div>
                 <?php endif; ?>
 
@@ -237,7 +292,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                         <th width="200">Domain Name</th>
                                         <th width="160">TLS</th>
                                         <th></th>
-                                        <th width="40"></th>
+                                        <th width="80"></th>
                                     </tr>
                                 </thead>
                                 <tbody data-ls-loop="console-domains.domains" data-ls-as="domain">
@@ -257,7 +312,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                         <td data-title="">
                                             <button class="link text-size-small" data-ls-if="true === {{domain.verification}}" data-ls-ui-trigger="dns-settings-{{domain.$id}}">DNS Settings</button>
                                             <button class="link text-size-small" data-ls-if="true !== {{domain.verification}}" data-ls-ui-trigger="dns-settings-{{domain.$id}}">Verify Domain</button>
-                                            
+
                                             <div data-ui-modal class="modal box close" data-button-alias="none" data-open-event="dns-settings-{{domain.$id}}" xdata-close-event="dns-settings-close-{{domain.$id}}">
                                                 <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
@@ -271,7 +326,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                                 <ol class="bullets">
                                                     <li>
                                                         <p>Add a new CNAME record in your DNS providers settings to point your new subdomain to your <?php echo APP_NAME; ?> server with the following value:</p>
-                                                        
+
                                                         <div class="ide margin-bottom-small">
                                                             <pre class="line-numbers"><code class="prism language-javascript" data-prism><?php echo $this->print($customDomainsTarget, 'escape'); ?></code></pre>
                                                         </div>
@@ -304,7 +359,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                                                             <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                                                             <input type="hidden" name="domainId" data-ls-bind="{{domain.$id}}" />
-                                                            
+
                                                             <button class="margin-top-small">Confirm & Verify</button>
                                                         </form>
                                                     </li>
@@ -339,7 +394,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                                                 <input type="hidden" name="domainId" data-ls-bind="{{domain.$id}}" />
 
-                                                <button class="danger round reverse small"><i class="icon-trash"></i></button>
+                                                <button class="danger small">Delete</button>
                                             </form>
                                         </td>
                                     </tr>
@@ -373,7 +428,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                                     <label for="name">Domain Name</label>
                                     <input type="text" class="full-width" id="domain" name="domain" placeholder="appwrite.example.com" required autocomplete="off" title="Enter a valid domain name" pattern="^([a-zA-Z0-9][a-zA-Z0-9-_]*\.)*[a-zA-Z0-9]*[a-zA-Z0-9-_]*[[a-zA-Z0-9]+$" />
-                                    
+
                                     <hr />
 
                                     <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
@@ -389,7 +444,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                 <div class="zone xl"
                     data-service="teams.getMemberships"
                     data-scope="console"
-                    data-event="load,teams.createMembership,teams.deleteMembership"
+                    data-event="load,teams.createMembership,teams.deleteMembership,teams.createMembership.resent"
                     data-name="members"
                     data-param-team-id="{{console-project.teamId}}"
                     data-success="trigger"
@@ -408,6 +463,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     data-scope="console"
                                     data-event="submit"
                                     data-success="alert,trigger"
+                                    data-confirm="Are you sure you want to remove that user from the team?"
                                     data-success-param-alert-text="Member Removed Successfully"
                                     data-success-param-trigger-events="teams.deleteMembership"
                                     data-failure="alert"
@@ -419,7 +475,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                                     <button class="danger">Leave</button>
                                 </form>
-                                
+
                                 <div data-ls-if="false === {{member.confirm}}" class="pull-end margin-end">
                                     <form class="pull-end"
                                         data-analytics
@@ -495,10 +551,10 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                             <input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
                             <input name="url" type="hidden" data-ls-bind="{{env.ENDPOINT}}/auth/join?project={{router.params.project}}" />
-                            
+
                             <label for="email">Email</label>
                             <input name="email" id="email" type="email" autocomplete="email" required>
-                            
+
                             <label for="team-name">Name <small>(optional)</small></label>
                             <input name="name" id="team-name" type="text" autocomplete="name" maxlength="128" />
 

app/views/console/storage/index.phtml

@@ -14,7 +14,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
 
 <div class="zone xl">
     <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
-        <li data-state="/console/database?project={{router.params.project}}">
+        <li data-state="/console/storage?project={{router.params.project}}">
             <h2 class="margin-bottom">Files</h2>
 
             <form class="box padding-small margin-bottom search"
@@ -33,7 +33,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                         <input name="search" id="searchFiles" type="search" autocomplete="off" placeholder="Search" class="margin-bottom-no" data-ls-bind="{{router.params.search}}">
                     </div>
                     <div class="col span-2 desktops-only">
-                        <button class="fill" title="Search" aria-label="Search"><i class="icon-search"></i></button>
+                        <button class="fill" title="Search" aria-label="Search">Search</button>
                     </div>
                 </div>
             </form>
@@ -55,7 +55,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                 </div>
 
                 <div data-ls-if="0 != {{project-files.sum}}">
-                    <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-files.sum}}"></span> files found</div>
+                    <div class="margin-bottom-small text-align-end text-size-small text-fade"><span data-ls-bind="{{project-files.sum}}"></span> files found</div>
 
                     <div class="box margin-bottom">
                         <table class="vertical">
@@ -106,12 +106,12 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                         <input type="hidden" data-ls-attrs="id=file-folderId-{{file.$id}}" name="folderId" data-cast-to="integer" value="1">
 
                                                         <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                                                        <input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.read}}" placeholder="User ID, Team ID or Role" />
-                                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-                                                        
+                                                        <input type="hidden" data-ls-attrs="id=file-read-{{file.$id}}" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$read}}" placeholder="User ID, Team ID or Role" />
+                                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
+
                                                         <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                                                        <input type="hidden" data-ls-attrs="id=file-write-{{file.$id}}" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$permissions.write}}" placeholder="User ID, Team ID or Role" />
-                                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                                                        <input type="hidden" data-ls-attrs="id=file-write-{{file.$id}}" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{file.$write}}" placeholder="User ID, Team ID or Role" />
+                                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
                                                     </form>
 
                                                     <form class="strip"
@@ -136,7 +136,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                 </div>
                                                 <div class="col span-4 text-size-small">
                                                     <div class="margin-bottom-small">File Preview</div>
-                                                    
+
                                                     <div class="margin-bottom-small">
                                                         <img src="" class="file-preview" data-ls-attrs="src={{env.ENDPOINT}}/v1/storage/files/{{file.$id}}/preview?width=350&height=250&project={{router.params.project}}&mode=admin" loading="lazy" width="225" height="160" />
                                                     </div>
@@ -237,18 +237,30 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                         data-failure-param-alert-classname="error">
                         <input type="hidden" name="folderId" id="files-folderId" data-cast-to="integer" value="1">
 
+                        <label for="fileId">File ID</label>
+                        <input
+                            type="hidden"
+                            data-custom-id
+                            data-id-type="auto"
+                            data-validator="storage.getFile"
+                            required
+                            maxlength="36"
+                            pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{1,36}$"
+                            name="fileId"
+                            id="fileId" />
+
                         <label for="file-read">File</label>
                         <input type="file" name="file" id="file-file" size="1" required>
 
                         <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
 
                         <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                        <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['*'])); ?>" placeholder="User ID, Team ID or Role" />
-                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-                        
+                        <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['role:all'])); ?>" placeholder="User ID, Team ID or Role" />
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
+
                         <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
                         <input type="hidden" id="file-write" name="write" data-forms-tags data-cast-to="json" value="" placeholder="User ID, Team ID or Role" />
-                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add 'role:all' for wildcard access</div>
 
                         <footer>
                             <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
@@ -257,5 +269,66 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                 </div>
             </div>
         </li>
+        <li data-state="/console/storage/usage?project={{router.params.project}}">
+            <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '90d'"
+                    data-service="storage.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-range="90d">
+                <button class="tick">90d</button>
+            </form>
+
+            <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '90d'" disabled>90d</button>
+
+            <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '30d'"
+                data-service="storage.getUsage"
+                data-event="submit"
+                data-name="usage">
+                <button class="tick">30d</button>
+            </form>
+
+            <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '30d'" disabled>30d</button>
+
+            <form class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '24h'"
+                data-service="storage.getUsage"
+                data-event="submit"
+                data-name="usage"
+                data-param-range="24h">
+                <button class="tick">24h</button>
+            </form>
+
+            <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
+
+            <h2>Usage</h2>
+
+            <div
+                data-service="storage.getUsage"
+                data-event="load"
+                data-name="usage">
+                <div class="box margin-bottom-small">
+                    <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                        <div class="chart background-image-no border-no margin-bottom-no">
+                            <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Total Files=files" data-height="140" data-show-y-axis="true" />
+                        </div>
+                    </div>
+                </div>
+
+                <ul class="chart-notes margin-bottom-large">
+                    <li>Total Files <span data-ls-bind="({{usage.files|statsGetLast|statsTotal}})"></span></li>
+                </ul>
+
+                <div class="box margin-bottom-small">
+                    <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                        <div class="chart background-image-no border-no margin-bottom-no">
+                            <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Total Storage=storage" data-height="140" data-show-y-axis="true" />
+                        </div>
+                    </div>
+                </div>
+
+                <ul class="chart-notes margin-bottom-large">
+                    <li>Total Storage (<span data-ls-bind="{{usage.storage|statsGetLast|humanFileSize}}"></span> <span data-ls-bind="{{usage.storage|statsGetLast|humanFileUnit}}"></span>)</li>
+                </ul>
+            </div>
+        </li>
     </ul>
 </div>

app/views/console/tasks/index.phtml

@@ -1,355 +0,0 @@
-<div class="cover margin-bottom-large">
-    <h1 class="zone xl margin-bottom-large">
-        <a data-ls-attrs="href=/console/home?project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> Home</a>
-        <br />
-
-        <span>Tasks</span>
-    </h1>
-</div>
-<div class="zone xl"
-    data-service="projects.listTasks"
-    data-scope="console"
-    data-event="load,projects.createTask,projects.updateTask,projects.deleteTask"
-    data-name="console-tasks"
-    data-param-project-id="{{router.params.project}}"
-    data-success="trigger"
-    data-success-param-trigger-events="projects.listTasks">
-
-    <div data-ls-if="0 === {{console-tasks.sum}} || undefined === {{console-tasks.sum}}" class="box margin-top margin-bottom">
-        <h3 class="margin-bottom-small text-bold">No Tasks Found</h3>
-
-        <p class="margin-bottom-no">You haven't created any tasks for your project yet.</p>
-    </div>
-
-    <div class="box y-scroll margin-bottom" data-ls-if="0 != {{console-tasks.sum}}">
-        <table class="full vertical">
-            <thead>
-                <tr>
-                    <th>Name</th>
-                    <th width="140">Status</th>
-                    <th width="180">Schedule</th>
-                    <th width="140"></th>
-                </tr>
-            </thead>
-            <tbody data-ls-loop="console-tasks.tasks" data-ls-as="task" class="list">
-                <tr>
-                    <td>
-                        <div class="margin-bottom-tiny text-one-liner">
-                            <span data-ls-attrs="title={{task.name}} ({{task.failures}} errors)" data-ls-bind="{{task.name}}"></span>
-
-                            <span data-ls-if="false === {{task.security}}">
-                                &nbsp; <span class="text-danger">SSL/TLS Disabled</span>
-                            </span>
-                            <span data-ls-if="0 !== {{task.failures}}">
-                                &nbsp; <span class="text-danger" data-ls-bind="({{task.failures}} errors)"></span>
-                            </span>
-                        </div>
-
-                        <a data-ls-attrs="href={{task.httpUrl}}" data-ls-bind="{{task.httpUrl}}" target="_blank" class="text-one-liner text-size-small"></a>
-                    </td>
-                    <td data-title="" style="vertical-align: middle">
-                        <span data-ls-if="'play' === {{task.status}}">
-                            <span class="tag green"><i class="icon-play"></i> Running &nbsp;</span>
-                        </span>
-                        <span data-ls-if="'play' !== {{task.status}}">
-                            <span class="tag red"><i class="icon-pause"></i> Paused &nbsp;</span>
-                        </span>
-                    </td>
-                    <td data-title="" style="vertical-align: middle" class="text-size-small text-fade">
-                        <span data-ls-bind="Next: {{task.next|dateTime}}"></span>
-
-                        <br />
-                    
-                        <span data-ls-if="undefined !== {{task.previous}} && {{task.previous}}">
-                            <span data-ls-bind="Prev: {{task.previous|dateTime}}"></span>
-
-                            <!-- <span data-ls-if="undefined !== {{task.delay}} && 59 < {{task.delay}}" class="text-danger margin-top-tiny">
-                                <small data-ls-bind="({{task.delay|ms2hum}} Delay)"></small>
-                            </span> -->
-                        </span>
-                        <small data-ls-if="undefined === {{task.previous}}" class="text-size-small">
-                            None.
-                        </small>
-                    </td>
-                    <td data-title="">
-                        <div data-ui-modal class="modal box sticky-footer close" data-button-alias="none" data-open-event="task-update-{{task.$id}}">
-                            <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                            <h1>Update Task</h1>
-
-                            <form
-                                data-analytics
-                                data-analytics-activity
-                                data-analytics-event="submit"
-                                data-analytics-category="console"
-                                data-analytics-label="Update Project Task"
-                                data-service="projects.updateTask"
-                                data-scope="console"
-                                data-event="submit"
-                                data-success="alert,trigger"
-                                data-success-param-alert-text="Updated task successfully"
-                                data-success-param-trigger-events="projects.updateTask"
-                                data-failure="alert"
-                                data-failure-param-alert-text="Failed to update task"
-                                data-failure-param-alert-classname="error">
-
-                                <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-                                <input type="hidden" name="taskId" data-ls-bind="{{task.$id}}" />
-
-                                <label data-ls-attrs="for=name-{{task.$id}}">Name</label>
-                                <input type="text" class="full-width" data-ls-attrs="id=name-{{task.$id}}" name="name" required autocomplete="off" data-ls-bind="{{task.name}}" maxlength="128" />
-
-                                <label data-ls-attrs="for=status-{{task.$id}}" class="margin-bottom">Status
-                                    <div class="margin-top-small">
-                                        <input name="status" type="radio" checked="checked" required data-ls-bind="{{task.status}}" value="play" /> &nbsp; <span>Play</span> &nbsp;
-                                        <input name="status" type="radio" required data-ls-bind="{{task.status}}" value="pause" /> &nbsp; <span>Pause</span> &nbsp;
-                                    </div>
-                                </label>
-
-                                <label data-ls-attrs="for=schedule-{{task.$id}}">Schedule (CRON Syntax)</label>
-                                <input type="text" class="full-width" data-ls-attrs="id=schedule-{{task.$id}}" name="schedule" required autocomplete="off" data-ls-bind="{{task.schedule}}" placeholder="* * * * *" />
-
-                                <div class="row responsive thin">
-                                    <div class="col span-4">
-                                        <label data-ls-attrs="for=httpMethod-{{task.$id}}">HTTP Method</label>
-                                        <select data-ls-attrs="id=httpMethod-{{task.$id}}" name="httpMethod" required data-ls-bind="{{task.httpMethod}}">
-                                            <option value="POST">POST</option>
-                                            <option value="GET">GET</option>
-                                            <option value="PUT">PUT</option>
-                                            <option value="PATCH">PATCH</option>
-                                            <option value="DELETE">DELETE</option>
-                                            <option value="CONNECT">CONNECT</option>
-                                            <option value="HEAD">HEAD</option>
-                                            <option value="TRACE">TRACE</option>
-                                            <option value="OPTIONS">OPTIONS</option>
-                                        </select>
-                                    </div>
-                                    <div class="col span-8">
-                                        <label data-ls-attrs="for=httpUrl-{{task.$id}}">HTTP URL</label>
-                                        <input type="url" class="full-width" data-ls-attrs="id=httpUrl-{{task.$id}}" name="httpUrl" required autocomplete="off" placeholder="https://example.com/callback" data-ls-bind="{{task.httpUrl}}" />
-                                    </div>
-                                </div>
-
-                                <div class="margin-bottom toggle" data-ls-ui-open data-button-aria="Advanced Options">
-                                    <i class="icon-plus pull-end margin-top-tiny"></i>
-                                    <i class="icon-minus pull-end margin-top-tiny"></i>
-
-                                    <h2 class="margin-bottom">
-                                        Advanced Options
-                                        <small class="text-size-small">(optional)</small>
-                                    </h2>
-
-                                    <label for="httpHeaders" class="text-bold">HTTP Headers</label>
-
-                                    <input type="hidden" id="httpHeadersInit" name="httpHeaders" data-cast-to="array-empty">
-                                    
-                                    <div class="margin-bottom-small">
-                                        <div data-ls-loop="task.httpHeaders" data-ls-as="header" style="overflow: hidden">
-                                            <div class="margin-bottom-small">
-                                                <div data-forms-remove class="row thin">
-                                                    <div class="col span-10">
-                                                        <input type="hidden" name="httpHeaders" data-forms-headers data-ls-bind="{{header}}" data-cast-to="array" />
-                                                    </div>
-                                                    <div class="col span-2">
-                                                        <button type="button" data-remove class="reverse danger round pull-end"><i class="icon-cancel"></i></button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-
-                                        <div data-forms-clone="" data-label="Add Header" data-first="0">
-                                            <div class="">
-                                                <div data-forms-remove class="row thin margin-bottom-small">
-                                                    <div class="col span-10">
-                                                        <input type="hidden" name="httpHeaders" data-forms-headers data-cast-to="array" />
-                                                    </div>
-                                                    <div class="col span-2">
-                                                        <button type="button" data-remove class="reverse danger round pull-end"><i class="icon-cancel"></i></button>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <label data-ls-attrs="for=security-{{task.$id}}" class="margin-bottom">
-                                        <div class="margin-bottom-small text-bold">SSL / TLS (Certificate verification)</div>
-                                        
-                                        <input name="security" type="radio" required data-ls-bind="{{task.security}}" value="true" data-cast-to="boolean" /> &nbsp; <span>Enabled</span>
-                                        <input name="security" type="radio" required data-ls-bind="{{task.security}}" value="false" data-cast-to="boolean" /> &nbsp; <span>Disabled</span>
-                                    </label>
-
-                                    <p class="margin-bottom text-size-small text-fade"><span class="text-red">Warning</span>: Untrusted or self-signed certificates may not be secure.
-                                        <a href="https://en.wikipedia.org/wiki/Self-signed_certificate" target="_blank" rel="noopener">Learn more<i class="icon-link-ext"></i></a>
-                                    </p>
-
-                                    <label class="text-bold">HTTP Authentication <span class="tooltip" data-tooltip="Use to secure your endpoint from untrusted sources"><i class="icon-question"></i></span> &nbsp;<small>(optional)</small></label>
-
-                                    <div class="row responsive thin">
-                                        <div class="col span-6 margin-bottom">
-                                            <label data-ls-attrs="for=httpUser-{{task.$id}}">User</label>
-                                            <input type="text" class="full-width margin-bottom-no" data-ls-attrs="id=httpUser-{{task.$id}}" name="httpUser" autocomplete="off" data-ls-bind="{{task.httpUser}}" />
-                                        </div>
-                                        <div class="col span-6 margin-bottom">
-                                            <label data-ls-attrs="for=httpPass-{{task.$id}}">Password</label>
-                                            <input data-forms-show-secret type="password" class="full-width margin-bottom-no" data-ls-attrs="id=httpPass-{{task.$id}}" name="httpPass" autocomplete="off" data-ls-bind="{{task.httpPass}}" />
-                                        </div>
-                                    </div>
-                                </div>
-
-                                <footer>
-                                    <button type="submit">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                                </footer>
-                            </form>
-
-                        </div>
-
-                        <form
-                            data-analytics
-                            data-analytics-activity
-                            data-analytics-event="submit"
-                            data-analytics-category="console"
-                            data-analytics-label="Delete Project Task"
-                            data-service="projects.deleteTask"
-                            data-scope="console"
-                            data-event="task-delete-{{task.$id}}"
-                            data-confirm="Are you sure you want to delete this task?"
-                            data-success="alert,trigger"
-                            data-success-param-alert-text="Deleted task successfully"
-                            data-success-param-trigger-events="projects.deleteTask"
-                            data-failure="alert"
-                            data-failure-param-alert-text="Failed to delete task"
-                            data-failure-param-alert-classname="error">
-
-                            <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-                            <input type="hidden" name="taskId" data-ls-bind="{{task.$id}}" />
-                        </form>
-
-                        <button class="pull-end margin-start round desktops-only" data-ls-ui-trigger="task-update-{{task.$id}}"><i class="icon-cog"></i></button>
-                        <button class="pull-end reverse danger round desktops-only" data-ls-ui-trigger="task-delete-{{task.$id}}"><i class="icon-trash"></i></button>
-
-                        <button class="link pull-start margin-end-small tablets-only phones-only" data-ls-ui-trigger="task-update-{{task.$id}}">Update</button>
-                        <button class="link pull-start margin-end text-danger tablets-only phones-only" data-ls-ui-trigger="task-delete-{{task.$id}}">Delete</button>
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-
-    <div class="clear">
-        <div data-ui-modal class="modal box close sticky-footer" data-button-text="Add Task">
-            <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-            <h1>Add Task</h1>
-
-            <form
-                data-analytics
-                data-analytics-activity
-                data-analytics-event="submit"
-                data-analytics-category="console"
-                data-analytics-label="Create Project Task"
-                data-service="projects.createTask"
-                data-scope="console"
-                data-event="submit"
-                data-success="alert,trigger,reset"
-                data-success-param-alert-text="Created task successfully"
-                data-success-param-trigger-events="projects.createTask"
-                data-failure="alert"
-                data-failure-param-alert-text="Failed to create task"
-                data-failure-param-alert-classname="error">
-
-                <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-
-                <label for="name">Name</label>
-                <input type="text" class="full-width" id="name" name="name" required autocomplete="off" maxlength="128" />
-
-                <label data-ls-attrs="for=status" class="margin-bottom">Status
-                    <div class="margin-top-small">
-                        <input name="status" type="radio" value="play" checked="checked" required /> &nbsp; <span>Play</span> &nbsp;
-                        <input name="status" type="radio" value="pause" required /> &nbsp; <span>Pause</span> &nbsp;
-                    </div>
-                </label>
-
-                <label for="schedule">Schedule (CRON Syntax)</label>
-                <input type="text" class="full-width" id="schedule" name="schedule" required autocomplete="off" placeholder="* * * * *" />
-
-                <div class="row responsive thin">
-                    <div class="col span-4">
-                        <label for="httpMethod">HTTP Method</label>
-                        <select id="httpMethod" name="httpMethod" required>
-                            <option value="POST">POST</option>
-                            <option value="GET">GET</option>
-                            <option value="PUT">PUT</option>
-                            <option value="PATCH">PATCH</option>
-                            <option value="DELETE">DELETE</option>
-                            <option value="CONNECT">CONNECT</option>
-                            <option value="HEAD">HEAD</option>
-                            <option value="TRACE">TRACE</option>
-                            <option value="OPTIONS">OPTIONS</option>
-                        </select>
-                    </div>
-                    <div class="col span-8">
-                        <label for="httpUrl">HTTP URL</label>
-                        <input type="url" class="full-width" id="httpUrl" name="httpUrl" required autocomplete="off" placeholder="https://example.com/callback" />
-                    </div>
-                </div>
-                
-                <div class="margin-bottom toggle" data-ls-ui-open data-button-aria="Advanced Options">
-                    <i class="icon-plus pull-end margin-top-tiny"></i>
-                    <i class="icon-minus pull-end margin-top-tiny"></i>
-                    
-                    <h2 class="margin-bottom">
-                        Advanced Options
-                        <small class="text-size-small">(optional)</small>
-                    </h2>
-
-                    <label for="httpHeaders" class="text-bold">HTTP Headers</label>
-                    
-                    <input type="hidden" id="httpHeadersInitAdd" name="httpHeaders" data-cast-to="array-empty">
-
-                    <div class="margin-bottom-small">
-                        <div data-forms-clone="" data-label="Add Header" data-first="0">
-                            <div class="">
-                                <div data-forms-remove class="row thin margin-bottom-small">
-                                    <div class="col span-10">
-                                        <input type="hidden" name="httpHeaders" data-forms-headers data-cast-to="array" />
-                                    </div>
-                                    <div class="col span-2">
-                                        <button type="button" data-remove class="reverse danger round pull-end"><i class="icon-cancel"></i></button>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <label for="secure" class="margin-bottom-small">
-                        <div class="margin-bottom-small text-bold">SSL / TLS (Certificate verification)</div>
-                        
-                        <input name="security" data-ls-attrs="id=secure-yes" type="radio" value="1" checked="checked" required /> &nbsp; <span>Enabled</span>
-                        <input name="security" data-ls-attrs="id=secure-no" type="radio" value="0" required /> &nbsp; <span>Disabled</span>
-                    </label>
-
-                    <p class="margin-bottom text-size-small text-fade"><span class="text-red">Warning</span>: Untrusted or self-signed certificates may not be secure.
-                        <a href="https://en.wikipedia.org/wiki/Self-signed_certificate" target="_blank" rel="noopener">Learn more<i class="icon-link-ext"></i></a>
-                    </p>
-
-                    <label class="text-bold">HTTP Authentication <span class="tooltip" data-tooltip="Use to secure your endpoint from untrusted sources"><i class="icon-question"></i></span> &nbsp;<small>(optional)</small></label>
-
-                    <div class="row responsive thin">
-                        <div class="col span-6 margin-bottom">
-                            <label for="httpUser">User</label>
-                            <input type="text" class="full-width margin-bottom-no" id="httpUser" name="httpUser" autocomplete="off" />
-                        </div>
-                        <div class="col span-6 margin-bottom">
-                            <label for="httpPass">Password</label>
-                            <input type="password" data-forms-show-secret class="full-width margin-bottom-no" id="httpPass" name="httpPass" autocomplete="off" />
-                        </div>
-                    </div>
-                </div>
-
-                <footer>
-                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                </footer>
-            </form>
-        </div>
-    </div>
-</div>

app/views/console/users/index.phtml

@@ -35,7 +35,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                         <input name="search" id="searchUsers" type="search" autocomplete="off" placeholder="Search" class="margin-bottom-no" data-ls-bind="{{router.params.search}}">
                     </div>
                     <div class="col span-2 desktops-only">
-                        <button class="fill" title="Search" aria-label="Search"><i class="icon-search"></i></button>
+                        <button class="fill" title="Search" aria-label="Search">Search</button>
                     </div>
                 </div>
             </form>
@@ -57,7 +57,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                 </div>
 
                 <div data-ls-if="0 != {{project-users.sum}}">
-                    <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-users.sum}}"></span> users found</div>
+                    <div class="margin-bottom-small text-align-end text-size-small text-fade"><span data-ls-bind="{{project-users.sum}}"></span> users found</div>
 
                     <div class="box margin-bottom">
                         <table class="vertical">
@@ -86,15 +86,15 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                         <small data-ls-bind="{{user.email}}"></span>
                                     </td>
                                     <td data-title="Status: ">
-                                        <span data-ls-if="{{user.emailVerification}} === true">
+                                        <span data-ls-if="{{user.emailVerification}} === true && {{user.status}} === true">
                                             <span class="tag green">Verified</span>
                                         </span>
 
-                                        <span data-ls-if="{{user.emailVerification}} !== true">
+                                        <span data-ls-if="{{user.emailVerification}} !== true && {{user.status}} === true">
                                             <span class="tag">Unverified</span>
                                         </span>
 
-                                        <span data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>">
+                                        <span data-ls-if="{{user.status}} === false">
                                             <span class="tag red">Blocked</span>
                                         </span>
                                     </td>
@@ -155,6 +155,18 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                         data-failure-param-alert-text="Failed to create user"
                         data-failure-param-alert-classname="error">
 
+                        <label for="userId">User ID</label>
+                        <input
+                            type="hidden"
+                            data-custom-id
+                            data-id-type="auto"
+                            data-validator="users.get"
+                            required
+                            maxlength="36"
+                            pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{1,36}$"
+                            id="userId"
+                            name="userId" />
+
                         <label for="user-name">Name</label>
                         <input type="text" class="full-width" id="user-name" name="name" required autocomplete="off" maxlength="128" />
 
@@ -191,7 +203,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                         <input name="search" id="searchTeams" type="search" autocomplete="off" placeholder="Search" class="margin-bottom-no" data-ls-bind="{{router.params.search}}">
                     </div>
                     <div class="col span-2 desktops-only">
-                        <button class="fill" title="Search" aria-label="Search"><i class="icon-search"></i></button>
+                        <button class="fill" title="Search" aria-label="Search">Search</button>
                     </div>
                 </div>
             </form>
@@ -213,7 +225,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                 </div>
 
                 <div data-ls-if="0 != {{project-teams.sum}}">
-                    <div class="margin-bottom-small margin-end-small text-align-end text-size-small"><span data-ls-bind="{{project-teams.sum}}"></span> results found</div>
+                    <div class="margin-bottom-small text-align-end text-size-small text-fade"><span data-ls-bind="{{project-teams.sum}}"></span> teams found</div>
 
                     <div class="box margin-bottom">
                         <table class="vertical">
@@ -291,9 +303,21 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                         data-failure-param-alert-text="Failed to create team"
                         data-failure-param-alert-classname="error">
 
+                        <label for="teamId">Team ID</label>
+                        <input
+                            type="hidden"
+                            data-custom-id
+                            data-id-type="auto"
+                            data-validator="teams.get"
+                            required
+                            maxlength="36"
+                            pattern="^[a-zA-Z0-9][a-zA-Z0-9._-]{1,36}$"
+                            id="teamId"
+                            name="teamId" />
+
                         <label for="team-name">Name</label>
                         <input type="text" class="full-width" id="team-name" name="name" required autocomplete="off" maxlength="128" />
-                        
+
                         <hr />
 
                         <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
@@ -301,11 +325,11 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                 </div>
             </div>
         </li>
-        
+
         <li data-state="/console/users/providers?project={{router.params.project}}">
-            <p data-ls-if="{{console-project.usersAuthLimit}} == 0" class="text-fade text-size-small margin-bottom pull-end">Unlimited Users <span class="link" data-ls-ui-trigger="project-update-auth-users-limit">Set Limit</a></p>
-            <p data-ls-if="{{console-project.usersAuthLimit}} != 0" class="text-fade text-size-small margin-bottom pull-end"><span data-ls-bind="{{console-project.usersAuthLimit|statsTotal}}"></span> Users allowed <span class="link" data-ls-ui-trigger="project-update-auth-users-limit">Change Limit</a></p>
-            
+            <p data-ls-if="{{console-project.authLimit}} == 0" class="text-fade text-size-small margin-bottom pull-end">Unlimited Users <span class="link" data-ls-ui-trigger="project-update-auth-users-limit">Set Limit</a></p>
+            <p data-ls-if="{{console-project.authLimit}} != 0" class="text-fade text-size-small margin-bottom pull-end"><span data-ls-bind="{{console-project.authLimit|statsTotal}}"></span> Users allowed <span class="link" data-ls-ui-trigger="project-update-auth-users-limit">Change Limit</a></p>
+
             <h2>Settings</h2>
 
             <div data-ui-modal class="modal close" data-button-alias="none" data-open-event="project-update-auth-users-limit">
@@ -313,8 +337,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                 <h1>Max Allowed Users</h1>
 
-                <form data-debug="1"
-                    data-analytics
+                <form data-analytics
                     data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
@@ -330,7 +353,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                     data-failure-param-alert-text="Failed to update project users limit"
                     data-failure-param-alert-classname="error">
 
-                    <input name="limit" id="users-limit" type="number" data-ls-bind="{{console-project.usersAuthLimit}}" data-cast-to="numeric" min="0" />
+                    <input name="limit" id="users-limit" type="number" data-ls-bind="{{console-project.authLimit}}" data-cast-to="numeric" min="0" />
 
                     <div class="info row thin margin-bottom margin-top">
                         <div class="col span-1">
@@ -347,7 +370,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
             <ul class="tiles cell-3 margin-bottom-small">
                 <?php foreach($auth as $index => $method):
-                    $key = $method['key'] ?? '';
+                    $key = ucfirst($method['key'] ?? '');
                     $name = $method['name'] ?? '';
                     $icon = $method['icon'] ?? '';
                     $docs = $method['docs'] ?? '';
@@ -372,17 +395,17 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                 data-failure="alert"
                                 data-failure-param-alert-text="Failed to update project auth status settings"
                                 data-failure-param-alert-classname="error">
-                                <input name="method" id="<?php echo $this->escape($key); ?>" type="hidden" autocomplete="off" value="<?php echo $this->escape($index); ?>">
+                                <input name="method" id="auth<?php echo $this->escape($key); ?>" type="hidden" autocomplete="off" value="<?php echo $this->escape($index); ?>">
                                 <?php if( !(in_array($key, ['usersAuthMagicURL', 'usersAuthInvites']) && !$smtpEnabled)): ?>
-                                    <input name="status" type="hidden" data-forms-switch data-ls-bind="{{console-project.<?php echo $this->escape($key); ?>}}" data-cast-to="boolean" class="pull-end" />
+                                    <input name="status" type="hidden" data-forms-switch data-ls-bind="{{console-project.auth<?php echo $this->escape($key); ?>}}" data-cast-to="boolean" class="pull-end" />
                                 <?php endif; ?>
                             </form>
                         <?php endif; ?>
-                        
+
                         <img src="<?php echo $this->escape($icon); ?>?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="Email/Password Logo" class="pull-start provider margin-end" />
-                                
+
                         <span class="text-size-small"><?php echo $this->escape($name); ?><?php if(!$enabled): ?> <spann class="text-fade text-size-xs">soon</span><?php endif; ?>
-                        
+
                         <?php if( in_array($key, ['usersAuthMagicURL', 'usersAuthInvites']) && !$smtpEnabled): ?>
                             <p class="margin-bottom-no text-one-liner text-size-small text-danger">
                                 SMTP Disabled
@@ -396,7 +419,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                         <?php endif; ?>
                     </div>
                 </li>
-                <?php endforeach; ?>
+                <?php endforeach;?>
             </ul>
 
             <h3>OAuth2 Providers</h3>
@@ -409,18 +432,18 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                 data-scope="console">
                 <ul class="tiles cell-3 margin-bottom-small">
                     <?php foreach ($providers as $provider => $data):
-                        if (isset($data['enabled']) && !$data['enabled']) { continue; }
-                        if (isset($data['mock']) && $data['mock']) { continue; }
+                    if (isset($data['enabled']) && !$data['enabled']) {continue;}
+                        if (isset($data['mock']) && $data['mock']) {continue;}
                         $sandbox = $data['sandbox'] ?? false;
                         $form = $data['form'] ?? false;
                         $name = $data['name'] ?? 'Unknown';
                         $beta = $data['beta'] ?? false;
-                        ?>
+                    ?>
                         <li class="<?php echo (isset($data['enabled']) && !$data['enabled']) ? 'dev-feature' : ''; ?>">
                             <div data-ui-modal class="modal close" data-button-alias="none" data-open-event="provider-update-<?php echo $provider; ?>">
                                 <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
 
-                                <h1><?php echo $this->escape($name); ?> <?php if($sandbox): ?>Sandbox<?php endif; ?> OAuth2 Settings</h1>
+                                <h1><?php echo $this->escape($name); ?> <?php if ($sandbox): ?>Sandbox<?php endif;?> OAuth2 Settings</h1>
 
                                 <form
                                     autocomplete="off"
@@ -439,23 +462,22 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     data-failure="alert"
                                     data-failure-param-alert-text="Failed to update project OAuth2 settings"
                                     data-failure-param-alert-classname="error">
-                                    
-                                    <input style="display: none" type="text" /> <?php /** Disabling Chrone Autofill @see https://stackoverflow.com/a/15917221/2299554 */ ?>
-                                    <input style="display: none" type="password" /> <?php /** Disabling Chrone Autofill @see https://stackoverflow.com/a/15917221/2299554 */ ?>
-                                    
+
+                                    <input style="display: none" type="text" /> <?php /** Disabling Chrone Autofill @see https://stackoverflow.com/a/15917221/2299554 */?>
+                                    <input style="display: none" type="password" /> <?php /** Disabling Chrone Autofill @see https://stackoverflow.com/a/15917221/2299554 */?>
+
                                     <input name="provider" id="provider<?php echo $this->escape(ucfirst($provider)); ?>" type="hidden" autocomplete="off" value="<?php echo $this->escape($provider); ?>">
 
-                                    <?php if(!$form): ?>
+                                    <?php if (!$form): ?>
                                         <label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid">App ID</label>
-                                        <input name="appId" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}}">
-                                    
+                                        <input name="appId" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Appid}}">
+
                                         <label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret">App Secret</label>
-                                        <input name="secret" data-forms-show-secret id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret" type="password" autocomplete="off" data-ls-bind="{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
+                                        <input name="secret" data-forms-show-secret id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret" type="password" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
                                     <?php else: ?>
                                         <label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid">Bundle ID <span class="tooltip" data-tooltip="Attribute internal display name"><i class="icon-info-circled"></i></span></label>
-                                        <input name="appId" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}}" placeholder="com.company.appname" />
-
-                                        <input name="secret" data-forms-oauth-apple id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret" type="hidden" autocomplete="off" data-ls-bind="{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}" />
+                                        <input name="appId" id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid" type="text" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Appid}}" placeholder="com.company.appname" />
+                                        <input name="secret" data-forms-oauth-apple id="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret" type="hidden" autocomplete="off" data-ls-bind="{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Secret}}" />
                                     <?php endif; ?>
 
                                     <div class="info row thin margin-bottom margin-top">
@@ -477,21 +499,21 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
 
                             <div class="box padding-small margin-bottom">
                                 <span data-ls-if="
-                                    {{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}} &&
-                                    {{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
+                                    {{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Appid}} &&
+                                    {{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
                                     <button class="switch on pull-end" data-ls-ui-trigger="provider-update-<?php echo $provider; ?>"></button>
                                 </span>
 
                                 <span data-ls-if="
-                                    !{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Appid}} ||
-                                    !{{console-project.usersOauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
+                                    !{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Appid}} ||
+                                    !{{console-project.provider<?php echo $this->escape(ucfirst($provider)); ?>Secret}}">
                                     <button class="switch pull-end" data-ls-ui-trigger="provider-update-<?php echo $this->escape($provider); ?>"></button>
                                 </span>
 
                                 <img src="/images/users/<?php echo $this->escape(strtolower($provider)); ?>.png?buster=<?php echo APP_CACHE_BUSTER; ?>" alt="<?php echo $this->escape(ucfirst($provider)); ?> Logo" class="pull-start provider margin-end" />
-                                
+
                                 <span class="text-size-small">
-                                    <?php echo $this->escape($name); ?> <?php if($sandbox): ?><span class="text-size-xs text-fade">sandbox</span><?php endif; ?> <?php if($beta): ?><span class="text-size-xs text-fade">beta</span><?php endif; ?>
+                                    <?php echo $this->escape($name); ?> <?php if ($sandbox): ?><span class="text-size-xs text-fade">sandbox</span><?php endif;?> <?php if ($beta): ?><span class="text-size-xs text-fade">beta</span><?php endif;?>
                                 </span>
 
                                 <p class="margin-bottom-no text-one-liner text-size-small">
@@ -499,9 +521,83 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                 </p>
                             </div>
                         </li>
-                    <?php endforeach; ?>
+                    <?php endforeach;?>
                 </ul>
             </div>
         </li>
+        <li data-state="/console/users/usage?project={{router.params.project}}">
+                <form
+                    class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '90d'"
+                    data-service="users.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-range="90d">
+                    <button class="tick">90d</button>
+                </form>
+
+                <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '90d'" disabled>90d</button>
+
+                <form
+                    class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '30d'"
+                    data-service="users.getUsage"
+                    data-event="submit"
+                    data-name="usage">
+                    <button class="tick">30d</button>
+                </form>
+
+                <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '30d'" disabled>30d</button>
+
+                <form
+                    class="pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} !== '24h'"
+                    data-service="users.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-range="24h">
+                    <button class="tick">24h</button>
+                </form>
+
+                <button class="tick pull-end margin-start-small margin-top-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
+
+                <h2>Usage</h2>
+
+                <div data-service="users.getUsage" data-event="load" data-name="usage">
+                    <h3 class="margin-bottom-tiny">Users</h3>
+                    <p class="text-fade">Count of users over time</p>
+                    <div class="box margin-bottom-small">
+                        <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input type="hidden" data-ls-bind="{{usage}}" data-forms-chart="Users=usersCount" data-show-y-axis="true" data-height="140" />
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="chart-notes margin-bottom-large">
+                        <li>Users <span data-ls-bind="({{usage.usersCount|statsGetLast|statsTotal}})"></span></li>
+                    </ul>
+
+                    <h3 class="margin-bottom-tiny">Operations</h3>
+                    <p class="text-fade">Count of users create, read, update and delete operations over time</p>
+                    <div class="box margin-bottom-small">
+                        <div class="margin-start-negative-small margin-end-negative-small margin-top-negative-small margin-bottom-negative-small">
+                            <div class="chart background-image-no border-no margin-bottom-no">
+                                <input 
+                                    type="hidden" 
+                                    data-ls-bind="{{usage}}"
+                                    data-forms-chart="Created=usersCreate,Read=usersRead,Updated=usersUpdate,Deleted=usersDelete"
+                                    data-show-y-axis="true"
+                                    data-colors="create,read,update,delete"
+                                    data-height="140" />
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="chart-notes margin-bottom-large crud">
+                        <li>Created</li>
+                        <li>Read</li>
+                        <li>Updated</li>
+                        <li>Deleted</li>
+                    </ul>
+                </div>
+            </li>
     </ul>
 </div>

app/views/console/users/team.phtml

@@ -17,8 +17,8 @@
     </div>
 
     <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
-        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>    
-        
+        <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
         <h2>JSON View</h2>
 
         <div class="margin-bottom">
@@ -32,7 +32,7 @@
         <ul class="phases clear" data-ui-phases data-selected="{{router.params.tab}}">
             <li data-state="/console/users/teams/team?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>Overview</h2>
-                
+
                 <div class="row responsive margin-top-negative">
                     <div class="col span-8 margin-bottom-large">
                         <label>&nbsp;</label>
@@ -84,7 +84,7 @@
                             </div>
 
                             <div data-ls-if="0 != {{project-members.sum}}">
-                                <div class="margin-bottom-small margin-end-small text-align-end text-size-small margin-top-negative"><span data-ls-bind="{{project-members.sum}}"></span> memberships found</div>
+                                <div class="margin-bottom-small margin-end-small text-align-end text-size-small margin-top-negative text-fade"><span data-ls-bind="{{project-members.sum}}"></span> memberships found</div>
 
                                 <div class="box margin-bottom">
                                     <ul data-ls-loop="project-members.memberships" data-ls-as="member" class="list">
@@ -98,6 +98,7 @@
                                                 data-service="teams.deleteMembership"
                                                 data-event="submit"
                                                 data-success="alert,trigger"
+                                                data-confirm="Are you sure you want to remove that user from the team?"
                                                 data-success-param-alert-text="Member Removed Successfully"
                                                 data-success-param-trigger-events="teams.deleteMembership"
                                                 data-failure="alert"
@@ -146,10 +147,10 @@
 
                                     <input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{team.$id}}">
                                     <input name="url" type="hidden" data-ls-bind="{{env.ENDPOINT}}" />
-                                    
+
                                     <label for="email">Email</label>
                                     <input name="email" id="email" type="email" autocomplete="email" required>
-                                    
+
                                     <label for="team-name">Name <small>(optional)</small></label>
                                     <input name="name" id="team-name" type="text" autocomplete="name" maxlength="128" />
 
@@ -232,7 +233,7 @@
                     </div>
                 </div>
             </li>
-            
+
         </ul>
     </div>
 </div>

app/views/console/users/user.phtml

@@ -46,11 +46,9 @@
             <hr />
 
             <footer>
-
                 <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </footer>
         </form>
-
     </div>
     
     <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-email">
@@ -82,11 +80,9 @@
             <hr />
 
             <footer>
-
                 <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </footer>
         </form>
-
     </div>
 
     <div data-ui-modal class="modal width-medium box close" data-button-hide="on" data-open-event="open-update-password">
@@ -118,11 +114,9 @@
             <hr />
 
             <footer>
-
                 <button type="submit" class="">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
             </footer>
         </form>
-
     </div>
 
     <div data-ui-modal class="modal width-large box close" data-button-hide="on" data-open-event="open-json">
@@ -142,7 +136,7 @@
             <li data-state="/console/users/user?id={{router.params.id}}&project={{router.params.project}}">
                 <h2>Overview</h2>
 
-                <div data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none" class="box padding-small danger margin-bottom-xxl text-align-center">
+                <div data-ls-if="{{user.status}} === false" style="display: none" class="box padding-small danger margin-bottom-xxl text-align-center">
                     This user account is blocked.
                 </div>
 
@@ -207,11 +201,11 @@
 
                         <div class="box danger margin-bottom">
                             <p>This is the area where you can delete this user.</p>
-                        
+
                             <p>By deleting this user you will lose all data associated with this user.</p>
-                        
+
                             <p>PLEASE NOTE: User deletion is irreversible.</p>
-                        
+
                             <form class="inline"
                                 data-analytics
                                 data-analytics-activity
@@ -230,7 +224,7 @@
                                 data-failure-param-alert-text="Failed to delete user"
                                 data-failure-param-alert-classname="error">
                                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-                        
+
                                 <button class="danger reverse" type="submit">Delete User</button>
                             </form>
                         </div>
@@ -248,7 +242,7 @@
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
                         </ul>
 
-                        <div data-ls-if="{{user.status}} !== <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
+                        <div data-ls-if="{{user.status}} === true" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
                                 data-analytics
                                 data-analytics-activity
@@ -265,11 +259,11 @@
                                 data-failure-param-alert-text="Failed to block user"
                                 data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" data-cast-to="integer">Block Account</button>
+                                <button name="status" type="submit" class="danger fill" value="false" data-cast-to="boolean">Block Account</button>
                             </form>
                         </div>
 
-                        <div data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
+                        <div data-ls-if="{{user.status}} === false" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
                                 data-analytics
                                 data-analytics-activity
@@ -286,7 +280,7 @@
                                 data-failure-param-alert-text="Failed to activate user"
                                 data-failure-param-alert-classname="error">
 
-                                <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>" data-cast-to="integer">Activate Account</button>
+                                <button name="status" type="submit" class="fill" value="true" data-cast-to="boolean">Activate Account</button>
                             </form>
                         </div>
                     </div>
@@ -329,7 +323,9 @@
                                         <button class="danger">Logout</button>
                                     </form>
                                     <div class="pull-start margin-end avatar-container">
-                                        <img onerror="this.onerror=null;this.src='/images/unknown.svg'" 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" />
+                                        <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-if="{{session.clientCode|lowercase}} !== 'cli'" 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" />
+
+                                        <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-if="{{session.clientCode|lowercase}} === 'cli'" 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" />
                                         
                                         <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" />
@@ -339,7 +335,7 @@
                                     <span 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>
 
                                     <div class="margin-top-small">
-                                        <img onerror="this.onerror=null;this.src='/images/unknown.svg'" data-ls-if="{{session.countryCode}} !== '--'" data-ls-attrs="src={{env.API}}/avatars/flags/{{session.countryCode}}?width=120&height=120&project={{env.PROJECT}}" class="avatar xxs margin-end-small inline" />
+                                        <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=120&height=120&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>
@@ -360,7 +356,7 @@
                             data-failure="alert"
                             data-failure-param-alert-text="Failed to logout all sessions"
                             data-failure-param-alert-classname="error">
-                            
+
                             <button class="danger">Logout from all sessions</button>
                         </form>
                     </div>
@@ -396,12 +392,15 @@
                                     <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.src='/images/unknown.svg'" data-ls-if="({{log.clientCode}})" 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" />
+                                        <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-if="{{log.clientCode|lowercase}} !== 'cli'" 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" />
+                                        
+                                        <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-if="{{log.clientCode|lowercase}} === 'cli'" 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" />
+                                        
                                         <span data-ls-if="({{log.clientName}})" data-ls-bind="{{log.clientName}} {{log.clientVersion}} on {{log.model}} {{log.osName}} {{log.osVersion}}"></span>
                                         <div data-ls-if="(!{{log.clientName}})" class="text-align-center text-fade">Unknown</div>
                                     </td>
                                     <td data-title="Location: ">
-                                        <img onerror="this.onerror=null;this.src='/images/unknown.svg'" data-ls-if="{{log.countryCode}} !== '--'" data-ls-attrs="src={{env.API}}/avatars/flags/{{log.countryCode}}?width=80&height=80&project={{env.PROJECT}}" class="avatar xxs inline margin-end-small" />
+                                        <img onerror="this.onerror=null;this.className='avatar hide'" data-ls-if="{{log.countryCode}} !== '--'" 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>

app/views/console/webhooks/index.phtml

@@ -58,31 +58,31 @@ $events = array_keys($this->getParam('events', []));
                         <label data-ls-attrs="for=name-{{webhook.$id}}">Name</label>
                         <input type="text" class="full-width" data-ls-attrs="id=name-{{webhook.$id}}" name="name" required autocomplete="off" data-ls-bind="{{webhook.name}}" maxlength="128" />
 
+                        <label data-ls-attrs="for=url-{{webhook.$id}}">POST URL</label>
+                        <input type="url" class="full-width" data-ls-attrs="id=url-{{webhook.$id}}" name="url" required autocomplete="off" placeholder="https://example.com/callback" data-ls-bind="{{webhook.url}}" />
+
                         <section data-forms-select-all>
                             <label data-ls-attrs="for=events-{{webhook.$id}}">Events</label>
                             <div class="row responsive thin">
-                                <?php foreach ($events as $i => $event) : ?>
+                                <?php foreach ($events as $i => $event): ?>
                                     <div class="col span-6 text-one-liner margin-bottom text-height-large text-size-small" title="<?php echo $event; ?>">
-                                        <input type="checkbox" name="events" data-ls-bind="{{webhook.events}}" id="update-<?php echo $event; ?>" value="<?php echo $event; ?>" />
+                                        <input type="checkbox" name="events" data-ls-bind="{{webhook.events}}" id="update-<?php echo $event; ?>" value="<?php echo $event; ?>" data-by-key="true" />
                                         &nbsp;
                                         <label class="inline" for="update-<?php echo $event; ?>"><?php echo $event; ?></label>
                                     </div>
-                                    <?php if (($i + 1) % 2 === 0) : ?>
+                                    <?php if (($i + 1) % 2 === 0): ?>
                                     </div>
                                     <div class="row responsive thin">
-                                    <?php endif; ?>
-    
-                                <?php endforeach; ?>
+                                    <?php endif;?>
+
+                                <?php endforeach;?>
                             </div>
                         </section>
 
-                        <label data-ls-attrs="for=url-{{webhook.$id}}">POST URL</label>
-                        <input type="url" class="full-width" data-ls-attrs="id=url-{{webhook.$id}}" name="url" required autocomplete="off" placeholder="https://example.com/callback" data-ls-bind="{{webhook.url}}" />
-
                         <div class="margin-bottom toggle" data-ls-ui-open data-button-aria="Advanced Options">
                             <i class="icon-plus pull-end margin-top-tiny"></i>
                             <i class="icon-minus pull-end margin-top-tiny"></i>
-                            
+
                             <h2 class="margin-bottom">
                                 Advanced Options
                                 <small class="text-size-small">(optional)</small>
@@ -90,7 +90,7 @@ $events = array_keys($this->getParam('events', []));
 
                             <label data-ls-attrs="for=security-{{task.$id}}" class="margin-bottom-small">
                                 <div class="margin-bottom-small text-bold">SSL / TLS (Certificate verification)</div>
-                                        
+
                                 <input name="security" type="radio" required data-ls-attrs="id=secure-yes-{{webhook.$id}}" data-ls-bind="{{webhook.security}}" value="true" data-cast-to="boolean" /> &nbsp; <span>Enabled</span> &nbsp;
                                 <input name="security" type="radio" required data-ls-attrs="id=secure-no-{{webhook.$id}}" data-ls-bind="{{webhook.security}}" value="false" data-cast-to="boolean" /> &nbsp; <span>Disabled</span> &nbsp;
                             </label>
@@ -114,7 +114,7 @@ $events = array_keys($this->getParam('events', []));
                         </div>
 
                         <footer>
-                            <button type="submit">Save</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                            <button type="submit">Update</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
                         </footer>
                     </form>
                 </div>
@@ -180,31 +180,31 @@ $events = array_keys($this->getParam('events', []));
                 <label for="name">Name</label>
                 <input type="text" class="full-width" id="name" name="name" required autocomplete="off" maxlength="128" />
 
+                <label for="url">POST URL</label>
+                <input type="url" class="full-width" id="url" name="url" required autocomplete="off" placeholder="https://example.com/callback" />
+
                 <section data-forms-select-all>
                     <label for="events">Events</label>
                     <div class="row responsive thin">
-                        <?php foreach ($events as $i => $event) : ?>
+                        <?php foreach ($events as $i => $event): ?>
                             <div class="col span-6 text-one-liner margin-bottom text-height-large text-size-small" title="<?php echo $event; ?>">
-                                <input type="checkbox" name="events" id="add-<?php echo $event; ?>" value="<?php echo $event; ?>" />
+                                <input type="checkbox" name="events" id="add-<?php echo $event; ?>" value="<?php echo $event; ?>" data-by-key="true" />
                                 &nbsp;
                                 <label class="inline" for="add-<?php echo $event; ?>"><?php echo $event; ?></label>
                             </div>
-                            <?php if (($i + 1) % 2 === 0) : ?>
+                            <?php if (($i + 1) % 2 === 0): ?>
                             </div>
                             <div class="row responsive thin">
-                            <?php endif; ?>
+                            <?php endif;?>
 
-                        <?php endforeach; ?>
+                        <?php endforeach;?>
                     </div>
                 </section>
 
-                <label for="url">POST URL</label>
-                <input type="url" class="full-width" id="url" name="url" required autocomplete="off" placeholder="https://example.com/callback" />
-
                 <div class="margin-bottom toggle" data-ls-ui-open data-button-aria="Advanced Options">
                     <i class="icon-plus pull-end margin-top-tiny"></i>
                     <i class="icon-minus pull-end margin-top-tiny"></i>
-                    
+
                     <h2 class="margin-bottom">
                         Advanced Options
                         <small class="text-size-small">(optional)</small>
@@ -212,7 +212,7 @@ $events = array_keys($this->getParam('events', []));
 
                     <label data-ls-attrs="for=security-{{task.$id}}" class="margin-bottom-small">
                         <div class="margin-bottom-small text-bold">SSL / TLS (Certificate verification)</div>
-                                        
+
                         <input name="security" type="radio" required data-ls-attrs="id=secure-yes" checked="checked" value="1" /> &nbsp; <span>Enabled</span> &nbsp;
                         <input name="security" type="radio" required data-ls-attrs="id=secure-no" value="0" /> &nbsp; <span>Disabled</span> &nbsp;
                     </label>

app/views/general/error.phtml

@@ -1,7 +1,9 @@
 <?php
+$development = $this->getParam('development', false);
 $code = $this->getParam('code', 500);
 $errorID = $this->getParam('errorID', 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx');
 $message = $this->getParam('message', '');
+$trace = $this->getParam('trace', []);
 $projectName = $this->getParam('projectName', '');
 $projectURL = $this->getParam('projectURL', '');
 ?>
@@ -18,4 +20,30 @@ $projectURL = $this->getParam('projectURL', '');
 
         <p><a href="<?php echo $this->escape($projectURL); ?>" rel="noopener">Back to <?php echo $projectName; ?></a></p>
     <?php endif; ?>
+
+    <?php if ($development): ?>
+        <div class="margin-top-xl">
+            
+            <h2 class="margin-bottom-large">Error Trace</h2>
+
+            <?php foreach($trace as $log): ?>
+                <table class="margin-bottom-xl">
+                    <?php foreach($log as $key => $value): ?>
+                        <tr>
+                            <td style="width: 120px"><?php echo $key; ?></td>
+                            <td>
+                                <?php if (is_array($value)): ?>
+                                    <?php var_dump($value); ?>
+                                <?php else: ?>
+                                    <?php echo $value; ?>
+                                <?php endif; ?>
+                            </td>
+                        </tr>
+                        
+                        <?php endforeach; ?>
+                </table>
+            <?php endforeach; ?>
+        </div>
+    <?php endif; ?>
+
 </section>

app/views/home/auth/signup.phtml

@@ -37,6 +37,7 @@ $root = ($this->getParam('root') !== 'disabled');
         <?php if($root): ?>
             <p>Please create your root account</p>
         <?php endif; ?>
+        <input name="userId" type="hidden" value="unique()">
 
         <label>Name</label>
         <input name="name" type="text" autocomplete="name" placeholder="" required maxlength="128">

app/views/install/compose.phtml

@@ -32,7 +32,7 @@ services:
     networks:
       - gateway
       - appwrite
-  
+
   appwrite:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     container_name: appwrite
@@ -106,6 +106,14 @@ services:
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_MEMORY_SWAP
       - _APP_FUNCTIONS_RUNTIMES
+      - _APP_LOGGING_PROVIDER
+      - _APP_LOGGING_CONFIG
+      - _APP_STATSD_HOST
+      - _APP_STATSD_PORT
+      - _APP_MAINTENANCE_INTERVAL
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
 
   appwrite-realtime:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -130,6 +138,7 @@ services:
     networks:
       - appwrite
     depends_on:
+      - mariadb
       - redis
     environment:
       - _APP_ENV
@@ -144,24 +153,27 @@ services:
       - _APP_DB_PASS
       - _APP_USAGE_STATS
 
-  appwrite-worker-usage:
+  appwrite-worker-database:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-usage
-    container_name: appwrite-worker-usage
+    entrypoint: worker-database
+    container_name: appwrite-worker-database
     restart: unless-stopped
     networks:
       - appwrite
     depends_on:
       - redis
-      - telegraf
+      - mariadb
     environment:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
-      - _APP_STATSD_HOST
-      - _APP_STATSD_PORT
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
 
   appwrite-worker-audits:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -203,30 +215,6 @@ services:
       - _APP_REDIS_USER
       - _APP_REDIS_PASS
 
-  appwrite-worker-tasks:
-    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
-    entrypoint: worker-tasks
-    container_name: appwrite-worker-tasks
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      - redis
-      - mariadb
-    environment:
-      - _APP_ENV
-      - _APP_OPENSSL_KEY_V1
-      - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_REDIS_USER
-      - _APP_REDIS_PASS
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-
   appwrite-worker-deletes:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: worker-deletes
@@ -336,7 +324,7 @@ services:
       - _APP_SMTP_SECURE
       - _APP_SMTP_USERNAME
       - _APP_SMTP_PASSWORD
-      
+
   appwrite-maintenance:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
     entrypoint: maintenance
@@ -357,6 +345,26 @@ services:
       - _APP_MAINTENANCE_RETENTION_ABUSE
       - _APP_MAINTENANCE_RETENTION_AUDIT
 
+  appwrite-usage:
+    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
+    entrypoint: usage
+    container_name: appwrite-usage
+    restart: unless-stopped
+    networks:
+      - appwrite
+    depends_on:
+      - influxdb
+      - mariadb
+    environment:
+      - _APP_ENV
+      - _APP_DB_HOST
+      - _APP_DB_PORT
+      - _APP_DB_SCHEMA
+      - _APP_DB_USER
+      - _APP_DB_PASS
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT
+      - _APP_USAGE_AGGREGATION_INTERVAL
 
   appwrite-schedule:
     image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
@@ -375,7 +383,7 @@ services:
       - _APP_REDIS_PASS
 
   mariadb:
-    image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
+    image: mariadb:10.7 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
     restart: unless-stopped
     networks: