nodebb-plugin-equipment-calendar 0.7.1 → 0.8.1

package/library.js

@@ -60,20 +60,23 @@ function parseLocationMap(locationMapJson) {
 
 let haTokenCache = null; // { accessToken, refreshToken, expMs }
 
-async function getHelloAssoAccessToken(settings) {
+async function getHelloAssoAccessToken(settings, opts = {}) {
   const now = Date.now();
-  if (haTokenCache && haTokenCache.accessToken && haTokenCache.expMs && now < haTokenCache.expMs - 30_000) {
+  if (!opts.force && haTokenCache && haTokenCache.accessToken && haTokenCache.expMs && now < haTokenCache.expMs - 30_000) {
     return haTokenCache.accessToken;
   }
 
   const tokenKey = 'equipmentCalendar:ha:token';
+  if (opts.clearStored) {
+    try { await db.delete(tokenKey); } catch (e) {}
+  }
   let stored = null;
   try {
     stored = await db.getObject(tokenKey);
   } catch (e) {}
 
   // If refresh token exists and not expired locally, try refresh flow first
-  const canRefresh = stored && stored.refresh_token;
+  const canRefresh = !opts.force && stored && stored.refresh_token;
   const useRefresh = canRefresh && stored.refresh_expires_at && now < parseInt(stored.refresh_expires_at, 10);
 
   const formBody = new URLSearchParams();
@@ -158,7 +161,11 @@ async function createHelloAssoCheckoutIntent(settings, bookingId, reservations)
     },
   };
 
-  const token = await getHelloAssoAccessToken(settings);
+  const token = const force = String(req.query.force || '') === '1';
+    const clear = String(req.query.clear || '') === '1';
+    // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
+    haTokenCache = null;
+    await getHelloAssoAccessToken(settings, { force, clearStored: clear });
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/checkout-intents`;
   const resp = await fetchFn(url, {
     method: 'POST',
@@ -179,7 +186,11 @@ async function createHelloAssoCheckoutIntent(settings, bookingId, reservations)
 
 async function fetchHelloAssoCheckoutIntent(settings, checkoutIntentId) {
   const org = String(settings.ha_organizationSlug || '').trim();
-  const token = await getHelloAssoAccessToken(settings);
+  const token = const force = String(req.query.force || '') === '1';
+    const clear = String(req.query.clear || '') === '1';
+    // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
+    haTokenCache = null;
+    await getHelloAssoAccessToken(settings, { force, clearStored: clear });
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/checkout-intents/${encodeURIComponent(checkoutIntentId)}`;
   const resp = await fetchFn(url, { headers: { authorization: `Bearer ${token}`, accept: 'application/json' } });
   if (!resp.ok) {
@@ -219,7 +230,11 @@ async function fetchHelloAssoItems(settings) {
     } catch (e) {}
   }
 
-  const token = await getHelloAssoAccessToken(settings);
+  const token = const force = String(req.query.force || '') === '1';
+    const clear = String(req.query.clear || '') === '1';
+    // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
+    haTokenCache = null;
+    await getHelloAssoAccessToken(settings, { force, clearStored: clear });
   const url = `https://api.helloasso.com/v5/organizations/${encodeURIComponent(org)}/forms/${encodeURIComponent(formType)}/${encodeURIComponent(formSlug)}/items`;
   const resp = await fetchFn(url, { headers: { authorization: `Bearer ${token}` } });
   if (!resp.ok) {
@@ -564,6 +579,8 @@ plugin.init = async function (params) {
   if (mid && mid.admin) {
     router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
     router.get('/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, mid.admin.buildHeader, renderAdminReservationsPage);
+    router.get('/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, mid.admin.buildHeader, handleHelloAssoTest);
+    router.get('/api/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, handleHelloAssoTest);
     router.get('/api/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, renderAdminReservationsPage);
     router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
     router.post('/admin/plugins/equipment-calendar/save', middleware.applyCSRF, handleAdminSave);
@@ -652,6 +669,8 @@ plugin.addAdminRoutes = async function (params) {
   const { router, middleware: mid } = params;
   router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
     router.get('/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, mid.admin.buildHeader, renderAdminReservationsPage);
+    router.get('/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, mid.admin.buildHeader, handleHelloAssoTest);
+    router.get('/api/admin/plugins/equipment-calendar/helloasso-test', middleware.applyCSRF, handleHelloAssoTest);
     router.get('/api/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, renderAdminReservationsPage);
   router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
 };
@@ -781,13 +800,53 @@ async function handleAdminDelete(req, res) {
   return res.redirect('/admin/plugins/equipment-calendar/reservations?updated=1');
 }
 
+
+async function handleHelloAssoTest(req, res) {
+  const isAdmin = req.uid ? await groups.isMember(req.uid, 'administrators') : false;
+  if (!isAdmin) return helpers.notAllowed(req, res);
+
+  const settings = await getSettings();
+  let ok = false;
+  let message = '';
+  let count = 0;
+
+  try {
+    const force = String(req.query.force || '') === '1';
+    const clear = String(req.query.clear || '') === '1';
+    // force=1 skips in-memory cache and refresh_token; clear=1 wipes stored refresh token
+    haTokenCache = null;
+    await getHelloAssoAccessToken(settings, { force, clearStored: clear });
+    const items = await fetchHelloAssoItems(settings);
+    const list = Array.isArray(items) ? items : (Array.isArray(items.data) ? items.data : []);
+    count = list.length;
+    const sampleItems = list.slice(0, 10).map(it => ({
+      id: String(it.id || it.itemId || it.reference || it.slug || it.name || '').trim(),
+      name: String(it.name || it.label || it.title || '').trim(),
+      rawName: String(it.name || it.label || it.title || it.id || '').trim(),
+    }));
+    ok = true;
+    message = `OK: token valide. Items récupérés: ${count}.`;
+  } catch (e) {
+    ok = false;
+    message = (e && e.message) ? e.message : String(e);
+  }
+
+  res.render('admin/plugins/equipment-calendar-helloasso-test', {
+    title: 'Equipment Calendar - Test HelloAsso',
+    ok,
+    message,
+    count,
+    settings,
+    sampleItems,
+    hasSampleItems: sampleItems && sampleItems.length > 0,
+  });
+}
+
 async function renderAdminPage(req, res) {
   const settings = await getSettings();
   res.render('admin/plugins/equipment-calendar', {
     title: 'Equipment Calendar',
     settings,
-    view_itemsSourceManual: String(settings.itemsSource || 'manual') !== 'helloasso',
-    view_itemsSourceHelloasso: String(settings.itemsSource || 'manual') === 'helloasso',
     saved: req.query && String(req.query.saved || '') === '1',
     purged: req.query && parseInt(req.query.purged, 10) || 0,
     view_dayGridMonth: (settings.defaultView || 'dayGridMonth') === 'dayGridMonth',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.7.1",
+  "version": "0.8.1",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -26,6 +26,6 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "0.4.2",
+  "version": "0.4.7",
   "minver": "4.7.1"
 }

package/public/templates/admin/plugins/equipment-calendar-helloasso-test.tpl

@@ -0,0 +1,54 @@
+<div class="acp-page-container">
+  <div class="d-flex align-items-center justify-content-between flex-wrap gap-2">
+    <h1 class="mb-0">Equipment Calendar</h1>
+    <div class="btn-group">
+      <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar">Paramètres</a>
+      <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar/reservations">Réservations</a>
+      <a class="btn btn-secondary active" href="/admin/plugins/equipment-calendar/helloasso-test">Test HelloAsso</a>
+    </div>
+  </div>
+
+  <div class="card card-body mt-3">
+    <div class="d-flex flex-wrap gap-2 mb-2">
+      <a class="btn btn-outline-primary" href="/admin/plugins/equipment-calendar/helloasso-test">Test (cache OK)</a>
+      <a class="btn btn-outline-primary" href="/admin/plugins/equipment-calendar/helloasso-test?force=1">Test (forcer nouveau token)</a>
+      <a class="btn btn-outline-danger" href="/admin/plugins/equipment-calendar/helloasso-test?force=1&clear=1" onclick="return confirm('Supprimer le token stocké et retester ?');">Vider token + retester</a>
+    </div>
+    {{{ if ok }}}
+      <div class="alert alert-success">{message}</div>
+    {{{ else }}}
+      <div class="alert alert-danger">Échec : {message}</div>
+    {{{ end }}}
+
+    <div class="small text-muted">
+      Form: <code>{settings.ha_itemsFormType}</code> / <code>{settings.ha_itemsFormSlug}</code> — Orga: <code>{settings.ha_organizationSlug}</code>
+    </div>
+    {{{ if hasSampleItems }}}
+  <div class="card card-body mt-3">
+    <div class="d-flex flex-wrap gap-2 mb-2">
+      <a class="btn btn-outline-primary" href="/admin/plugins/equipment-calendar/helloasso-test">Test (cache OK)</a>
+      <a class="btn btn-outline-primary" href="/admin/plugins/equipment-calendar/helloasso-test?force=1">Test (forcer nouveau token)</a>
+      <a class="btn btn-outline-danger" href="/admin/plugins/equipment-calendar/helloasso-test?force=1&clear=1" onclick="return confirm('Supprimer le token stocké et retester ?');">Vider token + retester</a>
+    </div>
+    <h5 class="mb-2">Aperçu (10 premiers articles)</h5>
+    <div class="table-responsive">
+      <table class="table table-striped align-middle">
+        <thead>
+          <tr>
+            <th>ID</th>
+            <th>Nom</th>
+          </tr>
+        </thead>
+        <tbody>
+          {{{ each sampleItems }}}
+          <tr>
+            <td><code>{sampleItems.id}</code></td>
+            <td>{sampleItems.rawName}</td>
+          </tr>
+          {{{ end }}}
+        </tbody>
+      </table>
+    </div>
+  </div>
+  {{{ end }}}
+</div>

package/public/templates/admin/plugins/equipment-calendar.tpl

@@ -4,6 +4,7 @@
   <div class="btn-group">
     <a class="btn btn-secondary active" href="/admin/plugins/equipment-calendar">Paramètres</a>
     <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar/reservations">Réservations</a>
+    <a class="btn btn-outline-secondary" href="/admin/plugins/equipment-calendar/helloasso-test">Test HelloAsso</a>
   </div>
 </div>
 
@@ -58,8 +59,8 @@
       <div class="mb-3">
         <label class="form-label">Source</label>
         <select class="form-select" name="itemsSource">
-          <option value="manual" {{{ if view_itemsSourceManual }}}selected{{{ end }}}>Manuel (JSON)</option>
-          <option value="helloasso" {{{ if view_itemsSourceHelloasso }}}selected{{{ end }}}>HelloAsso (articles d’un formulaire)</option>
+          <option value="manual">Manuel (JSON)</option>
+          <option value="helloasso">HelloAsso (articles d’un formulaire)</option>
         </select>
         <div class="form-text">Si HelloAsso est choisi, la liste du matériel est récupérée via l’API HelloAsso (items d’un formulaire).</div>
       </div>