@arquimedes.co/eureka-forms 3.0.60-test → 3.0.60

package/dist/Form/Form.js

@@ -6,7 +6,7 @@ import InternalFormStyle from '../constants/InternalFormStyle';
 import ColumnForm from './FormTypes/ColumnForm/ColumnForm';
 import StepperForm from './FormTypes/StepperForm/StepperForm';
 import { FormStyleTypes, FormTypes } from '../constants/FormStepTypes';
-import { calcValue } from './FormFunctions';
+import { calcValue, resolveCaptchaToken } from './FormFunctions';
 import { FormProvider, useForm } from 'react-hook-form';
 import widgetInstance from '../Utils/AxiosWidget';
 import axiosInstance from '../Utils/AxiosAPI';
@@ -38,15 +38,16 @@ function FormComponent({ form, apiKey, reload, isWidget, branding, setSubmit, sc
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [idFocusStep]);
     const onSubmit = useCallback(async (values) => {
-        let token = null;
-        if (form.hasCaptcha && !internal && !customSubmit) {
-            token = recaptchaRef.current?.getValue();
-            token ?? (token = await recaptchaRef?.current.executeAsync());
-        }
         const ApiKey = internal ? form.apiKey : apiKey;
         if (!ApiKey && !customSubmit && !customSubmitBtns)
             return;
         try {
+            // Resolved inside the try so a captcha that cannot mint a token surfaces through the same
+            // error path as any other submit failure, rather than rejecting out of the handler and
+            // leaving the submitter with no feedback at all.
+            const token = form.hasCaptcha && !internal && !customSubmit
+                ? await resolveCaptchaToken(recaptchaRef.current)
+                : null;
             const state = await dispatch(getAppState({ idForm })).unwrap();
             const newValues = {
                 ...state.site.values.global,

package/dist/Form/FormFunctions.d.ts

@@ -4,6 +4,23 @@ import { CustomStep } from '../FormSteps/CustomStep';
 import { CBRFormStep } from '../@Types/CBRFormStep';
 import { MapperElement } from '../@Types/MapperElement';
 import { ValuesStore } from '../States/SiteSlice';
+/** The reCAPTCHA widget surface a submission needs: the response it holds, and the challenge that mints one. */
+export interface CaptchaWidget {
+    getValue(): string | null;
+    executeAsync(): Promise<string | null>;
+}
+/**
+ * Resolve the reCAPTCHA response to send with a submission, running the invisible challenge when the widget
+ * is not holding one yet.
+ *
+ * An unsolved invisible widget answers `getValue()` with an EMPTY STRING rather than null, so emptiness —
+ * not nullishness — is what decides whether the challenge still has to run. A submission that skips the
+ * challenge carries no token, and the API rejects every captcha-protected public form with a 403.
+ *
+ * Yields null when no widget is mounted, leaving the caller to submit tokenless rather than throwing out of
+ * the submit handler.
+ */
+export declare function resolveCaptchaToken(captcha: CaptchaWidget | null | undefined): Promise<string | null>;
 /**
  * Function that cals the value of a step to output on submit
  */

package/dist/Form/FormFunctions.js

@@ -3,6 +3,28 @@ import FormStepTypes, { EntityValueDataTypes } from '../constants/FormStepTypes'
 import { calcStepDeps } from '../FormSteps/StepHooks';
 import { calcRecursiveData } from '../Utils/FormStepFunctions';
 import { isValidPhoneNumber } from '../Utils/PhoneFunctions';
+/**
+ * Resolve the reCAPTCHA response to send with a submission, running the invisible challenge when the widget
+ * is not holding one yet.
+ *
+ * An unsolved invisible widget answers `getValue()` with an EMPTY STRING rather than null, so emptiness —
+ * not nullishness — is what decides whether the challenge still has to run. A submission that skips the
+ * challenge carries no token, and the API rejects every captcha-protected public form with a 403.
+ *
+ * Yields null when no widget is mounted, leaving the caller to submit tokenless rather than throwing out of
+ * the submit handler.
+ */
+export async function resolveCaptchaToken(captcha) {
+    if (!captcha)
+        return null;
+    const held = captcha.getValue();
+    if (held)
+        return held;
+    const solved = await captcha.executeAsync();
+    if (solved)
+        return solved;
+    return null;
+}
 /**
  * Function that cals the value of a step to output on submit
  */

package/dist/Form/FormFunctions.test.js

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/require-await */
 import { ContentState, EditorState } from 'draft-js';
 import FormStepTypes, { EntityValueDataTypes } from '../constants/FormStepTypes';
-import { calcDependencies, calcValue } from './FormFunctions';
+import { calcDependencies, calcValue, resolveCaptchaToken } from './FormFunctions';
 import { stringToDraft } from '../Utils/DraftFunctions';
 import { describe, expect, test } from 'vitest';
 describe('FormFunctions', function () {
@@ -455,4 +455,31 @@ describe('FormFunctions', function () {
             expect(dependencyStore.idStep.dependents.length).toBe(1);
         });
     });
+    describe('resolveCaptchaToken', function () {
+        test('Uses the token the widget already holds without re-running the challenge', async () => {
+            let executed = false;
+            const token = await resolveCaptchaToken({
+                getValue: () => 'already-solved',
+                executeAsync: async () => {
+                    executed = true;
+                    return 'freshly-solved';
+                },
+            });
+            expect(token).toBe('already-solved');
+            expect(executed).toBe(false);
+        });
+        test('Runs the challenge when the invisible widget reports an empty response', async () => {
+            // An unsolved invisible captcha answers `getValue()` with '' — not null — so emptiness is what
+            // must decide whether the challenge still has to run. Treating only nullish as unsolved leaves
+            // the submission tokenless and the API answers 403.
+            const token = await resolveCaptchaToken({
+                getValue: () => '',
+                executeAsync: async () => 'freshly-solved',
+            });
+            expect(token).toBe('freshly-solved');
+        });
+        test('Yields no token when the widget is not mounted', async () => {
+            expect(await resolveCaptchaToken(null)).toBeNull();
+        });
+    });
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arquimedes.co/eureka-forms",
   "repository": "git://github.com/Arquimede5/Eureka-Forms.git",
-  "version":"3.0.60-test",
+  "version": "3.0.60",
   "scripts": {
     "watch": "node node_modules/@typescript/native/bin/tsc --noEmit --watch --project tsconfig.app.json",
     "start": "vite",