strapi-plugin-hubspot 0.14.0 → 0.16.0

package/dist/_chunks/{index-CPVfElYB.mjs → index-7cL9PRh1.mjs}

@@ -25,7 +25,7 @@ const index = {
       icon: PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await import("./Forms-ws6d8rdC.mjs")).default
+      Component: async () => (await import("./Forms-6EoEYzAc.mjs")).default
     });
     app.customFields.register({
       name: "property",
@@ -40,7 +40,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => import("./HubspotPropertyInput-C-kHDgwx.mjs")
+        Input: async () => import("./HubspotPropertyInput-CrYP4pc0.mjs")
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -103,7 +103,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => import("./HubspotObjectInput-DshusXZP.mjs")
+        Input: async () => import("./HubspotObjectInput-DhsnSguG.mjs")
       }
     });
     app.customFields.register({
@@ -119,7 +119,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => import("./HubspotFormInput-18pWTITT.mjs")
+        Input: async () => import("./HubspotFormInput-V5w4y1fb.mjs")
       }
     });
     app.createSettingSection(
@@ -135,7 +135,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await import("./Settings-Bm7WkzK1.mjs")).default
+          Component: async () => (await import("./Settings-CjcWj9I6.mjs")).default
         }
       ]
     );
@@ -145,7 +145,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-DKV-8FWP.mjs"), "./translations/fr.json": () => import("./fr-GB6T3ZyU.mjs") }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => import("./en-D6GHgMOt.mjs"), "./translations/fr.json": () => import("./fr-CfohMY8n.mjs") }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{index-BlaG8oIq.js → index-CodpLKZx.js}

@@ -26,7 +26,7 @@ const index = {
       icon: icons.PaperPlane,
       intlLabel: { id: `${PLUGIN_ID}.menu.label`, defaultMessage: "HubSpot Forms" },
       permissions: [{ action: `plugin::${PLUGIN_ID}.forms`, subject: null }],
-      Component: async () => (await Promise.resolve().then(() => require("./Forms-Cch-7zei.js"))).default
+      Component: async () => (await Promise.resolve().then(() => require("./Forms-BW_zGc1P.js"))).default
     });
     app.customFields.register({
       name: "property",
@@ -41,7 +41,7 @@ const index = {
         defaultMessage: "Picked from the portal's real properties"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-XGnH2tHn.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotPropertyInput-luFfnxqy.js"))
       },
       // Exposed in the Content-Type Builder. Without this, `objectField` could
       // only be set by hand-editing schema.json — which is not how anyone
@@ -104,7 +104,7 @@ const index = {
         defaultMessage: "Picked from the portal's configured objects"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-BDO99qXs.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotObjectInput-Bmo6YQgs.js"))
       }
     });
     app.customFields.register({
@@ -120,7 +120,7 @@ const index = {
         defaultMessage: "A form built in the HubSpot form builder, stored by slug"
       },
       components: {
-        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-M2l_8w_e.js"))
+        Input: async () => Promise.resolve().then(() => require("./HubspotFormInput-oMhm1UJm.js"))
       }
     });
     app.createSettingSection(
@@ -136,7 +136,7 @@ const index = {
           // Mirrors the RBAC action registered server-side: a role without it
           // doesn't see the link at all — the routes refuse it anyway.
           permissions: [{ action: `plugin::${PLUGIN_ID}.settings`, subject: null }],
-          Component: async () => (await Promise.resolve().then(() => require("./Settings-CRnsu6ob.js"))).default
+          Component: async () => (await Promise.resolve().then(() => require("./Settings-B3A22i7Z.js"))).default
         }
       ]
     );
