Merge branch 'feat-database-indexing' into feat-audit-abuse

2024-06-02 19:04:49 +12:00 · 2021-06-12 17:54:55 +03:00 · 2021-06-12 17:54:55 +03:00 · a3053b2a2b
parent 5be8e2fc0c 4dc225a886
commit a3053b2a2b
111 changed files with 548 additions and 352 deletions
--- a/.travis-ci/build.sh
+++ b/.travis-ci/build.sh
@ -15,7 +15,7 @@ then
      exit 1
 fi

-if test $(find "./app/db/DBIP/dbip-country-lite-2021-02.mmdb" -mmin +259200)
+if test $(find "./app/db/DBIP/dbip-country-lite-2021-06.mmdb" -mmin +259200)
 then
    printf "${RED}GEO country DB has not been updated for more than 6 months. Go to https://db-ip.com/db/download/ip-to-country-lite to download a newer version${NC}\n"
 fi
--- a/CHANGES.md
+++ b/CHANGES.md
@ -8,7 +8,10 @@
  - Renamed *Devices* to *Sessions*
  - Add Provider Icon to each Session
  - Add Anonymous Account Placeholder
- Upgraded telegraf docker image version to v1.1.0
+- Upgraded telegraf docker image version to v1.2.0
+- Added new environment variables to the `telegraf` service:
+  - _APP_INFLUXDB_HOST
+  - _APP_INFLUXDB_PORT

 ## Bugs

--- a/4
+++ b/4
@ -62,8 +62,10 @@ RUN \
  make && make install && \
  cd .. && \
  ## Imagick Extension
-  git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \
+  ## Last working commit https://github.com/Imagick/imagick/commit/35741750aa1cda2b7ac354bfa6128fa037e9cf32
+  git clone --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \
  cd imagick && \
+  git checkout 35741750aa1cda2b7ac354bfa6128fa037e9cf32 && \
  phpize && \
  ./configure && \
  make && make install && \
