Merge branch 'dev' of github.com:appwrite/appwrite into feat-265-realtime-support

.env

@@ -3,6 +3,7 @@ _APP_ENV=development
 _APP_SYSTEM_EMAIL_NAME=Appwrite
 _APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io
 _APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io
+_APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
@@ -31,7 +32,10 @@ _APP_STORAGE_LIMIT=10000000
 _APP_FUNCTIONS_TIMEOUT=900
 _APP_FUNCTIONS_CONTAINERS=10
 _APP_FUNCTIONS_CPUS=1
-_APP_FUNCTIONS_MEMORY=128
-_APP_FUNCTIONS_MEMORY_SWAP=128
+_APP_FUNCTIONS_MEMORY=256
+_APP_FUNCTIONS_MEMORY_SWAP=256
 _APP_MAINTENANCE_INTERVAL=86400
-_APP_SYSTEM_RESPONSE_FORMAT=
+_APP_MAINTENANCE_RETENTION_EXECUTION=1209600
+_APP_MAINTENANCE_RETENTION_ABUSE=86400
+_APP_MAINTENANCE_RETENTION_AUDIT=1209600
+_APP_USAGE_STATS=enabled

.gitattributes

@@ -0,0 +1,10 @@
+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
+tests/* linguist-detectable=false
+tests/*/* linguist-detectable=false
+tests/*/*/* linguist-detectable=false
+tests/*/*/*/* linguist-detectable=false
+tests/*/*/*/*/* linguist-detectable=false

.travis-ci/deploy.sh

@@ -0,0 +1 @@
+echo 'Nothing to deploy right now.'

.travis.yml

@@ -1,9 +1,11 @@
+dist: xenial
+
 arch:
   - amd64
 
 os: linux
 
-language: minimal
+language: shell
 
 notifications:
   email:
@@ -13,20 +15,35 @@ services:
 - docker
 
 before_install:
-  - curl -fsSL https://get.docker.com | sh
-  - echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json
-  - mkdir -p $HOME/.docker
-  - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json
-  - sudo service docker start
+- curl -fsSL https://get.docker.com | sh
+- echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json
+- mkdir -p $HOME/.docker
+- echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json
+- sudo service docker start
+- >
+  if [ ! -z "${DOCKERHUB_PULL_USERNAME:-}" ]; then
+    echo "${DOCKERHUB_PULL_PASSWORD}" | docker login --username "${DOCKERHUB_PULL_USERNAME}" --password-stdin
+  fi
+- docker --version
+- docker buildx create --use
+- chmod -R u+x ./.travis-ci
 
 install:
-- docker --version
 - docker-compose up -d
 - sleep 10
 
 script:
 - docker ps
 - docker-compose logs appwrite
+- docker-compose logs appwrite-worker-functions
 - docker-compose exec appwrite doctor
 - docker-compose exec appwrite vars
 - docker-compose exec appwrite test
+
+deploy:
+  - provider: script
+    edge: true
+    script: ./.travis-ci/deploy.sh
+    on:
+      repo: appwrite/appwrite
+      branch: deploy

CHANGES.md

@@ -1,4 +1,4 @@
-# Version 0.7.0 (NOT-RELEASED)
+# Version 0.7.0
 
 ## Features
 
