Merge branch '0.15.x' into database-layer-docs

app/config/errors.php

@@ -48,6 +48,11 @@ return [
         'description' => 'SMTP is disabled on your Appwrite instance. You can <a href="/docs/email-delivery">learn more about setting up SMTP</a> in our docs.',
         'code' => 503,
     ],
+    Exception::GENERAL_PHONE_DISABLED => [
+        'name' => Exception::GENERAL_PHONE_DISABLED,
+        'description' => 'Phone provider is not configured. Please check the _APP_PHONE_PROVIDER environment variable of your Appwrite server.',
+        'code' => 503,
+    ],
     Exception::GENERAL_ARGUMENT_INVALID => [
         'name' => Exception::GENERAL_ARGUMENT_INVALID,
         'description' => 'The request contains one or more invalid arguments. Please refer to the endpoint documentation.',
@@ -170,6 +175,16 @@ return [
         'description' => 'The requested authentication method is either disabled or unsupported. Please check the supported authentication methods in the Appwrite console.',
         'code' => 501,
     ],
+    Exception::USER_PHONE_ALREADY_EXISTS => [
+        'name' => Exception::USER_PHONE_ALREADY_EXISTS,
+        'description' => 'A user with the same phone number already exists in the current project.',
+        'code' => 409,
+    ],
+    Exception::USER_PHONE_NOT_FOUND => [
+        'name' => Exception::USER_PHONE_NOT_FOUND,
+        'description' => 'The current user does not have a phone number associated with their account.',
+        'code' => 400,
+    ],
 
     /** Teams */
     Exception::TEAM_NOT_FOUND => [

app/controllers/api/account.php

@@ -859,7 +859,7 @@ App::post('/v1/account/sessions/phone')
     ->inject('phone')
     ->action(function (string $userId, string $number, Request $request, Response $response, Document $project, Database $dbForProject, Audit $audits, Event $events, EventPhone $messaging, Phone $phone) {
         if (empty(App::getEnv('_APP_PHONE_PROVIDER'))) {
-            throw new Exception('Phone Disabled', 503, Exception::GENERAL_SMTP_DISABLED);
+            throw new Exception('Phone provider not configured', 503, Exception::GENERAL_PHONE_DISABLED);
         }
 
         $roles = Authorization::getRoles();
@@ -1596,7 +1596,7 @@ App::patch('/v1/account/phone')
         try {
             $user = $dbForProject->updateDocument('users', $user->getId(), $user);
         } catch (Duplicate $th) {
-            throw new Exception('Phone number already exists', 409, Exception::USER_EMAIL_ALREADY_EXISTS);
+            throw new Exception('Phone number already exists', 409, Exception::USER_PHONE_ALREADY_EXISTS);
         }
 
         $audits
@@ -2263,12 +2263,12 @@ App::post('/v1/account/verification/phone')
     ->inject('messaging')
     ->action(function (Request $request, Response $response, Phone $phone, Document $user, Database $dbForProject, Audit $audits, Event $events, Stats $usage, EventPhone $messaging) {
 
-        if (empty(App::getEnv('_APP_SMTP_HOST'))) {
-            throw new Exception('SMTP Disabled', 503, Exception::GENERAL_SMTP_DISABLED);
+        if (empty(App::getEnv('_APP_PHONE_PROVIDER'))) {
+            throw new Exception('Phone provider not configured', 503, Exception::GENERAL_PHONE_DISABLED);
         }
 
         if (empty($user->getAttribute('phone'))) {
-            throw new Exception('User has no phone number.', 400);
+            throw new Exception('User has no phone number.', 400, Exception::USER_PHONE_NOT_FOUND);
         }
 
         $roles = Authorization::getRoles();

app/controllers/api/databases.php

@@ -240,7 +240,7 @@ App::get('/v1/databases')
     ->label('sdk.description', '/docs/references/databases/list.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-    ->label('sdk.response.model', Response::MODEL_COLLECTION_LIST)
+    ->label('sdk.response.model', Response::MODEL_DATABASE_LIST)
     ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
     ->param('limit', 25, new Range(0, 100), 'Maximum number of collection to return in response. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
     ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Offset value. The default value is 0. Use this param to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
@@ -395,6 +395,7 @@ App::put('/v1/databases/:databaseId')
     ->label('sdk.response.model', Response::MODEL_COLLECTION)
     ->param('databaseId', '', new UID(), 'Database ID.')
     ->param('name', null, new Text(128), 'Collection name. Max length: 128 chars.')
+    ->inject('response')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('usage')
@@ -481,6 +482,7 @@ App::delete('/v1/databases/:databaseId')
     });
 
 App::post('/v1/databases/:databaseId/collections')
+    ->alias('/v1/database/collections', ['databaseId' => 'default'])
     ->desc('Create Collection')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].create')
@@ -553,6 +555,7 @@ App::post('/v1/databases/:databaseId/collections')
     });
 
 App::get('/v1/databases/:databaseId/collections')
+    ->alias('/v1/database/collections', ['databaseId' => 'default'])
     ->desc('List Collections')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -606,6 +609,7 @@ App::get('/v1/databases/:databaseId/collections')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId')
+    ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
     ->desc('Get Collection')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -642,6 +646,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
+    ->alias('/v1/database/collections/:collectionId/logs', ['databaseId' => 'default'])
     ->desc('List Collection Logs')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -731,6 +736,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
 
 
 App::put('/v1/databases/:databaseId/collections/:collectionId')
+    ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
     ->desc('Update Collection')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
@@ -803,6 +809,7 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
     });
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId')
+    ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
     ->desc('Delete Collection')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
@@ -866,6 +873,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string')
+    ->alias('/v1/database/collections/:collectionId/attributes/string', ['databaseId' => 'default'])
     ->desc('Create String Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -911,6 +919,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email')
+    ->alias('/v1/database/collections/:collectionId/attributes/email', ['databaseId' => 'default'])
     ->desc('Create Email Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -950,6 +959,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
+    ->alias('/v1/database/collections/:collectionId/attributes/enum', ['databaseId' => 'default'])
     ->desc('Create Enum Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -1005,6 +1015,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
+    ->alias('/v1/database/collections/:collectionId/attributes/ip', ['databaseId' => 'default'])
     ->desc('Create IP Address Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -1044,6 +1055,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
+    ->alias('/v1/database/collections/:collectionId/attributes/url', ['databaseId' => 'default'])
     ->desc('Create URL Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -1083,6 +1095,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/integer')
+    ->alias('/v1/database/collections/:collectionId/attributes/integer', ['databaseId' => 'default'])
     ->desc('Create Integer Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -1151,6 +1164,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float')
+    ->alias('/v1/database/collections/:collectionId/attributes/float', ['databaseId' => 'default'])
     ->desc('Create Float Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -1222,6 +1236,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean')
+    ->alias('/v1/database/collections/:collectionId/attributes/boolean', ['databaseId' => 'default'])
     ->desc('Create Boolean Attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
@@ -1260,6 +1275,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
+    ->alias('/v1/database/collections/:collectionId/attributes', ['databaseId' => 'default'])
     ->desc('List Attributes')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -1301,6 +1317,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
+    ->alias('/v1/database/collections/:collectionId/attributes/:key', ['databaseId' => 'default'])
     ->desc('Get Attribute')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -1371,6 +1388,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
     });
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
+    ->alias('/v1/database/collections/:collectionId/attributes/:key', ['databaseId' => 'default'])
     ->desc('Delete Attribute')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
@@ -1464,6 +1482,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
+    ->alias('/v1/database/collections/:collectionId/indexes', ['databaseId' => 'default'])
     ->desc('Create Index')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].create')
@@ -1587,6 +1606,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
+    ->alias('/v1/database/collections/:collectionId/indexes', ['databaseId' => 'default'])
     ->desc('List Indexes')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -1628,6 +1648,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
+    ->alias('/v1/database/collections/:collectionId/indexes/:key', ['databaseId' => 'default'])
     ->desc('Get Index')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
@@ -1678,6 +1699,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
     });
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
+    ->alias('/v1/database/collections/:collectionId/indexes/:key', ['databaseId' => 'default'])
     ->desc('Delete Index')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
@@ -1752,6 +1774,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
     });
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
+    ->alias('/v1/database/collections/:collectionId/documents', ['databaseId' => 'default'])
     ->desc('Create Document')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].create')
