strapi-plugin-hubspot 0.13.1 → 0.15.0

package/dist/server/index.js

@@ -159,6 +159,9 @@ function resolveObjects(configured) {
   return out;
 }
 const ENV_VAR = "HUBSPOT_API_KEY";
+const ENV_PORTAL = "HUBSPOT_PORTAL_ID";
+const ENV_REGION = "HUBSPOT_REGION";
+const ENV_DEFAULT_FORM = "HUBSPOT_DEFAULT_FORM_ID";
 const store = (strapi) => strapi.store({ type: "plugin", name: "hubspot" });
 async function getStoredSettings(strapi) {
   return await store(strapi).get({ key: "settings" }) ?? {};
@@ -167,6 +170,13 @@ async function setStoredSettings(strapi, value) {
   await store(strapi).set({ key: "settings", value });
   clearCache();
 }
+const first = (values, fallback = "") => {
+  for (const item of values) {
+    const value = (item.value ?? "").trim();
+    if (value) return { value, source: item.source };
+  }
+  return { value: fallback, source: null };
+};
 async function resolveApiKey(strapi) {
   const stored = await getStoredSettings(strapi);
   if (stored.apiKey) return { apiKey: stored.apiKey, source: "settings" };
@@ -176,14 +186,71 @@ async function resolveApiKey(strapi) {
   if (fromEnv) return { apiKey: fromEnv, source: "env" };
   return { apiKey: "", source: null };
 }
-async function publicSettings(strapi) {
-  const { apiKey, source } = await resolveApiKey(strapi);
+async function resolveAccount(strapi) {
+  const resolved = await resolveAccountSources(strapi);
+  return {
+    portalId: resolved.portalId,
+    region: resolved.region || "eu1",
+    defaultFormId: resolved.defaultFormId
+  };
+}
+async function resolveAccountSources(strapi) {
+  const stored = await getStoredSettings(strapi);
+  const formsCfg = strapi.plugin("hubspot").config("forms", {}) ?? {};
+  const portal = first([
+    { value: stored.portalId, source: "settings" },
+    { value: strapi.plugin("hubspot").config("portalId", ""), source: "config" },
+    { value: process.env[ENV_PORTAL], source: "env" }
+  ]);
+  const region = first(
+    [
+      { value: stored.region, source: "settings" },
+      { value: strapi.plugin("hubspot").config("region", ""), source: "config" },
+      { value: process.env[ENV_REGION], source: "env" }
+    ],
+    "eu1"
+  );
+  const form = first([
+    { value: stored.defaultFormId, source: "settings" },
+    { value: formsCfg.defaultFormId, source: "config" },
+    { value: process.env[ENV_DEFAULT_FORM], source: "env" }
+  ]);
+  const { apiKey, source: keySource } = await resolveApiKey(strapi);
   return {
     configured: Boolean(apiKey),
-    keySource: source,
-    hint: apiKey ? `…${apiKey.slice(-4)}` : ""
+    keySource,
+    hint: apiKey ? `…${apiKey.slice(-4)}` : "",
+    portalId: portal.value,
+    region: region.value || "eu1",
+    defaultFormId: form.value,
+    portalSource: portal.source,
+    regionSource: region.source,
+    formSource: form.source
   };
 }
+async function publicSettings(strapi) {
+  return resolveAccountSources(strapi);
+}
+async function patchStoredSettings(strapi, body) {
+  const current = await getStoredSettings(strapi);
+  const next = { ...current };
+  if (typeof body.apiKey === "string" && body.apiKey.trim()) {
+    next.apiKey = body.apiKey.trim();
+  }
+  if ("portalId" in body) next.portalId = String(body.portalId ?? "").trim();
+  if ("region" in body) {
+    const region = String(body.region ?? "").trim().toLowerCase();
+    next.region = region || "eu1";
+  }
+  if ("defaultFormId" in body) next.defaultFormId = String(body.defaultFormId ?? "").trim();
+  await setStoredSettings(strapi, next);
+}
+async function clearStoredApiKey(strapi) {
+  const current = await getStoredSettings(strapi);
+  const { apiKey: _apiKey, ...rest } = current;
+  const empty = !rest.portalId && !rest.region && !rest.defaultFormId;
+  await setStoredSettings(strapi, empty ? null : rest);
+}
 function collectMappings(node, target, found = []) {
   if (Array.isArray(node)) {
     for (const item of node) collectMappings(item, target, found);
@@ -1247,6 +1314,13 @@ const contentTypes = {
         submitLabel: localizedString(),
         successMessage: localizedString("text"),
         class: { type: "string" },
+        // Marketing form GUID of the connected HubSpot portal. Test portal
+        // today, production later — swap the private app + this GUID, no
+        // code change. Empty = CRM upsert fallback (no native conversion).
+        hubspotFormId: {
+          type: "string",
+          pluginOptions: { i18n: { localized: false } }
+        },
         definition: {
           type: "json",
           required: true,
@@ -1450,6 +1524,312 @@ function resolveSubmission(definition, rawValues) {
   const unknown = Object.keys(rawValues).filter((key) => !declared.has(key));
   return { values, hidden, missingRequired, unknown };
 }
+const HS_BASE$2 = "https://api.hubapi.com";
+const OBJECT_BY_TYPE_ID = {
+  "0-1": "contact",
+  "0-2": "company"
+};
+const TYPE_MAP = {
+  single_line_text: "text",
+  multi_line_text: "textarea",
+  email: "email",
+  phone: "tel",
+  mobile_phone: "tel",
+  number: "number",
+  dropdown: "select",
+  select: "select",
+  radio: "radio",
+  multiple_checkboxes: "checkbox",
+  single_checkbox: "checkbox",
+  booleancheckbox: "checkbox"
+};
+let counter$1 = 0;
+const makeId$1 = (prefix) => `${prefix}_${Date.now().toString(36)}${(counter$1 += 1).toString(36)}`;
+function convertCondition(parentFieldId, raw) {
+  const operator = (raw.operator ?? "").toUpperCase();
+  const values = (raw.values ?? []).map((v) => String(v)).filter((v) => v !== "");
+  const spread = (op, logic) => values.length ? { logic, rules: values.map((value) => ({ field: parentFieldId, operator: op, value })) } : null;
+  switch (operator) {
+    case "EQ":
+    case "SET_ANY":
+      return spread("eq", "or");
+    case "NEQ":
+    case "NOT_SET_ANY":
+      return spread("neq", "and");
+    case "CONTAINS":
+      return spread("contains", "or");
+    case "GT":
+      return spread("gt", "or");
+    case "LT":
+      return spread("lt", "or");
+    case "SET":
+    case "NOT_EMPTY":
+      return { logic: "and", rules: [{ field: parentFieldId, operator: "notEmpty" }] };
+    case "NOT_SET":
+    case "EMPTY":
+      return { logic: "and", rules: [{ field: parentFieldId, operator: "empty" }] };
+    default:
+      return null;
+  }
+}
+function convertField(raw, ctx) {
+  const label = raw.label || raw.name || "";
+  const name = raw.name ?? "";
+  if (raw.hidden) {
+    ctx.skipped.push({ code: "hidden-field", label });
+    return [];
+  }
+  const object = OBJECT_BY_TYPE_ID[raw.objectTypeId ?? "0-1"];
+  if (!object) {
+    ctx.skipped.push({ code: "object", label, detail: raw.objectTypeId });
+    return [];
+  }
+  const type = TYPE_MAP[raw.fieldType ?? ""];
+  if (!type || !name) {
+    ctx.skipped.push({ code: "field-type", label, detail: raw.fieldType });
+    return [];
+  }
+  if (ctx.usedNames.has(name)) {
+    ctx.skipped.push({ code: "duplicate", label, detail: name });
+    return [];
+  }
+  ctx.usedNames.add(name);
+  const options = (raw.options ?? []).map((o) => ({ value: String(o.value ?? ""), label: o.label || void 0 })).filter((o) => o.value !== "");
+  const field = {
+    id: makeId$1("fld"),
+    name,
+    label,
+    type,
+    required: Boolean(raw.required),
+    placeholder: raw.placeholder || void 0,
+    helpText: raw.description || void 0,
+    ...options.length ? { options } : {},
+    hubspot: { object, property: name },
+    ...ctx.parentCondition ? { visibleIf: ctx.parentCondition } : {}
+  };
+  const out = [field];
+  for (const dependent of raw.dependentFields ?? []) {
+    if (!dependent.field) continue;
+    const childLabel = dependent.field.label || dependent.field.name || "";
+    const condition = dependent.dependentCondition ? convertCondition(field.id, dependent.dependentCondition) : null;
+    if (!condition) {
+      ctx.skipped.push({
+        code: "condition",
+        label: childLabel,
+        detail: dependent.dependentCondition?.operator
+      });
+    }
+    out.push(...convertField(dependent.field, { ...ctx, parentCondition: condition }));
+  }
+  return out;
+}
+function convertHubspotForm(raw) {
+  const skipped = [];
+  const usedNames = /* @__PURE__ */ new Set();
+  const fields = [];
+  for (const group of raw.fieldGroups ?? []) {
+    if (group.richText && !(group.fields ?? []).length) {
+      skipped.push({ code: "rich-text", detail: group.richText.slice(0, 80) });
+      continue;
+    }
+    const groupFields = (group.fields ?? []).flatMap(
+      (f) => convertField(f, { usedNames, skipped })
+    );
+    const topLevel = (group.fields ?? []).length;
+    if (topLevel === 2 && groupFields.length >= 2) {
+      groupFields[0].width = "half";
+      groupFields[1].width = "half";
+    }
+    fields.push(...groupFields);
+  }
+  if (raw.legalConsentOptions && Object.keys(raw.legalConsentOptions).length) {
+    skipped.push({ code: "legal-consent" });
+  }
+  const postSubmit = raw.configuration?.postSubmitAction;
+  return {
+    name: raw.name ?? "",
+    submitLabel: raw.displayOptions?.submitButtonText || null,
+    successMessage: postSubmit?.type === "thank_you" && postSubmit.value ? postSubmit.value : null,
+    hubspotFormId: raw.id ?? null,
+    // HubSpot forms are single-page: one step, reorganizable in the builder.
+    definition: { version: 1, steps: [{ id: makeId$1("stp"), fields }] },
+    skipped
+  };
+}
+async function hsGet(apiKey, path) {
+  const res = await fetch(`${HS_BASE$2}${path}`, {
+    headers: { Authorization: `Bearer ${apiKey}` }
+  });
+  if (!res.ok) {
+    const body = await res.json().catch(() => ({}));
+    throw Object.assign(new Error(body.message || `HubSpot ${res.status}`), {
+      status: res.status
+    });
+  }
+  return await res.json();
+}
+async function listHubspotForms(apiKey) {
+  const out = [];
+  let after;
+  for (let page = 0; page < 10; page += 1) {
+    const query2 = after ? `&after=${encodeURIComponent(after)}` : "";
+    const res = await hsGet(apiKey, `/marketing/v3/forms/?limit=100&formTypes=hubspot${query2}`);
+    for (const form of res.results ?? []) {
+      if (form.id && !form.archived) {
+        out.push({ id: form.id, name: form.name || form.id, updatedAt: form.updatedAt });
+      }
+    }
+    after = res.paging?.next?.after;
+    if (!after) break;
+  }
+  return out.sort((a, b) => a.name.localeCompare(b.name));
+}
+async function fetchHubspotForm(apiKey, formId) {
+  return hsGet(apiKey, `/marketing/v3/forms/${encodeURIComponent(formId)}`);
+}
+const GUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const PORTAL = /^\d{1,12}$/;
+const HUTK = /^[a-f0-9]{8,128}$/i;
+const SHAPE_TTL_MS = 5 * 60 * 1e3;
+const DEFAULT_CONSENT_TEXT = "J'accepte que mes données soient utilisées pour me recontacter.";
+function isFormGuid(value) {
+  return GUID.test(value.trim());
+}
+function sanitizeHutk(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return HUTK.test(trimmed) ? trimmed : void 0;
+}
+function sanitizePortalId(value) {
+  if (typeof value !== "string" && typeof value !== "number") return void 0;
+  const trimmed = String(value).trim();
+  return PORTAL.test(trimmed) ? trimmed : void 0;
+}
+function sanitizeIp(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed && trimmed.length <= 45 ? trimmed : void 0;
+}
+function formsHost(region) {
+  const r = (region || "eu1").trim().toLowerCase();
+  if (!r || r === "na1" || r === "na") return "api.hsforms.com";
+  return `api-${r}.hsforms.com`;
+}
+function formsSubmitUrl(portalId, formGuid, region = "eu1") {
+  return `https://${formsHost(region)}/submissions/v3/integration/secure/submit/${encodeURIComponent(portalId)}/${encodeURIComponent(formGuid)}`;
+}
+function toHsFields(props) {
+  return Object.entries(props).filter(([, value]) => value !== "").map(([name, value]) => ({ name, value }));
+}
+function filterToFormFields(fields, allowed) {
+  if (!allowed) return fields;
+  return fields.filter((field) => allowed.has(field.name));
+}
+function formFieldNames(raw) {
+  const names = [];
+  for (const group of raw.fieldGroups ?? []) {
+    for (const field of group.fields ?? []) {
+      if (field.name) names.push(field.name);
+    }
+  }
+  return names;
+}
+const shapeCache = /* @__PURE__ */ new Map();
+async function loadFormShape(apiKey, formGuid) {
+  const cached = shapeCache.get(formGuid);
+  if (cached && Date.now() - cached.at < SHAPE_TTL_MS) {
+    return { names: cached.names, hasLegalConsent: cached.hasLegalConsent };
+  }
+  try {
+    const raw = await fetchHubspotForm(apiKey, formGuid);
+    const names = new Set(formFieldNames(raw));
+    const hasLegalConsent = Boolean(
+      raw.legalConsentOptions && typeof raw.legalConsentOptions === "object" && raw.legalConsentOptions.type && raw.legalConsentOptions.type !== "none"
+    );
+    shapeCache.set(formGuid, { at: Date.now(), names, hasLegalConsent });
+    return { names, hasLegalConsent };
+  } catch {
+    return null;
+  }
+}
+async function findContactIdByEmail(apiKey, email) {
+  const res = await fetch("https://api.hubapi.com/crm/v3/objects/contacts/search", {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      filterGroups: [
+        { filters: [{ propertyName: "email", operator: "EQ", value: email }] }
+      ],
+      properties: ["email"],
+      limit: 1
+    })
+  });
+  const body = await res.json().catch(() => ({}));
+  if (!res.ok) return void 0;
+  return body.results?.[0]?.id;
+}
+function contextPayload(ctx) {
+  const out = {};
+  const hutk = sanitizeHutk(ctx?.hutk);
+  if (hutk) out.hutk = hutk;
+  if (typeof ctx?.pageUri === "string" && ctx.pageUri.trim()) {
+    out.pageUri = ctx.pageUri.trim().slice(0, 1e3);
+  }
+  if (typeof ctx?.pageName === "string" && ctx.pageName.trim()) {
+    out.pageName = ctx.pageName.trim().slice(0, 200);
+  }
+  const ip = sanitizeIp(ctx?.ipAddress);
+  if (ip) out.ipAddress = ip;
+  return out;
+}
+async function postForm(url, apiKey, payload) {
+  const res = await fetch(url, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(payload)
+  });
+  if (res.ok) return { ok: true, status: res.status };
+  const body = await res.json().catch(() => ({}));
+  const error = body.errors?.[0]?.message || body.message || `HubSpot ${res.status}`;
+  return { ok: false, status: res.status, error };
+}
+async function submitMarketingForm(input) {
+  const portalId = sanitizePortalId(input.portalId);
+  const formGuid = input.formGuid.trim();
+  if (!portalId || !isFormGuid(formGuid) || !input.fields.length) {
+    return { ok: false, status: 0, error: "Missing portal, form GUID or fields" };
+  }
+  const url = formsSubmitUrl(portalId, formGuid, input.region);
+  const context = contextPayload(input.context);
+  const base = {
+    fields: input.fields,
+    ...Object.keys(context).length ? { context } : {}
+  };
+  const withConsent = input.consent?.given && input.formHasLegalConsent !== false ? {
+    ...base,
+    legalConsentOptions: {
+      consent: {
+        consentToProcess: true,
+        text: input.consent.text?.trim() || DEFAULT_CONSENT_TEXT
+      }
+    }
+  } : base;
+  let result = await postForm(url, input.apiKey, withConsent);
+  if (!result.ok && result.status === 400 && withConsent !== base) {
+    result = await postForm(url, input.apiKey, base);
+  }
+  if (!result.ok && result.status === 400 && input.fields.length > 1) {
+    const email = input.fields.find((f) => f.name === "email");
+    if (email) result = await postForm(url, input.apiKey, { ...base, fields: [email] });
+  }
+  return result;
+}
 function publicForm(entry) {
   return {
     slug: entry.slug,
@@ -1558,9 +1938,9 @@ function sanitizeRawValues(raw) {
   }
   return values;
 }
-const HS_BASE$2 = "https://api.hubapi.com";
-const HS_COMPANIES = `${HS_BASE$2}/crm/v3/objects/companies`;
-const HS_NOTES = `${HS_BASE$2}/crm/v3/objects/notes`;
+const HS_BASE$1 = "https://api.hubapi.com";
+const HS_COMPANIES = `${HS_BASE$1}/crm/v3/objects/companies`;
+const HS_NOTES = `${HS_BASE$1}/crm/v3/objects/notes`;
 const ASSOC_NOTE_TO_CONTACT = 202;
 const ASSOC_NOTE_TO_COMPANY = 190;
 const escapeHtml = (s) => s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
@@ -1618,8 +1998,17 @@ function createFormsService(strapi, _opts = {}) {
   const formsConfig = () => ({
     companyFromDomain: true,
     timelineNote: true,
+    defaultFormId: "",
     ...strapi.plugin("hubspot").config("forms", {})
   });
+  const stringProps = (props) => {
+    const out = {};
+    for (const [key, value] of Object.entries(props)) {
+      if (value === "" || value == null) continue;
+      out[key] = typeof value === "boolean" ? value ? "true" : "false" : String(value);
+    }
+    return out;
+  };
   async function partitionBySchema(apiKey, groups) {
     let schema;
     try {
@@ -1659,20 +2048,20 @@ function createFormsService(strapi, _opts = {}) {
     });
     const existingId = found.results?.[0]?.id;
     if (!existingId) return void 0;
-    const stringProps = {};
-    for (const [key, value] of Object.entries(props)) stringProps[key] = String(value);
+    const stringProps2 = {};
+    for (const [key, value] of Object.entries(props)) stringProps2[key] = String(value);
     await hsJson(apiKey, `${HS_COMPANIES}/${existingId}`, {
       method: "PATCH",
-      body: { properties: stringProps }
+      body: { properties: stringProps2 }
     });
     return existingId;
   }
   async function createCompany(apiKey, props) {
-    const stringProps = {};
-    for (const [key, value] of Object.entries(props)) stringProps[key] = String(value);
+    const stringProps2 = {};
+    for (const [key, value] of Object.entries(props)) stringProps2[key] = String(value);
     const created = await hsJson(apiKey, HS_COMPANIES, {
       method: "POST",
-      body: { properties: stringProps }
+      body: { properties: stringProps2 }
     });
     return created.id;
   }
@@ -1685,19 +2074,19 @@ function createFormsService(strapi, _opts = {}) {
         limit: 1
       }
     });
-    const stringProps = { domain };
-    for (const [key, value] of Object.entries(props)) stringProps[key] = String(value);
+    const stringProps2 = { domain };
+    for (const [key, value] of Object.entries(props)) stringProps2[key] = String(value);
     const existingId = found.results?.[0]?.id;
     if (existingId) {
       await hsJson(apiKey, `${HS_COMPANIES}/${existingId}`, {
         method: "PATCH",
-        body: { properties: stringProps }
+        body: { properties: stringProps2 }
       });
       return existingId;
     }
     const created = await hsJson(apiKey, HS_COMPANIES, {
       method: "POST",
-      body: { properties: stringProps }
+      body: { properties: stringProps2 }
     });
     return created.id;
   }
@@ -1807,6 +2196,7 @@ function createFormsService(strapi, _opts = {}) {
         });
       }
     }
