tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sign-ups without checked user agreement being accepted through the web form (#13088)

Browse Source 
* Fix user agreement not being verified

* Fix tests

* Fix up agreement field being dismissed
This commit is contained in:
ThibG
2020-02-16 12:56:53 +01:00
committed by GitHub
parent 250ca99cb5
commit c48d895ea7
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/auth/registrations_controller.rb
View File

@ -41,7 +41,6 @@ class Auth::RegistrationsController < Devise::RegistrationsController
resource.locale = I18n.locale
resource.invite_code = params[:invite_code] if resource.invite_code.blank?
resource.agreement = true
resource.current_sign_in_ip = request.remote_ip
resource.build_account if resource.account.nil?
@ -49,7 +48,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
def configure_sign_up_params
devise_parameter_sanitizer.permit(:sign_up) do |u|
u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code)
u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement)
end
end