CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-29 19:50:26 +12:00
Code Issues Projects Releases Wiki Activity

Fixed response syntax with new FW version

Browse source
This commit is contained in:
Eldad Fux 2022-09-07 14:02:36 +03:00
parent 856a53c33c
commit 0895a25615
8 changed files with 98 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/controllers/api/account.php
View file

@ -128,8 +128,9 @@ App::post('/v1/account')
$usage->setParam('users.create', 1); $usage->setParam('users.create', 1);
$events->setParam('userId', $user->getId()); $events->setParam('userId', $user->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($user, Response::MODEL_USER); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($user, Response::MODEL_USER);
}); });
App::post('/v1/account/sessions/email') App::post('/v1/account/sessions/email')
@ -1227,8 +1228,9 @@ App::post('/v1/account/jwt')
$jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway. $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic(new Document(['jwt' => $jwt->encode([ ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic(new Document(['jwt' => $jwt->encode([
// 'uid' => 1, // 'uid' => 1,
// 'aud' => 'http://site.com', // 'aud' => 'http://site.com',
// 'scopes' => ['user'], // 'scopes' => ['user'],
@ -2013,8 +2015,9 @@ App::post('/v1/account/recovery')
$audits->setResource('user/' . $profile->getId()); $audits->setResource('user/' . $profile->getId());
$usage->setParam('users.update', 1); $usage->setParam('users.update', 1);
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($recovery, Response::MODEL_TOKEN); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($recovery, Response::MODEL_TOKEN);
}); });
App::put('/v1/account/recovery') App::put('/v1/account/recovery')
@ -2173,8 +2176,9 @@ App::post('/v1/account/verification')
$audits->setResource('user/' . $user->getId()); $audits->setResource('user/' . $user->getId());
$usage->setParam('users.update', 1); $usage->setParam('users.update', 1);
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($verification, Response::MODEL_TOKEN); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($verification, Response::MODEL_TOKEN);
}); });
App::put('/v1/account/verification') App::put('/v1/account/verification')
@ -2321,8 +2325,9 @@ App::post('/v1/account/verification/phone')
$audits->setResource('user/' . $user->getId()); $audits->setResource('user/' . $user->getId());
$usage->setParam('users.update', 1); $usage->setParam('users.update', 1);
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($verification, Response::MODEL_TOKEN); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($verification, Response::MODEL_TOKEN);
}); });
App::put('/v1/account/verification/phone') App::put('/v1/account/verification/phone')

64
app/controllers/api/databases.php
View file

