CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-02 18:26:49 +13:00
Code Issues Projects Releases Wiki Activity

Fix reserved attribute selections

Browse source
This commit is contained in:
Jake Barnby 2022-10-21 13:53:54 +13:00
parent 81e1d2ac82
commit f9a32f6011
No known key found for this signature in database
GPG key ID: C437A8CC85B96E9C
21 changed files with 256 additions and 287 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
docs/examples/1.2.x/client-graphql/examples/account/create-o-auth2session.md
View file

@ -1,7 +0,0 @@
query {
accountCreateOAuth2Session(
provider: "amazon"
) {
status
}
}

6
docs/examples/1.2.x/client-graphql/examples/graphql/get.md
View file

@ -1,6 +0,0 @@
query {
graphqlGet(
query: "[QUERY]"
) {
}
}

6
docs/examples/1.2.x/client-graphql/examples/graphql/post.md
View file

@ -1,6 +0,0 @@
mutation {
graphqlPost(
query: "{}"
) {
}
}

6
docs/examples/1.2.x/server-graphql/examples/graphql/get.md
View file

@ -1,6 +0,0 @@
query {
graphqlGet(
query: "[QUERY]"
) {
}
}

6
docs/examples/1.2.x/server-graphql/examples/graphql/post.md
View file

@ -1,6 +0,0 @@
mutation {
graphqlPost(
query: "{}"
) {
}
}

2
src/Appwrite/GraphQL/Schema.php
View file

