yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change

This commit is contained in:
sylor_huang@126.com 2020-08-11 17:00:56 +08:00
parent 57d1a1474e
commit d4d412ab40
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/accounts_controller.rb
View File

@ -263,11 +263,12 @@ class AccountsController < ApplicationController
:expires => 1.month.from_now, :expires => 1.month.from_now,
:path => '/', :path => '/',
:secure => false, :secure => false,
:httponly => true :httponly => true,
:domain => "/"
} }
if edu_setting('cookie_domain').present? # if edu_setting('cookie_domain').present?
cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) # cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
end # end
cookies[autologin_cookie_name] = cookie_options cookies[autologin_cookie_name] = cookie_options
cookies.signed[:user_id] ||= user.id cookies.signed[:user_id] ||= user.id

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

@ -17,11 +17,12 @@ module LoginHelper
:expires => 1.month.from_now, :expires => 1.month.from_now,
:path => '/', :path => '/',
:secure => false, :secure => false,
:httponly => false :httponly => false,
:domain => "/"
} }
if edu_setting('cookie_domain').present? # if edu_setting('cookie_domain').present?
cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) # cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
end # end
unless cookies[autologin_cookie_name].present? unless cookies[autologin_cookie_name].present?
cookies[autologin_cookie_name] = cookie_options cookies[autologin_cookie_name] = cookie_options
end end