Correction du backlink quand l'url est mal définie (#2060)

fabienheureux · web-flow · commit 890e1851cfd2 · 2025-09-25T12:50:39.000Z
* debug backlink

* Add more test cases

* Add tests

* Disable cache control

* Add font

* fix test

* fix test

* Remove random settings
diff --git a/core/views.py b/core/views.py
@@ -4,24 +4,26 @@
 from django.contrib.staticfiles import finders
 from django.http import HttpResponse
 from django.template.loader import render_to_string
-from django.utils.safestring import mark_safe
 from django.views.decorators.cache import cache_control
+from wagtail.templatetags.wagtailcore_tags import richtext
 
 from qfdmd.models import EmbedSettings
 
 
-@cache_control(max_age=3600)  # an hour
 def backlink(request):
     key = request.GET.get("key")
     text_content = ""
-    if key == "assistant":
-        text_content = EmbedSettings.objects.first().backlink_assistant
-    if key == "carte":
-        text_content = EmbedSettings.objects.first().backlink_carte
-    if key == "formulaire":
-        text_content = EmbedSettings.objects.first().backlink_formulaire
-
-    return HttpResponse(mark_safe(text_content), content_type="text/plain")
+    try:
+        if key == "assistant":
+            text_content = EmbedSettings.objects.first().backlink_assistant
+        if key == "carte":
+            text_content = EmbedSettings.objects.first().backlink_carte
+        if key == "formulaire":
+            text_content = EmbedSettings.objects.first().backlink_formulaire
+    except (AttributeError, EmbedSettings.DoesNotExist):
+        pass
+
+    return HttpResponse(richtext(text_content), content_type="text/plain")
 
 
 @cache_control(max_age=31536000)
diff --git a/integration_tests/core/test_backlink_views.py b/integration_tests/core/test_backlink_views.py
@@ -0,0 +1,51 @@
+import pytest
+from factory.django import DjangoModelFactory
+
+from qfdmd.models import EmbedSettings
+
+
+class EmbedSettingsFactory(DjangoModelFactory):
+    class Meta:
+        model = EmbedSettings
+
+
+@pytest.mark.django_db
+def test_backlink_assistant(client):
+    EmbedSettingsFactory(backlink_assistant="coucou")
+    response = client.get("/embed/backlink?key=assistant")
+    assert response.content.decode() == "coucou"
+
+
+@pytest.mark.django_db
+def test_backlink_carte(client):
+    EmbedSettingsFactory(backlink_carte="coucou")
+    response = client.get("/embed/backlink?key=carte")
+    assert response.content.decode() == "coucou"
+
+
+@pytest.mark.django_db
+def test_backlink_formulaire(client):
+    EmbedSettingsFactory(backlink_formulaire="coucou")
+    response = client.get("/embed/backlink?key=formulaire")
+    assert response.content.decode() == "coucou"
+
+
+@pytest.mark.django_db
+def test_backlink_random(client):
+    EmbedSettingsFactory(
+        backlink_carte="coucou", backlink_assistant="youpi", backlink_formulaire="super"
+    )
+    response = client.get("/embed/backlink?key=random")
+    assert response.content.decode() == ""
+
+
+@pytest.mark.django_db
+def test_backlink_without_settings(client):
+    response = client.get("/embed/backlink?key=assistant")
+    assert response.content.decode() == ""
+
+    response = client.get("/embed/backlink?key=formulaire")
+    assert response.content.decode() == ""
+
+    response = client.get("/embed/backlink?key=carte")
+    assert response.content.decode() == ""
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,17 +1,12 @@
 import type { Config } from "jest"
 
 const config: Config = {
-    preset: "ts-jest",
-    testEnvironment: "jsdom",
-    testEnvironmentOptions: {
-        html: '<html lang="zh-cmn-Hant"></html>',
-        url: "https://jestjs.io/",
-        userAgent: "Agent/007",
-    },
-    transform: {
-        "^.+\\.ts?$": "ts-jest",
-    },
-    transformIgnorePatterns: ["/node_modules/(?!crypto-random-string)(.*)"],
+  preset: "ts-jest",
+  testEnvironment: "jsdom",
+  verbose: false,
+  transform: {
+    "^.+\\.ts?$": "ts-jest",
+  },
 }
 
 export default config
diff --git a/package.json b/package.json
@@ -83,4 +83,4 @@
   "optionalDependencies": {
     "@parcel/watcher-linux-x64-glibc": "^2.5.1"
   }
-}
+}
diff --git a/static/to_compile/embed/assistant.ts b/static/to_compile/embed/assistant.ts
@@ -6,14 +6,14 @@ import { generateBackLink } from "./helpers"
 const script = document.currentScript as HTMLScriptElement
 const slug = script?.dataset?.objet
 const epci = script?.dataset?.epci
