|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
class Auth::RegistrationsController < Devise::RegistrationsController
|
|
|
include Devise::Controllers::Rememberable
|
|
|
+ include RegistrationSpamConcern
|
|
|
|
|
|
layout :determine_layout
|
|
|
|
|
@@ -13,6 +14,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController
|
|
|
before_action :set_body_classes, only: [:new, :create, :edit, :update]
|
|
|
before_action :require_not_suspended!, only: [:update]
|
|
|
before_action :set_cache_headers, only: [:edit, :update]
|
|
|
+ before_action :set_registration_form_time, only: :new
|
|
|
|
|
|
skip_before_action :require_functional!, only: [:edit, :update]
|
|
|
|
|
@@ -45,16 +47,17 @@ class Auth::RegistrationsController < Devise::RegistrationsController
|
|
|
def build_resource(hash = nil)
|
|
|
super(hash)
|
|
|
|
|
|
- resource.locale = I18n.locale
|
|
|
- resource.invite_code = params[:invite_code] if resource.invite_code.blank?
|
|
|
- resource.sign_up_ip = request.remote_ip
|
|
|
+ resource.locale = I18n.locale
|
|
|
+ resource.invite_code = params[:invite_code] if resource.invite_code.blank?
|
|
|
+ resource.registration_form_time = session[:registration_form_time]
|
|
|
+ resource.sign_up_ip = request.remote_ip
|
|
|
|
|
|
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], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement)
|
|
|
+ u.permit({ account_attributes: [:username], invite_request_attributes: [:text] }, :email, :password, :password_confirmation, :invite_code, :agreement, :website, :confirm_password)
|
|
|
end
|
|
|
end
|
|
|
|