@marvalt/madapter 1.1.0 → 2.1.0

package/dist/client/mautic-client.d.ts

@@ -17,16 +17,9 @@
 import { MauticConfig } from '../types/config';
 import { MauticContact, MauticFormSubmission, MauticForm, MauticApiResponse } from '../types/mautic';
 export declare class MauticClient {
-    private baseUrl;
-    private proxyUrl?;
-    private appId?;
-    private workerSecret?;
-    private useProxy;
-    private isConfigured;
+    private proxyEndpoint;
     private config;
     constructor(config: MauticConfig);
-    private validateConfiguration;
-    private getAuthHeaders;
     private makeRequest;
     /**
      * Submit a form to Mautic

package/dist/client/mautic-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mautic-client.d.ts","sourceRoot":"","sources":["../../src/client/mautic-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,UAAU,EAGV,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB,qBAAa,YAAY;IACvB,OAAO,CAAC,OAAO,CAAc;IAC7B,OAAO,CAAC,QAAQ,CAAC,CAAS;IAC1B,OAAO,CAAC,KAAK,CAAC,CAAS;IACvB,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY;IAoBhC,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,cAAc;YAER,WAAW;IA6EzB;;OAEG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkC9F;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOvE;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOnG;;OAEG;IACG,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIlE;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAKvC;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlD;;OAEG;IACG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAUpG;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOpF;;OAEG;IACG,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOzF;;OAEG;IACG,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAInE;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAI3C;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAI/C;;OAEG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAO3F;;OAEG;IACG,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAMjG"}
+{"version":3,"file":"mautic-client.d.ts","sourceRoot":"","sources":["../../src/client/mautic-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,YAAY,EAAY,MAAM,iBAAiB,CAAC;AACzD,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,UAAU,EAGV,iBAAiB,EAClB,MAAM,iBAAiB,CAAC;AAEzB,qBAAa,YAAY;IACvB,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAe;gBAEjB,MAAM,EAAE,YAAY;YAOlB,WAAW;IAyDzB;;OAEG;IACG,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAkC9F;;OAEG;IACG,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOvE;;OAEG;IACG,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOnG;;OAEG;IACG,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAIlE;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAKvC;;OAEG;IACG,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;IAIlD;;OAEG;IACG,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAUpG;;OAEG;IACG,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOpF;;OAEG;IACG,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAOzF;;OAEG;IACG,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAInE;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAI3C;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAI/C;;OAEG;IACG,mBAAmB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAO3F;;OAEG;IACG,wBAAwB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;CAMjG"}

package/dist/generators/mautic-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mautic-generator.d.ts","sourceRoot":"","sources":["../../src/generators/mautic-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,sBAAsB,CAAC;AAGxE,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,WAAW,CAA6D;gBAEpE,MAAM,EAAE,qBAAqB;IAezC;;OAEG;YACW,cAAc;IAwC5B;;OAEG;IACG,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA2GrD;;OAEG;IACG,eAAe,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAclE;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAMnD;;OAEG;YACW,oBAAoB;IAqBlC;;OAEG;YACW,eAAe;CAmB9B;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAGjG"}
+{"version":3,"file":"mautic-generator.d.ts","sourceRoot":"","sources":["../../src/generators/mautic-generator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAkB,MAAM,sBAAsB,CAAC;AAGxE,qBAAa,eAAe;IAC1B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,WAAW,CAA6D;gBAEpE,MAAM,EAAE,qBAAqB;IAYzC;;OAEG;YACW,cAAc;IAwC5B;;OAEG;IACG,kBAAkB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IA2GrD;;OAEG;IACG,eAAe,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAclE;;OAEG;IACG,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAMnD;;OAEG;YACW,oBAAoB;IAqBlC;;OAEG;YACW,eAAe;CAmB9B;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAGjG"}

package/dist/index.cjs

@@ -24,58 +24,17 @@ var _documentCurrentScript = typeof document !== 'undefined' ? document.currentS
  */
 class MauticClient {
     constructor(config) {
-        this.baseUrl = '';
         this.config = config;
-        if (config.authMode === 'cloudflare_proxy' && config.cloudflareWorkerUrl) {
-            // Cloudflare Worker proxy (recommended - uses Secrets Store)
-            this.proxyUrl = config.cloudflareWorkerUrl;
-            this.useProxy = true;
-            this.isConfigured = true;
-        }
-        else if (config.authMode === 'direct' && config.apiUrl) {
-            // Direct Mautic API access (legacy - for local development only)
-            this.baseUrl = config.apiUrl || '';
-            this.useProxy = false;
-            this.isConfigured = true;
-        }
-        else {
-            // Fallback or error state
-            this.useProxy = false;
-            this.isConfigured = false;
-        }
-    }
-    validateConfiguration() {
-        if (!this.isConfigured) {
-            throw new Error('Mautic service not properly configured. Check your configuration.');
-        }
+        // Convention-based: Always use /api/mautic-submit unless explicitly overridden
+        this.proxyEndpoint = config.proxyEndpoint || '/api/mautic-submit';
     }
-    getAuthHeaders() { return {}; }
     async makeRequest(endpoint, options = {}) {
-        this.validateConfiguration();
-        let url;
-        if (this.useProxy) {
-            // Use Cloudflare Worker proxy
-            const proxyEndpoint = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
-            url = `${this.proxyUrl}?endpoint=${encodeURIComponent(proxyEndpoint)}`;
-        }
-        else {
-            // Use direct Mautic API
-            // Determine if this is a form submission endpoint (should not use /api prefix)
-            const isFormSubmission = endpoint.startsWith('/form/submit') ||
-                (endpoint.startsWith('/forms/') && endpoint.includes('/submit'));
-            if (isFormSubmission) {
-                // Form submissions go directly to the form endpoint, not the API
-                url = `${this.baseUrl}${endpoint}`;
-            }
-            else {
-                // API calls use the /api prefix
-                url = `${this.baseUrl}/api${endpoint}`;
-            }
-        }
+        // Always use proxy endpoint (convention-based)
+        const proxyEndpoint = endpoint.startsWith('/') ? endpoint : `/${endpoint}`;
+        const url = `${this.proxyEndpoint}?endpoint=${encodeURIComponent(proxyEndpoint)}`;
         const isFormSubmission = endpoint.startsWith('/form/submit') ||
             (endpoint.startsWith('/forms/') && endpoint.includes('/submit'));
         const headers = {
-            // no app headers in proxy mode
             ...options.headers,
         };
         // Default JSON only for non-form submissions when a body exists and no explicit content-type provided
@@ -279,6 +238,7 @@ class MauticClient {
  */
 /**
  * Create Mautic configuration from environment variables
+ * Convention-based: Uses /api/mautic-submit by default
  */
 const createMauticConfig = (overrides = {}) => {
     // Use import.meta.env for Vite compatibility in browser
@@ -305,26 +265,12 @@ const createMauticConfig = (overrides = {}) => {
         return undefined;
     };
     const merged = {
-        authMode: getEnvVar('VITE_AUTH_MODE') || getEnvVar('VITE_MAUTIC_AUTH_MODE') || 'cloudflare_proxy',
         apiUrl: getEnvVar('VITE_MAUTIC_URL'),
-        cloudflareWorkerUrl: getEnvVar('VITE_MAUTIC_PROXY_URL'),
+        proxyEndpoint: getEnvVar('VITE_MAUTIC_PROXY_ENDPOINT') || '/api/mautic-submit',
         timeout: parseInt(getEnvVar('VITE_MAUTIC_TIMEOUT') || '30000'),
         retries: parseInt(getEnvVar('VITE_MAUTIC_RETRIES') || '3'),
         ...overrides,
     };
-    // Enforce required fields depending on authMode
-    const errors = [];
-    if (merged.authMode === 'cloudflare_proxy') {
-        if (!merged.cloudflareWorkerUrl)
-            errors.push('cloudflareWorkerUrl is required for cloudflare_proxy mode');
-    }
-    if (merged.authMode === 'direct') {
-        if (!merged.apiUrl)
-            errors.push('apiUrl is required for direct mode');
-    }
-    if (errors.length) {
-        throw new Error(`Invalid Mautic configuration: ${errors.join('; ')}`);
-    }
     return merged;
 };
 /**
@@ -332,19 +278,6 @@ const createMauticConfig = (overrides = {}) => {
  */
 const validateMauticConfig = (config) => {
     const errors = [];
-    if (!config.authMode) {
-        errors.push('authMode is required');
-    }
-    if (config.authMode === 'cloudflare_proxy') {
-        if (!config.cloudflareWorkerUrl) {
-            errors.push('cloudflareWorkerUrl is required for cloudflare_proxy mode');
-        }
-    }
-    else if (config.authMode === 'direct') {
-        if (!config.apiUrl) {
-            errors.push('apiUrl is required for direct mode');
-        }
-    }
     if (config.timeout && config.timeout < 1000) {
         errors.push('timeout must be at least 1000ms');
     }
@@ -361,7 +294,7 @@ const validateMauticConfig = (config) => {
  */
 const getDefaultMauticConfig = () => {
     return {
-        authMode: 'cloudflare_proxy',
+        proxyEndpoint: '/api/mautic-submit',
         timeout: 30000,
         retries: 3,
     };
@@ -379,22 +312,15 @@ const mergeMauticConfig = (base, overrides) => {
  * Check if Mautic is enabled based on configuration
  */
 const isMauticEnabled = (config) => {
-    if (config.authMode === 'cloudflare_proxy') {
-        return !!config.cloudflareWorkerUrl;
-    }
-    else if (config.authMode === 'direct') {
-        return !!config.apiUrl;
-    }
-    return false;
+    return !!config.apiUrl;
 };
 /**
  * Get Mautic configuration summary (for debugging)
  */
 const getMauticConfigSummary = (config) => {
     return {
-        authMode: config.authMode,
         hasApiUrl: !!config.apiUrl,
-        hasCloudflareWorkerUrl: !!config.cloudflareWorkerUrl,
+        proxyEndpoint: config.proxyEndpoint || '/api/mautic-submit',
         timeout: config.timeout,
         retries: config.retries,
         isEnabled: isMauticEnabled(config),
@@ -536,14 +462,11 @@ class MauticGenerator {
     constructor(config) {
         this.cachedToken = null;
         this.config = config;
+        // Generator uses direct OAuth2 calls, not the client
+        // Client is only used for proxy mode (cloudflare_proxy)
         this.client = new MauticClient({
-            authMode: config.authMode,
             apiUrl: config.apiUrl,
-            cloudflareWorkerUrl: config.cloudflareWorkerUrl,
-            clientId: config.clientId,
-            clientSecret: config.clientSecret,
-            cfAccessClientId: config.cfAccessClientId,
-            cfAccessClientSecret: config.cfAccessClientSecret,
+            proxyEndpoint: config.cloudflareWorkerUrl,
             timeout: config.timeout,
             retries: config.retries,
         });