Skip to content

Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.

fix: refresh webhook form timestamp (#6530)

Ilya Devdera49a6769bd15
diff --git a/packages/sdk-components-react-remix/src/webhook-form.tsx b/packages/sdk-components-react-remix/src/webhook-form.tsx
index 392348abe0..4fb23db499 100644
--- a/packages/sdk-components-react-remix/src/webhook-form.tsx
+++ b/packages/sdk-components-react-remix/src/webhook-form.tsx
@@ -95,6 +95,7 @@ export const WebhookForm = forwardRef<
ref
) => {
const fetcher = useFetcher<{ success: boolean }>();
+ const hiddenJsInput = useRef<HTMLInputElement>(null);
useOnFetchEnd(fetcher, (data) => {
const state: State = data?.success === true ? "success" : "error";
@@ -102,16 +103,18 @@ export const WebhookForm = forwardRef<
});
/**
- * Add hidden field generated using js with simple jsdom detector.
+ * Refresh the hidden field using js with simple jsdom detector.
* This is used to protect form submission against very simple bots.
* Skipped for Brave browser due to: https://github.com/brave/brave-browser/issues/46541
*/
const handleSubmitAndAddHiddenJsField = (
event: React.FormEvent<HTMLFormElement>
) => {
- const hiddenInput = document.createElement("input");
- hiddenInput.type = "hidden";
- hiddenInput.name = formBotFieldName;
+ const hiddenInput = hiddenJsInput.current;
+ if (hiddenInput === null) {
+ event.preventDefault();
+ return;
+ }
// Skip bot detection for Brave - Shields blocks matchMedia fingerprinting detection
if (isBraveBrowser()) {
hiddenInput.value = "brave";
@@ -119,7 +122,6 @@ export const WebhookForm = forwardRef<
// Non-numeric values are utilized for logging purposes.
hiddenInput.value = isJSDom() ? "jsdom" : Date.now().toString(16);
}
- event.currentTarget.appendChild(hiddenInput);
};
return (
@@ -135,6 +137,7 @@ export const WebhookForm = forwardRef<
name={formIdFieldName}
value={action?.toString()}
/>
+ <input type="hidden" name={formBotFieldName} ref={hiddenJsInput} />
{children}
</fetcher.Form>
);
diff --git a/packages/sdk-components-react-router/src/webhook-form.browser.test.tsx b/packages/sdk-components-react-router/src/webhook-form.browser.test.tsx
new file mode 100644
index 0000000000..677fddb435
--- /dev/null
+++ b/packages/sdk-components-react-router/src/webhook-form.browser.test.tsx
@@ -0,0 +1,61 @@
+import { createRoot, type Root } from "react-dom/client";
+import { act } from "react-dom/test-utils";
+import { createMemoryRouter, RouterProvider } from "react-router";
+import { afterEach, expect, test, vi } from "vitest";
+import { formBotFieldName } from "@webstudio-is/sdk/runtime";
+import { WebhookForm } from "./webhook-form";
+
+(
+ globalThis as typeof globalThis & { IS_REACT_ACT_ENVIRONMENT: boolean }
+).IS_REACT_ACT_ENVIRONMENT = true;
+
+let root: Root | undefined;
+
+afterEach(() => {
+ act(() => root?.unmount());
+ root = undefined;
+ document.body.innerHTML = "";
+ vi.restoreAllMocks();
+});
+
+test("refreshes one bot timestamp when a Webhook Form is submitted again", async () => {
+ const submissions: FormData[] = [];
+ const router = createMemoryRouter(
+ [
+ {
+ path: "/contact",
+ element: (
+ <WebhookForm action="form-id">
+ <button type="submit">Send</button>
+ </WebhookForm>
+ ),
+ action: async ({ request }) => {
+ submissions.push(await request.formData());
+ return { success: true };
+ },
+ },
+ ],
+ { initialEntries: ["/contact"] }
+ );
+ const container = document.createElement("div");
+ document.body.append(container);
+ root = createRoot(container);
+ await act(async () => root?.render(<RouterProvider router={router} />));
+
+ const now = Date.now();
+ const clock = vi.spyOn(Date, "now").mockReturnValue(now);
+ const button = container.querySelector("button");
+ expect(button).not.toBeNull();
+
+ await act(async () => button?.click());
+ await expect.poll(() => submissions.length).toBe(1);
+
+ clock.mockReturnValue(now + 5 * 60 * 1000 + 1);
+ await act(async () => button?.click());
+ await expect.poll(() => submissions.length).toBe(2);
+
+ expect(submissions[0]?.getAll(formBotFieldName)).toEqual([now.toString(16)]);
+ expect(submissions[1]?.getAll(formBotFieldName)).toEqual([
+ (now + 5 * 60 * 1000 + 1).toString(16),
+ ]);
+});
diff --git a/packages/sdk-components-react-router/src/webhook-form.tsx b/packages/sdk-components-react-router/src/webhook-form.tsx
index 9fa7050e04..f85577bbaf 100644
--- a/packages/sdk-components-react-router/src/webhook-form.tsx
+++ b/packages/sdk-components-react-router/src/webhook-form.tsx
@@ -95,6 +95,7 @@ export const WebhookForm = forwardRef<
ref
) => {
const fetcher = useFetcher<{ success: boolean }>();
+ const hiddenJsInput = useRef<HTMLInputElement>(null);
useOnFetchEnd(fetcher, (data) => {
const state: State = data?.success === true ? "success" : "error";
@@ -102,16 +103,18 @@ export const WebhookForm = forwardRef<
});
/**
- * Add hidden field generated using js with simple jsdom detector.
+ * Refresh the hidden field using js with simple jsdom detector.
* This is used to protect form submission against very simple bots.
* Skipped for Brave browser due to: https://github.com/brave/brave-browser/issues/46541
*/
const handleSubmitAndAddHiddenJsField = (
event: React.FormEvent<HTMLFormElement>
) => {
- const hiddenInput = document.createElement("input");
- hiddenInput.type = "hidden";
- hiddenInput.name = formBotFieldName;
+ const hiddenInput = hiddenJsInput.current;
+ if (hiddenInput === null) {
+ event.preventDefault();
+ return;
+ }
// Skip bot detection for Brave - Shields blocks matchMedia fingerprinting detection
if (isBraveBrowser()) {
hiddenInput.value = "brave";
@@ -119,7 +122,6 @@ export const WebhookForm = forwardRef<
// Non-numeric values are utilized for logging purposes.
hiddenInput.value = isJSDom() ? "jsdom" : Date.now().toString(16);
}
- event.currentTarget.appendChild(hiddenInput);
};
return (
@@ -135,6 +137,7 @@ export const WebhookForm = forwardRef<
name={formIdFieldName}
value={action?.toString()}
/>
+ <input type="hidden" name={formBotFieldName} ref={hiddenJsInput} />
{children}
</fetcher.Form>
);