Merge branch 'master' of https://github.com/appwrite/appwrite into feat-pls-merge

2026-05-26 13:51:13 +00:00 · 2022-06-29 05:52:18 +00:00
parent 77b38e3a5e c5dde7c2f5
commit 7bd4e08b68
2136 changed files with 48306 additions and 5876 deletions
@@ -79,14 +79,17 @@ App::post('/v1/projects')
        }

        $projectId = ($projectId == 'unique()') ? $dbForConsole->getId() : $projectId;
+
        if ($projectId === 'console') {
            throw new Exception("'console' is a reserved project.", 400, Exception::PROJECT_RESERVED_PROJECT);
        }
+
        $project = $dbForConsole->createDocument('projects', new Document([
-            '$id' => $projectId == 'unique()' ? $dbForConsole->getId() : $projectId,
+            '$id' => $projectId,
            '$read' => ['team:' . $teamId],
            '$write' => ['team:' . $teamId . '/owner', 'team:' . $teamId . '/developer'],
            'name' => $name,
+            'teamInternalId' => $team->getInternalId(),
            'teamId' => $team->getId(),
            'description' => $description,
            'logo' => $logo,
@@ -112,7 +115,7 @@ App::post('/v1/projects')
        /** @var array $collections */
        $collections = Config::getParam('collections', []);

-        $dbForProject->setNamespace("_{$project->getId()}");
+        $dbForProject->setNamespace("_{$project->getInternalId()}");
        $dbForProject->create('appwrite');

        $audit = new Audit($dbForProject);
@@ -173,7 +176,7 @@ App::get('/v1/projects')
    ->param('limit', 25, new Range(0, 100), 'Results limit value. By default will return maximum 25 results. Maximum of 100 results allowed per request.', true)
    ->param('offset', 0, new Range(0, APP_LIMIT_COUNT), 'Results offset. The default value is 0. Use this param to manage pagination. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
    ->param('cursor', '', new UID(), 'ID of the project used as the starting point for the query, excluding the project itself. Should be used for efficient pagination when working with large sets of data. [learn more about pagination](https://appwrite.io/docs/pagination)', true)
-    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor.', true)
+    ->param('cursorDirection', Database::CURSOR_AFTER, new WhiteList([Database::CURSOR_AFTER, Database::CURSOR_BEFORE]), 'Direction of the cursor, can be either \'before\' or \'after\'.', true)
    ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
    ->inject('response')
    ->inject('dbForConsole')
@@ -271,15 +274,15 @@ App::get('/v1/projects/:projectId/usage')
                ],
            ];

-            $dbForProject->setNamespace("_{$projectId}");
+            $dbForProject->setNamespace("_{$project->getInternalId()}");

            $metrics = [
                'requests',
                'network',
                'executions',
                'users.count',
-                'database.documents.count',
-                'database.collections.count',
+                'databases.documents.count',
+                'databases.collections.count',
                'storage.total'
            ];

@@ -326,8 +329,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']
            ]);
@@ -590,6 +593,7 @@ App::post('/v1/projects/:projectId/webhooks')
            '$id' => $dbForConsole->getId(),
            '$read' => ['role:all'],
            '$write' => ['role:all'],
+            'projectInternalId' => $project->getInternalId(),
            'projectId' => $project->getId(),
            'name' => $name,
            'events' => $events,
@@ -597,6 +601,7 @@ App::post('/v1/projects/:projectId/webhooks')
            'security' => $security,
            'httpUser' => $httpUser,
            'httpPass' => $httpPass,
+            'signatureKey' => \bin2hex(\random_bytes(64)),
        ]);

        $webhook = $dbForConsole->createDocument('webhooks', $webhook);
