From 34706150fbdd1d1bafa9b99196d6314431a074c2 Mon Sep 17 00:00:00 2001 From: Gosha Arinich Date: Fri, 15 Aug 2014 18:26:05 +0300 Subject: [PATCH] gracefully handle invalid sessions --- app/controllers/application_controller.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bcb7f54e..4afa3f6b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -41,8 +41,13 @@ def clear_expired_cookie_if_session_is_empty def current_user if @current_user.nil? && session[:current_user] - @current_user = User.find(session[:current_user]) + unless @current_user = User.find_by_id(session[:current_user]) + session[:current_user] = nil + store_location! + redirect_to signin_path + end end + @current_user end