@marvalt/wadapter 2.3.5 → 2.3.6

package/dist/gravity-forms/gravity-forms-client.d.ts

@@ -16,10 +16,10 @@
  */
 import { GravityFormsConfig, GravityForm, GravityFormSubmission, GravityFormSubmissionResult } from '../types/gravity-forms';
 export declare class GravityFormsClient {
+    private proxyEndpoint;
     private config;
     constructor(config: GravityFormsConfig);
     private makeRequest;
-    private getBaseUrl;
     getForm(id: number): Promise<GravityForm>;
     getForms(): Promise<GravityForm[]>;
     getFormConfig(id: number): Promise<GravityForm>;

package/dist/gravity-forms/gravity-forms-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gravity-forms-client.d.ts","sourceRoot":"","sources":["../../src/gravity-forms/gravity-forms-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE7H,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,kBAAkB;YAIxB,WAAW;IAuDzB,OAAO,CAAC,UAAU;IASZ,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAYzC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAUlC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAU/C,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAUnG,SAAS,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;CAM1F"}
+{"version":3,"file":"gravity-forms-client.d.ts","sourceRoot":"","sources":["../../src/gravity-forms/gravity-forms-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAE7H,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,kBAAkB;YAQxB,WAAW;IAoCnB,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAMzC,QAAQ,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;IAMlC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAM/C,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,qBAAqB,GAAG,OAAO,CAAC,2BAA2B,CAAC;IAiBnG,SAAS,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC;CAI1F"}

package/dist/index.d.ts

@@ -545,6 +545,7 @@ interface GravityFormSubmission {
     source_page_confirmations?: any;
     target_page_number?: number;
     target_page_confirmations?: any;
+    headers?: Record<string, string>;
 }
 interface GravityFormSubmissionResult {
     success: boolean;
@@ -588,10 +589,10 @@ interface GravityFormsConfig {
  */
 
 declare class GravityFormsClient {
+    private proxyEndpoint;
     private config;
     constructor(config: GravityFormsConfig);
     private makeRequest;
-    private getBaseUrl;
     getForm(id: number): Promise<GravityForm$1>;
     getForms(): Promise<GravityForm$1[]>;
     getFormConfig(id: number): Promise<GravityForm$1>;

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import require$$0, { useState, useEffect, useCallback, createContext, useContext } from 'react';
+import require$$0, { useState, useEffect, useCallback, useRef, useMemo, createContext, useContext } from 'react';
 import { writeFileSync } from 'fs';
 import { join } from 'path';
 
@@ -265,33 +265,18 @@ function transformWordPressMediaItems(media) {
 class GravityFormsClient {
     constructor(config) {
         this.config = config;
+        // Convention-based: Always use /api/gravity-forms-submit unless explicitly overridden
+        // This matches the Mautic pattern for consistency
+        this.proxyEndpoint = config.proxyEndpoint || '/api/gravity-forms-submit';
     }
     async makeRequest(endpoint, options = {}) {
-        // Construct URL based on auth mode
-        let url;
-        if (this.config.authMode === 'cloudflare_proxy') {
-            // For proxy modes, pass the full REST path including /wp-json as query parameter
-            const baseUrl = this.getBaseUrl();
-            const fullEndpoint = `/wp-json${endpoint}`;
-            url = `${baseUrl}?endpoint=${encodeURIComponent(fullEndpoint)}`;
-        }
-        else {
-            // For direct mode, construct the full API URL
-            url = `${this.config.apiUrl}${endpoint}`;
-        }
+        // Always use proxy endpoint (convention-based, like Mautic)
+        const proxyEndpoint = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
+        const url = `${this.proxyEndpoint}?endpoint=${encodeURIComponent(proxyEndpoint)}`;
         const headers = {
             'Content-Type': 'application/json',
             ...options.headers,
         };
-        // Add authentication based on mode
-        if (this.config.authMode === 'cloudflare_proxy') ;
-        else {
-            // Direct mode - use basic auth
-            if (this.config.username && this.config.password) {
-                const credentials = btoa(`${this.config.username}:${this.config.password}`);
-                headers.Authorization = `Basic ${credentials}`;
-            }
-        }
         const response = await fetch(url, {
             ...options,
             headers,
@@ -315,56 +300,37 @@ class GravityFormsClient {
             throw new Error(`Failed to parse JSON response: ${error.message}`);
         }
     }
-    getBaseUrl() {
-        switch (this.config.authMode) {
-            case 'cloudflare_proxy':
-                return this.config.cloudflareWorkerUrl || '';
-            default:
-                return this.config.apiUrl || '';
-        }
-    }
     async getForm(id) {
-        // If using custom endpoint (gf-api plugin), use it for both modes
-        // Otherwise: proxy uses gf-api/v1, direct uses official gf/v2
-        const useCustom = this.config.useCustomEndpoint;
-        const endpoint = useCustom
-            ? `/forms/${id}` // apiUrl already includes /wp-json/gf-api/v1
-            : (this.config.authMode === 'cloudflare_proxy'
-                ? `/gf-api/v1/forms/${id}`
-                : `/wp-json/gf/v2/forms/${id}`);
+        // Always use custom gf-api/v1 endpoint (from custom plugin)
+        const endpoint = `/forms/${id}`;
         return this.makeRequest(endpoint);
     }
     async getForms() {
-        const useCustom = this.config.useCustomEndpoint;
-        const endpoint = useCustom
-            ? '/forms' // apiUrl already includes /wp-json/gf-api/v1
-            : (this.config.authMode === 'cloudflare_proxy'
-                ? '/gf-api/v1/forms'
-                : '/wp-json/gf/v2/forms');
+        // Always use custom gf-api/v1 endpoint (from custom plugin)
+        const endpoint = '/forms';
         return this.makeRequest(endpoint);
     }
     async getFormConfig(id) {
-        const useCustom = this.config.useCustomEndpoint;
-        const endpoint = useCustom
-            ? `/forms/${id}/config` // apiUrl already includes /wp-json/gf-api/v1
-            : (this.config.authMode === 'cloudflare_proxy'
-                ? `/gf-api/v1/forms/${id}/config`
-                : `/wp-json/gf/v2/forms/${id}`); // v2 returns full form including settings
+        // Always use custom gf-api/v1 endpoint (from custom plugin)
+        const endpoint = `/forms/${id}/config`;
         return this.makeRequest(endpoint);
     }
     async submitForm(formId, submission) {
-        const endpoint = this.config.authMode === 'cloudflare_proxy'
-            ? `/gf-api/v1/forms/${formId}/submit`
-            : `/wp-json/gf/v2/forms/${formId}/submissions`; // official GF REST v2 submissions
+        // Always use custom gf-api/v1 submit endpoint (from custom plugin)
+        const endpoint = `/forms/${formId}/submit`;
+        // Merge custom headers (e.g., Turnstile token) with default headers
+        const headers = {
+            'Content-Type': 'application/json',
+            ...(submission.headers || {}),
+        };
         return this.makeRequest(endpoint, {
             method: 'POST',
-            body: JSON.stringify(submission),
+            headers,
+            body: JSON.stringify(submission.field_values),
         });
     }
     async getHealth() {
-        const endpoint = this.config.authMode === 'cloudflare_proxy'
-            ? '/gf-api/v1/health'
-            : '/wp-json/gf/v2/health';
+        const endpoint = '/health';
         return this.makeRequest(endpoint);
     }
 }
@@ -1932,15 +1898,115 @@ const WordPressContent = ({ content, className = '', showExcerpt = false, showDa
     return (jsxRuntimeExports.jsxs("article", { className: `wordpress-content ${className}`, children: [jsxRuntimeExports.jsxs("header", { className: "content-header", children: [jsxRuntimeExports.jsx("h1", { className: "content-title", dangerouslySetInnerHTML: { __html: content.title.rendered } }), showDate && (jsxRuntimeExports.jsx("time", { className: "content-date", dateTime: content.date, children: new Date(content.date).toLocaleDateString() })), showAuthor && 'author' in content && (jsxRuntimeExports.jsxs("span", { className: "content-author", children: ["Author ID: ", content.author] }))] }), showExcerpt && content.excerpt && (jsxRuntimeExports.jsx("div", { className: "content-excerpt", dangerouslySetInnerHTML: { __html: content.excerpt.rendered } })), jsxRuntimeExports.jsx("div", { className: "content-body", dangerouslySetInnerHTML: { __html: content.content.rendered } })] }));
 };
 
+const TurnstileWidget = ({ siteKey, action, cData, onSuccess, onError, onExpire, theme = 'auto', size = 'normal', tabIndex, }) => {
+    const widgetRef = useRef(null);
+    const widgetId = useRef(null);
+    const scriptLoaded = useRef(false);
+    useEffect(() => {
+        if (!widgetRef.current || !siteKey)
+            return;
+        const loadTurnstile = () => {
+            if (window.turnstile && widgetRef.current && !widgetId.current) {
+                try {
+                    widgetId.current = window.turnstile.render(widgetRef.current, {
+                        sitekey: siteKey,
+                        callback: onSuccess,
+                        'error-callback': onError,
+                        'expired-callback': onExpire,
+                        theme,
+                        size,
+                        tabindex: tabIndex,
+                    });
+                }
+                catch (error) {
+                    console.error('Failed to render Turnstile widget:', error);
+                    onError?.();
+                }
+            }
+        };
+        // Check if Turnstile is already loaded
+        if (window.turnstile) {
+            loadTurnstile();
+        }
+        else if (!scriptLoaded.current) {
+            // Load Turnstile script
+            scriptLoaded.current = true;
+            const script = document.createElement('script');
+            script.src = 'https://challenges.cloudflare.com/turnstile/v0/api.js';
+            script.async = true;
+            script.defer = true;
+            script.onload = loadTurnstile;
+            script.onerror = () => {
+                console.error('Failed to load Turnstile script');
+                onError?.();
+            };
+            document.head.appendChild(script);
+        }
+        return () => {
+            if (widgetId.current && window.turnstile) {
+                try {
+                    window.turnstile.remove(widgetId.current);
+                }
+                catch (error) {
+                    console.error('Failed to remove Turnstile widget:', error);
+                }
+                widgetId.current = null;
+            }
+        };
+    }, [siteKey, onSuccess, onError, onExpire, theme, size, tabIndex]);
+    return jsxRuntimeExports.jsx("div", { ref: widgetRef, className: "cf-turnstile" });
+};
+
 const GravityForm = ({ formId, config, className = '', onSubmit, onError, }) => {
     const { form, loading, error, submitting, result, submitForm } = useGravityForms(formId, config);
     const [formData, setFormData] = useState({});
+    const [turnstileToken, setTurnstileToken] = useState(null);
+    const [turnstileError, setTurnstileError] = useState(null);
+    // Get Turnstile site key from environment - memoized to prevent re-renders
+    const turnstilesiteKey = useMemo(() => {
+        try {
+            // @ts-ignore - import.meta is a Vite-specific global
+            if (typeof import.meta !== 'undefined' && import.meta.env) {
+                // @ts-ignore
+                const key = import.meta.env.VITE_TURNSTILE_SITE_KEY;
+                // Ensure we return a string or undefined, not an object
+                return typeof key === 'string' ? key : undefined;
+            }
+        }
+        catch (e) {
+            // import.meta not available
+        }
+        return undefined;
+    }, []); // Empty deps - site key doesn't change during runtime
+    // Memoize Turnstile callbacks to prevent widget re-renders
+    const handleTurnstileSuccess = useCallback((token) => {
+        setTurnstileToken(token);
+        setTurnstileError(null);
+    }, []);
+    const handleTurnstileError = useCallback(() => {
+        setTurnstileToken(null);
+        setTurnstileError('Verification failed. Please try again.');
+    }, []);
+    const handleTurnstileExpire = useCallback(() => {
+        setTurnstileToken(null);
+        setTurnstileError('Verification expired. Please verify again.');
+    }, []);
     const handleSubmit = async (e) => {
         e.preventDefault();
+        // Check Turnstile token if enabled
+        if (turnstilesiteKey && !turnstileToken) {
+            setTurnstileError('Please complete the verification');
+            return;
+        }
         try {
             const submission = {
                 form_id: formId,
                 field_values: formData,
+                ...(turnstileToken ? {
+                    headers: {
+                        'cf-turnstile-response': turnstileToken
+                    }
+                } : {})
             };
             await submitForm(submission);
             if (onSubmit && result) {
@@ -1968,7 +2034,11 @@ const GravityForm = ({ formId, config, className = '', onSubmit, onError, }) =>
     if (!form) {
         return jsxRuntimeExports.jsx("div", { className: `gravity-form not-found ${className}`, children: "Form not found" });
     }
-    return (jsxRuntimeExports.jsx("div", { className: `gravity-form ${className}`, children: jsxRuntimeExports.jsxs("form", { onSubmit: handleSubmit, children: [jsxRuntimeExports.jsx("h2", { children: form.title }), form.description && jsxRuntimeExports.jsx("p", { children: form.description }), form.fields.map(field => (jsxRuntimeExports.jsxs("div", { className: `field field-${field.type}`, children: [jsxRuntimeExports.jsxs("label", { htmlFor: `field_${field.id}`, children: [field.label, field.required && jsxRuntimeExports.jsx("span", { className: "required", children: "*" })] }), field.description && (jsxRuntimeExports.jsx("p", { className: "field-description", children: field.description })), field.type === 'text' && (jsxRuntimeExports.jsx("input", { type: "text", id: `field_${field.id}`, name: field.label, required: field.required, placeholder: field.placeholder, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value) })), field.type === 'email' && (jsxRuntimeExports.jsx("input", { type: "email", id: `field_${field.id}`, name: field.label, required: field.required, placeholder: field.placeholder, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value) })), field.type === 'textarea' && (jsxRuntimeExports.jsx("textarea", { id: `field_${field.id}`, name: field.label, required: field.required, placeholder: field.placeholder, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value) })), field.type === 'select' && field.choices && (jsxRuntimeExports.jsxs("select", { id: `field_${field.id}`, name: field.label, required: field.required, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value), children: [jsxRuntimeExports.jsx("option", { value: "", children: "Select an option" }), field.choices.map((choice, index) => (jsxRuntimeExports.jsx("option", { value: choice.value, children: choice.text }, index)))] }))] }, field.id))), jsxRuntimeExports.jsx("button", { type: "submit", disabled: submitting, children: submitting ? 'Submitting...' : 'Submit' }), result && (jsxRuntimeExports.jsx("div", { className: `result ${result.success ? 'success' : 'error'}`, children: result.message }))] }) }));
+    return (jsxRuntimeExports.jsx("div", { className: `gravity-form ${className}`, children: jsxRuntimeExports.jsxs("form", { onSubmit: handleSubmit, children: [jsxRuntimeExports.jsx("h2", { children: form.title }), form.description && jsxRuntimeExports.jsx("p", { children: form.description }), form.fields.map(field => (jsxRuntimeExports.jsxs("div", { className: `field field-${field.type}`, children: [jsxRuntimeExports.jsxs("label", { htmlFor: `field_${field.id}`, children: [field.label, field.required && jsxRuntimeExports.jsx("span", { className: "required", children: "*" })] }), field.description && (jsxRuntimeExports.jsx("p", { className: "field-description", children: field.description })), field.type === 'text' && (jsxRuntimeExports.jsx("input", { type: "text", id: `field_${field.id}`, name: field.label, required: field.required, placeholder: field.placeholder, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value) })), field.type === 'email' && (jsxRuntimeExports.jsx("input", { type: "email", id: `field_${field.id}`, name: field.label, required: field.required, placeholder: field.placeholder, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value) })), field.type === 'textarea' && (jsxRuntimeExports.jsx("textarea", { id: `field_${field.id}`, name: field.label, required: field.required, placeholder: field.placeholder, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value) })), field.type === 'select' && field.choices && (jsxRuntimeExports.jsxs("select", { id: `field_${field.id}`, name: field.label, required: field.required, onChange: (e) => handleFieldChange(field.id.toString(), e.target.value), children: [jsxRuntimeExports.jsx("option", { value: "", children: "Select an option" }), field.choices.map((choice, index) => (jsxRuntimeExports.jsx("option", { value: choice.value, children: choice.text }, index)))] }))] }, field.id))), turnstilesiteKey && (jsxRuntimeExports.jsxs("div", { className: "form-turnstile", children: [jsxRuntimeExports.jsx(TurnstileWidget, { siteKey: turnstilesiteKey, onSuccess: handleTurnstileSuccess, onError: handleTurnstileError, onExpire: handleTurnstileExpire, theme: "auto", size: "normal" }), turnstileError && (jsxRuntimeExports.jsx("p", { className: "field-error turnstile-error", children: turnstileError }))] })), jsxRuntimeExports.jsx("button", { type: "submit", disabled: submitting || (!!turnstilesiteKey && !turnstileToken), children: submitting
+                        ? 'Submitting...'
+                        : (turnstilesiteKey && !turnstileToken)
+                            ? 'Complete verification first'
+                            : 'Submit' }), result && (jsxRuntimeExports.jsx("div", { className: `result ${result.success ? 'success' : 'error'}`, children: result.message }))] }) }));
 };
 
 const WordPressContext = createContext(undefined);
@@ -2091,7 +2161,7 @@ function getFormById(id) {
     return (gravityFormsStaticData?.forms ?? []).find(f => String(f.id) === key);
 }
 
-let document;
+let document$1;
 let offset;
 let output;
 let stack;
@@ -2118,7 +2188,7 @@ function Frame(block, tokenStart, tokenLength, prevOffset, leadingHtmlStart) {
   };
 }
 const parse = (doc) => {
-  document = doc;
+  document$1 = doc;
   offset = 0;
   output = [];
   stack = [];
@@ -2151,7 +2221,7 @@ function proceed() {
         if (null !== leadingHtmlStart) {
           output.push(
             Freeform(
-              document.substr(
+              document$1.substr(
                 leadingHtmlStart,
                 startOffset - leadingHtmlStart
               )
@@ -2192,7 +2262,7 @@ function proceed() {
         return true;
       }
       const stackTop = stack.pop();
-      const html = document.substr(
+      const html = document$1.substr(
         stackTop.prevOffset,
         startOffset - stackTop.prevOffset
       );
@@ -2220,7 +2290,7 @@ function parseJSON(input) {
   }
 }
 function nextToken() {
-  const matches = tokenizer.exec(document);
+  const matches = tokenizer.exec(document$1);
   if (null === matches) {
     return ["no-more-tokens", "", null, 0, 0];
   }
@@ -2250,16 +2320,16 @@ function nextToken() {
   return ["block-opener", name, attrs, startedAt, length];
 }
 function addFreeform(rawLength) {
-  const length = document.length - offset;
+  const length = document$1.length - offset;
   if (0 === length) {
     return;
   }
-  output.push(Freeform(document.substr(offset, length)));
+  output.push(Freeform(document$1.substr(offset, length)));
 }
 function addInnerBlock(block, tokenStart, tokenLength, lastOffset) {
   const parent = stack[stack.length - 1];
   parent.block.innerBlocks.push(block);
-  const html = document.substr(
+  const html = document$1.substr(
     parent.prevOffset,
     tokenStart - parent.prevOffset
   );
@@ -2272,7 +2342,7 @@ function addInnerBlock(block, tokenStart, tokenLength, lastOffset) {
 }
 function addBlockFromStack(endOffset) {
   const { block, leadingHtmlStart, prevOffset, tokenStart } = stack.pop();
-  const html = endOffset ? document.substr(prevOffset, endOffset - prevOffset) : document.substr(prevOffset);
+  const html = endOffset ? document$1.substr(prevOffset, endOffset - prevOffset) : document$1.substr(prevOffset);
   if (html) {
     block.innerHTML += html;
     block.innerContent.push(html);
@@ -2280,7 +2350,7 @@ function addBlockFromStack(endOffset) {
   if (null !== leadingHtmlStart) {
     output.push(
       Freeform(
-        document.substr(
+        document$1.substr(
           leadingHtmlStart,
           tokenStart - leadingHtmlStart
         )