Merge pull request #6864 from ckan/fix_caching_logic_on_logged_in_users

amercader · web-flow · commit fcf2489bea19 · 2022-05-20T15:05:45.000+02:00
Fix caching logic on logged in users
diff --git a/ckan/lib/base.py b/ckan/lib/base.py
@@ -20,8 +20,7 @@
 import ckan.lib.helpers as h
 import ckan.plugins as p
 
-from ckan.common import request, config, session
-
+from ckan.common import request, config, session, g
 
 log = logging.getLogger(__name__)
 
@@ -116,7 +115,7 @@ def _allow_caching(cache_force: Optional[bool] = None):
     if cache_force is not None:
         allow_cache = cache_force
     # Do not allow caching of pages for logged in users/flash messages etc.
-    elif _is_valid_session_cookie_data():
+    elif ('user' in g and g.user) or _is_valid_session_cookie_data():
         allow_cache = False
     # Tests etc.
     elif 'REMOTE_USER' in request.environ:
