mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-22 18:48:26 +09:00
c707ef49d9
* Fix 2FA challenge not appearing for non-database users Fix #11685 * Fix account deletion not working when using external login Fix #11691
53 lines
1.2 KiB
Ruby
53 lines
1.2 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Settings::DeletesController < Settings::BaseController
|
|
layout 'admin'
|
|
|
|
before_action :check_enabled_deletion
|
|
before_action :authenticate_user!
|
|
before_action :require_not_suspended!
|
|
|
|
skip_before_action :require_functional!
|
|
|
|
def show
|
|
@confirmation = Form::DeleteConfirmation.new
|
|
end
|
|
|
|
def destroy
|
|
if challenge_passed?
|
|
destroy_account!
|
|
redirect_to new_user_session_path, notice: I18n.t('deletes.success_msg')
|
|
else
|
|
redirect_to settings_delete_path, alert: I18n.t('deletes.challenge_not_passed')
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def check_enabled_deletion
|
|
redirect_to root_path unless Setting.open_deletion
|
|
end
|
|
|
|
def resource_params
|
|
params.require(:form_delete_confirmation).permit(:password, :username)
|
|
end
|
|
|
|
def require_not_suspended!
|
|
forbidden if current_account.suspended?
|
|
end
|
|
|
|
def challenge_passed?
|
|
if current_user.encrypted_password.blank?
|
|
current_account.username == resource_params[:username]
|
|
else
|
|
current_user.valid_password?(resource_params[:password])
|
|
end
|
|
end
|
|
|
|
def destroy_account!
|
|
current_account.suspend!
|
|
Admin::SuspensionWorker.perform_async(current_user.account_id, true)
|
|
sign_out
|
|
end
|
|
end
|