@@ -1874,6 +1897,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
+    ->alias('/v1/database/collections/:collectionId/documents', ['databaseId' => 'default'])
     ->desc('List Documents')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.read')
@@ -1987,6 +2011,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
+    ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
     ->desc('Get Document')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.read')
@@ -2056,6 +2081,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
     });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId/logs')
+    ->alias('/v1/database/collections/:collectionId/documents/:documentId/logs', ['databaseId' => 'default'])
     ->desc('List Document Logs')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.read')
@@ -2149,6 +2175,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
+    ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
     ->desc('Update Document')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].update')
@@ -2163,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')
@@ -2209,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)) {
@@ -2220,6 +2247,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
         $data = \array_merge($document->getArrayCopy(), $data);
 
         $data['$collection'] = $collection->getId(); // Make sure user don't switch collectionID
+        $data['$createdAt'] = $collection->getCreatedAt(); // Make sure user don't switch createdAt
         $data['$id'] = $document->getId(); // Make sure user don't switch document unique ID
         $data['$read'] = (is_null($read)) ? ($document->getRead() ?? []) : $read; // By default inherit read permissions
         $data['$write'] = (is_null($write)) ? ($document->getWrite() ?? []) : $write; // By default inherit write permissions
@@ -2286,6 +2314,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
     });
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
+    ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
     ->desc('Delete Document')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.write')
@@ -2385,330 +2414,331 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
     });
 
 App::get('/v1/databases/usage')
-->desc('Get usage stats for the database')
-->groups(['api', 'database'])
-->label('scope', 'collections.read')
-->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-->label('sdk.namespace', 'databases')
-->label('sdk.method', 'getUsage')
-->label('sdk.response.code', Response::STATUS_CODE_OK)
-->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-->label('sdk.response.model', Response::MODEL_USAGE_DATABASES)
-->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), '`Date range.', true)
-->inject('response')
-->inject('dbForProject')
-->action(function (string $range, Response $response, Database $dbForProject) {
+    ->desc('Get usage stats for the database')
+    ->groups(['api', 'database'])
+    ->label('scope', 'collections.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'databases')
+    ->label('sdk.method', 'getUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_DATABASES)
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), '`Date range.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $range, Response $response, Database $dbForProject) {
 
-    $usage = [];
-    if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
-        $periods = [
-            '24h' => [
-                'period' => '30m',
-                'limit' => 48,
-            ],
-            '7d' => [
-                'period' => '1d',
-                'limit' => 7,
-            ],
-            '30d' => [
-                'period' => '1d',
-                'limit' => 30,
-            ],
-            '90d' => [
-                'period' => '1d',
-                'limit' => 90,
-            ],
-        ];
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '30m',
+                    'limit' => 48,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
 
-        $metrics = [
-            'databases.count',
-            'databases.documents.count',
-            'databases.collections.count',
-            'databases.create',
-            'databases.read',
-            'databases.update',
-            'databases.delete',
-            'databases.collections.create',
-            'databases.collections.read',
-            'databases.collections.update',
-            'databases.collections.delete',
-            'databases.documents.create',
-            'databases.documents.read',
-            'databases.documents.update',
-            'databases.documents.delete'
-        ];
+            $metrics = [
+                'databases.count',
+                'databases.documents.count',
+                'databases.collections.count',
+                'databases.create',
+                'databases.read',
+                'databases.update',
+                'databases.delete',
+                'databases.collections.create',
+                'databases.collections.read',
+                'databases.collections.update',
+                'databases.collections.delete',
+                'databases.documents.create',
+                'databases.documents.read',
+                'databases.documents.update',
+                'databases.documents.delete'
+            ];
 
-        $stats = [];
+            $stats = [];
 
-        Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $periods[$range]['limit'];
-                $period = $periods[$range]['period'];
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
 
-                $requestDocs = $dbForProject->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $limit, 0, ['time'], [Database::ORDER_DESC]);
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '30m' => 1800,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    // TODO@kodumbeats explore performance if query is ordered by time ASC
+                    $stats[$metric] = array_reverse($stats[$metric]);
                 }
+            });
 
-                // backfill metrics with empty values for graphs
-                $backfill = $limit - \count($requestDocs);
-                while ($backfill > 0) {
-                    $last = $limit - $backfill - 1; // array index of last added metric
-                    $diff = match ($period) { // convert period to seconds for unix timestamp math
-                        '30m' => 1800,
-                        '1d' => 86400,
-                    };
-                    $stats[$metric][] = [
-                        'value' => 0,
-                        'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
-                    ];
-                    $backfill--;
-                }
-                // TODO@kodumbeats explore performance if query is ordered by time ASC
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-        });
+            $usage = new Document([
+                'range' => $range,
+                'databasesCount' => $stats["databases.count"],
+                'documentsCount' => $stats["databases.documents.count"],
+                'collectionsCount' => $stats["databases.collections.count"],
+                'documentsCreate' =>  $stats["databases.documents.create"],
+                'documentsRead' =>  $stats["databases.documents.read"],
+                'documentsUpdate' => $stats["databases.documents.update"],
+                'documentsDelete' => $stats["databases.documents.delete"],
+                'collectionsCreate' => $stats["databases.collections.create"],
+                'collectionsRead' =>  $stats["databases.collections.read"],
+                'collectionsUpdate' => $stats["databases.collections.update"],
+                'collectionsDelete' => $stats["databases.collections.delete"],
+                'databasesCreate' => $stats["databases.create"],
+                'databasesRead' =>  $stats["databases.read"],
+                'databasesUpdate' => $stats["databases.update"],
+                'databasesDelete' => $stats["databases.delete"],
+            ]);
+        }
 
