Change
This commit is contained in:
parent
055b7dbac5
commit
57d1a1474e
|
@ -256,23 +256,23 @@ class AccountsController < ApplicationController
|
|||
# UserDayCertification.create(user_id: user.id, status: 1)
|
||||
end
|
||||
|
||||
# def set_autologin_cookie(user)
|
||||
# token = Token.get_or_create_permanent_login_token(user, "autologin_forge_military")
|
||||
# cookie_options = {
|
||||
# :value => token.value,
|
||||
# :expires => 1.month.from_now,
|
||||
# :path => '/',
|
||||
# :secure => false,
|
||||
# :httponly => true
|
||||
# }
|
||||
# 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
|
||||
def set_autologin_cookie(user)
|
||||
token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
|
||||
cookie_options = {
|
||||
:value => token.value,
|
||||
:expires => 1.month.from_now,
|
||||
:path => '/',
|
||||
:secure => false,
|
||||
:httponly => true
|
||||
}
|
||||
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
|
||||
|
||||
# logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
|
||||
# end
|
||||
logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
|
||||
end
|
||||
|
||||
def logout
|
||||
Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")
|
||||
|
|
|
@ -140,10 +140,8 @@ class UsersController < ApplicationController
|
|||
# 其他平台登录后,必须将token同步到forge平台,实现sso登录功能
|
||||
def sync_token
|
||||
return render_error('未找相关用户!') unless @user
|
||||
|
||||
token = Token.get_or_create_permanent_login_token(@user, autologin_cookie_name)
|
||||
token.update_column(:value, params[:token])
|
||||
session[:"#{default_yun_session}"] = @user.id
|
||||
render_ok
|
||||
end
|
||||
|
||||
|
|
|
@ -26,7 +26,6 @@ class Token < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def self.get_or_create_permanent_login_token(user, type)
|
||||
Rails.logger.info("======login_token=====user_id:#{user.id}===type:#{type}")
|
||||
token = Token.get_token_from_user(user, type)
|
||||
unless token
|
||||
token = Token.create(:user => user, :action => type)
|
||||
|
|
Loading…
Reference in New Issue