diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 0ff3bf0fd..682c5f2e3 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -52,6 +52,7 @@ class AccountsController < ApplicationController u.login = user_params["login"] if user_params["login"] u.mail = user_params["mail"] if user_params["mail"] u.lastname = user_params["lastname"] if user_params["lastname"] + u.password = user_params["password"] if user_params["password"] ue.gender = user_extension_params["gender"] ue.school_id = user_extension_params["school_id"] @@ -67,7 +68,7 @@ class AccountsController < ApplicationController sync_params = {} if (user_params["mail"] && user_params["mail"] != user_mail) || (user_params["login"] && user_params["login"] != params[:old_user_login]) - sync_params = sync_params.merge(email: user_params["mail"], login_name: user_params["login"]) + sync_params = sync_params.merge(email: user_params["mail"], login_name: user_params["login"], full_name: user_params["login"]) end if sync_params.present? diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index ca748d551..a389fa72d 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -44,13 +44,22 @@ module LoginHelper end def logout_user + Rails.logger.info("####################__11111______######") + if User.current.logged? + Rails.logger.info("####################__2222_______######") if autologin = cookies.delete(autologin_cookie_name) + Rails.logger.info("####################__33333______######") + User.current.delete_autologin_token(autologin) end + Rails.logger.info("####################__4444444______######") + User.current.delete_session_token(session[:tk]) self.logged_user = nil end + Rails.logger.info("####################__55555______######") + # 云上实验室退出清理当前session laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)) default_yun_session = "#{laboratory.try(:identifier).split('.').first}_user_id"