-        $usage = new Document([
-            'range' => $range,
-            'databasesCount' => $stats["databases.count"],
-            'documentsCount' => $stats["databases.documents.count"],
-            'collectionsCount' => $stats["databases.collections.count"],
-            'documentsCreate' =>  $stats["databases.documents.create"],
-            'documentsRead' =>  $stats["databases.documents.read"],
-            'documentsUpdate' => $stats["databases.documents.update"],
-            'documentsDelete' => $stats["databases.documents.delete"],
-            'collectionsCreate' => $stats["databases.collections.create"],
-            'collectionsRead' =>  $stats["databases.collections.read"],
-            'collectionsUpdate' => $stats["databases.collections.update"],
-            'collectionsDelete' => $stats["databases.collections.delete"],
-            'databasesCreate' => $stats["databases.create"],
-            'databasesRead' =>  $stats["databases.read"],
-            'databasesUpdate' => $stats["databases.update"],
-            'databasesDelete' => $stats["databases.delete"],
-        ]);
-    }
-
-    $response->dynamic($usage, Response::MODEL_USAGE_DATABASES);
-});
+        $response->dynamic($usage, Response::MODEL_USAGE_DATABASES);
+    });
 
 App::get('/v1/databases/:databaseId/usage')
-->desc('Get usage stats for the database')
-->groups(['api', 'database'])
-->label('scope', 'collections.read')
-->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-->label('sdk.namespace', 'databases')
-->label('sdk.method', 'getDatabaseUsage')
-->label('sdk.response.code', Response::STATUS_CODE_OK)
-->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-->label('sdk.response.model', Response::MODEL_USAGE_DATABASE)
-->param('databaseId', '', new UID(), 'Database ID.')
-->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), '`Date range.', true)
-->inject('response')
-->inject('dbForProject')
-->action(function (string $databaseId, string $range, Response $response, Database $dbForProject) {
+    ->desc('Get usage stats for the database')
+    ->groups(['api', 'database'])
+    ->label('scope', 'collections.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'databases')
+    ->label('sdk.method', 'getDatabaseUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_DATABASE)
+    ->param('databaseId', '', new UID(), 'Database ID.')
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), '`Date range.', true)
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $databaseId, string $range, Response $response, Database $dbForProject) {
 
-    $usage = [];
-    if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
-        $periods = [
-            '24h' => [
-                'period' => '30m',
-                'limit' => 48,
-            ],
-            '7d' => [
-                'period' => '1d',
-                'limit' => 7,
-            ],
-            '30d' => [
-                'period' => '1d',
-                'limit' => 30,
-            ],
-            '90d' => [
-                'period' => '1d',
-                'limit' => 90,
-            ],
-        ];
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '30m',
+                    'limit' => 48,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
 
-        $metrics = [
-            'databases.' . $databaseId . '.documents.count',
-            'databases.' . $databaseId . '.collections.count',
-            'databases.' . $databaseId . '.collections.create',
-            'databases.' . $databaseId . '.collections.read',
-            'databases.' . $databaseId . '.collections.update',
-            'databases.' . $databaseId . '.collections.delete',
-            'databases.' . $databaseId . '.documents.create',
-            'databases.' . $databaseId . '.documents.read',
-            'databases.' . $databaseId . '.documents.update',
-            'databases.' . $databaseId . '.documents.delete'
-        ];
+            $metrics = [
+                'databases.' . $databaseId . '.documents.count',
+                'databases.' . $databaseId . '.collections.count',
+                'databases.' . $databaseId . '.collections.create',
+                'databases.' . $databaseId . '.collections.read',
+                'databases.' . $databaseId . '.collections.update',
+                'databases.' . $databaseId . '.collections.delete',
+                'databases.' . $databaseId . '.documents.create',
+                'databases.' . $databaseId . '.documents.read',
+                'databases.' . $databaseId . '.documents.update',
+                'databases.' . $databaseId . '.documents.delete'
+            ];
 
-        $stats = [];
+            $stats = [];
 
-        Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $periods[$range]['limit'];
-                $period = $periods[$range]['period'];
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
 
-                $requestDocs = $dbForProject->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $limit, 0, ['time'], [Database::ORDER_DESC]);
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '30m' => 1800,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    // TODO@kodumbeats explore performance if query is ordered by time ASC
+                    $stats[$metric] = array_reverse($stats[$metric]);
                 }
+            });
 
-                // backfill metrics with empty values for graphs
-                $backfill = $limit - \count($requestDocs);
-                while ($backfill > 0) {
-                    $last = $limit - $backfill - 1; // array index of last added metric
-                    $diff = match ($period) { // convert period to seconds for unix timestamp math
-                        '30m' => 1800,
-                        '1d' => 86400,
-                    };
-                    $stats[$metric][] = [
-                        'value' => 0,
-                        'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
-                    ];
-                    $backfill--;
-                }
-                // TODO@kodumbeats explore performance if query is ordered by time ASC
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-        });
+            $usage = new Document([
+                'range' => $range,
+                'documentsCount' => $stats["databases.{$databaseId}.documents.count"],
+                'collectionsCount' => $stats["databases.{$databaseId}.collections.count"],
+                'documentsCreate' =>  $stats["databases.{$databaseId}.documents.create"],
+                'documentsRead' =>  $stats["databases.{$databaseId}.documents.read"],
+                'documentsUpdate' => $stats["databases.{$databaseId}.documents.update"],
+                'documentsDelete' => $stats["databases.{$databaseId}.documents.delete"],
+                'collectionsCreate' => $stats["databases.{$databaseId}.collections.create"],
+                'collectionsRead' =>  $stats["databases.{$databaseId}.collections.read"],
+                'collectionsUpdate' => $stats["databases.{$databaseId}.collections.update"],
+                'collectionsDelete' => $stats["databases.{$databaseId}.collections.delete"],
+            ]);
+        }
 
