nodebb-plugin-calendar-onekite 11.1.75 → 11.1.77

package/lib/admin.js

@@ -21,27 +21,39 @@ function formatFR(tsOrIso) {
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   try {
+    const dataWithSubject = Object.assign({}, data || {}, subject ? { subject, _subject: subject } : {});
+
+    // Same compatibility strategy as lib/api.js
+    const attempts = [];
     if (typeof emailer.sendToEmail === 'function') {
-      if (emailer.sendToEmail.length >= 4) {
-        await emailer.sendToEmail(template, toEmail, subject, data);
+      if (emailer.sendToEmail.length === 3) {
+        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject));
       } else {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
-        await emailer.sendToEmail(template, toEmail, dataWithSubject);
+        attempts.push(() => emailer.sendToEmail(template, toEmail, subject, dataWithSubject));
+        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject, subject));
+        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject));
       }
-      return;
     }
     if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, subject, data);
-        return;
-      }
       if (emailer.send.length === 3) {
-        const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
-        await emailer.send(template, toEmail, dataWithSubject);
+        attempts.push(() => emailer.send(template, toEmail, dataWithSubject));
+      } else {
+        attempts.push(() => emailer.send(template, toEmail, subject, dataWithSubject));
+        attempts.push(() => emailer.send(template, toEmail, dataWithSubject, subject));
+        attempts.push(() => emailer.send(template, toEmail, dataWithSubject));
+      }
+    }
+
+    let lastErr = null;
+    for (const fn of attempts) {
+      try {
+        await fn();
         return;
+      } catch (e) {
+        lastErr = e;
       }
-      await emailer.send(template, toEmail, subject, data);
     }
+    if (lastErr) throw lastErr;
   } catch (err) {
     console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String(err && err.message || err) });
   }
@@ -86,7 +98,12 @@ admin.getSettings = async function (req, res) {
 };
 
 admin.saveSettings = async function (req, res) {
-  await meta.settings.set('calendar-onekite', req.body || {});
+  // Merge instead of overwrite so a missing/empty body (eg. due to body parser
+  // differences across NodeBB versions) does not wipe existing settings.
+  const current = (await meta.settings.get('calendar-onekite')) || {};
+  const incoming = req.body && typeof req.body === 'object' ? req.body : {};
+  const merged = Object.assign({}, current, incoming);
+  await meta.settings.set('calendar-onekite', merged);
   res.json({ ok: true });
 };
 

package/lib/api.js

@@ -15,27 +15,43 @@ const helloasso = require('./helloasso');
 async function sendEmail(template, toEmail, subject, data) {
   if (!toEmail) return;
   const emailer = require.main.require('./src/emailer');
-  const dataWithSubject = Object.assign({}, data || {}, subject ? { subject } : {});
+  const dataWithSubject = Object.assign({}, data || {}, subject ? { subject, _subject: subject } : {});
   try {
-    // NodeBB's Emailer API differs across versions; the most reliable approach is to pass `subject` inside `data`.
+    // NodeBB Emailer signatures vary across versions/plugins.
+    // IMPORTANT: some implementations accept (template, email, data) and will NOT throw if we pass a string as `data`,
+    // which can lead to "sent but empty subject". So we prefer the (template, email, data) call first when arity hints it.
+    const attempts = [];
+
     if (typeof emailer.sendToEmail === 'function') {
-      // Prefer 3-args (template, email, data) when possible
-      if (emailer.sendToEmail.length >= 3) {
-        await emailer.sendToEmail(template, toEmail, dataWithSubject);
-        return;
+      if (emailer.sendToEmail.length === 3) {
+        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject));
+      } else {
+        // Try the common forms that include subject
+        attempts.push(() => emailer.sendToEmail(template, toEmail, subject, dataWithSubject));
+        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject, subject));
+        attempts.push(() => emailer.sendToEmail(template, toEmail, dataWithSubject));
       }
-      // Fallback
-      await emailer.sendToEmail(template, toEmail, subject, data);
-      return;
     }
     if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 3) {
-        await emailer.send(template, toEmail, dataWithSubject);
+      if (emailer.send.length === 3) {
+        attempts.push(() => emailer.send(template, toEmail, dataWithSubject));
+      } else {
+        attempts.push(() => emailer.send(template, toEmail, subject, dataWithSubject));
+        attempts.push(() => emailer.send(template, toEmail, dataWithSubject, subject));
+        attempts.push(() => emailer.send(template, toEmail, dataWithSubject));
+      }
+    }
+
+    let lastErr = null;
+    for (const fn of attempts) {
+      try {
+        await fn();
         return;
+      } catch (e) {
+        lastErr = e;
       }
-      await emailer.send(template, toEmail, subject, data);
-      return;
     }