--- a/app/config/collections.php
+++ b/app/config/collections.php
@ -11,7 +11,7 @@ $collections = [
    'console' => [
        '$id' => 'console',
        '$collection' => 'projects',
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Appwrite',
        'description' => 'Appwrite core engine',
        'logo' => '',
@ -51,7 +51,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_COLLECTIONS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_COLLECTIONS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Collections',
        'structure' => true,
        'rules' => [
@ -106,7 +106,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_RULES => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_RULES,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Collections Rule',
        'structure' => true,
        'rules' => [
@ -186,7 +186,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_USERS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_USERS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'User',
        'structure' => true,
        'rules' => [
@ -307,7 +307,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_SESSIONS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_SESSIONS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Session',
        'structure' => true,
        'rules' => [
@ -505,7 +505,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_TOKENS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_TOKENS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Token',
        'structure' => true,
        'rules' => [
@ -568,7 +568,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_MEMBERSHIPS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_MEMBERSHIPS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Membership',
        'structure' => true,
        'rules' => [
@ -640,7 +640,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_TEAMS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_TEAMS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Team',
        'structure' => true,
        'rules' => [
@ -676,7 +676,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_PROJECTS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_PROJECTS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Project',
        'structure' => true,
        'rules' => [
@ -834,7 +834,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_WEBHOOKS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_WEBHOOKS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Webhook',
        'structure' => true,
        'rules' => [
@ -898,7 +898,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_KEYS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_KEYS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Key',
        'structure' => true,
        'rules' => [
@ -934,7 +934,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_TASKS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_TASKS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Task',
        'structure' => true,
        'rules' => [
@ -1088,7 +1088,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_PLATFORMS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_PLATFORMS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Platform',
        'structure' => true,
        'rules' => [
@ -1160,7 +1160,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_DOMAINS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_DOMAINS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Domains',
        'structure' => true,
        'rules' => [
@ -1223,7 +1223,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_CERTIFICATES => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_CERTIFICATES,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Certificates',
        'structure' => true,
        'rules' => [
@ -1295,7 +1295,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_FILES => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_FILES,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'File',
        'structure' => true,
        'rules' => [
@ -1439,7 +1439,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_FUNCTIONS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_FUNCTIONS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Functions',
        'structure' => true,
        'rules' => [
@ -1557,7 +1557,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_TAGS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_TAGS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Tags',
        'structure' => true,
        'rules' => [
@ -1611,7 +1611,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_EXECUTIONS => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_EXECUTIONS,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Executions',
        'structure' => true,
        'rules' => [
@ -1701,7 +1701,7 @@ $collections = [
    Database::SYSTEM_COLLECTION_RESERVED => [
        '$collection' => Database::SYSTEM_COLLECTION_COLLECTIONS,
        '$id' => Database::SYSTEM_COLLECTION_RESERVED,
-        '$permissions' => ['read' => ['*']],
+        '$permissions' => ['read' => ['role:all']],
        'name' => 'Reserved',
        'structure' => true,
    ],
--- a/app/config/collections2.php
+++ b/app/config/collections2.php
@ -629,7 +629,7 @@ $collections = [
        'indexes' => [
            [
                '$id' => '_key_bucket',
-                'type' => Database::INDEX_UNIQUE,
+                'type' => Database::INDEX_KEY,
                'attributes' => ['bucketId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
@ -852,7 +852,7 @@ $collections = [
        'indexes' => [
            [
                '$id' => '_key_function',
-                'type' => Database::INDEX_UNIQUE,
+                'type' => Database::INDEX_KEY,
                'attributes' => ['functionId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
@ -960,7 +960,7 @@ $collections = [
        'indexes' => [
            [
                '$id' => '_key_function',
-                'type' => Database::INDEX_UNIQUE,
+                'type' => Database::INDEX_KEY,
                'attributes' => ['functionId'],
                'lengths' => [Database::LENGTH_KEY],
                'orders' => [Database::ORDER_ASC],
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@ -15,7 +15,7 @@ return [
            [
                'key' => 'web',
                'name' => 'Web',
-                'version' => '3.0.4',
+                'version' => '3.1.0',
                'url' => 'https://github.com/appwrite/sdk-for-web',
                'package' => 'https://www.npmjs.com/package/appwrite',
                'enabled' => true,
@ -62,7 +62,7 @@ return [
            [
                'key' => 'flutter',
                'name' => 'Flutter',
-                'version' => '0.6.2',
+                'version' => '0.6.4',
                'url' => 'https://github.com/appwrite/sdk-for-flutter',
                'package' => 'https://pub.dev/packages/appwrite',
                'enabled' => true,
@ -109,19 +109,20 @@ return [
                'gitUserName' => 'appwrite',
            ],
            [
-                'key' => 'kotlin',
-                'name' => 'Kotlin',
-                'url' => '',
-                'package' => '',
-                'enabled' => false,
-                'beta' => false,
+                'key' => 'android',
+                'name' => 'Android',
+                'version' => '0.0.0-SNAPSHOT',
+                'url' => 'https://github.com/appwrite/sdk-for-android',
+                'package' => 'https://repo1.maven.org/maven2/io/appwrite/sdk-for-android/',
+                'enabled' => true,
+                'beta' => true,
                'dev' => false,
                'hidden' => false,
                'family' => APP_PLATFORM_CLIENT,
                'prism' => 'kotlin',
-                'source' => false,
-                'gitUrl' => 'git@github.com:appwrite/sdk-for-kotlin.git',
-                'gitRepoName' => 'sdk-for-kotlin',
+                'source' => \realpath(__DIR__ . '/../sdks/client-android'),
+                'gitUrl' => 'git@github.com:appwrite/sdk-for-android.git',
+                'gitRepoName' => 'sdk-for-android',
                'gitUserName' => 'appwrite',
            ],
            // [
@ -178,7 +179,7 @@ return [
            [
                'key' => 'nodejs',
                'name' => 'Node.js',
-                'version' => '2.2.2',
+                'version' => '2.3.0',
                'url' => 'https://github.com/appwrite/sdk-for-node',
                'package' => 'https://www.npmjs.com/package/node-appwrite',
                'enabled' => true,
@ -195,7 +196,7 @@ return [
            [
                'key' => 'deno',
                'name' => 'Deno',
-                'version' => '0.2.1',
+                'version' => '0.2.2',
                'url' => 'https://github.com/appwrite/sdk-for-deno',
                'package' => 'https://deno.land/x/appwrite',
                'enabled' => true,
@ -212,7 +213,7 @@ return [
            [
                'key' => 'php',
                'name' => 'PHP',
-                'version' => '2.1.1',
+                'version' => '2.1.2',
                'url' => 'https://github.com/appwrite/sdk-for-php',
                'package' => 'https://packagist.org/packages/appwrite/appwrite',
                'enabled' => true,
@ -229,7 +230,7 @@ return [
            [
                'key' => 'python',
                'name' => 'Python',
-                'version' => '0.2.1',
+                'version' => '0.3.0',
                'url' => 'https://github.com/appwrite/sdk-for-python',
                'package' => 'https://pypi.org/project/appwrite/',
                'enabled' => true,
@ -246,7 +247,7 @@ return [
            [
                'key' => 'ruby',
                'name' => 'Ruby',
-                'version' => '2.1.1',
+                'version' => '2.2.0',
                'url' => 'https://github.com/appwrite/sdk-for-ruby',
                'package' => 'https://rubygems.org/gems/appwrite',
                'enabled' => true,
@ -314,7 +315,7 @@ return [
            [
                'key' => 'dart',
                'name' => 'Dart',
-                'version' => '0.6.1',
+                'version' => '0.6.3',
                'url' => 'https://github.com/appwrite/sdk-for-dart',
                'package' => 'https://pub.dev/packages/dart_appwrite',
                'enabled' => true,
@ -331,7 +332,7 @@ return [
            [
                'key' => 'cli',
                'name' => 'Command Line',
-                'version' => '0.10.1',
+                'version' => '0.10.0',
                'url' => 'https://github.com/appwrite/sdk-for-cli',
                'package' => 'https://github.com/appwrite/sdk-for-cli',
                'enabled' => true,
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -56,15 +56,16 @@ App::post('/v1/account')
        /** @var Utopia\Database\Database $dbForInternal */
        /** @var Appwrite\Event\Event $audits */

+        $email = \strtolower($email);
        if ('console' === $project->getId()) {
-            $whitlistEmails = $project->getAttribute('authWhitelistEmails');
-            $whitlistIPs = $project->getAttribute('authWhitelistIPs');
+            $whitelistEmails = $project->getAttribute('authWhitelistEmails');
+            $whitelistIPs = $project->getAttribute('authWhitelistIPs');

-            if (!empty($whitlistEmails) && !\in_array($email, $whitlistEmails)) {
+            if (!empty($whitelistEmails) && !\in_array($email, $whitelistEmails)) {
                throw new Exception('Console registration is restricted to specific emails. Contact your administrator for more information.', 401);
            }

-            if (!empty($whitlistIPs) && !\in_array($request->getIP(), $whitlistIPs)) {
+            if (!empty($whitelistIPs) && !\in_array($request->getIP(), $whitelistIPs)) {
                throw new Exception('Console registration is restricted to specific IPs. Contact your administrator for more information.', 401);
            }
        }
@ -85,7 +86,7 @@ App::post('/v1/account')
            $userId = $dbForInternal->getId();
            $user = $dbForInternal->createDocument('users', new Document([
                '$id' => $userId,
-                '$read' => ['*'],
+                '$read' => ['role:all'],
                '$write' => ['user:'.$userId],
                'email' => $email,
                'emailVerification' => false,
@ -151,6 +152,7 @@ App::post('/v1/account/sessions')
        /** @var MaxMind\Db\Reader $geodb */
        /** @var Appwrite\Event\Event $audits */

+        $email = \strtolower($email);
        $protocol = $request->getProtocol();
        
        $profile = $dbForInternal->findFirst('users', [new Query('email', Query::TYPE_EQUAL, [$email])], 1); // Get user by email address
@ -460,7 +462,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                    $userId = $dbForInternal->getId();
                    $user = $dbForInternal->createDocument('users', new Document([
                        '$id' => $userId,
-                        '$read' => ['*'],
+                        '$read' => ['role:all'],
                        '$write' => ['user:'.$userId],
                        'email' => $email,
                        'emailVerification' => true,
@ -598,7 +600,7 @@ App::post('/v1/account/sessions/anonymous')
            throw new Exception('Failed to create anonymous user.', 401);
        }

-        if ($user->getId()) {
+        if (!$user->isEmpty()) {
            throw new Exception('Cannot create an anonymous user when logged in.', 401);
        }

@ -617,7 +619,7 @@ App::post('/v1/account/sessions/anonymous')
        $userId = $dbForInternal->getId();
        $user = $dbForInternal->createDocument('users', new Document([
            '$id' => $userId,
-            '$read' => ['*'], 
+            '$read' => ['role:all'], 
            '$write' => ['user:'.$userId],
            'email' => null,
            'emailVerification' => false,
@ -658,7 +660,8 @@ App::post('/v1/account/sessions/anonymous')

        Authorization::setRole('user:'.$user->getId());

-        $user = $dbForInternal->updateDocument('users', $user->getId(), $user);
+        $user = $dbForInternal->updateDocument('users', $user->getId(),
+            $user->setAttribute('sessions', $session, Document::SET_TYPE_APPEND));

        $audits
            ->setParam('userId', $user->getId())
@ -999,7 +1002,8 @@ App::patch('/v1/account/email')
            throw new Exception('Invalid credentials', 401);
        }

-        $profile = $dbForInternal->findFirst('users', [new Query('email', Query::TYPE_EQUAL, [$email])], 1); // Get user by email address
+        $email = \strtolower($email);
+        $profile = $dbForInternal->findFirst('users', [new Query('email', Query::TYPE_EQUAL, [\strtolower($email)])], 1); // Get user by email address

        if ($profile) {
            throw new Exception('User already registered', 400);
@ -1293,6 +1297,7 @@ App::post('/v1/account/recovery')
        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
        $isAppUser = Auth::isAppUser(Authorization::$roles);

+        $email = \strtolower($email);
        $profile = $dbForInternal->findFirst('users', [new Query('email', Query::TYPE_EQUAL, [$email])], 1); // Get user by email address

        if (!$profile) {
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@ -12,6 +12,7 @@ use Appwrite\Utopia\Response;
 use Appwrite\Task\Validator\Cron;
 use Utopia\App;
 use Utopia\Exception;
+use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
@ -499,13 +500,13 @@ App::get('/v1/functions/:functionId/tags')
    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
    ->label('sdk.response.model', Response::MODEL_TAG_LIST)
    ->param('functionId', '', new UID(), 'Function unique ID.')
-    // ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
+    ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
    ->param('offset', 0, new Range(0, 2000), 'Results offset. The default value is 0. Use this param to manage pagination.', true)
-    // ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
+    ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
    ->inject('response')
    ->inject('dbForInternal')
-    ->action(function ($functionId, $limit, $offset, $response, $dbForInternal) {
+    ->action(function ($functionId, $search, $limit, $offset, $orderType, $response, $dbForInternal) {
        /** @var Appwrite\Utopia\Response $response */
        /** @var Utopia\Database\Database $dbForInternal */

@ -517,7 +518,7 @@ App::get('/v1/functions/:functionId/tags')

        $queries[] = new Query('functionId', Query::TYPE_EQUAL, [$function->getId()]);
        
-        $results = $dbForInternal->find('tags', $queries, $limit, $offset);
+        $results = $dbForInternal->find('tags', $queries, $limit, $offset, ['_id'], [$orderType]);
        $sum = $dbForInternal->count('tags', $queries, APP_LIMIT_COUNT);

        $response->dynamic2(new Document([
@ -759,7 +760,7 @@ App::get('/v1/functions/:functionId/executions')

        $results = $dbForInternal->find('executions', [
            new Query('functionId', Query::TYPE_EQUAL, [$function->getId()]),
-        ], $limit, $offset);
+        ], $limit, $offset, ['_id'], [Database::ORDER_DESC]);
        
        $sum = $dbForInternal->count('executions', [
            new Query('functionId', Query::TYPE_EQUAL, [$function->getId()]),
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@ -48,11 +48,13 @@ App::post('/v1/projects')
    ->inject('dbForConsole')
    ->inject('dbForInternal')
    ->inject('dbForExternal')
-    ->action(function ($name, $teamId, $description, $logo, $url, $legalName, $legalCountry, $legalState, $legalCity, $legalAddress, $legalTaxId, $response, $dbForConsole, $dbForInternal, $dbForExternal) {
+    ->inject('consoleDB')
+    ->action(function ($name, $teamId, $description, $logo, $url, $legalName, $legalCountry, $legalState, $legalCity, $legalAddress, $legalTaxId, $response, $dbForConsole, $dbForInternal, $dbForExternal, $consoleDB) {
        /** @var Appwrite\Utopia\Response $response */
        /** @var Utopia\Database\Database $dbForConsole */
        /** @var Utopia\Database\Database $dbForInternal */
        /** @var Utopia\Database\Database $dbForExternal */
+        /** @var Appwrite\Database\Database $consoleDB */

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

@ -128,6 +130,8 @@ App::post('/v1/projects')
            }
        }

+        $consoleDB->createNamespace($project->getId());
+
        $response->setStatusCode(Response::STATUS_CODE_CREATED);
        $response->dynamic2($project, Response::MODEL_PROJECT);
    });
@ -154,7 +158,7 @@ App::get('/v1/projects')

        $queries = ($search) ? [new Query('name', Query::TYPE_SEARCH, [$search])] : [];

-        $results = $dbForConsole->find('projects', $queries, $limit, $offset);
+        $results = $dbForConsole->find('projects', $queries, $limit, $offset, ['_id'], [$orderType]);
        $sum = $dbForConsole->count('projects', $queries, APP_LIMIT_COUNT);

        $response->dynamic2(new Document([
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@ -225,6 +225,7 @@ App::get('/v1/storage/files/:fileId/preview')
    ->param('fileId', '', new UID(), 'File unique ID')
    ->param('width', 0, new Range(0, 4000), 'Resize preview image width, Pass an integer between 0 to 4000.', true)
    ->param('height', 0, new Range(0, 4000), 'Resize preview image height, Pass an integer between 0 to 4000.', true)
+    ->param('gravity', Image::GRAVITY_CENTER, new WhiteList([Image::GRAVITY_CENTER, Image::GRAVITY_NORTH, Image::GRAVITY_NORTHWEST, Image::GRAVITY_NORTHEAST, Image::GRAVITY_WEST, Image::GRAVITY_EAST, Image::GRAVITY_SOUTHWEST, Image::GRAVITY_SOUTH, Image::GRAVITY_SOUTHEAST]), 'Image crop gravity', true)
    ->param('quality', 100, new Range(0, 100), 'Preview image quality. Pass an integer between 0 to 100. Defaults to 100.', true)
    ->param('borderWidth', 0, new Range(0, 100), 'Preview image border in pixels. Pass an integer between 0 to 100. Defaults to 0.', true)
    ->param('borderColor', '', new HexColor(), 'Preview image border color. Use a valid HEX color, no # is needed for prefix.', true)
@ -237,7 +238,7 @@ App::get('/v1/storage/files/:fileId/preview')
    ->inject('response')
    ->inject('project')
    ->inject('dbForInternal')
-    ->action(function ($fileId, $width, $height, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $dbForInternal) {
+    ->action(function ($fileId, $width, $height, $gravity, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $dbForInternal) {
        /** @var Utopia\Swoole\Request $request */
        /** @var Appwrite\Utopia\Response $response */
        /** @var Utopia\Database\Document $project */
@ -325,7 +326,7 @@ App::get('/v1/storage/files/:fileId/preview')

        $image = new Image($source);

-        $image->crop((int) $width, (int) $height);
+        $image->crop((int) $width, (int) $height, $gravity);
        
        if (!empty($opacity) || $opacity==0) {
            $image->setOpacity($opacity);
@ -436,11 +437,11 @@ App::get('/v1/storage/files/:fileId/view')
    ->param('fileId', '', new UID(), 'File unique ID.')
    ->inject('response')
    ->inject('dbForInternal')
-    ->action(function ($fileId, $response, $projectDB) {
+    ->action(function ($fileId, $response, $dbForInternal) {
        /** @var Appwrite\Utopia\Response $response */
        /** @var Utopia\Database\Database $dbForInternal */

-        $file  = $projectDB->getDocument('files', $fileId);
+        $file  = $dbForInternal->getDocument('files', $fileId);
        $mimes = Config::getParam('storage-mimes');

        if (empty($file->getId())) {
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@ -257,7 +257,8 @@ App::post('/v1/teams/:teamId/memberships')

        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::$roles);
        $isAppUser = Auth::isAppUser(Authorization::$roles);
-
+        
+        $email = \strtolower($email);
        $name = (empty($name)) ? $email : $name;
        $team = $dbForInternal->getDocument('teams', $teamId);

@ -285,7 +286,7 @@ App::post('/v1/teams/:teamId/memberships')
                $userId = $dbForInternal->getId();
                $invitee = $dbForInternal->createDocument('users', new Document([
                    '$id' => $userId,
-                    '$read' => ['user:'.$userId, '*'],
+                    '$read' => ['user:'.$userId, 'role:all'],
                    '$write' => ['user:'.$userId],
                    'email' => $email,
                    'emailVerification' => false,
@ -322,7 +323,7 @@ App::post('/v1/teams/:teamId/memberships')

        $membership = new Document([
            '$id' => $dbForInternal->getId(),
-            '$read' => ['*'],
+            '$read' => ['role:all'],
            '$write' => ['user:'.$invitee->getId(), 'team:'.$team->getId().'/owner'],
            'userId' => $invitee->getId(),
            'teamId' => $team->getId(),
@ -435,7 +436,7 @@ App::get('/v1/teams/:teamId/memberships')
            throw new Exception('Team not found', 404);
        }

-        $memberships = $dbForInternal->find('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], $limit, $offset);
+        $memberships = $dbForInternal->find('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], $limit, $offset, ['_id'], [$orderType]);
        $sum = $dbForInternal->count('memberships', [new Query('teamId', Query::TYPE_EQUAL, [$teamId])], APP_LIMIT_COUNT);
        $users = [];

@ -455,7 +456,6 @@ App::get('/v1/teams/:teamId/memberships')
        ]), Response::MODEL_MEMBERSHIP_LIST);
    });

-
 App::patch('/v1/teams/:teamId/memberships/:membershipId')
    ->desc('Update Membership Roles')
    ->groups(['api', 'teams'])
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -39,11 +39,13 @@ App::post('/v1/users')
        /** @var Appwrite\Utopia\Response $response */
        /** @var Utopia\Database\Database $dbForInternal */

+        $email = \strtolower($email);
+
        try {
            $userId = $dbForInternal->getId();
            $user = $dbForInternal->createDocument('users', new Document([
                '$id' => $userId,
-                '$read' => ['*'],
+                '$read' => ['role:all'],
                '$write' => ['user:'.$userId],
                'email' => $email,
                'emailVerification' => false,
@ -87,7 +89,7 @@ App::get('/v1/users')
        /** @var Appwrite\Utopia\Response $response */
        /** @var Utopia\Database\Database $dbForInternal */

-        $results = $dbForInternal->find('users', [], $limit, $offset);
+        $results = $dbForInternal->find('users', [], $limit, $offset, ['_id'], [$orderType]);
        $sum = $dbForInternal->count('users', [], APP_LIMIT_COUNT);

        $response->dynamic2(new Document([
@ -353,26 +355,20 @@ App::patch('/v1/users/:userId/verification')
    ->param('userId', '', new UID(), 'User unique ID.')
    ->param('emailVerification', false, new Boolean(), 'User Email Verification Status.')
    ->inject('response')
-    ->inject('projectDB')
-    ->action(function ($userId, $emailVerification, $response, $projectDB) {
+    ->inject('dbForInternal')
+    ->action(function ($userId, $emailVerification, $response, $dbForInternal) {
        /** @var Appwrite\Utopia\Response $response */
-        /** @var Appwrite\Database\Database $projectDB */
+        /** @var Utopia\Database\Database $dbForInternal */

-        $user = $projectDB->getDocument($userId);
+        $user = $dbForInternal->getDocument('users', $userId);

-        if (empty($user->getId()) || Database::SYSTEM_COLLECTION_USERS != $user->getCollection()) {
+        if ($user->isEmpty()) {
            throw new Exception('User not found', 404);
        }

-        $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [
-            'emailVerification' => $emailVerification,
-        ]));
+        $user = $dbForInternal->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', $emailVerification));

-        if (false === $user) {
-            throw new Exception('Failed saving user to DB', 500);
-        }
-
-        $response->dynamic($user, Response::MODEL_USER);
+        $response->dynamic2($user, Response::MODEL_USER);
    });

 App::patch('/v1/users/:userId/prefs')
@ -525,7 +521,7 @@ App::delete('/v1/users/:userId')
        
        // $dbForInternal->createDocument('users', new Document([
        //     '$id' => $userId,
-        //     '$read' => ['*'],
+        //     '$read' => ['role:all'],
        // ]));

        $deletes
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@ -6,9 +6,9 @@ use Appwrite\Database\Document;
 use Appwrite\Network\Validator\Host;
 use Appwrite\Utopia\Response;
 use Utopia\App;
-use Utopia\Validator\Numeric;
-use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
+use Utopia\Validator\Integer;
+use Utopia\Validator\Text;
 use Utopia\Storage\Validator\File;

 App::get('/v1/mock/tests/foo')
@ -24,7 +24,7 @@ App::get('/v1/mock/tests/foo')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -42,7 +42,7 @@ App::post('/v1/mock/tests/foo')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -60,7 +60,7 @@ App::patch('/v1/mock/tests/foo')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -78,7 +78,7 @@ App::put('/v1/mock/tests/foo')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -96,7 +96,7 @@ App::delete('/v1/mock/tests/foo')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -114,7 +114,7 @@ App::get('/v1/mock/tests/bar')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -132,7 +132,7 @@ App::post('/v1/mock/tests/bar')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -150,7 +150,7 @@ App::patch('/v1/mock/tests/bar')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -168,7 +168,7 @@ App::put('/v1/mock/tests/bar')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -186,7 +186,7 @@ App::delete('/v1/mock/tests/bar')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->action(function ($x, $y, $z) {
    });
@ -230,7 +230,7 @@ App::post('/v1/mock/tests/general/upload')
    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Numeric(), 'Sample numeric param')
+    ->param('y', '', new Integer(), 'Sample numeric param')
    ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
    ->param('file', [], new File(), 'Sample file param', false)
    ->inject('request')
@ -271,6 +271,7 @@ App::get('/v1/mock/tests/general/redirect')
    ->label('sdk.description', 'Mock a redirect request.')
    ->label('sdk.response.code', Response::STATUS_CODE_MOVED_PERMANENTLY)
    ->label('sdk.response.type', Response::CONTENT_TYPE_HTML)
+    ->label('sdk.response.model', Response::MODEL_MOCK)
    ->label('sdk.mock', true)
    ->inject('response')
    ->action(function ($response) {
@ -394,6 +395,7 @@ App::get('/v1/mock/tests/general/502-error')
    ->label('sdk.description', 'Mock a 502 bad gateway.')
    ->label('sdk.response.code', Response::STATUS_CODE_BAD_GATEWAY)
    ->label('sdk.response.type', Response::CONTENT_TYPE_TEXT)
+    ->label('sdk.response.model', Response::MODEL_ANY)
    ->label('sdk.mock', true)
    ->inject('response')
    ->action(function ($response) {
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@ -8,6 +8,7 @@ use Utopia\App;
 use Utopia\View;
 use Utopia\Config\Config;
 use Utopia\Exception;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;

@ -488,4 +489,4 @@ App::get('/versions')
        }

        $response->json($versions);
-    });
+    });
--- a/app/db/DBIP/dbip-country-lite-2021-02.mmdb
+++ b/app/db/DBIP/dbip-country-lite-2021-02.mmdb
--- a/app/db/DBIP/dbip-country-lite-2021-06.mmdb
+++ b/app/db/DBIP/dbip-country-lite-2021-06.mmdb
--- a/app/http.php
+++ b/app/http.php
@ -139,10 +139,10 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
    
    try {
        Authorization::cleanRoles();
-        Authorization::setRole('*');
+        Authorization::setRole('role:all');

        Authorization2::cleanRoles();
-        Authorization2::setRole('*');
+        Authorization2::setRole('role:all');

        $app->run($request, $response);
    } catch (\Throwable $th) {
--- a/app/init.php
+++ b/app/init.php
@ -47,7 +47,7 @@ const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 12;
 const APP_LIMIT_COUNT = 5000;
 const APP_LIMIT_USERS = 10000;
-const APP_CACHE_BUSTER = 146;
+const APP_CACHE_BUSTER = 148;
 const APP_VERSION_STABLE = '0.8.0';
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
@ -263,7 +263,7 @@ $register->set('smtp', function () {
    return $mail;
 });
 $register->set('geodb', function () {
-    return new Reader(__DIR__.'/db/DBIP/dbip-country-lite-2021-02.mmdb');
+    return new Reader(__DIR__.'/db/DBIP/dbip-country-lite-2021-06.mmdb');
 });

 /*
--- a/app/tasks/sdks.php
+++ b/app/tasks/sdks.php
@ -15,7 +15,7 @@ use Appwrite\SDK\Language\Deno;
 use Appwrite\SDK\Language\DotNet;
 use Appwrite\SDK\Language\Flutter;
 use Appwrite\SDK\Language\Go;
-use Appwrite\SDK\Language\Java;
+use Appwrite\SDK\Language\Kotlin;
 use Appwrite\SDK\Language\Swift;

 $cli
@ -134,9 +134,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                    case 'go':
                        $config = new Go();
                        break;
-                    case 'java':
-                        $config = new Java();
-                        break;
                    case 'swift':
                        $config = new Swift();
                        break;
@ -144,6 +141,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                        $cover = '';
                        $config = new DotNet();
                        break;
+                    case 'android':
+                        $config = new Kotlin();
+                        break;
                    default:
                        throw new Exception('Language "'.$language['key'].'" not supported');
                        break;
@ -155,9 +155,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

                $sdk
                    ->setName($language['name'])
-                    ->setDescription("Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way.
-                        Use the {$language['name']} SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools.
-                        For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)")
+                    ->setNamespace('io appwrite')
+                    ->setDescription("Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the {$language['name']} SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)")
                    ->setShortDescription('Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API')
                    ->setLicense($license)
                    ->setLicenseContent($licenseContent)
@ -202,7 +201,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                    \exec('rm -rf '.$target.' && \
                        mkdir -p '.$target.' && \
                        cd '.$target.' && \
-                        git init && \
+                        git init --initial-branch=master && \
                        git remote add origin '.$gitUrl.' && \
                        git fetch && \
                        git pull '.$gitUrl.' && \
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@ -240,11 +240,11 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
            <li>
                <div class="link flutter-new"><img src="/images/clients/flutter.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Flutter Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Flutter App &nbsp;<span class="text-size-tiny">(beta)</span></div>
            </li>
-            <li class="disabled">
-                <div class="link ios-new"><img src="/images/clients/ios.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New iOS App <span class="text-fade text-size-small">(soon)</span></div>
+            <li>
+                <div class="link android-new"><img src="/images/clients/android.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Android Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Android App</div>
            </li>
            <li class="disabled">
-                <div class="link android-new"><img src="/images/clients/android.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Android Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Android App  <span class="text-fade text-size-small">(soon)</span></div>
+                <div class="link ios-new"><img src="/images/clients/ios.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="iOS Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New iOS App <span class="text-fade text-size-small">(soon)</span></div>
            </li>
            <li class="disabled">
                <div class="link unity-new"><img src="/images/clients/unity.png?v=<?php echo APP_CACHE_BUSTER; ?>" alt="Unity Platform Logo" class="avatar xxs margin-end-small" loading="lazy" /> New Unity Game  <span class="text-fade text-size-small">(soon)</span></div>
@ -329,6 +329,42 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
    </form>
 </script>

+<div data-ui-modal class="modal box close" data-button-alias=".android-new">
+    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>
+
+    <h1>Register your Android App</h1>
+
+    <form
+        data-analytics
+        data-analytics-activity
+        data-analytics-event="submit"
+        data-analytics-category="console"
+        data-analytics-label="Create Project Platform (Android)"
+        data-service="projects.createPlatform"
+        data-scope="console"
+        data-event="submit"
+        data-success="alert,trigger,reset"
+        data-success-param-alert-text="Registered new platform successfully"
+        data-success-param-trigger-events="projects.createPlatform"
+        data-failure="alert"
+        data-failure-param-alert-text="Failed to register platform"
+        data-failure-param-alert-classname="error">
+
+        <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
+        <input type="hidden" name="type" data-ls-bind="android" />
+
+        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Android App" maxlength="128" />
+
+        <label for="key">Package Name <span class="tooltip large" data-tooltip="Your package name is generally the applicationId in your app-level build.gradle file."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
+
+        <hr />
+
+        <button type="submit">Register</button> &nbsp; <button data-ui-modal-close="" type="button" class="reverse">Back</button>
+    </form>
+</div>
+
 <div data-ui-modal class="modal box close width-large" data-button-alias=".flutter-new">
    <button type="button" class="close pull-end" data-ui-modal-close=""><i class="icon-cancel"></i></button>

--- a/app/views/console/settings/index.phtml
+++ b/app/views/console/settings/index.phtml
@ -58,7 +58,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                <label for="logo">Project Logo</label>

                                <div class="text-align-center clear">
-                                    <input type="hidden" name="logo" data-ls-bind="{{console-project.logo}}" data-read="<?php echo $this->escape(json_encode(['*'])); ?>" data-write="<?php echo $this->escape(json_encode(['team:{{console-project.teamId}}'])); ?>" data-accept="image/*" data-forms-upload="" data-label-button="Upload" data-preview-alt="Project Logo" data-scope="console" data-default="">
+                                    <input type="hidden" name="logo" data-ls-bind="{{console-project.logo}}" data-read="<?php echo $this->escape(json_encode(['role:all'])); ?>" data-write="<?php echo $this->escape(json_encode(['team:{{console-project.teamId}}'])); ?>" data-accept="image/*" data-forms-upload="" data-label-button="Upload" data-preview-alt="Project Logo" data-scope="console" data-default="">
                                </div>

                                <hr />
--- a/app/views/console/storage/index.phtml
+++ b/app/views/console/storage/index.phtml
@ -243,7 +243,7 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">(Max file size allowed: <?php echo $fileLimitHuman; ?>)</div>

                        <label for="file-read">Read Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                        <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['*'])); ?>" placeholder="User ID, Team ID or Role" />
+                        <input type="hidden" id="file-read" name="read" data-forms-tags data-cast-to="json" value="<?php echo htmlentities(json_encode(['role:all'])); ?>" placeholder="User ID, Team ID or Role" />
                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
                        
                        <label for="file-write">Write Access (<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@ -372,11 +372,14 @@ services:
      - appwrite-influxdb:/var/lib/influxdb:rw

  telegraf:
-    image: appwrite/telegraf:1.1.0
+    image: appwrite/telegraf:1.2.0
    container_name: appwrite-telegraf
    restart: unless-stopped
    networks:
      - appwrite
+    environment: 
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT

 networks:
  gateway:
--- a/app/views/layouts/default.phtml
+++ b/app/views/layouts/default.phtml
@ -43,7 +43,7 @@ if(!empty($platforms)) {
    <link rel="apple-touch-icon" href="/images/apple.png">
    <!-- <link rel="preconnect" href="" /> -->
    <?php if (!empty($canonical)): ?>
-        <link rel="canonical" href="<?php echo $canonical; ?>" />
+        <link rel="canonical" href="<?php echo $this->escape($canonical); ?>" />
    <?php endif; ?>
    <?php foreach ($this->getParam('prefetch', []) as $prefetch): ?>
        <link rel="prefetch" href="<?php echo $this->escape($prefetch); ?>" />
@ -52,12 +52,12 @@ if(!empty($platforms)) {
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=5" />
    <meta name="theme-color" content="#24f4d4">
    <meta property="og:type" content="website" />
-    <meta property="og:title" content="<?php echo $this->getParam('title', ''); ?>" />
-    <meta property="og:description" content="<?php echo $this->getParam('description', ''); ?>" />
+    <meta property="og:title" content="<?php echo $this->escape($this->getParam('title', '')); ?>" />
+    <meta property="og:description" content="<?php echo $this->escape($this->getParam('description', '')); ?>" />
    <?php if (!empty($canonical)): ?>
-        <meta property="og:url" content="<?php echo $canonical; ?>" />
+        <meta property="og:url" content="<?php echo $this->escape($canonical); ?>" />
    <?php endif; ?>
-    <meta property="og:image"  content="<?php echo $endpoint; ?>/images/logo.png?v=<?php echo APP_CACHE_BUSTER; ?>" />
+    <meta property="og:image"  content="<?php echo $this->escape($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(){
@ -69,11 +69,11 @@ if(!empty($platforms)) {

        var APP_ENV = {
            NAME: '<?php echo APP_NAME; ?>',
-            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; ?>',
+            VERSION: '<?php echo $this->escape($version); ?>',
+            CACHEBUSTER: '<?php echo $this->escape($version); ?>/<?php echo APP_CACHE_BUSTER; ?>',
+            PROTOCOL: '<?php echo $this->escape($protocol); ?>',
+            ENDPOINT: '<?php echo $this->escape($endpoint); ?>',
+            DOMAIN: '<?php echo $this->escape($domain); ?>',
            HOME: '<?php echo $this->escape($this->getParam('home')); ?>',
            SETUP: '<?php echo $this->escape($this->getParam('setup')); ?>',
            API: '/v1',
@ -93,7 +93,7 @@ if(!empty($platforms)) {

            script.type   = 'text/javascript';
            script.async  = true;
-            script.src    = '/dist/scripts/app-all.js?v=<?php echo APP_CACHE_BUSTER; ?>.<?php echo $version; ?>';
+            script.src    = '/dist/scripts/app-all.js?v=<?php echo APP_CACHE_BUSTER; ?>.<?php echo $this->escape($version); ?>';
            script.onload = function() {
                window.ls.run(window);
            };
@ -142,6 +142,6 @@ if(!empty($platforms)) {

    <?php echo $this->exec($this->getParam('footer', [])); ?>

-    <!-- Version <?php echo $version; ?> -->
+    <!-- Version <?php echo $this->escape($version); ?> -->
 </body>
 </html>
--- a/app/workers/audits.php
+++ b/app/workers/audits.php
@ -1,5 +1,6 @@
 <?php

+use Appwrite\Resque\Worker;
 use Utopia\Audit\Audit;
 use Utopia\Cache\Adapter\Redis;
 use Utopia\Cache\Cache;
@ -10,18 +11,17 @@ use Utopia\Database\Database;
 require_once __DIR__.'/../init.php';

 Console::title('Audits V1 Worker');
-
 Console::success(APP_NAME.' audits worker v1 has started');

-class AuditsV1
+class AuditsV1 extends Worker
 {
    public $args = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        global $register;

@ -43,8 +43,8 @@ class AuditsV1
        $audit->log($userId, $event, $resource, $userAgent, $ip, '', $data);
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
        // ... Remove environment for this job
    }
-}
+}
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@ -1,30 +1,30 @@
 <?php

-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Domains\Domain;
 use Appwrite\Database\Database;
 use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Network\Validator\CNAME;
+use Appwrite\Resque\Worker;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;
+use Utopia\Domains\Domain;

 require_once __DIR__.'/../init.php';

 Console::title('Certificates V1 Worker');
-
 Console::success(APP_NAME.' certificates worker v1 has started');

-class CertificatesV1
+class CertificatesV1 extends Worker
 {
    public $args = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        global $register;

@ -204,8 +204,7 @@ class CertificatesV1
        Authorization::reset();
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
-        // ... Remove environment for this job
    }
-}
+}
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@ -7,6 +7,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\Resque\Worker;
 use Utopia\Storage\Device\Local;
 use Utopia\Abuse\Abuse;
 use Utopia\Abuse\Adapters\TimeLimit;
@ -19,30 +20,29 @@ use Utopia\Database\Adapter\MariaDB;
 require_once __DIR__.'/../init.php';

 Console::title('Deletes V1 Worker');
-
 Console::success(APP_NAME.' deletes worker v1 has started'."\n");

-class DeletesV1
+class DeletesV1 extends Worker
 {
-
    public $args = [];

    protected $consoleDB = null;

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
-    { 
-        $projectId = isset($this->args['projectId']) ? $this->args['projectId'] : '';
-        $type = $this->args['type'];
+    public function run(): void
+    {
+        $projectId = $this->args['projectId'] ?? '';
+        $type = $this->args['type'] ?? '';
        
        switch (strval($type)) {
            case DELETE_TYPE_DOCUMENT:
-                $document = $this->args['document'];
+                $document = $this->args['document'] ?? '';
                $document = new Document($document);
-                switch (strval($document->getCollection())) {
+                
+                switch ($document->getCollection()) {
                    case Database::SYSTEM_COLLECTION_PROJECTS:
                        $this->deleteProject($document);
                        break;
@ -81,13 +81,11 @@ class DeletesV1
            default:
                Console::error('No delete operation for type: '.$type);
                break;
-            
            }
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
-        // ... Remove environment for this job
    }
    
    protected function deleteDocuments(Document $document, $projectId) 
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@ -1,6 +1,7 @@
 <?php

 use Appwrite\Event\Event;
+use Appwrite\Resque\Worker;
 use Cron\CronExpression;
 use Swoole\Runtime;
 use Utopia\App;
@ -126,17 +127,17 @@ Console::info(count($list)." functions listed in " . ($executionEnd - $execution

 //TODO aviod scheduled execution if delay is bigger than X offest

-class FunctionsV1
+class FunctionsV1 extends Worker
 {
    public $args = [];

    public $allowed = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        global $register;

@ -563,7 +564,7 @@ class FunctionsV1
        return $output;
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
    }
-}
+}
--- a/app/workers/mails.php
+++ b/app/workers/mails.php
@ -1,26 +1,26 @@
 <?php

+use Appwrite\Resque\Worker;
 use Utopia\App;
 use Utopia\CLI\Console;

 require_once __DIR__.'/../init.php';

 Console::title('Mails V1 Worker');
-
 Console::success(APP_NAME.' mails worker v1 has started'."\n");

-class MailsV1
+class MailsV1 extends Worker
 {
    /**
     * @var array
     */
    public $args = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        global $register;

@ -68,8 +68,7 @@ class MailsV1
        }
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
-        // ... Remove environment for this job
    }
-}
+}
--- a/app/workers/tasks.php
+++ b/app/workers/tasks.php
@ -1,32 +1,32 @@
 <?php

-use Utopia\App;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
 use Appwrite\Database\Database;
 use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
 use Appwrite\Database\Adapter\Redis as RedisAdapter;
 use Appwrite\Database\Validator\Authorization;
+use Appwrite\Resque\Worker;
 use Cron\CronExpression;
+use Utopia\App;
+use Utopia\CLI\Console;
+use Utopia\Config\Config;

 require_once __DIR__.'/../init.php';

 Console::title('Tasks V1 Worker');
-
 Console::success(APP_NAME.' tasks worker v1 has started');

-class TasksV1
+class TasksV1 extends Worker
 {
    /**
     * @var array
     */
    public $args = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        global $register;

@ -73,11 +73,11 @@ class TasksV1
        }

        if ($task->getAttribute('updated') !== $updated) { // Task have already been rescheduled by owner
-            return false;
+            return;
        }

        if ($task->getAttribute('status') !== 'play') { // Skip task and don't schedule again
-            return false;
+            return;
        }

        // Reschedule
@ -202,11 +202,10 @@ class TasksV1

        // Send alert if needed (use SMTP as default for now)

-        return true;
+        return;
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
-        // ... Remove environment for this job
    }
-}
+}
--- a/app/workers/usage.php
+++ b/app/workers/usage.php
@ -1,29 +1,30 @@
 <?php

+use Appwrite\Resque\Worker;
 use Utopia\App;
 use Utopia\CLI\Console;

 require_once __DIR__.'/../init.php';

 Console::title('Usage V1 Worker');
-
 Console::success(APP_NAME.' usage worker v1 has started');

-class UsageV1
+class UsageV1 extends Worker
 {
    /**
     * @var array
     */
    public $args = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        global $register;

+        /** @var \Domnikl\Statsd\Client $statsd */
        $statsd = $register->get('statsd', true);

        $projectId = $this->args['projectId'] ?? '';
@ -36,12 +37,12 @@ class UsageV1
        $httpMethod = $this->args['httpMethod'] ?? '';
        $httpRequest = $this->args['httpRequest'] ?? 0;

-        $functionId = $this->args['functionId'];
+        $functionId = $this->args['functionId'] ?? '';
        $functionExecution = $this->args['functionExecution'] ?? 0;
        $functionExecutionTime = $this->args['functionExecutionTime'] ?? 0;
        $functionStatus = $this->args['functionStatus'] ?? '';

-        $tags = ",project={$projectId},version=".App::getEnv('_APP_VERSION', 'UNKNOWN').'';
+        $tags = ",project={$projectId},version=".App::getEnv('_APP_VERSION', 'UNKNOWN');

        // the global namespace is prepended to every key (optional)
        $statsd->setNamespace('appwrite.usage');
@ -52,7 +53,6 @@ class UsageV1
        
        if($functionExecution >= 1) {
            $statsd->increment('executions.all'.$tags.',functionId='.$functionId.',functionStatus='.$functionStatus);
-            var_dump($tags.',functionId='.$functionId.',functionStatus='.$functionStatus);
            $statsd->count('executions.time'.$tags.',functionId='.$functionId, $functionExecutionTime);
        }

@ -65,8 +65,7 @@ class UsageV1
        }
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
-        // ... Remove environment for this job
    }
-}
+}
--- a/app/workers/webhooks.php
+++ b/app/workers/webhooks.php
@ -1,23 +1,23 @@
 <?php

+use Appwrite\Resque\Worker;
 use Utopia\App;
 use Utopia\CLI\Console;

 require_once __DIR__.'/../init.php';

 Console::title('Webhooks V1 Worker');
-
 Console::success(APP_NAME.' webhooks worker v1 has started');

-class WebhooksV1
+class WebhooksV1 extends Worker
 {
    public $args = [];

-    public function setUp(): void
+    public function init(): void
    {
    }

-    public function perform()
+    public function run(): void
    {
        $errors = [];

@ -88,8 +88,7 @@ class WebhooksV1
        }
    }

-    public function tearDown(): void
+    public function shutdown(): void
    {
-        // ... Remove environment for this job
    }
-}
+}
--- a/composer.json
+++ b/composer.json
@ -45,14 +45,14 @@
        "utopia-php/cache": "0.4.*",
        "utopia-php/cli": "0.11.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.2.*",
+        "utopia-php/database": "0.3.*",
        "utopia-php/locale": "0.3.*",
        "utopia-php/registry": "0.4.*",
        "utopia-php/preloader": "0.2.*",
        "utopia-php/domains": "1.1.*",
        "utopia-php/swoole": "0.2.*",
        "utopia-php/storage": "0.5.*",
-        "utopia-php/image": "0.2.*",
+        "utopia-php/image": "0.3.*",
        "resque/php-resque": "1.3.6",
        "matomo/device-detector": "4.2.2",
        "dragonmantank/cron-expression": "3.1.0",
@ -73,7 +73,7 @@
        }
    ],
    "require-dev": {
-        "appwrite/sdk-generator": "0.10.6",
+        "appwrite/sdk-generator": "0.10.11",
        "swoole/ide-helper": "4.6.6",
        "phpunit/phpunit": "9.5.4",
        "vimeo/psalm": "4.7.2"
--- a/composer.lock
+++ b/composer.lock
@ -1899,16 +1899,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "0.2.0",
+            "version": "0.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "b5dd144d582f3355c13f5430b1b3d7eb850bc5cd"
+                "reference": "6f8b7184ae4971672188607ea311a22a50da6767"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/b5dd144d582f3355c13f5430b1b3d7eb850bc5cd",
-                "reference": "b5dd144d582f3355c13f5430b1b3d7eb850bc5cd",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/6f8b7184ae4971672188607ea311a22a50da6767",
+                "reference": "6f8b7184ae4971672188607ea311a22a50da6767",
                "shasum": ""
            },
            "require": {
@ -1921,7 +1921,9 @@
                "utopia-php/framework": "0.*.*"
            },
            "require-dev": {
+                "fakerphp/faker": "^1.14",
                "phpunit/phpunit": "^9.4",
+                "utopia-php/cli": "^0.11.0",
                "vimeo/psalm": "4.0.1"
            },
            "type": "library",
@ -1954,9 +1956,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.2.0"
+                "source": "https://github.com/utopia-php/database/tree/0.3.1"
            },
-            "time": "2021-05-26T18:41:44+00:00"
+            "time": "2021-06-11T15:02:46+00:00"
        },
        {
            "name": "utopia-php/domains",
@ -2063,16 +2065,16 @@
        },
        {
            "name": "utopia-php/image",
-            "version": "0.2.1",
+            "version": "0.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/image.git",
-                "reference": "0754955a165483852184d1215cc3bf659432d23a"
+                "reference": "2044fdd44d87c4253cfe929cca975fd037461b00"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/image/zipball/0754955a165483852184d1215cc3bf659432d23a",
-                "reference": "0754955a165483852184d1215cc3bf659432d23a",
+                "url": "https://api.github.com/repos/utopia-php/image/zipball/2044fdd44d87c4253cfe929cca975fd037461b00",
+                "reference": "2044fdd44d87c4253cfe929cca975fd037461b00",
                "shasum": ""
            },
            "require": {
@ -2110,9 +2112,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/image/issues",
-                "source": "https://github.com/utopia-php/image/tree/0.2.1"
+                "source": "https://github.com/utopia-php/image/tree/0.3.2"
            },
-            "time": "2021-04-13T07:47:24+00:00"
+            "time": "2021-06-10T09:16:11+00:00"
        },
        {
            "name": "utopia-php/locale",
@ -2661,16 +2663,16 @@
        },
        {
            "name": "appwrite/sdk-generator",
-            "version": "0.10.6",
+            "version": "0.10.11",
            "source": {
                "type": "git",
                "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "ab4adb0b9126c617e11c8fdf4352c8aa9a715ecc"
+                "reference": "f73391d482660798f4077d54760d67e633bdde1e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/ab4adb0b9126c617e11c8fdf4352c8aa9a715ecc",
-                "reference": "ab4adb0b9126c617e11c8fdf4352c8aa9a715ecc",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/f73391d482660798f4077d54760d67e633bdde1e",
+                "reference": "f73391d482660798f4077d54760d67e633bdde1e",
                "shasum": ""
            },
            "require": {
@ -2704,9 +2706,9 @@
            "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
            "support": {
                "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/0.10.6"
+                "source": "https://github.com/appwrite/sdk-generator/tree/0.10.11"
            },
-            "time": "2021-05-24T14:32:40+00:00"
+            "time": "2021-06-07T11:37:50+00:00"
        },
        {
            "name": "composer/semver",
@ -2961,20 +2963,20 @@
        },
        {
            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.0",
+            "version": "v3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e"
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e",
-                "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e",
+                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
                "shasum": ""
            },
            "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0",
+                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
                "php": "^7.1 || ^8.0",
                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
            },
@ -3000,9 +3002,9 @@
            "description": "A more advanced JSONRPC implementation",
            "support": {
                "issues": "https://github.com/felixfbecker/php-advanced-json-rpc/issues",
-                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0"
+                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.1"
            },
-            "time": "2021-01-10T17:48:47+00:00"
+            "time": "2021-06-11T22:34:44+00:00"
        },
        {
            "name": "felixfbecker/language-server-protocol",
@ -3251,16 +3253,16 @@
        },
        {
            "name": "netresearch/jsonmapper",
-            "version": "v2.1.0",
+            "version": "v4.0.0",
            "source": {
                "type": "git",
                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e"
+                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e",
-                "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
+                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
                "shasum": ""
            },
            "require": {
@ -3268,10 +3270,10 @@
                "ext-pcre": "*",
                "ext-reflection": "*",
                "ext-spl": "*",
-                "php": ">=5.6"
+                "php": ">=7.1"
            },
            "require-dev": {
-                "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0",
+                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
                "squizlabs/php_codesniffer": "~3.5"
            },
            "type": "library",
@ -3296,9 +3298,9 @@
            "support": {
                "email": "cweiske@cweiske.de",
                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/master"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0"
            },
-            "time": "2020-04-16T18:48:43+00:00"
+            "time": "2020-12-01T19:48:11+00:00"
        },
        {
            "name": "nikic/php-parser",
@ -4720,16 +4722,16 @@
        },
        {
            "name": "sebastian/global-state",
-            "version": "5.0.2",
+            "version": "5.0.3",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455"
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455",
-                "reference": "a90ccbddffa067b51f574dea6eb25d5680839455",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/23bd5951f7ff26f12d4e3242864df3e08dec4e49",
+                "reference": "23bd5951f7ff26f12d4e3242864df3e08dec4e49",
                "shasum": ""
            },
            "require": {
@ -4772,7 +4774,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.3"
            },
            "funding": [
                {
@ -4780,7 +4782,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-10-26T15:55:19+00:00"
+            "time": "2021-06-11T13:31:12+00:00"
        },
        {
            "name": "sebastian/lines-of-code",
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -2,7 +2,6 @@
 # This is a development version of THE Appwrite docker-compose.yml file.
 # Avoid using this file in your production environment.
 # We're exposing here sensetive ports and mounting code volumes for rapid development and debugging of the server stack.
-# For a production ready compose file please use: https://appwrite.io/docker-compose.yml

 version: '3'

@ -431,10 +430,13 @@ services:
      - appwrite-influxdb:/var/lib/influxdb:rw

  telegraf:
-    image: appwrite/telegraf:1.1.0
+    image: appwrite/telegraf:1.2.0
    container_name: appwrite-telegraf
    networks:
      - appwrite
+    environment: 
+      - _APP_INFLUXDB_HOST
+      - _APP_INFLUXDB_PORT

  # Dev Tools Start ------------------------------------------------------------------------------------------
  # 
--- a/docs/examples/0.8.x/server-python/examples/account/create-recovery.md
+++ b/docs/examples/0.8.x/server-python/examples/account/create-recovery.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/create-verification.md
+++ b/docs/examples/0.8.x/server-python/examples/account/create-verification.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/delete-session.md
+++ b/docs/examples/0.8.x/server-python/examples/account/delete-session.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/delete-sessions.md
+++ b/docs/examples/0.8.x/server-python/examples/account/delete-sessions.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/delete.md
+++ b/docs/examples/0.8.x/server-python/examples/account/delete.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/get-logs.md
+++ b/docs/examples/0.8.x/server-python/examples/account/get-logs.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/get-prefs.md
+++ b/docs/examples/0.8.x/server-python/examples/account/get-prefs.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/get-sessions.md
+++ b/docs/examples/0.8.x/server-python/examples/account/get-sessions.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/get.md
+++ b/docs/examples/0.8.x/server-python/examples/account/get.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/update-email.md
+++ b/docs/examples/0.8.x/server-python/examples/account/update-email.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/update-name.md
+++ b/docs/examples/0.8.x/server-python/examples/account/update-name.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/update-password.md
+++ b/docs/examples/0.8.x/server-python/examples/account/update-password.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/update-prefs.md
+++ b/docs/examples/0.8.x/server-python/examples/account/update-prefs.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/update-recovery.md
+++ b/docs/examples/0.8.x/server-python/examples/account/update-recovery.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/account/update-verification.md
+++ b/docs/examples/0.8.x/server-python/examples/account/update-verification.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 account = Account(client)
--- a/docs/examples/0.8.x/server-python/examples/avatars/get-q-r.md
+++ b/docs/examples/0.8.x/server-python/examples/avatars/get-q-r.md
@ -11,4 +11,4 @@ client = Client()

 avatars = Avatars(client)

-result = avatars.get_q_r('[TEXT]')
+result = avatars.get_qr('[TEXT]')
--- a/docs/examples/0.8.x/server-python/examples/health/get-d-b.md
+++ b/docs/examples/0.8.x/server-python/examples/health/get-d-b.md
@ -11,4 +11,4 @@ client = Client()

 health = Health(client)

-result = health.get_d_b()
+result = health.get_db()
--- a/docs/examples/0.8.x/server-python/examples/locale/get-countries-e-u.md
+++ b/docs/examples/0.8.x/server-python/examples/locale/get-countries-e-u.md
@ -11,4 +11,4 @@ client = Client()

 locale = Locale(client)

-result = locale.get_countries_e_u()
+result = locale.get_countries_eu()
--- a/docs/examples/0.8.x/server-python/examples/teams/update-membership-status.md
+++ b/docs/examples/0.8.x/server-python/examples/teams/update-membership-status.md
@ -6,7 +6,7 @@ client = Client()
 (client
  .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
  .set_project('5df5acd0d48c2') # Your project ID
-  .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+  .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 )

 teams = Teams(client)
--- a/docs/examples/0.8.x/server-ruby/examples/account/create-recovery.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/create-recovery.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/create-verification.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/create-verification.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/delete-session.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/delete-session.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/delete-sessions.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/delete-sessions.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/delete.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/delete.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/get-logs.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/get-logs.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/get-prefs.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/get-prefs.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/get-sessions.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/get-sessions.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/get.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/get.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/update-email.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/update-email.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/update-name.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/update-name.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/update-password.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/update-password.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/update-prefs.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/update-prefs.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/update-recovery.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/update-recovery.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/account/update-verification.md
+++ b/docs/examples/0.8.x/server-ruby/examples/account/update-verification.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 account = Appwrite::Account.new(client);
--- a/docs/examples/0.8.x/server-ruby/examples/avatars/get-q-r.md
+++ b/docs/examples/0.8.x/server-ruby/examples/avatars/get-q-r.md
@ -10,6 +10,6 @@ client

 avatars = Appwrite::Avatars.new(client);

-response = avatars.get_q_r(text: '[TEXT]');
+response = avatars.get_qr(text: '[TEXT]');

 puts response
--- a/docs/examples/0.8.x/server-ruby/examples/health/get-d-b.md
+++ b/docs/examples/0.8.x/server-ruby/examples/health/get-d-b.md
@ -10,6 +10,6 @@ client

 health = Appwrite::Health.new(client);

-response = health.get_d_b();
+response = health.get_db();

 puts response
--- a/docs/examples/0.8.x/server-ruby/examples/locale/get-countries-e-u.md
+++ b/docs/examples/0.8.x/server-ruby/examples/locale/get-countries-e-u.md
@ -10,6 +10,6 @@ client

 locale = Appwrite::Locale.new(client);

-response = locale.get_countries_e_u();
+response = locale.get_countries_eu();

 puts response
--- a/docs/examples/0.8.x/server-ruby/examples/teams/update-membership-status.md
+++ b/docs/examples/0.8.x/server-ruby/examples/teams/update-membership-status.md
@ -5,7 +5,7 @@ client = Appwrite::Client.new()
 client
    .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
    .set_project('5df5acd0d48c2') # Your project ID
-    .set_j_w_t('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
+    .set_jwt('eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ...') # Your secret JSON Web Token
 ;

 teams = Appwrite::Teams.new(client);
--- a/docs/references/account/create-jwt.md
+++ b/docs/references/account/create-jwt.md
@ -1 +1 @@
-Use this endpoint to create a JSON Web Token. You can use the resulting JWT to authenticate on behalf of the current user when working with the Appwrite server-side API and SDKs. The JWT secret is valid for 15 minutes from its creation and will be invalid if the user will logout.
+Use this endpoint to create a JSON Web Token. You can use the resulting JWT to authenticate on behalf of the current user when working with the Appwrite server-side API and SDKs. The JWT secret is valid for 15 minutes from its creation and will be invalid if the user will logout in that time frame.
--- a/docs/sdks/android/CHANGELOG.md
+++ b/docs/sdks/android/CHANGELOG.md
@ -0,0 +1 @@
+# Change Log
--- a/docs/sdks/android/GETTING_STARTED.md
+++ b/docs/sdks/android/GETTING_STARTED.md
@ -0,0 +1,94 @@
+## Getting Started
+
+### Add your Android Platform
+To initialize your SDK and start interacting with Appwrite services, you need to add a new Android platform to your project. To add a new platform, go to your Appwrite console, select your project (create one if you haven't already), and click the 'Add Platform' button on the project Dashboard.
+
+From the options, choose to add a new **Android** platform and add your app credentials.
+
+Add your app <u>name</u> and <u>package name</u>. Your package name is generally the applicationId in your app-level `build.gradle` file. By registering a new platform, you are allowing your app to communicate with the Appwrite API.
+
+### Registering additional activities
+In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-android/blob/master/app/src/main/AndroidManifest.xml). Be sure to replace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in your project settings screen in the console.
+
+```xml
+<manifest>
+    <application>
+        <activity android:name="io.appwrite.views.CallbackActivity" >
+            <intent-filter android:label="android_web_auth">
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="appwrite-callback-[PROJECT_ID]" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
+```
+
+### Init your SDK
+
+<p>Initialize your SDK with your Appwrite server API endpoint and project ID, which can be found in your project settings page.
+
+```kotlin
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+val client = Client(context)
+  .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+  .setProject("5df5acd0d48c2") // Your project ID
+  .setSelfSigned(true) // Remove in production
+```
+
+Before starting to send any API calls to your new Appwrite instance, make sure your Android emulators has network access to the Appwrite server hostname or IP address.
+
+When trying to connect to Appwrite from an emulator or a mobile device, localhost is the hostname of the device or emulator and not your local Appwrite instance. You should replace localhost with your private IP. You can also use a service like [ngrok](https://ngrok.com/) to proxy the Appwrite API.
+
+### Make Your First Request
+
+<p>Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.
+
+```kotlin
+// Register User
+val account = Account(client)
+val response = account.create(
+    "email@example.com", 
+    "password"
+)
+```
+
+### Full Example
+
+```kotlin
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+val client = Client(context)
+  .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+  .setProject("5df5acd0d48c2") // Your project ID
+  .setSelfSigned(true) // Remove in production
+
+val account = Account(client)
+val response = account.create(
+    "email@example.com", 
+    "password"
+)
+```
+
+### Error Handling
+The Appwrite Android SDK raises an `AppwriteException` object with `message`, `code` and `response` properties. You can handle any errors by catching `AppwriteException` and present the `message` to the user or handle it yourself based on the provided error information. Below is an example.
+
+```kotlin
+try {
+    var response = account.create("email@example.com", "password")
+    Log.d("Appwrite response", response.body?.string())
+} catch(e : AppwriteException) {
+    Log.e("AppwriteException",e.message.toString())
+}
+```
+
+### Learn more
+You can use following resources to learn more and get help
+- 🚀 [Getting Started Tutorial](https://appwrite.io/docs/getting-started-for-android)
+- 📜 [Appwrite Docs](https://appwrite.io/docs)
+- 💬 [Discord Community](https://appwrite.io/discord)
+- 🚂 [Appwrite Android Playground](https://github.com/appwrite/playground-for-android)
--- a/docs/sdks/dart/CHANGELOG.md
+++ b/docs/sdks/dart/CHANGELOG.md
@ -1,3 +1,7 @@
+## 0.6.2
+
+- Removed default values, nothing should change in usage as default values are already allocated in server
+
 ## 0.6.1

 - Fix for image preview param types
--- a/docs/sdks/dart/EXAMPLES.md
+++ b/docs/sdks/dart/EXAMPLES.md
@ -44,7 +44,7 @@ MultipartFile file = MultipartFile.fromFile('./path-to-file/image.jpg', filename

 storage.createFile(
    file: file,
-    read: ['*'],
+    read: ['role:all'],
    write: []
 )
 .then((response) {
--- a/docs/sdks/deno/GETTING_STARTED.md
+++ b/docs/sdks/deno/GETTING_STARTED.md
@ -1,7 +1,7 @@
 ## Getting Started

 ### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.

 ```typescript
 let client = new sdk.Client();
@ -17,7 +17,7 @@ client

 ### Make your first request

-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```typescript
 let users = new sdk.Users(client);
--- a/docs/sdks/flutter-dev/EXAMPLES.md
+++ b/docs/sdks/flutter-dev/EXAMPLES.md
@ -41,7 +41,7 @@ MultipartFile file = MultipartFile.fromFile('./path-to-file/image.jpg', filename

 storage.createFile(
    file: file,
-    read: ['*'],
+    read: ['role:all'],
    write: []
 )
 .then((response) {
--- a/docs/sdks/flutter/CHANGELOG.md
+++ b/docs/sdks/flutter/CHANGELOG.md
@ -1,3 +1,7 @@
+## 0.6.3
+
+- Removed default values, nothing should change in usage as default values are already allocated in server
+
 ## 0.6.2

 - Fixed deployment bug
--- a/docs/sdks/flutter/EXAMPLES.md
+++ b/docs/sdks/flutter/EXAMPLES.md
@ -41,7 +41,7 @@ MultipartFile file = MultipartFile.fromFile('./path-to-file/image.jpg', filename

 storage.createFile(
    file: file,
-    read: ['*'],
+    read: ['role:all'],
    write: []
 )
 .then((response) {
--- a/docs/sdks/flutter/GETTING_STARTED.md
+++ b/docs/sdks/flutter/GETTING_STARTED.md
@ -23,7 +23,7 @@ The Appwrite SDK uses ASWebAuthenticationSession on iOS 12+ and SFAuthentication
 4. In Deployment Info, 'Target' select iOS 11.0

 ### Android
-In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to relpace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in you project settings screen in your Appwrite console.
+In order to capture the Appwrite OAuth callback url, the following activity needs to be added to your [AndroidManifest.xml](https://github.com/appwrite/playground-for-flutter/blob/master/android/app/src/main/AndroidManifest.xml). Be sure to replace the **[PROJECT_ID]** string with your actual Appwrite project ID. You can find your Appwrite project ID in your project settings screen in the console.

 ```xml
 <manifest>
@ -48,7 +48,7 @@ While running Flutter Web, make sure your Appwrite server and your Flutter clien

 ### Init your SDK

-<p>Initialize your SDK code with your project ID, which can be found in your project settings page.
+<p>Initialize your SDK with your Appwrite server API endpoint and project ID, which can be found in your project settings page.

 ```dart
 import 'package:appwrite/appwrite.dart';
@ -68,7 +68,7 @@ When trying to connect to Appwrite from an emulator or a mobile device, localhos

 ### Make Your First Request

-<p>Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+<p>Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```dart
 // Register User
--- a/docs/sdks/nodejs/GETTING_STARTED.md
+++ b/docs/sdks/nodejs/GETTING_STARTED.md
@ -1,7 +1,7 @@
 ## Getting Started

 ### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key project API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key project API keys section.

 ```js
 const sdk = require('node-appwrite');
@ -17,7 +17,7 @@ client
 ```

 ### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```js
 let users = new sdk.Users(client);
--- a/docs/sdks/php/GETTING_STARTED.md
+++ b/docs/sdks/php/GETTING_STARTED.md
@ -1,7 +1,7 @@
 ## Getting Started

 ### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.

 ```php
 $client = new Client();
@ -15,7 +15,7 @@ $client
 ```

 ### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```php
 $users = new Users($client);
--- a/docs/sdks/python/GETTING_STARTED.md
+++ b/docs/sdks/python/GETTING_STARTED.md
@ -1,7 +1,7 @@
 ## Getting Started

 ### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.

 ```python
 from appwrite.client import Client
@ -18,7 +18,7 @@ client = Client()
 ```

 ### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```python
 users = Users(client)
--- a/docs/sdks/ruby/GETTING_STARTED.md
+++ b/docs/sdks/ruby/GETTING_STARTED.md
@ -1,7 +1,7 @@
 ## Getting Started

 ### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page and your new API secret Key from project's API keys section.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page and your new API secret Key from project's API keys section.

 ```ruby
 require 'appwrite'
@ -17,7 +17,7 @@ client
 ```

 ### Make Your First Request
-Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, create any of the Appwrite service objects and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```ruby
 users = Appwrite::Users.new(client);
--- a/docs/sdks/web/GETTING_STARTED.md
+++ b/docs/sdks/web/GETTING_STARTED.md
@ -6,7 +6,7 @@ For you to init your SDK and interact with Appwrite services you need to add a w
 From the options, choose to add a **Web** platform and add your client app hostname. By adding your hostname to your project platform you are allowing cross-domain communication between your project and the Appwrite API.

 ### Init your SDK
-Initialize your SDK code with your project ID which can be found in your project settings page.
+Initialize your SDK with your Appwrite server API endpoint and project ID which can be found in your project settings page.

 ```js
 // Init your Web SDK
@ -19,7 +19,7 @@ sdk
 ```

 ### Make Your First Request
-Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the API References section.
+Once your SDK object is set, access any of the Appwrite services and choose any request to send. Full documentation for any service method you would like to use can be found in your SDK documentation or in the [API References](https://appwrite.io/docs) section.

 ```js
 // Register User
--- a/public/images/clients/ios.png
+++ b/public/images/clients/ios.png
--- a/public/images/clients/linux.png
+++ b/public/images/clients/linux.png
--- a/public/images/clients/macos.png
+++ b/public/images/clients/macos.png
--- a/public/images/clients/windows.png
+++ b/public/images/clients/windows.png
--- a/public/images/logo.png
+++ b/public/images/logo.png
--- a/src/Appwrite/Auth/Auth.php
+++ b/src/Appwrite/Auth/Auth.php
@ -16,6 +16,7 @@ class Auth
    /**
     * User Roles.
     */
+    const USER_ROLE_ALL = 'all';
    const USER_ROLE_GUEST = 'guest';
    const USER_ROLE_MEMBER = 'member';
    const USER_ROLE_ADMIN = 'admin';
@ -23,7 +24,6 @@ class Auth
    const USER_ROLE_OWNER = 'owner';
    const USER_ROLE_APP = 'app';
    const USER_ROLE_SYSTEM = 'system';
-    const USER_ROLE_ALL = '*';

    /**
     * Token Types.
--- a/src/Appwrite/Database/Validator/Authorization.php
+++ b/src/Appwrite/Database/Validator/Authorization.php
@ -10,7 +10,7 @@ class Authorization extends Validator
    /**
     * @var array
     */
-    static $roles = ['*' => true];
+    static $roles = ['role:all' => true];

    /**
     * @var Document
--- a/src/Appwrite/Extend/PDO.php
+++ b/src/Appwrite/Extend/PDO.php
@ -77,6 +77,7 @@ class PDO extends PDONative
            $result = $this->pdo->rollBack();
        } catch (\Throwable $th) {
            $this->pdo = $this->reconnect();
+            return false;
        }

        return $result;
--- a/src/Appwrite/Network/Validator/Origin.php
+++ b/src/Appwrite/Network/Validator/Origin.php
@ -13,6 +13,9 @@ class Origin extends Validator
    const CLIENT_TYPE_FLUTTER_MACOS = 'flutter-macos';
    const CLIENT_TYPE_FLUTTER_WINDOWS = 'flutter-windows';
    const CLIENT_TYPE_FLUTTER_LINUX = 'flutter-linux';
+    const CLIENT_TYPE_ANDROID = 'android';
+    const CLIENT_TYPE_IOS = 'ios';
+
    
    const SCHEME_TYPE_HTTP = 'http';
    const SCHEME_TYPE_HTTPS = 'https';
@ -69,6 +72,8 @@ class Origin extends Validator
                case self::CLIENT_TYPE_FLUTTER_MACOS:
                case self::CLIENT_TYPE_FLUTTER_WINDOWS:
                case self::CLIENT_TYPE_FLUTTER_LINUX:
+                case self::CLIENT_TYPE_ANDROID:
+                case self::CLIENT_TYPE_IOS: 
                    $this->clients[] = (isset($platform['key'])) ? $platform['key'] : '';
                    break;
                
@ -90,7 +95,7 @@ class Origin extends Validator
    }

    /**
-     * Check if Origin has been whiltlisted
+     * Check if Origin has been allowed
     *  for access to the API
     *
     * @param mixed $origin
--- a/src/Appwrite/Resque/Worker.php
+++ b/src/Appwrite/Resque/Worker.php
@ -0,0 +1,29 @@
+<?php
+
+namespace Appwrite\Resque;
+
+abstract class Worker
+{
+    public $args = [];
+
+    abstract public function init(): void;
+
+    abstract public function run(): void;
+
+    abstract public function shutdown(): void;
+
+    public function setUp(): void
+    {
+        $this->init();
+    }
+
+    public function perform()
+    {
+        $this->run();
+    }
+
+    public function tearDown(): void
+    {
+        $this->shutdown();
+    }
+}
--- a/src/Appwrite/Specification/Format.php
+++ b/src/Appwrite/Specification/Format.php
@ -62,6 +62,7 @@ abstract class Format
     * @param Route[] $routes
     * @param Model[] $models
     * @param array $keys
+     * @param int $authCount
     */
    public function __construct(App $app, array $services, array $routes, array $models, array $keys, int $authCount)
    {
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@ -4,7 +4,6 @@ namespace Appwrite\Specification\Format;

 use Appwrite\Specification\Format;
 use Appwrite\Template\Template;
-use Appwrite\Utopia\Response\Model;
 use stdClass;
 use Utopia\Validator;

@ -188,7 +187,7 @@ class Swagger2 extends Format
                ];
            }

-            if($route->getLabel('sdk.response.code', 500) === 204) {
+            if(in_array($route->getLabel('sdk.response.code', 500), [204, 301, 302, 308], true)) {
                $temp['responses'][(string)$route->getLabel('sdk.response.code', '500')]['description'] = 'No content';
                unset($temp['responses'][(string)$route->getLabel('sdk.response.code', '500')]['schema']);
            }
@ -218,7 +217,7 @@ class Swagger2 extends Format
            $bodyRequired = [];

            foreach ($route->getParams() as $name => $param) { // Set params
-                $validator = (\is_callable($param['validator'])) ? call_user_func_array($param['validator'], $this->app->getResources($param['injections'])) : $param['validator']; /* @var $validator \Utopia\Validator */
+                $validator = (\is_callable($param['validator'])) ? call_user_func_array($param['validator'], $this->app->getResources($param['injections'])) : $param['validator']; /** @var \Utopia\Validator $validator */

                $node = [
                    'name' => $name,
@ -279,6 +278,7 @@ class Swagger2 extends Format
                        $node['x-example'] = $validator->getMin();
                        break;
                    case 'Utopia\Validator\Numeric':
+                    case 'Utopia\Validator\Integer':
                        $node['type'] = $validator->getType();
                        $node['format'] = 'int32';
                        break;
@ -355,13 +355,16 @@ class Swagger2 extends Format
        }
        foreach ($this->models as $model) {
            foreach ($model->getRules() as $rule) {
-                if (!in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])) {
+                if (
+                    in_array($model->getType(), $usedModels)
+                    && !in_array($rule['type'], ['string', 'integer', 'boolean', 'json', 'float'])
+                ) {
                    $usedModels[] = $rule['type'];
                }
            }
        }
        foreach ($this->models as $model) {
-            if (!in_array($model->getType(), $usedModels) && $model->getType() !== 'error') {
+            if (!in_array($model->getType(), $usedModels)) {
                continue;
            }

--- a/Show more
+++ b/Show more