@ -226,8 +226,9 @@ App::post('/v1/databases')
$events->setParam('databaseId', $database->getId()); $events->setParam('databaseId', $database->getId());
$usage->setParam('databases.create', 1); $usage->setParam('databases.create', 1);
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($database, Response::MODEL_DATABASE); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($database, Response::MODEL_DATABASE);
}); });
App::get('/v1/databases') App::get('/v1/databases')
@ -550,8 +551,9 @@ App::post('/v1/databases/:databaseId/collections')
->setParam('databaseId', $databaseId) ->setParam('databaseId', $databaseId)
->setParam('databases.collections.create', 1); ->setParam('databases.collections.create', 1);
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($collection, Response::MODEL_COLLECTION); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($collection, Response::MODEL_COLLECTION);
}); });
App::get('/v1/databases/:databaseId/collections') App::get('/v1/databases/:databaseId/collections')
@ -915,8 +917,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
'array' => $array, 'array' => $array,
]), $response, $dbForProject, $database, $audits, $events, $usage); ]), $response, $dbForProject, $database, $audits, $events, $usage);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_STRING); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_STRING);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email')
@ -956,8 +959,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
'format' => APP_DATABASE_ATTRIBUTE_EMAIL, 'format' => APP_DATABASE_ATTRIBUTE_EMAIL,
]), $response, $dbForProject, $database, $audits, $events, $usage); ]), $response, $dbForProject, $database, $audits, $events, $usage);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_EMAIL); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_EMAIL);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
@ -1013,8 +1017,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
'formatOptions' => ['elements' => $elements], 'formatOptions' => ['elements' => $elements],
]), $response, $dbForProject, $database, $audits, $events, $usage); ]), $response, $dbForProject, $database, $audits, $events, $usage);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_ENUM); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_ENUM);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
@ -1054,8 +1059,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
'format' => APP_DATABASE_ATTRIBUTE_IP, 'format' => APP_DATABASE_ATTRIBUTE_IP,
]), $response, $dbForProject, $database, $audits, $events, $usage); ]), $response, $dbForProject, $database, $audits, $events, $usage);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_IP); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_IP);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
@ -1095,8 +1101,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
'format' => APP_DATABASE_ATTRIBUTE_URL, 'format' => APP_DATABASE_ATTRIBUTE_URL,
]), $response, $dbForProject, $database, $audits, $events, $usage); ]), $response, $dbForProject, $database, $audits, $events, $usage);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_URL); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_URL);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/integer') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/integer')
@ -1165,8 +1172,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
$attribute->setAttribute('max', \intval($formatOptions['max'])); $attribute->setAttribute('max', \intval($formatOptions['max']));
} }
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_INTEGER); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_INTEGER);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float')
@ -1238,8 +1246,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
$attribute->setAttribute('max', \floatval($formatOptions['max'])); $attribute->setAttribute('max', \floatval($formatOptions['max']));
} }
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_FLOAT); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_FLOAT);
}); });
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean') App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean')
@ -1278,8 +1287,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
'array' => $array, 'array' => $array,
]), $response, $dbForProject, $database, $audits, $events, $usage); ]), $response, $dbForProject, $database, $audits, $events, $usage);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN);
}); });
App::get('/v1/databases/:databaseId/collections/:collectionId/attributes') App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
@ -1632,8 +1642,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
->setParam('databaseId', $databaseId) ->setParam('databaseId', $databaseId)
->setParam('collectionId', $collection->getId()) ->setParam('collectionId', $collection->getId())
->setParam('indexId', $index->getId()) ->setParam('indexId', $index->getId())
->setContext('collection', $collection) ->setContext('collection', $collection)
->setContext('database', $db) ->setContext('database', $db)
; ;
$audits $audits
@ -1641,8 +1651,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
->setPayload($index->getArrayCopy()) ->setPayload($index->getArrayCopy())
; ;
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($index, Response::MODEL_INDEX); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($index, Response::MODEL_INDEX);
}); });
App::get('/v1/databases/:databaseId/collections/:collectionId/indexes') App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
@ -1932,8 +1943,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
->setPayload($document->getArrayCopy()) ->setPayload($document->getArrayCopy())
; ;
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($document, Response::MODEL_DOCUMENT); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($document, Response::MODEL_DOCUMENT);
}); });
App::get('/v1/databases/:databaseId/collections/:collectionId/documents') App::get('/v1/databases/:databaseId/collections/:collectionId/documents')

16
app/controllers/api/functions.php
View file

@ -82,8 +82,9 @@ App::post('/v1/functions')
$eventsInstance->setParam('functionId', $function->getId()); $eventsInstance->setParam('functionId', $function->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($function, Response::MODEL_FUNCTION); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($function, Response::MODEL_FUNCTION);
}); });
App::get('/v1/functions') App::get('/v1/functions')
@ -622,8 +623,9 @@ App::post('/v1/functions/:functionId/deployments')
->setParam('functionId', $function->getId()) ->setParam('functionId', $function->getId())
->setParam('deploymentId', $deployment->getId()); ->setParam('deploymentId', $deployment->getId());
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($deployment, Response::MODEL_DEPLOYMENT); ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($deployment, Response::MODEL_DEPLOYMENT);
}); });
App::get('/v1/functions/:functionId/deployments') App::get('/v1/functions/:functionId/deployments')
@ -906,9 +908,9 @@ App::post('/v1/functions/:functionId/executions')
$event->trigger(); $event->trigger();
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); return $response
->setStatusCode(Response::STATUS_CODE_ACCEPTED)
return $response->dynamic($execution, Response::MODEL_EXECUTION); ->dynamic($execution, Response::MODEL_EXECUTION);
} }
/** Collect environment variables */ /** Collect environment variables */

25
app/controllers/api/projects.php
View file

