fix(api-form-builder): check both global and form recaptcha settings

webiny · Jun 10, 2024 · c1849b3 · c1849b3
1 parent 1359b71
commit c1849b3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/packages/api-form-builder/src/plugins/crud/submissions.crud.ts b/packages/api-form-builder/src/plugins/crud/submissions.crud.ts
@@ -26,6 +26,7 @@ import { createTopic } from "@webiny/pubsub";
 import { sanitizeFormSubmissionData } from "~/plugins/crud/utils/sanitizeFormSubmissionData";
 import { mdbid } from "@webiny/utils";
 import { FormsPermissions } from "~/plugins/crud/permissions/FormsPermissions";
+import { isRecaptchaEnabled } from "~/plugins/crud/utils/isRecaptchaEnabled";
 
 interface CreateSubmissionsCrudParams {
     context: FormBuilderContext;
@@ -185,7 +186,7 @@ export const createSubmissionsCrud = (params: CreateSubmissionsCrudParams): Subm
                 throwOnNotFound: true
             });
 
-            if (settings && settings.reCaptcha && settings.reCaptcha.enabled) {
+            if (settings && isRecaptchaEnabled(settings, form)) {
                 if (!reCaptchaResponseToken) {
                     throw new Error("Missing reCAPTCHA response token - cannot verify.");
                 }

diff --git a/packages/api-form-builder/src/plugins/crud/utils/isRecaptchaEnabled.ts b/packages/api-form-builder/src/plugins/crud/utils/isRecaptchaEnabled.ts
@@ -0,0 +1,9 @@
+import { FbForm, Settings } from "~/types";
+
+export const isRecaptchaEnabled = (settings: Settings, form: FbForm) => {
+    if (!settings.reCaptcha.enabled) {
+        return false;
+    }
+
+    return form.settings.reCaptcha?.enabled === true;
+};
diff --git a/packages/api-form-builder/src/types.ts b/packages/api-form-builder/src/types.ts
@@ -94,6 +94,13 @@ export interface FbFormField {
     settings?: Record<string, any>;
 }
 
+export interface ReCaptchaSettings {
+    reCaptcha: {
+        enabled: boolean | null;
+        errorMessage: string;
+    };
+}
+
 export interface FbForm {
     id: string;
     tenant: string;
@@ -112,7 +119,7 @@ export interface FbForm {
     fields: FbFormField[];
     steps: FbFormStep[];
     stats: Omit<FbFormStats, "conversionRate">;
-    settings: Record<string, any>;
+    settings: ReCaptchaSettings | Record<string, any>;
     triggers: Record<string, any> | null;
     formId: string;
     webinyVersion: string;