Skip to content

Commit

Permalink
♻️ split delete credentials route
Browse files Browse the repository at this point in the history
  • Loading branch information
valya committed Jul 11, 2022
1 parent c952bee commit cd1a51b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
15 changes: 4 additions & 11 deletions packages/cli/src/credentials/credentials.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,9 @@ credentialsController.delete(
ResponseHelper.send(async (req: CredentialRequest.Delete) => {
const { id: credentialId } = req.params;

const shared = await Db.collections.SharedCredentials.findOne({
relations: ['credentials'],
where: whereClause({
user: req.user,
entityType: 'credentials',
entityId: credentialId,
}),
});
const shared = await CredentialsService.getSharedCredentials(req.user, credentialId, [
'credentials',
]);

if (!shared) {
LoggerProxy.info('Attempt to delete credential blocked due to lack of permissions', {
Expand All @@ -192,9 +187,7 @@ credentialsController.delete(
);
}

await externalHooks.run('credentials.delete', [credentialId]);

await Db.collections.Credentials.remove(shared.credentials);
await CredentialsService.deleteCredentials(shared.credentials);

return true;
}),
Expand Down
6 changes: 6 additions & 0 deletions packages/cli/src/credentials/credentials.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,10 @@ export class CredentialsService {
});
return result;
}

static async deleteCredentials(credentials: CredentialsEntity): Promise<void> {
await externalHooks.run('credentials.delete', [credentials.id]);

await Db.collections.Credentials.remove(credentials);
}
}

0 comments on commit cd1a51b

Please sign in to comment.