nodebb-plugin-onekite-calendar 2.0.66 → 2.0.67

package/lib/shared.js

@@ -0,0 +1,427 @@
+'use strict';
+
+/**
+ * Centralised helpers used across api.js, admin.js, helloassoWebhook.js,
+ * scheduler.js, discord.js and widgets.js.
+ *
+ * Previously these were duplicated (sometimes with subtle divergences) in
+ * multiple files.  This module is the single source of truth.
+ */
+
+const crypto = require('crypto');
+const nconf = require.main.require('nconf');
+const meta = require.main.require('./src/meta');
+const emailer = require.main.require('./src/emailer');
+const groups = require.main.require('./src/groups');
+const user = require.main.require('./src/user');
+
+const { getGroupNameBySlug } = require('./group-helpers');
+
+// ─── Base URL ────────────────────────────────────────────────────────────────
+
+function forumBaseUrl() {
+  // Try meta.config first (runtime-accurate), then nconf fallback.
+  let base = '';
+  try {
+    base = (meta && meta.config && (meta.config.url || meta.config['url']))
+      ? String(meta.config.url || meta.config['url'])
+      : '';
+  } catch (_) { /* ignore */ }
+  if (!base) {
+    try { base = String(nconf.get('url') || ''); } catch (_) { /* ignore */ }
+  }
+  base = base.trim().replace(/\/$/, '');
+  if (base && !/^https?:\/\//i.test(base)) {
+    base = `https://${base.replace(/^\/\//, '')}`;
+  }
+  return base;
+}
+
+// ─── HMAC / signing ──────────────────────────────────────────────────────────
+
+function hmacSecret() {
+  try {
+    const s = String(nconf.get('secret') || '').trim();
+    if (s) return s;
+  } catch (_) { /* ignore */ }
+  return 'calendar-onekite';
+}
+
+function signCalendarLink(type, id, uid) {
+  try {
+    const msg = `${String(type)}:${String(id)}:${String(uid || 0)}`;
+    return crypto.createHmac('sha256', hmacSecret()).update(msg).digest('hex');
+  } catch (_) {
+    return '';
+  }
+}
+
+// ─── Date formatting ─────────────────────────────────────────────────────────
+
+function formatFR(tsOrIso) {
+  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-'))
+    ? Date.parse(tsOrIso)
+    : Number(tsOrIso);
+  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yyyy = d.getFullYear();
+  return `${dd}/${mm}/${yyyy}`;
+}
+
+function formatFRShort(tsOrIso) {
+  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-'))
+    ? Date.parse(tsOrIso)
+    : Number(tsOrIso);
+  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
+  const dd = String(d.getDate()).padStart(2, '0');
+  const mm = String(d.getMonth() + 1).padStart(2, '0');
+  const yy = String(d.getFullYear()).slice(-2);
+  return `${dd}/${mm}/${yy}`;
+}
+
+// ─── Group / UID normalisation ───────────────────────────────────────────────
+
+function normalizeAllowedGroups(raw) {
+  if (!raw) return [];
+  if (Array.isArray(raw)) {
+    return raw.map((v) => String(v || '').trim()).filter(Boolean);
+  }
+  const s = String(raw || '').trim();
+  if (!s) return [];
+
+  // Handle JSON-encoded arrays (ACP can store them this way)
+  if (s.startsWith('[') && s.endsWith(']')) {
+    try {
+      const parsed = JSON.parse(s);
+      if (Array.isArray(parsed)) {
+        return parsed.map((v) => String(v || '').trim()).filter(Boolean);
+      }
+    } catch (_) { /* fall through */ }
+  }
+
+  return s
+    .split(',')
+    .map((v) => String(v || '').trim().replace(/^"+|"+$/g, ''))
+    .filter(Boolean);
+}
+
+function normalizeUids(members) {
+  if (!Array.isArray(members)) return [];
+  const out = [];
+  for (const m of members) {
+    if (Number.isInteger(m)) { out.push(m); continue; }
+    if (typeof m === 'string' && m.trim()) {
+      const n = parseInt(m, 10);
+      if (Number.isFinite(n)) { out.push(n); continue; }
+    }
+    if (m && typeof m === 'object' && m.uid != null) {
+      const n = Number.isInteger(m.uid) ? m.uid : parseInt(String(m.uid).trim(), 10);
+      if (Number.isFinite(n)) out.push(n);
+    }
+  }
+  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
+}
+
+function normalizeUidList(uids) {
+  if (!uids) return [];
+  const arr = Array.isArray(uids) ? uids : (() => {
+    const s = String(uids || '').trim();
+    if (!s) return [];
+    try {
+      const parsed = JSON.parse(s);
+      return Array.isArray(parsed) ? parsed : [];
+    } catch (_) {
+      return s.split(',').map((x) => String(x).trim()).filter(Boolean);
+    }
+  })();
+
+  const out = [];
+  for (const u of arr) {
+    const n = Number.isInteger(u) ? u : parseInt(String(u || '').trim(), 10);
+    if (Number.isFinite(n) && n > 0) out.push(String(n));
+  }
+  return Array.from(new Set(out));
+}
+
+// ─── Group membership helpers ────────────────────────────────────────────────
+
+async function getMembersByGroupIdentifier(groupIdentifier) {
+  const id = String(groupIdentifier || '').trim();
+  if (!id) return [];
+
+  try {
+    const members = await groups.getMembers(id, 0, -1);
+    if (Array.isArray(members) && members.length) return members;
+  } catch (_) { /* ignore */ }
+
+  const groupName = await getGroupNameBySlug(id);
+  if (groupName && String(groupName).trim() && String(groupName).trim() !== id) {
+    try {
+      const members = await groups.getMembers(String(groupName).trim(), 0, -1);
+      return Array.isArray(members) ? members : [];
+    } catch (_) {
+      return [];
+    }
+  }
+  return [];
+}
+
+async function userInAnyGroup(uid, allowedGroups) {
+  const allowed = normalizeAllowedGroups(allowedGroups);
+  if (!uid || !allowed.length) return false;
+
+  const ug = await groups.getUserGroups([uid]);
+  const list = (ug && ug[0]) ? ug[0] : [];
+
+  const seen = new Set();
+  for (const g of list) {
+    if (!g) continue;
+    if (g.slug) seen.add(String(g.slug));
+    if (g.name) seen.add(String(g.name));
+    if (g.groupName) seen.add(String(g.groupName));
+    if (g.displayName) seen.add(String(g.displayName));
+  }
+
+  return allowed.some((v) => seen.has(String(v)));
+}
+
+// ─── User helpers ────────────────────────────────────────────────────────────
+
+async function usernamesByUids(uids) {
+  const ids = normalizeUidList(uids);
+  if (!ids.length) return [];
+
+  try {
+    if (typeof user.getUsersFields === 'function') {
+      const rows = await user.getUsersFields(ids, ['username']);
+      return (rows || []).map((r) => (r && r.username ? String(r.username) : '')).filter(Boolean);
+    }
+  } catch (_) { /* fall through */ }
+
+  const rows = await Promise.all(ids.map(async (uid) => {
+    try {
+      const r = await user.getUserFields(uid, ['username']);
+      return r && r.username ? String(r.username) : '';
+    } catch (_) { return ''; }
+  }));
+  return rows.filter(Boolean);
+}
+
+// ─── Email ───────────────────────────────────────────────────────────────────
+
+async function sendEmail(template, uid, subject, data) {
+  const toUid = Number.isInteger(uid) ? uid : (uid ? parseInt(String(uid), 10) : NaN);
+  if (!Number.isFinite(toUid) || toUid <= 0) return;
+
+  const params = Object.assign({}, data || {}, subject ? { subject } : {});
+
+  try {
+    if (typeof emailer.send !== 'function') return;
+    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: err && err.message ? err.message : String(err),
+    });
+  }
+}
+
+// ─── Calendar export helpers (ICS / Google Calendar) ─────────────────────────
+
+function ymdToCompact(ymd) {
+  return String(ymd || '').replace(/-/g, '');
+}
+
+function dtToGCalUtc(dt) {
+  const d = (dt instanceof Date) ? dt : new Date(dt);
+  return d.toISOString().replace(/[-:]/g, '').replace(/\.\d{3}Z$/, 'Z');
+}
+
+/**
+ * Build ICS download URL + Google Calendar template URL.
+ *
+ * Accepts two calling conventions for backward-compatibility:
+ *   (a) { type, id, uid, title, details, location, allDay, start, end, startYmd, endYmd }
+ *       (used by api.js for all entity types)
+ *   (b) { rid, uid, itemNames, pickupAddress, startYmd, endYmd }
+ *       (used by admin.js / helloassoWebhook.js for reservations only)
+ */
+function buildCalendarLinks(opts) {
+  // Normalise the two calling conventions
+  const type = opts.type || 'reservation';
+  const id = opts.id || opts.rid || '';
+  const uid = Number(opts.uid) || 0;
+  const itemNames = Array.isArray(opts.itemNames) ? opts.itemNames : [];
+  const defaultTitle = itemNames.length ? `Location - ${itemNames.join(', ')}` : 'Location';
+  const title = String(opts.title || defaultTitle).trim() || 'Évènement';
+  const details = String(opts.details || '').trim();
+  const location = String(opts.location || opts.pickupAddress || '').trim();
+  const isAllDay = opts.allDay !== undefined ? !!opts.allDay : true;
+
+  // Signed ICS URL
+  const sig = signCalendarLink(type, String(id), uid);
+  const icsPath = `/plugins/calendar-onekite/ics/${encodeURIComponent(type)}/${encodeURIComponent(id)}?uid=${encodeURIComponent(String(uid))}&sig=${encodeURIComponent(sig)}`;
+  const icsUrl = `${forumBaseUrl()}${icsPath}`;
+
+  // Google Calendar template URL
+  let dates = '';
+  if (isAllDay) {
+    dates = `${ymdToCompact(opts.startYmd)}/${ymdToCompact(opts.endYmd)}`;
+  } else {
+    dates = `${dtToGCalUtc(opts.start)}/${dtToGCalUtc(opts.end)}`;
+  }
+  const gcal = new URL('https://calendar.google.com/calendar/render');
+  gcal.searchParams.set('action', 'TEMPLATE');
+  gcal.searchParams.set('text', title);
+  if (dates) gcal.searchParams.set('dates', dates);
+  if (details) gcal.searchParams.set('details', details);
+  if (location) gcal.searchParams.set('location', location);
+
+  return { icsUrl, googleCalUrl: gcal.toString() };
+}
+
+// ─── HelloAsso URL helpers ───────────────────────────────────────────────────
+
+function normalizeCallbackUrl(configured) {
+  const base = forumBaseUrl();
+  let url = (configured || '').trim();
+  if (!url) {
+    url = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
+  }
+  if (url && url.startsWith('/') && base) {
+    url = `${base}${url}`;
+  }
+  if (url && !/^https?:\/\//i.test(url)) {
+    url = `https://${url.replace(/^\/\//, '')}`;
+  }
+  return url;
+}
+
+function normalizeReturnUrl() {
+  const base = forumBaseUrl();
+  return base ? `${base}/calendar` : '';
+}
+
+function autoFormSlugForYear(year) {
+  return `locations-materiel-${year}`;
+}
+
+function autoCreatorGroupForYear(year) {
+  return `onekite-ffvl-${year}`;
+}
+
+// ─── HelloAsso item name builder ─────────────────────────────────────────────
+
+function buildHelloAssoItemName(baseLabel, itemNames, start, end) {
+  const base = String(baseLabel || '').trim();
+  const items = Array.isArray(itemNames)
+    ? itemNames.map((s) => String(s || '').trim()).filter(Boolean)
+    : [];
+  const range = (start && end) ? (`Du ${formatFR(start)} au ${formatFR(end)}`) : '';
+
+  let out = '';
+  if (base) out += base;
+  if (items.length) out += (out ? ' — ' : '') + items.map((it) => '• ' + it).join(' ');
+  if (range) out += (out ? ' — ' : '') + range;
+
+  out = String(out || '').trim();
+  if (!out) out = 'Réservation matériel';
+
+  // HelloAsso constraint: itemName max 250 chars
+  if (out.length > 250) {
+    out = out.slice(0, 249).trimEnd() + '…';
+  }
+  return out;
+}
+
+// ─── Calendar-day arithmetic ─────────────────────────────────────────────────
+
+/**
+ * Calendar-day difference (end exclusive) computed purely from Y/M/D.
+ * Uses UTC midnights to avoid any dependency on local timezone or DST.
+ */
+function calendarDaysExclusiveYmd(startYmd, endYmd) {
+  try {
+    const m1 = /^\d{4}-\d{2}-\d{2}$/.exec(String(startYmd || '').trim());
+    const m2 = /^\d{4}-\d{2}-\d{2}$/.exec(String(endYmd || '').trim());
+    if (!m1 || !m2) return null;
+    const [sy, sm, sd] = String(startYmd).split('-').map((x) => parseInt(x, 10));
+    const [ey, em, ed] = String(endYmd).split('-').map((x) => parseInt(x, 10));
+    const sUtc = Date.UTC(sy, sm - 1, sd);
+    const eUtc = Date.UTC(ey, em - 1, ed);
+    const diff = Math.floor((eUtc - sUtc) / (24 * 60 * 60 * 1000));
+    return Math.max(1, diff);
+  } catch (_) {
+    return null;
+  }
+}
+
+function yearFromTs(ts) {
+  const d = new Date(Number(ts));
+  return Number.isFinite(d.getTime()) ? d.getFullYear() : new Date().getFullYear();
+}
+
+// ─── Misc ────────────────────────────────────────────────────────────────────
+
+function arrayifyNames(obj) {
+  return (Array.isArray(obj && obj.itemNames)
+    ? obj.itemNames
+    : (obj && obj.itemName ? [obj.itemName] : [])
+  ).filter(Boolean);
+}
+
+function getSetting(settings, key, fallback) {
+  const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
+  if (v == null || v === '') return fallback;
+  if (typeof v === 'object' && v && typeof v.value !== 'undefined') return v.value;
+  return v;
+}
+
+// ─── Exports ─────────────────────────────────────────────────────────────────
+
+module.exports = {
+  // URLs
+  forumBaseUrl,
+  normalizeCallbackUrl,
+  normalizeReturnUrl,
+  autoFormSlugForYear,
+  autoCreatorGroupForYear,
+
+  // HMAC / signing
+  hmacSecret,
+  signCalendarLink,
+
+  // Dates
+  formatFR,
+  formatFRShort,
+  ymdToCompact,
+  dtToGCalUtc,
+  calendarDaysExclusiveYmd,
+  yearFromTs,
+
+  // Groups / UIDs
+  normalizeAllowedGroups,
+  normalizeUids,
+  normalizeUidList,
+  getMembersByGroupIdentifier,
+  userInAnyGroup,
+
+  // Users
+  usernamesByUids,
+
+  // Email
+  sendEmail,
+
+  // Calendar links
+  buildCalendarLinks,
+
+  // HelloAsso
+  buildHelloAssoItemName,
+
+  // Misc
+  arrayifyNames,
+  getSetting,
+};

