Merge branch 'dev' of github.com:appwrite/appwrite into feat-465-add-arm-support

.env

@@ -16,7 +16,7 @@ _APP_DB_PORT=3306
 _APP_DB_SCHEMA=appwrite
 _APP_DB_USER=user
 _APP_DB_PASS=password
-_APP_STORAGE_ANTIVIRUS=enabled
+_APP_STORAGE_ANTIVIRUS=disabled
 _APP_STORAGE_ANTIVIRUS_HOST=clamav
 _APP_STORAGE_ANTIVIRUS_PORT=3310
 _APP_INFLUXDB_HOST=influxdb

.travis.yml

@@ -37,7 +37,7 @@ script:
 - docker-compose logs appwrite-worker-functions
 - docker-compose exec appwrite doctor
 - docker-compose exec appwrite vars
-- docker-compose exec appwrite test
+- docker-compose exec appwrite test --debug
 
 deploy:
   - provider: script

CHANGES.md

@@ -2,11 +2,15 @@
 
 - Anonymous login
 
-# Version 0.7.1 (Not Released Yet)
+## Upgrades
+
+- Upgraded ClamAV to version 1.3.0
+
+# Version 0.7.1
 
 ## Features
 
-- Better error logs on appwrite cretificates worker
+- Better error logs on appwrite certificates worker
 - Added option for Redis authentication
 - Force adding a security email on setup
 - SMTP is now disabled by default, no dummy SMTP is included in setup
@@ -22,10 +26,16 @@
 - Upgraded influxdb/influxdb-php lib to version 1.15.2
 - Upgraded phpmailer/phpmailer lib to version 6.3.0
 - Upgraded adhocore/jwt lib to version 1.1.2
+- Upgraded domnikl/statsd to slickdeals/statsd version 3.0
  
 ## Bug Fixes
 
 - Updated missing storage env vars
