diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 65b8d4f17..1ab98c863 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -5,12 +5,12 @@ class AccountsController < ApplicationController #skip_before_action :check_account, :only => [:logout] def simple_update - Rails.logger.info "User.current=========#{current_user}" - Rails.logger.info "User.current=========#{User.current.id}" + simple_update_params.merge!(username: params[:username]&.gsub(/\s+/, "")) simple_update_params.merge!(email: params[:email]&.gsub(/\s+/, "")) simple_update_params.merge!(platform: (params[:platform] || 'forge')&.gsub(/\s+/, "")) simple_update_params.merge!(user_id: current_user.id) + Rails.logger.info "User.current simple_update_params=========#{simple_update_params}" Register::RemoteForm.new(simple_update_params).validate! ActiveRecord::Base.transaction do @@ -421,10 +421,10 @@ class AccountsController < ApplicationController end def remote_register_params - params.permit(:username, :email, :password, :platform, :user_id) + params.permit(:username, :email, :password, :platform) end def simple_update_params - params.permit(:username, :email, :password, :platform, :user_id) + params.permit(:username, :email, :password, :platform) end end diff --git a/app/forms/register/remote_form.rb b/app/forms/register/remote_form.rb index c3eda4358..b312eac0e 100644 --- a/app/forms/register/remote_form.rb +++ b/app/forms/register/remote_form.rb @@ -8,7 +8,7 @@ module Register def check! user = User.find_by(id: user_id) - Rails.logger.info "Register::RemoteForm params: id: #{user&.id}; username: #{username}; email: #{email}; password: #{password}; platform: #{platform}" + Rails.logger.info "Register::RemoteForm params: id: #{user_id}; username: #{username}; email: #{email}; password: #{password}; platform: #{platform}" check_login(username, user) check_mail(email,user) check_password(password)