nodebb-plugin-onekite-calendar 1.0.25 → 1.0.27

package/lib/admin.js

@@ -41,11 +41,8 @@ async function sendEmail(template, uid, subject, data) {
   try {
     if (typeof emailer.send !== 'function') return;
     // NodeBB 4.x: send(template, uid, params)
-    if (emailer.send.length >= 3) {
-      await emailer.send(template, toUid, params);
-    } else {
-      await emailer.send(template, toUid);
-    }
+    // Do NOT branch on function.length (unreliable once wrapped/bound).
+    await emailer.send(template, toUid, params);
   } catch (err) {
     console.warn('[calendar-onekite] Failed to send email', {
       template,
@@ -162,11 +159,11 @@ admin.approveReservation = async function (req, res) {
       // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
       callbackUrl: returnUrl,
       webhookUrl: webhookUrl,
-      itemName: buildHelloAssoItemName('Réservation matériel Onekite', Array.isArray(r.itemNames) ? r.itemNames : [], r.start, r.end),
+      itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
       containsDonation: false,
       metadata: {
         reservationId: String(rid),
-        items: (Array.isArray(r.itemNames) ? r.itemNames : []).filter(Boolean),
+        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       },
     });
@@ -199,8 +196,8 @@ admin.approveReservation = async function (req, res) {
       await sendEmail('calendar-onekite_approved', requesterUid, 'Location matériel - Réservation validée', {
         uid: requesterUid,
         username: requester && requester.username ? requester.username : '',
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentUrl: paymentUrl || '',
         pickupAddress: r.pickupAddress || '',
@@ -235,8 +232,8 @@ admin.refuseReservation = async function (req, res) {
       await sendEmail('calendar-onekite_refused', requesterUid, 'Location matériel - Réservation refusée', {
         uid: requesterUid,
         username: requester && requester.username ? requester.username : '',
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         start: formatFR(r.start),
         end: formatFR(r.end),
@@ -419,7 +416,7 @@ admin.getAccounting = async function (req, res) {
 
     const itemNames = Array.isArray(r.itemNames) && r.itemNames.length
       ? r.itemNames
-      : [];
+      : (r.itemName ? [r.itemName] : []);
 
     const total = Number(r.total) || 0;
     const startDate = formatFR(r.start);

package/lib/api.js

@@ -123,12 +123,11 @@ async function sendEmail(template, uid, subject, data) {
 
   try {
     if (typeof emailer.send !== 'function') return;
-    // NodeBB: send(template, uid, params)
-    if (emailer.send.length >= 3) {
-      await emailer.send(template, toUid, params);
-    } else {
-      await emailer.send(template, toUid);
-    }
+    // NodeBB 4.x: send(template, uid, params)
+    // NOTE: Do NOT branch on function.length: it is unreliable once the function
+    // is wrapped/bound (common in production builds) and can lead to params being
+    // dropped, resulting in empty email bodies and missing subjects.
+    await emailer.send(template, toUid, params);
   } catch (err) {
     // eslint-disable-next-line no-console
     console.warn('[calendar-onekite] Failed to send email', { template, uid: toUid, err: String((err && err.message) || err) });
@@ -328,18 +327,15 @@ function eventsFor(resv) {
   const startIsoDate = new Date(parseInt(resv.start, 10)).toISOString().slice(0, 10);
   const endIsoDate = new Date(parseInt(resv.end, 10)).toISOString().slice(0, 10);
 
-  const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds.filter(Boolean) : [];
-  const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames.filter(Boolean) : [];
+  const itemIds = Array.isArray(resv.itemIds) ? resv.itemIds : (resv.itemId ? [resv.itemId] : []);
+  const itemNames = Array.isArray(resv.itemNames) ? resv.itemNames : (resv.itemName ? [resv.itemName] : []);
 
   // One line = one material: return one calendar event per item
-  if (!itemIds.length && !itemNames.length) {
-    return [];
-  }
   const out = [];
-  const count = Math.max(itemIds.length, itemNames.length);
+  const count = Math.max(itemIds.length, itemNames.length, 1);
   for (let i = 0; i < count; i++) {
-    const itemId = String(itemIds[i] || itemIds[0] || i);
-    const itemName = String(itemNames[i] || itemNames[0] || itemId);
+    const itemId = String(itemIds[i] || itemIds[0] || resv.itemId || '');
+    const itemName = String(itemNames[i] || itemNames[0] || resv.itemName || itemId);
     out.push({
       // keep id unique per item for FullCalendar, but keep the real rid in extendedProps.rid
       id: `${resv.rid}:${itemId || i}`,
@@ -356,14 +352,15 @@ function eventsFor(resv) {
         uid: resv.uid,
         approvedBy: resv.approvedBy || 0,
         approvedByUsername: resv.approvedByUsername || '',
-        itemIds: itemIds,
-        itemNames: itemNames,
+        itemIds: itemIds.filter(Boolean),
+        itemNames: itemNames.filter(Boolean),
         itemIdLine: itemId,
         itemNameLine: itemName,
       },
     });
   }
   return out;
+}
 
 function eventsForSpecial(ev) {
   const start = new Date(parseInt(ev.start, 10));
@@ -533,8 +530,8 @@ api.getReservationDetails = async function (req, res) {
     status: r.status,
     uid: r.uid,
     username: r.username || '',
-    itemNames: Array.isArray(r.itemNames) ? r.itemNames : [],
-    itemIds: Array.isArray(r.itemIds) ? r.itemIds : [],
+    itemNames: Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : []),
+    itemIds: Array.isArray(r.itemIds) ? r.itemIds : (r.itemId ? [r.itemId] : []),
     start: r.start,
     end: r.end,
     approvedByUsername: r.approvedByUsername || '',
@@ -698,9 +695,9 @@ api.createReservation = async function (req, res) {
     return res.status(400).json({ error: "bad-dates" });
   }
 
-  // NodeBB 4.x only: require modern payload
-  const itemIds = Array.isArray(req.body.itemIds) ? req.body.itemIds.map(String) : [];
-  const itemNames = Array.isArray(req.body.itemNames) ? req.body.itemNames.map(String) : [];
+  // Support both legacy single itemId and new itemIds[] payload
+  const itemIds = Array.isArray(req.body.itemIds) ? req.body.itemIds.map(String) : ((req.body.itemId ? [String(req.body.itemId)] : []));
+  const itemNames = Array.isArray(req.body.itemNames) ? req.body.itemNames.map(String) : (req.body.itemName ? [String(req.body.itemName)] : []);
 
   const total = typeof req.body.total === 'number' ? req.body.total : parseFloat(String(req.body.total || '0'));
 
@@ -719,7 +716,7 @@ api.createReservation = async function (req, res) {
     const exStart = parseInt(existing.start, 10);
     const exEnd = parseInt(existing.end, 10);
     if (!(exStart < end && start < exEnd)) continue;
-    const exItemIds = Array.isArray(existing.itemIds) ? existing.itemIds : [];
+    const exItemIds = Array.isArray(existing.itemIds) ? existing.itemIds : (existing.itemId ? [existing.itemId] : []);
     const shared = exItemIds.filter(x => itemIds.includes(String(x)));
     if (shared.length) {
       conflicts.push({ rid: existing.rid, itemIds: shared, status: existing.status });
@@ -744,6 +741,9 @@ api.createReservation = async function (req, res) {
     username: username || null,
     itemIds,
     itemNames: itemNames.length ? itemNames : itemIds,
+    // keep legacy fields for backward compatibility
+    itemId: itemIds[0],
+    itemName: (itemNames[0] || itemIds[0]),
     start,
     end,
     status: 'pending',
@@ -754,35 +754,51 @@ api.createReservation = async function (req, res) {
   // Save
   await dbLayer.saveReservation(resv);
 
-  // Notify groups by email (NodeBB 4.x, UID-only)
+  // Notify groups by email (NodeBB emailer config)
   try {
-    const notifyGroups = String(settings.notifyGroups || '')
-      .split(/[\n,;]+/)
-      .map(s => s.trim())
-      .filter(Boolean);
-
+    const notifyGroups = (settings.notifyGroups || '').split(',').map(s => s.trim()).filter(Boolean);
     if (notifyGroups.length) {
-      const requester = await user.getUserFields(uid, ['username']);
-      const itemsLabel = (itemNames && itemNames.length ? itemNames : itemIds).join(', ');
-
+      const requester = await user.getUserFields(uid, ['username', 'email']);
+      const itemsLabel = (resv.itemNames || []).join(', ');
       for (const g of notifyGroups) {
         const members = await getMembersByGroupIdentifier(g);
         const uids = normalizeUids(members);
 
-        for (const memberUid of uids) {
+        // Batch fetch user email/username when supported by this NodeBB version.
+        let usersData = [];
+        try {
+          if (typeof user.getUsersFields === 'function') {
+            usersData = await user.getUsersFields(uids, ['username', 'email']);
+            // Some NodeBB versions omit uid in returned rows; re-attach it from input order.
+            if (Array.isArray(usersData)) {
+              usersData = usersData.map((row, idx) => (row ? Object.assign({ uid: uids[idx] }, row) : null));
+            }
+          } else {
+            usersData = await Promise.all(uids.map(async (memberUid) => {
+              try { return await user.getUserFields(memberUid, ['username', 'email']); }
+              catch (e) { return null; }
+            }));
+          }
+        } catch (e) {
+          usersData = [];
+        }
+
+        for (const md of (usersData || [])) {
+          const memberUid = md && (md.uid || md.userId || md.userid || md.user_id);
           const u = parseInt(memberUid, 10);
-          if (!Number.isInteger(u) || u <= 0) continue;
-
-          await sendEmail('calendar-onekite_pending', u, 'Location matériel - Demande de réservation', {
-            uid: u,
-            requester: requester && requester.username ? requester.username : '',
-            itemName: itemsLabel,
-            itemNames: (itemNames && itemNames.length ? itemNames : itemIds),
-            dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
-            start: formatFR(start),
-            end: formatFR(end),
-            total: resv.total || 0,
-          });
+          if (Number.isInteger(u) && u > 0) {
+            await sendEmail('calendar-onekite_pending', u, 'Location matériel - Demande de réservation', {
+              uid: u,
+              username: md && md.username ? md.username : '',
+              requester: requester.username,
+              itemName: itemsLabel,
+              itemNames: resv.itemNames || [],
+              dateRange: `Du ${formatFR(start)} au ${formatFR(end)}`,
+              start: formatFR(start),
+              end: formatFR(end),
+              total: resv.total || 0,
+            });
+          }
         }
       }
     }
@@ -796,8 +812,8 @@ api.createReservation = async function (req, res) {
       rid: resv.rid,
       uid: resv.uid,
       username: resv.username || '',
-      itemIds: itemIds || [],
-      itemNames: itemNames || [],
+      itemIds: resv.itemIds || [],
+      itemNames: resv.itemNames || [],
       start: resv.start,
       end: resv.end,
       status: resv.status,
@@ -821,7 +837,8 @@ api.approveReservation = async function (req, res) {
   if (r.status !== 'pending') return res.status(400).json({ error: 'bad-status' });
 
   r.status = 'awaiting_payment';
-  r.pickupAddress = String((req.body && req.body.pickupAddress) || '').trim();
+  // Backwards compatible: old clients sent `adminNote` to describe the pickup place.
+  r.pickupAddress = String((req.body && (req.body.pickupAddress || req.body.adminNote)) || '').trim();
   r.notes = String((req.body && req.body.notes) || '').trim();
   r.pickupTime = String((req.body && req.body.pickupTime) || '').trim();
   r.pickupLat = String((req.body && req.body.pickupLat) || '').trim();
@@ -861,11 +878,11 @@ api.approveReservation = async function (req, res) {
       // Can be overridden via ACP setting `helloassoCallbackUrl`.
       callbackUrl: normalizeReturnUrl(meta),
       webhookUrl: normalizeCallbackUrl(settings2.helloassoCallbackUrl, meta),
-      itemName: buildHelloAssoItemName('', Array.isArray(r.itemNames) ? r.itemNames : [], r.start, r.end),
+      itemName: buildHelloAssoItemName('', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
       containsDonation: false,
       metadata: {
         reservationId: String(rid),
-        items: (Array.isArray(r.itemNames) ? r.itemNames : []).filter(Boolean),
+        items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       },
     });
@@ -897,8 +914,8 @@ api.approveReservation = async function (req, res) {
     await sendEmail('calendar-onekite_approved', requesterUid, 'Location matériel - Réservation validée', {
       uid: requesterUid,
       username: requester && requester.username ? requester.username : '',
-      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       start: formatFR(r.start),
       end: formatFR(r.end),
@@ -938,8 +955,8 @@ api.refuseReservation = async function (req, res) {
     await sendEmail('calendar-onekite_refused', requesterUid2, 'Location matériel - Demande de réservation', {
       uid: requesterUid2,
       username: requester && requester.username ? requester.username : '',
-      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+      itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
       start: formatFR(r.start),
       end: formatFR(r.end),
@@ -1000,6 +1017,4 @@ api.cancelReservation = async function (req, res) {
   return res.json({ ok: true, status: 'cancelled' });
 };
 
-module.exports = api;
-
-}
+module.exports = api;

package/lib/helloassoWebhook.js

@@ -32,11 +32,9 @@ async function sendEmail(template, uid, subject, data) {
     if (typeof emailer.send !== 'function') return;
     const params = Object.assign({}, data || {}, subject ? { subject } : {});
     // NodeBB 4.x: send(template, uid, params)
-    if (emailer.send.length >= 3) {
-      await emailer.send(template, toUid, params);
-    } else {
-      await emailer.send(template, toUid);
-    }
+    // Do NOT branch on function.length: it is unreliable once wrapped/bound and
+    // can lead to params being dropped (empty email bodies / missing subjects).
+    await emailer.send(template, toUid, params);
   } catch (err) {
     // eslint-disable-next-line no-console
     console.warn('[calendar-onekite] Failed to send email (webhook)', { template, uid: toUid, err: String((err && err.message) || err) });
@@ -330,8 +328,8 @@ async function handler(req, res, next) {
       await sendEmail('calendar-onekite_paid', requesterUid, 'Location matériel - Paiement reçu', {
         uid: requesterUid,
         username: requester && requester.username ? requester.username : '',
-        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+        itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+        itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentReceiptUrl: r.paymentReceiptUrl || '',
       });
@@ -343,8 +341,8 @@ async function handler(req, res, next) {
         rid: r.rid,
         uid: r.uid,
         username: (requester && requester.username) ? requester.username : (r.username || ''),
-        itemIds: Array.isArray(r.itemIds) ? r.itemIds : [],
-        itemNames: Array.isArray(r.itemNames) ? r.itemNames : [],
+        itemIds: r.itemIds || (r.itemId ? [r.itemId] : []),
+        itemNames: r.itemNames || (r.itemName ? [r.itemName] : []),
         start: r.start,
         end: r.end,
         status: r.status,

package/lib/scheduler.js

@@ -66,12 +66,9 @@ async function processAwaitingPayment() {
 
     try {
       if (typeof emailer.send !== 'function') return;
-      // NodeBB: send(template, uid, params)
-      if (emailer.send.length >= 3) {
-        await emailer.send(template, toUid, params);
-      } else {
-        await emailer.send(template, toUid);
-      }
+      // NodeBB 4.x: send(template, uid, params)
+      // Do NOT branch on function.length (unreliable once wrapped/bound).
+      await emailer.send(template, toUid, params);
     } catch (err) {
       // eslint-disable-next-line no-console
       console.warn('[calendar-onekite] Failed to send email (scheduler)', {
@@ -118,8 +115,8 @@ async function processAwaitingPayment() {
         await sendEmail('calendar-onekite_reminder', toUid, 'Location matériel - Rappel', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           paymentUrl: r.paymentUrl || '',
           delayMinutes: holdMins,
@@ -152,8 +149,8 @@ async function processAwaitingPayment() {
         await sendEmail('calendar-onekite_expired', toUid, 'Location matériel - Rappel', {
           uid: toUid,
           username: (u && u.username) ? u.username : '',
-          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : ''),
-          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : []),
+          itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
+          itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           delayMinutes: holdMins,
         });

package/library.js

@@ -20,26 +20,6 @@ const Plugin = {};
 const isFn = (fn) => typeof fn === 'function';
 const mw = (...fns) => fns.filter(isFn);
 
-// Express throws during route registration if any callback is undefined.
-// To keep NodeBB bootable and surface a clearer error, we wrap handlers and
-// provide a deterministic 500 handler when a target function is missing.
-function safeHandler(fn, name) {
-  if (typeof fn !== 'function') {
-    return function missingHandler(req, res) {
-      // eslint-disable-next-line no-console
-      console.error(`[calendar-onekite] Missing route handler: ${name}`);
-      return res.status(500).json({ error: 'missing-handler', handler: name });
-    };
-  }
-  return async function wrappedHandler(req, res, next) {
-    try {
-      return await fn(req, res, next);
-    } catch (err) {
-      return next(err);
-    }
-  };
-}
-
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
@@ -78,43 +58,44 @@ Plugin.init = async function (params) {
   // Page routes (HTML)
   // IMPORTANT: pass an ARRAY for middlewares (even if empty), otherwise
   // setupPageRoute will throw "middlewares is not iterable".
-  routeHelpers.setupPageRoute(router, '/calendar', mw(), safeHandler(controllers.renderCalendar, 'controllers.renderCalendar'));
-  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/calendar-onekite', mw(), safeHandler(admin.renderAdmin, 'admin.renderAdmin'));
+  routeHelpers.setupPageRoute(router, '/calendar', mw(), controllers.renderCalendar);
+  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/calendar-onekite', mw(), admin.renderAdmin);
 
   // Public API (JSON) — NodeBB 4.x only (v3 API)
-  router.get('/api/v3/plugins/calendar-onekite/events', ...publicExpose, safeHandler(api.getEvents, 'api.getEvents'));
-  router.get('/api/v3/plugins/calendar-onekite/items', ...publicExpose, safeHandler(api.getItems, 'api.getItems'));
-  router.get('/api/v3/plugins/calendar-onekite/capabilities', ...publicExpose, safeHandler(api.getCapabilities, 'api.getCapabilities'));
+  router.get('/api/v3/plugins/calendar-onekite/events', ...publicExpose, api.getEvents);
+  router.get('/api/v3/plugins/calendar-onekite/items', ...publicExpose, api.getItems);
+  router.get('/api/v3/plugins/calendar-onekite/capabilities', ...publicExpose, api.getCapabilities);
 
-  router.post('/api/v3/plugins/calendar-onekite/reservations', ...publicExpose, safeHandler(api.createReservation, 'api.createReservation'));
-  router.get('/api/v3/plugins/calendar-onekite/reservations/:rid', ...publicExpose, safeHandler(api.getReservationDetails, 'api.getReservationDetails'));
-  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/approve', ...publicExpose, safeHandler(api.approveReservation, 'api.approveReservation'));
-  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', ...publicExpose, safeHandler(api.refuseReservation, 'api.refuseReservation'));
-  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/cancel', ...publicExpose, safeHandler(api.cancelReservation, 'api.cancelReservation'));
+  router.post('/api/v3/plugins/calendar-onekite/reservations', ...publicExpose, api.createReservation);
+  router.get('/api/v3/plugins/calendar-onekite/reservations/:rid', ...publicExpose, api.getReservationDetails);
+  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/approve', ...publicExpose, api.approveReservation);
+  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', ...publicExpose, api.refuseReservation);
+  router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/cancel', ...publicExpose, api.cancelReservation);
 
-  router.post('/api/v3/plugins/calendar-onekite/special-events', ...publicExpose, safeHandler(api.createSpecialEvent, 'api.createSpecialEvent'));
-  router.get('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, safeHandler(api.getSpecialEventDetails, 'api.getSpecialEventDetails'));
-  router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, safeHandler(api.deleteSpecialEvent, 'api.deleteSpecialEvent'));
+  router.post('/api/v3/plugins/calendar-onekite/special-events', ...publicExpose, api.createSpecialEvent);
+  router.get('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.getSpecialEventDetails);
+  router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
 
   // Admin API (JSON)
   const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
 
   adminBases.forEach((base) => {
-    router.get(`${base}/settings`, ...adminMws, safeHandler(admin.getSettings, 'admin.getSettings'));
-    router.put(`${base}/settings`, ...adminMws, safeHandler(admin.saveSettings, 'admin.saveSettings'));
+    router.get(`${base}/settings`, ...adminMws, admin.getSettings);
+    router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
 
-    router.get(`${base}/pending`, ...adminMws, safeHandler(admin.listPending, 'admin.listPending'));
-    router.put(`${base}/reservations/:rid/approve`, ...adminMws, safeHandler(admin.approveReservation, 'admin.approveReservation'));
-    router.put(`${base}/reservations/:rid/refuse`, ...adminMws, safeHandler(admin.refuseReservation, 'admin.refuseReservation'));
+    router.get(`${base}/pending`, ...adminMws, admin.listPending);
+    router.put(`${base}/reservations/:rid/approve`, ...adminMws, admin.approveReservation);
+    router.put(`${base}/reservations/:rid/refuse`, ...adminMws, admin.refuseReservation);
 
-    router.post(`${base}/purge`, ...adminMws, safeHandler(admin.purgeByYear, 'admin.purgeByYear'));
+    router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
+    router.get(`${base}/debug`, ...adminMws, admin.debugHelloAsso);
     // Accounting / exports
-    router.get(`${base}/accounting`, ...adminMws, safeHandler(admin.getAccounting, 'admin.getAccounting'));
-    router.get(`${base}/accounting.csv`, ...adminMws, safeHandler(admin.exportAccountingCsv, 'admin.exportAccountingCsv'));
-    router.post(`${base}/accounting/purge`, ...adminMws, safeHandler(admin.purgeAccounting, 'admin.purgeAccounting'));
+    router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
+    router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
+    router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
 
     // Purge special events by year
-    router.post(`${base}/special-events/purge`, ...adminMws, safeHandler(admin.purgeSpecialEventsByYear, 'admin.purgeSpecialEventsByYear'));
+    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
   });
 
   // HelloAsso callback endpoint (hardened)
@@ -128,8 +109,13 @@ Plugin.init = async function (params) {
     },
     type: ['application/json', 'application/*+json'],
   });
-  router.post('/plugins/calendar-onekite/helloasso', helloassoJson, safeHandler(helloassoWebhook.handler, 'helloassoWebhook.handler'));
+  // Accept webhook on both legacy root path and namespaced plugin path.
+  // Some reverse proxies block unknown root paths, so /plugins/... is recommended.
+  router.post('/helloasso', helloassoJson, helloassoWebhook.handler);
+  router.post('/plugins/calendar-onekite/helloasso', helloassoJson, helloassoWebhook.handler);
 
+  // Optional: health checks
+  router.get('/helloasso', (req, res) => res.json({ ok: true }));
   router.get('/plugins/calendar-onekite/helloasso', (req, res) => res.json({ ok: true }));
 
   scheduler.start();
@@ -147,7 +133,8 @@ Plugin.addAdminNavigation = async function (header) {
 
 
 // Ensure our transactional emails always get a subject.
-// Ensure our transactional emails always get a subject (NodeBB email hook).
+// NodeBB's Emailer.sendToEmail signature expects (template, email, language, params),
+// so plugins typically inject/modify the subject via this hook.
 Plugin.emailModify = async function (data) {
   try {
     if (!data || !data.template) return data;

package/package.json

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

package/plugin.json

@@ -39,5 +39,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.25"
+  "version": "1.0.26"
 }

package/public/admin.js

@@ -221,14 +221,14 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     for (const r of list) {
       if (r && r.rid) pendingCache.set(String(r.rid), r);
       const created = r.createdAt ? fmtFR(r.createdAt) : '';
-      const itemNames = Array.isArray(r.itemNames) ? r.itemNames : [];
+      const itemNames = Array.isArray(r.itemNames) && r.itemNames.length ? r.itemNames : [r.itemName || r.itemId].filter(Boolean);
       const itemsHtml = `<ul style="margin: 0 0 10px 18px;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul>`;
       const div = document.createElement('div');
       div.className = 'list-group-item onekite-pending-row';
       div.innerHTML = `
         <div class="d-flex justify-content-between align-items-start gap-2">
           <div style="min-width: 0;">
-            <div><strong>${itemsHtml}</strong></div>
+            <div><strong>${itemsHtml || escapeHtml(r.itemName || '')}</strong></div>
             <div class="text-muted" style="font-size: 12px;">Créée: ${escapeHtml(created)}</div>
             <div class="text-muted" style="font-size: 12px;">Période: ${escapeHtml(new Date(parseInt(r.start, 10)).toLocaleDateString('fr-FR'))} → ${escapeHtml(new Date(parseInt(r.end, 10)).toLocaleDateString('fr-FR'))}</div>
           </div>
@@ -492,7 +492,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
               ? r.itemNames
               : (typeof r.itemNames === 'string' && r.itemNames.trim()
                 ? r.itemNames.split(',').map(s => s.trim()).filter(Boolean)
-                : ([]));
+                : ([r.itemName || r.itemId].filter(Boolean)));
             const itemsListHtml = itemNames.length
               ? `<div class="mb-2"><strong>Matériel</strong><ul style="margin:0.25rem 0 0 1.1rem; padding:0;">${itemNames.map(n => `<li>${escapeHtml(String(n))}</li>`).join('')}</ul></div>`
               : '';

package/public/client.js

@@ -787,7 +787,7 @@ function toDatetimeLocalValue(date) {
       (evs || []).forEach((ev) => {
         const st = (ev.extendedProps && ev.extendedProps.status) || '';
         if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(st)) return;
-        const ids = (ev.extendedProps && ev.extendedProps.itemIds) || [];
+        const ids = (ev.extendedProps && ev.extendedProps.itemIds) || (ev.extendedProps && ev.extendedProps.itemId ? [ev.extendedProps.itemId] : []);
         ids.forEach((id) => blocked.add(String(id)));
       });
     } catch (e) {}
@@ -1300,7 +1300,12 @@ function toDatetimeLocalValue(date) {
             p = Object.assign({}, p0, details);
           } else if (p0.type === 'special' && p0.eid) {
             const details = await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(String(p0.eid))}`);
-            p = Object.assign({}, p0, details);
+            p = Object.assign({}, p0, details, {
+              // keep backward compat with older field names used by templates below
+              pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
+              pickupLat: details.lat || details.pickupLat || p0.pickupLat,
+              pickupLon: details.lon || details.pickupLon || p0.pickupLon,
+            });
           }
         } catch (e) {
           // ignore detail fetch errors; fall back to minimal props
@@ -1365,7 +1370,7 @@ function toDatetimeLocalValue(date) {
           ? `<div class="mb-2"><strong>Réservée par</strong><br><a class="onekite-user-link" href="${window.location.origin}/user/${encodeURIComponent(username)}">${escapeHtml(username)}</a></div>`
           : '';
         const itemsHtml = (() => {
-        const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : []);
+        const names = Array.isArray(p.itemNames) ? p.itemNames : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
         if (names.length) {
           return `<ul style="margin:0 0 0 1.1rem; padding:0;">${names.map(n => `<li>${String(n).replace(/</g,'&lt;').replace(/>/g,'&gt;')}</li>`).join('')}</ul>`;
         }
@@ -1500,7 +1505,7 @@ function toDatetimeLocalValue(date) {
             callback: async () => {
               const itemNames = Array.isArray(p.itemNames) && p.itemNames.length
                 ? p.itemNames
-                : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : []);
+                : (typeof p.itemNames === 'string' && p.itemNames.trim() ? p.itemNames.split(',').map(s=>s.trim()).filter(Boolean) : (p.itemName ? [p.itemName] : []));
               const itemsListHtml = itemNames.length
                 ? `<div class="mb-2"><strong>Matériel</strong><ul style="margin:0.25rem 0 0 1.1rem; padding:0;">${itemNames.map(n => `<li>${String(n).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</li>`).join('')}</ul></div>`
                 : '';