+- Fixed a bug, that added a wrong timzone offset to user log timestamps
+- Fixed a bug, that Response format header was not added in the access-control-allow-header list.
+- Fixed a bug where countryName is unknown on sessions (#933)
+- Added missing event users.update.prefs (#952)
+- Fixed bug not allowing to reset document permissions (#977)
 
 ## Security
 

CONTRIBUTING.md

@@ -366,7 +366,6 @@ From time to time, our team will add tutorials that will help contributors find
 * [Appwrite Environment Variables](./docs/tutorials/environment-variables.md)
 * [Running in Production](./docs/tutorials/running-in-production.md)
 
-
 ## Other Ways to Help
 
 Pull requests are great, but there are many other areas where you can help Appwrite. 

README.md

@@ -53,7 +53,7 @@ docker run -it --rm \
     --volume /var/run/docker.sock:/var/run/docker.sock \
     --volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
     --entrypoint="install" \
-    appwrite/appwrite:0.7.0
+    appwrite/appwrite:0.7.1
 ```
 
 ### Windows
@@ -65,7 +65,7 @@ docker run -it --rm ^
     --volume //var/run/docker.sock:/var/run/docker.sock ^
     --volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
     --entrypoint="install" ^
-    appwrite/appwrite:0.7.0
+    appwrite/appwrite:0.7.1
 ```
 
 #### PowerShell
@@ -75,7 +75,7 @@ docker run -it --rm ,
     --volume /var/run/docker.sock:/var/run/docker.sock ,
     --volume ${pwd}/appwrite:/usr/src/code/appwrite:rw ,
     --entrypoint="install" ,
-    appwrite/appwrite:0.7.0
+    appwrite/appwrite:0.7.1
 ```
 
 Once the Docker installation completes, go to http://localhost to access the Appwrite console from your browser. Please note that on non-linux native hosts, the server might take a few minutes to start after installation completes.

app/config/events.php

@@ -117,6 +117,11 @@ return [
         'model' => Response::MODEL_USER,
         'note' => 'version >= 0.7',
     ],
+    'users.update.prefs' => [
+        'description' => 'This event triggers when a user preference is updated from the users API.',
+        'model' => Response::MODEL_ANY,
+        'note' => 'version >= 0.7',
+    ],
     'users.update.status' => [
         'description' => 'This event triggers when a user status is updated from the users API.',
         'model' => Response::MODEL_USER,

app/config/platforms.php

@@ -32,7 +32,7 @@ return [
             [
                 'key' => 'flutter',
                 'name' => 'Flutter',
-                'version' => '0.3.0',
+                'version' => '0.4.0-dev.3',
                 'url' => 'https://github.com/appwrite/sdk-for-flutter',
                 'package' => 'https://pub.dev/packages/appwrite',
                 'enabled' => true,
@@ -165,7 +165,7 @@ return [
             [
                 'key' => 'deno',
                 'name' => 'Deno',
-                'version' => '0.1.0',
+                'version' => '0.1.1',
                 'url' => 'https://github.com/appwrite/sdk-for-deno',
                 'package' => 'https://deno.land/x/appwrite',
                 'enabled' => true,
@@ -199,7 +199,7 @@ return [
             [
                 'key' => 'python',
                 'name' => 'Python',
-                'version' => '0.1.0',
+                'version' => '0.1.1',
                 'url' => 'https://github.com/appwrite/sdk-for-python',
                 'package' => 'https://pypi.org/project/appwrite/',
                 'enabled' => true,
@@ -216,7 +216,7 @@ return [
             [
                 'key' => 'ruby',
                 'name' => 'Ruby',
-                'version' => '2.0.0',
+                'version' => '2.0.2',
                 'url' => 'https://github.com/appwrite/sdk-for-ruby',
                 'package' => 'https://rubygems.org/gems/appwrite',
                 'enabled' => true,
@@ -284,12 +284,12 @@ return [
             [
                 'key' => 'dart',
                 'name' => 'Dart',
-                'version' => '0.2.0',
+                'version' => '0.4.0',
                 'url' => 'https://github.com/appwrite/sdk-for-dart',
                 'package' => 'https://pub.dev/packages/dart_appwrite',
                 'enabled' => true,
                 'beta' => true,
-                'dev' => true,
+                'dev' => false,
                 'hidden' => false,
                 'family' => APP_PLATFORM_SERVER,
                 'prism' => 'dart',
@@ -301,7 +301,7 @@ return [
             [
                 'key' => 'cli',
                 'name' => 'Command Line',
-                'version' => '0.5.0',
+                'version' => '0.6.0',
                 'url' => 'https://github.com/appwrite/sdk-for-cli',
                 'package' => 'https://github.com/appwrite/sdk-for-cli',
                 'enabled' => true,

app/config/variables.php

@@ -107,8 +107,8 @@ return [
                 'name' => '_APP_SYSTEM_SECURITY_EMAIL_ADDRESS',
                 'description' => 'This is the email address used to issue SSL certificates for custom domains or the user agent in your webhooks payload.',
                 'introduction' => '0.7.0',
-                'default' => '',
-                'required' => true,
+                'default' => 'certs@appwrite.io',
+                'required' => false,
                 'question' => '',
             ],
             [
@@ -143,7 +143,7 @@ return [
             ],
             [
                 'name' => '_APP_REDIS_USER',
-                'description' => 'Redis server user.',
+                'description' => 'Redis server user. This is an optional variable. Default value is an empty string.',
                 'introduction' => '0.7',
                 'default' => '',
                 'required' => false,
@@ -151,7 +151,7 @@ return [
             ],
             [
                 'name' => '_APP_REDIS_PASS',
-                'description' => 'Redis server password.',
+                'description' => 'Redis server password. This is an optional variable. Default value is an empty string.',
                 'introduction' => '0.7',
                 'default' => '',
                 'required' => false,

app/controllers/api/account.php

@@ -236,9 +236,11 @@ App::post('/v1/account/sessions')
             ->setStatusCode(Response::STATUS_CODE_CREATED)
         ;
 
+        $countries = $locale->getText('countries');
+
         $session
             ->setAttribute('current', true)
-            ->setAttribute('countryName', (isset($countries[$session->getAttribute('countryCode')])) ? $countries[$session->getAttribute('countryCode')] : $locale->getText('locale.country.unknown'))
+            ->setAttribute('countryName', (isset($countries[strtoupper($session->getAttribute('countryCode'))])) ? $countries[strtoupper($session->getAttribute('countryCode'))] : $locale->getText('locale.country.unknown'))
         ;
         
         $response->dynamic($session, Response::MODEL_SESSION);
@@ -253,8 +255,8 @@ App::get('/v1/account/sessions/oauth2/:provider')
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'createOAuth2Session')
     ->label('sdk.description', '/docs/references/account/create-session-oauth2.md')
-    ->label('sdk.response.code', 301)
-    ->label('sdk.response.type', 'text/html')
+    ->label('sdk.response.code', Response::STATUS_CODE_MOVED_PERMANENTLY)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_HTML)
     ->label('sdk.methodType', 'webAuth')
     ->label('abuse-limit', 50)
     ->label('abuse-key', 'ip:{ip}')
@@ -679,8 +681,8 @@ App::get('/v1/account/sessions')
                 continue;
             }
 
-            $token->setAttribute('countryName', (isset($countries[$token->getAttribute('contryCode')]))
-                ? $countries[$token->getAttribute('contryCode')]
+            $token->setAttribute('countryName', (isset($countries[strtoupper($token->getAttribute('countryCode'))]))
+                ? $countries[strtoupper($token->getAttribute('countryCode'))]
                 : $locale->getText('locale.country.unknown'));
             $token->setAttribute('current', ($current == $token->getId()) ? true : false);
 

app/controllers/api/database.php

@@ -535,20 +535,12 @@ App::patch('/v1/database/collections/:collectionId/documents/:documentId')
             throw new Exception('No document found', 404);
         }
 
-        //TODO check merge read write permissions
-
-        if (!empty($read)) { // Overwrite permissions only when passed
-            $data['$permissions']['read'] = $read;
-        }
-
-        if (!empty($write)) { // Overwrite permissions only when passed
-            $data['$permissions']['write'] = $write;
-        }
-
         $data = \array_merge($document->getArrayCopy(), $data);
 
         $data['$collection'] = $collection->getId(); // Make sure user don't switch collectionID
         $data['$id'] = $document->getId(); // Make sure user don't switch document unique ID
+        $data['$permissions']['read'] = $read;
+        $data['$permissions']['write'] = $write;
 
         if (empty($data)) {
             throw new Exception('Missing payload', 400);

app/controllers/api/health.php

@@ -254,7 +254,10 @@ App::get('/v1/health/anti-virus')
         /** @var Appwrite\Utopia\Response $response */
 
         if (App::getEnv('_APP_STORAGE_ANTIVIRUS') === 'disabled') { // Check if scans are enabled
-            throw new Exception('Anitvirus is disabled');
+            return $response->json([
+                'status' => 'disabled',
+                'version' => '',
+            ]);
         }
 
         $antiVirus = new Network(App::getEnv('_APP_STORAGE_ANTIVIRUS_HOST', 'clamav'),

app/controllers/api/users.php

@@ -205,8 +205,8 @@ App::get('/v1/users/:userId/sessions')
                 continue;
             }
 
-            $token->setAttribute('countryName', (isset($countries[$token->getAttribute('contryCode')]))
-                ? $countries[$token->getAttribute('contryCode')]
+            $token->setAttribute('countryName', (isset($countries[strtoupper($token->getAttribute('countryCode'))]))
+                ? $countries[strtoupper($token->getAttribute('countryCode'))]
                 : $locale->getText('locale.country.unknown'));
             $token->setAttribute('current', false);
 
@@ -373,6 +373,7 @@ App::patch('/v1/users/:userId/status')
 App::patch('/v1/users/:userId/prefs')
     ->desc('Update User Preferences')
     ->groups(['api', 'users'])
+    ->label('event', 'users.update.prefs')
     ->label('scope', 'users.write')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'users')

app/controllers/general.php

@@ -117,7 +117,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         ->addHeader('Server', 'Appwrite')
         ->addHeader('X-Content-Type-Options', 'nosniff')
         ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-SDK-Version, Cache-Control, Expires, Pragma')
+        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, Cache-Control, Expires, Pragma')
         ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
         ->addHeader('Access-Control-Allow-Origin', $refDomain)
         ->addHeader('Access-Control-Allow-Credentials', 'true')
@@ -237,7 +237,7 @@ App::options(function ($request, $response) {
     $response
         ->addHeader('Server', 'Appwrite')
         ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
-        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
+        ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-Appwrite-JWT, X-Appwrite-Response-Format, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
         ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
         ->addHeader('Access-Control-Allow-Origin', $origin)
         ->addHeader('Access-Control-Allow-Credentials', 'true')

app/controllers/mock.php

@@ -2,8 +2,9 @@
 
 global $utopia, $request, $response;
 
+use Appwrite\Database\Document;
+use Appwrite\Utopia\Response;
 use Utopia\App;
-use Utopia\Response;
 use Utopia\Validator\Numeric;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
@@ -11,13 +12,16 @@ use Utopia\Validator\Host;
 use Utopia\Storage\Validator\File;
 
 App::get('/v1/mock/tests/foo')
-    ->desc('Mock a get request for SDK tests')
+    ->desc('Get Foo')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'foo')
     ->label('sdk.method', 'get')
-    ->label('sdk.description', 'Mock a get request for SDK tests')
+    ->label('sdk.description', 'Mock a get request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -26,13 +30,16 @@ App::get('/v1/mock/tests/foo')
     });
 
 App::post('/v1/mock/tests/foo')
-    ->desc('Mock a post request for SDK tests')
+    ->desc('Post Foo')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'foo')
     ->label('sdk.method', 'post')
-    ->label('sdk.description', 'Mock a post request for SDK tests')
+    ->label('sdk.description', 'Mock a post request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -41,13 +48,16 @@ App::post('/v1/mock/tests/foo')
     });
 
 App::patch('/v1/mock/tests/foo')
-    ->desc('Mock a patch request for SDK tests')
+    ->desc('Patch Foo')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'foo')
     ->label('sdk.method', 'patch')
-    ->label('sdk.description', 'Mock a get request for SDK tests')
+    ->label('sdk.description', 'Mock a patch request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -56,13 +66,16 @@ App::patch('/v1/mock/tests/foo')
     });
 
 App::put('/v1/mock/tests/foo')
-    ->desc('Mock a put request for SDK tests')
+    ->desc('Put Foo')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'foo')
     ->label('sdk.method', 'put')
-    ->label('sdk.description', 'Mock a put request for SDK tests')
+    ->label('sdk.description', 'Mock a put request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -71,13 +84,16 @@ App::put('/v1/mock/tests/foo')
     });
 
 App::delete('/v1/mock/tests/foo')
-    ->desc('Mock a delete request for SDK tests')
+    ->desc('Delete Foo')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'foo')
     ->label('sdk.method', 'delete')
-    ->label('sdk.description', 'Mock a delete request for SDK tests')
+    ->label('sdk.description', 'Mock a delete request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -86,13 +102,16 @@ App::delete('/v1/mock/tests/foo')
     });
 
 App::get('/v1/mock/tests/bar')
-    ->desc('Mock a get request for SDK tests')
+    ->desc('Get Bar')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'bar')
     ->label('sdk.method', 'get')
-    ->label('sdk.description', 'Mock a get request for SDK tests')
+    ->label('sdk.description', 'Mock a get request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -101,13 +120,16 @@ App::get('/v1/mock/tests/bar')
     });
 
 App::post('/v1/mock/tests/bar')
-    ->desc('Mock a post request for SDK tests')
+    ->desc('Post Bar')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'bar')
     ->label('sdk.method', 'post')
-    ->label('sdk.description', 'Mock a post request for SDK tests')
+    ->label('sdk.description', 'Mock a post request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -116,13 +138,16 @@ App::post('/v1/mock/tests/bar')
     });
 
 App::patch('/v1/mock/tests/bar')
-    ->desc('Mock a patch request for SDK tests')
+    ->desc('Patch Bar')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'bar')
     ->label('sdk.method', 'patch')
-    ->label('sdk.description', 'Mock a get request for SDK tests')
+    ->label('sdk.description', 'Mock a patch request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -131,13 +156,16 @@ App::patch('/v1/mock/tests/bar')
     });
 
 App::put('/v1/mock/tests/bar')
-    ->desc('Mock a put request for SDK tests')
+    ->desc('Put Bar')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'bar')
     ->label('sdk.method', 'put')
-    ->label('sdk.description', 'Mock a put request for SDK tests')
+    ->label('sdk.description', 'Mock a put request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -146,13 +174,16 @@ App::put('/v1/mock/tests/bar')
     });
 
 App::delete('/v1/mock/tests/bar')
-    ->desc('Mock a delete request for SDK tests')
+    ->desc('Delete Bar')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'bar')
     ->label('sdk.method', 'delete')
-    ->label('sdk.description', 'Mock a delete request for SDK tests')
+    ->label('sdk.description', 'Mock a delete request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -161,14 +192,17 @@ App::delete('/v1/mock/tests/bar')
     });
 
 App::post('/v1/mock/tests/general/upload')
-    ->desc('Mock a post request for SDK tests')
+    ->desc('Upload File')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'upload')
-    ->label('sdk.description', 'Mock a delete request for SDK tests')
+    ->label('sdk.description', 'Mock a file upload request.')
     ->label('sdk.request.type', 'multipart/form-data')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->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')
@@ -203,13 +237,15 @@ App::post('/v1/mock/tests/general/upload')
     });
 
 App::get('/v1/mock/tests/general/redirect')
-    ->desc('Mock a post request for SDK tests')
+    ->desc('Redirect')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'redirect')
-    ->label('sdk.description', 'Mock a redirect request for SDK tests')
+    ->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.mock', true)
     ->inject('response')
     ->action(function ($response) {
@@ -219,25 +255,31 @@ App::get('/v1/mock/tests/general/redirect')
     });
 
 App::get('/v1/mock/tests/general/redirect/done')
-    ->desc('Mock a post request for SDK tests')
+    ->desc('Redirected')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'redirected')
-    ->label('sdk.description', 'Mock a redirected request for SDK tests')
+    ->label('sdk.description', 'Mock a redirected request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->action(function () {
     });
 
 App::get('/v1/mock/tests/general/set-cookie')
-    ->desc('Mock a cookie request for SDK tests')
+    ->desc('Set Cookie')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'setCookie')
-    ->label('sdk.description', 'Mock a set cookie request for SDK tests')
+    ->label('sdk.description', 'Mock a set cookie request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->inject('response')
     ->action(function ($response) {
@@ -247,13 +289,16 @@ App::get('/v1/mock/tests/general/set-cookie')
     });
 
 App::get('/v1/mock/tests/general/get-cookie')
-    ->desc('Mock a cookie request for SDK tests')
+    ->desc('Get Cookie')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'getCookie')
-    ->label('sdk.description', 'Mock a get cookie request for SDK tests')
+    ->label('sdk.description', 'Mock a cookie response.')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MOCK)
     ->label('sdk.mock', true)
     ->inject('request')
     ->action(function ($request) {
@@ -265,13 +310,15 @@ App::get('/v1/mock/tests/general/get-cookie')
     });
 
 App::get('/v1/mock/tests/general/empty')
-    ->desc('Mock a post request for SDK tests')
+    ->desc('Empty Response')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'general')
     ->label('sdk.method', 'empty')
-    ->label('sdk.description', 'Mock a redirected request for SDK tests')
+    ->label('sdk.description', 'Mock a an empty response.')
+    ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
+    ->label('sdk.response.model', Response::MODEL_NONE)
     ->label('sdk.mock', true)
     ->inject('response')
     ->action(function ($response) {
@@ -280,8 +327,40 @@ App::get('/v1/mock/tests/general/empty')
         $response->noContent();
     });
 
+App::get('/v1/mock/tests/general/400-error')
+    ->desc('400 Error')
+    ->groups(['mock'])
+    ->label('scope', 'public')
+    ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
+    ->label('sdk.namespace', 'general')
+    ->label('sdk.method', 'error400')
+    ->label('sdk.description', 'Mock a an 400 failed request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_BAD_REQUEST)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ERROR)
+    ->label('sdk.mock', true)
+    ->action(function () {
+        throw new Exception('Mock 400 error', 400);
+    });
+
+App::get('/v1/mock/tests/general/500-error')
+    ->desc('500 Error')
+    ->groups(['mock'])
+    ->label('scope', 'public')
+    ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
+    ->label('sdk.namespace', 'general')
+    ->label('sdk.method', 'error500')
+    ->label('sdk.description', 'Mock a an 500 failed request.')
+    ->label('sdk.response.code', Response::STATUS_CODE_INTERNAL_SERVER_ERROR)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_ERROR)
+    ->label('sdk.mock', true)
+    ->action(function () {
+        throw new Exception('Mock 500 error', 500);
+    });
+
 App::get('/v1/mock/tests/general/oauth2')
-    ->desc('Mock an OAuth2 login route')
+    ->desc('OAuth Login')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('docs', false)
@@ -298,7 +377,7 @@ App::get('/v1/mock/tests/general/oauth2')
     });
 
 App::get('/v1/mock/tests/general/oauth2/token')
-    ->desc('Mock an OAuth2 login route')
+    ->desc('OAuth2 Token')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('docs', false)
@@ -327,7 +406,7 @@ App::get('/v1/mock/tests/general/oauth2/token')
     });
 
 App::get('/v1/mock/tests/general/oauth2/user')
-    ->desc('Mock an OAuth2 user route')
+    ->desc('OAuth2 User')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('docs', false)
@@ -348,8 +427,9 @@ App::get('/v1/mock/tests/general/oauth2/user')
     });
 
 App::get('/v1/mock/tests/general/oauth2/success')
-    ->label('scope', 'public')
+    ->desc('OAuth2 Success')
     ->groups(['mock'])
+    ->label('scope', 'public')
     ->label('docs', false)
     ->inject('response')
     ->action(function ($response) {
@@ -361,6 +441,7 @@ App::get('/v1/mock/tests/general/oauth2/success')
     });
 
 App::get('/v1/mock/tests/general/oauth2/failure')
+    ->desc('OAuth2 Failure')
     ->groups(['mock'])
     ->label('scope', 'public')
     ->label('docs', false)
@@ -397,5 +478,5 @@ App::shutdown(function($utopia, $response, $request) {
         throw new Exception('Failed to save resutls', 500);
     }
 
-    $response->json(['result' => $route->getMethod() . ':' . $route->getURL() . ':passed']);
+    $response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getURL() . ':passed']), Response::MODEL_MOCK);
 }, ['utopia', 'response', 'request'], 'mock');

app/http.php

@@ -94,7 +94,7 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
         return;
     }
 
-    $app = new App('America/New_York');
+    $app = new App('UTC');
     
     try {
         Authorization::cleanRoles();

app/init.php

@@ -39,8 +39,8 @@ const APP_USERAGENT = APP_NAME.'-Server v%s. Please report abuse at %s';
 const APP_MODE_DEFAULT = 'default';
 const APP_MODE_ADMIN = 'admin';
 const APP_PAGING_LIMIT = 12;
-const APP_CACHE_BUSTER = 144;
-const APP_VERSION_STABLE = '0.7.0';
+const APP_CACHE_BUSTER = 145;
+const APP_VERSION_STABLE = '0.7.1';
 const APP_STORAGE_UPLOADS = '/storage/uploads';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_CACHE = '/storage/cache';

app/preload.php

@@ -28,10 +28,9 @@ foreach ([
     realpath(__DIR__ . '/../vendor/felixfbecker'),
     realpath(__DIR__ . '/../vendor/twig/twig'),
     realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'),
-    realpath(__DIR__ . '/../vendor/domnikl'),
-    realpath(__DIR__ . '/../vendor/domnikl'),
+    realpath(__DIR__ . '/../vendor/slickdeals'),
     realpath(__DIR__ . '/../vendor/psr/log'),
-    realpath(__DIR__ . '/../vendor/piwik'),
+    realpath(__DIR__ . '/../vendor/matomo'),
     realpath(__DIR__ . '/../vendor/symfony'),
 ] as $key => $value) {
     if($value !== false) {

app/tasks/install.php

@@ -124,7 +124,7 @@ $cli
 
             $input[$var['name']] = Console::confirm($var['question'].' (default: \''.$var['default'].'\')');
 
-            if(empty($input[$key])) {
+            if(empty($input[$var['name']])) {
                 $input[$var['name']] = $var['default'];
             }
         }
@@ -181,4 +181,4 @@ $cli
             $analytics->createEvent('install/server', 'install', APP_VERSION_STABLE.' - '.$message);
             Console::success($message);
         }
-    });
+    });

app/tasks/sdks.php

@@ -42,7 +42,7 @@ $cli
         $production = ($git) ? (Console::confirm('Type "Appwrite" to push code to production git repos') == 'Appwrite') : false;
         $message = ($git) ? Console::confirm('Please enter your commit message:') : '';
 
-        if(!in_array($version, ['0.6.2', '0.7.0'])) {
+        if(!in_array($version, ['0.6.x', '0.7.x'])) {
             throw new Exception('Unknown version given');
         }
 
@@ -67,6 +67,8 @@ $cli
                 $target = \realpath(__DIR__.'/..').'/sdks/git/'.$language['key'].'/';
                 $readme = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/README.md');
                 $readme = ($readme) ? \file_get_contents($readme) : '';
+                $gettingStarted = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/GETTING_STARTED.md');
+                $gettingStarted = ($gettingStarted) ? \file_get_contents($gettingStarted) : '';
                 $examples = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/EXAMPLES.md');
                 $examples = ($examples) ? \file_get_contents($examples) : '';
                 $changelog = \realpath(__DIR__ . '/../../docs/sdks/'.$language['key'].'/CHANGELOG.md');
@@ -96,6 +98,15 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                         $config = new CLI();
                         $config->setComposerVendor('appwrite');
                         $config->setComposerPackage('cli');
+                        $config->setExecutableName('appwrite');
+                        $config->setLogo("
+    _                            _ _           ___   __   _____ 
+   /_\  _ __  _ ____      ___ __(_) |_ ___    / __\ / /   \_   \
+  //_\\| '_ \| '_ \ \ /\ / / '__| | __/ _ \  / /   / /     / /\/
+ /  _  \ |_) | |_) \ V  V /| |  | | ||  __/ / /___/ /___/\/ /_  
+ \_/ \_/ .__/| .__/ \_/\_/ |_|  |_|\__\___| \____/\____/\____/  
+       |_|   |_|                                                  
+ ");
                         break;
                     case 'php':
                         $config = new PHP();
@@ -178,6 +189,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
                     ->setShareVia('appwrite_io')
                     ->setWarning($warning)
                     ->setReadme($readme)
+                    ->setGettingStarted($gettingStarted)
                     ->setChangelog($changelog)
                     ->setExamples($examples)
                 ;

app/views/install/compose.phtml

@@ -352,7 +352,7 @@ services:
       - appwrite-redis:/data:rw
 
   clamav:
-    image: appwrite/clamav:1.2.0
+    image: appwrite/clamav:1.3.0
     container_name: appwrite-clamav
     restart: unless-stopped
     networks:

bin/test

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

composer.json

@@ -34,7 +34,7 @@
 
         "appwrite/php-clamav": "1.0.*",
 
-        "utopia-php/framework": "0.10.0",
+        "utopia-php/framework": "0.12.*",
         "utopia-php/abuse": "0.3.*",
         "utopia-php/analytics": "0.1.*",
         "utopia-php/audit": "0.5.*",
@@ -53,14 +53,14 @@
         "resque/php-resque": "1.3.6",
         "matomo/device-detector": "4.1.0",
         "dragonmantank/cron-expression": "3.1.0",
-        "domnikl/statsd": "3.0.2",
         "influxdb/influxdb-php": "1.15.2",
         "phpmailer/phpmailer": "6.3.0",
         "chillerlan/php-qrcode": "4.3.0",
-        "adhocore/jwt": "1.1.2"
+        "adhocore/jwt": "1.1.2",
+        "slickdeals/statsd": "~3.0"
     },
     "require-dev": {
-        "appwrite/sdk-generator": "0.5.5",
+        "appwrite/sdk-generator": "0.6.3",
         "phpunit/phpunit": "9.4.2",
         "swoole/ide-helper": "4.5.5",
         "vimeo/psalm": "4.1.1"

docker-compose.yml

@@ -414,7 +414,7 @@ services:
       - appwrite-redis:/data:rw
 
   clamav:
-    image: appwrite/clamav:1.2.0
+    image: appwrite/clamav:1.3.0
     container_name: appwrite-clamav
     networks:
       - appwrite