From 23ddfaca118d4919af9ef146b87c62f43ad98ea8 Mon Sep 17 00:00:00 2001 From: Jan Renz Date: Tue, 28 Apr 2015 16:12:43 +0200 Subject: [PATCH] current_user nil not false --- app/controllers/application_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index aba5c4fb..007d1827 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -10,8 +10,11 @@ class ApplicationController < ActionController::Base rescue_from Pundit::NotAuthorizedError, with: :render_not_authorized def current_user - ::NewRelic::Agent.add_custom_parameters({ external_user_id: :external_user_id, user_id: :user_id, session_user_id: session[:user_id] }) + ::NewRelic::Agent.add_custom_parameters({ external_user_id: :session[:external_user_id], session_user_id: session[:user_id] }) @current_user ||= ExternalUser.find_by(id: session[:external_user_id]) || login_from_session || login_from_other_sources + if @current_user == false + @current_user = nil + end end def help