floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

修改密码和登出

This commit is contained in:
sylor_huang@126.com 2020-04-15 17:02:36 +08:00
parent e8df65e489
commit e208193ffd
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/accounts_controller.rb
View File

@ -52,6 +52,7 @@ class AccountsController < ApplicationController
u.login = user_params["login"] if user_params["login"] u.login = user_params["login"] if user_params["login"]
u.mail = user_params["mail"] if user_params["mail"] u.mail = user_params["mail"] if user_params["mail"]
u.lastname = user_params["lastname"] if user_params["lastname"] 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.gender = user_extension_params["gender"]
ue.school_id = user_extension_params["school_id"] ue.school_id = user_extension_params["school_id"]
@ -67,7 +68,7 @@ class AccountsController < ApplicationController
sync_params = {} sync_params = {}
if (user_params["mail"] && user_params["mail"] != user_mail) || (user_params["login"] && user_params["login"] != params[:old_user_login]) 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 end
if sync_params.present? if sync_params.present?

9
app/controllers/concerns/login_helper.rb
View File

@ -44,13 +44,22 @@ module LoginHelper
end end
def logout_user def logout_user
Rails.logger.info("####################__11111______######")
if User.current.logged? if User.current.logged?
Rails.logger.info("####################__2222_______######")
if autologin = cookies.delete(autologin_cookie_name) if autologin = cookies.delete(autologin_cookie_name)
Rails.logger.info("####################__33333______######")
User.current.delete_autologin_token(autologin) User.current.delete_autologin_token(autologin)
end end
Rails.logger.info("####################__4444444______######")
User.current.delete_session_token(session[:tk]) User.current.delete_session_token(session[:tk])
self.logged_user = nil self.logged_user = nil
end end
Rails.logger.info("####################__55555______######")
# 云上实验室退出清理当前session # 云上实验室退出清理当前session
laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)) laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1))
default_yun_session = "#{laboratory.try(:identifier).split('.').first}_user_id" default_yun_session = "#{laboratory.try(:identifier).split('.').first}_user_id"