Proin ut a fames amet mi a feugiat mus quam risus iaculis egestas dignissim maecenas scelerisque tristique a leo a diam a cursus consectetur sem ac litora aliquam a. Felis vestibulum vestibulum vitae a vestibulum aliquam id egestas a proin posuere aliquam bibendum facilisis adipiscing tempor aptent nibh feugiat felis rutrum integer condimentum tincidunt. Ipsum purus nulla habitant condimentum tempor vestibulum elementum scelerisque dui at condimentum gravida a scelerisque scelerisque a adipiscing parturient ornare enim sodales vestibulum. Nec egestas est habitant tempus tristique parturient conubia consectetur parturient vestibulum quam nam platea senectus suspendisse a varius accumsan auctor vehicula velit vel. Ullamcorper a et nulla et inceptos himenaeos in hac consectetur facilisis scelerisque condimentum pharetra facilisi porttitor ut feugiat suspendisse lectus quisque fermentum nibh platea.
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
new file mode 100644
index 000000000..d1223ef2c
--- /dev/null
+++ b/nginx/nginx.conf
@@ -0,0 +1,5 @@
+events {}
+
+http {
+ include /etc/nginx/servers.conf;
+}
diff --git a/nginx/servers.conf b/nginx/servers.conf
new file mode 100644
index 000000000..aba61ed87
--- /dev/null
+++ b/nginx/servers.conf
@@ -0,0 +1,27 @@
+proxy_cache_path /tmp/nginx_assistant_cache levels=1:2 keys_zone=assistant:10m max_size=1g inactive=60m use_temp_path=off;
+# Define a variable to disable cache if the logged_in cookie is set
+map $http_cookie $no_cache {
+ default 0;
+ "~*logged_in=.*" 1;
+}
+
+server {
+ listen 80;
+ server_name _;
+
+ location / {
+ proxy_pass http://host.docker.internal:8000;
+
+ proxy_cache_bypass $no_cache;
+ proxy_no_cache $no_cache;
+
+ proxy_cache assistant;
+ proxy_set_header Host $http_host;
+ 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;
+ proxy_cache_background_update on;
+ add_header X-Cache-Status $upstream_cache_status;
+ }
+}
diff --git a/qfdmd/middleware.py b/qfdmd/middleware.py
new file mode 100644
index 000000000..85372a8c7
--- /dev/null
+++ b/qfdmd/middleware.py
@@ -0,0 +1,44 @@
+class AssistantMiddleware:
+ def __init__(self, get_response):
+ self.get_response = get_response
+
+ def __call__(self, request):
+ response = self.get_response(request)
+
+ self._set_logged_in_cookie(request, response)
+ self._handle_iframe_cookie(request, response)
+ self._cleanup_vary_header(response)
+
+ return response
+
+ def _set_logged_in_cookie(self, request, response):
+ """Set or update the 'logged-in' header based on authentication."""
+ cookie_name = "logged_in"
+ if request.user.is_authenticated:
+ response.set_cookie(cookie_name, "1")
+ elif request.COOKIES.get(cookie_name):
+ response.delete_cookie(cookie_name)
+
+ def _handle_iframe_cookie(self, request, response):
+ """Manage iframe-related headers and cookies."""
+ iframe_in_request = "iframe" in request.GET
+ iframe_cookie = response.cookies.get("iframe")
+
+ if iframe_in_request:
+ response.set_cookie("iframe", "1")
+ response.headers["iframe"] = "1"
+ elif iframe_cookie and iframe_cookie.value == "1":
+ response.headers["iframe"] = "1"
+ else:
+ # Ensure the iframe header is not lingering
+ response.headers.pop("iframe", None)
+
+ @staticmethod
+ def _cleanup_vary_header(response):
+ """Helper to parse and return the Vary header as a list."""
+ vary_header = response.headers.get("Vary", "")
+ return [
+ v.strip()
+ for v in vary_header.split(",")
+ if v.strip() and v.strip().lower() != "cookie"
+ ]
diff --git a/qfdmd/views.py b/qfdmd/views.py
index 2db0bb93a..52167c753 100644
--- a/qfdmd/views.py
+++ b/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
@@ -91,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
@@ -115,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
diff --git a/servers.conf.erb b/servers.conf.erb
index af6805223..1813ceb5e 100644
--- a/servers.conf.erb
+++ b/servers.conf.erb
@@ -1,5 +1,12 @@
proxy_cache_path /tmp/nginx_assistant_cache levels=1:2 keys_zone=assistant:10m max_size=1g inactive=60m use_temp_path=off;
+# Define a variable to disable cache if the specific cookie is set
+map $http_cookie $no_cache {
+ default 0; # Enable caching by default
+ "~*logged_in=.*" 1; # Disable caching if 'logged_in' is set
+}
+
+
server {
listen <%= ENV["PORT"] %>;
server_name _;
@@ -12,8 +19,13 @@ server {
location / {
proxy_pass http://unix:/tmp/gunicorn.sock;
+
+ proxy_cache_bypass $no_cache;
+ proxy_no_cache $no_cache;
+
proxy_cache assistant;
- proxy_cache_key $request_method$request_uri;
+ proxy_set_header Host $http_host;
+ 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;
diff --git a/static/to_compile/entrypoints/assistant/script-to-iframe.ts b/static/to_compile/entrypoints/assistant/script-to-iframe.ts
index 5c62c7418..d2d31608e 100644
--- a/static/to_compile/entrypoints/assistant/script-to-iframe.ts
+++ b/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 = {
diff --git a/static/to_compile/js/controllers/assistant/analytics.ts b/static/to_compile/js/controllers/assistant/analytics.ts
index ec784a8a8..a490cb244 100644
--- a/static/to_compile/js/controllers/assistant/analytics.ts
+++ b/static/to_compile/js/controllers/assistant/analytics.ts
@@ -117,6 +117,11 @@ export default class extends Controller
{
conversionScore,
},
})
+
+ const posthogBannerConversionScore = document.querySelector("#posthog-banner-conversion-score")
+ if (posthogBannerConversionScore) {
+ posthogBannerConversionScore.textContent = conversionScore.toString()
+ }
}, 1000)
}
diff --git a/templates/components/footer/footer.html b/templates/components/footer/footer.html
index 9a6e3e17c..233309060 100644
--- a/templates/components/footer/footer.html
+++ b/templates/components/footer/footer.html
@@ -1,11 +1,11 @@
- {% if "iframe" in request.GET %}
+ {% if assistant.is_iframe %}
{% include "./_embedded.html" %}
{% else %}
{% include "./_standalone.html" %}
{% endif %}
-{% if "iframe" not in request.GET %}
+{% if not assistant.is_iframe %}
{% include "./_dsfr_footer.html" %}
{% endif %}
diff --git a/templates/components/header/header.html b/templates/components/header/header.html
index 65885d501..219e768d4 100644
--- a/templates/components/header/header.html
+++ b/templates/components/header/header.html
@@ -3,6 +3,7 @@