1
0
Fork 0
mirror of synced 2024-06-28 11:10:46 +12:00

Updated account response object

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

View file

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

View file

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

View file

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