+    let usedFormsApi = false;
     if (email && apiKey) {
       const groups = groupByObject(form.definition, resolution.values);
       for (const [object, props] of Object.entries(companyGroups)) {
@@ -1814,14 +2204,63 @@ function createFormsService(strapi, _opts = {}) {
       }
       const partition = await partitionBySchema(apiKey, groups);
       rejected = partition.rejected;
-      const result = await strapi.plugin("hubspot").service("submit").upsert({
-        object: "contact",
-        idProperty: "email",
-        properties: { ...partition.accepted.contact ?? {}, email }
-      });
-      if (result.ok) {
-        hubspotSynced = true;
-        contactId = result.id;
+      const account = await resolveAccount(strapi);
+      const portalId = sanitizePortalId(account.portalId);
+      const region = account.region || "eu1";
+      const ownGuid = typeof form.hubspotFormId === "string" ? form.hubspotFormId.trim() : "";
+      const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
+      if (portalId && formGuid) {
+        try {
+          const shape = await loadFormShape(apiKey, formGuid);
+          const fields = filterToFormFields(
+            toHsFields({ ...stringProps(partition.accepted.contact ?? {}), email }),
+            shape?.names ?? null
+          );
+          if (fields.length && !fields.some((f) => f.name === "email")) {
+            fields.unshift({ name: "email", value: email });
+          }
+          const submitted = await submitMarketingForm({
+            apiKey,
+            portalId,
+            formGuid,
+            region,
+            fields: fields.length ? fields : [{ name: "email", value: email }],
+            context: {
+              hutk: sanitizeHutk(meta.hutk),
+              pageUri: typeof meta.pageUrl === "string" ? meta.pageUrl : void 0,
+              pageName: typeof meta.pageName === "string" && meta.pageName || (form.title || form.name) || void 0,
+              ipAddress: sanitizeIp(meta.ipAddress)
+            },
+            consent: { given: meta.consent === true },
+            formHasLegalConsent: shape?.hasLegalConsent
+          });
+          if (submitted.ok) {
+            hubspotSynced = true;
+            usedFormsApi = true;
+            try {
+              contactId = await findContactIdByEmail(apiKey, email);
+            } catch (err) {
+              strapi.log.warn(
+                `[hubspot] contact lookup after form submit failed — ${err.message}`
+              );
+            }
+          } else {
+            strapi.log.warn(`[hubspot] Forms API submit failed — ${submitted.error}`);
+          }
+        } catch (err) {
+          strapi.log.warn(`[hubspot] Forms API submit failed — ${err.message}`);
+        }
+      }
+      if (!usedFormsApi) {
+        const result = await strapi.plugin("hubspot").service("submit").upsert({
+          object: "contact",
+          idProperty: "email",
+          properties: { ...partition.accepted.contact ?? {}, email }
+        });
+        if (result.ok) {
+          hubspotSynced = true;
+          contactId = result.id;
+        }
       }
       const domain = corporateDomain(email);
       const companyProps = partition.accepted.company ?? {};
@@ -1845,7 +2284,7 @@ function createFormsService(strapi, _opts = {}) {
           if (companyId) {
             await hsJson(
               apiKey,
-              `${HS_BASE$2}/crm/v4/objects/contacts/${contactId}/associations/default/companies/${companyId}`,
+              `${HS_BASE$1}/crm/v4/objects/contacts/${contactId}/associations/default/companies/${companyId}`,
               { method: "PUT" }
             );
           }
@@ -1853,7 +2292,7 @@ function createFormsService(strapi, _opts = {}) {
           strapi.log.warn(`[hubspot] company sync failed (contact OK) — ${err.message}`);
         }
       }
-      if (contactId && config2.timelineNote) {
+      if (contactId && config2.timelineNote && !usedFormsApi) {
         try {
           await createLeadNote(apiKey, {
             contactId,
@@ -1888,168 +2327,6 @@ function createFormsService(strapi, _opts = {}) {
   }
   return { submit };
 }
-const HS_BASE$1 = "https://api.hubapi.com";
-const OBJECT_BY_TYPE_ID = {
-  "0-1": "contact",
-  "0-2": "company"
-};
-const TYPE_MAP = {
-  single_line_text: "text",
-  multi_line_text: "textarea",
-  email: "email",
-  phone: "tel",
-  mobile_phone: "tel",
-  number: "number",
-  dropdown: "select",
-  select: "select",
-  radio: "radio",
-  multiple_checkboxes: "checkbox",
-  single_checkbox: "checkbox",
-  booleancheckbox: "checkbox"
-};
-let counter$1 = 0;
-const makeId$1 = (prefix) => `${prefix}_${Date.now().toString(36)}${(counter$1 += 1).toString(36)}`;
-function convertCondition(parentFieldId, raw) {
-  const operator = (raw.operator ?? "").toUpperCase();
-  const values = (raw.values ?? []).map((v) => String(v)).filter((v) => v !== "");
-  const spread = (op, logic) => values.length ? { logic, rules: values.map((value) => ({ field: parentFieldId, operator: op, value })) } : null;
-  switch (operator) {
-    case "EQ":
-    case "SET_ANY":
-      return spread("eq", "or");
-    case "NEQ":
-    case "NOT_SET_ANY":
-      return spread("neq", "and");
-    case "CONTAINS":
-      return spread("contains", "or");
-    case "GT":
-      return spread("gt", "or");
-    case "LT":
-      return spread("lt", "or");
-    case "SET":
-    case "NOT_EMPTY":
-      return { logic: "and", rules: [{ field: parentFieldId, operator: "notEmpty" }] };
-    case "NOT_SET":
-    case "EMPTY":
-      return { logic: "and", rules: [{ field: parentFieldId, operator: "empty" }] };
-    default:
-      return null;
-  }
-}
-function convertField(raw, ctx) {
-  const label = raw.label || raw.name || "";
-  const name = raw.name ?? "";
-  if (raw.hidden) {
-    ctx.skipped.push({ code: "hidden-field", label });
-    return [];
-  }
-  const object = OBJECT_BY_TYPE_ID[raw.objectTypeId ?? "0-1"];
-  if (!object) {
-    ctx.skipped.push({ code: "object", label, detail: raw.objectTypeId });
-    return [];
-  }
-  const type = TYPE_MAP[raw.fieldType ?? ""];
-  if (!type || !name) {
-    ctx.skipped.push({ code: "field-type", label, detail: raw.fieldType });
-    return [];
-  }
-  if (ctx.usedNames.has(name)) {
-    ctx.skipped.push({ code: "duplicate", label, detail: name });
-    return [];
-  }
-  ctx.usedNames.add(name);
-  const options = (raw.options ?? []).map((o) => ({ value: String(o.value ?? ""), label: o.label || void 0 })).filter((o) => o.value !== "");
-  const field = {
-    id: makeId$1("fld"),
-    name,
-    label,
-    type,
-    required: Boolean(raw.required),
-    placeholder: raw.placeholder || void 0,
-    helpText: raw.description || void 0,
-    ...options.length ? { options } : {},
-    hubspot: { object, property: name },
-    ...ctx.parentCondition ? { visibleIf: ctx.parentCondition } : {}
-  };
-  const out = [field];
-  for (const dependent of raw.dependentFields ?? []) {
-    if (!dependent.field) continue;
-    const childLabel = dependent.field.label || dependent.field.name || "";
-    const condition = dependent.dependentCondition ? convertCondition(field.id, dependent.dependentCondition) : null;
-    if (!condition) {
-      ctx.skipped.push({
-        code: "condition",
-        label: childLabel,
-        detail: dependent.dependentCondition?.operator
-      });
-    }
-    out.push(...convertField(dependent.field, { ...ctx, parentCondition: condition }));
-  }
-  return out;
-}
-function convertHubspotForm(raw) {
-  const skipped = [];
-  const usedNames = /* @__PURE__ */ new Set();
-  const fields = [];
-  for (const group of raw.fieldGroups ?? []) {
-    if (group.richText && !(group.fields ?? []).length) {
-      skipped.push({ code: "rich-text", detail: group.richText.slice(0, 80) });
-      continue;
-    }
-    const groupFields = (group.fields ?? []).flatMap(
-      (f) => convertField(f, { usedNames, skipped })
-    );
-    const topLevel = (group.fields ?? []).length;
-    if (topLevel === 2 && groupFields.length >= 2) {
-      groupFields[0].width = "half";
-      groupFields[1].width = "half";
-    }
-    fields.push(...groupFields);
-  }
-  if (raw.legalConsentOptions && Object.keys(raw.legalConsentOptions).length) {
-    skipped.push({ code: "legal-consent" });
-  }
-  const postSubmit = raw.configuration?.postSubmitAction;
-  return {
-    name: raw.name ?? "",
-    submitLabel: raw.displayOptions?.submitButtonText || null,
-    successMessage: postSubmit?.type === "thank_you" && postSubmit.value ? postSubmit.value : null,
-    // HubSpot forms are single-page: one step, reorganizable in the builder.
-    definition: { version: 1, steps: [{ id: makeId$1("stp"), fields }] },
-    skipped
-  };
-}
-async function hsGet(apiKey, path) {
-  const res = await fetch(`${HS_BASE$1}${path}`, {
-    headers: { Authorization: `Bearer ${apiKey}` }
-  });
-  if (!res.ok) {
-    const body = await res.json().catch(() => ({}));
-    throw Object.assign(new Error(body.message || `HubSpot ${res.status}`), {
-      status: res.status
-    });
-  }
-  return await res.json();
-}
-async function listHubspotForms(apiKey) {
-  const out = [];
-  let after;
-  for (let page = 0; page < 10; page += 1) {
-    const query2 = after ? `&after=${encodeURIComponent(after)}` : "";
-    const res = await hsGet(apiKey, `/marketing/v3/forms/?limit=100&formTypes=hubspot${query2}`);
-    for (const form of res.results ?? []) {
-      if (form.id && !form.archived) {
-        out.push({ id: form.id, name: form.name || form.id, updatedAt: form.updatedAt });
-      }
-    }
-    after = res.paging?.next?.after;
-    if (!after) break;
-  }
-  return out.sort((a, b) => a.name.localeCompare(b.name));
-}
-async function fetchHubspotForm(apiKey, formId) {
-  return hsGet(apiKey, `/marketing/v3/forms/${encodeURIComponent(formId)}`);
-}
 let counter = 0;
 const makeId = (prefix) => `${prefix}_${Date.now().toString(36)}${(counter += 1).toString(36)}`;
 const slugifyName = (label) => label.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
@@ -2128,7 +2405,8 @@ const WRITABLE = [
   "nextLabel",
   "submitLabel",
   "successMessage",
-  "class"
+  "class",
+  "hubspotFormId"
 ];
 const slugify = (value) => value.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") || "form";
 function createFormsAdminController(strapi) {
@@ -2493,6 +2771,7 @@ function createFormsAdminController(strapi) {
           submitLabel: source.submitLabel,
           successMessage: source.successMessage,
           class: source.class,
+          hubspotFormId: source.hubspotFormId ?? null,
           definition: source.definition
         };
         if (targetId) {
@@ -2727,17 +3006,27 @@ const FORMS_ACTION = "plugin::hubspot.forms";
 const config = {
   default: {
     apiKey: "",
+    // HubSpot account that receives form submissions. A test portal id is
+    // fine in development; production swaps this env var, not the code.
+    portalId: "",
+    // Hosting region of that portal (`eu1`, `na1`, …). Drives the Forms API
+    // host (`api-eu1.hsforms.com`) — CRM stays on api.hubapi.com.
+    region: "eu1",
     // Objects whose properties are offered. Names from the standard set, or
     // `{ name, path }` for a custom object type.
     objects: ["contact", "company"],
     validate: [],
-    // Submission pipeline of the built forms. Both default to true:
+    // Submission pipeline of the built forms:
     //  - companyFromDomain: a corporate email upserts the Company (deduped by
     //    domain) and associates it to the contact;
-    //  - timelineNote: a note recaps the submission on the contact's timeline.
+    //  - timelineNote: recap note on the CRM-upsert fallback only (off when
+    //    submissions go through the marketing Forms API);
+    //  - defaultFormId: portal-wide marketing form GUID when a builder form
+    //    doesn't set its own — swap with the portal at production cutover.
     forms: {
       companyFromDomain: true,
       timelineNote: true,
+      defaultFormId: "",
       // Per-IP brakes on the public routes; 0 disables one.
       rateLimit: { submitPerMinute: 6, searchPerMinute: 30 }
     }
@@ -2893,7 +3182,7 @@ const controllers = {
         if (!values || !Object.keys(values).length) ctx.throw(422, "Invalid submission");
         const rawMeta = ctx.request.body?.meta ?? {};
         const meta = {};
-        for (const key of ["pagePath", "pageUrl", "originPath", "originLabel", "source"]) {
+        for (const key of ["pagePath", "pageUrl", "pageName", "originPath", "originLabel", "source", "ipAddress"]) {
           const v = rawMeta[key];
           if (typeof v === "string" && v) meta[key] = v.slice(0, 500);
         }
@@ -2901,6 +3190,13 @@ const controllers = {
         if (typeof rawMeta.consentedAt === "string" && rawMeta.consentedAt.trim()) {
           meta.consentedAt = rawMeta.consentedAt.trim().slice(0, 40);
         }
+        if (typeof rawMeta.hutk === "string" && rawMeta.hutk.trim()) {
+          meta.hutk = rawMeta.hutk.trim().slice(0, 128);
+        }
+        if (!meta.ipAddress) {
+          const ip = ctx.request.ip;
+          if (ip) meta.ipAddress = ip.slice(0, 45);
+        }
         const outcome = await strapi.plugin("hubspot").service("forms").submit(entry, values, meta);
         if (!outcome.ok) {
           ctx.status = 422;
@@ -2913,15 +3209,24 @@ const controllers = {
   },
   settings: ({ strapi }) => ({
     async get(ctx) {
-      ctx.body = await publicSettings(strapi);
+      const settings = await publicSettings(strapi);
+      let forms = [];
+      const { apiKey } = await resolveApiKey(strapi);
+      if (apiKey) {
+        try {
+          forms = await listHubspotForms(apiKey);
+        } catch {
+          forms = [];
+        }
+      }
+      ctx.body = { ...settings, forms };
     },
     async update(ctx) {
-      const apiKey = (ctx.request.body?.apiKey ?? "").trim();
-      await setStoredSettings(strapi, apiKey ? { apiKey } : null);
+      await patchStoredSettings(strapi, ctx.request.body ?? {});
       ctx.body = await publicSettings(strapi);
     },
     async reset(ctx) {
-      await setStoredSettings(strapi, null);
+      await clearStoredApiKey(strapi);
       ctx.body = await publicSettings(strapi);
     }
   })