@@ -146,7 +146,7 @@ const index = {
     return Promise.all(
       locales.map(async (locale) => {
         try {
-          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-BXMU5CjT.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-Dx4XmZ4X.js")) }), `./translations/${locale}.json`, 3);
+          const { default: data } = await __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "./translations/en.json": () => Promise.resolve().then(() => require("./en-C7ls2EUl.js")), "./translations/fr.json": () => Promise.resolve().then(() => require("./fr-pOP8ZXqM.js")) }), `./translations/${locale}.json`, 3);
           return { data: prefixPluginTranslations(data), locale };
         } catch {
           return { data: {}, locale };

package/dist/_chunks/{objectLabels-CPc21Tdd.js → objectLabels-CSWGIgNb.js}

@@ -1,5 +1,5 @@
 "use strict";
-const index = require("./index-BlaG8oIq.js");
+const index = require("./index-CodpLKZx.js");
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{objectLabels-6OUnIDB5.mjs → objectLabels-Dnj14fsp.mjs}

@@ -1,4 +1,4 @@
-import { g as getTranslation } from "./index-CPVfElYB.mjs";
+import { g as getTranslation } from "./index-7cL9PRh1.mjs";
 const STANDARD = /* @__PURE__ */ new Set([
   "contact",
   "company",

package/dist/_chunks/{useHubspotSchema-qCUs2gIX.mjs → useHubspotSchema-BsmQgJgx.mjs}

@@ -1,6 +1,6 @@
 import * as React from "react";
 import { useFetchClient } from "@strapi/strapi/admin";
-import { P as PLUGIN_ID } from "./index-CPVfElYB.mjs";
+import { P as PLUGIN_ID } from "./index-7cL9PRh1.mjs";
 let cached = null;
 let inFlight = null;
 const listeners = /* @__PURE__ */ new Set();

package/dist/_chunks/{useHubspotSchema-0MvCM1AC.js → useHubspotSchema-DiRN3HrN.js}

@@ -1,7 +1,7 @@
 "use strict";
 const React = require("react");
 const admin = require("@strapi/strapi/admin");
-const index = require("./index-BlaG8oIq.js");
+const index = require("./index-CodpLKZx.js");
 function _interopNamespace(e) {
   if (e && e.__esModule) return e;
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-BlaG8oIq.js");
+const index = require("../_chunks/index-CodpLKZx.js");
 require("@strapi/icons");
 module.exports = index.index;

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { i } from "../_chunks/index-CPVfElYB.mjs";
+import { i } from "../_chunks/index-7cL9PRh1.mjs";
 import "@strapi/icons";
 export {
   i as default

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,33 @@ 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 };
+};
+const MODES = /* @__PURE__ */ new Set(["auto", "crm", "forms"]);
+function asSubmissionMode(value) {
+  return typeof value === "string" && MODES.has(value) ? value : void 0;
+}
+function asBool(value) {
+  return typeof value === "boolean" ? value : void 0;
+}
+function formsCfg(strapi) {
+  return strapi.plugin("hubspot").config("forms", {}) ?? {};
+}
+function policyFrom(stored, forms) {
+  return {
+    submissionMode: asSubmissionMode(stored.submissionMode) ?? asSubmissionMode(forms.submissionMode) ?? "auto",
+    writeExtraProperties: asBool(stored.writeExtraProperties) ?? asBool(forms.writeExtraProperties) ?? true,
+    syncFieldsOnPublish: asBool(stored.syncFieldsOnPublish) ?? asBool(forms.syncFieldsOnPublish) ?? false
+  };
+}
+async function resolvePolicy(strapi) {
+  return policyFrom(await getStoredSettings(strapi), formsCfg(strapi));
+}
 async function resolveApiKey(strapi) {
   const stored = await getStoredSettings(strapi);
   if (stored.apiKey) return { apiKey: stored.apiKey, source: "settings" };
@@ -176,14 +206,83 @@ 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 forms = formsCfg(strapi);
+  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: forms.defaultFormId, source: "config" },
+    { value: process.env[ENV_DEFAULT_FORM], source: "env" }
+  ]);
+  const { apiKey, source: keySource } = await resolveApiKey(strapi);
+  const policy = policyFrom(stored, forms);
   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,
+    ...policy
   };
 }
+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();
+  if ("submissionMode" in body) {
+    const mode = asSubmissionMode(body.submissionMode);
+    if (mode) next.submissionMode = mode;
+  }
+  if ("writeExtraProperties" in body && typeof body.writeExtraProperties === "boolean") {
+    next.writeExtraProperties = body.writeExtraProperties;
+  }
+  if ("syncFieldsOnPublish" in body && typeof body.syncFieldsOnPublish === "boolean") {
+    next.syncFieldsOnPublish = body.syncFieldsOnPublish;
+  }
+  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);
@@ -1457,6 +1556,96 @@ function resolveSubmission(definition, rawValues) {
   const unknown = Object.keys(rawValues).filter((key) => !declared.has(key));
   return { values, hidden, missingRequired, unknown };
 }
