diff --git a/app/controllers/admins/users_controller.rb b/app/controllers/admins/users_controller.rb index ba7b70d29..f5974b47d 100644 --- a/app/controllers/admins/users_controller.rb +++ b/app/controllers/admins/users_controller.rb @@ -41,7 +41,7 @@ class Admins::UsersController < Admins::BaseController end end @user.destroy! - Gitea::User::DeleteService.call(@user.login) + Gitea::User::DeleteService.call(@user.login, true) render_delete_success end diff --git a/app/services/gitea/user/delete_service.rb b/app/services/gitea/user/delete_service.rb index 763c6047f..096a88251 100644 --- a/app/services/gitea/user/delete_service.rb +++ b/app/services/gitea/user/delete_service.rb @@ -1,12 +1,13 @@ class Gitea::User::DeleteService < Gitea::ClientService - attr_reader :username + attr_reader :username, purge - def initialize(username) + def initialize(username, purge = false) @username = username + @purge = purge end def call - response = delete(request_url, params.merge(data: {purge: true})) + response = delete(request_url, params) render_status(response) end @@ -20,7 +21,7 @@ class Gitea::User::DeleteService < Gitea::ClientService end def request_url - "/admin/users/#{username}" + @purge ? "/admin/users/#{username}?purge=true" : "/admin/users/#{username}" end def params