pre_develop
daiao 6 years ago
parent 99511fe5e6
commit 151ab55dbb

@ -225,7 +225,7 @@ class ApplicationController < ActionController::Base
elsif params[:authToken] elsif params[:authToken]
user = Token.find_by_value(params[:authToken]).user user = Token.find_by_value(params[:authToken]).user
set_autologin_cookie(user) set_autologin_cookie(user)
session[:user_id] = user.id start_user_session(user)
end end
end end
if user.nil? && Setting.rest_api_enabled? && accept_api_auth? if user.nil? && Setting.rest_api_enabled? && accept_api_auth?

Loading…
Cancel
Save