diff --git a/changelogs/unreleased/services-usage-2.yml b/changelogs/unreleased/services-usage-2.yml new file mode 100644 index 0000000000000000000000000000000000000000..8cc4e96d520e7496ce038ff88e2c00602ebd27be --- /dev/null +++ b/changelogs/unreleased/services-usage-2.yml @@ -0,0 +1,5 @@ +--- +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 diff --git a/lib/api/users.rb b/lib/api/users.rb index 2b2c753cfc176c742309ce67f1551407d4a8d77c..3d8ae09edf1dc05e3360a8584914f57aa0bab685 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 - 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