nodebb-plugin-onekite-calendar 1.0.4 → 1.0.5

package/CHANGELOG.md

@@ -1,29 +1,4 @@
-# Changelog
-
-## 1.1.0
-- Ultra perf clean : JS chargé uniquement sur les pages/plugin concernées (plus de scripts globaux)
-- Suppression legacy supplémentaire : clés DB renommées en onekite-calendar:* (aucune donnée conservée)
-- Nettoyages internes (variables globales JS, routes/paramètres uniformisés)
-
-
-## 1.0.8
-- Suppression du legacy (namespace unique onekite-calendar, ACP/API/widgets)
-- Suppression des fallbacks inutiles
-
-
-## 1.0.6
-- Refactor interne : centralisation de l’envoi d’emails et du logging (opt-in)
-- Nettoyage : suppression des alias legacy (API + ACP)
-
-## 1.0.5
-- Widget : points colorés selon le type (mêmes couleurs que le calendrier)
-- Widget mobile : swipe horizontal pour naviguer semaine par semaine
-
-## 1.0.4
-- Widget : affichage des évènements sous forme de points (sans texte)
-- Widget : survol/clic sur un point affiche le contenu (tooltip + popup)
-- Widget : renommage « Calendrier (2 semaines) » en « Calendrier »
-- Texte : remplacement de toutes les occurrences « OneKite » par « Onekite »
+# Changelog – calendar-onekite
 
 ## 1.0.3
 - Suppression du texte d’archivage dans le toast de purge (plus de « 0 archivés »)
@@ -43,7 +18,7 @@
 - Correctifs divers de stabilité/performance (dont crash au démarrage)
 
 ## 1.0.0
-- Première version stable du plugin onekite-calendar
+- Première version stable du plugin calendar-onekite
 - Gestion des réservations de matériel avec contrôle de disponibilité
 - Calendrier FullCalendar via CDN
 - Validation / refus des demandes depuis l’ACP

package/lib/admin.js

@@ -2,11 +2,9 @@
 
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
+const emailer = require.main.require('./src/emailer');
 const nconf = require.main.require('nconf');
 
