From 0f60d0adc95f1588bf1b971e4e718136ddac5354 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Tue, 11 Aug 2020 17:13:42 +0800 Subject: [PATCH] Change --- app/controllers/accounts_controller.rb | 9 ++++----- app/controllers/concerns/login_helper.rb | 16 +++++++--------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 8251eb2d..3b9ff2e0 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -263,12 +263,11 @@ class AccountsController < ApplicationController :expires => 1.month.from_now, :path => '/', :secure => false, - :httponly => true, - :domain => "123.59.135.93" + :httponly => true } - # if edu_setting('cookie_domain').present? - # cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) - # end + if edu_setting('cookie_domain').present? + cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) + end cookies[autologin_cookie_name] = cookie_options cookies.signed[:user_id] ||= user.id diff --git a/app/controllers/concerns/login_helper.rb b/app/controllers/concerns/login_helper.rb index ab440737..d554705b 100644 --- a/app/controllers/concerns/login_helper.rb +++ b/app/controllers/concerns/login_helper.rb @@ -17,16 +17,14 @@ module LoginHelper :expires => 1.month.from_now, :path => '/', :secure => false, - :httponly => false, - :domain => "123.59.135.93" + :httponly => false } - # if edu_setting('cookie_domain').present? - # cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) - # end - # unless cookies[autologin_cookie_name].present? - - # end - cookies[autologin_cookie_name] = cookie_options + if edu_setting('cookie_domain').present? + cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) + end + unless cookies[autologin_cookie_name].present? + cookies[autologin_cookie_name] = cookie_options + end # for action cable cookies.signed[:user_id] ||= user.id