floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-22 12:45:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' into dev_chain

Browse Source
This commit is contained in:
Jasder
2020-07-02 15:52:15 +08:00
parent 2e3438d75b 04f98f1c10
commit 1541cb4fc3
14 changed files with 100 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/accounts_controller.rb
View File

@@ -269,7 +269,9 @@ class AccountsController < ApplicationController
cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
end
cookies[autologin_cookie_name] = cookie_options
logger.info("cookies is #{cookies}")
cookies.signed[:user_id] ||= user.id
logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
end
def logout

4
app/controllers/application_controller.rb
View File

@@ -342,7 +342,9 @@ class ApplicationController < ActionController::Base
elsif params[:debug] == 'student'
User.current = User.find 8686
elsif params[:debug] == 'admin'
User.current = User.find 1
user = User.find 1
User.current = user
cookies.signed[:user_id] = user.id
end
end
# User.current = User.find 81403

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

@@ -24,8 +24,10 @@ module LoginHelper
unless cookies[autologin_cookie_name].present?
cookies[autologin_cookie_name] = cookie_options
end
# for action cable
cookies.signed[:user_id] ||= user.id
Rails.logger.info("cookies is #{cookies}")
Rails.logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]}")
end
def successful_authentication(user)