-        $usage = new Document([
-            'range' => $range,
-            'documentsCount' => $stats["databases.{$databaseId}.documents.count"],
-            'collectionsCount' => $stats["databases.{$databaseId}.collections.count"],
-            'documentsCreate' =>  $stats["databases.{$databaseId}.documents.create"],
-            'documentsRead' =>  $stats["databases.{$databaseId}.documents.read"],
-            'documentsUpdate' => $stats["databases.{$databaseId}.documents.update"],
-            'documentsDelete' => $stats["databases.{$databaseId}.documents.delete"],
-            'collectionsCreate' => $stats["databases.{$databaseId}.collections.create"],
-            'collectionsRead' =>  $stats["databases.{$databaseId}.collections.read"],
-            'collectionsUpdate' => $stats["databases.{$databaseId}.collections.update"],
-            'collectionsDelete' => $stats["databases.{$databaseId}.collections.delete"],
-        ]);
-    }
-
-    $response->dynamic($usage, Response::MODEL_USAGE_DATABASE);
-});
+        $response->dynamic($usage, Response::MODEL_USAGE_DATABASE);
+    });
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
-->desc('Get usage stats for a collection')
-->groups(['api', 'database'])
-->label('scope', 'collections.read')
-->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
-->label('sdk.namespace', 'databases')
-->label('sdk.method', 'getCollectionUsage')
-->label('sdk.response.code', Response::STATUS_CODE_OK)
-->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
-->label('sdk.response.model', Response::MODEL_USAGE_COLLECTION)
-->param('databaseId', '', new UID(), 'Database ID.')
-->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
-->param('collectionId', '', new UID(), 'Collection ID.')
-->inject('response')
-->inject('dbForProject')
-->action(function (string $databaseId, string $range, string $collectionId, Response $response, Database $dbForProject) {
+    ->alias('/v1/database/collections/:collectionId/documents', ['databaseId' => 'default'])
+    ->desc('Get usage stats for a collection')
+    ->groups(['api', 'database'])
+    ->label('scope', 'collections.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'databases')
+    ->label('sdk.method', 'getCollectionUsage')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_USAGE_COLLECTION)
+    ->param('databaseId', '', new UID(), 'Database ID.')
+    ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
+    ->param('collectionId', '', new UID(), 'Collection ID.')
+    ->inject('response')
+    ->inject('dbForProject')
+    ->action(function (string $databaseId, string $range, string $collectionId, Response $response, Database $dbForProject) {
 
-    $database = $dbForProject->getDocument('databases', $databaseId);
+        $database = $dbForProject->getDocument('databases', $databaseId);
 
-    $collectionDocument = $dbForProject->getDocument('database_' . $database->getInternalId(), $collectionId);
-    $collection = $dbForProject->getCollection('database_' . $database->getInternalId() . '_collection_' . $collectionDocument->getInternalId());
+        $collectionDocument = $dbForProject->getDocument('database_' . $database->getInternalId(), $collectionId);
+        $collection = $dbForProject->getCollection('database_' . $database->getInternalId() . '_collection_' . $collectionDocument->getInternalId());
 
-    if ($collection->isEmpty()) {
-        throw new Exception('Collection not found', 404, Exception::COLLECTION_NOT_FOUND);
-    }
+        if ($collection->isEmpty()) {
+            throw new Exception('Collection not found', 404, Exception::COLLECTION_NOT_FOUND);
+        }
 
-    $usage = [];
-    if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
-        $periods = [
-            '24h' => [
-                'period' => '30m',
-                'limit' => 48,
-            ],
-            '7d' => [
-                'period' => '1d',
-                'limit' => 7,
-            ],
-            '30d' => [
-                'period' => '1d',
-                'limit' => 30,
-            ],
-            '90d' => [
-                'period' => '1d',
-                'limit' => 90,
-            ],
-        ];
+        $usage = [];
+        if (App::getEnv('_APP_USAGE_STATS', 'enabled') == 'enabled') {
+            $periods = [
+                '24h' => [
+                    'period' => '30m',
+                    'limit' => 48,
+                ],
+                '7d' => [
+                    'period' => '1d',
+                    'limit' => 7,
+                ],
+                '30d' => [
+                    'period' => '1d',
+                    'limit' => 30,
+                ],
+                '90d' => [
+                    'period' => '1d',
+                    'limit' => 90,
+                ],
+            ];
 
-        $metrics = [
-            "databases.{$databaseId}.collections.{$collectionId}.documents.count",
-            "databases.{$databaseId}.collections.{$collectionId}.documents.create",
-            "databases.{$databaseId}.collections.{$collectionId}.documents.read",
-            "databases.{$databaseId}.collections.{$collectionId}.documents.update",
-            "databases.{$databaseId}.collections.{$collectionId}.documents.delete",
-        ];
+            $metrics = [
+                "databases.{$databaseId}.collections.{$collectionId}.documents.count",
+                "databases.{$databaseId}.collections.{$collectionId}.documents.create",
+                "databases.{$databaseId}.collections.{$collectionId}.documents.read",
+                "databases.{$databaseId}.collections.{$collectionId}.documents.update",
+                "databases.{$databaseId}.collections.{$collectionId}.documents.delete",
+            ];
 
-        $stats = [];
+            $stats = [];
 
-        Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $limit = $periods[$range]['limit'];
-                $period = $periods[$range]['period'];
+            Authorization::skip(function () use ($dbForProject, $periods, $range, $metrics, &$stats) {
+                foreach ($metrics as $metric) {
+                    $limit = $periods[$range]['limit'];
+                    $period = $periods[$range]['period'];
 
-                $requestDocs = $dbForProject->find('stats', [
-                    new Query('period', Query::TYPE_EQUAL, [$period]),
-                    new Query('metric', Query::TYPE_EQUAL, [$metric]),
-                ], $limit, 0, ['time'], [Database::ORDER_DESC]);
+                    $requestDocs = $dbForProject->find('stats', [
+                        new Query('period', Query::TYPE_EQUAL, [$period]),
+                        new Query('metric', Query::TYPE_EQUAL, [$metric]),
+                    ], $limit, 0, ['time'], [Database::ORDER_DESC]);
 
-                $stats[$metric] = [];
-                foreach ($requestDocs as $requestDoc) {
-                    $stats[$metric][] = [
-                        'value' => $requestDoc->getAttribute('value'),
-                        'date' => $requestDoc->getAttribute('time'),
-                    ];
+                    $stats[$metric] = [];
+                    foreach ($requestDocs as $requestDoc) {
+                        $stats[$metric][] = [
+                            'value' => $requestDoc->getAttribute('value'),
+                            'date' => $requestDoc->getAttribute('time'),
+                        ];
+                    }
+
+                    // backfill metrics with empty values for graphs
+                    $backfill = $limit - \count($requestDocs);
+                    while ($backfill > 0) {
+                        $last = $limit - $backfill - 1; // array index of last added metric
+                        $diff = match ($period) { // convert period to seconds for unix timestamp math
+                            '30m' => 1800,
+                            '1d' => 86400,
+                        };
+                        $stats[$metric][] = [
+                            'value' => 0,
+                            'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
+                        ];
+                        $backfill--;
+                    }
+                    $stats[$metric] = array_reverse($stats[$metric]);
                 }
+            });
 
-                // backfill metrics with empty values for graphs
-                $backfill = $limit - \count($requestDocs);
-                while ($backfill > 0) {
-                    $last = $limit - $backfill - 1; // array index of last added metric
-                    $diff = match ($period) { // convert period to seconds for unix timestamp math
-                        '30m' => 1800,
-                        '1d' => 86400,
-                    };
-                    $stats[$metric][] = [
-                        'value' => 0,
-                        'date' => ($stats[$metric][$last]['date'] ?? \time()) - $diff, // time of last metric minus period
-                    ];
-                    $backfill--;
-                }
-                $stats[$metric] = array_reverse($stats[$metric]);
-            }
-        });
+            $usage = new Document([
+                'range' => $range,
+                'documentsCount' => $stats["databases.{$databaseId}.collections.{$collectionId}.documents.count"],
+                'documentsCreate' => $stats["databases.{$databaseId}.collections.{$collectionId}.documents.create"],
+                'documentsRead' => $stats["databases.{$databaseId}.collections.{$collectionId}.documents.read"],
+                'documentsUpdate' =>  $stats["databases.{$databaseId}.collections.{$collectionId}.documents.update"],
+                'documentsDelete' =>  $stats["databases.{$databaseId}.collections.{$collectionId}.documents.delete"]
+            ]);
+        }
 
-        $usage = new Document([
-            'range' => $range,
-            'documentsCount' => $stats["databases.{$databaseId}.collections.{$collectionId}.documents.count"],
-            'documentsCreate' => $stats["databases.{$databaseId}.collections.{$collectionId}.documents.create"],
-            'documentsRead' => $stats["databases.{$databaseId}.collections.{$collectionId}.documents.read"],
-            'documentsUpdate' =>  $stats["databases.{$databaseId}.collections.{$collectionId}.documents.update"],
-            'documentsDelete' =>  $stats["databases.{$databaseId}.collections.{$collectionId}.documents.delete"]
-        ]);
-    }
-
-    $response->dynamic($usage, Response::MODEL_USAGE_COLLECTION);
-});
+        $response->dynamic($usage, Response::MODEL_USAGE_COLLECTION);
+    });

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/projects.php

