From 265f5179176ae9579e3c2900be93ee3363d92217 Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Mon, 15 Jun 2020 21:10:20 +0530 Subject: [PATCH 1/4] Use DestroyService for deleting SSH keys via API from admin --- lib/api/users.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/api/users.rb b/lib/api/users.rb index 2b2c753cfc176c..a3378d88faf8cf 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -306,7 +306,7 @@ def reorder_users(users) key = user.keys.find_by(id: params[:key_id]) not_found!('Key') unless key - destroy_conditionally!(key) + ::Keys::DestroyService.new(current_user).execute(key) end # rubocop: enable CodeReuse/ActiveRecord -- GitLab From d97296115585cbb7be2fe69e66c8fa9fac9aea06 Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Mon, 15 Jun 2020 21:13:05 +0530 Subject: [PATCH 2/4] Add changelog --- changelogs/unreleased/services-usage-2.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/services-usage-2.yml diff --git a/changelogs/unreleased/services-usage-2.yml b/changelogs/unreleased/services-usage-2.yml new file mode 100644 index 00000000000000..05714c2906882c --- /dev/null +++ b/changelogs/unreleased/services-usage-2.yml @@ -0,0 +1,5 @@ +--- +title: Use Keys::DestroyService for deleting ssh keys via API from admin +merge_request: 34535 +author: Rajendra Kadam +type: fixed -- GitLab From e5d5265e31197e8591a4ddb51aeb1370879580ee Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Tue, 16 Jun 2020 10:50:00 +0530 Subject: [PATCH 3/4] Use service block inside destroy_conditionally --- 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 a3378d88faf8cf..3d8ae09edf1dc0 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -306,7 +306,10 @@ def reorder_users(users) key = user.keys.find_by(id: params[:key_id]) not_found!('Key') unless key - ::Keys::DestroyService.new(current_user).execute(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 35e2efd2b853f775ca68a3022c0dccd561c4485f Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Tue, 16 Jun 2020 10:56:01 +0530 Subject: [PATCH 4/4] Update changelog --- changelogs/unreleased/services-usage-2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/services-usage-2.yml b/changelogs/unreleased/services-usage-2.yml index 05714c2906882c..8cc4e96d520e74 100644 --- a/changelogs/unreleased/services-usage-2.yml +++ b/changelogs/unreleased/services-usage-2.yml @@ -1,5 +1,5 @@ --- -title: Use Keys::DestroyService for deleting ssh keys via API from admin +title: Use Keys::DestroyService for deleting an SSH key when an admin deletes a key via the API merge_request: 34535 author: Rajendra Kadam type: fixed -- GitLab