strapi-plugin-hubspot 0.16.5 → 0.16.7

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## 0.16.7 — 2026-09-23
+
+### Fixed
+- Admin TypeScript build of 0.16.6 (test fixture `objectTypeId`). Same
+  legitimate-interest / company-field conversion fix.
+
+## 0.16.6 — 2026-09-23
+
+### Fixed
+- Native conversions against HubSpot forms that use **legitimate interest**
+  (not explicit consent) and **company fields** (`objectTypeId` `0-2`) were
+  refused by the Forms API, so only a CRM note appeared. The submit now sends
+  `legalConsentOptions.legitimateInterest` and the company properties the
+  marketing form actually declares.
+
 ## 0.16.5 — 2026-09-23
 
 ### Fixed

package/dist/server/index.js

@@ -1923,10 +1923,6 @@ function formsSubmitUrl(portalId, formGuid, region = "eu1") {
 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 ?? []) {
@@ -1936,20 +1932,42 @@ function formFieldNames(raw) {
   }
   return names;
 }
-function formRequiredNames(raw) {
-  const names = [];
+const OBJECT_BAG = {
+  "0-1": "contact",
+  "0-2": "company"
+};
+function formShapeFields(raw) {
+  const fields = [];
   for (const group of raw.fieldGroups ?? []) {
     for (const field of group.fields ?? []) {
-      if (field.name && field.required) names.push(field.name);
+      if (!field.name) continue;
+      fields.push({
+        name: field.name,
+        objectTypeId: field.objectTypeId?.trim() || "0-1",
+        required: Boolean(field.required)
+      });
     }
   }
-  return names;
+  return fields;
+}
+function fieldsForHubspotForm(bags, shape, extra = {}) {
+  const contact = { ...bags.contact ?? {}, ...extra };
+  if (!shape?.fields.length) {
+    return toHsFields(contact).map((field) => ({ ...field, objectTypeId: "0-1" }));
+  }
+  const out = [];
+  for (const field of shape.fields) {
+    const bagName = OBJECT_BAG[field.objectTypeId] || "contact";
+    const value = bags[bagName]?.[field.name] ?? contact[field.name];
+    if (!value) continue;
+    out.push({ name: field.name, value, objectTypeId: field.objectTypeId || "0-1" });
+  }
+  return out;
 }
 function parseFormShape(raw) {
   const legal = raw.legalConsentOptions;
-  const hasLegalConsent = Boolean(
-    legal && typeof legal === "object" && legal.type && legal.type !== "none"
-  );
+  const legalType = typeof legal?.type === "string" ? legal.type : void 0;
+  const hasLegalConsent = Boolean(legalType && legalType !== "none");
   const communications = [];
   for (const box of legal?.communicationsCheckboxes ?? []) {
     const id = Number(box.subscriptionTypeId ?? box.communicationTypeId);
@@ -1959,12 +1977,21 @@ function parseFormShape(raw) {
       text: String(box.label || box.text || "").trim() || "I agree to receive communications."
     });
   }
+  const subscriptionTypeIds = (legal?.subscriptionTypeIds ?? []).map((id) => Number(id)).filter((id) => Number.isFinite(id) && id > 0);
   const consentToProcessText = legal?.consentToProcessText?.trim();
+  const privacyText = legal?.privacyText?.trim();
+  const lawfulRaw = String(legal?.lawfulBasis || "").toUpperCase();
+  const fields = formShapeFields(raw);
   return {
-    names: new Set(formFieldNames(raw)),
-    required: new Set(formRequiredNames(raw)),
+    names: new Set(fields.map((field) => field.name)),
+    required: new Set(fields.filter((field) => field.required).map((field) => field.name)),
+    fields,
     hasLegalConsent,
-    captcha: raw.configuration?.captchaEnabled === true,
+    ...legalType ? { legalType } : {},
+    lawfulBasis: lawfulRaw.includes("CUSTOMER") ? "CUSTOMER" : "LEAD",
+    subscriptionTypeIds,
+    ...privacyText ? { privacyText } : {},
+    captcha: raw.configuration?.recaptchaEnabled === true || raw.configuration?.captchaEnabled === true,
     ...consentToProcessText ? { consentToProcessText } : {},
     communications
   };
@@ -1976,9 +2003,22 @@ function canRetryEmailOnly(required) {
 function buildLegalConsent(shape, given, fallbackText) {
   if (!given) return void 0;
   if (shape && !shape.hasLegalConsent) return void 0;
+  const fallback = fallbackText?.trim() || DEFAULT_CONSENT_TEXT;
+  if (shape?.legalType === "legitimate_interest") {
+    const subscriptionTypeId = shape.subscriptionTypeIds[0];
+    if (!subscriptionTypeId) return void 0;
+    return {
+      legitimateInterest: {
+        value: true,
+        subscriptionTypeId,
+        legalBasis: shape.lawfulBasis || "LEAD",
+        text: shape.privacyText?.trim() || fallback
+      }
+    };
+  }
   const consent = {
     consentToProcess: true,
-    text: shape?.consentToProcessText?.trim() || fallbackText?.trim() || DEFAULT_CONSENT_TEXT
+    text: shape?.consentToProcessText?.trim() || fallback
   };
   if (shape?.communications.length) {
     consent.communications = shape.communications.map((item) => ({
@@ -2500,12 +2540,16 @@ function createFormsService(strapi, _opts = {}) {
       if (tryFormsApi && portalId && formGuid) {
         try {
           const shape = await loadFormShape(apiKey, formGuid);
-          const fields = filterToFormFields(
-            toHsFields({ ...contactProps, email }),
-            shape?.names ?? null
+          const fields = fieldsForHubspotForm(
+            {
+              contact: contactProps,
+              company: stringProps(partition.accepted.company ?? {})
+            },
+            shape,
+            { email }
           );
           if (fields.length && !fields.some((f) => f.name === "email")) {
-            fields.unshift({ name: "email", value: email });
+            fields.unshift({ name: "email", value: email, objectTypeId: "0-1" });
           }
           sentFieldNames = fields.map((f) => f.name);
           const submitted = await submitMarketingForm({
@@ -2513,7 +2557,7 @@ function createFormsService(strapi, _opts = {}) {
             portalId,
             formGuid,
             region,
-            fields: fields.length ? fields : [{ name: "email", value: email }],
+            fields: fields.length ? fields : [{ name: "email", value: email, objectTypeId: "0-1" }],
             context: {
               hutk: sanitizeHutk(meta.hutk),
               pageUri: typeof meta.pageUrl === "string" ? meta.pageUrl : void 0,

package/dist/server/index.mjs

@@ -1922,10 +1922,6 @@ function formsSubmitUrl(portalId, formGuid, region = "eu1") {
 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 ?? []) {
@@ -1935,20 +1931,42 @@ function formFieldNames(raw) {
   }
   return names;
 }
-function formRequiredNames(raw) {
-  const names = [];
+const OBJECT_BAG = {
+  "0-1": "contact",
+  "0-2": "company"
+};
+function formShapeFields(raw) {
+  const fields = [];
   for (const group of raw.fieldGroups ?? []) {
     for (const field of group.fields ?? []) {
-      if (field.name && field.required) names.push(field.name);
+      if (!field.name) continue;
+      fields.push({
+        name: field.name,
+        objectTypeId: field.objectTypeId?.trim() || "0-1",
+        required: Boolean(field.required)
+      });
     }
   }
-  return names;
+  return fields;
+}
+function fieldsForHubspotForm(bags, shape, extra = {}) {
+  const contact = { ...bags.contact ?? {}, ...extra };
+  if (!shape?.fields.length) {
+    return toHsFields(contact).map((field) => ({ ...field, objectTypeId: "0-1" }));
+  }
+  const out = [];
+  for (const field of shape.fields) {
+    const bagName = OBJECT_BAG[field.objectTypeId] || "contact";
+    const value = bags[bagName]?.[field.name] ?? contact[field.name];
+    if (!value) continue;
+    out.push({ name: field.name, value, objectTypeId: field.objectTypeId || "0-1" });
+  }
+  return out;
 }
 function parseFormShape(raw) {
   const legal = raw.legalConsentOptions;
-  const hasLegalConsent = Boolean(
-    legal && typeof legal === "object" && legal.type && legal.type !== "none"
-  );
+  const legalType = typeof legal?.type === "string" ? legal.type : void 0;
+  const hasLegalConsent = Boolean(legalType && legalType !== "none");
   const communications = [];
   for (const box of legal?.communicationsCheckboxes ?? []) {
     const id = Number(box.subscriptionTypeId ?? box.communicationTypeId);
@@ -1958,12 +1976,21 @@ function parseFormShape(raw) {
       text: String(box.label || box.text || "").trim() || "I agree to receive communications."
     });
   }
+  const subscriptionTypeIds = (legal?.subscriptionTypeIds ?? []).map((id) => Number(id)).filter((id) => Number.isFinite(id) && id > 0);
   const consentToProcessText = legal?.consentToProcessText?.trim();
+  const privacyText = legal?.privacyText?.trim();
+  const lawfulRaw = String(legal?.lawfulBasis || "").toUpperCase();
+  const fields = formShapeFields(raw);
   return {
-    names: new Set(formFieldNames(raw)),
-    required: new Set(formRequiredNames(raw)),
+    names: new Set(fields.map((field) => field.name)),
+    required: new Set(fields.filter((field) => field.required).map((field) => field.name)),
+    fields,
     hasLegalConsent,
-    captcha: raw.configuration?.captchaEnabled === true,
+    ...legalType ? { legalType } : {},
+    lawfulBasis: lawfulRaw.includes("CUSTOMER") ? "CUSTOMER" : "LEAD",
+    subscriptionTypeIds,
+    ...privacyText ? { privacyText } : {},
+    captcha: raw.configuration?.recaptchaEnabled === true || raw.configuration?.captchaEnabled === true,
     ...consentToProcessText ? { consentToProcessText } : {},
     communications
   };
@@ -1975,9 +2002,22 @@ function canRetryEmailOnly(required) {
 function buildLegalConsent(shape, given, fallbackText) {
   if (!given) return void 0;
   if (shape && !shape.hasLegalConsent) return void 0;
+  const fallback = fallbackText?.trim() || DEFAULT_CONSENT_TEXT;
+  if (shape?.legalType === "legitimate_interest") {
+    const subscriptionTypeId = shape.subscriptionTypeIds[0];
+    if (!subscriptionTypeId) return void 0;
+    return {
+      legitimateInterest: {
+        value: true,
+        subscriptionTypeId,
+        legalBasis: shape.lawfulBasis || "LEAD",
+        text: shape.privacyText?.trim() || fallback
+      }
+    };
+  }
   const consent = {
     consentToProcess: true,
-    text: shape?.consentToProcessText?.trim() || fallbackText?.trim() || DEFAULT_CONSENT_TEXT
+    text: shape?.consentToProcessText?.trim() || fallback
   };
   if (shape?.communications.length) {
     consent.communications = shape.communications.map((item) => ({
@@ -2499,12 +2539,16 @@ function createFormsService(strapi, _opts = {}) {
       if (tryFormsApi && portalId && formGuid) {
         try {
           const shape = await loadFormShape(apiKey, formGuid);
-          const fields = filterToFormFields(
-            toHsFields({ ...contactProps, email }),
-            shape?.names ?? null
+          const fields = fieldsForHubspotForm(
+            {
+              contact: contactProps,
+              company: stringProps(partition.accepted.company ?? {})
+            },
+            shape,
+            { email }
           );
           if (fields.length && !fields.some((f) => f.name === "email")) {
-            fields.unshift({ name: "email", value: email });
+            fields.unshift({ name: "email", value: email, objectTypeId: "0-1" });
           }
           sentFieldNames = fields.map((f) => f.name);
           const submitted = await submitMarketingForm({
@@ -2512,7 +2556,7 @@ function createFormsService(strapi, _opts = {}) {
             portalId,
             formGuid,
             region,
-            fields: fields.length ? fields : [{ name: "email", value: email }],
+            fields: fields.length ? fields : [{ name: "email", value: email, objectTypeId: "0-1" }],
             context: {
               hutk: sanitizeHutk(meta.hutk),
               pageUri: typeof meta.pageUrl === "string" ? meta.pageUrl : void 0,

package/dist/server/src/hsforms.d.ts

@@ -23,13 +23,9 @@ export declare function toHsFields(props: Record<string, string>): {
     name: string;
     value: string;
 }[];
-export declare function filterToFormFields(fields: {
+export declare function filterToFormFields<T extends {
     name: string;
-    value: string;
-}[], allowed: Set<string> | null): {
-    name: string;
-    value: string;
-}[];
+}>(fields: T[], allowed: Set<string> | null): T[];
 export declare function formFieldNames(raw: {
     fieldGroups?: {
         fields?: {
@@ -50,26 +46,56 @@ export interface CommunicationConsent {
     subscriptionTypeId: number;
     text: string;
 }
+export interface FormShapeField {
+    name: string;
+    objectTypeId: string;
+    required: boolean;
+}
 export interface FormShape {
     names: Set<string>;
     required: Set<string>;
+    fields: FormShapeField[];
     hasLegalConsent: boolean;
+    legalType?: string;
+    lawfulBasis?: "LEAD" | "CUSTOMER";
+    subscriptionTypeIds: number[];
+    privacyText?: string;
     captcha: boolean;
     consentToProcessText?: string;
     communications: CommunicationConsent[];
 }
+export declare function formShapeFields(raw: {
+    fieldGroups?: {
+        fields?: {
+            name?: string;
+            required?: boolean;
+            objectTypeId?: string;
+        }[];
+    }[];
+}): FormShapeField[];
+/** Values HubSpot declared on the marketing form, with the right objectTypeId. */
+export declare function fieldsForHubspotForm(bags: Record<string, Record<string, string>>, shape: FormShape | null | undefined, extra?: Record<string, string>): {
+    name: string;
+    value: string;
+    objectTypeId: string;
+}[];
 export declare function parseFormShape(raw: {
     fieldGroups?: {
         fields?: {
             name?: string;
             required?: boolean;
+            objectTypeId?: string;
         }[];
     }[];
     configuration?: {
         captchaEnabled?: boolean;
+        recaptchaEnabled?: boolean;
     };
     legalConsentOptions?: {
         type?: string;
+        lawfulBasis?: string;
+        privacyText?: string;
+        subscriptionTypeIds?: (number | string)[];
         consentToProcessText?: string;
         communicationsCheckboxes?: {
             label?: string;
@@ -81,7 +107,7 @@ export declare function parseFormShape(raw: {
 }): FormShape;
 /** Email-only retry is only safe when HubSpot doesn't require other fields. */
 export declare function canRetryEmailOnly(required: Iterable<string> | undefined): boolean;
-export declare function buildLegalConsent(shape: Pick<FormShape, "hasLegalConsent" | "communications" | "consentToProcessText"> | null | undefined, given: boolean, fallbackText?: string): Record<string, unknown> | undefined;
+export declare function buildLegalConsent(shape: Pick<FormShape, "hasLegalConsent" | "legalType" | "lawfulBasis" | "subscriptionTypeIds" | "privacyText" | "communications" | "consentToProcessText"> | null | undefined, given: boolean, fallbackText?: string): Record<string, unknown> | undefined;
 export interface FormSubmitContext {
     hutk?: string;
     pageUri?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-hubspot",
-  "version": "0.16.5",
+  "version": "0.16.7",
   "description": "The form builder for HubSpot in Strapi — multi-step forms with conditional fields mapped to real CRM properties, a public submit pipeline with retries, and save-time mapping validation.",
   "keywords": [
     "strapi",