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

app/controllers/api/databases.php

@@ -2190,7 +2190,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('collectionId', null, new UID(), 'Collection ID.')
     ->param('documentId', null, new UID(), 'Document ID.')
-    ->param('data', [], new JSON(), 'Document data as JSON object. Include only attribute and value pairs to be updated.')
+    ->param('data', [], new JSON(), 'Document data as JSON object. Include only attribute and value pairs to be updated.', true)
     ->param('read', null, new Permissions(), 'An array of strings with read permissions. By default inherits the existing read permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.', true)
     ->param('write', null, new Permissions(), 'An array of strings with write permissions. By default inherits the existing write permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.', true)
     ->inject('response')
@@ -2236,8 +2236,8 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
 
         $data = (\is_string($data)) ? \json_decode($data, true) : $data; // Cast to JSON array
 
-        if (empty($data)) {
-            throw new Exception('Missing payload', 400, Exception::DOCUMENT_MISSING_PAYLOAD);
+        if (empty($data) && empty($read) && empty($write)) {
+            throw new Exception('Missing payload or read/write permissions', 400, Exception::DOCUMENT_MISSING_PAYLOAD);
         }
 
         if (!\is_array($data)) {

app/controllers/api/functions.php

@@ -467,7 +467,7 @@ App::post('/v1/functions/:functionId/deployments')
     ->inject('project')
     ->inject('deviceFunctions')
     ->inject('deviceLocal')
-    ->action(function (string $functionId, string $entrypoint, array $file, bool $activate, Request $request, Response $response, Database $dbForProject, Stats $usage, Event $events, Document $project, Device $deviceFunctions, Device $deviceLocal) {
+    ->action(function (string $functionId, string $entrypoint, mixed $code, bool $activate, Request $request, Response $response, Database $dbForProject, Stats $usage, Event $events, Document $project, Device $deviceFunctions, Device $deviceLocal) {
 
         $function = $dbForProject->getDocument('functions', $functionId);
 

app/controllers/api/storage.php

@@ -354,7 +354,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('deviceLocal')
-    ->action(function (string $bucketId, string $fileId, array $file, ?array $read, ?array $write, Request $request, Response $response, Database $dbForProject, Document $user, Audit $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
+    ->action(function (string $bucketId, string $fileId, mixed $file, ?array $read, ?array $write, Request $request, Response $response, Database $dbForProject, Document $user, Audit $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
         if (

app/controllers/mock.php

@@ -237,7 +237,7 @@ App::post('/v1/mock/tests/general/upload')
     ->param('file', [], new File(), 'Sample file param', false)
     ->inject('request')
     ->inject('response')
-    ->action(function (string $x, int $y, array $z, array $file, Request $request, Response $response) {
+    ->action(function (string $x, int $y, array $z, mixed $file, Request $request, Response $response) {
 
         $file = $request->getFiles('file');
 

app/init.php

@@ -437,7 +437,7 @@ Structure::addFormat(APP_DATABASE_ATTRIBUTE_FLOAT_RANGE, function ($attribute) {
  * Registry
  */
 $register->set('logger', function () {
- // Register error logger
+    // Register error logger
     $providerName = App::getEnv('_APP_LOGGING_PROVIDER', '');
     $providerConfig = App::getEnv('_APP_LOGGING_CONFIG', '');
 

app/views/console/databases/collection.phtml

@@ -584,7 +584,16 @@ $logs = $this->getParam('logs', null);
                     </div>
 
                     <ul class="margin-bottom-large text-fade text-size-small">
-                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                            <button data-ls-ui-trigger="open-json" 
+                                class="link text-size-small" 
+                                data-analytics
+                                data-analytics-event="click"
+                                data-analytics-category="console"
+                                data-analytics-label="View as JSON (Collection)">
+                                View as JSON
+                            </button>
+                        </li>
                         <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-collection.$updatedAt|dateText}}"></span></li>
                         <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-collection.$createdAt|dateText}}"></span></li>
                     </ul>

app/views/console/databases/document.phtml

@@ -349,7 +349,16 @@ $logs = $this->getParam('logs', null);
                             </div>
 
                             <ul class="margin-bottom-large text-fade text-size-small" data-ls-if="({{project-document.$id}})">
-                                <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                                <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                                    <button data-ls-ui-trigger="open-json"
+                                        class="link text-size-small"
+                                        data-analytics
+                                        data-analytics-event="click"
+                                        data-analytics-category="console"
+                                        data-analytics-label="View as JSON (Document)">
+                                        View as JSON
+                                    </button>
+                                </li>
                                 <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-document.$updatedAt|dateText}}"></span></li>
                                 <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-document.$createdAt|dateText}}"></span></li>
                             </ul>

app/views/console/functions/function.phtml

@@ -245,7 +245,16 @@ sort($patterns);
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Function)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-function.$updatedAt|dateText}}"></span></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-function.$createdAt|dateText}}"></span></li>
                         </ul>
@@ -595,7 +604,16 @@ sort($patterns);
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i>
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Function)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-function.$updatedAt|dateText}}"></span></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-function.$createdAt|dateText}}"></span></li>
                         </ul>

app/views/console/storage/bucket.phtml

@@ -471,7 +471,16 @@ $fileLimitHuman = $this->getParam('fileLimitHuman', 0);
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                        <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> 
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Bucket)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Last Updated: <span data-ls-bind="{{project-bucket.$updatedAt|dateText}}"></span></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{project-bucket.$createdAt|dateText}}"></span></li>
                         </ul>

app/views/console/users/index.phtml

@@ -453,7 +453,7 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     data-analytics-activity
                                     data-analytics-event="submit"
                                     data-analytics-category="console"
-                                    data-analytics-label="Update Project OAuth2"
+                                    data-analytics-label="Update Project OAuth2 (<?php echo $this->escape($name); ?>)"
                                     data-service="projects.updateOAuth2"
                                     data-scope="console"
                                     data-event="submit"

app/views/console/users/team.phtml

@@ -206,7 +206,16 @@
                         </div>
 
                         <ul class="margin-bottom-large text-fade text-size-small">
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i>
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (Team)">
+                                    View as JSON
+                                </button>
+                            </li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> Created: <span data-ls-bind="{{team.$createdAt|dateText}}"></span></li>
                         </ul>
 

app/views/console/users/user.phtml

@@ -286,7 +286,16 @@
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-email" class="link text-size-small">Update Email</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-phone" class="link text-size-small">Update Phone</button></li>
                             <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-update-password" class="link text-size-small">Update Password</button></li>
-                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i> <button data-ls-ui-trigger="open-json" class="link text-size-small">View as JSON</button></li>
+                            <li class="margin-bottom-small"><i class="icon-angle-circled-right margin-start-tiny margin-end-tiny"></i>
+                                <button data-ls-ui-trigger="open-json" 
+                                    class="link text-size-small"
+                                    data-analytics
+                                    data-analytics-event="click"
+                                    data-analytics-category="console"
+                                    data-analytics-label="View as JSON (User)">
+                                    View as JSON
+                                </button>
+                            </li>
                         </ul>
 
                         <div data-ls-if="{{user.email}} && {{user.emailVerification}} === false" style="display: none">

tests/e2e/Services/Databases/DatabasesBase.php

@@ -2263,4 +2263,106 @@ trait DatabasesBase
 
         return $data;
     }
+
+    public function testUpdatePermissionsWithEmptyPayload(): array
+    {
+        // Create collection
+        $movies = $this->client->call(Client::METHOD_POST, '/database/collections', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'collectionId' => 'unique()',
+            'name' => 'Movies',
+            'read' => [],
+            'write' => [],
+            'permission' => 'document',
+        ]);
+
+        $this->assertEquals($movies['headers']['status-code'], 201);
+        $this->assertEquals($movies['body']['name'], 'Movies');
+
+        $moviesId = $movies['body']['$id'];
+
+        // create attribute
+        $title = $this->client->call(Client::METHOD_POST, '/database/collections/' . $moviesId . '/attributes/string', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+            'x-appwrite-key' => $this->getProject()['apiKey']
+        ]), [
+            'key' => 'title',
+            'size' => 256,
+            'required' => true,
+        ]);
+
+        $this->assertEquals($title['headers']['status-code'], 201);
+
+        // wait for database worker to create attributes
+        sleep(2);
+
+        // add document
+        $document = $this->client->call(Client::METHOD_POST, '/database/collections/' . $moviesId . '/documents', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'documentId' => 'unique()',
+            'data' => [
+                'title' => 'Captain America',
+            ],
+            'read' => ['role:all'],
+            'write' => ['role:all'],
+        ]);
+
+        $id = $document['body']['$id'];
+
+        $this->assertEquals($document['headers']['status-code'], 201);
+        $this->assertCount(1, $document['body']['$read']);
+        $this->assertCount(1, $document['body']['$write']);
+        $this->assertEquals(['role:all'], $document['body']['$read']);
+        $this->assertEquals(['role:all'], $document['body']['$write']);
+
+        // Send only read permission
+        $document = $this->client->call(Client::METHOD_PATCH, '/database/collections/' . $moviesId . '/documents/' . $id, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+         ], $this->getHeaders()), [
+            'read' => ['user:' . $this->getUser()['$id']],
+        ]);
+
+        if ($this->getSide() == 'client') {
+            $this->assertEquals($document['headers']['status-code'], 200);
+        }
+
+        if ($this->getSide() == 'server') {
+            $this->assertEquals($document['headers']['status-code'], 200);
+            $this->assertCount(1, $document['body']['$read']);
+            $this->assertCount(1, $document['body']['$write']);
+            $this->assertEquals(['user:' . $this->getUser()['$id']], $document['body']['$read']);
+            $this->assertEquals(['role:all'], $document['body']['$write']);
+        }
+
+        // send only write permission
+        $document = $this->client->call(Client::METHOD_PATCH, '/database/collections/' . $moviesId . '/documents/' . $id, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'write' => ['user:' . $this->getUser()['$id']],
+        ]);
+
+        if ($this->getSide() == 'server') {
+            $this->assertEquals($document['headers']['status-code'], 200);
+            $this->assertCount(1, $document['body']['$read']);
+            $this->assertCount(1, $document['body']['$write']);
+            $this->assertEquals(['user:' . $this->getUser()['$id']], $document['body']['$read']);
+            $this->assertEquals(['user:' . $this->getUser()['$id']], $document['body']['$write']);
+        }
+
+        // remove collection
+        $this->client->call(Client::METHOD_DELETE, '/database/collections/' . $moviesId, array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
+        return [];
+    }
 }