@@ -278,8 +278,8 @@ App::get('/v1/projects/:projectId/usage')
                 'network',
                 'executions',
                 'users.count',
-                'database.documents.count',
-                'database.collections.count',
+                'databases.documents.count',
+                'databases.collections.count',
                 'storage.total'
             ];
 
@@ -326,8 +326,8 @@ App::get('/v1/projects/:projectId/usage')
                 'requests' => $stats['requests'],
                 'network' => $stats['network'],
                 'functions' => $stats['executions'],
-                'documents' => $stats['database.documents.count'],
-                'collections' => $stats['database.collections.count'],
+                'documents' => $stats['databases.documents.count'],
+                'collections' => $stats['databases.collections.count'],
                 'users' => $stats['users.count'],
                 'storage' => $stats['storage.total']
             ]);

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

@@ -281,6 +281,7 @@ $logs = $this->getParam('logs', null);
                                                 data-scope="sdk"
                                                 data-event="submit"
                                                 data-confirm="Are you sure you want to delete this attribute?"
+                                                data-param-database-id="{{router.params.databaseId}}"
                                                 data-success="alert,trigger"
                                                 data-success-param-alert-text="Deleted attribute successfully"
                                                 data-success-param-trigger-events="databases.deleteAttribute"
@@ -397,6 +398,7 @@ $logs = $this->getParam('logs', null);
                                         data-scope="sdk"
                                         data-event="submit"
                                         data-confirm="Are you sure you want to delete this index?"
+                                        data-param-database-id="{{router.params.databaseId}}"
                                         data-success="alert,trigger"
                                         data-success-param-alert-text="Deleted index successfully"
                                         data-success-param-trigger-events="databases.deleteIndex"
@@ -582,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

@@ -24,7 +24,7 @@ $logs = $this->getParam('logs', null);
 
         <div class="cover">
             <h1 class="zone xl margin-bottom-large">
-                <a data-ls-attrs="href=/console/databases/collection?id={{router.params.collection}}&project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> <span data-ls-bind="{{project-collection.name}}"></span></a>
+                <a data-ls-attrs="href=/console/databases/collection?id={{router.params.collection}}&databaseId={{router.params.databaseId}}&project={{router.params.project}}" class="back text-size-small link-return-animation--start"><i class="icon-left-open"></i> <span data-ls-bind="{{project-collection.name}}"></span></a>
 
                 <br />
 
@@ -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

@@ -80,19 +80,19 @@ $smtpEnabled = $this->getParam('smtpEnabled', false);
                                     <td data-title="Name: ">
                                         <a data-ls-attrs="href=/console/users/user?id={{user.$id}}&project={{router.params.project}}">
                                             <span data-ls-bind="{{user.name}}" data-ls-attrs="title={{user.name}}"></span>
-                                            <span data-ls-if="{{user.name|escape}} === '' && {{user.email}} !== ''">Unknown</span>
-                                            <span data-ls-if="{{user.name|escape}} === '' && {{user.email}} === ''">Anonymous User</span>
+                                            <span data-ls-if="{{user.name|escape}} === '' && ({{user.email}} !== '' || {{user.phone}} !== '')">Unknown</span>
+                                            <span data-ls-if="{{user.name|escape}} === '' && {{user.email}} === '' && {{user.phone}} === ''">Anonymous User</span>
                                         </a>
                                     </td>
                                     <td data-title="Email: ">
-                                        <small data-ls-bind="{{user.email}}" data-ls-attrs="title={{user.email}}"></span>
+                                        <span data-ls-bind="{{user.email}}" data-ls-attrs="title={{user.email}}"></span>
                                     </td>
                                     <td data-title="Status: ">
-                                        <span data-ls-if="{{user.emailVerification}} === true && {{user.status}} === true">
+                                        <span data-ls-if="({{user.emailVerification}} || {{user.phoneVerification}}) && {{user.status}} === true">
                                             <span class="tag green">Verified</span>
                                         </span>
 
-                                        <span data-ls-if="{{user.emailVerification}} !== true && {{user.status}} === true">
+                                        <span data-ls-if="!({{user.emailVerification}} || {{user.phoneVerification}}) && {{user.status}} === true">
                                             <span class="tag">Unverified</span>
                                         </span>
 
@@ -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">

app/workers/databases.php

@@ -121,7 +121,7 @@ class DatabaseV1 extends Worker
             );
         }
 