-const { sendEmail } = require('./email');
-const log = require('./log');
-
 function forumBaseUrl() {
   const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
   return base;
@@ -20,7 +18,53 @@ function formatFR(tsOrIso) {
   return `${dd}/${mm}/${yyyy}`;
 }
 
-// Email helper is centralized in lib/email.js.
+async function sendEmail(template, toEmail, subject, data) {
+  // 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)
+      if (emailer.sendToEmail.length >= 4) {
+        await emailer.sendToEmail(template, toEmail, lang, params);
+      } else {
+        // Older signature: sendToEmail(template, email, params)
+        await emailer.sendToEmail(template, toEmail, params);
+      }
+      return;
+    }
+  } catch (err) {
+    console.warn('[calendar-onekite] Failed to send email', {
+      template,
+      toEmail,
+      err: err && err.message ? err.message : String(err),
+    });
+  }
+}
 
 function normalizeCallbackUrl(configured, meta) {
   const base = (meta && meta.config && (meta.config.url || meta.config['url'])) ? (meta.config.url || meta.config['url']) : '';
@@ -50,18 +94,18 @@ const ADMIN_PRIV = 'admin:settings';
 const admin = {};
 
 admin.renderAdmin = async function (req, res) {
-  res.render('admin/plugins/onekite-calendar', {
-    title: 'Calendar Onekite',
+  res.render('admin/plugins/calendar-onekite', {
+    title: 'Calendar OneKite',
   });
 };
 
 admin.getSettings = async function (req, res) {
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   res.json(settings || {});
 };
 
 admin.saveSettings = async function (req, res) {
-  await meta.settings.set('onekite-calendar', req.body || {});
+  await meta.settings.set('calendar-onekite', req.body || {});
   res.json({ ok: true });
 };
 
@@ -97,13 +141,17 @@ admin.approveReservation = async function (req, res) {
   }
 
   // Create HelloAsso payment link if configured
-  const settings = await meta.settings.get('onekite-calendar');
+  const settings = await meta.settings.get('calendar-onekite');
   const env = settings.helloassoEnv || 'prod';
   const token = await helloasso.getAccessToken({
     env,
     clientId: settings.helloassoClientId,
     clientSecret: settings.helloassoClientSecret,
   });
+        if (!token) {
+
+        }
+
   let paymentUrl = null;
   if (token) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
@@ -111,7 +159,7 @@ admin.approveReservation = async function (req, res) {
     const totalAmount = Math.max(0, Math.round((Number(r.total) || 0) * 100));
     const base = forumBaseUrl();
     const returnUrl = base ? `${base}/calendar` : '';
-    const webhookUrl = base ? `${base}/plugins/onekite-calendar/helloasso` : '';
+    const webhookUrl = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
     const year = new Date(Number(r.start)).getFullYear();
     const intent = await helloasso.createCheckoutIntent({
       env,
@@ -125,7 +173,7 @@ admin.approveReservation = async function (req, res) {
       // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
       callbackUrl: returnUrl,
       webhookUrl: webhookUrl,
-      itemName: 'Réservation matériel Onekite',
+      itemName: 'Réservation matériel OneKite',
       containsDonation: false,
       metadata: { reservationId: String(rid) },
     });
@@ -140,7 +188,7 @@ admin.approveReservation = async function (req, res) {
   if (paymentUrl) {
     r.paymentUrl = paymentUrl;
   } else {
-    log.warn('HelloAsso payment link not created (approve ACP)', { rid });
+    console.warn('[calendar-onekite] HelloAsso payment link not created (approve ACP)', { rid });
   }
 
   await dbLayer.saveReservation(r);
@@ -154,7 +202,7 @@ admin.approveReservation = async function (req, res) {
       const mapUrl = (Number.isFinite(latNum) && Number.isFinite(lonNum))
         ? `https://www.openstreetmap.org/?mlat=${encodeURIComponent(String(latNum))}&mlon=${encodeURIComponent(String(lonNum))}#map=18/${encodeURIComponent(String(latNum))}/${encodeURIComponent(String(lonNum))}`
         : '';
-      await sendEmail('onekite-calendar_approved', requester.email, 'Location matériel - Réservation validée', {
+      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 || '')),
@@ -189,7 +237,7 @@ admin.refuseReservation = async function (req, res) {
   try {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     if (requester && requester.email) {
-      await sendEmail('onekite-calendar_refused', requester.email, 'Location matériel - Réservation refusée', {
+      await sendEmail('calendar-onekite_refused', requester.email, 'Location matériel - Réservation refusée', {
         uid: parseInt(r.uid, 10),
         username: requester.username,
         itemName: (Array.isArray(r.itemNames) ? r.itemNames.join(', ') : (r.itemName || '')),
@@ -244,6 +292,98 @@ admin.purgeSpecialEventsByYear = async function (req, res) {
   return res.json({ ok: true, removed: count });
 };
 
+// Debug endpoint to validate HelloAsso connectivity and item loading
+
+
+admin.debugHelloAsso = async function (req, res) {
+  const settings = await meta.settings.get('calendar-onekite');
+  const env = (settings && settings.helloassoEnv) || 'prod';
+
+  // Never expose secrets in debug output
+  const safeSettings = {
+    helloassoEnv: env,
+    helloassoClientId: settings && settings.helloassoClientId ? String(settings.helloassoClientId) : '',
+    helloassoClientSecret: settings && settings.helloassoClientSecret ? '***' : '',
+    helloassoOrganizationSlug: settings && settings.helloassoOrganizationSlug ? String(settings.helloassoOrganizationSlug) : '',
+    helloassoFormType: settings && settings.helloassoFormType ? String(settings.helloassoFormType) : '',
+    helloassoFormSlug: settings && settings.helloassoFormSlug ? String(settings.helloassoFormSlug) : '',
+  };
+
+  const out = {
+    ok: true,
+    settings: safeSettings,
+    token: { ok: false },
+    // Catalog = what you actually want for a shop (available products/material)
+    catalog: { ok: false, count: 0, sample: [], keys: [] },
+    // Sold items = items present in orders (can be 0 if no sales yet)
+    soldItems: { ok: false, count: 0, sample: [] },
+  };
+
+  try {
+    const token = await helloasso.getAccessToken({
+      env,
+      clientId: settings.helloassoClientId,
+      clientSecret: settings.helloassoClientSecret,
+    });
+    if (!token) {
+      out.token = { ok: false, error: 'token-null' };
+      return res.json(out);
+    }
+    out.token = { ok: true };
+
+    // Catalog items (via /public)
+    try {
+      const y = new Date().getFullYear();
+      const { publicForm, items } = await helloasso.listCatalogItems({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug: `locations-materiel-${y}`,
+      });
+
+      const arr = Array.isArray(items) ? items : [];
+      out.catalog.ok = true;
+      out.catalog.count = arr.length;
+      out.catalog.keys = publicForm && typeof publicForm === 'object' ? Object.keys(publicForm) : [];
+      out.catalog.sample = arr.slice(0, 10).map((it) => ({
+        id: it.id,
+        name: it.name,
+        price: it.price ?? null,
+      }));
+    } catch (e) {
+      out.catalog = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [], keys: [] };
+    }
+
+    // Sold items
+    try {
+      const y2 = new Date().getFullYear();
+      const items = await helloasso.listItems({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug: `locations-materiel-${y2}`,
+      });
+      const arr = Array.isArray(items) ? items : [];
+      out.soldItems.ok = true;
+      out.soldItems.count = arr.length;
+      out.soldItems.sample = arr.slice(0, 10).map((it) => ({
+        id: it.id || it.itemId || it.reference || it.name,
+        name: it.name || it.label || it.itemName,
+        price: it.price || it.amount || it.unitPrice || null,
+      }));
+    } catch (e) {
+      out.soldItems = { ok: false, error: String(e && e.message ? e.message : e), count: 0, sample: [] };
+    }
+
+    return res.json(out);
+  } catch (e) {
+    out.ok = false;
+    out.token = { ok: false, error: String(e && e.message ? e.message : e) };
+    return res.json(out);
+  }
+};
 
 // Accounting endpoint: aggregates paid reservations so you can contabilize what was rented.
 // Query params:
@@ -360,7 +500,7 @@ admin.exportAccountingCsv = async function (req, res) {
   }
   const csv = lines.join('\n');
   res.setHeader('Content-Type', 'text/csv; charset=utf-8');
-  res.setHeader('Content-Disposition', 'attachment; filename="onekite-calendar-accounting.csv"');
+  res.setHeader('Content-Disposition', 'attachment; filename="calendar-onekite-accounting.csv"');
   return res.send(csv);
 };