nodebb-plugin-onekite-calendar 1.0.4 → 1.0.5

package/public/admin.js

@@ -1,5 +1,5 @@
 
-define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts, bootbox) {
+define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts, bootbox) {
   'use strict';
 
   // Cache of pending reservations keyed by rid so delegated click handlers
@@ -11,11 +11,11 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
     // by NodeBB ACP save buttons/hooks across ajaxify navigations.
     try {
       const now = Date.now();
-      const last = window.onekiteCalendarLastAlert;
+      const last = window.oneKiteCalendarLastAlert;
       if (last && last.type === type && last.msg === msg && (now - last.ts) < 1200) {
         return;
       }
-      window.onekiteCalendarLastAlert = { type, msg, ts: now };
+      window.oneKiteCalendarLastAlert = { type, msg, ts: now };
     } catch (e) {}
     try {
       if (alerts && typeof alerts[type] === 'function') {
@@ -46,7 +46,30 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
 
 
     if (!res.ok) {
-            const text = await res.text().catch(() => '');
+      // NodeBB versions differ: some expose admin APIs under /api/admin instead of /api/v3/admin
+      if (res.status === 404 && typeof url === 'string' && url.includes('/api/v3/admin/')) {
+        const altUrl = url.replace('/api/v3/admin/', '/api/admin/');
+        const res2 = await fetch(altUrl, {
+          credentials: 'same-origin',
+          headers: (() => {
+            const headers = { 'Content-Type': 'application/json' };
+            const token =
+              (window.config && (window.config.csrf_token || window.config.csrfToken)) ||
+              (window.ajaxify && window.ajaxify.data && window.ajaxify.data.csrf_token) ||
+              (document.querySelector('meta[name="csrf-token"]') && document.querySelector('meta[name="csrf-token"]').getAttribute('content')) ||
+              (document.querySelector('meta[name="csrf_token"]') && document.querySelector('meta[name="csrf_token"]').getAttribute('content')) ||
+              (typeof app !== 'undefined' && app && app.csrfToken) ||
+              null;
+            if (token) headers['x-csrf-token'] = token;
+            return headers;
+          })(),
+          ...opts,
+        });
+        if (res2.ok) {
+          return await res2.json();
+        }
+      }
+      const text = await res.text().catch(() => '');
       throw new Error(`${res.status} ${text}`);
     }
     return await res.json();
@@ -244,36 +267,36 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
   }
 
   async function loadSettings() {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/settings');
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/settings');
   }
 
   async function saveSettings(payload) {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/settings', {
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/settings', {
       method: 'PUT',
       body: JSON.stringify(payload),
     });
   }
 
   async function loadPending() {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/pending');
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/pending');
   }
 
   async function approve(rid, payload) {
-    return await fetchJson(`/api/v3/admin/plugins/onekite-calendar/reservations/${rid}/approve`, {
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/approve`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function refuse(rid, payload) {
-    return await fetchJson(`/api/v3/admin/plugins/onekite-calendar/reservations/${rid}/refuse`, {
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/reservations/${rid}/refuse`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function purge(year) {
-    return await fetchJson('/api/v3/admin/plugins/onekite-calendar/purge', {
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/purge', {
       method: 'POST',
       body: JSON.stringify({ year }),
     });
@@ -281,30 +304,55 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
 
   async function purgeSpecialEvents(year) {
     try {
-      return await fetchJson('/api/v3/admin/plugins/onekite-calendar/special-events/purge', {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
         method: 'POST',
         body: JSON.stringify({ year }),
       });
     } catch (e) {
-      return await fetchJson('/api/v3/admin/plugins/onekite-calendar/special-events/purge', {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/special-events/purge', {
         method: 'POST',
         body: JSON.stringify({ year }),
       });
     }
   }
 
+  async function debugHelloAsso() {
+    try {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
+    } catch (e) {
+      return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
+    }
+  }
+
   async function loadAccounting(from, to) {
     const params = new URLSearchParams();
     if (from) params.set('from', from);
     if (to) params.set('to', to);
     const qs = params.toString();
-    return await fetchJson(`/api/v3/admin/plugins/onekite-calendar/accounting${qs ? `?${qs}` : ''}`);
+    return await fetchJson(`/api/v3/admin/plugins/calendar-onekite/accounting${qs ? `?${qs}` : ''}`);
   }
 
   async function init() {
     const form = document.getElementById('onekite-settings-form');
     if (!form) return;
 
+    // Make the HelloAsso debug output readable in both light and dark ACP themes.
+    // NodeBB 4.x uses Bootstrap variables, so we can rely on CSS variables here.
+    (function injectAdminCss() {
+      const id = 'onekite-admin-css';
+      if (document.getElementById(id)) return;
+      const style = document.createElement('style');
+      style.id = id;
+      style.textContent = `
+        #onekite-debug-output.onekite-debug-output {
+          background: var(--bs-body-bg) !important;
+          color: var(--bs-body-color) !important;
+          border: 1px solid var(--bs-border-color) !important;
+        }
+      `;
+      document.head.appendChild(style);
+    })();
+
     // Load settings
     try {
       const s = await loadSettings();
@@ -361,19 +409,19 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
 
     // Expose the latest save handler so the global delegated listener (bound once)
     // can always call the current instance tied to the current form.
-    window.onekiteCalendarAdminDoSave = doSave;
+    window.oneKiteCalendarAdminDoSave = doSave;
 
     // Save buttons (NodeBB header/footer "Enregistrer" + floppy icon)
     // Bind a SINGLE delegated listener for the entire admin session.
     const SAVE_SELECTOR = '#save, .save, [data-action="save"], .settings-save, .floating-save, .btn[data-action="save"]';
-    if (!window.onekiteCalendarAdminBound) {
-      window.onekiteCalendarAdminBound = true;
+    if (!window.oneKiteCalendarAdminBound) {
+      window.oneKiteCalendarAdminBound = true;
       document.addEventListener('click', (ev) => {
         const btn = ev.target && ev.target.closest && ev.target.closest(SAVE_SELECTOR);
         if (!btn) return;
         // Only handle clicks while we're on this plugin page
         if (!document.getElementById('onekite-settings-form')) return;
-        const fn = window.onekiteCalendarAdminDoSave;
+        const fn = window.oneKiteCalendarAdminDoSave;
         if (typeof fn === 'function') fn(ev);
       });
     }
@@ -626,6 +674,30 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
       });
     }
 
+    // Debug
+    const debugBtn = document.getElementById('onekite-debug-run');
+    if (debugBtn) {
+      debugBtn.addEventListener('click', async () => {
+        const out = document.getElementById('onekite-debug-output');
+        if (out) out.textContent = 'Chargement...';
+        try {
+          const result = await debugHelloAsso();
+          if (out) out.textContent = JSON.stringify(result, null, 2);
+          const catalogCount = result && result.catalog ? parseInt(result.catalog.count, 10) || 0 : 0;
+          const catalogOk = !!(result && result.catalog && result.catalog.ok);
+          // Accept "count > 0" even if ok flag is false (some proxies can strip fields, etc.)
+          if (catalogOk || catalogCount > 0) {
+            showAlert('success', `Catalogue HelloAsso: ${catalogCount} item(s)`);
+          } else {
+            showAlert('error', 'HelloAsso: impossible de récupérer le catalogue.');
+          }
+        } catch (e) {
+          if (out) out.textContent = String(e && e.message ? e.message : e);
+          showAlert('error', 'Debug impossible.');
+        }
+      });
+    }
+
     // Accounting (paid reservations)
     const accFrom = document.getElementById('onekite-acc-from');
     const accTo = document.getElementById('onekite-acc-to');
@@ -697,7 +769,7 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
         if (accFrom && accFrom.value) params.set('from', accFrom.value);
         if (accTo && accTo.value) params.set('to', accTo.value);
         const qs = params.toString();
-        const url = `/api/v3/admin/plugins/onekite-calendar/accounting.csv${qs ? `?${qs}` : ''}`;
+        const url = `/api/v3/admin/plugins/calendar-onekite/accounting.csv${qs ? `?${qs}` : ''}`;
         window.open(url, '_blank');
       });
 
@@ -710,7 +782,7 @@ define('admin/plugins/onekite-calendar', ['alerts', 'bootbox'], function (alerts
             if (accFrom && accFrom.value) params.set('from', accFrom.value);
             if (accTo && accTo.value) params.set('to', accTo.value);
             const qs = params.toString();
-            const url = `/api/v3/admin/plugins/onekite-calendar/accounting/purge${qs ? `?${qs}` : ''}`;
+            const url = `/api/v3/admin/plugins/calendar-onekite/accounting/purge${qs ? `?${qs}` : ''}`;
             const res = await fetchJson(url, { method: 'POST' });
             if (res && res.ok) {
               showAlert('success', `Compta purgée : ${res.purged || 0} réservation(s).`);

package/public/client.js

@@ -1,10 +1,10 @@
 /* global FullCalendar, ajaxify */
 
-define('forum/onekite-calendar', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
+define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alerts, bootbox, hooks) {
   'use strict';
 
   // Ensure small UI tweaks are applied even when themes override bootstrap defaults.
-  (function ensureOnekiteStyles() {
+  (function ensureOneKiteStyles() {
     try {
       if (document.getElementById('onekite-inline-styles')) return;
       const style = document.createElement('style');
@@ -498,7 +498,7 @@ define('forum/onekite-calendar', ['alerts', 'bootbox', 'hooks'], function (alert
   }
 
   async function loadCapabilities() {
-    return await fetchJson('/api/v3/plugins/onekite-calendar/capabilities');
+    return await fetchJson('/api/v3/plugins/calendar-onekite/capabilities');
   }
 
   // Leaflet (OpenStreetMap) helpers - loaded lazily only when needed.
@@ -706,34 +706,34 @@ function attachAddressAutocomplete(inputEl, onPick) {
 
   async function loadItems() {
     try {
-      return await fetchJson('/api/v3/plugins/onekite-calendar/items');
+      return await fetchJson('/api/v3/plugins/calendar-onekite/items');
     } catch (e) {
       return [];
     }
   }
 
   async function requestReservation(payload) {
-    return await fetchJson('/api/v3/plugins/onekite-calendar/reservations', {
+    return await fetchJson('/api/v3/plugins/calendar-onekite/reservations', {
       method: 'POST',
       body: JSON.stringify(payload),
     });
   }
 
   async function approveReservation(rid, payload) {
-    return await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${rid}/approve`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/approve`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
   }
 
   async function cancelReservation(rid) {
-    return await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${rid}/cancel`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/cancel`, {
       method: 'PUT',
     });
   }
 
   async function refuseReservation(rid, payload) {
-    return await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${rid}/refuse`, {
+    return await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${rid}/refuse`, {
       method: 'PUT',
       body: JSON.stringify(payload || {}),
     });
@@ -783,7 +783,7 @@ function toDatetimeLocalValue(date) {
     let blocked = new Set();
     try {
       const qs = new URLSearchParams({ start: selectionInfo.startStr, end: selectionInfo.endStr });
-      const evs = await fetchJson(`/api/v3/plugins/onekite-calendar/events?${qs.toString()}`);
+      const evs = await fetchJson(`/api/v3/plugins/calendar-onekite/events?${qs.toString()}`);
       (evs || []).forEach((ev) => {
         const st = (ev.extendedProps && ev.extendedProps.status) || '';
         if (!['pending', 'awaiting_payment', 'approved', 'paid'].includes(st)) return;
@@ -1094,7 +1094,7 @@ function toDatetimeLocalValue(date) {
           window.__onekiteEventsAbort = abort;
 
           const qs = new URLSearchParams({ start: info.startStr, end: info.endStr });
-          const url = `/api/v3/plugins/onekite-calendar/events?${qs.toString()}`;
+          const url = `/api/v3/plugins/calendar-onekite/events?${qs.toString()}`;
           const data = await fetchJsonCached(url, { signal: abort.signal });
 
           // Prefetch adjacent range (previous/next) for snappier navigation.
@@ -1108,8 +1108,8 @@ function toDatetimeLocalValue(date) {
               const toStr = (d) => new Date(d.getTime()).toISOString();
               const qPrev = new URLSearchParams({ start: toStr(prevStart), end: toStr(prevEnd) });
               const qNext = new URLSearchParams({ start: toStr(nextStart), end: toStr(nextEnd) });
-              fetchJsonCached(`/api/v3/plugins/onekite-calendar/events?${qPrev.toString()}`).catch(() => {});
-              fetchJsonCached(`/api/v3/plugins/onekite-calendar/events?${qNext.toString()}`).catch(() => {});
+              fetchJsonCached(`/api/v3/plugins/calendar-onekite/events?${qPrev.toString()}`).catch(() => {});
+              fetchJsonCached(`/api/v3/plugins/calendar-onekite/events?${qNext.toString()}`).catch(() => {});
             }
           } catch (e) {}
 
@@ -1171,11 +1171,11 @@ function toDatetimeLocalValue(date) {
               isDialogOpen = false;
               return;
             }
-            await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
               method: 'POST',
               body: JSON.stringify(payload),
             }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
                 method: 'POST',
                 body: JSON.stringify(payload),
               });
@@ -1265,11 +1265,11 @@ function toDatetimeLocalValue(date) {
               isDialogOpen = false;
               return;
             }
-            await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+            await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
               method: 'POST',
               body: JSON.stringify(payload),
             }).catch(async () => {
-              return await fetchJson('/api/v3/plugins/onekite-calendar/special-events', {
+              return await fetchJson('/api/v3/plugins/calendar-onekite/special-events', {
                 method: 'POST',
                 body: JSON.stringify(payload),
               });
@@ -1296,10 +1296,10 @@ function toDatetimeLocalValue(date) {
         let p = p0;
         try {
           if (p0.type === 'reservation' && p0.rid) {
-            const details = await fetchJson(`/api/v3/plugins/onekite-calendar/reservations/${encodeURIComponent(String(p0.rid))}`);
+            const details = await fetchJson(`/api/v3/plugins/calendar-onekite/reservations/${encodeURIComponent(String(p0.rid))}`);
             p = Object.assign({}, p0, details);
           } else if (p0.type === 'special' && p0.eid) {
-            const details = await fetchJson(`/api/v3/plugins/onekite-calendar/special-events/${encodeURIComponent(String(p0.eid))}`);
+            const details = await fetchJson(`/api/v3/plugins/calendar-onekite/special-events/${encodeURIComponent(String(p0.eid))}`);
             p = Object.assign({}, p0, details, {
               // keep backward compat with older field names used by templates below
               pickupAddress: details.address || details.pickupAddress || p0.pickupAddress,
@@ -1348,7 +1348,7 @@ function toDatetimeLocalValue(date) {
                   callback: async () => {
                     try {
                       const eid = String(p.eid || ev.id).replace(/^special:/, '');
-                      await fetchJson(`/api/v3/plugins/onekite-calendar/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) {
@@ -1667,7 +1667,7 @@ function toDatetimeLocalValue(date) {
     });
 
     // Expose for live updates
-    try { window.onekiteCalendar = calendar; } catch (e) {}
+    try { window.oneKiteCalendar = calendar; } catch (e) {}
 
     calendar.render();
 
@@ -1766,7 +1766,7 @@ function toDatetimeLocalValue(date) {
   function autoInit(data) {
     try {
       const tpl = data && data.template ? data.template.name : (ajaxify && ajaxify.data && ajaxify.data.template ? ajaxify.data.template.name : '');
-      if (tpl === 'onekite-calendar') {
+      if (tpl === 'calendar-onekite') {
         init('#onekite-calendar');
       }
     } catch (e) {}
@@ -1786,9 +1786,9 @@ function toDatetimeLocalValue(date) {
 try {
   if (!window.__oneKiteSocketBound && typeof socket !== 'undefined' && socket && typeof socket.on === 'function') {
     window.__oneKiteSocketBound = true;
-    socket.on('event:onekite-calendar.reservationUpdated', function () {
+    socket.on('event:calendar-onekite.reservationUpdated', function () {
       try {
-        const cal = window.onekiteCalendar;
+        const cal = window.oneKiteCalendar;
         scheduleRefetch(cal);
       } catch (e) {}
     });

package/templates/admin/plugins/{onekite-calendar.tpl → calendar-onekite.tpl}

@@ -2,10 +2,22 @@
 
 <div class="row">
   <div class="col-lg-9">
-    <h1>Calendar Onekite</h1>
+    <h1>Calendar OneKite</h1>
 
     <ul class="nav nav-tabs mt-3" role="tablist">
-<li class="nav-item" role="presentation">
+      <li class="nav-item" role="presentation">
+        <button class="nav-link active" data-bs-toggle="tab" data-bs-target="#onekite-tab-settings" type="button" role="tab">Locations</button>
+      </li>
+      <li class="nav-item" role="presentation">
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-events" type="button" role="tab">Évènements</button>
+      </li>
+      <li class="nav-item" role="presentation">
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-pending" type="button" role="tab">Demandes en attente</button>
+      </li>
+      <li class="nav-item" role="presentation">
+        <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-debug" type="button" role="tab">Debug HelloAsso</button>
+      </li>
+      <li class="nav-item" role="presentation">
         <button class="nav-link" data-bs-toggle="tab" data-bs-target="#onekite-tab-accounting" type="button" role="tab">Comptabilisation</button>
       </li>
     </ul>
@@ -142,7 +154,14 @@
         <h4>Demandes en attente</h4>
         <div id="onekite-pending" class="list-group"></div>
       </div>
-<div class="tab-pane fade" id="onekite-tab-accounting" role="tabpanel">
+
+      <div class="tab-pane fade" id="onekite-tab-debug" role="tabpanel">
+        <p class="text-muted">Teste la récupération du token et la liste du matériel (catalogue).</p>
+        <button type="button" class="btn btn-secondary me-2" id="onekite-debug-run">Tester le chargement du matériel</button>
+        <pre id="onekite-debug-output" class="mt-3 p-3 border rounded onekite-debug-output" style="max-height: 360px; overflow: auto;"></pre>
+      </div>
+
+      <div class="tab-pane fade" id="onekite-tab-accounting" role="tabpanel">
         <h4>Comptabilisation des locations (payées)</h4>
         <div class="d-flex flex-wrap gap-2 align-items-end mb-3">
           <div>
@@ -186,7 +205,7 @@
 </div>
 
 <script>
-  require(['admin/plugins/onekite-calendar'], function (mod) {
+  require(['admin/plugins/calendar-onekite'], function (mod) {
     if (mod && mod.init) {
       mod.init();
     }

package/templates/{onekite-calendar.tpl → calendar-onekite.tpl}

@@ -21,17 +21,6 @@
   The plugin's forum script auto-initialises on the calendar page via ajaxify.
 -->
 
-<script>
-  // Ultra-perf: load the forum JS only on the calendar page.
-  require(['forum/onekite-calendar'], function (mod) {
-    try {
-      if (mod && typeof mod.init === 'function') {
-        mod.init('#onekite-calendar');
-      }
-    } catch (e) {}
-  });
-</script>
-
 
 <style>
   /* Make the custom "Évènement" button distinct from view buttons */

package/lib/constants.js

@@ -1,7 +0,0 @@
-'use strict';
-
-// Primary namespace for this plugin (NodeBB 4.x)
-module.exports = {
-  NAMESPACE: 'onekite-calendar',
-  WIDGET_ID: 'onekite-calendar-twoweeks',
-};

package/lib/email.js

@@ -1,26 +0,0 @@
-'use strict';
-
-const meta = require.main.require('./src/meta');
-const emailer = require.main.require('./src/emailer');
-
-function defaultLanguage() {
-  return (meta && meta.config && (meta.config.defaultLang || meta.config.defaultLanguage)) || 'fr';
-}
-
-/**
- * Send a transactional email using NodeBB's emailer (NodeBB 4.x).
- */
-async function sendEmail(template, toEmail, subject, data) {
-  if (!toEmail) return;
-  if (!emailer || typeof emailer.sendToEmail !== 'function') {
-    throw new Error('Emailer not available (sendToEmail missing)');
-  }
-
-  const language = defaultLanguage();
-  const params = Object.assign({}, data || {}, subject ? { subject } : {});
-  await emailer.sendToEmail(template, toEmail, language, params);
-}
-
-module.exports = {
-  sendEmail,
-};

package/lib/log.js

@@ -1,29 +0,0 @@
-'use strict';
-
-// Minimal, opt-in logging.
-// Enable by setting ONEKITE_CALENDAR_DEBUG=1 in the NodeBB process env.
-
-let logger;
-try {
-  logger = require.main.require('./src/logger');
-} catch (e) {
-  logger = null;
-}
-
-const enabled = () => !!process.env.ONEKITE_CALENDAR_DEBUG;
-
-function warn(msg, meta) {
-  if (!enabled()) return;
-  if (logger && typeof logger.warn === 'function') {
-    logger.warn(`[onekite-calendar] ${msg}`, meta || '');
-  }
-}
-
-function error(msg, meta) {
-  if (!enabled()) return;
-  if (logger && typeof logger.error === 'function') {
-    logger.error(`[onekite-calendar] ${msg}`, meta || '');
-  }
-}
-
-module.exports = { warn, error };