nodebb-plugin-calendar-onekite 11.1.99 → 11.2.1

package/lib/admin.js

@@ -19,12 +19,33 @@ function formatFR(tsOrIso) {
 }
 
 async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
+  // Prefer sending by uid (NodeBB core expects uid in various places)
+  const uid = data && Number.isInteger(data.uid) ? data.uid : null;
+  if (!toEmail && !uid) return;
 
   const settings = await meta.settings.get('calendar-onekite').catch(() => ({}));
   const lang = (settings && settings.defaultLang) || (meta && meta.config && meta.config.defaultLang) || 'fr';
   const params = Object.assign({}, data || {}, subject ? { subject } : {});
 
+  // If we have a uid, use the native uid-based sender first.
+  try {
+    if (uid && typeof emailer.send === 'function') {
+      // NodeBB: send(template, uid, params)
+      if (emailer.send.length >= 3) {
+        await emailer.send(template, uid, params);
+      } else {
+        await emailer.send(template, uid, params);
+      }
+      return;
+    }
+  } catch (err) {
+    console.warn('[calendar-onekite] Failed to send email', {
+      template,
+      toEmail,
+      err: err && err.message ? err.message : String(err),
+    });
+  }
+
   try {
     if (typeof emailer.sendToEmail === 'function') {
       // NodeBB: sendToEmail(template, email, language, params)
@@ -36,10 +57,6 @@ async function sendEmail(template, toEmail, subject, data) {
       }
       return;
     }
-    if (typeof emailer.send === 'function') {
-      // Fallback: send(template, uid, params) - not usable without uid
-      return;
-    }
   } catch (err) {
     console.warn('[calendar-onekite] Failed to send email', {
       template,
@@ -184,6 +201,7 @@ admin.approveReservation = async function (req, res) {
         ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
         : '';
       await sendEmail('calendar-onekite_approved', requester.email, 'Location matériel - Réservation validée', {
+        uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -216,6 +234,7 @@ admin.refuseReservation = async function (req, res) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     if (requester && requester.email) {
       await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Réservation refusée', {
+        uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: r.itemName,
         start: formatFR(r.start),

package/lib/helloassoWebhook.js

@@ -24,7 +24,8 @@ const SETTINGS_KEY = 'calendar-onekite';
 const PROCESSED_KEY = 'calendar-onekite:helloasso:processedPayments';
 
 async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
+  const uidFromData = data && Number.isInteger(data.uid) ? data.uid : null;
+  if (!toEmail && !uidFromData) return;
   try {
     const emailer = require.main.require('./src/emailer');
     // NodeBB core signature is typically:
@@ -33,6 +34,23 @@ async function sendEmail(template, toEmail, subject, data) {
     const language = (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
     const params = Object.assign({}, data || {}, subject ? { subject } : {});
 
+    // In NodeBB 4.x, various email flows expect a uid to be present.
+    // If we have it, always prefer the uid-based sender.
+    let uid = uidFromData;
+    if (!uid && toEmail && typeof user.getUidByEmail === 'function') {
+      try {
+        uid = await user.getUidByEmail(toEmail);
+        if (uid && typeof uid === 'string') uid = parseInt(uid, 10);
+      } catch (e) {
+        uid = null;
+      }
+    }
+    if (uid && typeof emailer.send === 'function') {
+      // NodeBB: send(template, uid, params)
+      await emailer.send(template, uid, params);
+      return;
+    }
+
     if (typeof emailer.sendToEmail === 'function') {
       // Prefer the canonical signature.
       // If a fork uses a shorter signature, we'll still try passing params as 3rd arg.
@@ -44,17 +62,8 @@ async function sendEmail(template, toEmail, subject, data) {
       return;
     }
 
-    if (typeof emailer.send === 'function') {
-      if (emailer.send.length >= 4) {
-        await emailer.send(template, toEmail, language, params);
-        return;
-      }
-      if (emailer.send.length === 3) {
-        await emailer.send(template, toEmail, params);
-        return;
-      }
-      await emailer.send(template, toEmail, language, params);
-    }
+    // Do not call emailer.send with an email address (it expects uid). If we reach here,
+    // fall back to sendToEmail only.
   } catch (err) {
     // eslint-disable-next-line no-console
     console.warn('[calendar-onekite] Failed to send email (webhook)', { template, toEmail, err: String(err && err.message || err) });
@@ -345,6 +354,7 @@ async function handler(req, res, next) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     if (requester && requester.email) {
       await sendEmail('calendar-onekite_paid', requester.email, 'Location matériel - Paiement reçu', {
+        uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),

package/library.js

@@ -53,48 +53,21 @@ Plugin.init = async function (params) {
   routeHelpers.setupPageRoute(router, '/calendar', mw(), controllers.renderCalendar);
   routeHelpers.setupAdminPageRoute(router, '/admin/plugins/calendar-onekite', mw(), admin.renderAdmin);
 
-  // Public API (JSON)
-  // We register both v3 and legacy (/api/...) endpoints as a compatibility fallback.
+  // Public API (JSON) — NodeBB 4.x only (v3 API)
+  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);
 
-  ['/api/v3/plugins/calendar-onekite/events', '/api/plugins/calendar-onekite/events'].forEach((p) => {
-    router.get(p, ...publicExpose, api.getEvents);
-  });
-
-  ['/api/v3/plugins/calendar-onekite/items', '/api/plugins/calendar-onekite/items'].forEach((p) => {
-    router.get(p, ...publicExpose, api.getItems);
-  });
-
-  ['/api/v3/plugins/calendar-onekite/capabilities', '/api/plugins/calendar-onekite/capabilities'].forEach((p) => {
-    router.get(p, ...publicExpose, api.getCapabilities);
-  });
-
-  ['/api/v3/plugins/calendar-onekite/reservations', '/api/plugins/calendar-onekite/reservations'].forEach((p) => {
-    router.post(p, ...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);
-  });
-  ['/api/v3/plugins/calendar-onekite/special-events/:eid', '/api/plugins/calendar-onekite/special-events/:eid'].forEach((p) => {
-    router.delete(p, ...publicAuth, api.deleteSpecialEvent);
-  });
-
-  // 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);
-  });
-  ['/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', '/api/plugins/calendar-onekite/reservations/:rid/refuse'].forEach((p) => {
-    router.put(p, ...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.post('/api/v3/plugins/calendar-onekite/reservations', ...publicExpose, api.createReservation);
+  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, api.createSpecialEvent);
+  router.delete('/api/v3/plugins/calendar-onekite/special-events/:eid', ...publicExpose, api.deleteSpecialEvent);
 
   // Admin API (JSON)
-  const adminBases = ['/api/v3/admin/plugins/calendar-onekite', '/api/admin/plugins/calendar-onekite'];
+  const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
 
   adminBases.forEach((base) => {
     router.get(`${base}/settings`, ...adminMws, admin.getSettings);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-calendar-onekite",
-  "version": "11.1.99",
+  "version": "11.2.1",
   "description": "FullCalendar-based equipment reservation workflow with admin approval & HelloAsso payment for NodeBB",
   "main": "library.js",
   "license": "MIT",
@@ -9,6 +9,6 @@
   },
   "dependencies": {},
   "nbbpm": {
-    "compatibility": "^3.0.0 || ^4.0.0"
+    "compatibility": "^4.0.0"
   }
-}
+}

package/plugin.json

@@ -31,5 +31,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "1.0.47"
-}
+  "version": "1.0.48"
+}

package/public/admin.js

@@ -426,7 +426,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
         body: JSON.stringify({ year }),
       });
     } catch (e) {
-      return await fetchJson('/api/admin/plugins/calendar-onekite/special-events/purge', {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
         method: 'POST',
         body: JSON.stringify({ year }),
       });
@@ -437,7 +437,7 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     try {
       return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
     } catch (e) {
-      return await fetchJson('/api/admin/plugins/calendar-onekite/debug');
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
     }
   }
 

package/public/client.js

@@ -253,11 +253,7 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
   }
 
   async function loadCapabilities() {
-    try {
-      return await fetchJson('/api/v3/plugins/calendar-onekite/capabilities');
-    } catch (e) {
-      return await fetchJson('/api/plugins/calendar-onekite/capabilities');
-    }
+    return await fetchJson('/api/v3/plugins/calendar-onekite/capabilities');
   }
 
   // Leaflet (OpenStreetMap) helpers - loaded lazily only when needed.
@@ -799,7 +795,7 @@ function toDatetimeLocalValue(date) {
               method: 'POST',
               body: JSON.stringify(payload),
             }).catch(async () => {
-              return await fetchJson('/api/plugins/calendar-onekite/special-events', {
+              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
                 method: 'POST',
                 body: JSON.stringify(payload),
               });
@@ -853,7 +849,7 @@ function toDatetimeLocalValue(date) {
             showAlert('error', 'Impossible : au moins un matériel est déjà réservé ou en attente sur cette période.');
           } else {
             const msg = payload && (payload.message || payload.error || payload.msg) ? String(payload.message || payload.error || payload.msg) : '';
-            showAlert('error', msg || ((e && (e.status === 401 || e.status === 403)) ? 'Erreur vous devez être adhérent Onekite' : 'Erreur lors de la création de la demande.'));
+            showAlert('error', msg || ((e && (e.status === 401 || e.status === 403)) ? 'Vous devez être adhérent Onekite' : 'Erreur lors de la création de la demande.'));
           }
           calendar.unselect();
           isDialogOpen = false;
@@ -882,7 +878,7 @@ function toDatetimeLocalValue(date) {
               method: 'POST',
               body: JSON.stringify(payload),
             }).catch(async () => {
-              return await fetchJson('/api/plugins/calendar-onekite/special-events', {
+              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
                 method: 'POST',
                 body: JSON.stringify(payload),
               });
@@ -937,8 +933,7 @@ function toDatetimeLocalValue(date) {
                   callback: async () => {
                     try {
                       const eid = String(p.eid || ev.id).replace(/^special:/, '');
-                      await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' })
-                        .catch(() => fetchJson(`/api/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' }));
+                      await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(eid)}`, { method: 'DELETE' });
                       showAlert('success', 'Évènement supprimé.');
                       calendar.refetchEvents();
                     } catch (e) {
@@ -1357,4 +1352,4 @@ try {
   return {
     init,
   };
-});
+});