strapi-plugin-hubspot 0.14.0 → 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);
@@ -2137,10 +2204,11 @@ 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 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(config2.defaultFormId) ? config2.defaultFormId.trim() : "";
+      const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
       if (portalId && formGuid) {
         try {
           const shape = await loadFormShape(apiKey, formGuid);
@@ -3141,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);
     }
   })

package/dist/server/index.mjs

@@ -158,6 +158,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" }) ?? {};
@@ -166,6 +169,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" };
@@ -175,14 +185,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);
@@ -2136,10 +2203,11 @@ 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 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(config2.defaultFormId) ? config2.defaultFormId.trim() : "";
+      const formGuid = isFormGuid(ownGuid) ? ownGuid : isFormGuid(account.defaultFormId) ? account.defaultFormId.trim() : "";
       if (portalId && formGuid) {
         try {
           const shape = await loadFormShape(apiKey, formGuid);
@@ -3140,15 +3208,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);
     }
   })

package/dist/server/src/__tests__/settings.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -50,6 +50,7 @@ declare const _default: {
                 };
                 attributes: {
                     name: {
+                        /** RBAC action gating the settings screen and its routes. */
                         type: string;
                         required: boolean;
                         pluginOptions: {
@@ -358,8 +359,11 @@ declare const _default: {
             }): Promise<void>;
             update(ctx: {
                 request: {
-                    body: {
+                    body?: {
                         apiKey?: string;
+                        portalId?: string;
+                        region?: string;
+                        defaultFormId?: string;
                     };
                 };
                 body: unknown;

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

@@ -1,28 +1,59 @@
 import type { Core } from "@strapi/strapi";
 /**
- * API key resolution, in order of precedence:
+ * API key + portal resolution, in order of precedence:
  *  1. saved from the admin UI (plugin core store)
  *  2. plugin config (config/plugins of the host app)
- *  3. environment variable (HUBSPOT_API_KEY)
+ *  3. environment variable
  *
  * The key is only ever read server-side; `publicSettings` is what the admin UI
- * receives, and it deliberately never carries the key itself.
+ * receives, and it deliberately never carries the key itself. Portal id, region
+ * and the default form GUID are not secrets — they round-trip so they can be
+ * edited in Settings → HubSpot.
  */
 export declare const ENV_VAR = "HUBSPOT_API_KEY";
+export declare const ENV_PORTAL = "HUBSPOT_PORTAL_ID";
+export declare const ENV_REGION = "HUBSPOT_REGION";
+export declare const ENV_DEFAULT_FORM = "HUBSPOT_DEFAULT_FORM_ID";
+export type SettingSource = "settings" | "config" | "env" | null;
 export interface StoredSettings {
     apiKey?: string;
+    portalId?: string;
+    region?: string;
+    defaultFormId?: string;
 }
 export interface PublicSettings {
     configured: boolean;
     /** Where the key comes from, so the UI can explain why it can't be edited. */
-    keySource: "settings" | "config" | "env" | null;
+    keySource: SettingSource;
     /** Last four characters, enough to recognise a key without exposing it. */
     hint: string;
+    portalId: string;
+    region: string;
+    defaultFormId: string;
+    portalSource: SettingSource;
+    regionSource: SettingSource;
+    formSource: SettingSource;
+}
+export interface HubspotAccount {
+    portalId: string;
+    region: string;
+    defaultFormId: string;
 }
 export declare function getStoredSettings(strapi: Core.Strapi): Promise<StoredSettings>;
 export declare function setStoredSettings(strapi: Core.Strapi, value: StoredSettings | null): Promise<void>;
 export declare function resolveApiKey(strapi: Core.Strapi): Promise<{
     apiKey: string;
-    source: PublicSettings["keySource"];
+    source: SettingSource;
 }>;
+/** Portal / region / default marketing form — settings UI overrides env. */
+export declare function resolveAccount(strapi: Core.Strapi): Promise<HubspotAccount>;
 export declare function publicSettings(strapi: Core.Strapi): Promise<PublicSettings>;
+/** Merge a PATCH-like body into the store without dropping the saved key. */
+export declare function patchStoredSettings(strapi: Core.Strapi, body: {
+    apiKey?: string;
+    portalId?: unknown;
+    region?: unknown;
+    defaultFormId?: unknown;
+}): Promise<void>;
+/** Drop only the stored token; portal / form settings stay. */
+export declare function clearStoredApiKey(strapi: Core.Strapi): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-hubspot",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "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",