CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-30 01:08:13 +13:00
Code Issues Projects Releases Wiki Activity

Sync with 0.16

Browse source
This commit is contained in:
Eldad Fux 2022-09-07 14:11:10 +03:00
parent 1f17fb34e4
commit 01fb4045bd
6 changed files with 62 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1981,8 +1981,9 @@ App::post('/v1/account/recovery')
// Hide secret for clients // Hide secret for clients
$recovery->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $secret : ''); $recovery->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $secret : '');
$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')
@ -2137,8 +2138,9 @@ App::post('/v1/account/verification')
// Hide secret for clients // Hide secret for clients
$verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : ''); $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : '');
$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')
@ -2278,8 +2280,9 @@ App::post('/v1/account/verification/phone')
// Hide secret for clients // Hide secret for clients
$verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : ''); $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : '');
$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')

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

@ -530,8 +530,9 @@ App::post('/v1/databases/:databaseId/collections')
->setParam('databaseId', $databaseId) ->setParam('databaseId', $databaseId)
->setParam('collectionId', $collection->getId()); ->setParam('collectionId', $collection->getId());
$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')
@ -1265,8 +1266,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
'array' => $array, 'array' => $array,
]), $response, $dbForProject, $database, $events); ]), $response, $dbForProject, $database, $events);
$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);
}); });
@ -1308,8 +1310,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
'filters' => ['datetime'] 'filters' => ['datetime']
]), $response, $dbForProject, $database, $events); ]), $response, $dbForProject, $database, $events);
$response->setStatusCode(Response::STATUS_CODE_ACCEPTED); $response
$response->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME); ->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) ->setContext('database', $db)
; ;
$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')
@ -1933,8 +1937,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
->setContext('database', $database) ->setContext('database', $database)
; ;
$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')

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

@ -1342,8 +1342,9 @@ App::post('/v1/functions/:functionId/variables')
$dbForProject->deleteCachedDocument('functions', $function->getId()); $dbForProject->deleteCachedDocument('functions', $function->getId());
$response->setStatusCode(Response::STATUS_CODE_CREATED); $response
$response->dynamic($variable, Response::MODEL_VARIABLE); ->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($variable, Response::MODEL_VARIABLE);
}); });
App::get('/v1/functions/:functionId/variables') App::get('/v1/functions/:functionId/variables')

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

@ -136,8 +136,9 @@ App::post('/v1/storage/buckets')
->setParam('bucketId', $bucket->getId()) ->setParam('bucketId', $bucket->getId())
; ;
$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')

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

@ -116,8 +116,9 @@ App::post('/v1/teams')
$events->setParam('userId', $user->getId()); $events->setParam('userId', $user->getId());
} }
$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')
@ -446,12 +447,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', $invitee->getAttribute('name')) ->setAttribute('teamName', $team->getAttribute('name'))
->setAttribute('userEmail', $invitee->getAttribute('email')), ->setAttribute('userName', $invitee->getAttribute('name'))
->setAttribute('userEmail', $invitee->getAttribute('email'))
,
Response::MODEL_MEMBERSHIP Response::MODEL_MEMBERSHIP
); );
}); });

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

@ -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) { ->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); $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $dbForProject, $events);
$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/users/bcrypt') 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) { ->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); $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
$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/users/md5') 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) { ->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); $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
$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/users/argon2') 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) { ->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); $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
$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/users/sha') 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); $user = createUser('sha', $options, $userId, $email, $password, null, $name, $dbForProject, $events);
$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/users/phpass') 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) { ->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); $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);
$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/users/scrypt') 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); $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $dbForProject, $events);
$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/users/scrypt-modified') App::post('/v1/users/scrypt-modified')