From 6a86d2aa319b3b509d3ccf23d5c765587736fa56 Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Mon, 22 Jun 2020 19:13:03 +0530 Subject: [PATCH 1/2] Use GpgKeys::DestroyService when a user deletes a GPG keys for themselves --- lib/api/users.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/api/users.rb b/lib/api/users.rb index 192eeb691ffc31..3f89f1c253afd6 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -829,9 +829,10 @@ def find_impersonation_token key = current_user.gpg_keys.find_by(id: params[:key_id]) not_found!('GPG Key') unless key - key.destroy - - no_content! + destroy_conditionally!(key) do |key| + destroy_service = ::GpgKeys::DestroyService.new(current_user) + destroy_service.execute(key) + end end # rubocop: enable CodeReuse/ActiveRecord -- GitLab From 8bba74386943f95089657240da2a9fbc604bc2b7 Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Mon, 22 Jun 2020 19:17:19 +0530 Subject: [PATCH 2/2] Add changelog --- changelogs/unreleased/services-usage-8.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/services-usage-8.yml diff --git a/changelogs/unreleased/services-usage-8.yml b/changelogs/unreleased/services-usage-8.yml new file mode 100644 index 00000000000000..fb3e3cfa709a19 --- /dev/null +++ b/changelogs/unreleased/services-usage-8.yml @@ -0,0 +1,5 @@ +--- +title: Use GpgKeys::DestroyService when a user deletes GPG keys for themselves via the API +merge_request: 35033 +author: Rajendra Kadam +type: fixed -- GitLab