Merge pull request PHORAX#44 from NMantek/add/turnstilereset

Reset turnstile widget after it expires
luzat · Oct 4, 2022 · b4bad2a · b4bad2a
2 parents a60136e + eb0d2b1
commit b4bad2a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 228 deletions.
diff --git a/Resources/Private/TypeScript/definitions/turnstile.ts b/Resources/Private/TypeScript/definitions/turnstile.ts
@@ -2,6 +2,7 @@ declare interface RenderParameters {
   sitekey: string;
   callback?: (token: string) => void;
   theme?: string;
+  action?: string;
 }
 declare class turnstile {
   static render: (

diff --git a/Resources/Private/TypeScript/modules/TurnstileForm.ts b/Resources/Private/TypeScript/modules/TurnstileForm.ts
@@ -1,6 +1,6 @@
 export class TurnstileForm {
-  constructor(container: NodeListOf<HTMLFormElement>) {
-    container.forEach((container) => {
+  constructor(containerList: NodeListOf<HTMLFormElement>) {
+    containerList.forEach((container) => {
       const captchaDiv = container.querySelector(
         '#turnstileDiv'
       ) as HTMLDivElement;
@@ -10,18 +10,27 @@ export class TurnstileForm {
         return;
       }
 
-      this.initCaptcha(captchaDiv, sitekey);
+      const formId = container.getAttribute('id') ?? 'default';
+
+      this.initCaptcha(captchaDiv, sitekey, formId);
     });
   }
 
-  private initCaptcha(captchaDiv: HTMLElement, sitekey: string) {
-    turnstile.render(captchaDiv, {
+  private initCaptcha(
+    captchaDiv: HTMLElement,
+    sitekey: string,
+    formId: string
+  ) {
+    const widgetId = turnstile.render(captchaDiv, {
       sitekey: sitekey,
-      callback: function () {
+      action: formId,
+      callback: () => {
         const captchaInput = captchaDiv.querySelector(
           'input'
         ) as HTMLInputElement;
         captchaInput.setAttribute('name', 'formhandler[Turnstile]');
+
+        setTimeout(() => turnstile.reset(widgetId), 300000);
       },
       theme: 'light',
     });