fix: reload turnstile on SPA navigation
Some checks failed
Tests / Backend - Tests skipped: 8, passed: 74
Backend Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 78.66% (553/703)
* Lines of Code: 703
#### Quality Gates Summary
No active quality gates.
Tests / Frontend - Lint, Tests et Build passed: 83
Frontend Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 80.20% (555/692)
* Lines of Code: 692
#### Quality Gates Summary
No active quality gates.
THE-TIP-TOP-MULTIBRANCH/pipeline/head There was a failure building this commit
Some checks failed
Tests / Backend - Tests skipped: 8, passed: 74
Backend Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 78.66% (553/703)
* Lines of Code: 703
#### Quality Gates Summary
No active quality gates.
Tests / Frontend - Lint, Tests et Build passed: 83
Frontend Coverage #### Project Overview
No changes detected, that affect the code coverage.
* Line Coverage: 80.20% (555/692)
* Lines of Code: 692
#### Quality Gates Summary
No active quality gates.
THE-TIP-TOP-MULTIBRANCH/pipeline/head There was a failure building this commit
This commit is contained in:
@@ -37,27 +37,43 @@ export default function Captcha({ onToken }) {
|
||||
|
||||
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('')
|
||||
},
|
||||
window.turnstile.ready(() => {
|
||||
if (
|
||||
cancelled ||
|
||||
!containerRef.current ||
|
||||
!window.turnstile
|
||||
) {
|
||||
return
|
||||
}
|
||||
)
|
||||
|
||||
widgetIdRef.current = window.turnstile.render(
|
||||
containerRef.current,
|
||||
{
|
||||
sitekey: TURNSTILE_SITE_KEY,
|
||||
language: 'fr',
|
||||
size: 'flexible',
|
||||
appearance: 'always',
|
||||
|
||||
callback: (token) => {
|
||||
if (!cancelled) {
|
||||
onToken(token)
|
||||
}
|
||||
},
|
||||
|
||||
'expired-callback': () => {
|
||||
if (!cancelled) {
|
||||
onToken('')
|
||||
}
|
||||
},
|
||||
|
||||
'error-callback': () => {
|
||||
if (!cancelled) {
|
||||
onToken('')
|
||||
}
|
||||
},
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
const existingScript = document.getElementById(
|
||||
@@ -66,32 +82,25 @@ export default function Captcha({ onToken }) {
|
||||
|
||||
if (window.turnstile) {
|
||||
renderWidget()
|
||||
return
|
||||
}
|
||||
|
||||
if (existingScript) {
|
||||
} else if (existingScript) {
|
||||
existingScript.addEventListener('load', renderWidget, {
|
||||
once: true,
|
||||
})
|
||||
} else {
|
||||
const script = document.createElement('script')
|
||||
|
||||
return () => {
|
||||
cancelled = true
|
||||
}
|
||||
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)
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
@@ -107,6 +116,10 @@ export default function Captcha({ onToken }) {
|
||||
}
|
||||
|
||||
widgetIdRef.current = null
|
||||
|
||||
if (containerRef.current) {
|
||||
containerRef.current.innerHTML = ''
|
||||
}
|
||||
}
|
||||
}, [onToken])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user