Merge branch 'master' of github.com:appwrite/appwrite into 0.9.x

appwrite · Jul 3, 2021 · 57bc8c7 · 57bc8c7
2 parents 737ba69 + f013d07
commit 57bc8c7
Show file tree

Hide file tree

Showing 12 changed files with 6,414 additions and 1,783 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,7 +16,7 @@ FROM php:8.0-cli-alpine as step1
 
 ENV PHP_REDIS_VERSION=5.3.4 \
     PHP_SWOOLE_VERSION=v4.6.7 \
-    PHP_IMAGICK_VERSION=master \
+    PHP_IMAGICK_VERSION=3.5.0 \
     PHP_YAML_VERSION=2.2.1 \
     PHP_MAXMINDDB_VERSION=v1.10.1
 
@@ -53,10 +53,8 @@ RUN \
   make && make install && \
   cd .. && \
   ## Imagick Extension
-  ## Last working commit https://github.com/Imagick/imagick/commit/35741750aa1cda2b7ac354bfa6128fa037e9cf32
-  git clone --branch $PHP_IMAGICK_VERSION https://github.com/Imagick/imagick && \
+  git clone --depth 1 --branch $PHP_IMAGICK_VERSION https://github.com/imagick/imagick && \
   cd imagick && \
-  git checkout 35741750aa1cda2b7ac354bfa6128fa037e9cf32 && \
   phpize && \
   ./configure && \
   make && make install && \
@@ -152,10 +150,12 @@ 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/*

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
@@ -1155,14 +1155,23 @@
 
         // TODO after this user needs to confirm mail again
 
-        $user = $projectDB->updateDocument(\array_merge(
+        if (!$isAnonymousUser) {
+            // Remove previous unique ID.
+            $projectDB->deleteUniqueKey(\md5($user->getArrayCopy()['$collection'].':'.'email'.'='.$user->getAttribute('email')));
+        }
+
+        $document = (\array_merge(
             $user->getArrayCopy(),
             ($isAnonymousUser ? [ 'password' => Auth::passwordHash($password) ] : []),
             [
                 'email' => $email,
                 'emailVerification' => false,
             ]
-        ));
+            ));
+
+        $user = $projectDB->updateDocument($document);
+
+        $projectDB->addUniqueKey(\md5($document['$collection'].':'.'email'.'='.$email));
 
         if (false === $user) {
             throw new Exception('Failed saving user to DB', 500);

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
@@ -22,7 +22,6 @@
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\Utopia\Response;
 use Utopia\Config\Config;
-use Utopia\Validator\Numeric;
 
 App::post('/v1/storage/files')
     ->desc('Create File')

diff --git a/app/controllers/mock.php b/app/controllers/mock.php
@@ -7,7 +7,7 @@
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Validator\ArrayList;
-use Utopia\Validator\Integer;
+use Utopia\Validator\Numeric;
 use Utopia\Validator\Text;
 use Utopia\Storage\Validator\File;
 
@@ -24,7 +24,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -42,7 +42,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -60,7 +60,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -78,7 +78,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -96,7 +96,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -114,7 +114,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -132,7 +132,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -150,7 +150,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -168,7 +168,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -186,7 +186,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->action(function ($x, $y, $z) {
     });
@@ -230,7 +230,7 @@
     ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->param('x', '', new Text(100), 'Sample string param')
-    ->param('y', '', new Integer(), 'Sample numeric param')
+    ->param('y', '', new Numeric(), 'Sample numeric param')
     ->param('z', null, new ArrayList(new Text(256)), 'Sample array param')
     ->param('file', [], new File(), 'Sample file param', false)
     ->inject('request')

diff --git a/docs/references/account/create-session-oauth2.md b/docs/references/account/create-session-oauth2.md
@@ -1 +1,3 @@
-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.
+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..