From a3c82d78ef9d2972809c858856cbbfa513f7ecef Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Wed, 17 Jun 2020 16:04:26 +0530 Subject: [PATCH 1/2] Use DestroyService for deleting SSH keys via API from user --- lib/api/users.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/api/users.rb b/lib/api/users.rb index 77644a2cbc2bb0..5f15787015193f 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -750,7 +750,10 @@ def find_impersonation_token key = current_user.keys.find_by(id: params[:key_id]) not_found!('Key') unless key - destroy_conditionally!(key) + destroy_conditionally!(key) do |key| + destroy_service = ::Keys::DestroyService.new(current_user) + destroy_service.execute(key) + end end # rubocop: enable CodeReuse/ActiveRecord -- GitLab From 57de2a989aa76c55e69d39092f77745a28a5187e Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Wed, 17 Jun 2020 16:14:27 +0530 Subject: [PATCH 2/2] Add changelog --- changelogs/unreleased/services-usage-4.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/services-usage-4.yml diff --git a/changelogs/unreleased/services-usage-4.yml b/changelogs/unreleased/services-usage-4.yml new file mode 100644 index 00000000000000..cd3e54a52be64f --- /dev/null +++ b/changelogs/unreleased/services-usage-4.yml @@ -0,0 +1,5 @@ +--- +title: Use Keys::DestroyService for deleting an SSH key when a user deletes a key via the API +merge_request: 34718 +author: Rajendra Kadam +type: fixed -- GitLab