@ -163,7 +163,7 @@ class Schema
$array = $attr['array'];
$required = $attr['required'];
$default = $attr['default'];
$escapedKey = str_replace('$', '_', $key);
$escapedKey = str_replace('$', '', $key);
$collections[$collectionId][$escapedKey] = [
'type' => Mapper::attribute(
$type,

2
src/Appwrite/GraphQL/Types/Mapper.php
View file

@ -162,7 +162,7 @@ class Mapper
}
foreach ($model->getRules() as $key => $rule) {
$escapedKey = str_replace('$', '_', $key);
$escapedKey = str_replace('$', '', $key);
if (\is_array($rule['type'])) {
$type = self::getUnionType($escapedKey, $rule);

2
tests/e2e/Services/GraphQL/AccountTest.php
View file

@ -285,7 +285,7 @@ class AccountTest extends Scope
$this->assertArrayNotHasKey('errors', $session['body']);
$this->assertIsArray($session['body']['data']);
$this->assertIsArray($session['body']['data']['accountGetSession']);
$this->assertEquals($this->getUser()['sessionId'], $session['body']['data']['accountGetSession']['_id']);
$this->assertEquals($this->getUser()['sessionId'], $session['body']['data']['accountGetSession']['id']);
return $session;
}

32
tests/e2e/Services/GraphQL/AuthTest.php
View file

@ -106,11 +106,11 @@ class AuthTest extends Scope
// Create collection
$query = $this->getQuery(self::$CREATE_COLLECTION);
$userId = $this->account1['body']['data']['accountCreate']['_id'];
$userId = $this->account1['body']['data']['accountCreate']['id'];
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $this->database['body']['data']['databasesCreate']['_id'],
'databaseId' => $this->database['body']['data']['databasesCreate']['id'],
'collectionId' => ID::unique(),
'name' => 'Actors',
'documentSecurity' => true,
@ -130,8 +130,8 @@ class AuthTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $this->database['body']['data']['databasesCreate']['_id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['_id'],
'databaseId' => $this->database['body']['data']['databasesCreate']['id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['id'],
'key' => 'name',
'size' => 256,
'required' => true,
@ -152,12 +152,12 @@ class AuthTest extends Scope
// Create document as account 1
$query = $this->getQuery(self::$CREATE_DOCUMENT);
$userId = $this->account1['body']['data']['accountCreate']['_id'];
$userId = $this->account1['body']['data']['accountCreate']['id'];
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $this->database['body']['data']['databasesCreate']['_id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['_id'],
'databaseId' => $this->database['body']['data']['databasesCreate']['id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['id'],
'documentId' => ID::unique(),
'data' => [
'name' => 'John Doe',
@ -180,9 +180,9 @@ class AuthTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $this->database['body']['data']['databasesCreate']['_id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['_id'],
'documentId' => $document['body']['data']['databasesCreateDocument']['_id'],
'databaseId' => $this->database['body']['data']['databasesCreate']['id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['id'],
'documentId' => $document['body']['data']['databasesCreateDocument']['id'],
]
];
$document = $this->client->call(Client::METHOD_POST, '/graphql', [
@ -211,12 +211,12 @@ class AuthTest extends Scope
// Create document as account 1
$query = $this->getQuery(self::$CREATE_DOCUMENT);
$userId = $this->account1['body']['data']['accountCreate']['_id'];
$userId = $this->account1['body']['data']['accountCreate']['id'];
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $this->database['body']['data']['databasesCreate']['_id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['_id'],
'databaseId' => $this->database['body']['data']['databasesCreate']['id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['id'],
'documentId' => ID::unique(),
'data' => [
'name' => 'John Doe',
@ -239,9 +239,9 @@ class AuthTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $this->database['body']['data']['databasesCreate']['_id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['_id'],
'documentId' => $document['body']['data']['databasesCreateDocument']['_id'],
'databaseId' => $this->database['body']['data']['databasesCreate']['id'],
'collectionId' => $this->collection['body']['data']['databasesCreateCollection']['id'],
'documentId' => $document['body']['data']['databasesCreateDocument']['id'],
]
];
$document = $this->client->call(Client::METHOD_POST, '/graphql', [

176
tests/e2e/Services/GraphQL/Base.php
View file

@ -286,7 +286,7 @@ trait Base
case self::$CREATE_DATABASE:
return 'mutation createDatabase($databaseId: String!, $name: String!) {
databasesCreate(databaseId: $databaseId, name: $name) {
_id
id
name
}
}';
@ -295,7 +295,7 @@ trait Base
databasesList {
total
databases {
_id
id
name
}
}
@ -303,14 +303,14 @@ trait Base
case self::$GET_DATABASE:
return 'query getDatabase($databaseId: String!) {
databasesGet(databaseId: $databaseId) {
_id
id
name
}
}';
case self::$UPDATE_DATABASE:
return 'mutation updateDatabase($databaseId: String!, $name: String!) {
databasesUpdate(databaseId: $databaseId, name: $name) {
_id
id
name
}
}';
@ -323,8 +323,8 @@ trait Base
case self::$GET_COLLECTION:
return 'query getCollection($databaseId: String!, $collectionId: String!) {
databasesGetCollection(databaseId: $databaseId, collectionId: $collectionId) {
_id
_permissions
id
permissions
documentSecurity
name
}
@ -334,8 +334,8 @@ trait Base
databasesListCollections(databaseId: $databaseId) {
total
collections {
_id
_permissions
id
permissions
documentSecurity
name
}
@ -344,8 +344,8 @@ trait Base
case self::$CREATE_COLLECTION:
return 'mutation createCollection($databaseId: String!, $collectionId: String!, $name: String!, $documentSecurity: Boolean!, $permissions: [String!]!) {
databasesCreateCollection(databaseId: $databaseId, collectionId: $collectionId, name: $name, documentSecurity: $documentSecurity, permissions: $permissions) {
_id
_permissions
id
permissions
documentSecurity
name
}
@ -353,8 +353,8 @@ trait Base
case self::$UPDATE_COLLECTION:
return 'mutation updateCollection($databaseId: String!, $collectionId: String!, $name: String!, $documentSecurity: Boolean!, $permissions: [String!], $enabled: Boolean){
databasesUpdateCollection(databaseId: $databaseId, collectionId: $collectionId, name: $name, documentSecurity: $documentSecurity, permissions: $permissions, enabled: $enabled) {
_id
_permissions
id
permissions
documentSecurity
name
}
@ -508,9 +508,9 @@ trait Base
case self::$GET_DOCUMENT:
return 'query getDocument($databaseId: String!, $collectionId: String!, $documentId: String!) {
databasesGetDocument(databaseId: $databaseId, collectionId: $collectionId, documentId: $documentId) {
_id
_collectionId
_permissions
id
collectionId
permissions
data
}
}';
@ -519,9 +519,9 @@ trait Base
databasesListDocuments(databaseId: $databaseId, collectionId: $collectionId) {
total
documents {
_id
_collectionId
_permissions
id
collectionId
permissions
data
}
}
@ -529,15 +529,15 @@ trait Base
case self::$CREATE_DOCUMENT:
return 'mutation createDocument($databaseId: String!, $collectionId: String!, $documentId: String!, $data: Json!, $permissions: [String!]){
databasesCreateDocument(databaseId: $databaseId, collectionId: $collectionId, documentId: $documentId, data: $data, permissions: $permissions) {
_id
_collectionId
_permissions
id
collectionId
permissions
}
}';
case self::$CREATE_CUSTOM_ENTITY:
return 'mutation createActor($name: String!, $age: Int!, $alive: Boolean!, $salary: Float, $email: String!, $role: String!, $dob: String!, $ip: String, $url: String){
actorsCreate(name: $name, age: $age, alive: $alive, salary: $salary, email: $email, role: $role, dob: $dob, ip: $ip, url: $url) {
_id
id
name
age
alive
@ -549,7 +549,7 @@ trait Base
case self::$GET_CUSTOM_ENTITIES:
return 'query getCustomEntities {
actorsList {
_id
id
name
age
alive
@ -596,8 +596,8 @@ trait Base
case self::$UPDATE_DOCUMENT:
return 'mutation updateDocument($databaseId: String!, $collectionId: String!, $documentId: String!, $data: Json!, $permissions: [String!]){
databasesUpdateDocument(databaseId: $databaseId, collectionId: $collectionId, documentId: $documentId, data: $data, permissions: $permissions) {
_id
_collectionId
id
collectionId
data
}
}';
@ -611,7 +611,7 @@ trait Base
case self::$GET_USER:
return 'query getUser($userId : String!) {
usersGet(userId : $userId) {
_id
id
name
registration
status
@ -634,7 +634,7 @@ trait Base
usersListSessions(userId : $userId) {
total
sessions {
_id
id
userId
}
}
@ -644,7 +644,7 @@ trait Base
usersListMemberships(userId : $userId) {
total
memberships {
_id
id
userId
teamId
}
@ -665,7 +665,7 @@ trait Base
usersList(queries: $queries, search: $search) {
total
users {
_id
id
name
registration
status
@ -677,7 +677,7 @@ trait Base
case self::$CREATE_USER:
return 'mutation createUser($userId: String!, $email: String!, $password: String!, $name: String){
usersCreate(userId: $userId, email: $email, password: $password, name: $name) {
_id
id
name
registration
status
@ -688,7 +688,7 @@ trait Base
case self::$UPDATE_USER_STATUS:
return 'mutation updateUserStatus($userId: String!, $status: Boolean!){
usersUpdateStatus(userId: $userId, status: $status) {
_id
id
name
email
}
@ -696,7 +696,7 @@ trait Base
case self::$UPDATE_USER_NAME:
return 'mutation updateUserName($userId: String!, $name: String!){
usersUpdateName(userId: $userId, name: $name) {
_id
id
name
registration
status
@ -707,7 +707,7 @@ trait Base
case self::$UPDATE_USER_EMAIL:
return 'mutation updateUserEmail($userId: String!, $email: String!){
usersUpdateEmail(userId: $userId, email: $email) {
_id
id
name
registration
status
@ -718,7 +718,7 @@ trait Base
case self::$UPDATE_USER_PASSWORD:
return 'mutation updateUserPassword($userId: String!, $password: String!){
usersUpdatePassword(userId: $userId, password: $password) {
_id
id
name
registration
status
@ -750,7 +750,7 @@ trait Base
case self::$UPDATE_USER_PHONE_VERIFICATION:
return 'mutation updateUserPhoneVerification($userId: String!, $phoneVerification: Boolean!){
usersUpdatePhoneVerification(userId: $userId, phoneVerification: $phoneVerification) {
_id
id
name
email
}
@ -888,7 +888,7 @@ trait Base
case self::$GET_ACCOUNT:
return 'query getAccount {
accountGet {
_id
id
name
email
status
@ -899,7 +899,7 @@ trait Base
case self::$CREATE_ACCOUNT:
return 'mutation createAccount($userId: String!, $email: String!, $password: String!, $name: String){
accountCreate(userId: $userId, email: $email, password: $password, name: $name) {
_id
id
name
registration
status
@ -910,7 +910,7 @@ trait Base
case self::$UPDATE_ACCOUNT_NAME:
return 'mutation updateAccountName($name: String!){
accountUpdateName(name: $name) {
_id
id
name
status
email
@ -920,7 +920,7 @@ trait Base
case self::$UPDATE_ACCOUNT_EMAIL:
return 'mutation updateAccountEmail($email: String!, $password: String!){
accountUpdateEmail(email: $email, password: $password) {
_id
id
name
status
email
@ -929,7 +929,7 @@ trait Base
case self::$UPDATE_ACCOUNT_PASSWORD:
return 'mutation updateAccountPassword($password: String!, $oldPassword: String!){
accountUpdatePassword(password: $password, oldPassword: $oldPassword) {
_id
id
name
status
email
@ -938,7 +938,7 @@ trait Base
case self::$UPDATE_ACCOUNT_PHONE:
return 'mutation updateAccountPhone($phone: String!, $password: String!){
accountUpdatePhone(phone: $phone, password: $password) {
_id
id
name
status
email
@ -948,7 +948,7 @@ trait Base
case self::$UPDATE_ACCOUNT_PREFS:
return 'mutation updateAccountPrefs($userId: String!, $prefs: Json!){
accountUpdatePrefs(userId: $userId, prefs: $prefs) {
_id
id
name
registration
status
@ -966,14 +966,14 @@ trait Base
case self::$GET_ACCOUNT_SESSION:
return 'query getAccountSession($sessionId: String!) {
accountGetSession(sessionId: $sessionId) {
_id
id
userId
}
}';
case self::$CREATE_ACCOUNT_SESSION:
return 'mutation createAccountEmailSession($email: String!, $password: String!){
accountCreateEmailSession(email: $email, password: $password) {
_id
id
userId
expire
ip
@ -1011,7 +1011,7 @@ trait Base
case self::$CREATE_ANONYMOUS_SESSION:
return 'mutation createAnonymousSession {
accountCreateAnonymousSession {
_id
id
userId
}
}';
@ -1032,7 +1032,7 @@ trait Base
accountListSessions {
total
sessions {
_id
id
userId
expire
}
@ -1101,7 +1101,7 @@ trait Base
case self::$GET_TEAM:
return 'query getTeam($teamId: String!){
teamsGet(teamId: $teamId) {
_id
id
name
total
}
@ -1119,7 +1119,7 @@ trait Base
case self::$CREATE_TEAM:
return 'mutation createTeam($teamId: String!, $name: String!, $roles: [String]){
teamsCreate(teamId: $teamId, name : $name, roles: $roles) {
_id
id
name
total
}
@ -1127,7 +1127,7 @@ trait Base
case self::$UPDATE_TEAM:
return 'mutation updateTeam($teamId: String!, $name: String!){
teamsUpdate(teamId: $teamId, name : $name) {
_id
id
name
total
}
@ -1141,7 +1141,7 @@ trait Base
case self::$GET_TEAM_MEMBERSHIP:
return 'query getTeamMembership($teamId: String!, $membershipId: String!){
teamsGetMembership(teamId: $teamId, membershipId: $membershipId) {
_id
id
teamId
userId
userName
@ -1153,7 +1153,7 @@ trait Base
teamsListMemberships(teamId: $teamId) {
total
memberships {
_id
id
teamId
userId
userName
@ -1164,7 +1164,7 @@ trait Base
case self::$CREATE_TEAM_MEMBERSHIP:
return 'mutation createTeamMembership($teamId: String!, $email: String!, $name: String, $roles: [String!]!, $url: String!){
teamsCreateMembership(teamId: $teamId, email: $email, name : $name, roles: $roles, url: $url) {
_id
id
userId
teamId
userName
@ -1178,7 +1178,7 @@ trait Base
case self::$UPDATE_TEAM_MEMBERSHIP_ROLES:
return 'mutation updateTeamMembershipRoles($teamId: String!, $membershipId: String!, $roles: [String!]!){
teamsUpdateMembershipRoles(teamId: $teamId, membershipId: $membershipId, roles: $roles) {
_id
id
userId
teamId
userName
@ -1192,7 +1192,7 @@ trait Base
case self::$UPDATE_TEAM_MEMBERSHIP_STATUS:
return 'mutation updateTeamMembership($teamId: String!, $membershipId: String!, $userId: String!, $secret: String!){
teamsUpdateMembershipStatus(teamId: $teamId, membershipId: $membershipId, userId: $userId, secret: $secret ) {
_id
id
userId
teamId
userName
@ -1212,7 +1212,7 @@ trait Base
case self::$GET_FUNCTION:
return 'query getFunction($functionId: String!) {
functionsGet(functionId: $functionId) {
_id
id
name
runtime
execute
@ -1223,7 +1223,7 @@ trait Base
functionsList {
total
functions {
_id
id
name
runtime
execute
@ -1246,7 +1246,7 @@ trait Base
functionsListDeployments(functionId: $functionId) {
total
deployments {
_id
id
buildStdout
buildStderr
}
@ -1255,7 +1255,7 @@ trait Base
case self::$GET_DEPLOYMENT:
return 'query getDeployment($functionId: String!, $deploymentId: String!) {
functionsGetDeployment(functionId: $functionId, deploymentId: $deploymentId) {
_id
id
buildId
buildStdout
buildStderr
@ -1264,7 +1264,7 @@ trait Base
case self::$CREATE_FUNCTION:
return 'mutation createFunction($functionId: String!, $name: String!, $execute: [String!]!, $runtime: String! $events: [String], $schedule: String, $timeout: Int) {
functionsCreate(functionId: $functionId, name: $name, execute: $execute, runtime: $runtime, events: $events, schedule: $schedule, timeout: $timeout) {
_id
id
name
runtime
execute
@ -1273,7 +1273,7 @@ trait Base
case self::$UPDATE_FUNCTION:
return 'mutation updateFunction($functionId: String!, $name: String!, $execute: [String!]!, $events: [String], $schedule: String, $timeout: Int) {
functionsUpdate(functionId: $functionId, name: $name, execute: $execute, events: $events, schedule: $schedule, timeout: $timeout) {
_id
id
name
runtime
execute
@ -1282,7 +1282,7 @@ trait Base
case self::$UPDATE_DEPLOYMENT:
return 'mutation updateFunctionDeployment($functionId: String!, $deploymentId: String!) {
functionsUpdateDeployment(functionId: $functionId, deploymentId: $deploymentId) {
_id
id
name
runtime
execute
@ -1297,7 +1297,7 @@ trait Base
case self::$CREATE_VARIABLE:
return 'mutation createVariable($functionId: String!, $key: String!, $value: String!) {
functionsCreateVariable(functionId: $functionId, key: $key, value: $value) {
_id
id
key
value
}
@ -1307,7 +1307,7 @@ trait Base
functionsListVariables(functionId: $functionId) {
total
variables {
_id
id
key
value
}
@ -1316,7 +1316,7 @@ trait Base
case self::$GET_VARIABLE:
return 'query getVariable($functionId: String!, $variableId: String!) {
functionsGetVariable(functionId: $functionId, variableId: $variableId) {
_id
id
key
value
}
@ -1324,7 +1324,7 @@ trait Base
case self::$UPDATE_VARIABLE:
return 'mutation updateVariable($functionId: String!, $variableId: String!, $key: String!, $value: String) {
functionsUpdateVariable(functionId: $functionId, variableId: $variableId, key: $key, value: $value) {
_id
id
key
value
}
@ -1338,7 +1338,7 @@ trait Base
case self::$CREATE_DEPLOYMENT:
return 'mutation createDeployment($functionId: String!, $entrypoint: String!, $code: InputFile!, $activate: Boolean!) {
functionsCreateDeployment(functionId: $functionId, entrypoint: $entrypoint, code: $code, activate: $activate) {
_id
id
buildId
entrypoint
size
@ -1356,7 +1356,7 @@ trait Base
case self::$GET_EXECUTION:
return 'query getExecution($functionId: String!$executionId: String!) {
functionsGetExecution(functionId: $functionId, executionId: $executionId) {
_id
id
status
stderr
}
@ -1366,7 +1366,7 @@ trait Base
functionsListExecutions(functionId: $functionId) {
total
executions {
_id
id
status
stderr
}
@ -1375,7 +1375,7 @@ trait Base
case self::$CREATE_EXECUTION:
return 'mutation createExecution($functionId: String!, $data: String, $async: Boolean) {
functionsCreateExecution(functionId: $functionId, data: $data, async: $async) {
_id
id
status
stderr
}
@ -1395,10 +1395,10 @@ trait Base
case self::$CREATE_BUCKET:
return 'mutation createBucket($bucketId: String!, $name: String!, $fileSecurity: Boolean, $permissions: [String!]) {
storageCreateBucket(bucketId: $bucketId, name: $name, fileSecurity: $fileSecurity, permissions: $permissions) {
_id
_createdAt
_updatedAt
_permissions
id
createdAt
updatedAt
permissions
name
enabled
fileSecurity
@ -1409,7 +1409,7 @@ trait Base
storageListBuckets {
total
buckets {
_id
id
name
enabled
}
@ -1418,7 +1418,7 @@ trait Base
case self::$GET_BUCKET:
return 'query getBucket($bucketId: String!) {
storageGetBucket(bucketId: $bucketId) {
_id
id
name
enabled
}
@ -1426,7 +1426,7 @@ trait Base
case self::$UPDATE_BUCKET:
return 'mutation updateBucket($bucketId: String!, $name: String!, $fileSecurity: Boolean, $permissions: [String!]) {
storageUpdateBucket(bucketId: $bucketId, name: $name, fileSecurity: $fileSecurity, permissions: $permissions) {
_id
id
name
enabled
}
@ -1440,7 +1440,7 @@ trait Base
case self::$CREATE_FILE:
return 'mutation createFile($bucketId: String!, $fileId: String!, $file: InputFile!, $permissions: [String!]) {
storageCreateFile(bucketId: $bucketId, fileId: $fileId, file: $file, permissions: $permissions) {
_id
id
bucketId
name
}
@ -1450,7 +1450,7 @@ trait Base
storageListFiles(bucketId: $bucketId) {
total
files {
_id
id
name
}
}
@ -1458,7 +1458,7 @@ trait Base
case self::$GET_FILE:
return 'query getFile($bucketId: String!, $fileId: String!) {
storageGetFile(bucketId: $bucketId, fileId: $fileId) {
_id
id
name
}
}';
@ -1483,7 +1483,7 @@ trait Base
case self::$UPDATE_FILE:
return 'mutation updateFile($bucketId: String!, $fileId: String!, $permissions: [String!]) {
storageUpdateFile(bucketId: $bucketId, fileId: $fileId, permissions: $permissions) {
_id
id
name
}
}';
@ -1563,14 +1563,14 @@ trait Base
case self::$CREATE_DATABASE_STACK:
return 'mutation complex($databaseId: String!, $databaseName: String!, $collectionId: String!, $collectionName: String!, $documentSecurity: Boolean!, $collectionPermissions: [String!]!) {
databasesCreate(databaseId: $databaseId, name: $databaseName) {
_id
id
name
}
databasesCreateCollection(databaseId: $databaseId, collectionId: $collectionId, name: $collectionName, documentSecurity: $documentSecurity, permissions: $collectionPermissions) {
_id
_createdAt
_updatedAt
_permissions
id
createdAt
updatedAt
permissions
databaseId
name
documentSecurity
@ -1611,9 +1611,9 @@ trait Base
array
}
usersCreate(userId: "unique()", email: "test1@appwrite.io", password: "password", name: "Tester 1") {
_id
_createdAt
_updatedAt
id
createdAt
updatedAt
name
phone
email

6
tests/e2e/Services/GraphQL/BatchTest.php
View file

@ -111,7 +111,7 @@ class BatchTest extends Scope
$email2 = 'tester' . \uniqid() . '@example.com';
$query = 'mutation CreateAccount($userId: String!, $email: String!, $password: String!, $name: String) {
accountCreate(userId: $userId, email: $email, password: $password, name: $name) {
_id
id
}
}';
@ -200,7 +200,7 @@ class BatchTest extends Scope
[
'query' => 'mutation CreateAccount($userId: String!, $email: String!, $password: String!, $name: String) {
accountCreate(userId: $userId, email: $email, password: $password, name: $name) {
_id
id
}
}',
'variables' => [
@ -227,7 +227,7 @@ class BatchTest extends Scope
$this->assertArrayHasKey('accountCreate', $response['body'][2]['data']);
$this->assertEquals(194, $response['body'][0]['data']['localeListCountries']['total']);
$this->assertEquals(194, $response['body'][1]['data']['localeListCountries']['total']);
$this->assertArrayHasKey('_id', $response['body'][2]['data']['accountCreate']);
$this->assertArrayHasKey('id', $response['body'][2]['data']['accountCreate']);
}
public function testQueryBatchedQueries()

2
tests/e2e/Services/GraphQL/ContentTypeTest.php
View file

@ -129,7 +129,7 @@ class ContentTypeTest extends Scope
'operations' => \json_encode([
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
'fileId' => ID::unique(),
'file' => null,
'fileSecurity' => true,

36
tests/e2e/Services/GraphQL/DatabaseClientTest.php
View file

@ -52,7 +52,7 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $database['_id'],
'databaseId' => $database['id'],
'collectionId' => 'actors',
'name' => 'Actors',
'documentSecurity' => false,
@ -92,8 +92,8 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'name',
'size' => 256,
'required' => true,
@ -123,8 +123,8 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'age',
'min' => 18,
'max' => 150,
@ -158,8 +158,8 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => ID::unique(),
'data' => [
'name' => 'John Doe',
@ -202,8 +202,8 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
]
];
@ -228,9 +228,9 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'documentId' => $data['document']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => $data['document']['id'],
]
];
@ -255,9 +255,9 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'documentId' => $data['document']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => $data['document']['id'],
'data' => [
'name' => 'New Document Name',
],
@ -287,9 +287,9 @@ class DatabaseClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'documentId' => $data['document']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => $data['document']['id'],
]
];

114
tests/e2e/Services/GraphQL/DatabaseServerTest.php
View file

@ -52,7 +52,7 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $database['_id'],
'databaseId' => $database['id'],
'collectionId' => 'actors',
'name' => 'Actors',
'documentSecurity' => false,
@ -92,8 +92,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'name',
'size' => 256,
'required' => true,
@ -123,8 +123,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'age',
'min' => 18,
'max' => 150,
@ -155,8 +155,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'alive',
'required' => true,
]
@ -185,8 +185,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'salary',
'min' => 1000.0,
'max' => 999999.99,
@ -218,8 +218,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'email',
'required' => true,
]
@ -248,8 +248,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'role',
'elements' => [
'crew',
@ -283,8 +283,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'dob',
'required' => true,
]
@ -313,8 +313,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'ip',
'required' => false,
'default' => '::1',
@ -344,8 +344,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'url',
'required' => false,
'default' => 'https://appwrite.io',
@ -379,8 +379,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'index',
'type' => 'key',
'attributes' => [
@ -420,8 +420,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => ID::unique(),
'data' => [
'name' => 'John Doe',
@ -527,7 +527,7 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $database['_id'],
'databaseId' => $database['id'],
]
];
@ -552,7 +552,7 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'databaseId' => $data['database']['id'],
]
];
@ -577,8 +577,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
]
];
@ -604,8 +604,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
]
];
@ -630,8 +630,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'name',
]
];
@ -657,8 +657,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
]
];
@ -683,8 +683,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => $data['index']['key'],
]
];
@ -710,8 +710,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
]
];
@ -736,9 +736,9 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'documentId' => $data['document']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => $data['document']['id'],
]
];
@ -785,7 +785,7 @@ class DatabaseServerTest extends Scope
// $gqlPayload = [
// 'query' => $query,
// 'variables' => [
// 'id' => $data['_id'],
// 'id' => $data['id'],
// ]
// ];
//
@ -810,7 +810,7 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $database['_id'],
'databaseId' => $database['id'],
'name' => 'New Database Name',
]
];
@ -836,8 +836,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'name' => 'New Collection Name',
'documentSecurity' => false,
]
@ -864,9 +864,9 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'documentId' => $data['document']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => $data['document']['id'],
'data' => [
'name' => 'New Document Name',
],
@ -896,7 +896,7 @@ class DatabaseServerTest extends Scope
// $gqlPayload = [
// 'query' => $query,
// 'variables' => [
// 'id' => $data['_id'],
// 'id' => $data['id'],
// 'name' => 'New Custom Entity Name',
// ]
// ];
@ -924,9 +924,9 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'documentId' => $data['document']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'documentId' => $data['document']['id'],
]
];
@ -950,7 +950,7 @@ class DatabaseServerTest extends Scope
// $gqlPayload = [
// 'query' => $query,
// 'variables' => [
// 'id' => $data['_id'],
// 'id' => $data['id'],
// ]
// ];
//
@ -974,8 +974,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
'key' => 'name',
]
];
@ -1000,8 +1000,8 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $data['database']['_id'],
'collectionId' => $data['collection']['_id'],
'databaseId' => $data['database']['id'],
'collectionId' => $data['collection']['id'],
]
];
@ -1025,7 +1025,7 @@ class DatabaseServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'databaseId' => $database['_id'],
'databaseId' => $database['id'],
]
];

16
tests/e2e/Services/GraphQL/FunctionsClientTest.php
View file

@ -41,15 +41,15 @@ class FunctionsClientTest extends Scope
$this->assertArrayNotHasKey('errors', $function['body']);
$function = $function['body']['data']['functionsCreate'];
$functionId = $function['_id'];
$functionId = $function['id'];
$query = '
mutation createVariables($functionId: String!) {
var1: functionsCreateVariable(functionId: $functionId, key: "name", value: "John Doe") {
_id
id
}
var2: functionsCreateVariable(functionId: $functionId, key: "age", value: "42") {
_id
id
}
}
';
@ -87,7 +87,7 @@ class FunctionsClientTest extends Scope
'operations' => \json_encode([
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
'entrypoint' => 'index.php',
'activate' => true,
'code' => null,
@ -128,7 +128,7 @@ class FunctionsClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];
@ -155,7 +155,7 @@ class FunctionsClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];
@ -187,8 +187,8 @@ class FunctionsClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'executionId' => $execution['_id'],
'functionId' => $function['id'],
'executionId' => $execution['id'],
]
];

36
tests/e2e/Services/GraphQL/FunctionsServerTest.php
View file

@ -39,15 +39,15 @@ class FunctionsServerTest extends Scope
$this->assertArrayNotHasKey('errors', $function['body']);
$function = $function['body']['data']['functionsCreate'];
$functionId = $function['_id'];
$functionId = $function['id'];
$query = '
mutation createVariables($functionId: String!) {
var1: functionsCreateVariable(functionId: $functionId, key: "name", value: "John Doe") {
_id
id
}
var2: functionsCreateVariable(functionId: $functionId, key: "age", value: "42") {
_id
id
}
}
';
@ -85,7 +85,7 @@ class FunctionsServerTest extends Scope
'operations' => \json_encode([
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
'entrypoint' => 'index.php',
'activate' => true,
'code' => null,
@ -124,7 +124,7 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];
@ -154,8 +154,8 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'deploymentId' => $deployment['_id'],
'functionId' => $function['id'],
'deploymentId' => $deployment['id'],
'buildId' => $deployment['buildId'],
]
];
@ -203,7 +203,7 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];
@ -254,7 +254,7 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];
@ -285,8 +285,8 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'deploymentId' => $deployment['_id'],
'functionId' => $function['id'],
'deploymentId' => $deployment['id'],
]
];
@ -316,7 +316,7 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];
@ -348,8 +348,8 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'executionId' => $execution['_id'],
'functionId' => $function['id'],
'executionId' => $execution['id'],
]
];
@ -379,7 +379,7 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
'name' => 'Test Function Updated',
'execute' => [Role::any()->toString()],
'vars' => [
@ -416,8 +416,8 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'deploymentId' => $deployment['_id'],
'functionId' => $function['id'],
'deploymentId' => $deployment['id'],
]
];
@ -443,7 +443,7 @@ class FunctionsServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'functionId' => $function['_id'],
'functionId' => $function['id'],
]
];