+const OBJECT_TYPE_ID = {
+  contact: "0-1",
+  company: "0-2"
+};
+function leftoverContactProps(contact, sentFieldNames) {
+  const sent = new Set(sentFieldNames);
+  const extra = {};
+  for (const [key, value] of Object.entries(contact)) {
+    if (key === "email" || sent.has(key) || value === "") continue;
+    extra[key] = value;
+  }
+  return extra;
+}
+function mappedContactFields(definition) {
+  const out = [];
+  for (const step of definition.steps ?? []) {
+    for (const fld of step.fields ?? []) {
+      if (fld.type === "company") continue;
+      const mapping = fld.hubspot ?? {};
+      const object = mapping.object?.trim() || "contact";
+      if (object !== "contact") continue;
+      const property = mapping.property?.trim() || fld.name;
+      if (!property) continue;
+      out.push({
+        name: fld.name,
+        label: typeof fld.label === "string" ? fld.label : void 0,
+        type: fld.type,
+        required: Boolean(fld.required),
+        object,
+        property,
+        options: fld.options
+      });
+    }
+  }
+  return out;
+}
+function missingMappedFields(definition, existingNames) {
+  const existing = new Set(existingNames);
+  return mappedContactFields(definition).filter((field) => !existing.has(field.property));
+}
+function hsFieldType(type, options) {
+  switch (type) {
+    case "email":
+      return "email";
+    case "tel":
+      return "phone";
+    case "textarea":
+      return "multi_line_text";
+    case "number":
+      return "number";
+    case "select":
+      return "dropdown";
+    case "radio":
+      return "radio";
+    case "checkbox":
+      return Array.isArray(options) && options.length ? "multiple_checkboxes" : "booleancheckbox";
+    default:
+      return "single_line_text";
+  }
+}
+function toHsFormField(field) {
+  const options = (field.options ?? []).filter((option) => option.value).map((option) => ({
+    value: String(option.value),
+    label: option.label || String(option.value)
+  }));
+  return {
+    objectTypeId: OBJECT_TYPE_ID[field.object || "contact"] || "0-1",
+    name: field.property,
+    label: field.label || field.property,
+    required: Boolean(field.required),
+    hidden: false,
+    fieldType: hsFieldType(field.type, field.options),
+    ...options.length ? { options } : {}
+  };
+}
+function appendFieldGroups(existing, extra) {
+  return [
+    ...existing.map((group) => ({
+      groupType: group.groupType || "default_group",
+      richTextType: group.richTextType || "text",
+      ...group.richText ? { richText: group.richText } : {},
+      fields: group.fields ?? []
+    })),
+    ...extra.map((field) => ({
+      groupType: "default_group",
+      richTextType: "text",
+      fields: [toHsFormField(field)]
+    }))
+  ];
+}
 const HS_BASE$2 = "https://api.hubapi.com";
 const OBJECT_BY_TYPE_ID = {
   "0-1": "contact",
@@ -1620,6 +1809,23 @@ async function listHubspotForms(apiKey) {
 async function fetchHubspotForm(apiKey, formId) {
   return hsGet(apiKey, `/marketing/v3/forms/${encodeURIComponent(formId)}`);
 }
+async function patchHubspotForm(apiKey, formId, body) {
+  const res = await fetch(`${HS_BASE$2}/marketing/v3/forms/${encodeURIComponent(formId)}`, {
+    method: "PATCH",
+    headers: {
+      Authorization: `Bearer ${apiKey}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify(body)
+  });
+  if (!res.ok) {
+    const payload = await res.json().catch(() => ({}));
+    throw Object.assign(new Error(payload.message || `HubSpot ${res.status}`), {
+      status: res.status
+    });
+  }
+  return await res.json();
+}
 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;
@@ -1668,6 +1874,10 @@ function formFieldNames(raw) {
   return names;
 }
 const shapeCache = /* @__PURE__ */ new Map();
+function clearFormShapeCache(formGuid) {
+  if (formGuid) shapeCache.delete(formGuid);
+  else shapeCache.clear();
+}
 async function loadFormShape(apiKey, formGuid) {
   const cached = shapeCache.get(formGuid);
   if (cached && Date.now() - cached.at < SHAPE_TTL_MS) {
@@ -1763,6 +1973,16 @@ async function submitMarketingForm(input) {
   }
   return result;
 }
+async function syncFieldsToHubspotForm(apiKey, formGuid, definition) {
+  const raw = await fetchHubspotForm(apiKey, formGuid);
+  const extra = missingMappedFields(definition, formFieldNames(raw));
+  if (!extra.length) return [];
+  await patchHubspotForm(apiKey, formGuid, {
+    fieldGroups: appendFieldGroups(raw.fieldGroups ?? [], extra)
+  });
+  clearFormShapeCache(formGuid);
+  return extra.map((field) => field.property);
+}
 function publicForm(entry) {
   return {
     slug: entry.slug,
@@ -2130,6 +2350,7 @@ function createFormsService(strapi, _opts = {}) {
       }
     }
     let usedFormsApi = false;
+    let sentFieldNames = [];
     if (email && apiKey) {
       const groups = groupByObject(form.definition, resolution.values);
       for (const [object, props] of Object.entries(companyGroups)) {
@@ -2137,20 +2358,25 @@ function createFormsService(strapi, _opts = {}) {
       }
       const partition = await partitionBySchema(apiKey, groups);
       rejected = partition.rejected;
-      const portalId = sanitizePortalId(strapi.plugin("hubspot").config("portalId", ""));
-      const region = String(strapi.plugin("hubspot").config("region", "eu1") || "eu1");
+      const contactProps = stringProps(partition.accepted.contact ?? {});
+      const account = await resolveAccount(strapi);
+      const policy = await resolvePolicy(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(config2.defaultFormId) ? config2.defaultFormId.trim() : "";
-      if (portalId && formGuid) {
+      const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
+      const tryFormsApi = policy.submissionMode !== "crm" && Boolean(portalId && formGuid);
+      if (tryFormsApi && portalId && formGuid) {
         try {
           const shape = await loadFormShape(apiKey, formGuid);
           const fields = filterToFormFields(
-            toHsFields({ ...stringProps(partition.accepted.contact ?? {}), email }),
+            toHsFields({ ...contactProps, email }),
             shape?.names ?? null
           );
           if (fields.length && !fields.some((f) => f.name === "email")) {
             fields.unshift({ name: "email", value: email });
           }
+          sentFieldNames = fields.map((f) => f.name);
           const submitted = await submitMarketingForm({
             apiKey,
             portalId,
@@ -2187,12 +2413,28 @@ function createFormsService(strapi, _opts = {}) {
         const result = await strapi.plugin("hubspot").service("submit").upsert({
           object: "contact",
           idProperty: "email",
-          properties: { ...partition.accepted.contact ?? {}, email }
+          properties: { ...contactProps, email }
         });
         if (result.ok) {
           hubspotSynced = true;
           contactId = result.id;
         }
+      } else if (policy.writeExtraProperties) {
+        const extra = leftoverContactProps(contactProps, sentFieldNames);
+        if (Object.keys(extra).length) {
+          try {
+            const result = await strapi.plugin("hubspot").service("submit").upsert({
+              object: "contact",
+              idProperty: "email",
+              properties: { ...extra, email }
+            });
+            if (result.ok) contactId = result.id ?? contactId;
+          } catch (err) {
+            strapi.log.warn(
+              `[hubspot] leftover contact properties failed (conversion OK) — ${err.message}`
+            );
+          }
+        }
       }
       const domain = corporateDomain(email);
       const companyProps = partition.accepted.company ?? {};
@@ -2491,7 +2733,32 @@ function createFormsAdminController(strapi) {
         documentId: ctx.params.documentId,
         locale: ctx.query.locale
       });
-      ctx.body = { ok: true };
+      const policy = await resolvePolicy(strapi);
+      let addedFields = [];
+      let syncWarning;
+      if (policy.syncFieldsOnPublish) {
+        const { apiKey } = await resolveApiKey(strapi);
+        const account = await resolveAccount(strapi);
+        const ownGuid = typeof entry.hubspotFormId === "string" ? entry.hubspotFormId.trim() : "";
+        const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
+        if (apiKey && formGuid) {
+          try {
+            addedFields = await syncFieldsToHubspotForm(
+              apiKey,
+              formGuid,
+              entry.definition ?? EMPTY_DEFINITION
+            );
+          } catch (err) {
+            syncWarning = err.message;
+            strapi.log.warn(`[hubspot] field sync on publish failed — ${syncWarning}`);
+          }
+        }
+      }
+      ctx.body = {
+        ok: true,
+        ...addedFields.length ? { addedFields } : {},
+        ...syncWarning ? { syncWarning } : {}
+      };
     },
     async unpublish(ctx) {
       await documents().unpublish({
@@ -2955,10 +3222,20 @@ const config = {
     //    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.
+    //  - submissionMode / writeExtraProperties / syncFieldsOnPublish: see
+    //    Settings → HubSpot; each install picks its HubSpot will.
     forms: {
       companyFromDomain: true,
       timelineNote: true,
       defaultFormId: "",
+      // How submissions reach HubSpot. `auto` = Forms API when a GUID is set,
+      // else CRM upsert. `crm` skips conversions. `forms` prefers the Forms API.
+      submissionMode: "auto",
+      // After a conversion, CRM-write mapped contact props the HubSpot form dropped.
+      writeExtraProperties: true,
+      // On publish, PATCH missing mapped contact fields onto the HubSpot form.
+      // Off by default: HubSpot-first installs must not have Strapi mutate forms.
+      syncFieldsOnPublish: false,
       // Per-IP brakes on the public routes; 0 disables one.
       rateLimit: { submitPerMinute: 6, searchPerMinute: 30 }
     }
@@ -3141,15 +3418,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);
     }
   })