diff --git a/web/src/components/misc/Turnstile.svelte b/web/src/components/misc/Turnstile.svelte index b1fc162c..6b714c49 100644 --- a/web/src/components/misc/Turnstile.svelte +++ b/web/src/components/misc/Turnstile.svelte @@ -18,15 +18,15 @@ const setup = () => { window.turnstile?.render(turnstileElement, { sitekey, + "refresh-expired": "never", + "error-callback": (error) => { console.log("error code from turnstile:", error); return true; }, "expired-callback": () => { - console.log("turnstile expired. i am callback this is my message") - }, - "timeout-callback": () => { - console.log("turnstile timed out. i am callback this is my message") + console.log("turnstile expired, refreshing neow"); + turnstile.reset(); }, callback: () => { $turnstileSolved = true; @@ -39,10 +39,6 @@ } else { turnstileScript.addEventListener("load", setup); } - - window.addEventListener("focus", () => { - turnstile.refreshIfExpired(); - }); }); diff --git a/web/src/lib/api/session.ts b/web/src/lib/api/session.ts index f627b6f2..5b3e542b 100644 --- a/web/src/lib/api/session.ts +++ b/web/src/lib/api/session.ts @@ -35,7 +35,7 @@ export const requestSession = async () => { } }); - turnstile.update(); + turnstile.reset(); return response; } diff --git a/web/src/lib/api/turnstile.ts b/web/src/lib/api/turnstile.ts index 6a39ad7e..b95ecfd1 100644 --- a/web/src/lib/api/turnstile.ts +++ b/web/src/lib/api/turnstile.ts @@ -10,7 +10,7 @@ const getResponse = () => { return null; } -const update = () => { +const reset = () => { const turnstileElement = document.getElementById("turnstile-widget"); if (turnstileElement) { @@ -21,21 +21,7 @@ const update = () => { return null; } -const refreshIfExpired = () => { - const turnstileElement = document.getElementById("turnstile-widget"); - - if (turnstileElement) { - const isExpired = window?.turnstile?.isExpired(turnstileElement); - if (isExpired) { - console.log("expired, refreshing the turnstile widget rn"); - return update(); - } - console.log("turnstile not expired, nothing to do"); - } -} - export default { getResponse, - update, - refreshIfExpired, + reset, }