18
tests/e2e/Services/GraphQL/StorageClientTest.php
View file

@ -61,7 +61,7 @@ class StorageClientTest extends Scope
'operations' => \json_encode([
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
'fileId' => ID::unique(),
'file' => null,
'fileSecurity' => true,
@ -102,7 +102,7 @@ class StorageClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
]
];
@ -134,8 +134,8 @@ class StorageClientTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'fileId' => $file['_id'],
'bucketId' => $bucket['id'],
'fileId' => $file['id'],
]
];
@ -164,7 +164,7 @@ class StorageClientTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
'width' => 100,
'height' => 100,
]
@ -194,7 +194,7 @@ class StorageClientTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
]
];
@ -220,7 +220,7 @@ class StorageClientTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
]
];
@ -246,7 +246,7 @@ class StorageClientTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
'permissions' => [
Permission::read(Role::any()),
Permission::update(Role::any()),
@ -281,7 +281,7 @@ class StorageClientTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
]
];

24
tests/e2e/Services/GraphQL/StorageServerTest.php
View file

@ -60,7 +60,7 @@ class StorageServerTest extends Scope
'operations' => \json_encode([
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
'fileId' => ID::unique(),
'file' => null,
'fileSecurity' => true,
@ -121,7 +121,7 @@ class StorageServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
]
];
@ -151,7 +151,7 @@ class StorageServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
]
];
@ -183,8 +183,8 @@ class StorageServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'fileId' => $file['_id'],
'bucketId' => $bucket['id'],
'fileId' => $file['id'],
]
];
@ -213,7 +213,7 @@ class StorageServerTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
'width' => 100,
'height' => 100,
]
@ -243,7 +243,7 @@ class StorageServerTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
]
];
@ -269,7 +269,7 @@ class StorageServerTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
]
];
@ -294,7 +294,7 @@ class StorageServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
'name' => 'Actors Updated',
'fileSecurity' => false,
]
@ -327,7 +327,7 @@ class StorageServerTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
'permissions' => [
Permission::read(Role::any()),
Permission::update(Role::any()),
@ -362,7 +362,7 @@ class StorageServerTest extends Scope
'query' => $query,
'variables' => [
'bucketId' => $file['bucketId'],
'fileId' => $file['_id'],
'fileId' => $file['id'],
]
];
@ -388,7 +388,7 @@ class StorageServerTest extends Scope
$gqlPayload = [
'query' => $query,
'variables' => [
'bucketId' => $bucket['_id'],
'bucketId' => $bucket['id'],
]
];

