nodebb-plugin-onekite-calendar 1.0.4 → 1.0.5

package/lib/scheduler.js

@@ -3,7 +3,6 @@
 const meta = require.main.require('./src/meta');
 const db = require.main.require('./src/database');
 const dbLayer = require('./db');
-const log = require('./log');
 
 let timer = null;
 
@@ -16,7 +15,7 @@ function getSetting(settings, key, fallback) {
 
 // Pending holds: short lock after a user creates a request (defaults to 5 minutes)
 async function expirePending() {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const holdMins = parseInt(getSetting(settings, 'pendingHoldMinutes', '5'), 10) || 5;
   const now = Date.now();
 
@@ -44,7 +43,7 @@ async function expirePending() {
 // - We send a reminder after `paymentHoldMinutes` (default 60)
 // - We expire (and remove) after `2 * paymentHoldMinutes`
 async function processAwaitingPayment() {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const holdMins = parseInt(
     getSetting(settings, 'paymentHoldMinutes', getSetting(settings, 'holdMinutes', '60')),
     10
@@ -84,7 +83,11 @@ async function processAwaitingPayment() {
       }
     } catch (err) {
       // eslint-disable-next-line no-console
-      log.warn('Failed to send email (scheduler)', { template, toEmail, err: String((err && err.message) || err) });
+      console.warn('[calendar-onekite] Failed to send email (scheduler)', {
+        template,
+        toEmail,
+        err: String((err && err.message) || err),
+      });
     }
   }
 
@@ -108,7 +111,7 @@ async function processAwaitingPayment() {
 
     if (!r.reminderSent && now >= reminderAt && now < expireAt) {
       // Send reminder once (guarded across clustered NodeBB processes)
-      const reminderKey = 'onekite-calendar:email:reminderSent';
+      const reminderKey = 'calendar-onekite:email:reminderSent';
       const first = await db.setAdd(reminderKey, rid);
       if (!first) {
         // another process already sent it
@@ -119,7 +122,7 @@ async function processAwaitingPayment() {
       }
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (u && u.email) {
-        await sendEmail('onekite-calendar_reminder', u.email, 'Location matériel - Rappel', {
+        await sendEmail('calendar-onekite_reminder', u.email, 'Location matériel - Rappel', {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
@@ -138,12 +141,12 @@ async function processAwaitingPayment() {
     if (now >= expireAt) {
       // Expire: remove reservation so it disappears from calendar and frees items
       // Guard email send across clustered NodeBB processes
-      const expiredKey = 'onekite-calendar:email:expiredSent';
+      const expiredKey = 'calendar-onekite:email:expiredSent';
       const firstExpired = await db.setAdd(expiredKey, rid);
       const shouldEmail = !!firstExpired;
       const u = await user.getUserFields(r.uid, ['username', 'email']);
       if (shouldEmail && u && u.email) {
-        await sendEmail('onekite-calendar_expired', u.email, 'Location matériel - Rappel', {
+        await sendEmail('calendar-onekite_expired', u.email, 'Location matériel - Rappel', {
           username: u.username,
           itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
           itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),

package/lib/widgets.js

@@ -40,8 +40,8 @@ widgets.defineWidgets = async function (widgetData) {
   }
 
   list.push({
-    widget: 'onekite-calendar-twoweeks',
-    name: 'Calendrier Onekite',
+    widget: 'calendar-onekite-twoweeks',
+    name: 'Calendrier OneKite (2 semaines)',
     description: 'Affiche la semaine courante + la semaine suivante (FullCalendar via CDN).',
     content: '',
   });
@@ -54,7 +54,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const id = makeDomId();
   const calUrl = widgetCalendarUrl();
   const apiBase = forumBaseUrl();
-  const eventsEndpoint = `${apiBase}/api/v3/plugins/onekite-calendar/events`;
+  const eventsEndpoint = `${apiBase}/api/v3/plugins/calendar-onekite/events`;
 
   const idJson = JSON.stringify(id);
   const calUrlJson = JSON.stringify(calUrl);
@@ -63,7 +63,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   const html = `
 <div class="onekite-twoweeks">
   <div class="d-flex justify-content-between align-items-center mb-1">
-    <div style="font-weight: 600;">Calendrier</div>
+    <div style="font-weight: 600;">Calendrier (2 semaines)</div>
     <a href="${escapeHtml(calUrl)}" class="btn btn-sm btn-outline-secondary" style="line-height: 1.1;">Ouvrir</a>
   </div>
   <div id="${escapeHtml(id)}"></div>
@@ -137,130 +137,21 @@ widgets.renderTwoWeeksWidget = async function (data) {
       },
       navLinks: false,
       eventTimeFormat: { hour: '2-digit', minute: '2-digit', hour12: false },
-      eventContent: function(arg) {
-        // Render a simple dot instead of text.
-        const wrap = document.createElement('span');
-        wrap.className = 'onekite-dot';
-        wrap.setAttribute('aria-label', arg.event.title || '');
-        // Mark the node so eventDidMount can find it.
-        wrap.setAttribute('data-onekite-dot', '1');
-        return { domNodes: [wrap] };
-      },
       events: function(info, successCallback, failureCallback) {
         const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
-        const url1 = eventsEndpoint + '?' + qs.toString();
-        fetch(url1, { credentials: 'same-origin' })
+        fetch(eventsEndpoint + '?' + qs.toString(), { credentials: 'same-origin' })
           .then((r) => r.json())
           .then((json) => successCallback(json || []))
           .catch((e) => failureCallback(e));
       },
-      eventDidMount: function(info) {
-        // Native tooltip + click popup (Bootbox when available).
-        const title = info.event && info.event.title ? String(info.event.title) : '';
-        const start = info.event && info.event.start ? info.event.start : null;
-        const end = info.event && info.event.end ? info.event.end : null;
-        const fmt = (d) => {
-          try {
-            return new Intl.DateTimeFormat('fr-FR', { dateStyle: 'medium' }).format(d);
-          } catch (e) {
-            return d ? d.toISOString().slice(0, 10) : '';
-          }
-        };
-        const period = start ? (end ? (fmt(start) + ' → ' + fmt(end)) : fmt(start)) : '';
-        const body = [title, period].filter(Boolean).join('\n');
-        if (info.el) {
-          // Make dot color match the FullCalendar event colors.
-          try {
-            const dot = info.el.querySelector && info.el.querySelector('[data-onekite-dot="1"]');
-            if (dot) {
-              // Prefer explicit event colors, otherwise fall back to computed styles.
-              const bg = (info.event && (info.event.backgroundColor || info.event.borderColor)) || '';
-              if (bg) {
-                dot.style.backgroundColor = bg;
-              } else {
-                const cs = window.getComputedStyle(info.el);
-                const bgs = cs && cs.backgroundColor;
-                if (bgs && bgs !== 'rgba(0, 0, 0, 0)' && bgs !== 'transparent') {
-                  dot.style.backgroundColor = bgs;
-                }
-              }
-            }
-          } catch (e) {
-            // ignore
-          }
-
-          info.el.title = body;
-          info.el.style.cursor = 'pointer';
-          info.el.addEventListener('click', function(ev) {
-            ev.preventDefault();
-            ev.stopPropagation();
-            const html = '<div style="white-space:pre-line;">' + (body || '').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;') + '</div>';
-            if (window.bootbox && typeof window.bootbox.alert === 'function') {
-              window.bootbox.alert({ message: html });
-            } else {
-              // Fallback
-              alert(body);
-            }
-          }, { passive: false });
-        }
-      },
-      // On mobile, users can tap the calendar background to open the full page.
       dateClick: function() {
         window.location.href = calUrl;
       },
-      // Do not redirect on eventClick: we show a popup in eventDidMount.
-      eventClick: function(info) {
-        try { if (info && info.jsEvent) info.jsEvent.preventDefault(); } catch (e) {}
+      eventClick: function() {
+        window.location.href = calUrl;
       },
     });
 
-    // Mobile: swipe left/right to change week (2-week view).
-    (function enableSwipe() {
-      try {
-        if (!('ontouchstart' in window)) return;
-        const target = el; // calendar root
-        let sx = 0;
-        let sy = 0;
-        let st = 0;
-        let tracking = false;
-
-        target.addEventListener('touchstart', function (e) {
-          if (!e.touches || e.touches.length !== 1) return;
-          const t = e.touches[0];
-          sx = t.clientX;
-          sy = t.clientY;
-          st = Date.now();
-          tracking = true;
-        }, { passive: true });
-
-        target.addEventListener('touchend', function (e) {
-          if (!tracking) return;
-          tracking = false;
-          const changed = e.changedTouches && e.changedTouches[0];
-          if (!changed) return;
-          const dx = changed.clientX - sx;
-          const dy = changed.clientY - sy;
-          const adx = Math.abs(dx);
-          const ady = Math.abs(dy);
-          const dt = Date.now() - st;
-
-          // Must be a quick-ish horizontal swipe.
-          if (dt > 800) return;
-          if (adx < 50) return;
-          if (ady > adx * 0.75) return;
-
-          // Move by one week per swipe, even though the view spans 2 weeks.
-          if (dx < 0) {
-            calendar.incrementDate({ weeks: 1 });
-          } else {
-            calendar.incrementDate({ weeks: -1 });
-          }
-        }, { passive: true });
-      } catch (e) {
-        // ignore
-      }
-    })();
-
     calendar.render();
   }
 
@@ -274,18 +165,7 @@ widgets.renderTwoWeeksWidget = async function (data) {
   .onekite-twoweeks .fc .fc-button { padding: .2rem .35rem; font-size: .75rem; }
   .onekite-twoweeks .fc .fc-daygrid-day-number { font-size: .75rem; padding: 2px; }
   .onekite-twoweeks .fc .fc-col-header-cell-cushion { font-size: .75rem; }
-  .onekite-twoweeks .fc .fc-event-title { display: none; }
-  .onekite-twoweeks .fc .fc-event-time { display: none; }
-  .onekite-twoweeks .onekite-dot {
-    display: inline-block;
-    width: 8px;
-    height: 8px;
-    border-radius: 50%;
-    background: var(--fc-event-bg-color, currentColor);
-    border: 1px solid var(--fc-event-border-color, transparent);
-    opacity: 0.85;
-    margin: 0 2px;
-  }
+  .onekite-twoweeks .fc .fc-event-title { font-size: .72rem; }
 </style>
   `;
 

package/library.js

@@ -1,5 +1,10 @@
 'use strict';
 
+// We use NodeBB's route helpers for page routes so the rendered page includes
+// the normal client bundle (ajaxify/requirejs). The helper signatures differ
+// across NodeBB versions, but for NodeBB v4.x the order is:
+//   setupPageRoute(router, path, middlewaresArray, handler)
+//   setupAdminPageRoute(router, path, middlewaresArray, handler)
 const routeHelpers = require.main.require('./src/routes/helpers');
 
 const controllers = require('./lib/controllers.js');
@@ -8,7 +13,6 @@ const admin = require('./lib/admin');
 const scheduler = require('./lib/scheduler');
 const helloassoWebhook = require('./lib/helloassoWebhook');
 const widgets = require('./lib/widgets');
-const { NAMESPACE } = require('./lib/constants');
 const bodyParser = require('body-parser');
 
 const Plugin = {};
@@ -19,8 +23,16 @@ const mw = (...fns) => fns.filter(isFn);
 Plugin.init = async function (params) {
   const { router, middleware } = params;
 
-  const publicExpose = mw(middleware && (middleware.authenticate || middleware.exposeUid));
+  // Build middleware arrays safely and always spread them into Express route methods.
+  // Express will throw if any callback is undefined, so we filter strictly.
+  // 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 {
@@ -37,7 +49,6 @@ Plugin.init = async function (params) {
       return next(err);
     }
   }
-
   const adminMws = mw(
     middleware && (middleware.authenticate || middleware.exposeUid),
     middleware && middleware.ensureLoggedIn,
@@ -45,58 +56,67 @@ 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(), controllers.renderCalendar);
+  routeHelpers.setupAdminPageRoute(router, '/admin/plugins/calendar-onekite', mw(), admin.renderAdmin);
 
-  // Admin page route
-  routeHelpers.setupAdminPageRoute(router, `/admin/plugins/${NAMESPACE}`, mw(), admin.renderAdmin);
-
-  // Public API (JSON) — NodeBB 4.x (v3 API)
-  router.get(`/api/v3/plugins/${NAMESPACE}/events`, ...publicExpose, api.getEvents);
-  router.get(`/api/v3/plugins/${NAMESPACE}/items`, ...publicExpose, api.getItems);
-  router.get(`/api/v3/plugins/${NAMESPACE}/capabilities`, ...publicExpose, api.getCapabilities);
+  // 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);
 
-  router.post(`/api/v3/plugins/${NAMESPACE}/reservations`, ...publicExpose, api.createReservation);
-  router.get(`/api/v3/plugins/${NAMESPACE}/reservations/:rid`, ...publicExpose, api.getReservationDetails);
-  router.put(`/api/v3/plugins/${NAMESPACE}/reservations/:rid/approve`, ...publicExpose, api.approveReservation);
-  router.put(`/api/v3/plugins/${NAMESPACE}/reservations/:rid/refuse`, ...publicExpose, api.refuseReservation);
-  router.put(`/api/v3/plugins/${NAMESPACE}/reservations/:rid/cancel`, ...publicExpose, 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/${NAMESPACE}/special-events`, ...publicExpose, api.createSpecialEvent);
-  router.get(`/api/v3/plugins/${NAMESPACE}/special-events/:eid`, ...publicExpose, api.getSpecialEventDetails);
-  router.delete(`/api/v3/plugins/${NAMESPACE}/special-events/:eid`, ...publicExpose, 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 base = `/api/v3/admin/plugins/${NAMESPACE}`;
-
-  router.get(`${base}/settings`, ...adminMws, admin.getSettings);
-  router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
+  const adminBases = ['/api/v3/admin/plugins/calendar-onekite'];
 
-  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);
+  adminBases.forEach((base) => {
+    router.get(`${base}/settings`, ...adminMws, admin.getSettings);
+    router.put(`${base}/settings`, ...adminMws, admin.saveSettings);
 
-  router.post(`${base}/purge`, ...adminMws, admin.purgeByYear);
+    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.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}/purge`, ...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}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+    // Purge special events by year
+    router.post(`${base}/special-events/purge`, ...adminMws, admin.purgeSpecialEventsByYear);
+  });
 
-  // HelloAsso webhook endpoint (signature verified)
+  // HelloAsso callback endpoint (hardened)
+  // - Only accepts POST
+  // - Verifies x-ha-signature (HMAC SHA-256) using the configured client secret
+  // - Basic replay protection
+  // NOTE: we capture the raw body for signature verification.
   const helloassoJson = bodyParser.json({
     verify: (req, _res, buf) => {
       req.rawBody = buf;
     },
     type: ['application/json', 'application/*+json'],
   });
-
+  // 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/${NAMESPACE}/helloasso`, helloassoJson, helloassoWebhook.handler);
+  router.post('/plugins/calendar-onekite/helloasso', helloassoJson, helloassoWebhook.handler);
 
-  // Optional health checks
+  // Optional: health checks
   router.get('/helloasso', (req, res) => res.json({ ok: true }));
-  router.get(`/plugins/${NAMESPACE}/helloasso`, (req, res) => res.json({ ok: true }));
+  router.get('/plugins/calendar-onekite/helloasso', (req, res) => res.json({ ok: true }));
 
   scheduler.start();
 };
@@ -104,20 +124,24 @@ Plugin.init = async function (params) {
 Plugin.addAdminNavigation = async function (header) {
   header.plugins = header.plugins || [];
   header.plugins.push({
-    route: `/plugins/${NAMESPACE}`,
+    route: '/plugins/calendar-onekite',
     icon: 'fa-calendar',
-    name: 'Onekite Calendar',
+    name: 'Calendar OneKite',
   });
   return header;
 };
 
+
 // Ensure our transactional emails always get a subject.
+// 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;
     const tpl = String(data.template);
-    if (!tpl.startsWith('onekite-calendar_')) return data;
+    if (!tpl.startsWith('calendar-onekite_')) return data;
 
+    // If the caller provided a subject (we pass it in params.subject), copy it to data.subject.
     const provided = data.params && data.params.subject ? String(data.params.subject) : '';
     if (provided && (!data.subject || !String(data.subject).trim())) {
       data.subject = provided;
@@ -130,4 +154,4 @@ Plugin.emailModify = async function (data) {
 Plugin.defineWidgets = widgets.defineWidgets;
 Plugin.renderTwoWeeksWidget = widgets.renderTwoWeeksWidget;
 
-module.exports = Plugin;
+module.exports = Plugin;

package/package.json

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

package/plugin.json

@@ -1,6 +1,6 @@
 {
   "id": "nodebb-plugin-onekite-calendar",
-  "name": "Onekite Calendar",
+  "name": "OneKite Calendar",
   "description": "Equipment reservation calendar (FullCalendar) with admin approval & HelloAsso checkout",
   "url": "https://www.onekite.com/calendar",
   "hooks": [
@@ -21,7 +21,7 @@
       "method": "defineWidgets"
     },
     {
-      "hook": "filter:widget.render:onekite-calendar-twoweeks",
+      "hook": "filter:widget.render:calendar-onekite-twoweeks",
       "method": "renderTwoWeeksWidget"
     }
   ],
@@ -30,8 +30,14 @@
   },
   "templates": "./templates",
   "modules": {
-    "admin/plugins/onekite-calendar": "./public/admin.js",
-    "forum/onekite-calendar": "./public/client.js"
+    "../admin/plugins/calendar-onekite.js": "./public/admin.js",
+    "admin/plugins/calendar-onekite": "./public/admin.js"
   },
-  "version": "1.1.0"
+  "scripts": [
+    "public/client.js"
+  ],
+  "acpScripts": [
+    "public/admin.js"
+  ],
+  "version": "1.0.3"
 }