Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 8 deletions

diff --git a/lib/api/users.rb b/lib/api/users.rb
index 505fcb2b38e..3d9af536c3c 100644
--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -758,16 +758,11 @@ module API
 
         break if user.deactivated?
 
-        unless user.can_be_deactivated?
-          forbidden!('A blocked user cannot be deactivated by the API') if user.blocked?
-          forbidden!('An internal user cannot be deactivated by the API') if user.internal?
-          forbidden!("The user you are trying to deactivate has been active in the past #{Gitlab::CurrentSettings.deactivate_dormant_users_period} days and cannot be deactivated")
-        end
-
-        if user.deactivate
+        result = ::Users::DeactivateService.new(current_user, skip_authorization: true).execute(user)
+        if result[:status] == :success
           true
         else
-          render_api_error!(user.errors.full_messages, 400)
+          render_api_error!(result[:message], result[:reason] || :bad_request)
         end
       end
       # rubocop: enable CodeReuse/ActiveRecord