16
tests/e2e/Services/GraphQL/TeamsClientTest.php
View file

@ -50,7 +50,7 @@ class TeamsClientTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
'email' => 'user@appwrite.io',
'roles' => ['developer'],
'url' => 'http://localhost/membership',
@ -66,7 +66,7 @@ class TeamsClientTest extends Scope
$this->assertIsArray($membership['body']['data']);
$this->assertArrayNotHasKey('errors', $membership['body']);
$membership = $membership['body']['data']['teamsCreateMembership'];
$this->assertEquals($team['_id'], $membership['teamId']);
$this->assertEquals($team['id'], $membership['teamId']);
$this->assertEquals(['developer'], $membership['roles']);
return $membership;
@ -99,7 +99,7 @@ class TeamsClientTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
],
];
@ -124,7 +124,7 @@ class TeamsClientTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
],
];
@ -149,8 +149,8 @@ class TeamsClientTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'membershipId' => $membership['_id'],
'teamId' => $team['id'],
'membershipId' => $membership['id'],
],
];
@ -174,8 +174,8 @@ class TeamsClientTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'membershipId' => $membership['_id'],
'teamId' => $team['id'],
'membershipId' => $membership['id'],
],
];

24
tests/e2e/Services/GraphQL/TeamsServerTest.php
View file

