gracefully handle invalid sessions

goshacmd · goshacmd · commit 34706150fbdd · 2014-08-15T18:26:05.000+03:00
diff --git 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
 
