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

Updated user response object

Browse source
This commit is contained in:
Eldad Fux 2020-08-06 13:01:08 +03:00
parent 227d8dbb70
commit 14dfcc93a5
1 changed files with 13 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -726,7 +726,7 @@ App::patch('/v1/account/name')
->label('sdk.method', 'updateName') ->label('sdk.method', 'updateName')
->label('sdk.description', '/docs/references/account/update-name.md') ->label('sdk.description', '/docs/references/account/update-name.md')
->param('name', '', function () { return new Text(100); }, 'User name.') ->param('name', '', function () { return new Text(100); }, 'User name.')
->action(function ($name, $response, $user, $projectDB, $audits) use ($oauth2Keys) { ->action(function ($name, $response, $user, $projectDB, $audits) {
/** @var Appwrite\Swoole\Response $response */ /** @var Appwrite\Swoole\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
@ -740,21 +740,15 @@ App::patch('/v1/account/name')
throw new Exception('Failed saving user to DB', 500); throw new Exception('Failed saving user to DB', 500);
} }
$user->setAttribute('roles', Authorization::getRoles());
$audits $audits
->setParam('userId', $user->getId()) ->setParam('userId', $user->getId())
->setParam('event', 'account.update.name') ->setParam('event', 'account.update.name')
->setParam('resource', 'users/'.$user->getId()) ->setParam('resource', 'users/'.$user->getId())
; ;
$response->json(\array_merge($user->getArrayCopy(\array_merge( $response->dynamic($user, Response::MODEL_USER);
[
'$id',
'email',
'registration',
'name',
],
$oauth2Keys
)), ['roles' => Authorization::getRoles()]));
}, ['response', 'user', 'projectDB', 'audits']); }, ['response', 'user', 'projectDB', 'audits']);
App::patch('/v1/account/password') App::patch('/v1/account/password')
@ -768,7 +762,7 @@ App::patch('/v1/account/password')
->label('sdk.description', '/docs/references/account/update-password.md') ->label('sdk.description', '/docs/references/account/update-password.md')
->param('password', '', function () { return new Password(); }, 'New user password. Must be between 6 to 32 chars.') ->param('password', '', function () { return new Password(); }, 'New user password. Must be between 6 to 32 chars.')
->param('oldPassword', '', function () { return new Password(); }, 'Old user password. Must be between 6 to 32 chars.') ->param('oldPassword', '', function () { return new Password(); }, 'Old user password. Must be between 6 to 32 chars.')
->action(function ($password, $oldPassword, $response, $user, $projectDB, $audits) use ($oauth2Keys) { ->action(function ($password, $oldPassword, $response, $user, $projectDB, $audits) {
/** @var Appwrite\Swoole\Response $response */ /** @var Appwrite\Swoole\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
@ -786,21 +780,15 @@ App::patch('/v1/account/password')
throw new Exception('Failed saving user to DB', 500); throw new Exception('Failed saving user to DB', 500);
} }
$user->setAttribute('roles', Authorization::getRoles());
$audits $audits
->setParam('userId', $user->getId()) ->setParam('userId', $user->getId())
->setParam('event', 'account.update.password') ->setParam('event', 'account.update.password')
->setParam('resource', 'users/'.$user->getId()) ->setParam('resource', 'users/'.$user->getId())
; ;
$response->json(\array_merge($user->getArrayCopy(\array_merge( $response->dynamic($user, Response::MODEL_USER);
[
'$id',
'email',
'registration',
'name',
],
$oauth2Keys
)), ['roles' => Authorization::getRoles()]));
}, ['response', 'user', 'projectDB', 'audits']); }, ['response', 'user', 'projectDB', 'audits']);
App::patch('/v1/account/email') App::patch('/v1/account/email')
@ -814,7 +802,7 @@ App::patch('/v1/account/email')
->label('sdk.description', '/docs/references/account/update-email.md') ->label('sdk.description', '/docs/references/account/update-email.md')
->param('email', '', function () { return new Email(); }, 'User email.') ->param('email', '', function () { return new Email(); }, 'User email.')
->param('password', '', function () { return new Password(); }, 'User password. Must be between 6 to 32 chars.') ->param('password', '', function () { return new Password(); }, 'User password. Must be between 6 to 32 chars.')
->action(function ($email, $password, $response, $user, $projectDB, $audits) use ($oauth2Keys) { ->action(function ($email, $password, $response, $user, $projectDB, $audits) {
/** @var Appwrite\Swoole\Response $response */ /** @var Appwrite\Swoole\Response $response */
/** @var Appwrite\Database\Document $user */ /** @var Appwrite\Database\Document $user */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
@ -847,21 +835,16 @@ App::patch('/v1/account/email')
throw new Exception('Failed saving user to DB', 500); throw new Exception('Failed saving user to DB', 500);
} }
$user->setAttribute('roles', Authorization::getRoles());
$audits $audits
->setParam('userId', $user->getId()) ->setParam('userId', $user->getId())
->setParam('event', 'account.update.email') ->setParam('event', 'account.update.email')
->setParam('resource', 'users/'.$user->getId()) ->setParam('resource', 'users/'.$user->getId())
; ;
$response->json(\array_merge($user->getArrayCopy(\array_merge(
[ $response->dynamic($user, Response::MODEL_USER);
'$id',
'email',
'registration',
'name',
],
$oauth2Keys
)), ['roles' => Authorization::getRoles()]));
}, ['response', 'user', 'projectDB', 'audits']); }, ['response', 'user', 'projectDB', 'audits']);
App::patch('/v1/account/prefs') App::patch('/v1/account/prefs')