Browse Source

Change

pull/278/head
sylor_huang@126.com 5 years ago
parent
commit
0f60d0adc9
2 changed files with 11 additions and 14 deletions
  1. +4
    -5
      app/controllers/accounts_controller.rb
  2. +7
    -9
      app/controllers/concerns/login_helper.rb

+ 4
- 5
app/controllers/accounts_controller.rb View File

@@ -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


+ 7
- 9
app/controllers/concerns/login_helper.rb View File

@@ -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



Loading…
Cancel
Save