wip

.secrets.baseline

@@ -151,7 +151,7 @@
         "filename": "core/settings.py",
         "hashed_secret": "1ee34e26aeaf89c64ecc2c85efe6a961b75a50e9",
         "is_verified": false,
-        "line_number": 219
+        "line_number": 220
       }
     ],
     "docker-compose.yml": [
@@ -207,5 +207,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-22T18:36:09Z"
+  "generated_at": "2025-01-27T22:31:39Z"
 }

core/context_processors.py

@@ -23,7 +23,8 @@ def assistant(request) -> dict:
     return {
         "assistant": {
             "is_home": request.path == reverse("qfdmd:home"),
-            "is_iframe": request.session.get("iframe"),
+            "is_iframe": request.COOKIES.get("iframe") == "1"
+            or "iframe" in request.GET,
             "POSTHOG_KEY": settings.ASSISTANT["POSTHOG_KEY"],
             "MATOMO_ID": settings.ASSISTANT["MATOMO_ID"],
         },

core/settings.py

@@ -76,9 +76,10 @@
     "corsheaders.middleware.CorsMiddleware",
     "django.middleware.security.SecurityMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
-    "django.contrib.sessions.middleware.SessionMiddleware",
+    "qfdmd.middleware.RemoveCookieFromVaryMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",

qfdmd/middleware.py

@@ -0,0 +1,27 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class RemoveCookieFromVaryMiddleware:
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        response = self.get_response(request)
+        if request.user.is_authenticated:
+            response.headers["logged-in"] = 1
+        else:
+            del response.headers["Vary"]
+            response.headers["Vary"] = "iframe, logged-in"
+
+        if "iframe" in request.GET:
+            response.set_cookie("iframe", 1)
+
+        if (
+            response.cookies.get("iframe") == "1"
+            or request.COOKIES.get("iframe") == "1"
+        ):
+            response.headers["iframe"] = 1
+
+        return response

qfdmd/views.py

@@ -7,7 +7,8 @@
 from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
-from django.views.decorators.cache import cache_page
+from django.views.decorators.cache import cache_control, cache_page
+from django.views.decorators.vary import vary_on_headers
 from django.views.generic import DetailView, FormView, ListView
 
 from core.notion import create_new_row_in_notion_table
@@ -75,15 +76,6 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         )
         return context
 
-    def setup(self, request, *args, **kwargs):
-        if "iframe" not in request.session:
-            request.session["iframe"] = "iframe" in request.GET
-            if not request.user.is_authenticated:
-                request.session.set_expiry(
-                    0
-                )  # set to 0 expires when the users closes its browser
-        super().setup(request, *args, **kwargs)
-
 
 def cache_page_for_guests(*cache_args, **cache_kwargs):
     def inner_decorator(func):
@@ -100,7 +92,8 @@ def inner_function(request, *args, **kwargs):
     return inner_decorator
 
 
-@method_decorator(cache_page_for_guests(60 * 15), name="dispatch")
+@method_decorator(cache_control(max_age=60 * 15), name="dispatch")
+@method_decorator(vary_on_headers("logged-in", "iframe"), name="dispatch")
 class HomeView(BaseView, ListView):
     template_name = "qfdmd/home.html"
     model = Suggestion
@@ -124,11 +117,9 @@ def get_context_data(self, **kwargs: Any) -> dict[str, Any]:
         return context
 
 
-@method_decorator(cache_page_for_guests(60 * 15), name="dispatch")
 class SynonymeDetailView(BaseView, DetailView):
     model = Synonyme
 
 
-@method_decorator(cache_page_for_guests(60 * 15), name="dispatch")
 class CMSPageDetailView(BaseView, DetailView):
     model = CMSPage

servers.conf.erb

@@ -14,7 +14,7 @@ server {
         proxy_pass http://unix:/tmp/gunicorn.sock;
         proxy_cache assistant;
         proxy_set_header Host $http_host;
-        proxy_cache_key $request_method$request_uri;
+        proxy_cache_key $request_method$request_uri$is_args$args;
         proxy_cache_lock on;
         proxy_cache_lock_timeout 10s;
         proxy_cache_use_stale error timeout updating;

static/to_compile/entrypoints/assistant/script-to-iframe.ts

@@ -4,7 +4,7 @@ const script = document.currentScript as HTMLScriptElement
 const slug = script?.dataset?.objet;
 const origin = new URL(script?.getAttribute("src")).origin
 // TODO: mise en prod, remplacer dechet ci-dessous par une string vide
-const src = `${origin}/${slug || 'dechet'}?iframe`;
+const src = `${origin}/dechet/${slug || ''}?iframe`;
 const iframe = document.createElement("iframe");
 
 const iframeAttributes = {

templates/components/search/view.html

@@ -25,8 +25,6 @@
             qf-content-center
             "
         >
-            {% csrf_token %}
-
             <button
                 aria-label="Rechercher"
                 type="submit"