@ -50,7 +50,7 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
'email' => 'user@appwrite.io',
'roles' => ['developer'],
'url' => 'http://localhost/membership',
@ -65,7 +65,7 @@ class TeamsServerTest extends Scope
$this->assertIsArray($membership['body']['data']);
$this->assertArrayNotHasKey('errors', $membership['body']);
$membership = $membership['body']['data']['teamsCreateMembership'];
$this->assertEquals($team['_id'], $membership['teamId']);
$this->assertEquals($team['id'], $membership['teamId']);
$this->assertEquals(['developer'], $membership['roles']);
return $membership;
@ -98,7 +98,7 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
],
];
@ -123,7 +123,7 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
],
];
@ -148,8 +148,8 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'membershipId' => $membership['_id'],
'teamId' => $team['id'],
'membershipId' => $membership['id'],
],
];
@ -172,7 +172,7 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
'name' => 'New Name',
],
];
@ -199,8 +199,8 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'membershipId' => $membership['_id'],
'teamId' => $team['id'],
'membershipId' => $membership['id'],
'roles' => ['developer', 'admin'],
],
];
@ -227,8 +227,8 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'membershipId' => $membership['_id'],
'teamId' => $team['id'],
'membershipId' => $membership['id'],
],
];
@ -250,7 +250,7 @@ class TeamsServerTest extends Scope
$graphQLPayload = [
'query' => $query,
'variables' => [
'teamId' => $team['_id'],
'teamId' => $team['id'],
],
];

