release: 1.0.10

Jenkinsfile

@@ -334,6 +334,13 @@ stage('SonarQube Quality Gate') {
 
             steps {
                 sh '''
+                    set -a
+                    . /opt/furious-ducks/secrets/tiptop-mail.env
+                    set +a
+
+                    test -n "${TURNSTILE_SITE_KEY}"
+                    echo "Turnstile site key chargée (longueur: ${#TURNSTILE_SITE_KEY})"
+
                     docker build \
                       -t "${BACKEND_IMAGE}:${IMAGE_TAG}" \
                       backend

frontend/src/components/Captcha.jsx

@@ -1,19 +1,124 @@
-import { Turnstile } from '@marsidev/react-turnstile'
+import { useEffect, useRef } from 'react'
 import { CAPTCHA_ENABLED, TURNSTILE_SITE_KEY } from '../config/captcha'
 
-// `ref` expose reset() : un jeton Turnstile n'est valable qu'une fois, il faut
+const TURNSTILE_SCRIPT_ID = 'cf-turnstile-script'
-// en redemander un après chaque envoi refusé.
+const TURNSTILE_SCRIPT_URL =
-export default function Captcha({ ref, onToken }) {
+  'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit'
-  if (!CAPTCHA_ENABLED) return null
+
+export default function Captcha({ onToken }) {
+  const containerRef = useRef(null)
+  const widgetIdRef = useRef(null)
+
+  useEffect(() => {
+    if (!CAPTCHA_ENABLED || !TURNSTILE_SITE_KEY || !containerRef.current) {
+      return
+    }
+
+    let cancelled = false
+
+    const renderWidget = () => {
+      if (
+        cancelled ||
+        !containerRef.current ||
+        !window.turnstile
+      ) {
+        return
+      }
+
+      if (widgetIdRef.current !== null) {
+        try {
+          window.turnstile.remove(widgetIdRef.current)
+        } catch {
+          // Widget déjà supprimé
+        }
+
+        widgetIdRef.current = null
+      }
+
+      containerRef.current.innerHTML = ''
+
+      widgetIdRef.current = window.turnstile.render(
+        containerRef.current,
+        {
+          sitekey: TURNSTILE_SITE_KEY,
+          language: 'fr',
+          size: 'flexible',
+          appearance: 'always',
+
+          callback: (token) => {
+            onToken(token)
+          },
+
+          'expired-callback': () => {
+            onToken('')
+          },
+
+          'error-callback': () => {
+            onToken('')
+          },
+        }
+      )
+    }
+
+    const existingScript = document.getElementById(
+      TURNSTILE_SCRIPT_ID
+    )
+
+    if (window.turnstile) {
+      renderWidget()
+      return
+    }
+
+    if (existingScript) {
+      existingScript.addEventListener('load', renderWidget, {
+        once: true,
+      })
+
+      return () => {
+        cancelled = true
+      }
+    }
+
+    const script = document.createElement('script')
+
+    script.id = TURNSTILE_SCRIPT_ID
+    script.src = TURNSTILE_SCRIPT_URL
+    script.async = true
+    script.defer = true
+
+    script.addEventListener('load', renderWidget, {
+      once: true,
+    })
+
+    document.head.appendChild(script)
+
+    return () => {
+      cancelled = true
+
+      if (
+        widgetIdRef.current !== null &&
+        window.turnstile
+      ) {
+        try {
+          window.turnstile.remove(widgetIdRef.current)
+        } catch {
+          // Widget déjà supprimé
+        }
+      }
+
+      widgetIdRef.current = null
+    }
+  }, [onToken])
+
+  if (!CAPTCHA_ENABLED || !TURNSTILE_SITE_KEY) {
+    return null
+  }
 
   return (
-    <Turnstile
+    <div
-      ref={ref}
+      ref={containerRef}
-      siteKey={TURNSTILE_SITE_KEY}
+      id="turnstile-captcha"
-      options={{ language: 'fr', size: 'flexible' }}
+      className="w-full min-h-[65px] flex justify-center"
-      onSuccess={onToken}
-      onExpire={() => onToken('')}
-      onError={() => onToken('')}
     />
   )
 }