-let origin = new URL(script?.getAttribute("src")).origin
+let baseUrl = new URL(script?.getAttribute("src")).origin
 
 if (process.env.BASE_URL) {
-  origin = process.env.BASE_URL
+  baseUrl = process.env.BASE_URL
 }
 
 async function initScript() {
-  const parts = [origin]
+  const parts = [baseUrl]
   const iframeResizerOptions: iframeResizer.IFramePageOptions = {
     license: "GPLv3",
     id: "quefairedemesdechets-assistant",
@@ -53,7 +53,7 @@ async function initScript() {
   }
 
   script.parentNode?.insertBefore(iframe, script)
-  await generateBackLink(iframe, "assistant")
+  await generateBackLink(iframe, "assistant", baseUrl)
   iframe.onload = () => {
     iframeResize(iframeResizerOptions, iframe)
   }
diff --git a/static/to_compile/embed/helpers.ts b/static/to_compile/embed/helpers.ts
@@ -1,13 +1,23 @@
 export type BacklinkKey = "assistant" | "carte" | "formulaire"
-export async function generateBackLink(iframe: HTMLIFrameElement, key: BacklinkKey) {
+export async function generateBackLink(
+  iframe: HTMLIFrameElement,
+  key: BacklinkKey,
+  baseUrl?: string | null,
+) {
+  if (!baseUrl) {
+    console.error("Origin is not defined or is empty")
+    return
+  }
+
   const backlinkTag = document.createElement("div")
   backlinkTag.setAttribute(
     "style",
-    "font-size: 0.9rem; text-align: center; padding-top: 0.5rem;",
+    "font-family: system-ui; font-size: 0.9rem; text-align: center; padding-top: 0.5rem;",
   )
+
   let backlinkContent = ""
   try {
-    const req = await fetch(`${origin}/embed/backlink?key=${key}`)
+    const req = await fetch(`${baseUrl}/embed/backlink?key=${key}`)
     backlinkContent = await req.text()
     backlinkTag.innerHTML = backlinkContent
     iframe.insertAdjacentElement("afterend", backlinkTag)
diff --git a/static/to_compile/js/iframe_functions.ts b/static/to_compile/js/iframe_functions.ts
@@ -35,7 +35,8 @@ export async function buildAndInsertIframeFrom(
   backlinkKey: BacklinkKey,
 ) {
   const iframe = document.createElement("iframe")
-  await generateBackLink(iframe, backlinkKey)
+  const baseUrl = new URL(scriptTag.getAttribute("src")!).origin
+  await generateBackLink(iframe, backlinkKey, baseUrl)
   for (var key in iframeAttributes) {
     iframe.setAttribute(key, iframeAttributes[key])
   }
@@ -53,7 +54,7 @@ export function getIframeAttributesAndExtra(
   let maxWidth = options?.maxWidth || "100%"
   let height = "700px"
   let route = baseRoute
-  const BASE_URL = new URL(scriptTag.getAttribute("src")!).origin
+  const baseUrl = new URL(scriptTag.getAttribute("src")!).origin
   const urlParams = new URLSearchParams()
 
   let iframeExtraAttributes: { [Property in keyof HTMLScriptElement]?: unknown } = {}
@@ -89,7 +90,7 @@ export function getIframeAttributesAndExtra(
   }
 
   const iframeAttributes = compileIframeAttributes(
-    BASE_URL,
+    baseUrl,
     urlParams,
     maxWidth,
     height,
diff --git a/static/to_compile/tests/iframe_functions.test.ts b/static/to_compile/tests/iframe_functions.test.ts
@@ -14,11 +14,20 @@ describe("generateBackLink", () => {
     jest.restoreAllMocks()
   })
 
-  it("should not exit when fetch fails and logs an error message", async () => {
-    global.fetch = jest.fn(() => Promise.reject(new Error("Network Error")))
-    const key: BacklinkKey = "carte"
+  it("should log an error and not proceed when origin is undefined or empty", async () => {
+    console.error = jest.fn() // Mock console.error to track errors
 
-    await generateBackLink(iframeMock, key)
+    // Test for undefined origin
+    await generateBackLink(iframeMock, "carte", undefined)
+    expect(console.error).toHaveBeenCalledWith("Origin is not defined or is empty")
+
+    // Test for empty string origin
+    await generateBackLink(iframeMock, "carte", "")
+    expect(console.error).toHaveBeenCalledWith("Origin is not defined or is empty")
+
+    // Test for null origin
+    await generateBackLink(iframeMock, "carte", null)
+    expect(console.error).toHaveBeenCalledWith("Origin is not defined or is empty")
   })
 })
 

Original file line number	Diff line number	Diff line change
`@@ -83,4 +83,4 @@`
`83`	`83`	`"optionalDependencies": {`
`84`	`84`	`"@parcel/watcher-linux-x64-glibc": "^2.5.1"`
`85`	`85`	`}`
`86`		`-}`
	`86`	`+}`