6
tests/e2e/Services/GraphQL/UsersTest.php
View file

@ -89,7 +89,7 @@ class UsersTest extends Scope
$this->assertIsArray($user['body']['data']);
$this->assertArrayNotHasKey('errors', $user['body']);
$this->assertIsArray($user['body']['data']['usersGet']);
$this->assertEquals($this->getUser()['$id'], $user['body']['data']['usersGet']['_id']);
$this->assertEquals($this->getUser()['$id'], $user['body']['data']['usersGet']['id']);
}
public function testGetUserPreferences()
@ -196,7 +196,7 @@ class UsersTest extends Scope
$this->assertIsArray($user['body']['data']);
$this->assertArrayNotHasKey('errors', $user['body']);
$this->assertIsArray($user['body']['data']['usersUpdateStatus']);
$this->assertEquals($this->getUser()['$id'], $user['body']['data']['usersUpdateStatus']['_id']);
$this->assertEquals($this->getUser()['$id'], $user['body']['data']['usersUpdateStatus']['id']);
}
public function testUpdateUserEmailVerification()
@ -241,7 +241,7 @@ class UsersTest extends Scope
$this->assertIsArray($user['body']['data']);
$this->assertArrayNotHasKey('errors', $user['body']);
$this->assertIsArray($user['body']['data']['usersUpdatePhoneVerification']);
$this->assertEquals($this->getUser()['$id'], $user['body']['data']['usersUpdatePhoneVerification']['_id']);
$this->assertEquals($this->getUser()['$id'], $user['body']['data']['usersUpdatePhoneVerification']['id']);
}
public function testUpdateUserName()