@ -155,8 +155,9 @@ App::post('/v1/projects')
$dbForProject->createCollection($key, $attributes, $indexes); $dbForProject->createCollection($key, $attributes, $indexes);
} }
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($project, Response::MODEL_PROJECT); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($project, Response::MODEL_PROJECT);
}); });
App::get('/v1/projects') App::get('/v1/projects')
@ -605,8 +606,9 @@ App::post('/v1/projects/:projectId/webhooks')
$dbForConsole->deleteCachedDocument('projects', $project->getId()); $dbForConsole->deleteCachedDocument('projects', $project->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($webhook, Response::MODEL_WEBHOOK); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($webhook, Response::MODEL_WEBHOOK);
}); });
App::get('/v1/projects/:projectId/webhooks') App::get('/v1/projects/:projectId/webhooks')
@ -846,8 +848,9 @@ App::post('/v1/projects/:projectId/keys')
$dbForConsole->deleteCachedDocument('projects', $project->getId()); $dbForConsole->deleteCachedDocument('projects', $project->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($key, Response::MODEL_KEY); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($key, Response::MODEL_KEY);
}); });
App::get('/v1/projects/:projectId/keys') App::get('/v1/projects/:projectId/keys')
@ -1043,8 +1046,9 @@ App::post('/v1/projects/:projectId/platforms')
$dbForConsole->deleteCachedDocument('projects', $project->getId()); $dbForConsole->deleteCachedDocument('projects', $project->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($platform, Response::MODEL_PLATFORM); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($platform, Response::MODEL_PLATFORM);
}); });
App::get('/v1/projects/:projectId/platforms') App::get('/v1/projects/:projectId/platforms')
@ -1256,8 +1260,9 @@ App::post('/v1/projects/:projectId/domains')
$dbForConsole->deleteCachedDocument('projects', $project->getId()); $dbForConsole->deleteCachedDocument('projects', $project->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($domain, Response::MODEL_DOMAIN); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($domain, Response::MODEL_DOMAIN);
}); });
App::get('/v1/projects/:projectId/domains') App::get('/v1/projects/:projectId/domains')

10
app/controllers/api/storage.php
View file

@ -137,8 +137,9 @@ App::post('/v1/storage/buckets')
$usage->setParam('storage.buckets.create', 1); $usage->setParam('storage.buckets.create', 1);
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($bucket, Response::MODEL_BUCKET); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($bucket, Response::MODEL_BUCKET);
}); });
App::get('/v1/storage/buckets') App::get('/v1/storage/buckets')
@ -655,8 +656,9 @@ App::post('/v1/storage/buckets/:bucketId/files')
$metadata = null; // was causing leaks as it was passed by reference $metadata = null; // was causing leaks as it was passed by reference
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($file, Response::MODEL_FILE); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($file, Response::MODEL_FILE);
}); });
App::get('/v1/storage/buckets/:bucketId/files') App::get('/v1/storage/buckets/:bucketId/files')

19
app/controllers/api/teams.php
View file

@ -100,8 +100,9 @@ App::post('/v1/teams')
->setParam('data', $team->getArrayCopy()) ->setParam('data', $team->getArrayCopy())
; ;
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($team, Response::MODEL_TEAM); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($team, Response::MODEL_TEAM);
}); });
App::get('/v1/teams') App::get('/v1/teams')
@ -423,12 +424,14 @@ App::post('/v1/teams/:teamId/memberships')
->setParam('membershipId', $membership->getId()) ->setParam('membershipId', $membership->getId())
; ;
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic( ->setStatusCode(Response::STATUS_CODE_CREATED)
$membership ->dynamic(
->setAttribute('teamName', $team->getAttribute('name')) $membership
->setAttribute('userName', $user->getAttribute('name')) ->setAttribute('teamName', $team->getAttribute('name'))
->setAttribute('userEmail', $user->getAttribute('email')), ->setAttribute('userName', $user->getAttribute('name'))
->setAttribute('userEmail', $user->getAttribute('email'))
,
Response::MODEL_MEMBERSHIP Response::MODEL_MEMBERSHIP
); );
}); });

5
app/controllers/api/users.php
View file

@ -85,8 +85,9 @@ App::post('/v1/users')
->setParam('userId', $user->getId()) ->setParam('userId', $user->getId())
; ;
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($user, Response::MODEL_USER); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($user, Response::MODEL_USER);
}); });
App::get('/v1/users') App::get('/v1/users')

2
composer.json
View file

@ -42,7 +42,7 @@
"ext-sockets": "*", "ext-sockets": "*",
"appwrite/php-clamav": "1.1.*", "appwrite/php-clamav": "1.1.*",
"appwrite/php-runtimes": "0.10.*", "appwrite/php-runtimes": "0.10.*",
"utopia-php/framework": "0.19.*", "utopia-php/framework": "0.20.*",
"utopia-php/logger": "0.3.*", "utopia-php/logger": "0.3.*",
"utopia-php/abuse": "0.7.*", "utopia-php/abuse": "0.7.*",
"utopia-php/analytics": "0.2.*", "utopia-php/analytics": "0.2.*",