diff options
author | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-11-27 11:29:04 -0600 |
commit | e77c3996a513a45e5cad368b0053459f303c60cb (patch) | |
tree | 923411336e4207bb95c17c90c79f19dabb4d62e2 /app/controllers/auth | |
parent | 5de42665d77431def632ca8fb8665082027c60a5 (diff) | |
parent | 1c5b0e333464d8da3de73e4886502c816cb8173e (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/controllers/auth')
-rw-r--r-- | app/controllers/auth/registrations_controller.rb | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index 223db96ff..da0b6512f 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -16,13 +16,16 @@ class Auth::RegistrationsController < Devise::RegistrationsController def build_resource(hash = nil) super(hash) - resource.locale = I18n.locale + + resource.locale = I18n.locale + resource.invite_code = params[:invite_code] if resource.invite_code.blank? + resource.build_account if resource.account.nil? end def configure_sign_up_params devise_parameter_sanitizer.permit(:sign_up) do |u| - u.permit({ account_attributes: [:username] }, :email, :password, :password_confirmation) + u.permit({ account_attributes: [:username] }, :email, :password, :password_confirmation, :invite_code) end end @@ -35,7 +38,19 @@ class Auth::RegistrationsController < Devise::RegistrationsController end def check_enabled_registrations - redirect_to root_path if single_user_mode? || !Setting.open_registrations + redirect_to root_path if single_user_mode? || !allowed_registrations? + end + + def allowed_registrations? + Setting.open_registrations || (invite_code.present? && Invite.find_by(code: invite_code)&.valid_for_use?) + end + + def invite_code + if params[:user] + params[:user][:invite_code] + else + params[:invite_code] + end end private |