From 01fb4045bd913a49cda64626254cd18c97eef039 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Wed, 7 Sep 2022 14:11:10 +0300 Subject: [PATCH] Sync with 0.16 --- app/controllers/api/account.php | 15 +++++++------ app/controllers/api/databases.php | 25 +++++++++++++--------- app/controllers/api/functions.php | 5 +++-- app/controllers/api/storage.php | 5 +++-- app/controllers/api/teams.php | 19 ++++++++++------- app/controllers/api/users.php | 35 ++++++++++++++++++------------- 6 files changed, 62 insertions(+), 42 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 671a921df5..eeec83e069 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -1981,8 +1981,9 @@ App::post('/v1/account/recovery') // Hide secret for clients $recovery->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $secret : ''); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($recovery, Response::MODEL_TOKEN); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($recovery, Response::MODEL_TOKEN); }); App::put('/v1/account/recovery') @@ -2137,8 +2138,9 @@ App::post('/v1/account/verification') // Hide secret for clients $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : ''); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($verification, Response::MODEL_TOKEN); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($verification, Response::MODEL_TOKEN); }); App::put('/v1/account/verification') @@ -2278,8 +2280,9 @@ App::post('/v1/account/verification/phone') // Hide secret for clients $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : ''); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($verification, Response::MODEL_TOKEN); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($verification, Response::MODEL_TOKEN); }); App::put('/v1/account/verification/phone') diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php index 1a5ba02f25..94b17aa7b2 100644 --- a/app/controllers/api/databases.php +++ b/app/controllers/api/databases.php @@ -530,8 +530,9 @@ App::post('/v1/databases/:databaseId/collections') ->setParam('databaseId', $databaseId) ->setParam('collectionId', $collection->getId()); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($collection, Response::MODEL_COLLECTION); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($collection, Response::MODEL_COLLECTION); }); App::get('/v1/databases/:databaseId/collections') @@ -1265,8 +1266,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea 'array' => $array, ]), $response, $dbForProject, $database, $events); - $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); - $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN); + $response + ->setStatusCode(Response::STATUS_CODE_ACCEPTED) + ->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN); }); @@ -1308,8 +1310,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti 'filters' => ['datetime'] ]), $response, $dbForProject, $database, $events); - $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); - $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME); + $response + ->setStatusCode(Response::STATUS_CODE_ACCEPTED) + ->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME); }); @@ -1654,8 +1657,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes') ->setContext('database', $db) ; - $response->setStatusCode(Response::STATUS_CODE_ACCEPTED); - $response->dynamic($index, Response::MODEL_INDEX); + $response + ->setStatusCode(Response::STATUS_CODE_ACCEPTED) + ->dynamic($index, Response::MODEL_INDEX); }); App::get('/v1/databases/:databaseId/collections/:collectionId/indexes') @@ -1933,8 +1937,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents') ->setContext('database', $database) ; - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($document, Response::MODEL_DOCUMENT); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($document, Response::MODEL_DOCUMENT); }); App::get('/v1/databases/:databaseId/collections/:collectionId/documents') diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php index 67e84bf0e0..762da9aba7 100644 --- a/app/controllers/api/functions.php +++ b/app/controllers/api/functions.php @@ -1342,8 +1342,9 @@ App::post('/v1/functions/:functionId/variables') $dbForProject->deleteCachedDocument('functions', $function->getId()); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($variable, Response::MODEL_VARIABLE); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($variable, Response::MODEL_VARIABLE); }); App::get('/v1/functions/:functionId/variables') diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 45d70edb45..594dee006a 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -136,8 +136,9 @@ App::post('/v1/storage/buckets') ->setParam('bucketId', $bucket->getId()) ; - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($bucket, Response::MODEL_BUCKET); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($bucket, Response::MODEL_BUCKET); }); App::get('/v1/storage/buckets') diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php index 40eab55630..de8ccea5cc 100644 --- a/app/controllers/api/teams.php +++ b/app/controllers/api/teams.php @@ -116,8 +116,9 @@ App::post('/v1/teams') $events->setParam('userId', $user->getId()); } - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($team, Response::MODEL_TEAM); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($team, Response::MODEL_TEAM); }); App::get('/v1/teams') @@ -446,12 +447,14 @@ App::post('/v1/teams/:teamId/memberships') ->setParam('membershipId', $membership->getId()) ; - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic( - $membership - ->setAttribute('teamName', $team->getAttribute('name')) - ->setAttribute('userName', $invitee->getAttribute('name')) - ->setAttribute('userEmail', $invitee->getAttribute('email')), + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic( + $membership + ->setAttribute('teamName', $team->getAttribute('name')) + ->setAttribute('userName', $invitee->getAttribute('name')) + ->setAttribute('userEmail', $invitee->getAttribute('email')) + , Response::MODEL_MEMBERSHIP ); }); diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php index 2af0db3eed..a3b9f8741b 100644 --- a/app/controllers/api/users.php +++ b/app/controllers/api/users.php @@ -108,8 +108,9 @@ App::post('/v1/users') ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Database $dbForProject, Event $events) { $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/bcrypt') @@ -136,8 +137,9 @@ App::post('/v1/users/bcrypt') ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) { $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/md5') @@ -164,8 +166,9 @@ App::post('/v1/users/md5') ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) { $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/argon2') @@ -192,8 +195,9 @@ App::post('/v1/users/argon2') ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) { $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/sha') @@ -227,8 +231,9 @@ App::post('/v1/users/sha') $user = createUser('sha', $options, $userId, $email, $password, null, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/phpass') @@ -255,8 +260,9 @@ App::post('/v1/users/phpass') ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) { $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/scrypt') @@ -296,8 +302,9 @@ App::post('/v1/users/scrypt') $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $dbForProject, $events); - $response->setStatusCode(Response::STATUS_CODE_CREATED); - $response->dynamic($user, Response::MODEL_USER); + $response + ->setStatusCode(Response::STATUS_CODE_CREATED) + ->dynamic($user, Response::MODEL_USER); }); App::post('/v1/users/scrypt-modified')