|
|
|
@ -300,20 +300,15 @@ class AccountController < ApplicationController |
|
|
|
|
session[:auth_source_registration] = nil |
|
|
|
|
|
|
|
|
|
if @user.nil? |
|
|
|
|
@user = User.new(language: Setting.default_language) |
|
|
|
|
@user = assign_user_attributes({ language: Setting.default_language }) |
|
|
|
|
elsif user_with_placeholder_name?(@user) |
|
|
|
|
# force user to give their name |
|
|
|
|
@user.firstname = nil |
|
|
|
|
@user.lastname = nil |
|
|
|
|
end |
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
def self_registration! |
|
|
|
|
if @user.nil? |
|
|
|
|
@user = User.new |
|
|
|
|
@user.admin = false |
|
|
|
|
@user.register |
|
|
|
|
end |
|
|
|
|
@user = assign_user_attributes({ admin: false, status: User.statuses[:registered] }) if @user.nil? |
|
|
|
|
|
|
|
|
|
return if enforce_activation_user_limit(user: user_with_email(@user)) |
|
|
|
|
|
|
|
|
@ -329,6 +324,13 @@ class AccountController < ApplicationController |
|
|
|
|
end |
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
def assign_user_attributes(attrs) |
|
|
|
|
Users::SetAttributesService |
|
|
|
|
.new(model: User.new, user: current_user, contract_class: EmptyContract) |
|
|
|
|
.call(attrs) |
|
|
|
|
.result |
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
def register_plain_user(user) |
|
|
|
|
user.attributes = permitted_params.user.transform_values do |val| |
|
|
|
|
if val.is_a? String |
|
|
|
|