Compare commits
5 Commits
release-1.
...
16bcbd731c
| Author | SHA1 | Date | |
|---|---|---|---|
| 16bcbd731c | |||
| 246303139d | |||
| 1e09420705 | |||
| cc495f3b87 | |||
| 570f5d44f5 |
7
Jenkinsfile
vendored
7
Jenkinsfile
vendored
@@ -334,13 +334,6 @@ stage('SonarQube Quality Gate') {
|
|||||||
|
|
||||||
steps {
|
steps {
|
||||||
sh '''
|
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 \
|
docker build \
|
||||||
-t "${BACKEND_IMAGE}:${IMAGE_TAG}" \
|
-t "${BACKEND_IMAGE}:${IMAGE_TAG}" \
|
||||||
backend
|
backend
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useEffect, useRef } from 'react'
|
import { useEffect, useRef } from 'react'
|
||||||
import { CAPTCHA_ENABLED, TURNSTILE_SITE_KEY } from '../config/captcha'
|
import { TURNSTILE_SITE_KEY } from '../config/captcha'
|
||||||
|
|
||||||
const TURNSTILE_SCRIPT_ID = 'cf-turnstile-script'
|
const TURNSTILE_SCRIPT_ID = 'cf-turnstile-script'
|
||||||
const TURNSTILE_SCRIPT_URL =
|
const TURNSTILE_SCRIPT_URL =
|
||||||
@@ -10,9 +10,7 @@ export default function Captcha({ onToken }) {
|
|||||||
const widgetIdRef = useRef(null)
|
const widgetIdRef = useRef(null)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!CAPTCHA_ENABLED || !TURNSTILE_SITE_KEY || !containerRef.current) {
|
if (!TURNSTILE_SITE_KEY || !containerRef.current) return
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
let cancelled = false
|
let cancelled = false
|
||||||
|
|
||||||
@@ -29,7 +27,7 @@ export default function Captcha({ onToken }) {
|
|||||||
try {
|
try {
|
||||||
window.turnstile.remove(widgetIdRef.current)
|
window.turnstile.remove(widgetIdRef.current)
|
||||||
} catch {
|
} catch {
|
||||||
// Widget déjà supprimé
|
// Rien à faire
|
||||||
}
|
}
|
||||||
|
|
||||||
widgetIdRef.current = null
|
widgetIdRef.current = null
|
||||||
@@ -43,7 +41,6 @@ export default function Captcha({ onToken }) {
|
|||||||
sitekey: TURNSTILE_SITE_KEY,
|
sitekey: TURNSTILE_SITE_KEY,
|
||||||
language: 'fr',
|
language: 'fr',
|
||||||
size: 'flexible',
|
size: 'flexible',
|
||||||
appearance: 'always',
|
|
||||||
|
|
||||||
callback: (token) => {
|
callback: (token) => {
|
||||||
onToken(token)
|
onToken(token)
|
||||||
@@ -69,28 +66,23 @@ export default function Captcha({ onToken }) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (existingScript) {
|
const previousCallback = window.onloadTurnstileCallback
|
||||||
existingScript.addEventListener('load', renderWidget, {
|
|
||||||
once: true,
|
|
||||||
})
|
|
||||||
|
|
||||||
return () => {
|
window.onloadTurnstileCallback = () => {
|
||||||
cancelled = true
|
previousCallback?.()
|
||||||
}
|
renderWidget()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!existingScript) {
|
||||||
const script = document.createElement('script')
|
const script = document.createElement('script')
|
||||||
|
|
||||||
script.id = TURNSTILE_SCRIPT_ID
|
script.id = TURNSTILE_SCRIPT_ID
|
||||||
script.src = TURNSTILE_SCRIPT_URL
|
script.src = `${TURNSTILE_SCRIPT_URL}&onload=onloadTurnstileCallback`
|
||||||
script.async = true
|
script.async = true
|
||||||
script.defer = true
|
script.defer = true
|
||||||
|
|
||||||
script.addEventListener('load', renderWidget, {
|
|
||||||
once: true,
|
|
||||||
})
|
|
||||||
|
|
||||||
document.head.appendChild(script)
|
document.head.appendChild(script)
|
||||||
|
}
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
cancelled = true
|
cancelled = true
|
||||||
@@ -102,7 +94,7 @@ export default function Captcha({ onToken }) {
|
|||||||
try {
|
try {
|
||||||
window.turnstile.remove(widgetIdRef.current)
|
window.turnstile.remove(widgetIdRef.current)
|
||||||
} catch {
|
} catch {
|
||||||
// Widget déjà supprimé
|
// Rien à faire
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,9 +102,7 @@ export default function Captcha({ onToken }) {
|
|||||||
}
|
}
|
||||||
}, [onToken])
|
}, [onToken])
|
||||||
|
|
||||||
if (!CAPTCHA_ENABLED || !TURNSTILE_SITE_KEY) {
|
if (!TURNSTILE_SITE_KEY) return null
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
|
|||||||
Reference in New Issue
Block a user