Fix toolbar and pageviews to get user and session using new helpers

Author: davegaeddert

plain-pageviews/plain/pageviews/models.py

@@ -8,6 +8,16 @@
 
 from .params import extract_tracking_params
 
+try:
+    from plain.auth import get_request_user
+except ImportError:
+    get_request_user = None
+
+try:
+    from plain.sessions import get_request_session
+except ImportError:
+    get_request_session = None
+
 
 @models.register_model
 class Pageview(models.Model):
@@ -101,12 +111,18 @@ def create_from_request(
             if campaign is None:
                 campaign = extracted_campaign
 
-        if user := getattr(request, "user", None):
-            user_id = user.id
+        user = get_request_user(request) if get_request_user else None
+        user_id = user.id if user else ""
+
+        if get_request_session:
+            try:
+                session = get_request_session(request)
+            except KeyError:
+                session = None
         else:
-            user_id = ""
+            session = None
 
-        if session := getattr(request, "session", None):
+        if session:
             session_instance = session.model_instance
             session_id = str(session_instance.id) if session_instance else ""
 

plain-toolbar/plain/toolbar/toolbar.py

@@ -8,6 +8,11 @@
 
 from .registry import register_toolbar_item, registry
 
+try:
+    from plain.auth import get_request_user
+except ImportError:
+    get_request_user = None
+
 
 class Toolbar:
     def __init__(self, context):
@@ -22,7 +27,8 @@ def should_render(self):
         if impersonator := getattr(self.request, "impersonator", None):
             return getattr(impersonator, "is_admin", False)
 
-        if user := getattr(self.request, "user", None):
+        user = get_request_user(self.request) if get_request_user else None
+        if user:
             return getattr(user, "is_admin", False)
 
         return False