package/lib/utils.js

@@ -1,70 +1,15 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
-
-function getSetting(settings, key, fallback) {
-  const v = settings && Object.prototype.hasOwnProperty.call(settings, key) ? settings[key] : undefined;
-  if (v == null || v === '') return fallback;
-  if (typeof v === 'object' && v && typeof v.value !== 'undefined') return v.value;
-  return v;
-}
-
-function formatFR(tsOrIso) {
-  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-')) ? Date.parse(tsOrIso) : Number(tsOrIso);
-  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  const yyyy = d.getFullYear();
-  return `${dd}/${mm}/${yyyy}`;
-}
-
-function formatFRShort(tsOrIso) {
-  const ts = (typeof tsOrIso === 'string' && tsOrIso.includes('-')) ? Date.parse(tsOrIso) : Number(tsOrIso);
-  const d = new Date(Number.isFinite(ts) ? ts : tsOrIso);
-  const dd = String(d.getDate()).padStart(2, '0');
-  const mm = String(d.getMonth() + 1).padStart(2, '0');
-  return `${dd}/${mm}`;
-}
-
-function forumBaseUrl() {
-  return String(nconf.get('url') || '').trim().replace(/\/$/, '');
-}
-
-function normalizeAllowedGroups(raw) {
-  if (!raw) return [];
-  if (Array.isArray(raw)) {
-    return raw.map((s) => String(s || '').trim()).filter(Boolean);
-  }
-  return String(raw)
-    .split(',')
-    .map((s) => String(s || '').trim())
-    .filter(Boolean);
-}
-
-function normalizeUids(members) {
-  if (!Array.isArray(members)) return [];
-  const out = [];
-  for (const m of members) {
-    if (Number.isInteger(m)) { out.push(m); continue; }
-    if (typeof m === 'string' && m.trim() && !Number.isNaN(parseInt(m, 10))) { out.push(parseInt(m, 10)); continue; }
-    if (m && typeof m === 'object' && (Number.isInteger(m.uid) || (typeof m.uid === 'string' && m.uid.trim()))) {
-      const u = Number.isInteger(m.uid) ? m.uid : parseInt(m.uid, 10);
-      if (!Number.isNaN(u)) out.push(u);
-    }
-  }
-  return Array.from(new Set(out)).filter((u) => Number.isInteger(u) && u > 0);
-}
-
-function arrayifyNames(obj) {
-  return (Array.isArray(obj && obj.itemNames) ? obj.itemNames : (obj && obj.itemName ? [obj.itemName] : [])).filter(Boolean);
-}
+// Thin re-export layer for backward compatibility.
+// All helpers now live in ./shared.js.
+const shared = require('./shared');
 
 module.exports = {
-  getSetting,
-  formatFR,
-  formatFRShort,
-  forumBaseUrl,
-  normalizeAllowedGroups,
-  normalizeUids,
-  arrayifyNames,
+  getSetting: shared.getSetting,
+  formatFR: shared.formatFR,
+  formatFRShort: shared.formatFRShort,
+  forumBaseUrl: shared.forumBaseUrl,
+  normalizeAllowedGroups: shared.normalizeAllowedGroups,
+  normalizeUids: shared.normalizeUids,
+  arrayifyNames: shared.arrayifyNames,
 };

package/lib/widgets.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const nconf = require.main.require('nconf');
-
-function forumBaseUrl() {
-  return String(nconf.get('url') || '').trim().replace(/\/$/, '');
-}
+const { forumBaseUrl } = require('./shared');
 
 function escapeHtml(s) {
   return String(s || '')
@@ -331,7 +327,7 @@ dateClick: function() { window.location.href = calUrl; },
           const title = (ep.itemNameLine || ep.title || ev.title || '').toString();
           const statusLabel = (function(s){
             const map = {
-              pending: 'En attente de validation de validation',
+              pending: 'En attente de validation',
               awaiting_payment: 'Validée – paiement en attente',
               paid: 'Payée',
               rejected: 'Rejetée',

package/package.json

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