Revert "Merge branch 'master' into feat-1297-add-expire-date-to-urls"

This reverts commit 9472867c66, reversing changes made to 7e8d76b66d.
2024-05-19 04:02:34 +12:00 · 2021-07-02 11:39:41 +01:00 · 2021-07-02 11:39:41 +01:00 · da9860c7c4
parent 9472867c66
commit da9860c7c4
21 changed files with 3497 additions and 2415 deletions
--- a/CHANGES.md
+++ b/CHANGES.md
@ -13,7 +13,7 @@
  - _APP_INFLUXDB_HOST
  - _APP_INFLUXDB_PORT
 - Added `expires` parameter to Account Recovery and Email Validation URL's
- Upgraded phpmailer version to 6.5.0 (#1317)
+
 ## Bugs

 - Fixed bug when removing a project member on the Appwrite console (#1214)
--- a/8
+++ b/8
@ -16,7 +16,7 @@ FROM php:8.0-cli-alpine as step1

 ENV PHP_REDIS_VERSION=5.3.4 \
    PHP_SWOOLE_VERSION=v4.6.6 \
-    PHP_IMAGICK_VERSION=3.5.0 \
+    PHP_IMAGICK_VERSION=master \
    PHP_YAML_VERSION=2.2.1 \
    PHP_MAXMINDDB_VERSION=v1.10.1

@ -53,8 +53,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 && \
@ -150,12 +152,10 @@ RUN \
  brotli-dev \
  yaml-dev \
  imagemagick \
-  imagemagick-dev \
  libmaxminddb-dev \
  certbot \
  docker-cli \
  docker-compose \
-  libgomp \
  && docker-php-ext-install sockets opcache pdo_mysql \
  && apk del .deps \
  && rm -rf /var/cache/apk/*
--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -67,7 +67,7 @@ return [
                'introduction' => '',
                'default' => 'localhost',
                'required' => true,
-                'question' => 'Enter a DNS A record hostname to serve as a CNAME for your custom domains.' . PHP_EOL . 'You can use the same value as used for the Appwrite hostname.',
+                'question' => 'Enter a DNS A record hostname to serve as a CNAME for your custom domains.\nYou can use the same value as used for the Appwrite hostname.',
                'filter' => ''
            ],
            [
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@ -22,6 +22,7 @@ use Utopia\Image\Image;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Utopia\Response;
 use Utopia\Config\Config;
+use Utopia\Validator\Numeric;

 App::post('/v1/storage/files')
    ->desc('Create File')
@ -241,7 +242,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::getGravityTypes()), 'Image crop gravity. Can be one of ' . implode(",", Image::getGravityTypes()), 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)
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@ -7,7 +7,7 @@ use Appwrite\Network\Validator\Host;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Validator\ArrayList;
-use Utopia\Validator\Numeric;
+use Utopia\Validator\Integer;
 use Utopia\Validator\Text;
 use Utopia\Storage\Validator\File;

@ -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')
--- a/app/workers/functions.php
+++ b/app/workers/functions.php
@ -536,7 +536,7 @@ class FunctionsV1 extends Worker
        if(\count($list) > $max) {
            Console::info('Starting containers cleanup');

-            \uasort($list, function ($item1, $item2) {
+            \usort($list, function ($item1, $item2) {
                return (int)($item1['appwrite-created'] ?? 0) <=> (int)($item2['appwrite-created'] ?? 0);
            });

--- a/bin/schedule
+++ b/bin/schedule
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=1 REDIS_BACKEND=$REDIS_BACKEND RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler
+REDIS_BACKEND=$REDIS_BACKEND RESQUE_PHP='/usr/src/code/vendor/autoload.php' php /usr/src/code/vendor/bin/resque-scheduler
--- a/bin/worker-audits
+++ b/bin/worker-audits
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=1 QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-audits' APP_INCLUDE='/usr/src/code/app/workers/audits.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-certificates
+++ b/bin/worker-certificates
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=1 QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-certificates' APP_INCLUDE='/usr/src/code/app/workers/certificates.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-deletes
+++ b/bin/worker-deletes
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=1 QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-deletes' APP_INCLUDE='/usr/src/code/app/workers/deletes.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-functions
+++ b/bin/worker-functions
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=0.1 QUEUE='v1-functions' APP_INCLUDE='/usr/src/code/app/workers/functions.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-functions' APP_INCLUDE='/usr/src/code/app/workers/functions.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-mails
+++ b/bin/worker-mails
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=1 QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-mails' APP_INCLUDE='/usr/src/code/app/workers/mails.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-tasks
+++ b/bin/worker-tasks
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=0.1 QUEUE='v1-tasks' APP_INCLUDE='/usr/src/code/app/workers/tasks.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-tasks' APP_INCLUDE='/usr/src/code/app/workers/tasks.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-usage
+++ b/bin/worker-usage
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=1 QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-usage' APP_INCLUDE='/usr/src/code/app/workers/usage.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/bin/worker-webhooks
+++ b/bin/worker-webhooks
@ -7,4 +7,4 @@ else
    REDIS_BACKEND="redis://${_APP_REDIS_USER}:${_APP_REDIS_PASS}@${_APP_REDIS_HOST}:${_APP_REDIS_PORT}"
 fi

-INTERVAL=0.1 QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
+QUEUE='v1-webhooks' APP_INCLUDE='/usr/src/code/app/workers/webhooks.php' php /usr/src/code/vendor/bin/resque -dopcache.preload=opcache.preload=/usr/src/code/app/preload.php
--- a/composer.json
+++ b/composer.json
@ -51,12 +51,12 @@
        "utopia-php/domains": "1.1.*",
        "utopia-php/swoole": "0.2.*",
        "utopia-php/storage": "0.5.*",
-        "utopia-php/image": "0.5.*",
+        "utopia-php/image": "0.3.*",
        "resque/php-resque": "1.3.6",
        "matomo/device-detector": "4.2.2",
        "dragonmantank/cron-expression": "3.1.0",
        "influxdb/influxdb-php": "1.15.2",
-        "phpmailer/phpmailer": "6.5.0",
+        "phpmailer/phpmailer": "6.4.1",
        "chillerlan/php-qrcode": "4.3.0",
        "adhocore/jwt": "1.1.2",
        "slickdeals/statsd": "3.0.2"
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "a03cb89925d6bda5ad4248699f732a6a",
+    "content-hash": "399d2426ca92e04b6d6fb84a91c316c3",
    "packages": [
        {
            "name": "adhocore/jwt",
@ -834,16 +834,16 @@
        },
        {
            "name": "phpmailer/phpmailer",
-            "version": "v6.5.0",
+            "version": "v6.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c"
+                "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/a5b5c43e50b7fba655f793ad27303cd74c57363c",
-                "reference": "a5b5c43e50b7fba655f793ad27303cd74c57363c",
+                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/9256f12d8fb0cd0500f93b19e18c356906cbed3d",
+                "reference": "9256f12d8fb0cd0500f93b19e18c356906cbed3d",
                "shasum": ""
            },
            "require": {
@ -898,7 +898,7 @@
            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
            "support": {
                "issues": "https://github.com/PHPMailer/PHPMailer/issues",
-                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.5.0"
+                "source": "https://github.com/PHPMailer/PHPMailer/tree/v6.4.1"
            },
            "funding": [
                {
@ -906,7 +906,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-06-16T14:33:43+00:00"
+            "time": "2021-04-29T12:25:04+00:00"
        },
        {
            "name": "psr/http-client",
@ -1324,16 +1324,16 @@
        },
        {
            "name": "utopia-php/abuse",
-            "version": "0.4.2",
+            "version": "0.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "286b52209818e5033573e6441d65adbc48a6f715"
+                "reference": "8b7973aae4b02489bd22ffea45b985608f13b6d9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/286b52209818e5033573e6441d65adbc48a6f715",
-                "reference": "286b52209818e5033573e6441d65adbc48a6f715",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/8b7973aae4b02489bd22ffea45b985608f13b6d9",
+                "reference": "8b7973aae4b02489bd22ffea45b985608f13b6d9",
                "shasum": ""
            },
            "require": {
@ -1370,9 +1370,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/0.4.2"
+                "source": "https://github.com/utopia-php/abuse/tree/0.4.1"
            },
-            "time": "2021-06-23T15:04:44+00:00"
+            "time": "2021-06-05T14:31:33+00:00"
        },
        {
            "name": "utopia-php/analytics",
@ -1431,21 +1431,21 @@
        },
        {
            "name": "utopia-php/audit",
-            "version": "0.5.2",
+            "version": "0.5.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/audit.git",
-                "reference": "57e4f8f932164bdfd48ec32bf8d7d3f1bf7518e4"
+                "reference": "154a850170a58667a15e4b65fbabb6cd0b709dd9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/57e4f8f932164bdfd48ec32bf8d7d3f1bf7518e4",
-                "reference": "57e4f8f932164bdfd48ec32bf8d7d3f1bf7518e4",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/154a850170a58667a15e4b65fbabb6cd0b709dd9",
+                "reference": "154a850170a58667a15e4b65fbabb6cd0b709dd9",
                "shasum": ""
            },
            "require": {
                "ext-pdo": "*",
-                "php": ">=7.4"
+                "php": ">=7.1"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.3",
@ -1477,9 +1477,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/0.5.2"
+                "source": "https://github.com/utopia-php/audit/tree/0.5.1"
            },
-            "time": "2021-06-23T16:02:40+00:00"
+            "time": "2020-12-21T17:28:53+00:00"
        },
        {
            "name": "utopia-php/cache",
@ -1742,16 +1742,16 @@
        },
        {
            "name": "utopia-php/image",
-            "version": "0.5.0",
+            "version": "0.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/image.git",
-                "reference": "5b4ac25e70a95fa10b39c129b742ac66748d40b8"
+                "reference": "2044fdd44d87c4253cfe929cca975fd037461b00"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/image/zipball/5b4ac25e70a95fa10b39c129b742ac66748d40b8",
-                "reference": "5b4ac25e70a95fa10b39c129b742ac66748d40b8",
+                "url": "https://api.github.com/repos/utopia-php/image/zipball/2044fdd44d87c4253cfe929cca975fd037461b00",
+                "reference": "2044fdd44d87c4253cfe929cca975fd037461b00",
                "shasum": ""
            },
            "require": {
@ -1789,9 +1789,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/image/issues",
-                "source": "https://github.com/utopia-php/image/tree/0.5.0"
+                "source": "https://github.com/utopia-php/image/tree/0.3.2"
            },
-            "time": "2021-06-25T03:40:03+00:00"
+            "time": "2021-06-10T09:16:11+00:00"
        },
        {
            "name": "utopia-php/locale",
@ -2003,16 +2003,16 @@
        },
        {
            "name": "utopia-php/swoole",
-            "version": "0.2.4",
+            "version": "0.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/swoole.git",
-                "reference": "37d8c64b536d6bc7da4f0f5a934a0ec44885abf4"
+                "reference": "45c42aae7e7d3f9f82bf194c2cfa5499b674aefe"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/37d8c64b536d6bc7da4f0f5a934a0ec44885abf4",
-                "reference": "37d8c64b536d6bc7da4f0f5a934a0ec44885abf4",
+                "url": "https://api.github.com/repos/utopia-php/swoole/zipball/45c42aae7e7d3f9f82bf194c2cfa5499b674aefe",
+                "reference": "45c42aae7e7d3f9f82bf194c2cfa5499b674aefe",
                "shasum": ""
            },
            "require": {
@ -2053,9 +2053,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/swoole/issues",
-                "source": "https://github.com/utopia-php/swoole/tree/0.2.4"
+                "source": "https://github.com/utopia-php/swoole/tree/0.2.3"
            },
-            "time": "2021-06-22T10:49:24+00:00"
+            "time": "2021-03-22T22:39:24+00:00"
        },
        {
            "name": "utopia-php/system",
@ -2713,20 +2713,20 @@
        },
        {
            "name": "felixfbecker/advanced-json-rpc",
-            "version": "v3.2.1",
+            "version": "v3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/felixfbecker/php-advanced-json-rpc.git",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447"
+                "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/b5f37dbff9a8ad360ca341f3240dc1c168b45447",
-                "reference": "b5f37dbff9a8ad360ca341f3240dc1c168b45447",
+                "url": "https://api.github.com/repos/felixfbecker/php-advanced-json-rpc/zipball/06f0b06043c7438959dbdeed8bb3f699a19be22e",
+                "reference": "06f0b06043c7438959dbdeed8bb3f699a19be22e",
                "shasum": ""
            },
            "require": {
-                "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
+                "netresearch/jsonmapper": "^1.0 || ^2.0",
                "php": "^7.1 || ^8.0",
                "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0"
            },
@ -2752,9 +2752,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.1"
+                "source": "https://github.com/felixfbecker/php-advanced-json-rpc/tree/v3.2.0"
            },
-            "time": "2021-06-11T22:34:44+00:00"
+            "time": "2021-01-10T17:48:47+00:00"
        },
        {
            "name": "felixfbecker/language-server-protocol",
@ -3003,16 +3003,16 @@
        },
        {
            "name": "netresearch/jsonmapper",
-            "version": "v4.0.0",
+            "version": "v2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d"
+                "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
-                "reference": "8bbc021a8edb2e4a7ea2f8ad4fa9ec9dce2fcb8d",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/e0f1e33a71587aca81be5cffbb9746510e1fe04e",
+                "reference": "e0f1e33a71587aca81be5cffbb9746510e1fe04e",
                "shasum": ""
            },
            "require": {
@ -3020,10 +3020,10 @@
                "ext-pcre": "*",
                "ext-reflection": "*",
                "ext-spl": "*",
-                "php": ">=7.1"
+                "php": ">=5.6"
            },
            "require-dev": {
-                "phpunit/phpunit": "~7.5 || ~8.0 || ~9.0",
+                "phpunit/phpunit": "~4.8.35 || ~5.7 || ~6.4 || ~7.0",
                "squizlabs/php_codesniffer": "~3.5"
            },
            "type": "library",
@ -3048,9 +3048,9 @@
            "support": {
                "email": "cweiske@cweiske.de",
                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.0.0"
+                "source": "https://github.com/cweiske/jsonmapper/tree/master"
            },
-            "time": "2020-12-01T19:48:11+00:00"
+            "time": "2020-04-16T18:48:43+00:00"
        },
        {
            "name": "nikic/php-parser",
@ -4823,16 +4823,16 @@
        },
        {
            "name": "sebastian/type",
-            "version": "2.3.4",
+            "version": "2.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914"
+                "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b8cd8a1c753c90bc1a0f5372170e3e489136f914",
-                "reference": "b8cd8a1c753c90bc1a0f5372170e3e489136f914",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/0d1c587401514d17e8f9258a27e23527cb1b06c1",
+                "reference": "0d1c587401514d17e8f9258a27e23527cb1b06c1",
                "shasum": ""
            },
            "require": {
@ -4867,7 +4867,7 @@
            "homepage": "https://github.com/sebastianbergmann/type",
            "support": {
                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/2.3.4"
+                "source": "https://github.com/sebastianbergmann/type/tree/2.3.2"
            },
            "funding": [
                {
@ -4875,7 +4875,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-06-15T12:49:02+00:00"
+            "time": "2021-06-04T13:02:07+00:00"
        },
        {
            "name": "sebastian/version",
@ -4984,16 +4984,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v5.3.2",
+            "version": "v5.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1"
+                "reference": "058553870f7809087fa80fa734704a21b9bcaeb2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/649730483885ff2ca99ca0560ef0e5f6b03f2ac1",
-                "reference": "649730483885ff2ca99ca0560ef0e5f6b03f2ac1",
+                "url": "https://api.github.com/repos/symfony/console/zipball/058553870f7809087fa80fa734704a21b9bcaeb2",
+                "reference": "058553870f7809087fa80fa734704a21b9bcaeb2",
                "shasum": ""
            },
            "require": {
@ -5062,7 +5062,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v5.3.2"
+                "source": "https://github.com/symfony/console/tree/v5.3.0"
            },
            "funding": [
                {
@ -5078,7 +5078,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-06-12T09:42:48+00:00"
+            "time": "2021-05-26T17:43:10+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@ -5635,16 +5635,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v5.3.2",
+            "version": "v5.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "0732e97e41c0a590f77e231afc16a327375d50b0"
+                "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/0732e97e41c0a590f77e231afc16a327375d50b0",
-                "reference": "0732e97e41c0a590f77e231afc16a327375d50b0",
+                "url": "https://api.github.com/repos/symfony/string/zipball/a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
+                "reference": "a9a0f8b6aafc5d2d1c116dcccd1573a95153515b",
                "shasum": ""
            },
            "require": {
@ -5698,7 +5698,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v5.3.2"
+                "source": "https://github.com/symfony/string/tree/v5.3.0"
            },
            "funding": [
                {
@ -5714,7 +5714,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-06-06T09:51:56+00:00"
+            "time": "2021-05-26T17:43:10+00:00"
        },
        {
            "name": "theseer/tokenizer",
--- a/docs/references/account/create-session-anonymous.md
+++ b/docs/references/account/create-session-anonymous.md
@ -1 +1 @@
-Use this endpoint to allow a new user to register an anonymous account in your project. This route will also create a new session for the user. To allow the new user to convert an anonymous account to a normal account, you need to update its [email and password](/docs/client/account#accountUpdateEmail) or create an [OAuth2 session](/docs/client/account#accountCreateOAuth2Session).
+Use this endpoint to allow a new user to register an anonymous account in your project. This route will also create a new session for the user. To allow the new user to convert an anonymous account to a normal account account, you need to update its [email and password](/docs/client/account#accountUpdateEmail).
--- a/docs/references/account/create-session-oauth2.md
+++ b/docs/references/account/create-session-oauth2.md
@ -1,3 +1 @@
-Allow the user to login to their account using the OAuth2 provider of their choice. Each OAuth2 provider should be enabled from the Appwrite console first. Use the success and failure arguments to provide a redirect URL's back to your app when login is completed.
-
-If there is already an active session, the new session will be attached to the logged-in account. If there are no active sessions, the server will attempt to look for a user with the same email address as the email received from the OAuth2 provider and attach the new session to the existing user. If no matching user is found - the server will create a new user..
+Allow the user to login to their account using the OAuth2 provider of their choice. Each OAuth2 provider should be enabled from the Appwrite console first. Use the success and failure arguments to provide a redirect URL's back to your app when login is completed.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -14,6 +14,8 @@
    "gulp-clean-css": "^4.3.0",
    "gulp-concat": "^2.6.1",
    "gulp-jsmin": "^0.1.5",
-    "gulp-less": "^5.0.0"
+    "gulp-less": "^4.0.1",
+    "ls-service-form2json": "^1.0.0",
+    "yargs-parser": "^20.2.7"
  }
 }