-        $dbForProject->deleteCachedDocument('collections', $collectionId);
+        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
     }
 
     /**
@@ -233,8 +233,8 @@ class DatabaseV1 extends Worker
             }
         }
 
-        $dbForProject->deleteCachedDocument('collections', $collectionId);
-        $dbForProject->deleteCachedCollection('collection_' . $collection->getInternalId());
+        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
+        $dbForProject->deleteCachedCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
     }
 
     /**
@@ -291,7 +291,7 @@ class DatabaseV1 extends Worker
             );
         }
 
-        $dbForProject->deleteCachedDocument('collections', $collectionId);
+        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collectionId);
     }
 
     /**
@@ -344,6 +344,6 @@ class DatabaseV1 extends Worker
             );
         }
 
-        $dbForProject->deleteCachedDocument('collections', $collection->getId());
+        $dbForProject->deleteCachedDocument('database_' . $database->getInternalId(), $collection->getId());
     }
 }

composer.json

@@ -71,7 +71,7 @@
         }
     ],
     "require-dev": {
-        "appwrite/sdk-generator": "0.18.8",
+        "appwrite/sdk-generator": "0.19.0",
         "phpunit/phpunit": "9.5.20",
         "squizlabs/php_codesniffer": "^3.6",
         "swoole/ide-helper": "4.8.9",

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": "1593c7304ba026d4073de336227858f3",
+    "content-hash": "5d91773f78edc4fe8702d152b0a307c2",
     "packages": [
         {
             "name": "adhocore/jwt",
@@ -1581,62 +1581,6 @@
             },
             "time": "2021-06-04T20:33:46+00:00"
         },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "3.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
-            },
-            "bin": [
-                "bin/phpcs",
-                "bin/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
-            },
-            "time": "2022-06-18T07:21:10+00:00"
-        },
         {
             "name": "symfony/deprecation-contracts",
             "version": "v3.1.0",
@@ -2884,16 +2828,16 @@
     "packages-dev": [
         {
             "name": "appwrite/sdk-generator",
-            "version": "0.18.8",
+            "version": "0.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/appwrite/sdk-generator.git",
-                "reference": "8ba45dfb74ff6062f96c0e4d10d7c4fae94768b1"
+                "reference": "c3f795752173963334cec43af1d33a29a9d22016"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/8ba45dfb74ff6062f96c0e4d10d7c4fae94768b1",
-                "reference": "8ba45dfb74ff6062f96c0e4d10d7c4fae94768b1",
+                "url": "https://api.github.com/repos/appwrite/sdk-generator/zipball/c3f795752173963334cec43af1d33a29a9d22016",
+                "reference": "c3f795752173963334cec43af1d33a29a9d22016",
                 "shasum": ""
             },
             "require": {
@@ -2928,9 +2872,9 @@
             "description": "Appwrite PHP library for generating API SDKs for multiple programming languages and platforms",
             "support": {
                 "issues": "https://github.com/appwrite/sdk-generator/issues",
-                "source": "https://github.com/appwrite/sdk-generator/tree/0.18.8"
+                "source": "https://github.com/appwrite/sdk-generator/tree/0.19.0"
             },
-            "time": "2022-05-19T10:34:06+00:00"
+            "time": "2022-06-22T08:43:07+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -4963,6 +4907,62 @@
             ],
             "time": "2020-09-28T06:39:44+00:00"
         },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "3.7.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "bin": [
+                "bin/phpcs",
+                "bin/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.x-dev"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
+            "time": "2022-06-18T07:21:10+00:00"
+        },
         {
             "name": "swoole/ide-helper",
             "version": "4.8.9",

docs/examples/0.15.x/client-android/java/databases/create-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 public class MainActivity extends AppCompatActivity {
 
@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Database database = new Database(client);
+        Databases databases = new Databases(client);
 
-        database.createDocument(
+        databases.createDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]", 
             mapOf( "a" to "b" ), 

docs/examples/0.15.x/client-android/java/databases/delete-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 public class MainActivity extends AppCompatActivity {
 
@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Database database = new Database(client);
+        Databases databases = new Databases(client);
 
-        database.deleteDocument(
+        databases.deleteDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]"
             new Continuation<Object>() {

docs/examples/0.15.x/client-android/java/databases/get-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 public class MainActivity extends AppCompatActivity {
 
@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Database database = new Database(client);
+        Databases databases = new Databases(client);
 
-        database.getDocument(
+        databases.getDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]"
             new Continuation<Object>() {

docs/examples/0.15.x/client-android/java/databases/list-documents.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 public class MainActivity extends AppCompatActivity {
 
@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Database database = new Database(client);
+        Databases databases = new Databases(client);
 
-        database.listDocuments(
+        databases.listDocuments(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             new Continuation<Object>() {
                 @NotNull

docs/examples/0.15.x/client-android/java/databases/update-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 public class MainActivity extends AppCompatActivity {
 
@@ -16,9 +16,10 @@ public class MainActivity extends AppCompatActivity {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2"); // Your project ID
 
-        Database database = new Database(client);
+        Databases databases = new Databases(client);
 
-        database.updateDocument(
+        databases.updateDocument(
+            "[DATABASE_ID]", 
             "[COLLECTION_ID]", 
             "[DOCUMENT_ID]", 
             mapOf( "a" to "b" ), 

docs/examples/0.15.x/client-android/kotlin/databases/create-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val database = Database(client)
+        val databases = Databases(client)
 
         GlobalScope.launch {
-            val response = database.createDocument(
+            val response = databases.createDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]",
                 data = mapOf( "a" to "b" ),

docs/examples/0.15.x/client-android/kotlin/databases/delete-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val database = Database(client)
+        val databases = Databases(client)
 
         GlobalScope.launch {
-            val response = database.deleteDocument(
+            val response = databases.deleteDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]"
             )

docs/examples/0.15.x/client-android/kotlin/databases/get-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val database = Database(client)
+        val databases = Databases(client)
 
         GlobalScope.launch {
-            val response = database.getDocument(
+            val response = databases.getDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]"
             )

docs/examples/0.15.x/client-android/kotlin/databases/list-documents.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val database = Database(client)
+        val databases = Databases(client)
 
         GlobalScope.launch {
-            val response = database.listDocuments(
+            val response = databases.listDocuments(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
             )
             val json = response.body?.string()        

docs/examples/0.15.x/client-android/kotlin/databases/update-document.md

@@ -3,7 +3,7 @@ import android.os.Bundle
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import io.appwrite.Client
-import io.appwrite.services.Database
+import io.appwrite.services.Databases
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -14,10 +14,11 @@ class MainActivity : AppCompatActivity() {
             .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
             .setProject("5df5acd0d48c2") // Your project ID
 
-        val database = Database(client)
+        val databases = Databases(client)
 
         GlobalScope.launch {
-            val response = database.updateDocument(
+            val response = databases.updateDocument(
+                databaseId = "[DATABASE_ID]",
                 collectionId = "[COLLECTION_ID]",
                 documentId = "[DOCUMENT_ID]",
                 data = mapOf( "a" to "b" ),

docs/examples/0.15.x/client-apple/examples/account/update-prefs.md

@@ -6,7 +6,7 @@ func main() async throws {
       .setProject("5df5acd0d48c2") // Your project ID
     let account = Account(client)
     let user = try await account.updatePrefs(
-        prefs: 
+        prefs: [:]
     )
 
     print(String(describing: user)

docs/examples/0.15.x/client-apple/examples/databases/create-document.md

@@ -4,11 +4,12 @@ func main() async throws {
     let client = Client()
       .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
       .setProject("5df5acd0d48c2") // Your project ID
-    let database = Database(client)
-    let document = try await database.createDocument(
+    let databases = Databases(client)
+    let document = try await databases.createDocument(
+        databaseId: "[DATABASE_ID]",
         collectionId: "[COLLECTION_ID]",
         documentId: "[DOCUMENT_ID]",
-        data: 
+        data: [:]
     )
 
     print(String(describing: document)

docs/examples/0.15.x/client-apple/examples/databases/delete-document.md

@@ -4,8 +4,9 @@ func main() async throws {
     let client = Client()
       .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
       .setProject("5df5acd0d48c2") // Your project ID
-    let database = Database(client)
-    let result = try await database.deleteDocument(
+    let databases = Databases(client)
+    let result = try await databases.deleteDocument(
+        databaseId: "[DATABASE_ID]",
         collectionId: "[COLLECTION_ID]",
         documentId: "[DOCUMENT_ID]"
     )

docs/examples/0.15.x/client-apple/examples/databases/get-document.md

@@ -4,8 +4,9 @@ func main() async throws {
     let client = Client()
       .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
       .setProject("5df5acd0d48c2") // Your project ID
-    let database = Database(client)
-    let document = try await database.getDocument(
+    let databases = Databases(client)
+    let document = try await databases.getDocument(
+        databaseId: "[DATABASE_ID]",
         collectionId: "[COLLECTION_ID]",
         documentId: "[DOCUMENT_ID]"
     )

docs/examples/0.15.x/client-apple/examples/databases/list-documents.md

@@ -4,8 +4,9 @@ func main() async throws {
     let client = Client()
       .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
       .setProject("5df5acd0d48c2") // Your project ID
-    let database = Database(client)
-    let documentList = try await database.listDocuments(
+    let databases = Databases(client)
+    let documentList = try await databases.listDocuments(
+        databaseId: "[DATABASE_ID]",
         collectionId: "[COLLECTION_ID]"
     )
 

docs/examples/0.15.x/client-apple/examples/databases/update-document.md

@@ -4,11 +4,12 @@ func main() async throws {
     let client = Client()
       .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
       .setProject("5df5acd0d48c2") // Your project ID
-    let database = Database(client)
-    let document = try await database.updateDocument(
+    let databases = Databases(client)
+    let document = try await databases.updateDocument(
+        databaseId: "[DATABASE_ID]",
         collectionId: "[COLLECTION_ID]",
         documentId: "[DOCUMENT_ID]",
-        data: 
+        data: [:]
     )
 
     print(String(describing: document)

docs/examples/0.15.x/client-flutter/examples/databases/create-document.md

@@ -2,13 +2,14 @@ import 'package:appwrite/appwrite.dart';
 
 void main() { // Init SDK
   Client client = Client();
-  Database database = Database(client);
+  Databases databases = Databases(client);
 
   client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
   ;
-  Future result = database.createDocument(
+  Future result = databases.createDocument(
+    databaseId: '[DATABASE_ID]',
     collectionId: '[COLLECTION_ID]',
     documentId: '[DOCUMENT_ID]',
     data: {},

docs/examples/0.15.x/client-flutter/examples/databases/delete-document.md

@@ -2,13 +2,14 @@ import 'package:appwrite/appwrite.dart';
 
 void main() { // Init SDK
   Client client = Client();
-  Database database = Database(client);
+  Databases databases = Databases(client);
 
   client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
   ;
-  Future result = database.deleteDocument(
+  Future result = databases.deleteDocument(
+    databaseId: '[DATABASE_ID]',
     collectionId: '[COLLECTION_ID]',
     documentId: '[DOCUMENT_ID]',
   );

docs/examples/0.15.x/client-flutter/examples/databases/get-document.md

@@ -2,13 +2,14 @@ import 'package:appwrite/appwrite.dart';
 
 void main() { // Init SDK
   Client client = Client();
-  Database database = Database(client);
+  Databases databases = Databases(client);
 
   client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
   ;
-  Future result = database.getDocument(
+  Future result = databases.getDocument(
+    databaseId: '[DATABASE_ID]',
     collectionId: '[COLLECTION_ID]',
     documentId: '[DOCUMENT_ID]',
   );

docs/examples/0.15.x/client-flutter/examples/databases/list-documents.md

@@ -2,13 +2,14 @@ import 'package:appwrite/appwrite.dart';
 
 void main() { // Init SDK
   Client client = Client();
-  Database database = Database(client);
+  Databases databases = Databases(client);
 
   client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
   ;
-  Future result = database.listDocuments(
+  Future result = databases.listDocuments(
+    databaseId: '[DATABASE_ID]',
     collectionId: '[COLLECTION_ID]',
   );
 

docs/examples/0.15.x/client-flutter/examples/databases/update-document.md

@@ -2,13 +2,14 @@ import 'package:appwrite/appwrite.dart';
 
 void main() { // Init SDK
   Client client = Client();
-  Database database = Database(client);
+  Databases databases = Databases(client);
 
   client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
   ;
-  Future result = database.updateDocument(
+  Future result = databases.updateDocument(
+    databaseId: '[DATABASE_ID]',
     collectionId: '[COLLECTION_ID]',
     documentId: '[DOCUMENT_ID]',
     data: {},

docs/examples/0.15.x/client-web/examples/account/create-anonymous-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createAnonymousSession();
+const promise = account.createAnonymousSession();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-email-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createEmailSession('email@example.com', 'password');
+const promise = account.createEmailSession('email@example.com', 'password');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-j-w-t.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createJWT();
+const promise = account.createJWT();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-magic-u-r-l-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createMagicURLSession('[USER_ID]', 'email@example.com');
+const promise = account.createMagicURLSession('[USER_ID]', 'email@example.com');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-o-auth2session.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
 // Go to OAuth provider login page
-sdk.account.createOAuth2Session('amazon');
+account.createOAuth2Session('amazon');
 

docs/examples/0.15.x/client-web/examples/account/create-phone-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createPhoneSession('[USER_ID]', '');
+const promise = account.createPhoneSession('[USER_ID]', '');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-phone-verification.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createPhoneVerification();
+const promise = account.createPhoneVerification();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-recovery.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createRecovery('email@example.com', 'https://example.com');
+const promise = account.createRecovery('email@example.com', 'https://example.com');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create-verification.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.createVerification('https://example.com');
+const promise = account.createVerification('https://example.com');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/create.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.create('[USER_ID]', 'email@example.com', 'password');
+const promise = account.create('[USER_ID]', 'email@example.com', 'password');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/delete-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.deleteSession('[SESSION_ID]');
+const promise = account.deleteSession('[SESSION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/delete-sessions.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.deleteSessions();
+const promise = account.deleteSessions();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/get-logs.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.getLogs();
+const promise = account.getLogs();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/get-prefs.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.getPrefs();
+const promise = account.getPrefs();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/get-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.getSession('[SESSION_ID]');
+const promise = account.getSession('[SESSION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/get-sessions.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.getSessions();
+const promise = account.getSessions();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/get.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.get();
+const promise = account.get();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-email.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateEmail('email@example.com', 'password');
+const promise = account.updateEmail('email@example.com', 'password');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-magic-u-r-l-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateMagicURLSession('[USER_ID]', '[SECRET]');
+const promise = account.updateMagicURLSession('[USER_ID]', '[SECRET]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-name.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateName('[NAME]');
+const promise = account.updateName('[NAME]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-password.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updatePassword('password');
+const promise = account.updatePassword('password');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-phone-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updatePhoneSession('[USER_ID]', '[SECRET]');
+const promise = account.updatePhoneSession('[USER_ID]', '[SECRET]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-phone-verification.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updatePhoneVerification('[USER_ID]', '[SECRET]');
+const promise = account.updatePhoneVerification('[USER_ID]', '[SECRET]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-phone.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updatePhone('', 'password');
+const promise = account.updatePhone('', 'password');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-prefs.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updatePrefs({});
+const promise = account.updatePrefs({});
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-recovery.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateRecovery('[USER_ID]', '[SECRET]', 'password', 'password');
+const promise = account.updateRecovery('[USER_ID]', '[SECRET]', 'password', 'password');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-session.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateSession('[SESSION_ID]');
+const promise = account.updateSession('[SESSION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-status.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateStatus();
+const promise = account.updateStatus();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/account/update-verification.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Account } from "appwrite";
 
-sdk
+const client = new Client();
+
+const account = new Account(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.account.updateVerification('[USER_ID]', '[SECRET]');
+const promise = account.updateVerification('[USER_ID]', '[SECRET]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/avatars/get-browser.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getBrowser('aa');
+const result = avatars.getBrowser('aa');
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/avatars/get-credit-card.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getCreditCard('amex');
+const result = avatars.getCreditCard('amex');
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/avatars/get-favicon.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getFavicon('https://example.com');
+const result = avatars.getFavicon('https://example.com');
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/avatars/get-flag.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getFlag('af');
+const result = avatars.getFlag('af');
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/avatars/get-image.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getImage('https://example.com');
+const result = avatars.getImage('https://example.com');
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/avatars/get-initials.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getInitials();
+const result = avatars.getInitials();
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/avatars/get-q-r.md

@@ -1,10 +1,14 @@
-const sdk = new Appwrite();
+import { Client, Avatars } from "appwrite";
 
-sdk
+const client = new Client();
+
+const avatars = new Avatars(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let result = sdk.avatars.getQR('[TEXT]');
+const result = avatars.getQR('[TEXT]');
 
 console.log(result); // Resource URL

docs/examples/0.15.x/client-web/examples/databases/create-document.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Databases } from "appwrite";
 
-sdk
+const client = new Client();
+
+const databases = new Databases(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.database.createDocument('[COLLECTION_ID]', '[DOCUMENT_ID]', {});
+const promise = databases.createDocument('[DATABASE_ID]', '[COLLECTION_ID]', '[DOCUMENT_ID]', {});
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/databases/delete-document.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Databases } from "appwrite";
 
-sdk
+const client = new Client();
+
+const databases = new Databases(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.database.deleteDocument('[COLLECTION_ID]', '[DOCUMENT_ID]');
+const promise = databases.deleteDocument('[DATABASE_ID]', '[COLLECTION_ID]', '[DOCUMENT_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/databases/get-document.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Databases } from "appwrite";
 
-sdk
+const client = new Client();
+
+const databases = new Databases(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.database.getDocument('[COLLECTION_ID]', '[DOCUMENT_ID]');
+const promise = databases.getDocument('[DATABASE_ID]', '[COLLECTION_ID]', '[DOCUMENT_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/databases/list-documents.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Databases } from "appwrite";
 
-sdk
+const client = new Client();
+
+const databases = new Databases(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.database.listDocuments('[COLLECTION_ID]');
+const promise = databases.listDocuments('[DATABASE_ID]', '[COLLECTION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/databases/update-document.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Databases } from "appwrite";
 
-sdk
+const client = new Client();
+
+const databases = new Databases(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.database.updateDocument('[COLLECTION_ID]', '[DOCUMENT_ID]', {});
+const promise = databases.updateDocument('[DATABASE_ID]', '[COLLECTION_ID]', '[DOCUMENT_ID]', {});
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/functions/create-execution.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Functions } from "appwrite";
 
-sdk
+const client = new Client();
+
+const functions = new Functions(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.functions.createExecution('[FUNCTION_ID]');
+const promise = functions.createExecution('[FUNCTION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/functions/get-execution.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Functions } from "appwrite";
 
-sdk
+const client = new Client();
+
+const functions = new Functions(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.functions.getExecution('[FUNCTION_ID]', '[EXECUTION_ID]');
+const promise = functions.getExecution('[FUNCTION_ID]', '[EXECUTION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/functions/list-executions.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Functions } from "appwrite";
 
-sdk
+const client = new Client();
+
+const functions = new Functions(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.functions.listExecutions('[FUNCTION_ID]');
+const promise = functions.listExecutions('[FUNCTION_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/functions/retry-build.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Functions } from "appwrite";
 
-sdk
+const client = new Client();
+
+const functions = new Functions(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.functions.retryBuild('[FUNCTION_ID]', '[DEPLOYMENT_ID]', '[BUILD_ID]');
+const promise = functions.retryBuild('[FUNCTION_ID]', '[DEPLOYMENT_ID]', '[BUILD_ID]');
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/locale/get-continents.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Locale } from "appwrite";
 
-sdk
+const client = new Client();
+
+const locale = new Locale(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.locale.getContinents();
+const promise = locale.getContinents();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/locale/get-countries-e-u.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Locale } from "appwrite";
 
-sdk
+const client = new Client();
+
+const locale = new Locale(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.locale.getCountriesEU();
+const promise = locale.getCountriesEU();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/locale/get-countries-phones.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Locale } from "appwrite";
 
-sdk
+const client = new Client();
+
+const locale = new Locale(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.locale.getCountriesPhones();
+const promise = locale.getCountriesPhones();
 
 promise.then(function (response) {
     console.log(response); // Success

docs/examples/0.15.x/client-web/examples/locale/get-countries.md

@@ -1,11 +1,15 @@
-const sdk = new Appwrite();
+import { Client, Locale } from "appwrite";
 
-sdk
+const client = new Client();
+
+const locale = new Locale(client);
+
+client
     .setEndpoint('https://[HOSTNAME_OR_IP]/v1') // Your API Endpoint
     .setProject('5df5acd0d48c2') // Your project ID
 ;
 
-let promise = sdk.locale.getCountries();
+const promise = locale.getCountries();
 
 promise.then(function (response) {
     console.log(response); // Success