Array scopes

app/controllers/shared/api.php

@@ -379,9 +379,9 @@ App::init()
         }
 
         // Do now allow access if scope is not allowed
-        $scope = $route->getLabel('scope', 'none');
-        if (!\in_array($scope, $scopes)) {
-            throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, $user->getAttribute('email', 'User') . ' (role: ' . \strtolower($roles[$role]['label']) . ') missing scope (' . $scope . ')');
+        $allowed = (array)$route->getLabel('scope', 'none');
+        if (empty(\array_intersect($allowed, $scopes))) {
+            throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, $user->getAttribute('email', 'User') . ' (role: ' . \strtolower($roles[$role]['label']) . ') missing scopes (' . \json_encode($allowed) . ')');
         }
 
         // Do not allow access to blocked accounts

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Create.php

@@ -32,7 +32,7 @@ class Create extends BooleanCreate
             ->desc('Create boolean column')
             ->groups(['api', 'database', 'schema'])
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'column.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Boolean/Update.php

@@ -33,7 +33,7 @@ class Update extends BooleanUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/boolean/:key')
             ->desc('Update boolean column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Create.php

@@ -33,7 +33,7 @@ class Create extends DatetimeCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/datetime')
             ->desc('Create datetime column')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Datetime/Update.php

@@ -35,7 +35,7 @@ class Update extends DatetimeUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/datetime/:key')
             ->desc('Update dateTime column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Delete.php

@@ -32,7 +32,7 @@ class Delete extends AttributesDelete
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key')
             ->desc('Delete column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.delete')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Create.php

@@ -32,7 +32,7 @@ class Create extends EmailCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/email')
             ->desc('Create email column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Email/Update.php

@@ -34,7 +34,7 @@ class Update extends EmailUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/email/:key')
             ->desc('Update email column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Create.php

@@ -34,7 +34,7 @@ class Create extends EnumCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/enum')
             ->desc('Create enum column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Enum/Update.php

@@ -36,7 +36,7 @@ class Update extends EnumUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/enum/:key')
             ->desc('Update enum column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Create.php

@@ -32,7 +32,7 @@ class Create extends FloatCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/float')
             ->desc('Create float column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Float/Update.php

@@ -34,7 +34,7 @@ class Update extends FloatUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/float/:key')
             ->desc('Update float column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Get.php

@@ -41,7 +41,7 @@ class Get extends AttributesGet
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key')
             ->desc('Get column')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Create.php

@@ -32,7 +32,7 @@ class Create extends IPCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/ip')
             ->desc('Create IP address column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/IP/Update.php

@@ -34,7 +34,7 @@ class Update extends IPUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/ip/:key')
             ->desc('Update IP address column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Create.php

@@ -32,7 +32,7 @@ class Create extends IntegerCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/integer')
             ->desc('Create integer column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Integer/Update.php

@@ -34,7 +34,7 @@ class Update extends IntegerUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/integer/:key')
             ->desc('Update integer column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Create.php

@@ -33,7 +33,7 @@ class Create extends RelationshipCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/relationship')
             ->desc('Create relationship column')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/Relationship/Update.php

@@ -33,7 +33,7 @@ class Update extends RelationshipUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/:key/relationship')
             ->desc('Update relationship column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Create.php

@@ -34,7 +34,7 @@ class Create extends StringCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/string')
             ->desc('Create string column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/String/Update.php

@@ -36,7 +36,7 @@ class Update extends StringUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/string/:key')
             ->desc('Update string column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Create.php

@@ -32,7 +32,7 @@ class Create extends URLCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/url')
             ->desc('Create URL column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].create')
             ->label('audits.event', 'column.create')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/URL/Update.php

@@ -34,7 +34,7 @@ class Update extends URLUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns/url/:key')
             ->desc('Update URL column')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].columns.[columnId].update')
             ->label('audits.event', 'column.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Columns/XList.php

@@ -30,7 +30,7 @@ class XList extends AttributesXList
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/columns')
             ->desc('List columns')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Create.php

@@ -35,7 +35,7 @@ class Create extends CollectionCreate
             ->desc('Create table')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].create')
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'table.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{response.$id}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Delete.php

@@ -30,7 +30,7 @@ class Delete extends CollectionDelete
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId')
             ->desc('Delete table')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].delete')
             ->label('audits.event', 'table.delete')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Get.php

@@ -30,7 +30,7 @@ class Get extends CollectionGet
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId')
             ->desc('Get table')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Create.php

@@ -37,7 +37,7 @@ class Create extends IndexCreate
             ->desc('Create index')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].indexes.[indexId].create')
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'index.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Delete.php

@@ -35,7 +35,7 @@ class Delete extends IndexDelete
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes/:key')
             ->desc('Delete index')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].indexes.[indexId].update')
             ->label('audits.event', 'index.delete')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/Get.php

@@ -31,7 +31,7 @@ class Get extends IndexGet
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes/:key')
             ->desc('Get index')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Indexes/XList.php

@@ -31,7 +31,7 @@ class XList extends IndexXList
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/indexes')
             ->desc('List indexes')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Logs/XList.php

@@ -27,7 +27,7 @@ class XList extends CollectionLogXList
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/logs')
             ->desc('List table logs')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Delete.php

@@ -32,7 +32,7 @@ class Delete extends DocumentsDelete
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Delete rows')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.delete')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Update.php

@@ -33,7 +33,7 @@ class Update extends DocumentsUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Update rows')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Bulk/Upsert.php

@@ -32,7 +32,7 @@ class Upsert extends DocumentsUpsert
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Create or update rows')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Decrement.php

@@ -33,7 +33,7 @@ class Decrement extends DecrementDocumentAttribute
             ->desc('Decrement row column')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Column/Increment.php

@@ -33,7 +33,7 @@ class Increment extends IncrementDocumentAttribute
             ->desc('Increment row column')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'rows.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Create.php

@@ -41,7 +41,7 @@ class Create extends DocumentCreate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('Create row')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.create')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Delete.php

@@ -36,7 +36,7 @@ class Delete extends DocumentDelete
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId')
             ->desc('Delete row')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].delete')
             ->label('audits.event', 'row.delete')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Get.php

@@ -32,7 +32,7 @@ class Get extends DocumentGet
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId')
             ->desc('Get row')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.read')
+            ->label('scope', ['rows.read', 'documents.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Logs/XList.php

@@ -27,7 +27,7 @@ class XList extends DocumentLogXList
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows/:rowId/logs')
             ->desc('List row logs')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.read')
+            ->label('scope', ['rows.read', 'documents.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Update.php

@@ -34,7 +34,7 @@ class Update extends DocumentUpdate
             ->desc('Update row')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].update')
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.update')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}/row/{response.$id}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/Upsert.php

@@ -34,7 +34,7 @@ class Upsert extends DocumentUpsert
             ->desc('Create or update a row')
             ->groups(['api', 'database'])
             ->label('event', 'databases.[databaseId].tables.[tableId].rows.[rowId].upsert')
-            ->label('scope', 'rows.write')
+            ->label('scope', ['rows.write', 'documents.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('audits.event', 'row.upsert')
             ->label('audits.resource', 'database/{request.databaseId}/table/{request.tableId}/row/{response.$id}')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Rows/XList.php

@@ -32,7 +32,7 @@ class XList extends DocumentXList
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/rows')
             ->desc('List rows')
             ->groups(['api', 'database'])
-            ->label('scope', 'rows.read')
+            ->label('scope', ['rows.read', 'documents.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Update.php

@@ -33,7 +33,7 @@ class Update extends CollectionUpdate
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId')
             ->desc('Update table')
             ->groups(['api', 'database', 'schema'])
-            ->label('scope', 'tables.write')
+            ->label('scope', ['tables.write', 'collections.write'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('event', 'databases.[databaseId].tables.[tableId].update')
             ->label('audits.event', 'table.update')

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/Usage/Get.php

@@ -31,7 +31,7 @@ class Get extends CollectionUsageGet
             ->setHttpPath('/v1/tablesdb/:databaseId/tables/:tableId/usage')
             ->desc('Get table usage stats')
             ->groups(['api', 'database', 'usage'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Tables/XList.php

@@ -32,7 +32,7 @@ class XList extends CollectionXList
             ->setHttpPath('/v1/tablesdb/:databaseId/tables')
             ->desc('List tables')
             ->groups(['api', 'database'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', new Method(
                 namespace: $this->getSdkNamespace(),

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/Get.php

@@ -26,7 +26,7 @@ class Get extends DatabaseUsageGet
             ->setHttpPath('/v1/tablesdb/:databaseId/usage')
             ->desc('Get TablesDB usage stats')
             ->groups(['api', 'database', 'usage'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', [
                 new Method(

src/Appwrite/Platform/Modules/Databases/Http/TablesDB/Usage/XList.php

@@ -25,7 +25,7 @@ class XList extends DatabaseUsageXList
             ->setHttpPath('/v1/tablesdb/usage')
             ->desc('Get TablesDB usage stats')
             ->groups(['api', 'database', 'usage'])
-            ->label('scope', 'tables.read')
+            ->label('scope', ['tables.read', 'collections.read'])
             ->label('resourceType', RESOURCE_TYPE_DATABASES)
             ->label('sdk', [
                 new Method(

src/Appwrite/SDK/Specification/Format/Swagger2.php

@@ -349,11 +349,10 @@ class Swagger2 extends Format
                 }
             }
 
-            if (!empty($scope)) { //  && 'public' != $scope
+            if (!empty($scope)) {
                 $securities = ['Project' => []];
 
                 foreach ($sdk->getAuth() as $security) {
-                    /** @var AuthType $security */
                     if (\array_key_exists($security->value, $this->keys)) {
                         $securities[$security->value] = [];
                     }