mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-11-28 06:48:38 +09:00
Code

Fix account delete form not accepting password, update suspended (#3745)

Browse Source 
account before removing content for quicker feedback to end-users
This commit is contained in:
Eugen Rochko 2017-06-14 20:30:12 +02:00 committed by GitHub
parent 98eacb2238
commit 91c71471ab
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/settings/deletes_controller.rb
View File

@ -22,6 +22,6 @@ class Settings::DeletesController < ApplicationController
private private
def delete_params def delete_params
params.permit(:password) params.require(:form_delete_confirmation).permit(:password)
end end
end end

2
app/services/suspend_account_service.rb
View File

@ -5,8 +5,8 @@ class SuspendAccountService < BaseService
@account = account @account = account
purge_user if remove_user purge_user if remove_user
purge_content
purge_profile purge_profile
purge_content
unsubscribe_push_subscribers unsubscribe_push_subscribers
end end

4
spec/controllers/settings/deletes_controller_spec.rb
View File

@ -35,7 +35,7 @@ describe Settings::DeletesController do
context 'with correct password' do context 'with correct password' do
before do before do
delete :destroy, params: { password: 'petsmoldoggos' } delete :destroy, params: { form_delete_confirmation: { password: 'petsmoldoggos' } }
end end
it 'redirects to sign in page' do it 'redirects to sign in page' do
@ -53,7 +53,7 @@ describe Settings::DeletesController do
context 'with incorrect password' do context 'with incorrect password' do
before do before do
delete :destroy, params: { password: 'blaze420' } delete :destroy, params: { form_delete_confirmation: { password: 'blaze420' } }
end end
it 'redirects back to confirmation page' do it 'redirects back to confirmation page' do