nodebb-plugin-calendar-onekite 11.1.21 → 11.1.22

package/lib/admin.js

@@ -176,7 +176,10 @@ admin.debugHelloAsso = async function (req, res) {
     ok: true,
     settings: safeSettings,
     token: { ok: false },
-    items: { ok: false, count: 0, sample: [] },
+    // Catalog = what you actually want for a shop (available products/material)
+    catalog: { ok: false, count: 0, sample: [], keys: [] },
+    // Sold items = items present in orders (can be 0 if no sales yet)
+    soldItems: { ok: false, count: 0, sample: [] },
   };
 
   try {
@@ -191,6 +194,30 @@ admin.debugHelloAsso = async function (req, res) {
     }
     out.token = { ok: true };
 
+    // Catalog items (via /public)
+    try {
+      const { publicForm, items } = await helloasso.listCatalogItems({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug: settings.helloassoFormSlug,
+      });
+
+      const arr = Array.isArray(items) ? items : [];
+      out.catalog.ok = true;
+      out.catalog.count = arr.length;
+      out.catalog.keys = publicForm && typeof publicForm === 'object' ? Object.keys(publicForm) : [];
+      out.catalog.sample = arr.slice(0, 10).map((it) => ({
+        id: it.id,
+        name: it.name,
+        price: it.price ?? null,
+      }));
+    } catch (e) {
+      out.catalog = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [], keys: [] };
+    }
+
+    // Sold items
     try {
       const items = await helloasso.listItems({
         env,
@@ -200,15 +227,15 @@ admin.debugHelloAsso = async function (req, res) {
         formSlug: settings.helloassoFormSlug,
       });
       const arr = Array.isArray(items) ? items : [];
-      out.items.ok = true;
-      out.items.count = arr.length;
-      out.items.sample = arr.slice(0, 10).map((it) => ({
+      out.soldItems.ok = true;
+      out.soldItems.count = arr.length;
+      out.soldItems.sample = arr.slice(0, 10).map((it) => ({
         id: it.id || it.itemId || it.reference || it.name,
         name: it.name || it.label || it.itemName,
         price: it.price || it.amount || it.unitPrice || null,
       }));
     } catch (e) {
-      out.items = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [] };
+      out.soldItems = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [] };
     }
 
     return res.json(out);

package/lib/api.js

@@ -72,7 +72,9 @@ api.getItems = async function (req, res) {
     return res.json([]);
   }
 
-  const items = await helloasso.listItems({
+  // Important: the /items endpoint on HelloAsso lists *sold items*.
+  // For a shop catalog, use the /public form endpoint and extract the catalog.
+  const { items: catalog } = await helloasso.listCatalogItems({
     env,
     token,
     organizationSlug: settings.helloassoOrganizationSlug,
@@ -80,11 +82,10 @@ api.getItems = async function (req, res) {
     formSlug: settings.helloassoFormSlug,
   });
 
-  // Normalize minimal fields for client
-  const normalized = (items || []).map((it) => ({
-    id: it.id || it.itemId || it.reference || it.name,
-    name: it.name || it.label || `Item ${it.id || ''}`,
-    price: it.price || it.amount || it.unitPrice || 0,
+  const normalized = (catalog || []).map((it) => ({
+    id: it.id,
+    name: it.name,
+    price: typeof it.price === 'number' ? it.price : 0,
   })).filter(it => it.id && it.name);
 
   res.json(normalized);

package/lib/helloasso.js

@@ -95,18 +95,89 @@ async function getAccessToken({ env, clientId, clientSecret }) {
 
 async function listItems({ env, token, organizationSlug, formType, formSlug }) {
   if (!token || !organizationSlug || !formType || !formSlug) return [];
-  const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/items?pageIndex=1&pageSize=200`;
+  // This endpoint returns *sold items* (i.e., items present in orders). If your shop has
+  // no sales yet, it will legitimately return an empty list.
+  const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/forms/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/items?pageIndex=1&pageSize=200`;
   const { status, json } = await requestJson('GET', url, { Authorization: `Bearer ${token}` });
   if (status >= 200 && status < 300 && json) {
-    // HelloAsso returns { data: [...] } in many endpoints
-    return json.data || json.items || json || [];
+    return json.data || json.items || [];
   }
   return [];
 }
 
-async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail }) {
+async function getFormPublic({ env, token, organizationSlug, formType, formSlug }) {
   if (!token || !organizationSlug || !formType || !formSlug) return null;
-  const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/checkout-intents`;
+  // Public form details contains extraOptions/customFields and (for Shop) usually the catalog structure.
+  const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/forms/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/public`;
+  const { status, json } = await requestJson('GET', url, { Authorization: `Bearer ${token}` });
+  if (status >= 200 && status < 300) {
+    return json || null;
+  }
+  return null;
+}
+
+function extractCatalogItems(publicFormJson) {
+  if (!publicFormJson || typeof publicFormJson !== 'object') return [];
+
+  // Try a few common shapes used in HelloAsso "public" form responses.
+  const candidates = [];
+  const pushArr = (arr) => {
+    if (Array.isArray(arr)) candidates.push(...arr);
+  };
+
+  pushArr(publicFormJson.items);
+  pushArr(publicFormJson.tiers);
+  pushArr(publicFormJson.products);
+  pushArr(publicFormJson.data);
+  if (publicFormJson.form) {
+    pushArr(publicFormJson.form.items);
+    pushArr(publicFormJson.form.tiers);
+    pushArr(publicFormJson.form.products);
+  }
+
+  // Some responses nest in "campaign" or "publicForm".
+  if (publicFormJson.publicForm) {
+    pushArr(publicFormJson.publicForm.items);
+    pushArr(publicFormJson.publicForm.tiers);
+    pushArr(publicFormJson.publicForm.products);
+  }
+  if (publicFormJson.campaign) {
+    pushArr(publicFormJson.campaign.items);
+    pushArr(publicFormJson.campaign.tiers);
+    pushArr(publicFormJson.campaign.products);
+  }
+
+  // Normalize to { id, name, price }
+  return candidates
+    .map((it) => {
+      if (!it || typeof it !== 'object') return null;
+      const id = it.id ?? it.itemId ?? it.tierId;
+      const name = it.name ?? it.label ?? it.title;
+      const price =
+        (it.amount && (it.amount.total ?? it.amount.value)) ??
+        it.price ??
+        it.unitPrice ??
+        it.totalAmount ??
+        it.initialAmount;
+      if (!id || !name) return null;
+      return { id, name, price: typeof price === 'number' ? price : 0, raw: it };
+    })
+    .filter(Boolean);
+}
+
+async function listCatalogItems({ env, token, organizationSlug, formType, formSlug }) {
+  const publicForm = await getFormPublic({ env, token, organizationSlug, formType, formSlug });
+  const extracted = extractCatalogItems(publicForm);
+  return {
+    publicForm,
+    items: extracted.map(({ id, name, price, raw }) => ({ id, name, price, raw })),
+  };
+}
+
+async function createCheckoutIntent({ env, token, organizationSlug, formType, formSlug, totalAmount, payerEmail }) {
+  if (!token || !organizationSlug) return null;
+  // Checkout intents are created at organization level.
+  const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(organizationSlug)}/checkout-intents`;
   const payload = {
     totalAmount: totalAmount,
     initialAmount: totalAmount,
@@ -125,5 +196,8 @@ async function createCheckoutIntent({ env, token, organizationSlug, formType, fo
 module.exports = {
   getAccessToken,
   listItems,
+  getFormPublic,
+  extractCatalogItems,
+  listCatalogItems,
   createCheckoutIntent,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.21",
+  "version": "11.1.22",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",