+    if (lastErr) throw lastErr;
   } catch (err) {
     // eslint-disable-next-line no-console
     console.warn('[calendar-onekite] Failed to send email', { template, toEmail, err: String((err && err.message) || err) });

package/library.js

@@ -126,6 +126,13 @@ Plugin.renderMiniWidget = async function (hookData, callback) {
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
+  // Parse JSON bodies for our API routes.
+  // NodeBB core parses bodies for many built-in routes, but custom plugin
+  // routes are not guaranteed to have body parsing enabled across versions.
+  const jsonBody = bodyParser.json({
+    type: ['application/json', 'application/*+json'],
+  });
+
   // Build middleware arrays safely and always spread them into Express route methods.
   // Express will throw if any callback is undefined, so we filter strictly.
   const publicExpose = mw(middleware && middleware.exposeUid);
@@ -173,12 +180,12 @@ Plugin.init = async function (params) {
   });
 
   ['/api/v3/plugins/calendar-onekite/reservations', '/api/plugins/calendar-onekite/reservations'].forEach((p) => {
-    router.post(p, ...publicAuth, api.createReservation);
+    router.post(p, jsonBody, ...publicAuth, api.createReservation);
   });
 
   // Special events (other colour) - created/deleted by configured groups
   ['/api/v3/plugins/calendar-onekite/special-events', '/api/plugins/calendar-onekite/special-events'].forEach((p) => {
-    router.post(p, ...publicAuth, api.createSpecialEvent);
+    router.post(p, jsonBody, ...publicAuth, api.createSpecialEvent);
   });
   ['/api/v3/plugins/calendar-onekite/special-events/:eid', '/api/plugins/calendar-onekite/special-events/:eid'].forEach((p) => {
     router.delete(p, ...publicAuth, api.deleteSpecialEvent);
@@ -186,14 +193,14 @@ Plugin.init = async function (params) {
 
   // Validator actions from the calendar popup (requires login + validatorGroups)
   ['/api/v3/plugins/calendar-onekite/reservations/:rid/approve', '/api/plugins/calendar-onekite/reservations/:rid/approve'].forEach((p) => {
-    router.put(p, ...publicAuth, api.approveReservation);
+    router.put(p, jsonBody, ...publicAuth, api.approveReservation);
   });
   ['/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', '/api/plugins/calendar-onekite/reservations/:rid/refuse'].forEach((p) => {
-    router.put(p, ...publicAuth, api.refuseReservation);
+    router.put(p, jsonBody, ...publicAuth, api.refuseReservation);
   });
   // Cancellation by requester (or staff): owner can cancel even if not in validator group
   ['/api/v3/plugins/calendar-onekite/reservations/:rid/cancel', '/api/plugins/calendar-onekite/reservations/:rid/cancel'].forEach((p) => {
-    router.put(p, ...publicAuth, api.cancelReservation);
+    router.put(p, jsonBody, ...publicAuth, api.cancelReservation);
   });
 
 
@@ -202,21 +209,21 @@ Plugin.init = async function (params) {
 
   adminBases.forEach((base) => {
     router.get(`${base}/settings`, ...adminMws, admin.getSettings);
-    router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
+    router.put(`${base}/settings`, jsonBody, ...adminMws, admin.saveSettings);
 
     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.put(`${base}/reservations/:rid/approve`, jsonBody, ...adminMws, admin.approveReservation);
+    router.put(`${base}/reservations/:rid/refuse`, jsonBody, ...adminMws, admin.refuseReservation);
 
-    router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
+    router.post(`${base}/purge`, jsonBody, ...adminMws, admin.purgeByYear);
     router.get(`${base}/debug`, ...adminMws, admin.debugHelloAsso);
     // Accounting / exports
     router.get(`${base}/accounting`, ...adminMws, admin.getAccounting);
     router.get(`${base}/accounting.csv`, ...adminMws, admin.exportAccountingCsv);
-    router.post(`${base}/accounting/purge`, ...adminMws, admin.purgeAccounting);
+    router.post(`${base}/accounting/purge`, jsonBody, ...adminMws, admin.purgeAccounting);
 
     // Purge special events by year
-    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+    router.post(`${base}/special-events/purge`, jsonBody, ...adminMws, admin.purgeSpecialEventsByYear);
   });
 
   // HelloAsso callback endpoint (hardened)

package/package.json

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

package/plugin.json

@@ -28,7 +28,6 @@
   },
   "templates": "./templates",
   "modules": {
-    "../admin/plugins/calendar-onekite.js": "./public/admin.js",
     "admin/plugins/calendar-onekite": "./public/admin.js"
   },
   "scripts": [
@@ -37,5 +36,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.49"
-}
+  "version": "1.0.54"
+}