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

Updated account response object

Browse source
This commit is contained in:
Eldad Fux 2020-08-06 10:39:55 +03:00
parent f5760eacb5
commit 0c70412078
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/config/collections.php
View file

@ -234,6 +234,7 @@ $collections = [
'default' => '', 'default' => '',
'required' => false, 'required' => false,
'array' => false, 'array' => false,
'filter' => ['json']
], ],
[ [
'$collection' => Database::SYSTEM_COLLECTION_RULES, '$collection' => Database::SYSTEM_COLLECTION_RULES,

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

@ -239,7 +239,6 @@ App::post('/v1/account/sessions')
; ;
$response->dynamic($session, Response::MODEL_SESSION); $response->dynamic($session, Response::MODEL_SESSION);
;
}, ['request', 'response', 'projectDB', 'webhooks', 'audits']); }, ['request', 'response', 'projectDB', 'webhooks', 'audits']);
App::get('/v1/account/sessions/oauth2/:provider') App::get('/v1/account/sessions/oauth2/:provider')
@ -552,20 +551,15 @@ App::get('/v1/account')
->label('sdk.method', 'get') ->label('sdk.method', 'get')
->label('sdk.description', '/docs/references/account/get.md') ->label('sdk.description', '/docs/references/account/get.md')
->label('sdk.response', ['200' => 'user']) ->label('sdk.response', ['200' => 'user'])
->action(function ($response, $user) use ($oauth2Keys) { ->action(function ($response, $user) {
/** @var Appwrite\Swoole\Response $response */ /** @var Appwrite\Swoole\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
$response->json(\array_merge($user->getArrayCopy(\array_merge( $user
[ ->setAttribute('roles', Authorization::getRoles())
'$id', ;
'email',
'emailVerification', $response->dynamic($user, Response::MODEL_USER);
'registration',
'name',
],
$oauth2Keys
)), ['roles' => Authorization::getRoles()]));
}, ['response', 'user']); }, ['response', 'user']);
App::get('/v1/account/prefs') App::get('/v1/account/prefs')

2
src/Appwrite/Utopia/Response/Model/User.php
View file

@ -48,7 +48,7 @@ class User extends Model
'type' => 'json', 'type' => 'json',
'description' => 'User preferences as a key-value object', 'description' => 'User preferences as a key-value object',
'default' => new \stdClass, 'default' => new \stdClass,
'example' => ['theme' => 'dark', 'timezone' => 'UTC'], 'example' => ['theme' => 'pink', 'timezone' => 'UTC'],
]) ])
->addRule('roles', [ ->addRule('roles', [
'type' => 'string', 'type' => 'string',