nodebb-plugin-calendar-onekite 11.2.0 → 11.2.2

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

@@ -24,15 +24,18 @@ Plugin.init = async function (params) {
 
   // 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);
-  const publicAuth = mw(middleware && middleware.exposeUid, middleware && middleware.ensureLoggedIn);
+  // Auth middlewares differ slightly depending on NodeBB configuration.
+  // In v4, some installs rely on middleware.authenticate rather than exposeUid.
+  const baseExpose = mw(middleware && (middleware.authenticate || middleware.exposeUid));
+  const publicExpose = baseExpose;
+  const publicAuth = mw(middleware && (middleware.authenticate || middleware.exposeUid), middleware && middleware.ensureLoggedIn);
 
   // Robust admin guard: avoid middleware.admin.checkPrivileges() signature differences
   // across NodeBB versions. We treat membership in the 'administrators' group as admin.
   const Groups = require.main.require('./src/groups');
   async function adminOnly(req, res, next) {
     try {
-      const uid = req.uid;
+      const uid = req.uid || (req.user && req.user.uid) || (req.session && req.session.uid);
       if (!uid) {
         return res.status(401).json({ status: { code: 'not-authorized', message: 'Not logged in' } });
       }
@@ -45,7 +48,11 @@ Plugin.init = async function (params) {
       return next(err);
     }
   }
-  const adminMws = mw(middleware && middleware.exposeUid, middleware && middleware.ensureLoggedIn, adminOnly);
+  const adminMws = mw(
+    middleware && (middleware.authenticate || middleware.exposeUid),
+    middleware && middleware.ensureLoggedIn,
+    adminOnly
+  );
 
   // Page routes (HTML)
   // IMPORTANT: pass an ARRAY for middlewares (even if empty), otherwise
@@ -63,7 +70,6 @@ Plugin.init = async function (params) {
   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.get('/api/v3/plugins/calendar-onekite/special-events', ...publicExpose, api.getSpecialEvents);
   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);
 

package/package.json

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

package/public/client.js

@@ -849,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;