@@ -629,7 +634,7 @@ App::get('/v1/projects/:projectId/webhooks')
        }

        $webhooks = $dbForConsole->find('webhooks', [
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ], 5000);

        $response->dynamic(new Document([
@@ -662,7 +667,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')

        $webhook = $dbForConsole->findOne('webhooks', [
            new Query('_uid', Query::TYPE_EQUAL, [$webhookId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($webhook === false || $webhook->isEmpty()) {
@@ -704,7 +709,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')

        $webhook = $dbForConsole->findOne('webhooks', [
            new Query('_uid', Query::TYPE_EQUAL, [$webhookId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($webhook === false || $webhook->isEmpty()) {
@@ -721,7 +726,45 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
        ;

        $dbForConsole->updateDocument('webhooks', $webhook->getId(), $webhook);
+        $dbForConsole->deleteCachedDocument('projects', $project->getId());

+        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
+    });
+
+App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
+    ->desc('Update Webhook Signature Key')
+    ->groups(['api', 'projects'])
+    ->label('scope', 'projects.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+    ->label('sdk.namespace', 'projects')
+    ->label('sdk.method', 'updateWebhookSignature')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_WEBHOOK)
+    ->param('projectId', null, new UID(), 'Project unique ID.')
+    ->param('webhookId', null, new UID(), 'Webhook unique ID.')
+    ->inject('response')
+    ->inject('dbForConsole')
+    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
+
+        $project = $dbForConsole->getDocument('projects', $projectId);
+
+        if ($project->isEmpty()) {
+            throw new Exception('Project not found', 404, Exception::PROJECT_NOT_FOUND);
+        }
+
+        $webhook = $dbForConsole->findOne('webhooks', [
+            new Query('_uid', Query::TYPE_EQUAL, [$webhookId]),
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
+        ]);
+
+        if ($webhook === false || $webhook->isEmpty()) {
+            throw new Exception('Webhook not found', 404, Exception::WEBHOOK_NOT_FOUND);
+        }
+
+        $webhook->setAttribute('signatureKey', \bin2hex(\random_bytes(64)));
+
+        $dbForConsole->updateDocument('webhooks', $webhook->getId(), $webhook);
        $dbForConsole->deleteCachedDocument('projects', $project->getId());

        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
@@ -750,7 +793,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')

        $webhook = $dbForConsole->findOne('webhooks', [
            new Query('_uid', Query::TYPE_EQUAL, [$webhookId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($webhook === false || $webhook->isEmpty()) {
@@ -794,6 +837,7 @@ App::post('/v1/projects/:projectId/keys')
            '$id' => $dbForConsole->getId(),
            '$read' => ['role:all'],
            '$write' => ['role:all'],
+            'projectInternalId' => $project->getInternalId(),
            'projectId' => $project->getId(),
            'name' => $name,
            'scopes' => $scopes,
@@ -831,7 +875,7 @@ App::get('/v1/projects/:projectId/keys')
        }

        $keys = $dbForConsole->find('keys', [
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()]),
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()]),
        ], 5000);

        $response->dynamic(new Document([
@@ -864,7 +908,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForConsole->findOne('keys', [
            new Query('_uid', Query::TYPE_EQUAL, [$keyId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($key === false || $key->isEmpty()) {
@@ -901,7 +945,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForConsole->findOne('keys', [
            new Query('_uid', Query::TYPE_EQUAL, [$keyId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($key === false || $key->isEmpty()) {
@@ -944,7 +988,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')

        $key = $dbForConsole->findOne('keys', [
            new Query('_uid', Query::TYPE_EQUAL, [$keyId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($key === false || $key->isEmpty()) {
@@ -989,14 +1033,13 @@ App::post('/v1/projects/:projectId/platforms')
            '$id' => $dbForConsole->getId(),
            '$read' => ['role:all'],
            '$write' => ['role:all'],
+            'projectInternalId' => $project->getInternalId(),
            'projectId' => $project->getId(),
            'type' => $type,
            'name' => $name,
            'key' => $key,
            'store' => $store,
-            'hostname' => $hostname,
-            'dateCreated' => \time(),
-            'dateUpdated' => \time(),
+            'hostname' => $hostname
        ]);

        $platform = $dbForConsole->createDocument('platforms', $platform);
@@ -1062,7 +1105,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')

        $platform = $dbForConsole->findOne('platforms', [
            new Query('_uid', Query::TYPE_EQUAL, [$platformId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($platform === false || $platform->isEmpty()) {
@@ -1099,7 +1142,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')

        $platform = $dbForConsole->findOne('platforms', [
            new Query('_uid', Query::TYPE_EQUAL, [$platformId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($platform === false || $platform->isEmpty()) {
@@ -1108,7 +1151,6 @@ App::put('/v1/projects/:projectId/platforms/:platformId')

        $platform
            ->setAttribute('name', $name)
-            ->setAttribute('dateUpdated', \time())
            ->setAttribute('key', $key)
            ->setAttribute('store', $store)
            ->setAttribute('hostname', $hostname)
@@ -1144,7 +1186,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')

        $platform = $dbForConsole->findOne('platforms', [
            new Query('_uid', Query::TYPE_EQUAL, [$platformId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($platform === false || $platform->isEmpty()) {
@@ -1184,7 +1226,7 @@ App::post('/v1/projects/:projectId/domains')

        $document = $dbForConsole->findOne('domains', [
            new Query('domain', Query::TYPE_EQUAL, [$domain]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()]),
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()]),
        ]);

        if ($document && !$document->isEmpty()) {
@@ -1203,6 +1245,7 @@ App::post('/v1/projects/:projectId/domains')
            '$id' => $dbForConsole->getId(),
            '$read' => ['role:all'],
            '$write' => ['role:all'],
+            'projectInternalId' => $project->getInternalId(),
            'projectId' => $project->getId(),
            'updated' => \time(),
            'domain' => $domain->get(),
@@ -1242,7 +1285,7 @@ App::get('/v1/projects/:projectId/domains')
        }

        $domains = $dbForConsole->find('domains', [
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ], 5000);

        $response->dynamic(new Document([
@@ -1275,7 +1318,7 @@ App::get('/v1/projects/:projectId/domains/:domainId')

        $domain = $dbForConsole->findOne('domains', [
            new Query('_uid', Query::TYPE_EQUAL, [$domainId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($domain === false || $domain->isEmpty()) {
@@ -1309,7 +1352,7 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')

        $domain = $dbForConsole->findOne('domains', [
            new Query('_uid', Query::TYPE_EQUAL, [$domainId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($domain === false || $domain->isEmpty()) {
@@ -1369,7 +1412,7 @@ App::delete('/v1/projects/:projectId/domains/:domainId')

        $domain = $dbForConsole->findOne('domains', [
            new Query('_uid', Query::TYPE_EQUAL, [$domainId]),
-            new Query('projectId', Query::TYPE_EQUAL, [$project->getId()])
+            new Query('projectInternalId', Query::TYPE_EQUAL, [$project->getInternalId()])
        ]);

        if ($domain === false || $domain->isEmpty()) {