@@ -37,8 +37,14 @@
 - Added new environment variables for ClamAV hostname and port ([#780](https://github.com/appwrite/appwrite/pull/780))
 - New OAuth adapter for Box.com (@armino-dev - [#420](https://github.com/appwrite/appwrite/issues/410))
 - New OAuth adapter for PayPal sandbox  (@armino-dev - [#420](https://github.com/appwrite/appwrite/issues/410))
+- New OAuth adapter for Tradeshift  (@armino-dev - [#855](https://github.com/appwrite/appwrite/pull/855))
+- New OAuth adapter for Tradeshift sandbox  (@armino-dev - [#855](https://github.com/appwrite/appwrite/pull/855))
+- Introducing new permssion types: role:guest & role:member
+- Disabled rate-limits on server side integrations
+- Refactored migration script 
 
 ### User Interface
+
 - Updated grid for OAuth2 providers list in the console ([#413](https://github.com/appwrite/appwrite/issues/413))
 - Added Google Fonts to Appwrite for offline availability 
 - Added option to delete user from the console (@PineappleIOnic - [#538](https://github.com/appwrite/appwrite/issues/538))
@@ -53,6 +59,7 @@
 - Added toggle to hide/show secret keys and passwords inside the dashboard (@kodumbeats, [#535](https://github.com/appwrite/appwrite/issues/535))
 
 ### Upgrades
+
 - Upgraded QR codes generator library (@PedroCisnerosSantana - [#475](https://github.com/appwrite/appwrite/issues/475))
 - Upgraded Traefik image to version 2.3
 - Upgraded MariaDB to version 10.5.5
@@ -61,8 +68,10 @@
 - Upgraded Redis Resque queue library to version 1.3.6 ([#319](https://github.com/appwrite/appwrite/issues/319))
 - Upgraded ClamAV container image to version 1.0.11 ([#412](https://github.com/appwrite/appwrite/issues/412))
 - Upgraded device detctor to version 3.12.6
+- Upgraded GEOIP DB file to Feb 2021 release
 
 ## Breaking Changes (Read before upgrading!)
+
 - **Deprecated** `first` and `last` query params for documents list route in the database API
 - **Deprecated** Deprectaed Pubjabi Translations ('pn')
 - **Deprecated** `PATCH /account/prefs` is now updating the prefs payload and not just merging it
@@ -100,6 +109,8 @@
 - Fixed OAuth redirect when using the self-hosted instance default success URL ([#454](https://github.com/appwrite/appwrite/issues/454))
 - Fixed bug denying authentication with Github OAuth provider
 - Fixed a bug making read permission overwrite write permission in some cases
+- Fixed consistent property names in databases by enforcing camel case
+
 ## Security
 
 - Access to Health API now requires authentication with an API Key with access to `health.read` scope allowed
@@ -107,6 +118,8 @@
 - Now using your `_APP_SYSTEM_EMAIL_ADDRESS` as the email address for issuing and renewing SSL certificates
 - Block iframe access to Appwrite console using the `X-Frame-Options` header.
 - Fixed `roles` param input validator
+- API Keys are now stored encrypted 
+- Disabled domains whitlist ACL for the Appwrite console
 
 # Version 0.6.2 (PRE-RELEASE)
 

CONTRIBUTING.md

@@ -72,7 +72,23 @@ cd appwrite
 docker-compose up -d
 ```
 
-After finishing the installation process, you can start writing and editing code. To compile new CSS and JS distribution files, use 'less' and 'build' tasks using gulp as a task manager.
+### Code Autocompletion
+
+To get proper autocompletion for all the different functions and classes in the codebase, you'll need to install Appwrite dependencies on your local machine. You can easily do that with PHP's package manager, [Composer](https://getcomposer.org/). If you don't have Composer installed, you can use the Docker Hub image to get the same result:
+
+```bash
+docker run --rm --interactive --tty \
+  --volume $PWD:/app \
+  composer update --ignore-platform-reqs --optimize-autoloader --no-plugins --no-scripts --prefer-dist
+```
+
+### User Interface
+
+Appwrite uses an internal micro-framework called Litespeed.js to build simple UI components in vanilla JS and [less](http://lesscss.org/) for compiling CSS code. To apply any of your changes to the UI, use the `gulp build` or `gulp less` commands, and restart the Appwrite main container to load the new static files to memory using `docker-compose restart appwrite`.
+
+### Get Started
+
+After finishing the installation process, you can start writing and editing code.
 
 ## Architecture
 
@@ -216,7 +232,7 @@ For us to find the right balance, please open an issue explaining your ideas bef
 
 This will allow the Appwrite community to have sufficient discussion about the new feature value and how it fits in the product roadmap and vision.
 
-This is also important for the Appwrite lead developers to be able to give technical input and different emphasis regarding the feature design and architecture.
+This is also important for the Appwrite lead developers to be able to give technical input and different emphasis regarding the feature design and architecture. Some bigger features might need to go through our [RFC process](https://github.com/appwrite/rfc).
 
 ## Build
 
@@ -348,5 +364,5 @@ Submitting documentation updates, enhancements, designs, or bug fixes. Spelling
 
 ### Helping Someone
 
-Searching for Appwrite on Discord, GitHub, or StackOverflow and helping someone else who needs help. You can also help by reaching others how to contribute to Appwrite's repo!
+Searching for Appwrite on Discord, GitHub, or StackOverflow and helping someone else who needs help. You can also help by teaching others how to contribute to Appwrite's repo!
 

Dockerfile

@@ -99,7 +99,12 @@ ENV _APP_SERVER=swoole \
     _APP_FUNCTIONS_MEMORY_SWAP=128 \
     _APP_SETUP=self-hosted \
     _APP_VERSION=$VERSION \
+    _APP_USAGE_STATS=enabled \
+    # 14 Days = 1209600 s
+    _APP_MAINTENANCE_RETENTION_EXECUTION=1209600 \
+    _APP_MAINTENANCE_RETENTION_AUDIT=1209600 \
     # 1 Day = 86400 s
+    _APP_MAINTENANCE_RETENTION_ABUSE=86400 \
     _APP_MAINTENANCE_INTERVAL=86400
 #ENV _APP_SMTP_SECURE ''
 #ENV _APP_SMTP_USERNAME ''

Dockerfile.nginx

@@ -1,185 +0,0 @@
-FROM ubuntu:18.04 AS builder
-
-LABEL maintainer="team@appwrite.io"
-
-ARG TESTING=false
-
-ENV TZ=Asia/Tel_Aviv \
-    DEBIAN_FRONTEND=noninteractive \
-    PHP_VERSION=7.4 \
-    PHP_REDIS_VERSION=5.2.1
-
-RUN \
-  apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests ca-certificates software-properties-common wget git openssl && \
-  LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests make php$PHP_VERSION php$PHP_VERSION-dev zip unzip php$PHP_VERSION-zip && \
-  # Redis Extension
-  wget -q https://github.com/phpredis/phpredis/archive/$PHP_REDIS_VERSION.tar.gz && \
-  tar -xf $PHP_REDIS_VERSION.tar.gz && \
-  cd phpredis-$PHP_REDIS_VERSION && \
-  phpize$PHP_VERSION && \
-  ./configure && \
-  make && \
-  # Composer
-  wget https://getcomposer.org/composer.phar && \
-  chmod +x ./composer.phar && \
-  mv ./composer.phar /usr/bin/composer && \
-  #Brotli
-  cd / && \
-  git clone https://github.com/eustas/ngx_brotli.git && \
-  cd ngx_brotli && git submodule update --init && cd ..
-
-WORKDIR /usr/local/src/
-
-# Updating PHP Dependencies and Auto-loading...
-
-ENV TESTING=$TESTING
-
-COPY composer.* /usr/local/src/
-
-RUN composer update --ignore-platform-reqs --optimize-autoloader \
-    --no-plugins --no-scripts --prefer-dist \
-    `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
-
-FROM ubuntu:18.04
-LABEL maintainer="team@appwrite.io"
-
-ARG VERSION=dev
-
-ENV TZ=Asia/Tel_Aviv \
-    DEBIAN_FRONTEND=noninteractive \
-    PHP_VERSION=7.4 \
-    _APP_SERVER=nginx \
-    _APP_ENV=production \
-    _APP_DOMAIN=localhost \
-    _APP_DOMAIN_TARGET=localhost \
-    _APP_HOME=https://appwrite.io \
-    _APP_EDITION=community \
-    _APP_OPTIONS_ABUSE=enabled \
-    _APP_OPTIONS_FORCE_HTTPS=disabled \
-    _APP_OPENSSL_KEY_V1=your-secret-key \
-    _APP_STORAGE_LIMIT=10000000 \
-    _APP_STORAGE_ANTIVIRUS=enabled \
-    _APP_REDIS_HOST=redis \
-    _APP_REDIS_PORT=6379 \
-    _APP_DB_HOST=mariadb \
-    _APP_DB_PORT=3306 \
-    _APP_DB_USER=root \
-    _APP_DB_PASS=password \
-    _APP_DB_SCHEMA=appwrite \
-    _APP_INFLUXDB_HOST=influxdb \
-    _APP_INFLUXDB_PORT=8086 \
-    _APP_STATSD_HOST=telegraf \
-    _APP_STATSD_PORT=8125 \
-    _APP_SMTP_HOST=smtp \
-    _APP_SMTP_PORT=25 \
-    _APP_SETUP=self-hosted \
-    _APP_VERSION=$VERSION
-#ENV _APP_SMTP_SECURE ''
-#ENV _APP_SMTP_USERNAME ''
-#ENV _APP_SMTP_PASSWORD ''
-
-COPY --from=builder /phpredis-5.2.1/modules/redis.so /usr/lib/php/20190902/
-COPY --from=builder /phpredis-5.2.1/modules/redis.so /usr/lib/php/20190902/
-COPY --from=builder /ngx_brotli /ngx_brotli
-
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-RUN \
-  apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests wget ca-certificates software-properties-common build-essential libpcre3-dev zlib1g-dev libssl-dev openssl gnupg htop supervisor && \
-  LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php && \
-  add-apt-repository universe && \
-  add-apt-repository ppa:certbot/certbot && \
-  apt-get update && \
-  apt-get install -y --no-install-recommends --no-install-suggests php$PHP_VERSION php$PHP_VERSION-fpm \
-  php$PHP_VERSION-mysqlnd php$PHP_VERSION-curl php$PHP_VERSION-imagick php$PHP_VERSION-mbstring php$PHP_VERSION-dom certbot && \
-  # Nginx
-  wget http://nginx.org/download/nginx-1.19.0.tar.gz && \
-  tar -xzvf nginx-1.19.0.tar.gz && rm nginx-1.19.0.tar.gz && \
-  cd nginx-1.19.0 && \
-  ./configure --prefix=/usr/share/nginx \
-    --sbin-path=/usr/sbin/nginx \
-    --modules-path=/usr/lib/nginx/modules \
-    --conf-path=/etc/nginx/nginx.conf \
-    --error-log-path=/var/log/nginx/error.log \
-    --http-log-path=/var/log/nginx/access.log \
-    --pid-path=/run/nginx.pid \
-    --lock-path=/var/lock/nginx.lock \
-    --user=www-data \
-    --group=www-data \
-    --build=Ubuntu \
-    --with-http_gzip_static_module \
-    --with-http_ssl_module \
-    --with-http_v2_module \
-    --add-module=/ngx_brotli && \
-  make && \
-  make install && \
-  rm -rf ../nginx-1.19.0 && \
-  # Redis Extension
-  echo extension=redis.so >> /etc/php/$PHP_VERSION/fpm/conf.d/redis.ini && \
-  echo extension=redis.so >> /etc/php/$PHP_VERSION/cli/conf.d/redis.ini && \
-  # Cleanup
-  cd ../ && \
-  apt-get purge -y --auto-remove wget software-properties-common build-essential libpcre3-dev zlib1g-dev libssl-dev gnupg && \
-  apt-get clean && \
-  rm -rf /ngx_brotli && \
-  rm -rf /var/lib/apt/lists/*
-
-# Set Upload Limit (default to 100MB)
-RUN echo "upload_max_filesize = ${_APP_STORAGE_LIMIT}" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
-RUN echo "post_max_size = ${_APP_STORAGE_LIMIT}" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
-RUN echo "opcache.preload_user=www-data" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
-RUN echo "opcache.preload=/usr/src/code/app/preload.php" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
-RUN echo "opcache.enable_cli = 1" >> /etc/php/$PHP_VERSION/fpm/conf.d/appwrite.ini
-
-# Add logs file
-RUN echo "" >> /var/log/appwrite.log
-
-# Nginx Configuration (with self-signed ssl certificates)
-COPY ./docker/nginx.conf.template /etc/nginx/nginx.conf.template
-COPY ./docker/ssl/cert.pem /etc/nginx/ssl/cert.pem
-COPY ./docker/ssl/key.pem /etc/nginx/ssl/key.pem
-
-# PHP Configuration
-RUN mkdir -p /var/run/php
-COPY ./docker/www.conf /etc/php/$PHP_VERSION/fpm/pool.d/www.conf
-
-# Add PHP Source Code
-COPY ./app /usr/src/code/app
-COPY ./bin /usr/local/bin
-COPY ./docs /usr/src/code/docs
-COPY ./public /usr/src/code/public
-COPY ./src /usr/src/code/src
-COPY --from=builder /usr/local/src/vendor /usr/src/code/vendor
-
-RUN mkdir -p /storage/uploads && \
-    mkdir -p /storage/cache && \
-    mkdir -p /storage/config && \
-    mkdir -p /storage/certificates && \
-    mkdir -p /storage/functions && \
-    chown -Rf www-data.www-data /storage/uploads && chmod -Rf 0755 /storage/uploads && \
-    chown -Rf www-data.www-data /storage/cache && chmod -Rf 0755 /storage/cache && \
-    chown -Rf www-data.www-data /storage/config && chmod -Rf 0755 /storage/config && \
-    chown -Rf www-data.www-data /storage/certificates && chmod -Rf 0755 /storage/certificates && \
-    chown -Rf www-data.www-data /storage/functions && chmod -Rf 0755 /storage/functions
-
-# Supervisord Conf
-COPY ./docker/supervisord.conf /etc/supervisord.conf
-
-# Executables
-RUN chmod +x /usr/local/bin/start
-RUN chmod +x /usr/local/bin/doctor
-RUN chmod +x /usr/local/bin/migrate
-RUN chmod +x /usr/local/bin/test
-
-# Letsencrypt Permissions
-RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
-
-EXPOSE 80
-
-WORKDIR /usr/src/code
-
-CMD ["/bin/bash", "/usr/local/bin/start"]

README.md

@@ -53,7 +53,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.7.0 --version 0.7.0
+    appwrite/appwrite:0.7.0
 ```
 
 ### Windows
@@ -65,7 +65,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.7.0 --version 0.7.0
+    appwrite/appwrite:0.7.0
 ```
 
 #### PowerShell
@@ -75,7 +75,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.7.0 --version 0.7.0
+    appwrite/appwrite:0.7.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.
@@ -102,7 +102,7 @@ Getting started with Appwrite is as easy as creating a new project, choosing you
 * [**Account**](https://appwrite.io/docs/client/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
 * [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when in admin mode.
 * [**Teams**](https://appwrite.io/docs/client/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
-* [**Database**](https://appwrite.io/docs/client/database) - Manage database collections and documents. Read, create, update, and delete documents and filter lists of documents collections using an advanced filter with graph-like capabilities.
+* [**Database**](https://appwrite.io/docs/client/database) - Manage database collections and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
 * [**Storage**](https://appwrite.io/docs/client/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to fit your app perfectly. All files are scanned by ClamAV and stored in a secure and encrypted way.
 * [**Functions**](https://appwrite.io/docs/server/functions) - Customize your Appwrite server by executing your custom code in a secure, isolated environment. You can trigger your code on any Appwrite system event, manually or using a CRON schedule.
 * [**Locale**](https://appwrite.io/docs/client/locale) - Track your user's location, and manage your app locale-based data.
@@ -115,7 +115,7 @@ For the complete API documentation, visit [https://appwrite.io/docs](https://app
 Below is a list of currently supported platforms and languages. If you wish to help us add support to your platform of choice, you can go over to our [SDK Generator](https://github.com/appwrite/sdk-generator) project and view our [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md).
 
 #### Client
-* ✅    [Web](https://github.com/appwrite/sdk-for-js) (Maintained by the Appwrite Team)
+* ✅    [Web](https://github.com/appwrite/sdk-for-web) (Maintained by the Appwrite Team)
 * ✅    [Flutter](https://github.com/appwrite/sdk-for-flutter) (Maintained by the Appwrite Team)
 
 #### Server

app/config/collections.php

@@ -228,7 +228,7 @@ $collections = [
             [
                 '$collection' => Database::SYSTEM_COLLECTION_RULES,
                 'label' => 'Password Update Date',
-                'key' => 'password-update',
+                'key' => 'passwordUpdate',
                 'type' => Database::SYSTEM_VAR_TYPE_NUMERIC,
                 'default' => '',
                 'required' => true,
@@ -827,6 +827,7 @@ $collections = [
                 'type' => Database::SYSTEM_VAR_TYPE_TEXT,
                 'default' => '',
                 'required' => false,
+                'filter' => ['encrypt'],
             ],
         ],
     ],

app/config/environments.php

@@ -1,15 +1,29 @@
 <?php
+
+use Utopia\App;
+use Utopia\System\System;
+
 /**
  * List of Appwrite Cloud Functions supported environments
  */
-return [
-    'node-14' => [
+$environments = [
+    'node-14.5' => [
         'name' => 'Node.js',
         'version' => '14.5',
         'base' => 'node:14.5-alpine',
         'image' => 'appwrite/env-node-14.5:1.0.0',
         'build' => '/usr/src/code/docker/environments/node-14.5',
         'logo' => 'node.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
+    ],
+    'node-15.5' => [
+        'name' => 'Node.js',
+        'version' => '15.5',
+        'base' => 'node:15.5-alpine',
+        'image' => 'appwrite/env-node-15.5:1.0.0',
+        'build' => '/usr/src/code/docker/environments/node-15.5',
+        'logo' => 'node.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
     'php-7.4' => [
         'name' => 'PHP',
@@ -18,6 +32,7 @@ return [
         'image' => 'appwrite/env-php-7.4:1.0.0',
         'build' => '/usr/src/code/docker/environments/php-7.4',
         'logo' => 'php.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
     'php-8.0' => [
         'name' => 'PHP',
@@ -26,6 +41,7 @@ return [
         'image' => 'appwrite/env-php-8.0:1.0.0',
         'build' => '/usr/src/code/docker/environments/php-8.0',
         'logo' => 'php.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
     'ruby-2.7' => [
         'name' => 'Ruby',
@@ -34,6 +50,16 @@ return [
         'image' => 'appwrite/env-ruby-2.7:1.0.2',
         'build' => '/usr/src/code/docker/environments/ruby-2.7',
         'logo' => 'ruby.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
+    ],
+    'ruby-3.0' => [
+        'name' => 'Ruby',
+        'version' => '3.0',
+        'base' => 'ruby:3.0-alpine',
+        'image' => 'appwrite/env-ruby-3.0:1.0.0',
+        'build' => '/usr/src/code/docker/environments/ruby-3.0',
+        'logo' => 'ruby.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
     'python-3.8' => [
         'name' => 'Python',
@@ -42,6 +68,7 @@ return [
         'image' => 'appwrite/env-python-3.8:1.0.0',
         'build' => '/usr/src/code/docker/environments/python-3.8',
         'logo' => 'python.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
     'deno-1.2' => [
         'name' => 'Deno',
@@ -50,6 +77,7 @@ return [
         'image' => 'appwrite/env-deno-1.2:1.0.0',
         'build' => '/usr/src/code/docker/environments/deno-1.2',
         'logo' => 'deno.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
     'deno-1.5' => [
         'name' => 'Deno',
@@ -58,13 +86,53 @@ return [
         'image' => 'appwrite/env-deno-1.5:1.0.0',
         'build' => '/usr/src/code/docker/environments/deno-1.5',
         'logo' => 'deno.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
     ],
-    // 'dart-2.8' => [
-    //     'name' => 'Dart',
-    //     'version' => '2.8',
-    //     'base' => 'google/dart:2.8',
-    //     'image' => 'appwrite/env-dart:2.8',
-    //     'build' => '/usr/src/code/docker/environments/dart-2.8',
-    //     'logo' => 'dart.png',
-    // ],
-];
+    'deno-1.6' => [
+        'name' => 'Deno',
+        'version' => '1.6',
+        'base' => 'hayd/deno:alpine-1.6.0',
+        'image' => 'appwrite/env-deno-1.6:1.0.0',
+        'build' => '/usr/src/code/docker/environments/deno-1.6',
+        'logo' => 'deno.png',
+        'supports' => [System::X86, System::PPC, System::ARM],
+    ],
+    'dart-2.10' => [
+        'name' => 'Dart',
+        'version' => '2.10',
+        'base' => 'google/dart:2.10',
+        'image' => 'appwrite/env-dart-2.10:1.0.0',
+        'build' => '/usr/src/code/docker/environments/dart-2.10',
+        'logo' => 'dart.png',
+        'supports' => [System::X86],
+    ],
+    'dotnet-3.1' => [
+        'name' => '.NET',
+        'version' => '3.1',
+        'base' => 'mcr.microsoft.com/dotnet/runtime:3.1-alpine',
+        'image' => 'appwrite/env-dotnet-3.1:1.0.0',
+        'build' => '/usr/src/code/docker/environments/dotnet-3.1',
+        'logo' => 'dotnet.png',
+        'supports' => [System::X86, System::ARM],
+    ],
+    'dotnet-5.0' => [
+        'name' => '.NET',
+        'version' => '5.0',
+        'base' => 'mcr.microsoft.com/dotnet/runtime:5.0-alpine',
+        'image' => 'appwrite/env-dotnet-5.0:1.0.0',
+        'build' => '/usr/src/code/docker/environments/dotnet-5.0',
+        'logo' => 'dotnet.png',
+        'supports' => [System::X86, System::ARM],
+    ],
+];
+
+$allowList = empty(App::getEnv('_APP_FUNCTIONS_ENVS', null)) ? false : \explode(',', App::getEnv('_APP_FUNCTIONS_ENVS', null));
+
+$environments = array_filter($environments, function ($environment, $key) use ($allowList) {
+    $isAllowed = $allowList && in_array($key, $allowList);
+    $isSupported = in_array(System::getArchEnum(), $environment["supports"]);
+
+    return $allowList ? ($isAllowed && $isSupported) : $isSupported;
+}, ARRAY_FILTER_USE_BOTH);
+
+return $environments;

app/config/platforms.php

@@ -15,28 +15,30 @@ return [
             [
                 'key' => 'web',
                 'name' => 'Web',
-                'version' => '1.2.0',
-                'url' => 'https://github.com/appwrite/sdk-for-js',
+                'version' => '2.0.0',
+                'url' => 'https://github.com/appwrite/sdk-for-web',
                 'package' => 'https://www.npmjs.com/package/appwrite',
                 'enabled' => true,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
                 'prism' => 'javascript',
                 'source' => \realpath(__DIR__ . '/../sdks/client-web'),
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-js.git',
-                'gitRepoName' => 'sdk-for-js',
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-web.git',
+                'gitRepoName' => 'sdk-for-web',
                 'gitUserName' => 'appwrite',
             ],
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '0.3.0-dev.2',
+                'version' => '0.3.0',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
                 'beta' => true,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
                 'prism' => 'dart',
                 'source' => \realpath(__DIR__ . '/../sdks/client-flutter'),
@@ -52,6 +54,7 @@ return [
                 'enabled' => false,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
                 'prism' => 'swift',
                 'source' => false,
@@ -67,6 +70,7 @@ return [
                 'enabled' => false,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
                 'prism' => '',
                 'source' => false,
@@ -82,6 +86,7 @@ return [
                 'enabled' => false,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_CLIENT,
                 'prism' => 'kotlin',
                 'source' => false,
@@ -94,9 +99,9 @@ return [
             //     'name' => 'Java',
             //     'url' => '',
             //     'enabled' => false,
-            //     'dev' => false,
             //     'beta' => false,
             //     'dev' => false,
+            //     'hidden' => false,
             //     'family' => APP_PLATFORM_CLIENT,
             //     'prism' => 'java',
             //     'source' => false,
@@ -122,6 +127,7 @@ return [
                 'enabled' => true,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => true,
                 'family' => APP_PLATFORM_CONSOLE,
                 'prism' => 'console',
                 'source' => \realpath(__DIR__ . '/../sdks/console-web'),
@@ -142,12 +148,13 @@ return [
             [
                 'key' => 'nodejs',
                 'name' => 'Node.js',
-                'version' => '1.1.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-node',
                 'package' => 'https://www.npmjs.com/package/node-appwrite',
                 'enabled' => true,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'javascript',
                 'source' => \realpath(__DIR__ . '/../sdks/server-nodejs'),
@@ -158,12 +165,13 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '0.0.2',
+                'version' => '0.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
                 'beta' => true,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'typescript',
                 'source' => \realpath(__DIR__ . '/../sdks/server-deno'),
@@ -174,12 +182,13 @@ return [
             [
                 'key' => 'php',
                 'name' => 'PHP',
-                'version' => '1.1.0',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-php',
                 'package' => 'https://packagist.org/packages/appwrite/appwrite',
                 'enabled' => true,
                 'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'php',
                 'source' => \realpath(__DIR__ . '/../sdks/server-php'),
@@ -190,12 +199,13 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '0.0.6',
+                'version' => '0.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
-                'beta' => true,
+                'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'python',
                 'source' => \realpath(__DIR__ . '/../sdks/server-python'),
@@ -206,12 +216,13 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '1.0.11',
+                'version' => '2.0.0',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
-                'beta' => true,
+                'beta' => false,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'ruby',
                 'source' => \realpath(__DIR__ . '/../sdks/server-ruby'),
@@ -228,6 +239,7 @@ return [
                 'enabled' => false,
                 'beta' => true,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'go',
                 'source' => \realpath(__DIR__ . '/../sdks/server-go'),
@@ -244,6 +256,7 @@ return [
                 'enabled' => false,
                 'beta' => true,
                 'dev' => false,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'java',
                 'source' => \realpath(__DIR__ . '/../sdks/server-java'),
@@ -254,12 +267,13 @@ return [
             [
                 'key' => 'dotnet',
                 'name' => '.NET',
-                'version' => '0.0.2',
+                'version' => '0.1.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dotnet',
                 'package' => 'https://www.nuget.org/packages/Appwrite',
                 'enabled' => true,
                 'beta' => true,
                 'dev' => true,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'csharp',
                 'source' => \realpath(__DIR__ . '/../sdks/server-dotnet'),
@@ -270,12 +284,13 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '0.1.0',
+                'version' => '0.2.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
-                'package' => '',
+                'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
                 'beta' => true,
                 'dev' => true,
+                'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'dart',
                 'source' => \realpath(__DIR__ . '/../sdks/server-dart'),
@@ -283,6 +298,23 @@ return [
                 'gitRepoName' => 'sdk-for-dart',
                 'gitUserName' => 'appwrite',
             ],
+            [
+                'key' => 'cli',
+                'name' => 'Command Line',
+                'version' => '0.5.0',
+                'url' => 'https://github.com/appwrite/sdk-for-cli',
+                'package' => 'https://github.com/appwrite/sdk-for-cli',
+                'enabled' => true,
+                'beta' => true,
+                'dev' => false,
+                'hidden' => true,
+                'family' => APP_PLATFORM_SERVER,
+                'prism' => 'bash',
+                'source' => \realpath(__DIR__ . '/../sdks/server-cli'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-cli.git',
+                'gitRepoName' => 'sdk-for-cli',
+                'gitUserName' => 'appwrite',
+            ],
         ],
     ],
 ];

app/config/providers.php

@@ -163,6 +163,24 @@ return [ // Ordered by ABC.
         'beta' => false,
         'mock' => false,
     ],
+    'tradeshift' => [
+        'name' => 'Tradeshift',
+        'developers' => 'https://developers.tradeshift.com/docs/api',
+        'icon' => 'icon-tradeshift',
+        'enabled' => true,
+        'form' => false,
+        'beta' => false,
+        'mock' => false,
+    ],
+    'tradeshiftBox' => [
+        'name' => 'Tradeshift Sandbox',
+        'developers' => 'https://developers.tradeshift.com/docs/api',
+        'icon' => 'icon-tradeshiftbox',
+        'enabled' => true,
+        'form' => false,
+        'beta' => false,
+        'mock' => false,
+    ],
     'twitch' => [
         'name' => 'Twitch',
         'developers' => 'https://dev.twitch.tv/docs/authentication',
@@ -215,6 +233,15 @@ return [ // Ordered by ABC.
     //     'beta' => false,
     //     'mock' => false,
     // ],
+    'wordpress' => [
+        'name' => 'WordPress',
+        'developers' => 'https://developer.wordpress.com/docs/oauth2/',
+        'icon' => 'icon-wordpress',
+        'enabled' => true,
+        'form' => false,
+        'beta' => false,
+        'mock' => false
+    ],
     // Keep Last
     'mock' => [
         'name' => 'Mock',
@@ -225,13 +252,4 @@ return [ // Ordered by ABC.
         'beta' => false,
         'mock' => true,
     ],
-    'wordpress' => [
-        'name' => 'WordPress',
-        'developers' => 'https://developer.wordpress.com/docs/oauth2/',
-        'icon' => 'icon-wordpress',
-        'enabled' => true,
-        'form' => false,
-        'beta' => false,
-        'mock' => false
-    ]
 ];

app/config/roles.php

@@ -1,15 +1,8 @@
 <?php
 
-const ROLE_GUEST = 0;
-const ROLE_MEMBER = 1;
-const ROLE_ADMIN = 2;
-const ROLE_DEVELOPER = 3;
-const ROLE_OWNER = 4;
-const ROLE_APP = 5;
-const ROLE_SYSTEM = 6;
-const ROLE_ALL = '*';
+use Appwrite\Auth\Auth;
 
-$logged = [
+$member = [
     'public',
     'home',
     'console',
@@ -57,7 +50,7 @@ $admins = [
 ];
 
 return [
-    ROLE_GUEST => [
+    Auth::USER_ROLE_GUEST => [
         'label' => 'Guest',
         'scopes' => [
             'public',
@@ -71,23 +64,23 @@ return [
             'execution.write',
         ],
     ],
-    ROLE_MEMBER => [
+    Auth::USER_ROLE_MEMBER => [
         'label' => 'Member',
-        'scopes' => \array_merge($logged, []),
+        'scopes' => \array_merge($member, []),
     ],
-    ROLE_ADMIN => [
+    Auth::USER_ROLE_ADMIN => [
         'label' => 'Admin',
         'scopes' => \array_merge($admins, []),
     ],
-    ROLE_DEVELOPER => [
+    Auth::USER_ROLE_DEVELOPER => [
         'label' => 'Developer',
         'scopes' => \array_merge($admins, []),
     ],
-    ROLE_OWNER => [
+    Auth::USER_ROLE_OWNER => [
         'label' => 'Owner',
-        'scopes' => \array_merge($logged, $admins, []),
+        'scopes' => \array_merge($member, $admins, []),
     ],
-    ROLE_APP => [
+    Auth::USER_ROLE_APP => [
         'label' => 'Application',
         'scopes' => ['health.read'],
     ],

app/config/services.php

@@ -2,98 +2,139 @@
 
 return [
     '/' => [
+        'key' => 'homepage',
         'name' => 'Homepage',
+        'subtitle' => '',
         'controller' => 'web/home.php',
         'sdk' => false,
+        'docs' => false,
         'tests' => false,
     ],
     'console/' => [
+        'key' => 'console',
         'name' => 'Console',
         'controller' => 'web/console.php',
         'sdk' => false,
+        'docs' => false,
         'tests' => false,
     ],
     'v1/account' => [
+        'key' => 'account',
         'name' => 'Account',
+        'subtitle' => 'The Account service allows you to authenticate and manage a user account.',
         'description' => '/docs/services/account.md',
         'controller' => 'api/account.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/avatars' => [
+        'key' => 'avatars',
         'name' => 'Avatars',
+        'subtitle'=> 'The Avatars service aims to help you complete everyday tasks related to your app image, icons, and avatars.',
         'description' => '/docs/services/avatars.md',
         'controller' => 'api/avatars.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/database' => [
+        'key' => 'database',
         'name' => 'Database',
+        'subtitle' => 'The Database service allows you to create structured collections of documents, query and filter lists of documents',
         'description' => '/docs/services/database.md',
         'controller' => 'api/database.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/locale' => [
+        'key' => 'locale',
         'name' => 'Locale',
+        'subtitle' => 'The Locale service allows you to customize your app based on your users\' location.',
         'description' => '/docs/services/locale.md',
         'controller' => 'api/locale.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/health' => [
+        'key' => 'health',
         'name' => 'Health',
+        'subtitle' => 'The Health service allows you to both validate and monitor your Appwrite server\'s health.',
         'description' => '/docs/services/health.md',
         'controller' => 'api/health.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/projects' => [
+        'key' => 'projects',
         'name' => 'Projects',
+        'subtitle' => 'The Project service allows you to manage all the projects in your Appwrite server.',
         'controller' => 'api/projects.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/storage' => [
+        'key' => 'storage',
         'name' => 'Storage',
+        'subtitle' => 'The Storage service allows you to manage your project files.',
         'description' => '/docs/services/storage.md',
         'controller' => 'api/storage.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/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',
         'description' => '/docs/services/teams.md',
         'controller' => 'api/teams.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/users' => [
+        'key' => 'users',
         'name' => 'Users',
+        'subtitle' => 'The Users service allows you to manage your project users.',
         'description' => '/docs/services/users.md',
         'controller' => 'api/users.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/functions' => [
-        'name' => 'Users',
+        'key' => 'functions',
+        'name' => 'Functions',
+        'subtitle' => 'The Functions Service allows you view, create and manage your Cloud Functions.',
         'description' => '/docs/services/functions.md',
         'controller' => 'api/functions.php',
         'sdk' => true,
+        'docs' => true,
         'tests' => false,
     ],
     'v1/mock' => [
+        'key' => 'mock',
         'name' => 'Mock',
+        'subtitle' => '',
         'description' => '',
         'controller' => 'mock.php',
         'sdk' => false,
+        'docs' => false,
         'tests' => true,
     ],
     'v1/graphql' => [
+        'key' => 'graphql',
         'name' => 'GraphQL',
+        'subtitle' => 'Appwrite\'s GraphQL Endpoint',
         'description' => 'GraphQL Endpoint',
         'controller' => 'api/graphql.php',
         'sdk' => false,
+        'docs' => false,
         'tests' => false,
     ],
 ];

app/config/variables.php

@@ -1,5 +1,7 @@
 <?php
 
+use Utopia\Config\Config;
+
 return [
     [
         'category' => 'General',
@@ -22,7 +24,7 @@ return [
                 'question' => '',
             ],
             [
-                'name' => '_APP_OPTIONS_FORCE_HTTPS', 
+                'name' => '_APP_OPTIONS_FORCE_HTTPS',
                 'description' => 'Allows you to force HTTPS connection to your API. This feature redirects any HTTP call to HTTPS and adds the \'Strict-Transport-Security\' header to all HTTP responses. By default, set to \'disabled\'. To enable, set to \'enabled\'. This feature will work only when your ports are set to default 80 and 443.',
                 'introduction' => '',
                 'default' => 'enabled',
@@ -51,7 +53,7 @@ return [
                 'introduction' => '',
                 'default' => 'localhost',
                 'required' => true,
-                'question' => "Enter a DNS A record hostname to serve as a CNAME for your custom domains.\nYou can use the same value as used for the Appwrite hostname.",
+                'question' => 'Enter a DNS A record hostname to serve as a CNAME for your custom domains.\nYou can use the same value as used for the Appwrite hostname.',
             ],
             [
                 'name' => '_APP_CONSOLE_WHITELIST_EMAILS',
@@ -61,17 +63,17 @@ return [
                 'required' => false,
                 'question' => '',
             ],
-            [
-                'name' => '_APP_CONSOLE_WHITELIST_DOMAINS',
-                'description' => "This option allows you to limit creation of users to Appwrite console for users sharing the same email domains. This option is very useful for team working with company emails domain.\n\nTo enable this option, pass a list of allowed email domains separated by a comma.",
-                'introduction' => '',
-                'default' => '',
-                'required' => false,
-                'question' => '',
-            ],
+            // [
+            //     'name' => '_APP_CONSOLE_WHITELIST_DOMAINS',
+            //     'description' => 'This option allows you to limit creation of users to Appwrite console for users sharing the same email domains. This option is very useful for team working with company emails domain.\n\nTo enable this option, pass a list of allowed email domains separated by a comma.',
+            //     'introduction' => '',
+            //     'default' => '',
+            //     'required' => false,
+            //     'question' => '',
+            // ],
             [
                 'name' => '_APP_CONSOLE_WHITELIST_IPS',
-                'description' => "This last option allows you to limit creation of users in Appwrite console for users sharing the same set of IP addresses. This option is very useful for team working with a VPN service or a company IP.\n\nTo enable/activate this option, pass a list of allowed IP addresses separated by a comma.",
+                'description' => 'This last option allows you to limit creation of users in Appwrite console for users sharing the same set of IP addresses. This option is very useful for team working with a VPN service or a company IP.\n\nTo enable/activate this option, pass a list of allowed IP addresses separated by a comma.',
                 'introduction' => '',
                 'default' => '',
                 'required' => false,
@@ -93,6 +95,30 @@ return [
                 'required' => false,
                 'question' => '',
             ],
+            [
+                'name' => '_APP_SYSTEM_RESPONSE_FORMAT',
+                'description' => 'Use this environment variable to set the default Appwrite HTTP response format to support an older version of Appwrite. This option is useful to overcome breaking changes between versions. You can also use the `X-Appwrite-Response-Format` HTTP request header to overwrite the response for a specific request. This variable accepts any valid Appwrite version. To use the current version format, leave the value of the variable empty.',
+                'introduction' => '0.7.0',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+            ],
+            [
+                'name' => '_APP_SYSTEM_SECURITY_EMAIL_ADDRESS',
+                'description' => 'This is the email address used to issue SSL certificates for custom domains or the user agent in your webhooks payload.',
+                'introduction' => '0.7.0',
+                'default' => '',
+                'required' => true,
+                'question' => '',
+            ],
+            [
+                'name' => '_APP_USAGE_STATS',
+                'description' => 'This variable allows you to disable the collection and displaying of usage stats. This value is set to \'enabled\' by default, to disable the usage stats set the value to \'disabled\'. When disabled, it\'s recommended to turn off the Worker Usage, Influxdb and Telegraf containers for better resource usage.',
+                'introduction' => '0.7.0',
+                'default' => 'enabled',
+                'required' => false,
+                'question' => '',
+            ],
         ],
     ],
     [
@@ -115,6 +141,22 @@ return [
                 'required' => false,
                 'question' => '',
             ],
+            [
+                'name' => '_APP_REDIS_USER',
+                'description' => 'Redis server user.',
+                'introduction' => '0.7',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+            ],
+            [
+                'name' => '_APP_REDIS_PASS',
+                'description' => 'Redis server password.',
+                'introduction' => '0.7',
+                'default' => '',
+                'required' => false,
+                'question' => '',
+            ],
         ],
     ],
     [
@@ -147,7 +189,7 @@ return [
             ],
             [
                 'name' => '_APP_DB_USER',
-                'description' => 'MariaDB server user name. Default value is: \'root\'.',
+                'description' => 'MariaDB server user name. Default value is: \'user\'.',
                 'introduction' => '',
                 'default' => 'user',
                 'required' => false,
@@ -209,7 +251,7 @@ return [
     ],
     [
         'category' => 'SMTP',
-        'description' => "Appwrite is using an SMTP server for emailing your projects users and server admins. The SMTP env vars are used to allow Appwrite server to connect to the SMTP container.\n\nIf running in production, it might be easier to use a 3rd party SMTP server as it might be a little more difficult to set up a production SMTP server that will not send all your emails into your user's SPAM folder.",
+        'description' => 'Appwrite is using an SMTP server for emailing your projects users and server admins. The SMTP env vars are used to allow Appwrite server to connect to the SMTP container.\n\nIf running in production, it might be easier to use a 3rd party SMTP server as it might be a little more difficult to set up a production SMTP server that will not send all your emails into your user\'s SPAM folder.',
         'variables' => [
             [
                 'name' => '_APP_SMTP_HOST',
@@ -313,25 +355,33 @@ return [
             ],
             [
                 'name' => '_APP_FUNCTIONS_CPUS',
-                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is 1.',
+                'description' => 'The maximum number of CPU core a single cloud function is allowed to use. Please note that setting a value higher than available cores will result in a function error, which might result in an error. The default value is empty. When it\'s empty, CPU limit will be disabled.',
                 'introduction' => '0.7.0',
-                'default' => '1',
+                'default' => '',
                 'required' => false,
                 'question' => '',
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY',
-                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is 128.',
+                'description' => 'The maximum amount of memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, memory limit will be disabled.',
                 'introduction' => '0.7.0',
-                'default' => '128',
+                'default' => '256',
                 'required' => false,
                 'question' => '',
             ],
             [
                 'name' => '_APP_FUNCTIONS_MEMORY_SWAP',
-                'description' => 'The maximum amount of swap memory a single cloud function is allowed to use in megabytes. The default value is 128.',
+                'description' => 'The maximum amount of swap memory a single cloud function is allowed to use in megabytes. The default value is  empty. When it\'s empty, swap memory limit will be disabled.',
                 'introduction' => '0.7.0',
-                'default' => '128',
+                'default' => '256',
+                'required' => false,
+                'question' => '',
+            ],
+            [
+                'name' => '_APP_FUNCTIONS_ENVS',
+                'description' => 'This option allows you to limit the available environments for cloud functions. This option is very useful for low-cost servers to safe disk space.\n\nTo enable/activate this option, pass a list of allowed environments separated by a comma.\n\nCurrently, supported environments are: ' . \implode(', ', \array_keys(Config::getParam('providers'))),
+                'introduction' => '0.7.0',
+                'default' => 'node-14.5,deno-1.6,php-7.4,python-3.8,ruby-3.0,dotnet-5.0',
                 'required' => false,
                 'question' => '',
             ],
@@ -348,13 +398,31 @@ return [
                     'required' => false,
                     'question' => '',
                 ],
+                [
+                    'name' => '_APP_MAINTENANCE_RETENTION_EXECUTION',
+                    'description' => 'The maximum duration (in seconds) upto which to retain execution logs. The default value is 1209600 seconds (14 days).',
+                    'introduction' => '0.7.0',
+                    'default' => '1209600',
+                    'required' => false,
+                    'question' => '',
+                ],
+                [
+                    'name' => '_APP_MAINTENANCE_RETENTION_AUDIT',
+                    'description' => 'IThe maximum duration (in seconds) upto which to retain audit logs. The default value is 1209600 seconds (14 days).',
+                    'introduction' => '0.7.0',
+                    'default' => '1209600',
+                    'required' => false,
+                    'question' => '',
+                ],
+                [
+                    'name' => '_APP_MAINTENANCE_RETENTION_ABUSE',
+                    'description' => 'The maximum duration (in seconds) upto which to retain abuse logs. The default value is 86400 seconds (1 day).',
+                    'introduction' => '0.7.0',
+                    'default' => '86400',
+                    'required' => false,
+                    'question' => '',
+                ]
             ],
         ],
     ],
-    [
-        'name' => '_APP_SYSTEM_RESPONSE_FORMAT',
-        'default' => '',
-        'required' => false,
-        'question' => '',
-    ],
 ];

app/controllers/api/account.php

@@ -1,5 +1,6 @@
 <?php
 
+use Ahc\Jwt\JWT;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Config\Config;
@@ -18,11 +19,11 @@ use Appwrite\Database\Document;
 use Appwrite\Database\Exception\Duplicate;
 use Appwrite\Database\Validator\UID;
 use Appwrite\Database\Validator\Authorization;
+use Appwrite\Detector\Detector;
 use Appwrite\Template\Template;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\URL\URL as URLParser;
 use Appwrite\Utopia\Response;
-use DeviceDetector\DeviceDetector;
 use Utopia\Validator\ArrayList;
 
 $oauthDefaultSuccess = App::getEnv('_APP_HOME').'/auth/oauth2/success';
@@ -99,7 +100,7 @@ App::post('/v1/account')
                 'emailVerification' => false,
                 'status' => Auth::USER_STATUS_UNACTIVATED,
                 'password' => Auth::passwordHash($password),
-                'password-update' => \time(),
+                'passwordUpdate' => \time(),
                 'registration' => \time(),
                 'reset' => false,
                 'name' => $name,
@@ -183,59 +184,23 @@ App::post('/v1/account/sessions')
             throw new Exception('Invalid credentials. User is blocked', 401); // User is in status blocked
         }
 
-        $dd = new DeviceDetector($request->getUserAgent('UNKNOWN'));
-
-        $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'] : '';
-
+        $detector = new Detector($request->getUserAgent('UNKNOWN'));
+        $record = $geodb->get($request->getIP());
         $expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG;
         $secret = Auth::tokenGenerator();
-        $session = new Document([
-            '$collection' => Database::SYSTEM_COLLECTION_TOKENS,
-            '$permissions' => ['read' => ['user:'.$profile->getId()], 'write' => ['user:'.$profile->getId()]],
-            'userId' => $profile->getId(),
-            'type' => Auth::TOKEN_TYPE_LOGIN,
-            'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
-            'expire' => $expiry,
-            'userAgent' => $request->getUserAgent('UNKNOWN'),
-            'ip' => $request->getIP(),
-            '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(),
-        ]);
-
-        $record = $geodb->get($request->getIP());
-
-        if($record) {
-            $session
-                ->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
-            ;
-        } else {
-            $session
-                ->setAttribute('countryCode', '--')
-            ;
-        }
+        $session = new Document(array_merge(
+            [
+                '$collection' => Database::SYSTEM_COLLECTION_TOKENS,
+                '$permissions' => ['read' => ['user:'.$profile->getId()], 'write' => ['user:'.$profile->getId()]],
+                'userId' => $profile->getId(),
+                'type' => Auth::TOKEN_TYPE_LOGIN,
+                'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
+                'expire' => $expiry,
+                'userAgent' => $request->getUserAgent('UNKNOWN'),
+                'ip' => $request->getIP(),
+                'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+            ], $detector->getOS(), $detector->getClient(), $detector->getDevice()
+        ));
 
         Authorization::setRole('user:'.$profile->getId());
 
@@ -511,7 +476,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                         'emailVerification' => true,
                         'status' => Auth::USER_STATUS_ACTIVATED, // Email should already be authenticated by OAuth2 provider
                         'password' => Auth::passwordHash(Auth::passwordGenerator()),
-                        'password-update' => \time(),
+                        'passwordUpdate' => \time(),
                         'registration' => \time(),
                         'reset' => false,
                         'name' => $name,
@@ -534,26 +499,11 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
 
         // Create session token, verify user account and update OAuth2 ID and Access Token
 
-        $dd = new DeviceDetector($request->getUserAgent('UNKNOWN'));
-
-        $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'] : '';
-
+        $detector = new Detector($request->getUserAgent('UNKNOWN'));
+        $record = $geodb->get($request->getIP());
         $secret = Auth::tokenGenerator();
         $expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG;
-        $session = new Document([
+        $session = new Document(array_merge([
             '$collection' => Database::SYSTEM_COLLECTION_TOKENS,
             '$permissions' => ['read' => ['user:'.$user['$id']], 'write' => ['user:'.$user['$id']]],
             'userId' => $user->getId(),
@@ -562,31 +512,8 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
             'expire' => $expiry,
             'userAgent' => $request->getUserAgent('UNKNOWN'),
             'ip' => $request->getIP(),
-            '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(),
-        ]);
-
-        $record = $geodb->get($request->getIP());
-
-        if($record) {
-            $session
-                ->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
-            ;
-        } else {
-            $session
-                ->setAttribute('countryCode', '--')
-            ;
-        }
+            'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+        ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
 
         $user
             ->setAttribute('oauth2'.\ucfirst($provider), $oauth2ID)
@@ -637,6 +564,50 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
         ;
     });
 
+App::post('/v1/account/jwt')
+    ->desc('Create Account JWT')
+    ->groups(['api', 'account'])
+    ->label('scope', 'account')
+    ->label('docs', false) // Hidden for now - private beta
+    ->label('sdk.platform', [APP_PLATFORM_CLIENT])
+    ->label('sdk.namespace', 'account')
+    ->label('sdk.method', 'createJWT')
+    ->label('sdk.description', '/docs/references/account/create-jwt.md')
+    ->label('abuse-limit', 10)
+    ->label('abuse-key', 'url:{url},userId:{param-userId}')
+    ->inject('response')
+    ->inject('user')
+    ->action(function ($response, $user) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Document $user */
+            
+        $tokens = $user->getAttribute('tokens', []);
+        $session = new Document();
+
+        foreach ($tokens as $token) { /** @var Appwrite\Database\Document $token */
+            if ($token->getAttribute('secret') == Auth::hash(Auth::$secret)) { // If current session delete the cookies too
+                $session = $token;
+            }
+        }
+
+        if($session->isEmpty()) {
+            throw new Exception('No valid session found', 401);
+        }
+        
+        $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic(new Document(['jwt' => $jwt->encode([
+                // 'uid'    => 1,
+                // 'aud'    => 'http://site.com',
+                // 'scopes' => ['user'],
+                // 'iss'    => 'http://api.mysite.com',
+                'userId' => $user->getId(),
+                'sessionId' => $session->getId(),
+            ])]), Response::MODEL_JWT);
+    });
+
 App::get('/v1/account')
     ->desc('Get Account')
     ->groups(['api', 'account'])
@@ -674,7 +645,7 @@ App::get('/v1/account/prefs')
         /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Document $user */
 
-        $prefs = $user->getAttribute('prefs', new \stdClass);
+        $prefs = $user->getAttribute('prefs', new \stdClass());
 
         $response->dynamic(new Document($prefs), Response::MODEL_ANY);
     });
@@ -775,43 +746,13 @@ App::get('/v1/account/logs')
         foreach ($logs as $i => &$log) {
             $log['userAgent'] = (!empty($log['userAgent'])) ? $log['userAgent'] : 'UNKNOWN';
 
-            $dd = new DeviceDetector($log['userAgent']);
+            $detector = new Detector($log['userAgent']);
 
-            $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'] : '';
-
-            $output[$i] = new Document([
+            $output[$i] = new Document(array_merge([
                 '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(),
-            ]);
+            ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
 
             $record = $geodb->get($log['ip']);
 
@@ -1022,7 +963,6 @@ App::delete('/v1/account')
     ->label('sdk.method', 'delete')
     ->label('sdk.description', '/docs/references/account/delete.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->inject('request')
     ->inject('response')
@@ -1089,7 +1029,6 @@ App::delete('/v1/account/sessions/:sessionId')
     ->label('sdk.method', 'deleteSession')
     ->label('sdk.description', '/docs/references/account/delete-session.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->label('abuse-limit', 100)
     ->param('sessionId', null, new UID(), 'Session unique ID. Use the string \'current\' to delete the current device session.')
@@ -1164,7 +1103,6 @@ App::delete('/v1/account/sessions')
     ->label('sdk.method', 'deleteSessions')
     ->label('sdk.description', '/docs/references/account/delete-sessions.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->label('abuse-limit', 100)
     ->inject('request')
@@ -1412,7 +1350,7 @@ App::put('/v1/account/recovery')
 
         $profile = $projectDB->updateDocument(\array_merge($profile->getArrayCopy(), [
             'password' => Auth::passwordHash($password),
-            'password-update' => \time(),
+            'passwordUpdate' => \time(),
             'emailVerification' => true,
         ]));
 

app/controllers/api/avatars.php

@@ -383,8 +383,9 @@ App::get('/v1/avatars/qr')
 
         $download = ($download === '1' || $download === 'true' || $download === 1 || $download === true);
         $options = new QROptions([
-            'quietzone' => $size,
-            'outputType' => QRCode::OUTPUT_IMAGICK
+            'addQuietzone' => true,
+            'quietzoneSize' => $margin,
+            'outputType' => QRCode::OUTPUT_IMAGICK,
         ]);
 
         $qrcode = new QRCode($options);
@@ -393,10 +394,14 @@ App::get('/v1/avatars/qr')
             $response->addHeader('Content-Disposition', 'attachment; filename="qr.png"');
         }
 
+        $resize = new Resize($qrcode->render($text));
+
+        $resize->crop((int) $size, (int) $size);
+
         $response
             ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)).' GMT') // 45 days cache
             ->setContentType('image/png')
-            ->send($qrcode->render($text))
+            ->send($resize->output('png', 9))
         ;
     });
 

app/controllers/api/database.php

@@ -240,7 +240,6 @@ App::delete('/v1/database/collections/:collectionId')
     ->label('sdk.method', 'deleteCollection')
     ->label('sdk.description', '/docs/references/database/delete-collection.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('collectionId', '', new UID(), 'Collection unique ID.')
     ->inject('response')
@@ -584,7 +583,6 @@ App::delete('/v1/database/collections/:collectionId/documents/:documentId')
     ->label('sdk.method', 'deleteDocument')
     ->label('sdk.description', '/docs/references/database/delete-document.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('collectionId', null, new UID(), 'Collection unique ID. You can create a new collection with validation rules using the Database service [server integration](/docs/server/database#createCollection).')
     ->param('documentId', null, new UID(), 'Document unique ID.')

app/controllers/api/functions.php

@@ -4,11 +4,11 @@ use Appwrite\Database\Database;
 use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Database\Validator\UID;
-use Appwrite\Storage\Storage;
-use Appwrite\Storage\Validator\File;
-use Appwrite\Storage\Validator\FileSize;
-use Appwrite\Storage\Validator\FileType;
-use Appwrite\Storage\Validator\Upload;
+use Utopia\Storage\Storage;
+use Utopia\Storage\Validator\File;
+use Utopia\Storage\Validator\FileExt;
+use Utopia\Storage\Validator\FileSize;
+use Utopia\Storage\Validator\Upload;
 use Appwrite\Utopia\Response;
 use Appwrite\Task\Validator\Cron;
 use Utopia\App;
@@ -44,6 +44,9 @@ App::post('/v1/functions')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($name, $execute, $env, $vars, $events, $schedule, $timeout, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+
         $function = $projectDB->createDocument([
             '$collection' => Database::SYSTEM_COLLECTION_FUNCTIONS,
             '$permissions' => [
@@ -91,6 +94,9 @@ App::get('/v1/functions')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($search, $limit, $offset, $orderType, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+
         $results = $projectDB->getCollection([
             'limit' => $limit,
             'offset' => $offset,
@@ -122,6 +128,9 @@ App::get('/v1/functions/:functionId')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($functionId, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
@@ -156,96 +165,100 @@ App::get('/v1/functions/:functionId/usage')
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
             throw new Exception('Function not found', 404);
         }
-
-        $period = [
-            '24h' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-24 hours')),
-                'end' => DateTime::createFromFormat('U', \strtotime('+1 hour')),
-                'group' => '30m',
-            ],
-            '7d' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-7 days')),
-                'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                'group' => '1d',
-            ],
-            '30d' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-30 days')),
-                'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                'group' => '1d',
-            ],
-            '90d' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-90 days')),
-                'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                'group' => '1d',
-            ],
-        ];
-
-        $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']),
-                ];
+        
+        if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $period = [
+                '24h' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-24 hours')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('+1 hour')),
+                    'group' => '30m',
+                ],
+                '7d' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-7 days')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
+                    'group' => '1d',
+                ],
+                '30d' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-30 days')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
+                    'group' => '1d',
+                ],
+                '90d' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-90 days')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
+                    'group' => '1d',
+                ],
+            ];
+    
+            $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([
+                '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)),
+                ],
+            ]);
+        } else {
+            $response->json([]);
         }
-
-        $response->json([
-            '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)),
-            ],
-        ]);
     });
 
 App::put('/v1/functions/:functionId')
@@ -268,13 +281,19 @@ App::put('/v1/functions/:functionId')
     ->param('timeout', 15, new Range(1, 900), 'Function maximum execution time in seconds.', true)
     ->inject('response')
     ->inject('projectDB')
-    ->action(function ($functionId, $name, $execute, $vars, $events, $schedule, $timeout, $response, $projectDB) {
+    ->inject('project')
+    ->action(function ($functionId, $name, $execute, $vars, $events, $schedule, $timeout, $response, $projectDB, $project) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Database\Document $project */
+
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
             throw new Exception('Function not found', 404);
         }
 
+        $original = $function->getAttribute('schedule', '');
         $cron = (!empty($function->getAttribute('tag', null)) && !empty($schedule)) ? CronExpression::factory($schedule) : null;
         $next = (!empty($function->getAttribute('tag', null)) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : null;
 
@@ -287,28 +306,23 @@ App::put('/v1/functions/:functionId')
             'vars' => $vars,
             'events' => $events,
             'schedule' => $schedule,
-            'schedulePrevious' => null,
             'scheduleNext' => $next,
-            'timeout' => $timeout,   
+            'timeout' => $timeout,
         ]));
 
-        if ($next) {
-            ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
-
-            ]);
-
-            // ->setParam('projectId', $project->getId())
-            // ->setParam('event', $route->getLabel('event', ''))
-            // ->setParam('payload', [])
-            // ->setParam('functionId', null)
-            // ->setParam('executionId', null)
-            // ->setParam('trigger', 'event')
-        }
-
         if (false === $function) {
             throw new Exception('Failed saving function to DB', 500);
         }
 
+        if ($next && $schedule !== $original) {
+            ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
+                'projectId' => $project->getId(),
+                'functionId' => $function->getId(),
+                'executionId' => null,
+                'trigger' => 'schedule',
+            ]);  // Async task rescheduale
+        }
+
         $response->dynamic($function, Response::MODEL_FUNCTION);
     });
 
@@ -327,7 +341,12 @@ App::patch('/v1/functions/:functionId/tag')
     ->param('tag', '', new UID(), 'Tag unique ID.')
     ->inject('response')
     ->inject('projectDB')
-    ->action(function ($functionId, $tag, $response, $projectDB) {
+    ->inject('project')
+    ->action(function ($functionId, $tag, $response, $projectDB, $project) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Database\Document $project */
+
         $function = $projectDB->getDocument($functionId);
         $tag = $projectDB->getDocument($tag);
 
@@ -340,14 +359,23 @@ App::patch('/v1/functions/:functionId/tag')
         }
 
         $schedule = $function->getAttribute('schedule', '');
-        $cron = (!empty($function->getAttribute('tag')&& !empty($schedule))) ? CronExpression::factory($schedule) : null;
-        $next = (!empty($function->getAttribute('tag')&& !empty($schedule))) ? $cron->getNextRunDate()->format('U') : null;
+        $cron = (empty($function->getAttribute('tag')) && !empty($schedule)) ? CronExpression::factory($schedule) : null;
+        $next = (empty($function->getAttribute('tag')) && !empty($schedule)) ? $cron->getNextRunDate()->format('U') : null;
 
         $function = $projectDB->updateDocument(array_merge($function->getArrayCopy(), [
             'tag' => $tag->getId(),
             'scheduleNext' => $next,
         ]));
 
+        if ($next) { // Init first schedule
+            ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
+                'projectId' => $project->getId(),
+                'functionId' => $function->getId(),
+                'executionId' => null,
+                'trigger' => 'schedule',
+            ]);  // Async task rescheduale
+        }
+
         if (false === $function) {
             throw new Exception('Failed saving function to DB', 500);
         }
@@ -364,7 +392,6 @@ App::delete('/v1/functions/:functionId')
     ->label('sdk.method', 'delete')
     ->label('sdk.description', '/docs/references/functions/delete-function.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('functionId', '', new UID(), 'Function unique ID.')
     ->inject('response')
@@ -401,19 +428,24 @@ App::post('/v1/functions/:functionId/tags')
     ->label('sdk.namespace', 'functions')
     ->label('sdk.method', 'createTag')
     ->label('sdk.description', '/docs/references/functions/create-tag.md')
+    ->label('sdk.packaging', true)
     ->label('sdk.request.type', 'multipart/form-data')
     ->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('command', '', new Text('1028'), 'Code execution command.')
-    ->param('code', [], new File(), 'Gzip file containing your code.', false)
-    // ->param('code', '', new Text(128), 'Code package. Use the '.APP_NAME.' code packager to create a deployable package file.')
+    ->param('code', null, 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('usage')
-    ->action(function ($functionId, $command, $code, $request, $response, $projectDB, $usage) {
+    ->action(function ($functionId, $command, $file, $request, $response, $projectDB, $usage) {
+        /** @var Utopia\Swoole\Request $request */
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Event\Event $usage */
+
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
@@ -422,7 +454,7 @@ App::post('/v1/functions/:functionId/tags')
 
         $file = $request->getFiles('code');
         $device = Storage::getDevice('functions');
-        $fileType = new FileType([FileType::FILE_TYPE_GZIP]);
+        $fileExt = new FileExt([FileExt::TYPE_GZIP]);
         $fileSize = new FileSize(App::getEnv('_APP_STORAGE_LIMIT', 0));
         $upload = new Upload();
 
@@ -435,10 +467,9 @@ App::post('/v1/functions/:functionId/tags')
         $file['tmp_name'] = (\is_array($file['tmp_name']) && isset($file['tmp_name'][0])) ? $file['tmp_name'][0] : $file['tmp_name'];
         $file['size'] = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
 
-        // Check if file type is allowed (feature for project settings?)
-        // if (!$fileType->isValid($file['tmp_name'])) {
-        //     throw new Exception('File type not allowed', 400);
-        // }
+        if (!$fileExt->isValid($file['name'])) { // Check if file type is allowed
+            throw new Exception('File type not allowed', 400);
+        }
 
         if (!$fileSize->isValid($file['size'])) { // Check if file size is exceeding allowed limit
             throw new Exception('File size not allowed', 400);
@@ -502,6 +533,9 @@ App::get('/v1/functions/:functionId/tags')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($functionId, $search, $limit, $offset, $orderType, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
@@ -541,6 +575,9 @@ App::get('/v1/functions/:functionId/tags/:tagId')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($functionId, $tagId, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
@@ -569,7 +606,6 @@ App::delete('/v1/functions/:functionId/tags/:tagId')
     ->label('sdk.method', 'deleteTag')
     ->label('sdk.description', '/docs/references/functions/delete-tag.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('functionId', '', new UID(), 'Function unique ID.')
     ->param('tagId', '', new UID(), 'Tag unique ID.')
@@ -577,6 +613,10 @@ App::delete('/v1/functions/:functionId/tags/:tagId')
     ->inject('projectDB')
     ->inject('usage')
     ->action(function ($functionId, $tagId, $response, $projectDB, $usage) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Appwrite\Event\Event $usage */
+
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
@@ -629,6 +669,8 @@ App::post('/v1/functions/:functionId/executions')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_EXECUTION)
+    ->label('abuse-limit', 60)
+    ->label('abuse-time', 60)
     ->param('functionId', '', new UID(), 'Function unique ID.')
     // ->param('async', 1, new Range(0, 1), 'Execute code asynchronously. Pass 1 for true, 0 for false. Default value is 1.', true)
     ->inject('response')
@@ -721,6 +763,9 @@ App::get('/v1/functions/:functionId/executions')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($functionId, $search, $limit, $offset, $orderType, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
@@ -760,6 +805,9 @@ App::get('/v1/functions/:functionId/executions/:executionId')
     ->inject('response')
     ->inject('projectDB')
     ->action(function ($functionId, $executionId, $response, $projectDB) {
+        /** @var Appwrite\Utopia\Response $response */
+        /** @var Appwrite\Database\Database $projectDB */
+        
         $function = $projectDB->getDocument($functionId);
 
         if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {

app/controllers/api/health.php

@@ -2,8 +2,8 @@
 
 use Utopia\App;
 use Utopia\Exception;
-use Appwrite\Storage\Device\Local;
-use Appwrite\Storage\Storage;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Storage;
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
 
@@ -300,10 +300,6 @@ App::get('/v1/health/stats') // Currently only used internally
 
         $response
             ->json([
-                'server' => [
-                    'name' => 'nginx',
-                    'version' => \shell_exec('nginx -v 2>&1'),
-                ],
                 'storage' => [
                     'used' => Storage::human($device->getDirectorySize($device->getRoot().'/')),
                     'partitionTotal' => Storage::human($device->getPartitionTotalSpace()),

app/controllers/api/projects.php

@@ -176,74 +176,82 @@ App::get('/v1/projects/:projectId/usage')
             throw new Exception('Project not found', 404);
         }
 
-        $period = [
-            '24h' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-24 hours')),
-                'end' => DateTime::createFromFormat('U', \strtotime('+1 hour')),
-                'group' => '30m',
-            ],
-            '7d' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-7 days')),
-                'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                'group' => '1d',
-            ],
-            '30d' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-30 days')),
-                'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                'group' => '1d',
-            ],
-            '90d' => [
-                'start' => DateTime::createFromFormat('U', \strtotime('-90 days')),
-                'end' => DateTime::createFromFormat('U', \strtotime('now')),
-                'group' => '1d',
-            ],
-        ];
+        if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
 
-        $client = $register->get('influxdb');
-
-        $requests = [];
-        $network = [];
-        $functions = [];
-
-        if ($client) {
-            $start = $period[$range]['start']->format(DateTime::RFC3339);
-            $end = $period[$range]['end']->format(DateTime::RFC3339);
-            $database = $client->selectDB('telegraf');
-
-            // Requests
-            $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_requests_all" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
-            $points = $result->getPoints();
-
-            foreach ($points as $point) {
-                $requests[] = [
-                    'value' => (!empty($point['value'])) ? $point['value'] : 0,
-                    'date' => \strtotime($point['time']),
-                ];
-            }
-
-            // Network
-            $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_network_all" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
-            $points = $result->getPoints();
-
-            foreach ($points as $point) {
-                $network[] = [
-                    'value' => (!empty($point['value'])) ? $point['value'] : 0,
-                    'date' => \strtotime($point['time']),
-                ];
-            }
-
-            // Functions
-            $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().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
-            $points = $result->getPoints();
-
-            foreach ($points as $point) {
-                $functions[] = [
-                    'value' => (!empty($point['value'])) ? $point['value'] : 0,
-                    'date' => \strtotime($point['time']),
-                ];
+            $period = [
+                '24h' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-24 hours')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('+1 hour')),
+                    'group' => '30m',
+                ],
+                '7d' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-7 days')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
+                    'group' => '1d',
+                ],
+                '30d' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-30 days')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
+                    'group' => '1d',
+                ],
+                '90d' => [
+                    'start' => DateTime::createFromFormat('U', \strtotime('-90 days')),
+                    'end' => DateTime::createFromFormat('U', \strtotime('now')),
+                    'group' => '1d',
+                ],
+            ];
+    
+            $client = $register->get('influxdb');
+    
+            $requests = [];
+            $network = [];
+            $functions = [];
+    
+            if ($client) {
+                $start = $period[$range]['start']->format(DateTime::RFC3339);
+                $end = $period[$range]['end']->format(DateTime::RFC3339);
+                $database = $client->selectDB('telegraf');
+    
+                // Requests
+                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_requests_all" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
+                $points = $result->getPoints();
+    
+                foreach ($points as $point) {
+                    $requests[] = [
+                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
+                        'date' => \strtotime($point['time']),
+                    ];
+                }
+    
+                // Network
+                $result = $database->query('SELECT sum(value) AS "value" FROM "appwrite_usage_network_all" WHERE time > \''.$start.'\' AND time < \''.$end.'\' AND "metric_type"=\'counter\' AND "project"=\''.$project->getId().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
+                $points = $result->getPoints();
+    
+                foreach ($points as $point) {
+                    $network[] = [
+                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
+                        'date' => \strtotime($point['time']),
+                    ];
+                }
+    
+                // Functions
+                $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().'\' GROUP BY time('.$period[$range]['group'].') FILL(null)');
+                $points = $result->getPoints();
+    
+                foreach ($points as $point) {
+                    $functions[] = [
+                        'value' => (!empty($point['value'])) ? $point['value'] : 0,
+                        'date' => \strtotime($point['time']),
+                    ];
+                }
             }
+        } else {
+            $requests = [];
+            $network = [];
+            $functions = [];
         }
 
+
         // Users
 
         $projectDB->getCollection([
@@ -440,7 +448,6 @@ App::delete('/v1/projects/:projectId')
     ->label('sdk.namespace', 'projects')
     ->label('sdk.method', 'delete')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->param('password', '', new UID(), 'Your user password for confirmation. Must be between 6 to 32 chars.')
@@ -470,15 +477,22 @@ App::delete('/v1/projects/:projectId')
         ;
 
         foreach (['keys', 'webhooks', 'tasks', 'platforms', 'domains'] as $key) { // Delete all children (keys, webhooks, tasks [stop tasks?], platforms)
-            $list = $project->getAttribute('webhooks', []);
-
-            foreach ($list as $document) { /* @var $document Document */
-                if (!$consoleDB->deleteDocument($projectId)) {
+            $list = $project->getAttribute($key, []);
+            foreach ($list as $document) {
+                /** @var Document $document */
+                if ($consoleDB->deleteDocument($document->getId())) {
+                    if ($document->getCollection() == Database::SYSTEM_COLLECTION_DOMAINS) {
+                        $deletes
+                            ->setParam('type', DELETE_TYPE_CERTIFICATES)
+                            ->setParam('document', $document)
+                        ;
+                    }
+                } else {
                     throw new Exception('Failed to remove project document ('.$key.')] from DB', 500);
                 }
             }
         }
-        
+                
         if (!$consoleDB->deleteDocument($project->getAttribute('teamId', null))) {
             throw new Exception('Failed to remove project team from DB', 500);
         }
@@ -676,7 +690,6 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
     ->label('sdk.namespace', 'projects')
     ->label('sdk.method', 'deleteWebhook')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('webhookId', null, new UID(), 'Webhook unique ID.')
@@ -869,7 +882,6 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
     ->label('sdk.namespace', 'projects')
     ->label('sdk.method', 'deleteKey')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('keyId', null, new UID(), 'Key unique ID.')
@@ -1118,7 +1130,6 @@ App::delete('/v1/projects/:projectId/tasks/:taskId')
     ->label('sdk.namespace', 'projects')
     ->label('sdk.method', 'deleteTask')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('taskId', null, new UID(), 'Task unique ID.')
@@ -1326,7 +1337,6 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
     ->label('sdk.namespace', 'projects')
     ->label('sdk.method', 'deletePlatform')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('platformId', null, new UID(), 'Platform unique ID.')
@@ -1389,7 +1399,7 @@ App::post('/v1/projects/:projectId/domains')
         $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
 
         if (!$target->isKnown() || $target->isTest()) {
-            throw new Exception('Unreachable CNAME target ('.$target->get().'), plesse use a domain with a public suffix.', 500);
+            throw new Exception('Unreachable CNAME target ('.$target->get().'), please use a domain with a public suffix.', 500);
         }
 
         $domain = new Domain($domain);
@@ -1520,7 +1530,7 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')
         $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
 
         if (!$target->isKnown() || $target->isTest()) {
-            throw new Exception('Unreachable CNAME target ('.$target->get().'), plesse use a domain with a public suffix.', 500);
+            throw new Exception('Unreachable CNAME target ('.$target->get().'), please use a domain with a public suffix.', 500);
         }
 
         if ($domain->getAttribute('verification') === true) {
@@ -1558,13 +1568,13 @@ App::delete('/v1/projects/:projectId/domains/:domainId')
     ->label('sdk.namespace', 'projects')
     ->label('sdk.method', 'deleteDomain')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->param('domainId', null, new UID(), 'Domain unique ID.')
     ->inject('response')
     ->inject('consoleDB')
-    ->action(function ($projectId, $domainId, $response, $consoleDB) {
+    ->inject('deletes')
+    ->action(function ($projectId, $domainId, $response, $consoleDB, $deletes) {
         /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $consoleDB */
 
@@ -1580,7 +1590,12 @@ App::delete('/v1/projects/:projectId/domains/:domainId')
             throw new Exception('Domain not found', 404);
         }
 
-        if (!$consoleDB->deleteDocument($domain->getId())) {
+        if ($consoleDB->deleteDocument($domain->getId())) {
+            $deletes
+                ->setParam('type', DELETE_TYPE_CERTIFICATES)
+                ->setParam('document', $domain)
+            ;
+        } else {
             throw new Exception('Failed to remove domains from DB', 500);
         }
 

app/controllers/api/storage.php

@@ -13,11 +13,11 @@ use Appwrite\ClamAV\Network;
 use Appwrite\Database\Database;
 use Appwrite\Database\Document;
 use Appwrite\Database\Validator\UID;
-use Appwrite\Storage\Storage;
-use Appwrite\Storage\Validator\File;
-use Appwrite\Storage\Validator\FileSize;
-use Appwrite\Storage\Validator\Upload;
-use Appwrite\Storage\Compression\Algorithms\GZIP;
+use Utopia\Storage\Storage;
+use Utopia\Storage\Validator\File;
+use Utopia\Storage\Validator\FileSize;
+use Utopia\Storage\Validator\Upload;
+use Utopia\Storage\Compression\Algorithms\GZIP;
 use Appwrite\Resize\Resize;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Utopia\Response;
@@ -541,7 +541,6 @@ App::delete('/v1/storage/files/:fileId')
     ->label('sdk.method', 'deleteFile')
     ->label('sdk.description', '/docs/references/storage/delete-file.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('fileId', '', new UID(), 'File unique ID.')
     ->inject('response')

app/controllers/api/teams.php

@@ -16,9 +16,9 @@ use Appwrite\Database\Validator\UID;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Database\Exception\Duplicate;
 use Appwrite\Database\Validator\Key;
+use Appwrite\Detector\Detector;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Response;
-use DeviceDetector\DeviceDetector;
 
 App::post('/v1/teams')
     ->desc('Create Team')
@@ -207,7 +207,6 @@ App::delete('/v1/teams/:teamId')
     ->label('sdk.method', 'delete')
     ->label('sdk.description', '/docs/references/teams/delete-team.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('teamId', '', new UID(), 'Team unique ID.')
     ->inject('response')
@@ -324,7 +323,7 @@ App::post('/v1/teams/:teamId/memberships')
                     'emailVerification' => false,
                     'status' => Auth::USER_STATUS_UNACTIVATED,
                     'password' => Auth::passwordHash(Auth::passwordGenerator()),
-                    'password-update' => \time(),
+                    'passwordUpdate' => \time(),
                     'registration' => \time(),
                     'reset' => false,
                     'name' => $name,
@@ -407,11 +406,12 @@ App::post('/v1/teams/:teamId/memberships')
         $body = new Template(__DIR__.'/../../config/locale/templates/email-base.tpl');
         $content = new Template(__DIR__.'/../../config/locale/translations/templates/'.$locale->getText('account.emails.invitation.body'));
         $cta = new Template(__DIR__.'/../../config/locale/templates/email-cta.tpl');
-
+        $title = \sprintf($locale->getText('account.emails.invitation.title'), $team->getAttribute('name', '[TEAM-NAME]'), $project->getAttribute('name', ['[APP-NAME]']));
+        
         $body
             ->setParam('{{content}}', $content->render())
             ->setParam('{{cta}}', $cta->render())
-            ->setParam('{{title}}', $locale->getText('account.emails.invitation.title'))
+            ->setParam('{{title}}', $title)
             ->setParam('{{direction}}', $locale->getText('settings.direction'))
             ->setParam('{{project}}', $project->getAttribute('name', ['[APP-NAME]']))
             ->setParam('{{team}}', $team->getAttribute('name', '[TEAM-NAME]'))
@@ -431,9 +431,9 @@ App::post('/v1/teams/:teamId/memberships')
                 ->setParam('from', ($project->getId() === 'console') ? '' : \sprintf($locale->getText('account.emails.team'), $project->getAttribute('name')))
                 ->setParam('recipient', $email)
                 ->setParam('name', $name)
-                ->setParam('subject', \sprintf($locale->getText('account.emails.invitation.title'), $team->getAttribute('name', '[TEAM-NAME]'), $project->getAttribute('name', ['[APP-NAME]'])))
+                ->setParam('subject', $title)
                 ->setParam('body', $body->render())
-                ->trigger();
+                ->trigger()
             ;
         }
 
@@ -590,27 +590,11 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
 
         // Log user in
 
-        $dd = new DeviceDetector($request->getUserAgent('UNKNOWN'));
-
-        $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'] : '';
-
+        $detector = new Detector($request->getUserAgent('UNKNOWN'));
+        $record = $geodb->get($request->getIP());
         $expiry = \time() + Auth::TOKEN_EXPIRATION_LOGIN_LONG;
         $secret = Auth::tokenGenerator();
-
-        $session = new Document([
+        $session = new Document(array_merge([
             '$collection' => Database::SYSTEM_COLLECTION_TOKENS,
             '$permissions' => ['read' => ['user:'.$user->getId()], 'write' => ['user:'.$user->getId()]],
             'userId' => $user->getId(),
@@ -619,32 +603,8 @@ App::patch('/v1/teams/:teamId/memberships/:inviteId/status')
             'expire' => $expiry,
             'userAgent' => $request->getUserAgent('UNKNOWN'),
             'ip' => $request->getIP(),
-
-            '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(),
-        ]);
-
-        $record = $geodb->get($request->getIP());
-
-        if($record) {
-            $session
-                ->setAttribute('countryCode', \strtolower($record['country']['iso_code']))
-            ;
-        } else {
-            $session
-                ->setAttribute('countryCode', '--')
-            ;
-        }
+            'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+        ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
 
         $user->setAttribute('tokens', $session, Document::SET_TYPE_APPEND);
 
@@ -701,7 +661,6 @@ App::delete('/v1/teams/:teamId/memberships/:inviteId')
     ->label('sdk.method', 'deleteMembership')
     ->label('sdk.description', '/docs/references/teams/delete-team-membership.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
     ->param('teamId', '', new UID(), 'Team unique ID.')
     ->param('inviteId', '', new UID(), 'Invite unique ID.')

app/controllers/api/users.php

@@ -62,7 +62,7 @@ App::post('/v1/users')
                 'emailVerification' => false,
                 'status' => Auth::USER_STATUS_UNACTIVATED,
                 'password' => Auth::passwordHash($password),
-                'password-update' => \time(),
+                'passwordUpdate' => \time(),
                 'registration' => \time(),
                 'reset' => false,
                 'name' => $name,
@@ -165,7 +165,7 @@ App::get('/v1/users/:userId/prefs')
             throw new Exception('User not found', 404);
         }
 
-        $prefs = $user->getAttribute('prefs', '');
+        $prefs = $user->getAttribute('prefs', new \stdClass());
 
         $response->dynamic(new Document($prefs), Response::MODEL_ANY);
     });
@@ -416,9 +416,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->label('sdk.method', 'deleteSession')
     ->label('sdk.description', '/docs/references/users/delete-user-session.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->label('abuse-limit', 100)
     ->param('userId', '', new UID(), 'User unique ID.')
     ->param('sessionId', null, new UID(), 'User unique session ID.')
     ->inject('response')
@@ -463,9 +461,7 @@ App::delete('/v1/users/:userId/sessions')
     ->label('sdk.method', 'deleteSessions')
     ->label('sdk.description', '/docs/references/users/delete-user-sessions.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->label('abuse-limit', 100)
     ->param('userId', '', new UID(), 'User unique ID.')
     ->inject('response')
     ->inject('projectDB')
@@ -507,9 +503,7 @@ App::delete('/v1/users/:userId')
     ->label('sdk.method', 'deleteUser')
     ->label('sdk.description', '/docs/references/users/delete-user.md')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
-    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->label('abuse-limit', 100)
     ->param('userId', '', function () {return new UID();}, 'User unique ID.')
     ->inject('response')
     ->inject('projectDB')

app/controllers/general.php

@@ -14,29 +14,22 @@ use Appwrite\Database\Database;
 use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\Storage\Device\Local;
-use Appwrite\Storage\Storage;
-use Appwrite\Utopia\Response\Filter;
-use Appwrite\Utopia\Response\Filter\V06;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Storage;
+use Appwrite\Utopia\Response\Filters\V06;
 use Utopia\CLI\Console;
 
 Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $events, $audits, $usage, $deletes, $clients) {
+App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $clients) {
     /** @var Utopia\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
     /** @var Appwrite\Database\Document $console */
     /** @var Appwrite\Database\Document $project */
     /** @var Appwrite\Database\Document $user */
     /** @var Utopia\Locale\Locale $locale */
-    /** @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 bool $mode */
     /** @var array $clients */
 
@@ -52,20 +45,17 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         throw new Exception('Missing or unknown project ID', 400);
     }
 
-    $console->setAttribute('platforms', [ // Allways allow current host
-        '$collection' => Database::SYSTEM_COLLECTION_PLATFORMS,
-        'name' => 'Current Host',
-        'type' => 'web',
-        'hostname' => $request->getHostname(),
-    ], Document::SET_TYPE_APPEND);
-
     $referrer = $request->getReferer();
     $origin = \parse_url($request->getOrigin($referrer), PHP_URL_HOST);
     $protocol = \parse_url($request->getOrigin($referrer), PHP_URL_SCHEME);
     $port = \parse_url($request->getOrigin($referrer), PHP_URL_PORT);
 
     $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.((\in_array($origin, $clients))
-        ? $origin : 'localhost') . (!empty($port) ? ':'.$port : '');
+        ? $origin : 'localhost').(!empty($port) ? ':'.$port : '');
+    
+    $refDomain = (!$route->getLabel('origin', false))  // This route is publicly accessible
+        ? $refDomain
+        : (!empty($protocol) ? $protocol : $request->getProtocol()).'://'.$origin.(!empty($port) ? ':'.$port : '');
 
     $selfDomain = new Domain($request->getHostname());
     $endDomain = new Domain((string)$origin);
@@ -93,9 +83,6 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         : '.'.$request->getHostname()
     );
 
-    Storage::setDevice('files', new Local(APP_STORAGE_UPLOADS.'/app-'.$project->getId()));
-    Storage::setDevice('functions', new Local(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId()));
-
     /* 
     * Response format
     */
@@ -106,7 +93,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
                 Response::setFilter(new V06());
                 break;
             default:
-                throw new Exception('No filter available for response format : '.$responseFormat, 400);
+                Response::setFilter(null);
         }
     } else {
         Response::setFilter(null);
@@ -124,15 +111,13 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         }
 
         $response->addHeader('Strict-Transport-Security', 'max-age='.(60 * 60 * 24 * 126)); // 126 days
-    }    
+    }
 
     $response
         ->addHeader('Server', 'Appwrite')
-        ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url='.\urlencode($request->getURI()))
-        //->addHeader('X-Frame-Options', ($refDomain == 'http://localhost') ? 'SAMEORIGIN' : 'ALLOW-FROM ' . $refDomain)
         ->addHeader('X-Content-Type-Options', 'nosniff')
         ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-SDK-Version, Cache-Control, Expires, Pragma')
+        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-SDK-Version, Cache-Control, Expires, Pragma')
         ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
         ->addHeader('Access-Control-Allow-Origin', $refDomain)
         ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -141,7 +126,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     /*
      * Validate Client Domain - Check to avoid CSRF attack
      *  Adding Appwrite API domains to allow XDOMAIN communication
-     *  Skip this check for non-web platforms which are not requiredto send an origin header
+     *  Skip this check for non-web platforms which are not required to send an origin header
      */
     $origin = $request->getOrigin($request->getReferer(''));
     $originValidator = new Origin(\array_merge($project->getAttribute('platforms', []), $console->getAttribute('platforms', [])));
@@ -180,27 +165,31 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     $roles = Config::getParam('roles', []);
     $scope = $route->getLabel('scope', 'none'); // Allowed scope for chosen route
     $scopes = $roles[$role]['scopes']; // Allowed scopes for user role
-    
-    // Check if given key match project API keys
-    $key = $project->search('secret', $request->getHeader('x-appwrite-key', ''), $project->getAttribute('keys', []));
-    
-    /*
-     * Try app auth when we have project key and no user
-     *  Mock user to app and grant API key scopes in addition to default app scopes
-     */
-    if (null !== $key && $user->isEmpty()) {
-        $user = new Document([
-            '$id' => '',
-            'status' => Auth::USER_STATUS_ACTIVATED,
-            'email' => 'app.'.$project->getId().'@service.'.$request->getHostname(),
-            'password' => '',
-            'name' => $project->getAttribute('name', 'Untitled'),
-        ]);
 
-        $role = Auth::USER_ROLE_APP;
-        $scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));
+    $authKey = $request->getHeader('x-appwrite-key', '');
 
-        Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
+    if (!empty($authKey)) { // API Key authentication
+        // Check if given key match project API keys
+        $key = $project->search('secret', $authKey, $project->getAttribute('keys', []));
+            
+        /*
+         * Try app auth when we have project key and no user
+         *  Mock user to app and grant API key scopes in addition to default app scopes
+         */
+        if ($key && $user->isEmpty()) {
+            $user = new Document([
+                '$id' => '',
+                'status' => Auth::USER_STATUS_ACTIVATED,
+                'email' => 'app.'.$project->getId().'@service.'.$request->getHostname(),
+                'password' => '',
+                'name' => $project->getAttribute('name', 'Untitled'),
+            ]);
+
+            $role = Auth::USER_ROLE_APP;
+            $scopes = \array_merge($roles[$role]['scopes'], $key->getAttribute('scopes', []));
+
+            Authorization::setDefaultStatus(false);  // Cancel security segmentation for API keys.
+        }
     }
 
     if ($user->getId()) {
@@ -237,99 +226,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         throw new Exception('Password reset is required', 412);
     }
 
-    /*
-     * Background Jobs
-     */
-
-    $events
-        ->setParam('projectId', $project->getId())
-        ->setParam('userId', $user->getId())
-        ->setParam('event', $route->getLabel('event', ''))
-        ->setParam('payload', [])
-        ->setParam('functionId', null)	
-        ->setParam('executionId', null)	
-        ->setParam('trigger', 'event')
-    ;
-
-    $audits
-        ->setParam('projectId', $project->getId())
-        ->setParam('userId', $user->getId())
-        ->setParam('event', '')
-        ->setParam('resource', '')
-        ->setParam('userAgent', $request->getUserAgent(''))
-        ->setParam('ip', $request->getIP())
-        ->setParam('data', [])
-    ;
-
-    $usage
-        ->setParam('projectId', $project->getId())
-        ->setParam('httpRequest', 1)
-        ->setParam('httpUrl', $request->getHostname().$request->getURI())
-        ->setParam('httpMethod', $request->getMethod())
-        ->setParam('networkRequestSize', 0)
-        ->setParam('networkResponseSize', 0)
-        ->setParam('storage', 0)
-    ;
-    
-    $deletes
-        ->setParam('projectId', $project->getId())
-    ;
-
-}, ['utopia', 'request', 'response', 'console', 'project', 'user', 'locale', 'events', 'audits', 'usage', 'deletes', 'clients']);
-
-App::shutdown(function ($utopia, $request, $response, $project, $events, $audits, $usage, $deletes, $mode) {
-    /** @var Utopia\App $utopia */
-    /** @var Utopia\Swoole\Request $request */
-    /** @var Appwrite\Utopia\Response $response */
-    /** @var Appwrite\Database\Document $project */
-    /** @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 bool $mode */
-
-    if (!empty($events->getParam('event'))) {
-        if(empty($events->getParam('payload'))) {
-            $events->setParam('payload', $response->getPayload());
-        }
-
-        $webhooks = clone $events;
-        $functions = clone $events;
-
-        $webhooks
-            ->setQueue('v1-webhooks')
-            ->setClass('WebhooksV1')
-            ->trigger();
-
-        $functions
-            ->setQueue('v1-functions')
-            ->setClass('FunctionsV1')
-            ->trigger();
-    }
-    
-    if (!empty($audits->getParam('event'))) {
-        $audits->trigger();
-    }
-    
-    if (!empty($deletes->getParam('type')) && !empty($deletes->getParam('document'))) {
-        $deletes->trigger();
-    }
-    
-    $route = $utopia->match($request);
-    
-    if ($project->getId()
-        && $mode !== APP_MODE_ADMIN //TODO: add check to make sure user is admin
-        && !empty($route->getLabel('sdk.namespace', null))) { // Don't calculate console usage on admin mode
-        
-        $usage
-            ->setParam('networkRequestSize', $request->getSize() + $usage->getParam('storage'))
-            ->setParam('networkResponseSize', $response->getSize())
-            ->trigger()
-        ;
-    }
-
-}, ['utopia', 'request', 'response', 'project', 'events', 'audits', 'usage', 'deletes', 'mode']);
+}, ['utopia', 'request', 'response', 'console', 'project', 'user', 'locale', 'clients']);
 
 App::options(function ($request, $response) {
     /** @var Utopia\Swoole\Request $request */
@@ -340,11 +237,11 @@ App::options(function ($request, $response) {
     $response
         ->addHeader('Server', 'Appwrite')
         ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
+        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
         ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
         ->addHeader('Access-Control-Allow-Origin', $origin)
         ->addHeader('Access-Control-Allow-Credentials', 'true')
-        ->send();
+        ->noContent();
 }, ['request', 'response']);
 
 App::error(function ($error, $utopia, $request, $response, $layout, $project) {
@@ -359,8 +256,11 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
     $template = ($route) ? $route->getLabel('error', null) : null;
 
     if (php_sapi_name() === 'cli') {
-        Console::error('[Error] Method: '.$route->getMethod());
-        Console::error('[Error] URL: '.$route->getURL());
+        if($route) {
+            Console::error('[Error] Method: '.$route->getMethod());
+            Console::error('[Error] URL: '.$route->getURL());
+        }
+        
         Console::error('[Error] Type: '.get_class($error));
         Console::error('[Error] Message: '.$error->getMessage());
         Console::error('[Error] File: '.$error->getFile());
@@ -488,7 +388,7 @@ App::get('/.well-known/acme-challenge')
     ->inject('response')
     ->action(function ($request, $response) {
         $base = \realpath(APP_STORAGE_CERTIFICATES);
-        $path = \str_replace('/.well-known/acme-challenge/', '', $request->getParam('q'));
+        $path = \str_replace('/.well-known/acme-challenge/', '', $request->getURI());
         $absolute = \realpath($base.'/.well-known/acme-challenge/'.$path);
 
         if (!$base) {

app/controllers/mock.php

@@ -8,7 +8,7 @@ use Utopia\Validator\Numeric;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Host;
-use Appwrite\Storage\Validator\File;
+use Utopia\Storage\Validator\File;
 
 App::get('/v1/mock/tests/foo')
     ->desc('Mock a get request for SDK tests')

app/controllers/shared/api.php

@@ -1,17 +1,29 @@
 <?php
 
+use Appwrite\Auth\Auth;
+use Appwrite\Database\Validator\Authorization;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Storage;
 
-App::init(function ($utopia, $request, $response, $project, $user, $register) {
+App::init(function ($utopia, $request, $response, $project, $user, $register, $events, $audits, $usage, $deletes) {
     /** @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 */
+
+    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);
 
@@ -49,7 +61,105 @@ App::init(function ($utopia, $request, $response, $project, $user, $register) {
         ;
     }
 
-    if ($abuse->check() && App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') {
+    $isPreviliggedUser = Auth::isPreviliggedUser(Authorization::$roles);
+    $isAppUser = Auth::isAppUser(Authorization::$roles);
+
+    if (($abuse->check() // Route is rate-limited
+        && App::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled') // Abuse is not diabled
+        && (!$isAppUser && !$isPreviliggedUser)) // User is not an admin or API key
+        {
         throw new Exception('Too many requests', 429);
     }
-}, ['utopia', 'request', 'response', 'project', 'user', 'register'], 'api');
+
+    /*
+     * Background Jobs
+     */
+    $events
+        ->setParam('projectId', $project->getId())
+        ->setParam('userId', $user->getId())
+        ->setParam('event', $route->getLabel('event', ''))
+        ->setParam('payload', [])
+        ->setParam('functionId', null)	
+        ->setParam('executionId', null)	
+        ->setParam('trigger', 'event')
+    ;
+
+    $audits
+        ->setParam('projectId', $project->getId())
+        ->setParam('userId', $user->getId())
+        ->setParam('event', '')
+        ->setParam('resource', '')
+        ->setParam('userAgent', $request->getUserAgent(''))
+        ->setParam('ip', $request->getIP())
+        ->setParam('data', [])
+    ;
+
+    $usage
+        ->setParam('projectId', $project->getId())
+        ->setParam('httpRequest', 1)
+        ->setParam('httpUrl', $request->getHostname().$request->getURI())
+        ->setParam('httpMethod', $request->getMethod())
+        ->setParam('networkRequestSize', 0)
+        ->setParam('networkResponseSize', 0)
+        ->setParam('storage', 0)
+    ;
+    
+    $deletes
+        ->setParam('projectId', $project->getId())
+    ;
+
+}, ['utopia', 'request', 'response', 'project', 'user', 'register', 'events', 'audits', 'usage', 'deletes'], 'api');
+
+App::shutdown(function ($utopia, $request, $response, $project, $events, $audits, $usage, $deletes, $mode) {
+    /** @var Utopia\App $utopia */
+    /** @var Utopia\Swoole\Request $request */
+    /** @var Appwrite\Utopia\Response $response */
+    /** @var Appwrite\Database\Document $project */
+    /** @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 bool $mode */
+
+    if (!empty($events->getParam('event'))) {
+        if(empty($events->getParam('payload'))) {
+            $events->setParam('payload', $response->getPayload());
+        }
+
+        $webhooks = clone $events;
+        $functions = clone $events;
+
+        $webhooks
+            ->setQueue('v1-webhooks')
+            ->setClass('WebhooksV1')
+            ->trigger();
+
+        $functions
+            ->setQueue('v1-functions')
+            ->setClass('FunctionsV1')
+            ->trigger();
+    }
+    
+    if (!empty($audits->getParam('event'))) {
+        $audits->trigger();
+    }
+    
+    if (!empty($deletes->getParam('type')) && !empty($deletes->getParam('document'))) {
+        $deletes->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
+        && !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()
+        ;
+    }
+
+}, ['utopia', 'request', 'response', 'project', 'events', 'audits', 'usage', 'deletes', 'mode'], 'api');

app/controllers/shared/web.php

@@ -11,13 +11,18 @@ App::init(function ($utopia, $request, $response, $layout) {
 
     /* AJAX check  */
     if (!empty($request->getQuery('version', ''))) {
-        $layout->setPath(__DIR__.'/../../views/layouts/empty.phtml');
+        $layout->setPath(__DIR__ . '/../../views/layouts/empty.phtml');
     }
-    
+
+    $port = $request->getPort();
+    $protocol = $request->getProtocol();
+    $domain = $request->getHostname();
+
     $layout
         ->setParam('title', APP_NAME)
-        ->setParam('protocol', $request->getProtocol())
-        ->setParam('domain', $request->getHostname())
+        ->setParam('protocol', $protocol)
+        ->setParam('domain', $domain)
+        ->setParam('endpoint', $protocol . '://' . $domain . ($port != 80 && $port != 443 ? ':' . $port : ''))
         ->setParam('home', App::getEnv('_APP_HOME'))
         ->setParam('setup', App::getEnv('_APP_SETUP'))
         ->setParam('class', 'unknown')
@@ -34,9 +39,10 @@ App::init(function ($utopia, $request, $response, $layout) {
     $time = (60 * 60 * 24 * 45); // 45 days cache
 
     $response
-        ->addHeader('Cache-Control', 'public, max-age='.$time)
-        ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time).' GMT') // 45 days cache
+        ->addHeader('Cache-Control', 'public, max-age=' . $time)
+        ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time) . ' GMT') // 45 days cache
         ->addHeader('X-Frame-Options', 'SAMEORIGIN') // Avoid console and homepage from showing in iframes
+        ->addHeader('X-XSS-Protection', '1; mode=block; report=/v1/xss?url=' . \urlencode($request->getURI()))
         ->addHeader('X-UA-Compatible', 'IE=Edge') // Deny IE browsers from going into quirks mode
     ;
 

app/controllers/web/console.php

@@ -7,7 +7,7 @@ use Utopia\Domains\Domain;
 use Appwrite\Database\Database;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Database\Validator\UID;
-use Appwrite\Storage\Storage;
+use Utopia\Storage\Storage;
 
 App::init(function ($layout) {
     /** @var Utopia\View $layout */
@@ -122,7 +122,8 @@ App::get('/console/home')
         /** @var Utopia\View $layout */
 
         $page = new View(__DIR__.'/../../views/console/home/index.phtml');
-
+        $page
+            ->setParam('usageStatsEnabled',App::getEnv('_APP_USAGE_STATS','enabled') == 'enabled');
         $layout
             ->setParam('title', APP_NAME.' - Console')
             ->setParam('body', $page);
@@ -390,6 +391,7 @@ App::get('/console/functions/function')
             ->setParam('fileLimit', App::getEnv('_APP_STORAGE_LIMIT', 0))
             ->setParam('fileLimitHuman', Storage::human(App::getEnv('_APP_STORAGE_LIMIT', 0)))
             ->setParam('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900))
+            ->setParam('usageStatsEnabled',App::getEnv('_APP_USAGE_STATS','enabled') == 'enabled');
         ;
 
         $layout

app/controllers/web/home.php

@@ -191,7 +191,7 @@ App::get('/error/:code')
         $layout
             ->setParam('title', 'Error'.' - '.APP_NAME)
             ->setParam('body', $page);
-    }, ['']);
+    });
 
 App::get('/specs/:format')
     ->groups(['web', 'home'])
@@ -216,6 +216,7 @@ App::get('/specs/:format')
 
         $routes = [];
         $models = [];
+        $services = [];
 
         $keys = [
             APP_PLATFORM_CLIENT => [
@@ -317,6 +318,20 @@ App::get('/specs/:format')
             }
         }
 
+        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) {
@@ -327,11 +342,11 @@ App::get('/specs/:format')
 
         switch ($format) {
             case 'swagger2':
-                $format = new Swagger2($utopia, $routes, $models, $keys[$platform], $security[$platform]);
+                $format = new Swagger2($utopia, $services, $routes, $models, $keys[$platform], $security[$platform]);
                 break;
 
             case 'open-api3':
-                $format = new OpenAPI3($utopia, $routes, $models, $keys[$platform], $security[$platform]);
+                $format = new OpenAPI3($utopia, $services, $routes, $models, $keys[$platform], $security[$platform]);
                 break;
             
             default:

app/http.php

@@ -18,9 +18,10 @@ use Utopia\CLI\Console;
 ini_set('memory_limit','512M');
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
+ini_set('default_socket_timeout', -1);
 error_reporting(E_ALL);
 
-$http = new Server("0.0.0.0", 80);
+$http = new Server("0.0.0.0", App::getEnv('PORT', 80));
 
 $payloadSize = max(4000000 /* 4mb */, App::getEnv('_APP_STORAGE_LIMIT', 10000000 /* 10mb */));
 

app/init.php

@@ -11,6 +11,8 @@ if (\file_exists(__DIR__.'/../vendor/autoload.php')) {
     require_once __DIR__.'/../vendor/autoload.php';
 }
 
+use Ahc\Jwt\JWT;
+use Ahc\Jwt\JWTException;
 use Appwrite\Auth\Auth;
 use Appwrite\Database\Database;
 use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
@@ -32,12 +34,12 @@ use PDO as PDONative;
 const APP_NAME = 'Appwrite';
 const APP_DOMAIN = 'appwrite.io';
 const APP_EMAIL_TEAM = 'team@localhost.test'; // Default email address
-const APP_EMAIL_SECURITY = 'security@localhost.test'; // Default security email address
+const APP_EMAIL_SECURITY = ''; // Default security email address
 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 = 142;
+const APP_CACHE_BUSTER = 144;
 const APP_VERSION_STABLE = '0.7.0';
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
@@ -58,6 +60,7 @@ const DELETE_TYPE_DOCUMENT = 'document';
 const DELETE_TYPE_EXECUTIONS = 'executions';
 const DELETE_TYPE_AUDIT = 'audit';
 const DELETE_TYPE_ABUSE = 'abuse';
+const DELETE_TYPE_CERTIFICATES = 'certificates';
 
 $register = new Registry();
 
@@ -88,9 +91,13 @@ 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'); 
 
-Resque::setBackend(App::getEnv('_APP_REDIS_HOST', '')
-    .':'.App::getEnv('_APP_REDIS_PORT', ''));
-
+$user = App::getEnv('_APP_REDIS_USER','');
+$pass = App::getEnv('_APP_REDIS_PASS','');
+if(!empty($user) || !empty($pass)) {
+    Resque::setBackend('redis://'.$user.':'.$pass.'@'.App::getEnv('_APP_REDIS_HOST', '').':'.App::getEnv('_APP_REDIS_PORT', ''));
+} else {
+    Resque::setBackend(App::getEnv('_APP_REDIS_HOST', '').':'.App::getEnv('_APP_REDIS_PORT', ''));
+}
 /**
  * DB Filters
  */
@@ -173,6 +180,18 @@ $register->set('statsd', function () { // Register DB connection
 $register->set('cache', function () { // Register cache connection
     $redis = new Redis();
     $redis->pconnect(App::getEnv('_APP_REDIS_HOST', ''), App::getEnv('_APP_REDIS_PORT', ''));
+    $user = App::getEnv('_APP_REDIS_USER','');
+    $pass = App::getEnv('_APP_REDIS_PASS','');
+    $auth = [];
+    if(!empty($user)) {
+        $auth["user"] = $user;
+    }
+    if(!empty($pass)) {
+        $auth["pass"] = $pass;
+    }
+    if(!empty($auth)) {
+        $redis->auth($auth);
+    }
     $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
 
     return $redis;
@@ -206,7 +225,7 @@ $register->set('smtp', function () {
     return $mail;
 });
 $register->set('geodb', function () {
-    return new Reader(__DIR__.'/db/DBIP/dbip-country-lite-2020-01.mmdb');
+    return new Reader(__DIR__.'/db/DBIP/dbip-country-lite-2021-02.mmdb');
 });
 
 /*
@@ -319,7 +338,14 @@ App::setResource('deletes', function($register) {
 }, ['register']);
 
 // Test Mock
-App::setResource('clients', function($console, $project) {
+App::setResource('clients', function($request, $console, $project) {
+    $console->setAttribute('platforms', [ // Allways allow current host
+        '$collection' => Database::SYSTEM_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
@@ -345,7 +371,7 @@ App::setResource('clients', function($console, $project) {
     }))));
 
     return $clients;
-}, ['console', 'project']);
+}, ['request', 'console', 'project']);
 
 App::setResource('user', function($mode, $project, $console, $request, $response, $projectDB, $consoleDB) {
     /** @var Utopia\Swoole\Request $request */
@@ -406,6 +432,29 @@ App::setResource('user', function($mode, $project, $console, $request, $response
         }
     }
 
+    $authJWT = $request->getHeader('x-appwrite-jwt', '');
+
+    if (!empty($authJWT)) { // JWT authentication
+        $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
+
+        try {
+            $payload = $jwt->decode($authJWT);
+        } catch (JWTException $error) {
+            throw new Exception('Failed to verify JWT. '.$error->getMessage(), 401);
+        }
+        
+        $jwtUserId = $payload['userId'] ?? '';
+        $jwtSessionId = $payload['sessionId'] ?? '';
+
+        if($jwtUserId && $jwtSessionId) {
+            $user = $projectDB->getDocument($jwtUserId);
+        }
+
+        if (empty($user->search('$id', $jwtSessionId, $user->getAttribute('tokens')))) { // Match JWT to active token
+            $user = new Document(['$id' => '', '$collection' => Database::SYSTEM_COLLECTION_USERS]);
+        }
+    }
+
     return $user;
 }, ['mode', 'project', 'console', 'request', 'response', 'projectDB', 'consoleDB']);
 

app/tasks/doctor.php

@@ -3,8 +3,8 @@
 global $cli;
 
 use Appwrite\ClamAV\Network;
-use Appwrite\Storage\Device\Local;
-use Appwrite\Storage\Storage;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Storage;
 use Utopia\App;
 use Utopia\CLI\Console;
 use Utopia\Domains\Domain;

app/tasks/install.php

@@ -4,16 +4,15 @@ global $cli;
 
 use Appwrite\Docker\Compose;
 use Appwrite\Docker\Env;
+use Utopia\Analytics\GoogleAnalytics;
 use Utopia\CLI\Console;
 use Utopia\Config\Config;
-use Utopia\Validator\Mock;
 use Utopia\View;
 
 $cli
     ->task('install')
     ->desc('Install Appwrite')
-    ->param('version', APP_VERSION_STABLE, new Mock(), 'Appwrite version', true)
-    ->action(function ($version) {
+    ->action(function () {
         /**
          * 1. Start - DONE
          * 2. Check for older setup and get older version - DONE
@@ -36,6 +35,12 @@ $cli
         $defaultHTTPSPort = '443';
         $vars = [];
 
+        /**
+         * We are using a random value every execution for identification.
+         * This allows us to collect information without invading the privacy of our users.
+         */
+        $analytics = new GoogleAnalytics('UA-26264668-9', uniqid('server.', true));
+
         foreach($config as $category) {
             foreach($category['variables'] ?? [] as $var) {
                 $vars[] = $var;
@@ -48,7 +53,7 @@ $cli
         if (null !== $path && !\file_exists(\dirname($path))) {
             if (!@\mkdir(\dirname($path), 0755, true)) {
                 Console::error('Can\'t create directory '.\dirname($path));
-                exit(1);
+                Console::exit(1);
             }
         }
 
@@ -130,7 +135,7 @@ $cli
         $templateForCompose
             ->setParam('httpPort', $httpPort)
             ->setParam('httpsPort', $httpsPort)
-            ->setParam('version', $version)
+            ->setParam('version', APP_VERSION_STABLE)
         ;
         
         $templateForEnv
@@ -138,27 +143,42 @@ $cli
         ;
 
         if(!file_put_contents($path.'/docker-compose.yml', $templateForCompose->render(false))) {
-            Console::error('Failed to save Docker Compose file');
-            exit(1);
+            $message = 'Failed to save Docker Compose file';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE.' - '.$message);
+            Console::error($message);
+            Console::exit(1);
         }
 
         if(!file_put_contents($path.'/.env', $templateForEnv->render(false))) {
-            Console::error('Failed to save environment variables file');
-            exit(1);
+            $message = 'Failed to save environment variables file';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE.' - '.$message);
+            Console::error($message);
+            Console::exit(1);
         }
 
+        $env = '';
         $stdout = '';
         $stderr = '';
 
+        foreach ($input as $key => $value) {
+            if($value) {
+                $env .= $key.'='.$value.' ';
+            }
+        }
+
         Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes\"");
 
-        $exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
+        $exit = Console::execute("${env} docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans --renew-anon-volumes", '', $stdout, $stderr);
 
         if ($exit !== 0) {
-            Console::error("Failed to install Appwrite dockers");
+            $message = 'Failed to install Appwrite dockers';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE.' - '.$message);
+            Console::error($message);
             Console::error($stderr);
-            exit($exit);
+            Console::exit($exit);
         } else {
-            Console::success("Appwrite installed successfully");
+            $message = 'Appwrite installed successfully';
+            $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE.' - '.$message);
+            Console::success($message);
         }
     });

app/tasks/maintenance.php

@@ -4,64 +4,52 @@ global $cli;
 
 require_once __DIR__.'/../init.php';
 
-use Appwrite\Database\Database;
-use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
-use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Event\Event;
 use Utopia\App;
 use Utopia\CLI\Console;
-use Utopia\Config\Config;
-
-// TODO: Think of a better way to access consoleDB
-function getConsoleDB() {
-    global $register;
-    $consoleDB = new Database();
-    $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
-    $consoleDB->setNamespace('app_console'); // Main DB
-    $consoleDB->setMocks(Config::getParam('collections', []));
-    return $consoleDB;
-}
-
-function notifyDeleteExecutionLogs()
-{
-    Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
-        'type' => DELETE_TYPE_EXECUTIONS
-    ]);
-}
-
-function notifyDeleteAbuseLogs(int $interval) 
-{
-    Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
-        'type' =>  DELETE_TYPE_ABUSE,
-        'timestamp' => time() - $interval
-    ]);
-}
-
-function notifyDeleteAuditLogs(int $interval) 
-{
-    Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
-        'type' => DELETE_TYPE_AUDIT,
-        'timestamp' => time() - $interval
-    ]);
-}
 
 $cli
     ->task('maintenance')
     ->desc('Schedules maintenance tasks and publishes them to resque')
     ->action(function () {
+        Console::title('Maintenance V1');
+        Console::success(APP_NAME.' maintenance process v1 has started');
+
+        function notifyDeleteExecutionLogs(int $interval)
+        {
+            Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
+                'type' => DELETE_TYPE_EXECUTIONS,
+                'timestamp' => time() - $interval
+            ]);
+        }
+
+        function notifyDeleteAbuseLogs(int $interval) 
+        {
+            Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
+                'type' =>  DELETE_TYPE_ABUSE,
+                'timestamp' => time() - $interval
+            ]);
+        }
+
+        function notifyDeleteAuditLogs(int $interval) 
+        {
+            Resque::enqueue(Event::DELETE_QUEUE_NAME, Event::DELETE_CLASS_NAME, [
+                'type' => DELETE_TYPE_AUDIT,
+                'timestamp' => time() - $interval
+            ]);
+        }
+
         // # of days in seconds (1 day = 86400s)
         $interval = (int) App::getEnv('_APP_MAINTENANCE_INTERVAL', '86400');
-        //Convert Seconds to microseconds
-        $intervalMicroseconds = $interval * 1000000;
-
-        $consoleDB = getConsoleDB();
-
-        Console::loop(function() use ($consoleDB, $interval){
-            Console::info("[ MAINTENANCE TASK ] Notifying deletes workers every {$interval} seconds");
-            notifyDeleteExecutionLogs();
-            notifyDeleteAbuseLogs($interval);
-            notifyDeleteAuditLogs($interval);
-            
-        }, $intervalMicroseconds);
+        $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');
 
+        Console::loop(function() use ($interval, $executionLogsRetention, $abuseLogsRetention, $auditLogRetention){
+            $time = date('d-m-Y H:i:s', time());
+            Console::info("[{$time}] Notifying deletes workers every {$interval} seconds");
+            notifyDeleteExecutionLogs($executionLogsRetention);
+            notifyDeleteAbuseLogs($abuseLogsRetention);
+            notifyDeleteAuditLogs($auditLogRetention);
+        }, $interval);
     });

app/tasks/migrate.php

@@ -5,187 +5,26 @@ global $cli, $register, $projectDB, $console;
 use Utopia\Config\Config;
 use Utopia\CLI\Console;
 use Appwrite\Database\Database;
-use Appwrite\Database\Document;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
-
-$callbacks = [
-    '0.4.0' => function() {
-        Console::log('I got nothing to do.');
-    },
-
-    '0.5.0' => function($project) use ($register, $projectDB) {
-        $db = $register->get('db');
-
-        Console::log('Migrating project: '.$project->getAttribute('name').' ('.$project->getId().')');
-
-        // Update all documents $uid -> $id
-
-        $limit = 30;
-        $sum = 30;
-        $offset = 0;
-
-        while ($sum >= 30) {
-            $all = $projectDB->getCollection([
-                'limit' => $limit,
-                'offset' => $offset,
-                'orderType' => 'DESC',
-            ]);
-
-            $sum = \count($all);
-            
-            Console::log('Migrating: '.$offset.' / '.$projectDB->getSum());
-            
-            foreach($all as $document) {
-                $document = fixDocument($document);
-
-                if(empty($document->getId())) {
-                    throw new Exception('Missing ID');
-                }
-
-                try {
-                    $new = $projectDB->overwriteDocument($document->getArrayCopy());
-                } catch (\Throwable $th) {
-                    var_dump($document);
-                    Console::error('Failed to update document: '.$th->getMessage());
-                    continue;
-                }
-
-                if($new->getId() !== $document->getId()) {
-                    throw new Exception('Duplication Error');
-                }
-            }
-
-            $offset = $offset + $limit;
-        }
-
-        $schema = $_SERVER['_APP_DB_SCHEMA'] ?? '';
-
-        try {
-            $statement = $db->prepare("
-
-                CREATE TABLE IF NOT EXISTS `template.database.unique` (
-                    `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-                    `key` varchar(128) DEFAULT NULL,
-                    PRIMARY KEY (`id`),
-                    UNIQUE KEY `index1` (`key`)
-                ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
-                CREATE TABLE IF NOT EXISTS `{$schema}`.`app_{$project->getId()}.database.unique` LIKE `template.database.unique`;
-                ALTER TABLE `{$schema}`.`app_{$project->getId()}.audit.audit` DROP COLUMN IF EXISTS `userType`;
-                ALTER TABLE `{$schema}`.`app_{$project->getId()}.audit.audit` DROP INDEX IF EXISTS `index_1`;
-                ALTER TABLE `{$schema}`.`app_{$project->getId()}.audit.audit` ADD INDEX IF NOT EXISTS `index_1` (`userId` ASC);
-            ");
-
-            $statement->closeCursor();
-
-            $statement->execute();
-        }
-        catch (\Exception $e) {
-            Console::error('Failed to alter table for project: '.$project->getId().' with message: '.$e->getMessage().'/');
-        }
-    },
-];
-
-function fixDocument(Document $document) {
-    $providers = Config::getParam('providers');
-
-    if($document->getAttribute('$collection') === Database::SYSTEM_COLLECTION_PROJECTS){
-        foreach($providers as $key => $provider) {
-            if(!empty($document->getAttribute('usersOauth'.\ucfirst($key).'Appid'))) {
-                $document
-                    ->setAttribute('usersOauth2'.\ucfirst($key).'Appid', $document->getAttribute('usersOauth'.\ucfirst($key).'Appid', ''))
-                    ->removeAttribute('usersOauth'.\ucfirst($key).'Appid')
-                ;
-            }
-
-            if(!empty($document->getAttribute('usersOauth'.\ucfirst($key).'Secret'))) {
-                $document
-                    ->setAttribute('usersOauth2'.\ucfirst($key).'Secret', $document->getAttribute('usersOauth'.\ucfirst($key).'Secret', ''))
-                    ->removeAttribute('usersOauth'.\ucfirst($key).'Secret')
-                ;
-            }
-        }
-    }
-
-    if($document->getAttribute('$collection') === Database::SYSTEM_COLLECTION_WEBHOOKS){
-        $document->setAttribute('security', ($document->getAttribute('security')) ? true : false);
-    }
-
-    if($document->getAttribute('$collection') === Database::SYSTEM_COLLECTION_TASKS){
-        $document->setAttribute('security', ($document->getAttribute('security')) ? true : false);
-    }
-
-    if($document->getAttribute('$collection') === Database::SYSTEM_COLLECTION_USERS) {
-        foreach($providers as $key => $provider) {
-            if(!empty($document->getAttribute('oauth'.\ucfirst($key)))) {
-                $document
-                    ->setAttribute('oauth2'.\ucfirst($key), $document->getAttribute('oauth'.\ucfirst($key), ''))
-                    ->removeAttribute('oauth'.\ucfirst($key))
-                ;
-            }
-
-            if(!empty($document->getAttribute('oauth'.\ucfirst($key).'AccessToken'))) {
-                $document
-                    ->setAttribute('oauth2'.\ucfirst($key).'AccessToken', $document->getAttribute('oauth'.\ucfirst($key).'AccessToken', ''))
-                    ->removeAttribute('oauth'.\ucfirst($key).'AccessToken')
-                ;
-            }
-        }
-    
-        if($document->getAttribute('confirm', null) !== null) {
-            $document
-                ->setAttribute('emailVerification', $document->getAttribute('confirm', $document->getAttribute('emailVerification', false)))
-                ->removeAttribute('confirm')
-            ;
-        }
-    }
-
-    if($document->getAttribute('$collection') === Database::SYSTEM_COLLECTION_PLATFORMS) {
-        if($document->getAttribute('url', null) !== null) {
-            $document
-                ->setAttribute('hostname', \parse_url($document->getAttribute('url', $document->getAttribute('hostname', '')), PHP_URL_HOST))
-                ->removeAttribute('url')
-            ;
-        }
-    }
-
-    $document
-        ->setAttribute('$id', $document->getAttribute('$uid', $document->getAttribute('$id')))
-        ->removeAttribute('$uid')
-    ;
-
-    foreach($document as &$attr) { // Handle child documents
-        if($attr instanceof Document) {
-            $attr = fixDocument($attr);
-        }
-
-        if(\is_array($attr)) {
-            foreach($attr as &$child) {
-                if($child instanceof Document) {
-                    $child = fixDocument($child);
-                }
-            }
-        }
-    }
-
-    return $document;
-}
+use Appwrite\Migration\Version;
 
 $cli
     ->task('migrate')
-    ->action(function () use ($register, $callbacks) {
+    ->action(function () use ($register) {
         Console::success('Starting Data Migration');
 
         $consoleDB = new Database();
-        $consoleDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
-        $consoleDB->setNamespace('app_console'); // Main DB
-        $consoleDB->setMocks(Config::getParam('collections', []));
-        
+        $consoleDB
+            ->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register))
+            ->setNamespace('app_console') // Main DB
+            ->setMocks(Config::getParam('collections', []));
+
         $projectDB = new Database();
-        $projectDB->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register));
-        $projectDB->setMocks(Config::getParam('collections', []));
+        $projectDB
+            ->setAdapter(new RedisAdapter(new MySQLAdapter($register), $register))
+            ->setMocks(Config::getParam('collections', []));
 
         $console = $consoleDB->getDocument('console');
 
@@ -197,13 +36,14 @@ $cli
         $projects = [$console];
         $count = 0;
 
-        while ($sum >= 30) {
-            foreach($projects as $project) {
-                
-                $projectDB->setNamespace('app_'.$project->getId());
+        $migration = new Version\V06($register->get('db')); //TODO: remove hardcoded version and move to dynamic migration
 
+        while ($sum > 0) {
+            foreach ($projects as $project) {
                 try {
-                    $callbacks['0.5.0']($project, $projectDB);
+                    $migration
+                        ->setProject($project, $projectDB)
+                        ->execute();
                 } catch (\Throwable $th) {
                     throw $th;
                     Console::error('Failed to update project ("'.$project->getId().'") version with error: '.$th->getMessage());
@@ -221,9 +61,11 @@ $cli
             $sum = \count($projects);
             $offset = $offset + $limit;
             $count = $count + $sum;
-
-            Console::log('Fetched '.$count.'/'.$consoleDB->getSum().' projects...');
+            
+            if ($sum > 0) {
+                Console::log('Fetched '.$count.'/'.$consoleDB->getSum().' projects...');
+            }
         }
 
         Console::success('Data Migration Completed');
-    });
+    });

app/tasks/sdks.php

@@ -4,6 +4,7 @@ use Utopia\Config\Config;
 use Utopia\CLI\Console;
 use Appwrite\Spec\Swagger2;
 use Appwrite\SDK\SDK;
+use Appwrite\SDK\Language\CLI;
 use Appwrite\SDK\Language\PHP;
 use Appwrite\SDK\Language\Web;
 use Appwrite\SDK\Language\Node;
@@ -91,6 +92,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $config->setNPMPackage('appwrite');
                         $config->setBowerPackage('appwrite');
                         break;
+                    case 'cli':
+                        $config = new CLI();
+                        $config->setComposerVendor('appwrite');
+                        $config->setComposerPackage('cli');
+                        break;
                     case 'php':
                         $config = new PHP();
                         $config->setComposerVendor('appwrite');
@@ -100,6 +106,8 @@ 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.
+                            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':
                         $config = new Deno();
@@ -124,6 +132,8 @@ 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)";
                         break;
                     case 'go':
                         $config = new Go();
@@ -215,5 +225,5 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
             }
         }
 
-        exit();
+        Console::exit();
     });

app/views/console/account/index.phtml

@@ -29,6 +29,8 @@
                         <div class="box margin-bottom-xl">
                             <div>
                                 <form name="account.update"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Update Account Name"
@@ -58,6 +60,8 @@
                             <hr />
 
                             <form name="update-email"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Account Email"
@@ -99,6 +103,8 @@
                                 <h1>Update Password</h1>
 
                                 <form name="update-password"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Update Account Password"
@@ -129,6 +135,8 @@
                             <hr />
 
                             <form class="margin-top"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account Current Session"
@@ -163,6 +171,8 @@
                             <p>PLEASE NOTE: Account deletion is irreversible.</p>
 
                             <form class="inline"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account"
@@ -197,6 +207,8 @@
                         <span data-ls-if="true != {{session.current}}">
                             <!-- From remote session (-logout event) -->
                             <form class="pull-end"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account Session"
@@ -218,6 +230,8 @@
                         <span data-ls-if="true == {{session.current}}">
                             <!-- From current session (+logout event) -->
                             <form class="pull-end"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Account Current Session"
@@ -254,6 +268,8 @@
             </div>
 
             <form class="inline margin-bottom-large"
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Delete Account Sessions"

app/views/console/comps/footer.phtml

@@ -6,6 +6,7 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
     <ul class="copyright pull-start">
         <li>
             <a class="link-animation-enabled"
+                data-analytics
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="GitHub Link"
@@ -13,6 +14,7 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
         </li>
         <li>
             <a class="link-animation-enabled"
+                data-analytics
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="New GitHub Issue"
@@ -20,6 +22,7 @@ $version = $this->getParam('version', '').'.'.APP_CACHE_BUSTER;
         </li>
         <li>
             <a class="link-animation-enabled"
+                data-analytics
                 data-analytics-event="click"
                 data-analytics-category="console/footer"
                 data-analytics-label="Docs Link"

app/views/console/comps/header.phtml

@@ -51,6 +51,7 @@
                     <span class="link"><i class="icon-sun-inv force-dark pull-start"></i><i class="icon-moon-inv force-light pull-start"></i> &nbsp; Change Theme
                         <div class="pull-end switch-theme">
                             <button data-general-theme
+                                data-analytics
                                 data-analytics-event="click"
                                 data-analytics-category="console/header"
                                 data-analytics-label="Switch Theme">
@@ -67,6 +68,7 @@
 
     <nav class="project-only" data-ls-ui-open="" data-button-class="round icon-btn phones-only tablets-only" data-button-aria="Navigation" data-button-icon="icon-dot-3">
         <a class="logo" href="/console"
+            data-analytics
             data-analytics-event="click"
             data-analytics-category="console/navigation"
             data-analytics-label="Logo Link">
@@ -81,6 +83,7 @@
             <ul class="links">
                 <li>
                     <a data-ls-attrs="href=/console/home?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Home Link">
@@ -95,6 +98,7 @@
             <ul class="links">
                 <li>
                     <a data-ls-attrs="href=/console/database?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Database Link">
@@ -104,6 +108,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/storage?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Storage Link">
@@ -113,6 +118,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/users?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Users Link">
@@ -122,6 +128,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/functions?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Functions Link"
@@ -137,6 +144,7 @@
             <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">
@@ -146,6 +154,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/webhooks?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="Webhooks Links">
@@ -155,6 +164,7 @@
                 </li>
                 <li>
                     <a data-ls-attrs="href=/console/keys?project={{router.params.project}}"
+                        data-analytics
                         data-analytics-event="click"
                         data-analytics-category="console/navigation"
                         data-analytics-label="API Keys Link">
@@ -168,6 +178,7 @@
         <ul class="links bottom">
             <li>
                 <a data-ls-attrs="href=/console/settings?project={{router.params.project}}"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/navigation"
                     data-analytics-label="Settings Link">
@@ -194,6 +205,8 @@
 
     <form
         data-setup
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
         data-analytics-label="Create Project">

app/views/console/database/collection.phtml

@@ -114,7 +114,7 @@ $maxCells = 10;
                                                     <?php if(!$array): ?>
                                                         <?php switch($type):
                                                             case 'fileId': ?>
-                                                                <img data-ls-if="{{node.<?php echo $this->escape($key); ?>}} != ''" src="" data-ls-attrs="src=//{{env.DOMAIN}}/v1/storage/files/{{node.<?php echo $this->escape($key); ?>}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="avatar" width="30" height="30" loading="lazy" />
+                                                                <img data-ls-if="{{node.<?php echo $this->escape($key); ?>}} != ''" src="" data-ls-attrs="src={{env.ENDPOINT}}/v1/storage/files/{{node.<?php echo $this->escape($key); ?>}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="avatar" width="30" height="30" loading="lazy" />
                                                             <?php break; ?>
                                                             <?php case 'document': ?>
                                                                 {...}
@@ -174,6 +174,8 @@ $maxCells = 10;
                 <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 Collection"
@@ -340,6 +342,8 @@ $maxCells = 10;
                         </ul>
 
                         <form name="database.deleteCollection" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Database Collection"
@@ -363,6 +367,7 @@ $maxCells = 10;
                 <ul data-ls-loop="project-collection.rules" data-ls-as="rule" class="sortable">
                     <li data-forms-remove data-forms-move-up  data-forms-move-down>
                         <form
+                            data-analytics
                             data-analytics-event="splice-rule-{{$index}}"
                             data-analytics-category="console"
                             data-analytics-label="Spliced Collection Rule"
@@ -384,6 +389,8 @@ $maxCells = 10;
                     <h1>Add Rule</h1>
 
                     <form
+                        data-analytics
+                        data-analytics-activity
                         data-analytics-event="submit"
                         data-analytics-category="console"
                         data-analytics-label="Added Collection Rule"
@@ -503,7 +510,7 @@ $maxCells = 10;
 
     <div data-ls-loop="project-collections.collections" data-ls-as="project" data-ls-key="$index2" class="tiles cell-3 margin-bottom-negative">
         <div class="margin-bottom" data-ls-if="{{project.$id}} != {{router.params.id}}">
-            <input type="checkbox" name="list" data-ls-attrs="value={{project.$id}}" data-ls-bind="{{rule.list}}" /> <span data-ls-bind="{{project.name}}"></span>
+            <input type="checkbox" name="list" data-ls-attrs="value={{project.$id}},id={{project.$id}}" data-ls-bind="{{rule.list}}" /> <label data-ls-attrs="for={{project.$id}}" data-ls-bind="{{project.name}}"></label>
         </div>
     </div>
 </script>
@@ -513,7 +520,8 @@ $maxCells = 10;
 
     <div data-ls-loop="project-collections.collections" data-ls-as="project" data-ls-key="$index2" class="tiles cell-3 margin-bottom-negative">
         <div class="margin-bottom" data-ls-if="{{project.$id}} != {{router.params.id}}">
-            <input type="radio" name="list" data-ls-attrs="value={{project.$id}}" data-ls-bind="{{rule.list|firstElement}}" data-cast-to="array" required /> <span data-ls-bind="{{project.name}}"></span>
+            <input type="radio" name="list" data-ls-attrs="value={{project.$id}},id={{project.$id}}" data-ls-bind="{{rule.list|firstElement}}" data-cast-to="array" required />
+            <label data-ls-attrs="for={{project.$id}}"data-ls-bind="{{project.name}}"></label>
         </div>
     </div>
 </script>

app/views/console/database/document.phtml

@@ -192,6 +192,8 @@ $collections = [];
                 <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"
@@ -288,6 +290,8 @@ $collections = [];
 
                         <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"

app/views/console/database/index.phtml

@@ -18,6 +18,8 @@
                 <h1>New Collection</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create Database Collection"

app/views/console/database/search/documents.phtml

@@ -72,7 +72,7 @@ $rules = $collection->getAttribute('rules', []);
                                     <?php if(!$array): ?>
                                         <?php switch($type):
                                             case 'fileId': ?>
-                                                <img data-ls-if="{{node.<?php echo $this->escape($key); ?>}} != ''" src="" data-ls-attrs="src=//{{env.DOMAIN}}/v1/storage/files/{{node.<?php echo $this->escape($key); ?>}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="avatar" width="30" height="30" loading="lazy" />
+                                                <img data-ls-if="{{node.<?php echo $this->escape($key); ?>}} != ''" src="" data-ls-attrs="src={{env.ENDPOINT}}/v1/storage/files/{{node.<?php echo $this->escape($key); ?>}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="avatar" width="30" height="30" loading="lazy" />
                                             <?php break; ?>
                                             <?php case 'document': ?>
                                                 {...}

app/views/console/database/search/files.phtml

@@ -54,7 +54,7 @@
                                 <input type="radio" name="selected" data-ls-attrs="value={{file.$id}}" data-ls-bind="{{search.selected}}" />
                             </td>
                             <td data-title="x" class="">
-                                <img src="" data-ls-attrs="src=//{{env.DOMAIN}}/v1/storage/files/{{file.$id}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="pull-start avatar" width="30" height="30" loading="lazy" />
+                                <img src="" data-ls-attrs="src={{env.ENDPOINT}}/v1/storage/files/{{file.$id}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="pull-start avatar" width="30" height="30" loading="lazy" />
                             </td>
                             <td data-title="Name: " class="text-one-liner">
                                 <span data-ls-bind="{{file.name}}" data-ls-attrs="title={{file.name}}" class="text-fade text-size-small"></span>

app/views/console/functions/function.phtml

@@ -3,6 +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);
 ?>
 <div
     data-service="functions.get"
@@ -51,6 +52,8 @@ $timeout = $this->getParam('timeout', 900);
                                 </p>
 
                                 <form data-ls-if="{{project-function.tag}} !== ''" name="functions.createExecution" class="margin-top"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Function Execution"
@@ -93,6 +96,8 @@ $timeout = $this->getParam('timeout', 900);
                                     <ul data-ls-loop="project-function-tags.tags" data-ls-as="tag" class="list">
                                         <li class="clear">
                                             <form data-ls-if="{{tag.$id}} !== {{project-function.tag}}" name="functions.updateTag" class="pull-end"
+                                                data-analytics
+                                                data-analytics-activity
                                                 data-analytics-event="submit"
                                                 data-analytics-category="console"
                                                 data-analytics-label="Create Function Execution"
@@ -115,6 +120,8 @@ $timeout = $this->getParam('timeout', 900);
                                                 <span class="pull-start" data-ls-bind="Created {{tag.dateCreated|timeSince}} &nbsp; | &nbsp; {{tag.size|humanFileSize}}"></span>
 
                                                 <form data-ls-if="{{tag.$id}} !== {{project-function.tag}}" name="functions.deleteTag" class="pull-start"
+                                                    data-analytics
+                                                    data-analytics-activity
                                                     data-analytics-event="submit"
                                                     data-analytics-category="console"
                                                     data-analytics-label="Delete Function Tag"
@@ -140,39 +147,7 @@ $timeout = $this->getParam('timeout', 900);
                         </div>
 
                         <div class="pull-start">
-                            <div data-ui-modal class="modal close box sticky-footer" data-button-text="Deploy Tag">
-                                <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
-
-                                <h1>Deploy a New Tag</h1>
-
-                                <form
-                                    data-analytics-event="submit"
-                                    data-analytics-category="console"
-                                    data-analytics-label="Create Function Tag"
-                                    data-service="functions.createTag"
-                                    data-scope="sdk"
-                                    data-event="submit"
-                                    data-success="alert,trigger,reset"
-                                    data-success-param-alert-text="Created function tag successfully"
-                                    data-success-param-trigger-events="functions.createTag"
-                                    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>
-                                    <input type="text" id="tag-command" name="command" required autocomplete="off" class="margin-bottom" placeholder="node main.js" />
-                            
-                                    <label for="tag-code">Gzipped Code (tar.gz file)</label>
-                                    <input type="file" name="code" id="tag-code" size="1" required accept="application/x-gzip">
-                                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom-large">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
-
-                                    <footer>
-                                        <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
-                                    </footer>
-                                </form>
-                            </div>
+                            <button data-ls-ui-trigger="deploy-tag">Deploy Tag</button>
                         </div>
 
                         <div class="pull-end paging">
@@ -220,6 +195,8 @@ $timeout = $this->getParam('timeout', 900);
                         </ul>
 
                         <form name="functions.delete" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Function"
@@ -240,6 +217,7 @@ $timeout = $this->getParam('timeout', 900);
                     </div>
                 </div>
             </li>
+            <?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'"
@@ -318,6 +296,7 @@ $timeout = $this->getParam('timeout', 900);
                     </ul>
                 </div>
             </li>
+            <?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>
@@ -466,6 +445,8 @@ $timeout = $this->getParam('timeout', 900);
                         <label>&nbsp;</label>
 
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Update Function"
@@ -484,9 +465,13 @@ $timeout = $this->getParam('timeout', 900);
                                 <section class="margin-bottom-large">
                                     <label for="name">Name</label>
                                     <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>
+
                                     <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); ?>" />
+                                    <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" />
                                     <div class="text-size-small text-fade margin-bottom margin-top-negative-small">Max value is <?php echo $this->escape(number_format($timeout)); ?> seconds (<?php echo $this->escape((int) ($timeout / 60)); ?> minutes)</div>
                                 </section>
 
@@ -495,7 +480,9 @@ $timeout = $this->getParam('timeout', 900);
                                     <div class="row responsive thin margin-top-small">
                                         <?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}}" value="<?php echo $event; ?>" /> &nbsp; <?php echo $event; ?>
+                                                <input type="checkbox" name="events" data-ls-bind="{{project-function.events}}" id="<?php echo $event; ?>" value="<?php echo $event; ?>" />
+                                                &nbsp;
+                                                <label class="inline" for="<?php echo $event; ?>"><?php echo $event; ?></label>
                                             </div>
                                             <?php if (($i + 1) % 2 === 0) : ?>
                                             </div>
@@ -506,15 +493,9 @@ $timeout = $this->getParam('timeout', 900);
                                     </div>
                                 </section>
 
-                                <label for="execute">Execute 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="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>
-
-                                <section class="margin-bottom-large">
-                                    <label for="schedule">Schedule (CRON Syntax) <span class="tooltip small" data-tooltip="Set a CRON schedule to trigger this function."><i class="icon-info-circled"></i></span></label>
-                                    <input type="text" class="full-width" name="schedule" autocomplete="off" data-ls-bind="{{project-function.schedule}}" placeholder="* * * * *" />
-                                    <div class="text-size-small text-fade margin-bottom margin-top-negative-small">Leave blank for no schedule</div>
-                                </section>
+                                <label for="schedule">Schedule (CRON Syntax) <span class="tooltip small" data-tooltip="Set a CRON schedule to trigger this function."><i class="icon-info-circled"></i></span></label>
+                                <input type="text" id="function-schedule" class="full-width" name="schedule" autocomplete="off" data-ls-bind="{{project-function.schedule}}" placeholder="* * * * *" />
+                                <div class="text-size-small text-fade margin-bottom margin-top-negative-small">Leave blank for no schedule</div>
 
                                 <h3 class="margin-bottom-small">Variables <span class="tooltip small" data-tooltip="Set variables or secret keys that will be passed as env vars to your function at runtime."><i class="icon-info-circled"></i></span></h3>
 
@@ -522,7 +503,7 @@ $timeout = $this->getParam('timeout', 900);
                                     <hr class="margin-bottom margin-top-no" />
 
                                     <fieldset name="vars" data-cast-to="object">
-                                        <div data-ls-loop="project-function.vars" data-ls-as="var" id="project-vars">
+                                        <div data-ls-loop="project-function.vars" data-ls-as="var" id="project-vars" style="visibility: visible;">
                                             <div class="margin-bottom-small">
                                                 <div data-forms-remove class="row thin">
                                                     <div class="col span-10">
@@ -568,6 +549,8 @@ $timeout = $this->getParam('timeout', 900);
                         </ul>
 
                         <form name="functions.delete" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Function"
@@ -590,4 +573,71 @@ $timeout = $this->getParam('timeout', 900);
             </li>
         </ul>
     </div>
-</div>
+</div>
+
+<div data-ui-modal class="modal close box sticky-footer" data-button-hide="on" data-open-event="deploy-tag">
+    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+    <h1 class="margin-bottom-xl">Deploy a New Tag</h1>
+
+    <ul class="phases padding margin-top-negative-small" data-ui-phases>
+        <li>
+            <h2 style="display: none">CLI</h2>
+
+            <p><b>Unix</b></p>
+
+            <div class="margin-bottom">
+                <textarea type="hidden" data-ls-bind="appwrite functions createTag \
+    --functionId={{project-function.$id}} \
+    --command='mycommand' \
+    --code='/myrepo/myfunction'" data-forms-code="bash" data-lang="bash" data-lang-label="Bash"></textarea>
+            </div>
+
+            <p><b>PowerShell</b></p>
+
+            <div class="margin-bottom">
+                <textarea type="hidden" data-ls-bind="appwrite functions createTag `
+    --functionId={{project-function.$id}} `
+    --command='mycommand' `
+    --code='/myrepo/myfunction'" data-forms-code="powershell" data-lang="powershell" data-lang-label="PowerShell"></textarea>
+            </div>
+
+            <p>Learn more about <a href="" target="_blank">creating tags</a>, installing and using the <a href="" target="_blank">Appwrite CLI</a>.</p>
+        </li>
+        <li>
+            <h2 style="display: none">Manual</h2>
+            <form class="margin-top-negative"
+                data-analytics
+                data-analytics-activity
+                data-analytics-event="submit"
+                data-analytics-category="console"
+                data-analytics-label="Create Function Tag"
+                data-service="functions.createTag"
+                data-scope="sdk"
+                data-event="submit"
+                data-success="alert,trigger,reset"
+                data-success-param-alert-text="Created function tag successfully"
+                data-success-param-trigger-events="functions.createTag"
+                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>
+                <input type="text" id="tag-command" name="command" required autocomplete="off" class="margin-bottom" placeholder="node main.js" />
+
+                <label for="tag-code">Gzipped Code (tar.gz file)</label>
+                <input type="file" name="code" id="tag-code" size="1" required accept="application/x-gzip,.gz">
+                <div class="text-fade text-size-xs margin-top-negative-small margin-bottom-large">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>
+
+                <footer>
+                    <button type="submit">Create</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Cancel</button>
+                </footer>
+            </form>
+        </li>
+    </ul>
+
+
+    
+</div>

app/views/console/functions/index.phtml

@@ -90,6 +90,8 @@ $environments = $this->getParam('environments', []);
                         <h1>Add Function</h1>
 
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Create Project Function"

app/views/console/home/index.phtml

@@ -1,5 +1,6 @@
 <?php
 $graph = $this->getParam('graph', false);
+$usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 ?>
 
 <div class="cover margin-bottom-small">
@@ -26,40 +27,54 @@ $graph = $this->getParam('graph', false);
 
 <div class="zone xxl margin-top-negative-xxxl">
     <div class="clear margin-bottom-small margin-top-negative">
-        <div class="pull-end">
+        <?php if (!$graph && $usageStatsEnabled): ?>
+            <div class="pull-end">
 
-            <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '24h'"
-                data-service="projects.getUsage"
-                data-event="submit"
-                data-name="usage"
-                data-param-project-id="{{router.params.project}}"
-                data-param-range="24h">
-                <button class="tick">24h</button>
-            </form>
+                <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '24h'"
+                    data-analytics
+                    data-analytics-event="click"
+                    data-analytics-category="console"
+                    data-analytics-label="Usage 24h"
+                    data-service="projects.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-project-id="{{router.params.project}}"
+                    data-param-range="24h">
+                    <button class="tick">24h</button>
+                </form>
 
-            <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
+                <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '24h'" disabled>24h</button>
 
-            <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '30d'"
-                data-service="projects.getUsage"
-                data-event="submit"
-                data-name="usage"
-                data-param-project-id="{{router.params.project}}">
-                <button class="tick">30d</button>
-            </form>
+                <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '30d'"
+                    data-analytics
+                    data-analytics-event="click"
+                    data-analytics-category="console"
+                    data-analytics-label="Usage 30d"
+                    data-service="projects.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-project-id="{{router.params.project}}">
+                    <button class="tick">30d</button>
+                </form>
 
-            <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '30d'" disabled>30d</button>
+                <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '30d'" disabled>30d</button>
 
-            <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '90d'"
-                data-service="projects.getUsage"
-                data-event="submit"
-                data-name="usage"
-                data-param-project-id="{{router.params.project}}"
-                data-param-range="90d">
-                <button class="tick">90d</button>
-            </form>
+                <form class="margin-start-small inline" data-ls-if="{{usage.range}} !== '90d'"
+                    data-analytics
+                    data-analytics-event="click"
+                    data-analytics-category="console"
+                    data-analytics-label="Usage 90d"
+                    data-service="projects.getUsage"
+                    data-event="submit"
+                    data-name="usage"
+                    data-param-project-id="{{router.params.project}}"
+                    data-param-range="90d">
+                    <button class="tick">90d</button>
+                </form>
 
-            <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '90d'" disabled>90d</button>
-        </div>
+                <button class="tick margin-start-small" data-ls-if="{{usage.range}} === '90d'" disabled>90d</button>
+            </div>
+        <?php endif; ?>
     </div>
     <div
         data-service="projects.getUsage"
@@ -68,7 +83,7 @@ $graph = $this->getParam('graph', false);
         data-param-project-id="{{router.params.project}}"
         data-param-range="30d">
 
-        <?php if (!$graph) : ?>
+        <?php if (!$graph && $usageStatsEnabled): ?>
             <div class="box dashboard">
                 <div class="row responsive">
                     <div class="col span-9">
@@ -139,6 +154,8 @@ $graph = $this->getParam('graph', false);
                 </div>
 
                 <form class="pull-end margin-end"
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Delete Project Platform"
@@ -190,7 +207,11 @@ $graph = $this->getParam('graph', false);
     </div>
 
     <div class="pull-end desktops-only tablets-only">
-        <a data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your Server API Keys</a>
+        <a data-analytics
+            data-analytics-event="click"
+            data-analytics-category="console"
+            data-analytics-label="API Keys Link"
+            data-ls-attrs="href=/console/keys?project={{router.params.project}}">Manage Your Server API Keys</a>
     </div>
 
     <div class="drop-list pull-start" data-ls-ui-open="" data-button-aria="Choose Platform" data-button-text="Add Platform" data-button-class="button" data-blur="1">
@@ -220,6 +241,8 @@ $graph = $this->getParam('graph', false);
     <h1>New Web App</h1>
 
     <form
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
         data-analytics-label="Create Project Platform (Web)"
@@ -258,6 +281,8 @@ $graph = $this->getParam('graph', false);
 
 <script type="text/html" id="template-web-update">
     <form
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
         data-analytics-label="Update Project Platform (Web)"
@@ -296,6 +321,8 @@ $graph = $this->getParam('graph', false);
             <h2 style="display: none">&nbsp;&nbsp;iOS&nbsp;&nbsp;</h2>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Platform (Flutter / iOS)"
@@ -328,6 +355,8 @@ $graph = $this->getParam('graph', false);
             <h2 style="display: none">&nbsp;&nbsp;Android&nbsp;&nbsp;</h2>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Platform (Flutter / Android)"
@@ -360,9 +389,11 @@ $graph = $this->getParam('graph', false);
 
 <script type="text/html" id="template-ios-update">
     <form
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="console"
-        data-analytics-label="Update Project Platform (iOS)"
+        data-analytics-label="Update Project Platform (Flutter / iOS)"
         data-service="projects.updatePlatform"
         data-scope="console"
         data-event="submit"
@@ -390,9 +421,10 @@ $graph = $this->getParam('graph', false);
 
 <script type="text/html" id="template-android-update">
     <form
+        data-analytics
         data-analytics-event="submit"
         data-analytics-category="console"
-        data-analytics-label="Update Project Platform (Android)"
+        data-analytics-label="Update Project Platform (Flutter / Android)"
         data-service="projects.updatePlatform"
         data-scope="console"
         data-event="submit"

app/views/console/index.phtml

@@ -93,23 +93,28 @@ $home = $this->getParam('home', '');
                 <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"
                     data-analytics-category="console/home"
                     data-analytics-label="Twitter Link"><i class="icon-twitter"></i></a>
                 <a href="<?php echo APP_SOCIAL_FACEBOOK; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Facebook"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Facebook Link"><i class="icon-facebook"></i></a>
                 <a href="<?php echo APP_SOCIAL_LINKEDIN; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Linkedin"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Linkedin Link"><i class="icon-linkedin"></i></a>
                 <a href="<?php echo APP_SOCIAL_DISCORD; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> Discord Server"
+                    data-analytics
                     data-analytics-event="click"
                     data-analytics-category="console/home"
                     data-analytics-label="Discord Link"><i class="icon-discord"></i></a>
                 <a href="<?php echo APP_SOCIAL_GITHUB; ?>" target="_blank" rel="noopener" title="<?php echo APP_NAME;?> on Github"
-                    data-analytics-event="click"
+                    data-analytics
+                    data-analytics-type="click"
                     data-analytics-category="console/home"
                     data-analytics-label="GitHub Link"><i class="icon-github-circled"></i></a>
             </div>

app/views/console/keys/index.phtml

@@ -33,6 +33,8 @@ $scopes = $this->getParam('scopes', []);
                     <h1>Update API Key</h1>
 
                     <form
+                        data-analytics
+                        data-analytics-activity
                         data-analytics-event="submit"
                         data-analytics-category="console"
                         data-analytics-label="Update Project Key"
@@ -57,7 +59,9 @@ $scopes = $this->getParam('scopes', []);
                             <div class="row responsive thin">
                                 <?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" data-ls-bind="{{key.scopes}}" value="<?php echo $scope; ?>" /> &nbsp; <?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; ?>" />
+                                        &nbsp;
+                                        <label class="inline" for="scope-<?php echo $scope; ?>"><?php echo $scope; ?></label>
                                     </div>
                                     <?php if (($i + 1) % 2 === 0) : ?>
                                     </div>
@@ -75,6 +79,8 @@ $scopes = $this->getParam('scopes', []);
                 </div>
 
                 <form class="pull-end margin-end"
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Delete Project Key"
@@ -131,9 +137,11 @@ $scopes = $this->getParam('scopes', []);
             <h1>Add API Keys</h1>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
-                data-analytics-label="Create Project Platform"
+                data-analytics-label="Create Project Key"
                 data-service="projects.createKey"
                 data-scope="console"
                 data-event="submit"
@@ -154,7 +162,9 @@ $scopes = $this->getParam('scopes', []);
                     <div class="row responsive thin">
                         <?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" value="<?php echo $scope; ?>" /> &nbsp; <?php echo $scope; ?>
+                                <input type="checkbox" name="scopes" id="<?php echo $scope; ?>" value="<?php echo $scope; ?>" /> 
+                                &nbsp; 
+                                <label class="inline" for="<?php echo $scope; ?>"><?php echo $scope; ?></label>
                             </div>
                             <?php if (($i + 1) % 2 === 0) : ?>
                             </div>

app/views/console/settings/index.phtml

@@ -33,6 +33,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
 
                         <div class="box margin-bottom-large">
                             <form
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Project"
@@ -87,6 +89,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                             <p>PLEASE NOTE: Project deletion is irreversible.</p>
 
                             <form class="inline"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete Project"
@@ -131,7 +135,7 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
 
                         <label for="name">API Endpoint</label>
                         <div class="input-copy">
-                            <input data-forms-copy type="text" disabled data-ls-bind="{{env.PROTOCOL}}://{{env.DOMAIN}}/v1" />
+                            <input data-forms-copy type="text" disabled data-ls-bind="{{env.ENDPOINT}}/v1" />
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
@@ -281,6 +285,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                                     <li>
                                                         Confirm and verify your CNAME record values:
                                                         <form class="strip"
+                                                            data-analytics
+                                                            data-analytics-activity
                                                             data-analytics-event="submit"
                                                             data-analytics-category="console"
                                                             data-analytics-label="Update Domain Verification"
@@ -313,6 +319,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                         </td>
                                         <td data-title="">
                                             <form class="pull-end"
+                                                data-analytics
+                                                data-analytics-activity
                                                 data-analytics-event="submit"
                                                 data-analytics-category="console"
                                                 data-analytics-label="Delete Project Domain"
@@ -345,6 +353,8 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                 <h1>Add Domain</h1>
 
                                 <form
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Project Domain"
@@ -388,9 +398,11 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                         <ul data-ls-loop="members.memberships" data-ls-as="member" class="list">
                             <li class="clear">
                                 <form class="pull-end"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
-                                    data-analytics-label="Delete Team Membership"
+                                    data-analytics-label="Delete Project Membership"
                                     data-service="teams.deleteMembership"
                                     data-scope="console"
                                     data-event="submit"
@@ -409,9 +421,11 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                 
                                 <div data-ls-if="false === {{member.confirm}}" class="pull-end margin-end">
                                     <form class="pull-end"
+                                        data-analytics
+                                        data-analytics-activity
                                         data-analytics-event="submit"
                                         data-analytics-category="console"
-                                        data-analytics-label="Create Team Membership (resend)"
+                                        data-analytics-label="Create Project Membership (resend)"
                                         data-service="teams.deleteMembership"
                                         data-scope="console"
                                         data-event="submit"
@@ -439,7 +453,7 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                                         data-failure-param-alert-classname="error">
 
                                         <input name="teamId" type="hidden" data-ls-bind="{{member.teamId}}">
-                                        <input name="url" type="hidden" data-ls-bind="{{env.PROTOCOL}}://{{env.DOMAIN}}/auth/join?project={{router.params.project}}" />
+                                        <input name="url" type="hidden" data-ls-bind="{{env.ENDPOINT}}/auth/join?project={{router.params.project}}" />
                                         <input name="email" type="hidden" data-ls-bind="{{member.email}}">
                                         <input name="name" type="hidden" data-ls-bind="{{member.name}}">
                                         <input name="roles" type="hidden" data-ls-bind="{{member.roles}}" data-cast-to="json">
@@ -462,9 +476,11 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                         <h1>Invite Member</h1>
 
                         <form name="teams.createTeamMembership"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
-                            data-analytics-label="Create Team Membership"
+                            data-analytics-label="Create Project Membership"
                             data-service="teams.createMembership"
                             data-scope="console"
                             data-event="submit"
@@ -477,7 +493,7 @@ $customDomainsTarget = $this->getParam('customDomainsTarget', false);
                             data-failure-param-alert-classname="error">
 
                             <input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{console-project.teamId}}">
-                            <input name="url" type="hidden" data-ls-bind="{{env.PROTOCOL}}://{{env.DOMAIN}}/auth/join?project={{router.params.project}}" />
+                            <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>

app/views/console/storage/index.phtml

@@ -23,6 +23,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                 <h1>Upload File</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create Storage File"
@@ -111,7 +113,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                             <tbody data-ls-loop="project-files.files" data-ls-as="file">
                                 <tr>
                                     <td class="hide">
-                                        <img src="" data-ls-attrs="src=//{{env.DOMAIN}}/v1/storage/files/{{file.$id}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="pull-start avatar" width="30" height="30" loading="lazy" />
+                                        <img src="" data-ls-attrs="src={{env.ENDPOINT}}/v1/storage/files/{{file.$id}}/preview?width=65&height=65&project={{router.params.project}}&mode=admin" class="pull-start avatar" width="30" height="30" loading="lazy" />
                                     </td>
                                     <td data-title="Name: " class="text-one-liner" data-ls-attrs="title={{file.name}}" >
                                         <div data-ui-modal class="box modal sticky-footer width-large close" data-button-text="{{file.name}}" data-button-class="link" data-button-element="span">
@@ -124,6 +126,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                             <div class="row responsive modalize">
                                                 <div class="col span-8">
                                                     <form class="strip"
+                                                        data-analytics
+                                                        data-analytics-activity
                                                         data-analytics-event="submit"
                                                         data-analytics-category="console"
                                                         data-analytics-label="Update Storage File"
@@ -153,6 +157,8 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                     </form>
 
                                                     <form class="strip"
+                                                        data-analytics
+                                                        data-analytics-activity
                                                         data-analytics-event="submit"
                                                         data-analytics-category="console"
                                                         data-analytics-label="Delete File"
@@ -174,15 +180,15 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                                                     <div class="margin-bottom-small">File Preview</div>
                                                     
                                                     <div class="margin-bottom-small">
-                                                        <img src="" class="file-preview" data-ls-attrs="src=//{{env.DOMAIN}}/v1/storage/files/{{file.$id}}/preview?width=350&height=250&project={{router.params.project}}&mode=admin" loading="lazy" width="225" height="160" />
+                                                        <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>
 
                                                     <div class="margin-bottom-tiny">
-                                                        <a href="" data-ls-attrs="href=//{{env.DOMAIN}}/v1/storage/files/{{file.$id}}/view?project={{router.params.project}}&mode=admin" target="_blank" rel="noopener"><i class="icon-angle-circled-right margin-start-negative-tiny margin-end-tiny"></i> New Window <i class="icon-link-ext"></i></a>
+                                                        <a href="" data-ls-attrs="href={{env.ENDPOINT}}/v1/storage/files/{{file.$id}}/view?project={{router.params.project}}&mode=admin" target="_blank" rel="noopener"><i class="icon-angle-circled-right margin-start-negative-tiny margin-end-tiny"></i> New Window <i class="icon-link-ext"></i></a>
                                                     </div>
 
                                                     <div class="margin-bottom">
-                                                        <a href="" data-ls-attrs="href=//{{env.DOMAIN}}/v1/storage/files/{{file.$id}}/download?project={{router.params.project}}&mode=admin" target="_blank" rel="noopener"><i class="icon-angle-circled-right margin-start-negative-tiny margin-end-tiny"></i> Download <i class="icon-link-ext"></i></a>
+                                                        <a href="" data-ls-attrs="href={{env.ENDPOINT}}/v1/storage/files/{{file.$id}}/download?project={{router.params.project}}&mode=admin" target="_blank" rel="noopener"><i class="icon-angle-circled-right margin-start-negative-tiny margin-end-tiny"></i> Download <i class="icon-link-ext"></i></a>
                                                     </div>
                                                 </div>
                                             </div>

app/views/console/tasks/index.phtml

@@ -60,7 +60,7 @@
 
                         <br />
                     
-                        <span data-ls-if="undefined !== {{task.previous}}">
+                        <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">
@@ -78,6 +78,8 @@
                             <h1>Update Task</h1>
 
                             <form
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Project Task"
@@ -202,6 +204,8 @@
                         </div>
 
                         <form
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Project Task"
@@ -238,6 +242,8 @@
             <h1>Add Task</h1>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Task"

app/views/console/users/index.phtml

@@ -23,6 +23,8 @@ $providers = $this->getParam('providers', []);
                 <h1>Create User</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create User"
@@ -176,6 +178,8 @@ $providers = $this->getParam('providers', []);
                 <h1>Create Team</h1>
 
                 <form
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Create Team"
@@ -319,6 +323,8 @@ $providers = $this->getParam('providers', []);
                                 <h1><?php echo $this->escape($name); ?> OAuth2 Settings</h1>
 
                                 <form
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Update Project OAuth2"
@@ -339,7 +345,7 @@ $providers = $this->getParam('providers', []);
                                         <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}}">
                                     
                                         <label for="oauth2<?php echo $this->escape(ucfirst($provider)); ?>Secret">App Secret</label>
-                                        <input name="secret" data-forms-show-secret data-forms-show-secret-above="true" 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.usersOauth2<?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" />
@@ -355,7 +361,7 @@ $providers = $this->getParam('providers', []);
                                             <p>To complete set up, add this OAuth2 redirect URI to your <?php echo $this->escape(ucfirst($provider)); ?> app configuration.</p>
 
                                             <div class="input-copy">
-                                                <input data-forms-copy type="text" disabled data-ls-bind="{{env.PROTOCOL}}://{{env.DOMAIN}}/v1/account/sessions/oauth2/callback/<?php echo $this->escape($provider); ?>/{{router.params.project}}" class="margin-bottom-no" />
+                                                <input data-forms-copy type="text" disabled data-ls-bind="{{env.ENDPOINT}}/v1/account/sessions/oauth2/callback/<?php echo $this->escape($provider); ?>/{{router.params.project}}" class="margin-bottom-no" />
                                             </div>
                                         </div>
                                     </div>

app/views/console/users/team.phtml

@@ -39,6 +39,8 @@
 
                         <div class="box margin-bottom-large">
                             <form
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update Team"
@@ -88,6 +90,8 @@
                                     <ul data-ls-loop="project-members.memberships" data-ls-as="member" class="list">
                                         <li class="clear">
                                             <form class="pull-end"
+                                                data-analytics
+                                                data-analytics-activity
                                                 data-analytics-event="submit"
                                                 data-analytics-category="console"
                                                 data-analytics-label="Delete Team Membership"
@@ -125,6 +129,8 @@
                                 <h1>Add Member</h1>
 
                                 <form name="teams.createTeamMembership"
+                                    data-analytics
+                                    data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
                                     data-analytics-label="Create Team Membership"
@@ -139,7 +145,7 @@
                                     data-failure-param-alert-classname="error">
 
                                     <input name="teamId" id="team-teamId" type="hidden" data-ls-bind="{{team.$id}}">
-                                    <input name="url" type="hidden" data-ls-bind="{{env.PROTOCOL}}://{{env.DOMAIN}}" />
+                                    <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>
@@ -204,6 +210,8 @@
                         </ul>
 
                         <form name="teams.delete" class="margin-bottom"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete Team"

app/views/console/users/user.phtml

@@ -104,6 +104,8 @@
                             <p>PLEASE NOTE: User deletion is irreversible.</p>
                         
                             <form class="inline"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Delete User"
@@ -136,6 +138,8 @@
 
                         <div data-ls-if="{{user.status}} !== <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update User Status"
@@ -149,12 +153,14 @@
                                 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; ?>">Block Account</button>
+                                <button name="status" type="submit" class="danger fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" data-cast-to="integer">Block Account</button>
                             </form>
                         </div>
 
                         <div data-ls-if="{{user.status}} === <?php echo \Appwrite\Auth\Auth::USER_STATUS_BLOCKED; ?>" style="display: none">
                             <form name="users.updateStatus" class="margin-bottom"
+                                data-analytics
+                                data-analytics-activity
                                 data-analytics-event="submit"
                                 data-analytics-category="console"
                                 data-analytics-label="Update User Status"
@@ -168,7 +174,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; ?>">Activate Account</button>
+                                <button name="status" type="submit" class="fill" value="<?php echo \Appwrite\Auth\Auth::USER_STATUS_ACTIVATED; ?>" data-cast-to="integer">Activate Account</button>
                             </form>
                         </div>
                     </div>
@@ -192,6 +198,8 @@
                             <ul data-ls-loop="sessions.sessions" data-ls-as="session" class="list">
                                 <li class="clear">
                                     <form class="pull-end"
+                                        data-analytics
+                                        data-analytics-activity
                                         data-analytics-event="submit"
                                         data-analytics-category="console"
                                         data-analytics-label="Delete User Session"
@@ -222,6 +230,8 @@
                         </div>
 
                         <form class="inline margin-bottom-large"
+                            data-analytics
+                            data-analytics-activity
                             data-analytics-event="submit"
                             data-analytics-category="console"
                             data-analytics-label="Delete User Sessions"

app/views/console/webhooks/index.phtml

@@ -37,6 +37,8 @@ $events = array_keys($this->getParam('events', []));
                     <h1>Update Webhook</h1>
 
                     <form
+                        data-analytics
+                        data-analytics-activity
                         data-analytics-event="submit"
                         data-analytics-category="console"
                         data-analytics-label="Update Project Webhook"
@@ -61,7 +63,9 @@ $events = array_keys($this->getParam('events', []));
                             <div class="row responsive thin">
                                 <?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}}" value="<?php echo $event; ?>" /> &nbsp; <?php echo $event; ?>
+                                        <input type="checkbox" name="events" data-ls-bind="{{webhook.events}}" id="update-<?php echo $event; ?>" value="<?php echo $event; ?>" />
+                                        &nbsp;
+                                        <label class="inline" for="update-<?php echo $event; ?>"><?php echo $event; ?></label>
                                     </div>
                                     <?php if (($i + 1) % 2 === 0) : ?>
                                     </div>
@@ -116,6 +120,8 @@ $events = array_keys($this->getParam('events', []));
                 </div>
 
                 <form class="pull-end margin-end"
+                    data-analytics
+                    data-analytics-activity
                     data-analytics-event="submit"
                     data-analytics-category="console"
                     data-analytics-label="Delete Project Webhook"
@@ -154,6 +160,8 @@ $events = array_keys($this->getParam('events', []));
             <h1>Add Webhook</h1>
 
             <form
+                data-analytics
+                data-analytics-activity
                 data-analytics-event="submit"
                 data-analytics-category="console"
                 data-analytics-label="Create Project Webhook"
@@ -177,7 +185,9 @@ $events = array_keys($this->getParam('events', []));
                     <div class="row responsive thin">
                         <?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" value="<?php echo $event; ?>" /> &nbsp; <?php echo $event; ?>
+                                <input type="checkbox" name="events" id="add-<?php echo $event; ?>" value="<?php echo $event; ?>" />
+                                &nbsp;
+                                <label class="inline" for="add-<?php echo $event; ?>"><?php echo $event; ?></label>
                             </div>
                             <?php if (($i + 1) % 2 === 0) : ?>
                             </div>

app/views/home/auth/join.phtml

@@ -1,5 +1,7 @@
 <section class="zone medium">
     <form class="box margin-top-large"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Update Team Membership Status"

app/views/home/auth/recovery.phtml

@@ -6,6 +6,8 @@
     <small class="pull-end text-size-small">* All fields are required</small>
 
     <form name="account.createRecovery"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Create Account Recovery"
@@ -21,7 +23,7 @@
         <label>Email</label>
         <input name="email" type="email" class="full-width" autocomplete="email" placeholder="me@example.com" required>
 
-        <input name="url" type="hidden" data-ls-bind="{{env.PROTOCOL}}://{{env.DOMAIN}}/auth/recovery/reset" />
+        <input name="url" type="hidden" data-ls-bind="{{env.ENDPOINT}}/auth/recovery/reset" />
 
         <button type="submit" class="btn btn-primary"><i class="fa fa-sign-in"></i> Recover</button>
     </form>

app/views/home/auth/recovery/reset.phtml

@@ -9,6 +9,8 @@
     <br />
 
     <form name="recovery-reset"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Update Account Recovery"

app/views/home/auth/signin.phtml

@@ -17,6 +17,8 @@
         <p>Login using email and password</p>
 
         <form name="account.createSession"
+            data-analytics
+            data-analytics-activity
             data-analytics-event="submit"
             data-analytics-category="home"
             data-analytics-label="Create Account Session"

app/views/home/auth/signup.phtml

@@ -8,6 +8,8 @@
     <small class="pull-end text-size-small">* All fields are required</small>
 
     <form name="account.create"
+        data-analytics
+        data-analytics-activity
         data-analytics-event="submit"
         data-analytics-category="home"
         data-analytics-label="Create Account"

app/views/install/compose.phtml

@@ -66,6 +66,8 @@ services:
       - _APP_DOMAIN_TARGET
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -76,14 +78,19 @@ services:
       - _APP_SMTP_SECURE
       - _APP_SMTP_USERNAME
       - _APP_SMTP_PASSWORD
+      - _APP_USAGE_STATS
       - _APP_INFLUXDB_HOST
       - _APP_INFLUXDB_PORT
       - _APP_STORAGE_LIMIT
+      - _APP_STORAGE_ANTIVIRUS
+      - _APP_STORAGE_ANTIVIRUS_HOST
+      - _APP_STORAGE_ANTIVIRUS_PORT
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_FUNCTIONS_CONTAINERS
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_MEMORY_SWAP
+      - _APP_FUNCTIONS_ENVS
 
   appwrite-worker-usage:
     image: appwrite/appwrite:<?php echo $version."\n"; ?>
@@ -99,6 +106,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_STATSD_HOST
       - _APP_STATSD_PORT
 
@@ -116,6 +125,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -137,6 +148,8 @@ services:
       - _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
@@ -158,6 +171,8 @@ services:
       - _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
@@ -177,10 +192,13 @@ services:
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
+      - appwrite-certificates:/storage/certificates:rw
     environment:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -205,6 +223,9 @@ services:
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_DOMAIN_TARGET
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -229,6 +250,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -239,6 +262,7 @@ services:
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_MEMORY_SWAP
+      - _APP_USAGE_STATS
 
   appwrite-worker-mails:
     image: appwrite/appwrite:<?php echo $version."\n"; ?>
@@ -256,6 +280,8 @@ services:
       - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -263,10 +289,9 @@ services:
       - _APP_SMTP_PASSWORD
       
   appwrite-maintenance:
+    image: appwrite/appwrite:<?php echo $version."\n"; ?>
     entrypoint: maintenance
     container_name: appwrite-maintenance
-    build:
-      context: .
     restart: unless-stopped
     networks:
       - appwrite
@@ -276,12 +301,13 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_MAINTENANCE_INTERVAL
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+
 
   appwrite-schedule:
     image: appwrite/appwrite:<?php echo $version."\n"; ?>
@@ -296,6 +322,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
 
   mariadb:
     image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
@@ -305,8 +333,6 @@ services:
       - appwrite
     volumes:
       - appwrite-mariadb:/var/lib/mysql:rw
-    ports:
-      - "3306:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=rootsecretpassword
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
@@ -370,5 +396,4 @@ volumes:
   appwrite-certificates:
   appwrite-functions:
   appwrite-influxdb:
-  appwrite-chronograf:
   appwrite-config:

app/views/layouts/default.phtml

@@ -2,6 +2,7 @@
 
 $protocol       = $this->getParam('protocol', '');
 $domain         = $this->getParam('domain', '');
+$endpoint       = $this->getParam('endpoint', '');
 $platforms      = $this->getParam('platforms', []);
 $version        = $this->getParam('version', '0.0.0');
 $isDev          = $this->getParam('isDev', false);
@@ -56,7 +57,7 @@ if(!empty($platforms)) {
     <?php if (!empty($canonical)): ?>
         <meta property="og:url" content="<?php echo $canonical; ?>" />
     <?php endif; ?>
-    <meta property="og:image"  content="<?php echo $protocol; ?>://<?php echo $domain; ?>/images/logo.png?v=<?php echo APP_CACHE_BUSTER; ?>" />
+    <meta property="og:image"  content="<?php echo $endpoint; ?>/images/logo.png?v=<?php echo APP_CACHE_BUSTER; ?>" />
     <script>
 
         (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -71,6 +72,7 @@ if(!empty($platforms)) {
             VERSION: '<?php echo $version; ?>',
             CACHEBUSTER: '<?php echo $version; ?>/<?php echo APP_CACHE_BUSTER; ?>',
             PROTOCOL: '<?php echo $protocol; ?>',
+            ENDPOINT: '<?php echo $endpoint; ?>',
             DOMAIN: '<?php echo $domain; ?>',
             HOME: '<?php echo $this->escape($this->getParam('home')); ?>',
             SETUP: '<?php echo $this->escape($this->getParam('setup')); ?>',
@@ -142,4 +144,4 @@ if(!empty($platforms)) {
 
     <!-- Version <?php echo $version; ?> -->
 </body>
-</html>
+</html>

app/workers/audits.php

@@ -6,7 +6,7 @@ use Utopia\CLI\Console;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Audits V1 Worker');
+Console::title('Audits V1 Worker');
 
 Console::success(APP_NAME.' audits worker v1 has started');
 

app/workers/certificates.php

@@ -12,7 +12,7 @@ use Appwrite\Network\Validator\CNAME;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Certificates V1 Worker');
+Console::title('Certificates V1 Worker');
 
 Console::success(APP_NAME.' certificates worker v1 has started');
 
@@ -73,7 +73,7 @@ class CertificatesV1
             $target = new Domain(App::getEnv('_APP_DOMAIN_TARGET', ''));
     
             if(!$target->isKnown() || $target->isTest()) {
-                throw new Exception('Unreachable CNAME target ('.$target->get().'), plesse use a domain with a public suffix.');
+                throw new Exception('Unreachable CNAME target ('.$target->get().'), please use a domain with a public suffix.');
             }
         }
 
@@ -110,14 +110,22 @@ class CertificatesV1
         }
 
         $staging = (App::isProduction()) ? '' : ' --dry-run';
+        $email = App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS');
 
-        $response = \shell_exec("certbot certonly --webroot --noninteractive --agree-tos{$staging} \
-            --email ".App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', 'security@localhost.test')." \
-            -w ".APP_STORAGE_CERTIFICATES." \
-            -d {$domain->get()}");
+        if(empty($email)) {
+            throw new Exception('You must set a valid security email address (_APP_SYSTEM_SECURITY_EMAIL_ADDRESS) to issue an SSL certificate');
+        }
 
-        if(!$response) {
-            throw new Exception('Failed to issue a certificate');
+        $stdout = '';
+        $stderr = '';
+
+        $exit = Console::execute("certbot certonly --webroot --noninteractive --agree-tos{$staging}"
+            ." --email ".$email
+            ." -w ".APP_STORAGE_CERTIFICATES
+            ." -d {$domain->get()}", '', $stdout, $stderr);
+
+        if($stderr || $exit !== 0) {
+            throw new Exception('Failed to issue a certificate with message: '.$stderr);
         }
 
         $path = APP_STORAGE_CERTIFICATES.'/'.$domain->get();
@@ -129,19 +137,19 @@ class CertificatesV1
         }
         
         if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/cert.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/cert.pem')) {
-            throw new Exception('Failed to rename certificate cert.pem: '.\json_encode($response));
+            throw new Exception('Failed to rename certificate cert.pem: '.\json_encode($stdout));
         }
 
         if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/chain.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/chain.pem')) {
-            throw new Exception('Failed to rename certificate chain.pem: '.\json_encode($response));
+            throw new Exception('Failed to rename certificate chain.pem: '.\json_encode($stdout));
         }
 
         if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/fullchain.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/fullchain.pem')) {
-            throw new Exception('Failed to rename certificate fullchain.pem: '.\json_encode($response));
+            throw new Exception('Failed to rename certificate fullchain.pem: '.\json_encode($stdout));
         }
 
         if(!@\rename('/etc/letsencrypt/live/'.$domain->get().'/privkey.pem', APP_STORAGE_CERTIFICATES.'/'.$domain->get().'/privkey.pem')) {
-            throw new Exception('Failed to rename certificate privkey.pem: '.\json_encode($response));
+            throw new Exception('Failed to rename certificate privkey.pem: '.\json_encode($stdout));
         }
 
         $certificate = \array_merge($certificate, [
@@ -154,7 +162,7 @@ class CertificatesV1
             'issueDate' => \time(),
             'renewDate' => $renew,
             'attempts' => 0,
-            'log' => \json_encode($response),
+            'log' => \json_encode($stdout),
         ]);
 
         $certificate = $consoleDB->createDocument($certificate);

app/workers/deletes.php

@@ -5,7 +5,7 @@ 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\Storage\Device\Local;
+use Utopia\Storage\Device\Local;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
 use Utopia\CLI\Console;
@@ -15,7 +15,7 @@ use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Deletes V1 Worker');
+Console::title('Deletes V1 Worker');
 
 Console::success(APP_NAME.' deletes worker v1 has started'."\n");
 
@@ -38,7 +38,7 @@ class DeletesV1
         switch (strval($type)) {
             case DELETE_TYPE_DOCUMENT:
                 $document = $this->args['document'];
-                $document = new Document($document);    
+                $document = new Document($document);
                 switch (strval($document->getCollection())) {
                     case Database::SYSTEM_COLLECTION_PROJECTS:
                         $this->deleteProject($document);
@@ -59,7 +59,7 @@ class DeletesV1
                 break;
 
             case DELETE_TYPE_EXECUTIONS:
-                $this->deleteExecutionLogs();
+                $this->deleteExecutionLogs($this->args['timestamp']);
                 break;
 
             case DELETE_TYPE_AUDIT:
@@ -69,6 +69,11 @@ class DeletesV1
             case DELETE_TYPE_ABUSE:
                 $this->deleteAbuseLogs($this->args['timestamp']);
                 break;
+
+            case DELETE_TYPE_CERTIFICATES:
+                $document = new Document($this->args['document']);
+                $this->deleteCertificates($document);
+                break;
                         
             default:
                 Console::error('No delete operation for type: '.$type);
@@ -121,16 +126,17 @@ class DeletesV1
         ], $this->getProjectDB($projectId));
     }
 
-    protected function deleteExecutionLogs() 
+    protected function deleteExecutionLogs($timestamp) 
     {
-        $this->deleteForProjectIds(function($projectId) {
+        $this->deleteForProjectIds(function($projectId) use ($timestamp) {
             if (!($projectDB = $this->getProjectDB($projectId))) {
                 throw new Exception('Failed to get projectDB for project '.$projectId);
             }
 
             // Delete Executions
             $this->deleteByGroup([
-                '$collection='.Database::SYSTEM_COLLECTION_EXECUTIONS
+                '$collection='.Database::SYSTEM_COLLECTION_EXECUTIONS,
+                'dateCreated<'.$timestamp
             ], $projectDB);
         });
     }
@@ -304,6 +310,21 @@ class DeletesV1
         Console::info("Deleted {$count} document by group in " . ($executionEnd - $executionStart) . " seconds");
     }
 
+    protected function deleteCertificates(Document $document)
+    {
+        $domain = $document->getAttribute('domain');
+        $directory = APP_STORAGE_CERTIFICATES . '/' . $domain;
+        $checkTraversal = realpath($directory) === $directory;
+
+        if($domain && $checkTraversal && is_dir($directory)) {
+            array_map('unlink', glob($directory.'/*.*'));
+            rmdir($directory);
+            Console::info("Deleted certificate files for {$domain}");
+        } else {
+            Console::info("No certificate files found for {$domain}");
+        }
+    }
+
     /**
      * @return Database;
      */

app/workers/functions.php

@@ -1,7 +1,4 @@
 <?php
-ini_set('display_errors', 1);
-ini_set('display_startup_errors', 1);
-error_reporting(E_ALL);
 
 use Appwrite\Database\Database;
 use Appwrite\Database\Document;
@@ -9,6 +6,7 @@ use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Event\Event;
+use Cron\CronExpression;
 use Swoole\Runtime;
 use Utopia\App;
 use Utopia\CLI\Console;
@@ -16,7 +14,7 @@ use Utopia\Config\Config;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Functions V1 Worker');
+Console::title('Functions V1 Worker');
 
 Runtime::setHookFlags(SWOOLE_HOOK_ALL);
 
@@ -30,21 +28,27 @@ $environments = Config::getParam('environments');
 $warmupStart = \microtime(true);
 
 Co\run(function() use ($environments) {  // Warmup: make sure images are ready to run fast 🚀
-    Swoole\Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
-    
+    Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
+
+    $dockerUser = App::getEnv('DOCKERHUB_PULL_USERNAME', null);
+    $dockerPass = App::getEnv('DOCKERHUB_PULL_PASSWORD', null);
+
+    if($dockerUser) {
+        $stdout = '';
+        $stderr = '';
+
+        Console::execute('docker login --username '.$dockerUser.' --password-stdin', $dockerPass, $stdout, $stderr);
+        Console::log('Docker Login'. $stdout.$stderr);
+    }
+
     foreach($environments as $environment) {
         go(function() use ($environment) {
             $stdout = '';
             $stderr = '';
         
-            Console::info('Warming up '.$environment['name'].' environment...');
+            Console::info('Warming up '.$environment['name'].' '.$environment['version'].' environment...');
         
-            if(App::isDevelopment()) {
-                Console::execute('docker build '.$environment['build'].' -t '.$environment['image'], '', $stdout, $stderr);
-            }
-            else {
-                Console::execute('docker pull '.$environment['image'], '', $stdout, $stderr);
-            }
+            Console::execute('docker pull '.$environment['image'], '', $stdout, $stderr);
         
             if(!empty($stdout)) {
                 Console::log($stdout);
@@ -87,14 +91,6 @@ $stdout = \explode("\n", $stdout);
     \parse_str($value, $container);
 
     if(isset($container['name'])) {
-        // $labels = [];
-        // $temp = explode(',', $container['labels'] ?? []);
-
-        // foreach($temp as &$label) {
-        //     $label = explode('=', $label);
-        //     $labels[$label[0] || 0] = $label[1] || '';
-        // }
-
         $container = [
             'name' => $container['name'],
             'online' => (\substr($container['status'], 0, 2) === 'Up'),
@@ -116,19 +112,6 @@ $stdout = \explode("\n", $stdout);
 
 Console::info(count($list)." functions listed in " . ($executionEnd - $executionStart) . " seconds with exit code {$exitCode}");
 
-/*
- * 1. Get Original Task
- * 2. Check for updates
- *  If has updates skip task and don't reschedule
- *  If status not equal to play skip task
- * 3. Check next run date, update task and add new job at the given date
- * 4. Execute task (set optional timeout)
- * 5. Update task response to log
- *      On success reset error count
- *      On failure add error count
- *      If error count bigger than allowed change status to pause
- */
-
 /**
  * 1. Get event args - DONE
  * 2. Unpackage code in the isolated container - DONE
@@ -144,23 +127,6 @@ Console::info(count($list)." functions listed in " . ($executionEnd - $execution
 
 //TODO aviod scheduled execution if delay is bigger than X offest
 
-/**
- * Limit CPU Usage - DONE
- * Limit Memory Usage - DONE
- * Limit Network Usage
- * Limit Storage Usage (//--storage-opt size=120m \)
- * Make sure no access to redis, mariadb, influxdb or other system services
- * Make sure no access to NFS server / storage volumes
- * Access Appwrite REST from internal network for improved performance
- */
-
-/**
- * Get Usage Stats
- *  -> Network (docker stats --no-stream --format="{{.NetIO}}" appwrite)
- *  -> CPU Time - DONE
- *  -> Invoctions (+1) - DONE
- */
-
 class FunctionsV1
 {
     public $args = [];
@@ -180,6 +146,7 @@ class FunctionsV1
         $executionId = $this->args['executionId'] ?? '';
         $trigger = $this->args['trigger'] ?? '';
         $event = $this->args['event'] ?? '';
+        $scheduleOriginal = $this->args['scheduleOriginal'] ?? '';
         $payload = (!empty($this->args['payload'])) ? json_encode($this->args['payload']) : '';
 
         $database = new Database();
@@ -228,9 +195,7 @@ class FunctionsV1
 
                         Console::success('Triggered function: '.$event);
 
-                        Swoole\Coroutine\run(function () use ($projectId, $database, $function, $event, $payload) {
-                            $this->execute('event', $projectId, '', $database, $function, $event, $payload);
-                        });
+                        $this->execute('event', $projectId, '', $database, $function, $event, $payload);
                     }
                 }
                 break;
@@ -248,6 +213,45 @@ class FunctionsV1
                  *      On failure add error count
                  *      If error count bigger than allowed change status to pause
                  */
+
+                // Reschedule
+                Authorization::disable();
+                $function = $database->getDocument($functionId);
+                Authorization::reset();
+
+                if (empty($function->getId()) || Database::SYSTEM_COLLECTION_FUNCTIONS != $function->getCollection()) {
+                    throw new Exception('Function not found ('.$functionId.')');
+                }
+
+                if($scheduleOriginal && $scheduleOriginal !== $function->getAttribute('schedule')) { // Schedule has changed from previous run, ignore this run.
+                    return;
+                }
+
+                $cron = CronExpression::factory($function->getAttribute('schedule'));
+                $next = (int) $cron->getNextRunDate()->format('U');
+
+                $function
+                    ->setAttribute('scheduleNext', $next)
+                    ->setAttribute('schedulePrevious', \time())
+                ;
+
+                Authorization::disable();
+
+                $function = $database->updateDocument(array_merge($function->getArrayCopy(), [
+                    'scheduleNext' => $next,
+                ]));
+
+                Authorization::reset();
+
+                ResqueScheduler::enqueueAt($next, 'v1-functions', 'FunctionsV1', [
+                    'projectId' => $projectId,
+                    'functionId' => $function->getId(),
+                    'executionId' => null,
+                    'trigger' => 'schedule',
+                    'scheduleOriginal' => $function->getAttribute('schedule', ''),
+                ]);  // Async task rescheduale
+
+                $this->execute($trigger, $projectId, $executionId, $database, $function);
                 
                 break;
 
@@ -260,9 +264,7 @@ class FunctionsV1
                     throw new Exception('Function not found ('.$functionId.')');
                 }
 
-                Swoole\Coroutine\run(function () use ($trigger, $projectId, $executionId, $database, $function) {
-                    $this->execute($trigger, $projectId, $executionId, $database, $function);
-                });
+                $this->execute($trigger, $projectId, $executionId, $database, $function);
                 break;
             
             default:
@@ -316,8 +318,8 @@ class FunctionsV1
             'time' => 0,
         ]);
 
-        if(false === $execution) {
-            throw new Exception('Failed to create execution');
+        if(false === $execution || ($execution instanceof Document && $execution->isEmpty())) {
+            throw new Exception('Failed to create or read execution');
         }
         
         Authorization::reset();
@@ -344,7 +346,7 @@ class FunctionsV1
         \array_walk($vars, function (&$value, $key) {
             $key = $this->filterEnvKey($key);
             $value = \escapeshellarg((empty($value)) ? 'null' : $value);
-            $value = "\t\t\t--env {$key}={$value} \\";
+            $value = "--env {$key}={$value}";
         });
 
         $tagPath = $tag->getAttribute('path', '');
@@ -380,27 +382,38 @@ class FunctionsV1
             unset($list[$container]);
         }
 
+        /**
+         * Limit CPU Usage - DONE
+         * Limit Memory Usage - DONE
+         * Limit Network Usage
+         * Limit Storage Usage (//--storage-opt size=120m \)
+         * Make sure no access to redis, mariadb, influxdb or other system services
+         * Make sure no access to NFS server / storage volumes
+         * Access Appwrite REST from internal network for improved performance
+         */
         if(!isset($list[$container])) { // Create contianer if not ready
             $stdout = '';
             $stderr = '';
     
             $executionStart = \microtime(true);
             $executionTime = \time();
-
-            $exitCode = Console::execute("docker run \
-                -d \
-                --entrypoint=\"\" \
-                --cpus=".App::getEnv('_APP_FUNCTIONS_CPUS', '1')." \
-                --memory=".App::getEnv('_APP_FUNCTIONS_MEMORY', '128')."m \
-                --memory-swap=".App::getEnv('_APP_FUNCTIONS_MEMORY_SWAP', '128')."m \
-                --name={$container} \
-                --label appwrite-type=function \
-                --label appwrite-created=".$executionTime." \
-                --volume {$tagPathTargetDir}:/tmp:rw \
-                --workdir /usr/local/src \
-                ".\implode("\n", $vars)."
-                {$environment['image']} \
-                sh -c 'mv /tmp/code.tar.gz /usr/local/src/code.tar.gz && tar -zxf /usr/local/src/code.tar.gz --strip 1 && rm /usr/local/src/code.tar.gz && tail -f /dev/null'"
+            $cpus = App::getEnv('_APP_FUNCTIONS_CPUS', '');
+            $memory = App::getEnv('_APP_FUNCTIONS_MEMORY', '');
+            $swap = App::getEnv('_APP_FUNCTIONS_MEMORY_SWAP', '');
+            $exitCode = Console::execute("docker run ".
+                " -d".
+                " --entrypoint=\"\"".
+                (empty($cpus) ? "" : (" --cpus=".$cpus)).
+                (empty($memory) ? "" : (" --memory=".$memory."m")).
+                (empty($swap) ? "" : (" --memory-swap=".$swap."m")).
+                " --name={$container}".
+                " --label appwrite-type=function".
+                " --label appwrite-created={$executionTime}".
+                " --volume {$tagPathTargetDir}:/tmp:rw".
+                " --workdir /usr/local/src".
+                " ".\implode(" ", $vars).
+                " {$environment['image']}".
+                " sh -c 'mv /tmp/code.tar.gz /usr/local/src/code.tar.gz && tar -zxf /usr/local/src/code.tar.gz --strip 1 && rm /usr/local/src/code.tar.gz && tail -f /dev/null'"
             , '', $stdout, $stderr, 30);
 
             $executionEnd = \microtime(true);
@@ -430,11 +443,8 @@ class FunctionsV1
 
         $executionStart = \microtime(true);
         
-        $exitCode = Console::execute("docker exec \
-        ".\implode("\n", $vars)."
-        {$container} \
-        {$command}"
-        , '', $stdout, $stderr, $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)));
+        $exitCode = Console::execute("docker exec ".\implode(" ", $vars)." {$container} {$command}"
+            , '', $stdout, $stderr, $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)));
 
         $executionEnd = \microtime(true);
         $executionTime = ($executionEnd - $executionStart);
@@ -470,8 +480,10 @@ class FunctionsV1
             ->setParam('networkRequestSize', 0)
             ->setParam('networkResponseSize', 0)
         ;
-
-        $usage->trigger();
+        
+        if(App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $usage->trigger();
+        }
 
         $this->cleanup();
     }

app/workers/mails.php

@@ -5,7 +5,7 @@ use Utopia\CLI\Console;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Mails V1 Worker');
+Console::title('Mails V1 Worker');
 
 Console::success(APP_NAME.' mails worker v1 has started'."\n");
 

app/workers/tasks.php

@@ -11,7 +11,7 @@ use Cron\CronExpression;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Tasks V1 Worker');
+Console::title('Tasks V1 Worker');
 
 Console::success(APP_NAME.' tasks worker v1 has started');
 

app/workers/usage.php

@@ -5,7 +5,7 @@ use Utopia\CLI\Console;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Usage V1 Worker');
+Console::title('Usage V1 Worker');
 
 Console::success(APP_NAME.' usage worker v1 has started');
 

app/workers/webhooks.php

@@ -10,7 +10,7 @@ use Appwrite\Database\Validator\Authorization;
 
 require_once __DIR__.'/../init.php';
 
-\cli_set_process_title('Webhooks V1 Worker');
+Console::title('Webhooks V1 Worker');
 
 Console::success(APP_NAME.' webhooks worker v1 has started');
 

bin/schedule

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+REDIS_BACKEND=$REDIS_BACKEND RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler

bin/start

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-export PHP_VERSION=$PHP_VERSION
-
-chown -Rf www-data.www-data /usr/src/code/
-
-sed 's/%_APP_STORAGE_LIMIT%/'$_APP_STORAGE_LIMIT'/g' /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
-
-# Function to update the fpm configuration to make the service environment variables available
-function setEnvironmentVariable() {
-    if [ -z "$2" ]; then
-            echo "Environment variable '$1' not set."
-            return
-    fi
-
-    # Check whether variable already exists
-    if ! grep -q "\[$1\]" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf; then
-        # Add variable
-        echo "env[$1] = $2" >> /etc/php/$PHP_VERSION/fpm/pool.d/www.conf
-    fi
-
-    # Reset variable
-    # sed -i "s/^env\[$1.*/env[$1] = $2/g" /etc/php/$PHP_VERSION/fpm/pool.d/www.conf
-}
-
-# Grep for variables that look like MySQL (APP_)
-for _curVar in $(env | grep _APP_ | awk -F = '{print $1}');do
-    # awk has split them by the equals sign
-    # Pass the name and value to our function
-    setEnvironmentVariable ${_curVar} ${!_curVar}
-done
-
-# Init server settings
-php /usr/src/code/app/tasks/init.php ssl
-
-# Start supervisord and services
-/usr/bin/supervisord -n -c /etc/supervisord.conf

bin/test

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/usr/src/code/vendor/bin/phpunit --configuration /usr/src/code/phpunit.xml $@
+/usr/src/code/vendor/bin/phpunit --verbose --configuration /usr/src/code/phpunit.xml $@

bin/worker-audits

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-certificates

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-deletes

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-functions

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-functions' APP_INCLUDE='/usr/src/code/app/workers/functions.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-functions' APP_INCLUDE='/usr/src/code/app/workers/functions.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-mails

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-tasks

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-tasks' APP_INCLUDE='/usr/src/code/app/workers/tasks.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-tasks' APP_INCLUDE='/usr/src/code/app/workers/tasks.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-usage

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

bin/worker-webhooks

@@ -1,3 +1,10 @@
 #!/bin/sh
 
-QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}" php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+if [ -z "$_APP_REDIS_USER" ] || [ -z "$_APP_REDIS_PASS" ]
+then
+    REDIS_BACKEND="${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+else
+    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
+fi
+
+QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php

composer.json

@@ -36,15 +36,18 @@
 
         "utopia-php/framework": "0.10.0",
         "utopia-php/abuse": "0.3.*",
+        "utopia-php/analytics": "0.1.*",
         "utopia-php/audit": "0.5.*",
         "utopia-php/cache": "0.2.*",
-        "utopia-php/cli": "0.8.0",
+        "utopia-php/cli": "0.9.0",
         "utopia-php/config": "0.2.*",
         "utopia-php/locale": "0.3.*",
         "utopia-php/registry": "0.2.*",
         "utopia-php/preloader": "0.2.*",
         "utopia-php/domains": "0.2.*",
         "utopia-php/swoole": "0.2.*",
+        "utopia-php/system": "0.4.*",
+        "utopia-php/storage": "0.2.*",
 
         "resque/php-resque": "1.3.6",
         "matomo/device-detector": "3.13.0",
@@ -52,12 +55,13 @@
         "domnikl/statsd": "3.0.2",
         "influxdb/influxdb-php": "1.15.1",
         "phpmailer/phpmailer": "6.1.7",
-        "chillerlan/php-qrcode": "4.2.0"
+        "chillerlan/php-qrcode": "4.3.0",
+        "adhocore/jwt": "1.1.0"
     },
     "require-dev": {
-        "swoole/ide-helper": "4.5.5",
-        "appwrite/sdk-generator": "0.4.3",
+        "appwrite/sdk-generator": "0.5.5",
         "phpunit/phpunit": "9.4.2",
+        "swoole/ide-helper": "4.5.5",
         "vimeo/psalm": "4.1.1"
     },
     "repositories": [

docker-compose.nginx.yml

@@ -1,215 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    image: traefik:v2.2
-    container_name: appwrite-traefik
-    command:
-      - --log.level=DEBUG
-      - --api.insecure=true
-      - --providers.file.directory=/storage/config
-      - --providers.file.watch=true
-      - --providers.docker=true
-      - --entrypoints.web.address=:80
-      - --entrypoints.websecure.address=:443
-      - --accesslog=true
-    restart: unless-stopped
-    ports:
-      - 80:80
-      - 443:443
-      - 8080:8080
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - appwrite-config:/storage/config:ro
-      - appwrite-certificates:/storage/certificates:ro
-    depends_on:
-      - appwrite
-    networks:
-      - gateway
-      - appwrite
-  
-  appwrite:
-    container_name: appwrite
-    build:
-      context: .
-      args:
-        - TESTING=true
-        - VERSION=dev
-    restart: unless-stopped
-    networks:
-      - appwrite
-    labels:
-      - traefik.http.routers.appwrite.rule=PathPrefix(`/`)
-      - traefik.http.routers.appwrite-secure.rule=PathPrefix(`/`)
-      - traefik.http.routers.appwrite-secure.tls=true
-    volumes:
-      - appwrite-uploads:/storage/uploads:rw
-      - appwrite-cache:/storage/cache:rw
-      - appwrite-config:/storage/config:rw
-      - appwrite-certificates:/storage/certificates:rw
-      - appwrite-functions:/storage/functions:rw
-      - ./phpunit.xml:/usr/src/code/phpunit.xml
-      - ./tests:/usr/src/code/tests
-      - ./app:/usr/src/code/app
-      # - ./vendor:/usr/src/code/vendor
-      - ./docs:/usr/src/code/docs
-      - ./public:/usr/src/code/public
-      - ./src:/usr/src/code/src
-    ports:
-      - 9501:80
-    depends_on:
-      - mariadb
-      - redis
-      # - smtp
-      - clamav
-      - influxdb
-      - telegraf
-      - maildev
-    environment:
-      #- _APP_ENV=production
-      - _APP_ENV=development
-      - _APP_OPTIONS_ABUSE=disabled
-      - _APP_OPTIONS_FORCE_HTTPS=disabled
-      - _APP_OPENSSL_KEY_V1=your-secret-key
-      - _APP_DOMAIN=demo.appwrite.io
-      - _APP_DOMAIN_TARGET=demo.appwrite.io
-      - _APP_REDIS_HOST=redis
-      - _APP_REDIS_PORT=6379
-      - _APP_DB_HOST=mariadb
-      - _APP_DB_PORT=3306
-      - _APP_DB_SCHEMA=appwrite
-      - _APP_DB_USER=user
-      - _APP_DB_PASS=password
-      - _APP_INFLUXDB_HOST=influxdb
-      - _APP_INFLUXDB_PORT=8086
-      - _APP_STATSD_HOST=telegraf
-      - _APP_STATSD_PORT=8125
-      - _APP_SMTP_HOST=maildev
-      - _APP_SMTP_PORT=25
-
-  mariadb:
-    image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
-    container_name: appwrite-mariadb
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-mariadb:/var/lib/mysql:rw
-    ports:
-      - "3306:3306"
-    environment:
-      - MYSQL_ROOT_PASSWORD=rootsecretpassword
-      - MYSQL_DATABASE=appwrite
-      - MYSQL_USER=user
-      - MYSQL_PASSWORD=password
-    command: 'mysqld --innodb-flush-method=fsync'
-
-  maildev:
-    image: djfarrelly/maildev
-    container_name: appwrite-maildev
-    restart: unless-stopped
-    ports:
-      - '1080:80'
-    networks:
-      - appwrite
-
-  # smtp:
-  #   image: appwrite/smtp:1.0.1
-  #   container_name: appwrite-smtp
-  #   restart: unless-stopped
-  #   networks:
-  #     - appwrite
-  #   environment:
-  #     - MAILNAME=appwrite
-  #     - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16
-
-  redis:
-    image: redis:5.0
-    container_name: appwrite-redis
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-redis:/data:rw
-
-  clamav:
-    image: appwrite/clamav:1.2.0
-    container_name: appwrite-clamav
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-uploads:/storage/uploads
-
-  influxdb:
-    image: influxdb:1.6
-    container_name: appwrite-influxdb
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-influxdb:/var/lib/influxdb:rw
-
-  telegraf:
-    image: appwrite/telegraf:1.0.0
-    container_name: appwrite-telegraf
-    restart: unless-stopped
-    networks:
-      - appwrite
-
-  # redis-commander:
-  #   image: rediscommander/redis-commander:latest
-  #   restart: unless-stopped
-  #   networks:
-  #   - appwrite
-  #   environment:
-  #   - REDIS_HOSTS=redis
-  #   ports:
-  #   - "8081:8081"
-
-  # resque:
-  #   image: registry.gitlab.com/appwrite/appwrite/resque-web:v1.0.2
-  #   restart: unless-stopped
-  #   networks:
-  #     - appwrite
-  #   ports:
-  #     - "5678:5678"
-  #   environment:
-  #     - RESQUE_WEB_HOST=redis
-  #     - RESQUE_WEB_PORT=6379
-  #     - RESQUE_WEB_HTTP_BASIC_AUTH_USER=user
-  #     - RESQUE_WEB_HTTP_BASIC_AUTH_PASSWORD=password
-
-  # chronograf:
-  #   image: chronograf:1.5
-  #   container_name: appwrite-chronograf
-  #   restart: unless-stopped
-  #   networks:
-  #   - appwrite
-  #   volumes:
-  #   - appwrite-chronograf:/var/lib/chronograf
-  #   ports:
-  #   - "8888:8888"
-  #   environment:
-  #   - INFLUXDB_URL=http://influxdb:8086
-  #   - KAPACITOR_URL=http://kapacitor:9092
-  #   - AUTH_DURATION=48h
-  #   - TOKEN_SECRET=duperduper5674829!jwt
-  #   - GH_CLIENT_ID=d86f7145a41eacfc52cc
-  #   - GH_CLIENT_SECRET=9e0081062367a2134e7f2ea95ba1a32d08b6c8ab
-  #   - GH_ORGS=appwrite
-
-networks:
-  gateway:
-  appwrite:
-
-volumes:
-  appwrite-mariadb:
-  appwrite-redis:
-  appwrite-cache:
-  appwrite-uploads:
-  appwrite-certificates:
-  appwrite-functions:
-  appwrite-influxdb:
-  appwrite-chronograf:
-  appwrite-config:

docker-compose.yml

@@ -21,7 +21,6 @@ services:
       - --entrypoints.appwrite_web.address=:80
       - --entrypoints.appwrite_websecure.address=:443
       - --accesslog=true
-    restart: unless-stopped
     ports:
       - 80:80
       - 443:443
@@ -43,7 +42,6 @@ services:
       args:
         - TESTING=true
         - VERSION=dev
-    restart: unless-stopped
     ports: 
       - 9501:80
     networks:
@@ -88,6 +86,7 @@ services:
       - _APP_SYSTEM_EMAIL_NAME
       - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS
+      - _APP_SYSTEM_RESPONSE_FORMAT
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
@@ -95,6 +94,8 @@ services:
       - _APP_DOMAIN_TARGET
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -108,15 +109,16 @@ services:
       - _APP_SMTP_SECURE
       - _APP_SMTP_USERNAME
       - _APP_SMTP_PASSWORD
+      - _APP_USAGE_STATS
       - _APP_INFLUXDB_HOST
       - _APP_INFLUXDB_PORT
       - _APP_STORAGE_LIMIT
       - _APP_FUNCTIONS_TIMEOUT
       - _APP_FUNCTIONS_CONTAINERS
-      - _APP_SYSTEM_RESPONSE_FORMAT
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_MEMORY_SWAP
+      - _APP_FUNCTIONS_ENVS
 
   appwrite-realtime:
     entrypoint: realtime
@@ -162,7 +164,6 @@ services:
     container_name: appwrite-worker-usage
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -175,6 +176,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_STATSD_HOST
       - _APP_STATSD_PORT
 
@@ -183,7 +186,6 @@ services:
     container_name: appwrite-worker-audits
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -196,6 +198,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -207,7 +211,6 @@ services:
     container_name: appwrite-worker-webhooks
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -222,6 +225,8 @@ services:
       - _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
@@ -233,7 +238,6 @@ services:
     container_name: appwrite-worker-tasks
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -247,6 +251,8 @@ services:
       - _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
@@ -258,13 +264,13 @@ services:
     container_name: appwrite-worker-deletes
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes: 
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-functions:/storage/functions:rw
+      - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
@@ -274,6 +280,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -285,7 +293,6 @@ services:
     container_name: appwrite-worker-certificates
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes: 
@@ -301,6 +308,8 @@ services:
       - _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
@@ -312,7 +321,6 @@ services:
     container_name: appwrite-worker-functions
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -320,8 +328,8 @@ services:
       - appwrite-functions:/storage/functions:rw
       - /tmp:/tmp:rw
       - ./app:/usr/src/code/app
-      - ./docker:/usr/src/code/docker
       - ./src:/usr/src/code/src
+      - ./docker:/usr/src/code/docker
     depends_on:
       - redis
       - mariadb
@@ -329,6 +337,8 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_DB_HOST
       - _APP_DB_PORT
       - _APP_DB_SCHEMA
@@ -339,13 +349,15 @@ services:
       - _APP_FUNCTIONS_CPUS
       - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_MEMORY_SWAP
+      - _APP_USAGE_STATS
+      - DOCKERHUB_PULL_USERNAME
+      - DOCKERHUB_PULL_PASSWORD
 
   appwrite-worker-mails:
     entrypoint: worker-mails
     container_name: appwrite-worker-mails
     build:
       context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -361,6 +373,8 @@ services:
       - _APP_SYSTEM_EMAIL_ADDRESS
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
       - _APP_SMTP_HOST
       - _APP_SMTP_PORT
       - _APP_SMTP_SECURE
@@ -372,28 +386,6 @@ services:
     container_name: appwrite-maintenance
     build:
       context: .
-    restart: unless-stopped
-    networks:
-      - appwrite
-    depends_on:
-      - redis
-    environment:
-      - _APP_ENV
-      - _APP_REDIS_HOST
-      - _APP_REDIS_PORT
-      - _APP_MAINTENANCE_INTERVAL
-      - _APP_DB_HOST
-      - _APP_DB_PORT
-      - _APP_DB_SCHEMA
-      - _APP_DB_USER
-      - _APP_DB_PASS
-
-  appwrite-schedule:
-    entrypoint: schedule
-    container_name: appwrite-schedule
-    build:
-      context: .
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -405,17 +397,41 @@ services:
       - _APP_ENV
       - _APP_REDIS_HOST
       - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
+      - _APP_MAINTENANCE_INTERVAL
+      - _APP_MAINTENANCE_RETENTION_EXECUTION
+      - _APP_MAINTENANCE_RETENTION_ABUSE
+      - _APP_MAINTENANCE_RETENTION_AUDIT
+
+  appwrite-schedule:
+    entrypoint: schedule
+    container_name: appwrite-schedule
+    build:
+      context: .
+    networks:
+      - appwrite
+    volumes:
+      - ./app:/usr/src/code/app
+      - ./src:/usr/src/code/src
+    depends_on:
+      - redis
+    environment:
+      - _APP_ENV
+      - _APP_REDIS_HOST
+      - _APP_REDIS_PORT
+      - _APP_REDIS_USER
+      - _APP_REDIS_PASS
 
   mariadb:
     image: appwrite/mariadb:1.2.0 # fix issues when upgrading using: mysql_upgrade -u root -p
     container_name: appwrite-mariadb
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
       - appwrite-mariadb:/var/lib/mysql:rw
     ports:
-      - "9502:3306"
+      - "3306:3306"
     environment:
       - MYSQL_ROOT_PASSWORD=password
       - MYSQL_DATABASE=${_APP_DB_SCHEMA}
@@ -439,7 +455,6 @@ services:
   redis:
     image: redis:6.0-alpine
     container_name: appwrite-redis
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -448,7 +463,6 @@ services:
   clamav:
     image: appwrite/clamav:1.2.0
     container_name: appwrite-clamav
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -457,7 +471,6 @@ services:
   influxdb:
     image: influxdb:1.8-alpine
     container_name: appwrite-influxdb
-    restart: unless-stopped
     networks:
       - appwrite
     volumes:
@@ -466,14 +479,25 @@ services:
   telegraf:
     image: appwrite/telegraf:1.0.0
     container_name: appwrite-telegraf
-    restart: unless-stopped
     networks:
       - appwrite
 
+  # Dev Tools Start ------------------------------------------------------------------------------------------
+  # 
+  # The Appwrite Team uses the following tools to help debug, monitor and diagnose the Appwrite stack
+  #
+  # Here is a description of the different tools and why are we using them:
+  #
+  # MailCatcher - An SMTP server. Catches all system emails and displays them in a nice UI.
+  # RequestCatcher - An HTTP server. Catches all system https calls and displays them using a simple HTTP API. Used to debug & tests webhooks and HTTP tasks
+  # RedisCommander - A nice UI for exploring Redis data
+  # Resque - A nice UI for exploring Reddis pub/sub, view the different queues workloads, pending and failed tasks
+  # Chronograf - A nice UI for exploring InfluxDB data
+  # Webgrind - A nice UI for exploring and debugging code-level stuff
+
   maildev: # used mainly for dev tests
     image: djfarrelly/maildev
     container_name: appwrite-maildev
-    restart: unless-stopped
     ports:
       - '9503:80'
     networks:
@@ -482,12 +506,19 @@ services:
   request-catcher: # used mainly for dev tests
     image: smarterdm/http-request-catcher
     container_name: appwrite-request-catcher
-    restart: unless-stopped
     ports:
       - '9504:5000'
     networks:
       - appwrite
 
+  adminer:
+    image: adminer
+    restart: always
+    ports:
+      - 9505:8080
+    networks:
+      - appwrite
+
   # redis-commander:
   #   image: rediscommander/redis-commander:latest
   #   restart: unless-stopped
@@ -536,6 +567,8 @@ services:
   #     - './debug:/tmp'
   #   ports:
   #     - '3001:80'
+  
+  # Dev Tools End   ------------------------------------------------------------------------------------------
 
 networks:
   gateway:
@@ -549,5 +582,5 @@ volumes:
   appwrite-certificates:
   appwrite-functions:
   appwrite-influxdb:
-  appwrite-chronograf:
   appwrite-config:
+  # appwrite-chronograf:

docker/environments/build.sh

@@ -6,9 +6,15 @@ docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
 echo 'Deno 1.5...'
 docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.5:1.0.0 ./docker/environments/deno-1.5/ --push
 
+echo 'Deno 1.6...'
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-deno-1.6:1.0.0 ./docker/environments/deno-1.6/ --push
+
 echo 'Node 14.5...'
 docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-14.5:1.0.0 ./docker/environments/node-14.5/ --push
 
+echo 'Node 15.5...'
+docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le -t appwrite/env-node-15.5:1.0.0 ./docker/environments/node-15.5/ --push
+
 echo 'PHP 7.4...'
 docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-php-7.4:1.0.0 ./docker/environments/php-7.4/ --push
 
@@ -20,3 +26,15 @@ docker buildx build --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
 
 echo 'Ruby 2.7...'
 docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-ruby-2.7:1.0.2 ./docker/environments/ruby-2.7/ --push
+
+echo 'Ruby 3.0...'
+docker buildx build --platform linux/amd64,linux/arm64,linux/386,linux/ppc64le -t appwrite/env-ruby-3.0:1.0.0 ./docker/environments/ruby-3.0/ --push
+
+echo 'Dart 2.10...'
+docker buildx build --platform linux/amd64 -t appwrite/env-dart-2.10:1.0.0 ./docker/environments/dart-2.10/ --push
+
+echo '.NET 3.1...'
+docker buildx build --platform linux/amd64,linux/arm64 -t appwrite/env-dotnet-3.1:1.0.0 ./docker/environments/dotnet-3.1/ --push
+
+echo '.NET 5.0...'
+docker buildx build --platform linux/amd64,linux/arm64 -t appwrite/env-dotnet-5.0:1.0.0 ./docker/environments/dotnet-5.0/ --push

docker/environments/dart-2.10/Dockerfile

@@ -0,0 +1,9 @@
+FROM google/dart:2.10
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apt-get update -y && apt-get install -y tar
+
+WORKDIR /usr/local/src/
+
+ENV PUB_CACHE=/usr/local/src/.appwrite

docker/environments/deno-1.6/Dockerfile

@@ -0,0 +1,11 @@
+FROM hayd/deno:alpine-1.6.2
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apk add tar
+
+RUN mkdir /usr/local/src
+
+WORKDIR /usr/local/src/
+
+ENV DENO_DIR=/usr/local/src/.appwrite

docker/environments/dotnet-3.1/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/dotnet/runtime:3.1-alpine
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apk add tar
+
+WORKDIR /usr/local/src/

docker/environments/dotnet-5.0/Dockerfile

@@ -0,0 +1,7 @@
+FROM mcr.microsoft.com/dotnet/runtime:5.0-alpine
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apk add tar
+
+WORKDIR /usr/local/src/

docker/environments/node-15.5/Dockerfile

@@ -0,0 +1,9 @@
+FROM node:15.5-alpine
+
+LABEL maintainer="team@appwrite.io"
+
+RUN apk add tar
+
+RUN mkdir /usr/local/src
+
+WORKDIR /usr/local/src/