diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index e32132531b..20b64cbf71 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -14,13 +14,13 @@ use Appwrite\Utopia\Request; use Utopia\App; use Utopia\Abuse\Abuse; use Utopia\Abuse\Adapters\TimeLimit; -use Utopia\Cache\Adapter\Redis as RedisCache; use Utopia\Cache\Adapter\Filesystem; use Utopia\Cache\Cache; use Utopia\Database\Database; use Utopia\Database\DateTime; use Utopia\Database\Document; use Utopia\Database\Validator\Authorization; +use Utopia\Registry\Registry; $parseLabel = function (string $label, array $responsePayload, array $requestParams, Document $user) { preg_match_all('/{(.*?)}/', $label, $matches); diff --git a/tests/e2e/Services/GraphQL/GraphQLAbuseTest.php b/tests/e2e/Services/GraphQL/GraphQLAbuseTest.php index 9b13281e1a..684523383a 100644 --- a/tests/e2e/Services/GraphQL/GraphQLAbuseTest.php +++ b/tests/e2e/Services/GraphQL/GraphQLAbuseTest.php @@ -7,6 +7,8 @@ use Tests\E2E\Scopes\ProjectCustom; use Tests\E2E\Scopes\Scope; use Tests\E2E\Scopes\SideServer; use Utopia\App; +use Utopia\Database\Permission; +use Utopia\Database\Role; class GraphQLAbuseTest extends Scope { @@ -28,13 +30,13 @@ class GraphQLAbuseTest extends Scope 'databaseName' => 'database', 'collectionId' => 'collection', 'collectionName' => 'collection', - 'collectionPermission' => 'collection', - 'collectionRead' => ['role:member'], - 'collectionWrite' => ['role:member'], - 'documentId' => 'document', - 'documentData' => ['name' => 'foobar'], - 'documentRead' => ['role:member'], - 'documentWrite' => ['role:member'], + 'collectionPermissions' => [ + Permission::read(Role::users()), + Permission::create(Role::users()), + Permission::update(Role::users()), + Permission::delete(Role::users()), + ], + 'documentSecurity' => false, ], ]; diff --git a/tests/e2e/Services/GraphQL/GraphQLBase.php b/tests/e2e/Services/GraphQL/GraphQLBase.php index 7f39975c5c..78accb87cd 100644 --- a/tests/e2e/Services/GraphQL/GraphQLBase.php +++ b/tests/e2e/Services/GraphQL/GraphQLBase.php @@ -1350,12 +1350,12 @@ trait GraphQLBase } }'; case self::$CREATE_DATABASE_STACK: - return 'mutation complex($databaseId: String!, $databaseName: String!, $collectionId: String!, $collectionName: String!, $collectionDocumentSecurity: Boolean!, $collectionPermissions: [String!]!) { + return 'mutation complex($databaseId: String!, $databaseName: String!, $collectionId: String!, $collectionName: String!, $documentSecurity: Boolean!, $collectionPermissions: [String!]!) { databasesCreate(databaseId: $databaseId, name: $databaseName) { _id name } - databasesCreateCollection(databaseId: $databaseId, collectionId: $collectionId, name: $collectionName, documentSecurity: $documentSecurity, permissions $collectionPermissions) { + databasesCreateCollection(databaseId: $databaseId, collectionId: $collectionId, name: $collectionName, documentSecurity: $documentSecurity, permissions: $collectionPermissions) { _id _createdAt _updatedAt