Update the delete identity endpoints to set the params and payload
Because no payload was set, the event params (userId and identityId) wasn't picked up automatically. This updates the endpoints so that the payload is set, but also makes sure to set the userId and identityId params since the identityId param's key doesn't match the key in the payload.
This commit is contained in:
parent
5cd94041dc
commit
f1ba7b08ab
2 changed files with 16 additions and 4 deletions
|
@ -842,7 +842,7 @@ App::get('/v1/account/identities')
|
||||||
});
|
});
|
||||||
|
|
||||||
App::delete('/v1/account/identities/:identityId')
|
App::delete('/v1/account/identities/:identityId')
|
||||||
->desc('Delete Identity')
|
->desc('Delete identity')
|
||||||
->groups(['api', 'account'])
|
->groups(['api', 'account'])
|
||||||
->label('scope', 'account')
|
->label('scope', 'account')
|
||||||
->label('event', 'users.[userId].identities.[identityId].delete')
|
->label('event', 'users.[userId].identities.[identityId].delete')
|
||||||
|
@ -859,7 +859,8 @@ App::delete('/v1/account/identities/:identityId')
|
||||||
->param('identityId', '', new UID(), 'Identity ID.')
|
->param('identityId', '', new UID(), 'Identity ID.')
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->inject('dbForProject')
|
->inject('dbForProject')
|
||||||
->action(function (string $identityId, Response $response, Database $dbForProject) {
|
->inject('queueForEvents')
|
||||||
|
->action(function (string $identityId, Response $response, Database $dbForProject, Event $queueForEvents) {
|
||||||
|
|
||||||
$identity = $dbForProject->getDocument('identities', $identityId);
|
$identity = $dbForProject->getDocument('identities', $identityId);
|
||||||
|
|
||||||
|
@ -869,6 +870,11 @@ App::delete('/v1/account/identities/:identityId')
|
||||||
|
|
||||||
$dbForProject->deleteDocument('identities', $identityId);
|
$dbForProject->deleteDocument('identities', $identityId);
|
||||||
|
|
||||||
|
$queueForEvents
|
||||||
|
->setParam('userId', $identity->getAttribute('userId'))
|
||||||
|
->setParam('identityId', $identity->getId())
|
||||||
|
->setPayload($response->output($identity, Response::MODEL_IDENTITY));
|
||||||
|
|
||||||
return $response->noContent();
|
return $response->noContent();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -1211,7 +1211,7 @@ App::delete('/v1/users/:userId')
|
||||||
});
|
});
|
||||||
|
|
||||||
App::delete('/v1/users/identities/:identityId')
|
App::delete('/v1/users/identities/:identityId')
|
||||||
->desc('Delete Identity')
|
->desc('Delete identity')
|
||||||
->groups(['api', 'users'])
|
->groups(['api', 'users'])
|
||||||
->label('event', 'users.[userId].identities.[identityId].delete')
|
->label('event', 'users.[userId].identities.[identityId].delete')
|
||||||
->label('scope', 'users.write')
|
->label('scope', 'users.write')
|
||||||
|
@ -1227,7 +1227,8 @@ App::delete('/v1/users/identities/:identityId')
|
||||||
->param('identityId', '', new UID(), 'Identity ID.')
|
->param('identityId', '', new UID(), 'Identity ID.')
|
||||||
->inject('response')
|
->inject('response')
|
||||||
->inject('dbForProject')
|
->inject('dbForProject')
|
||||||
->action(function (string $identityId, Response $response, Database $dbForProject) {
|
->inject('queueForEvents')
|
||||||
|
->action(function (string $identityId, Response $response, Database $dbForProject, Event $queueForEvents) {
|
||||||
|
|
||||||
$identity = $dbForProject->getDocument('identities', $identityId);
|
$identity = $dbForProject->getDocument('identities', $identityId);
|
||||||
|
|
||||||
|
@ -1237,6 +1238,11 @@ App::delete('/v1/users/identities/:identityId')
|
||||||
|
|
||||||
$dbForProject->deleteDocument('identities', $identityId);
|
$dbForProject->deleteDocument('identities', $identityId);
|
||||||
|
|
||||||
|
$queueForEvents
|
||||||
|
->setParam('userId', $identity->getAttribute('userId'))
|
||||||
|
->setParam('identityId', $identity->getId())
|
||||||
|
->setPayload($response->output($identity, Response::MODEL_IDENTITY));
|
||||||
|
|
||||||
return $response->noContent();
|
return $response->noContent();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue