nodebb-plugin-equipment-calendar 0.8.0 → 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) {
@@ -796,10 +811,19 @@ async function handleHelloAssoTest(req, res) {
   let count = 0;
 
   try {
-    await getHelloAssoAccessToken(settings);
+    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) {
@@ -813,6 +837,8 @@ async function handleHelloAssoTest(req, res) {
     message,
     count,
     settings,
+    sampleItems,
+    hasSampleItems: sampleItems && sampleItems.length > 0,
   });
 }
 
@@ -1368,6 +1394,10 @@ async function handleAdminSave(req, res) {
       approverGroup: String(req.body.approverGroup || DEFAULT_SETTINGS.approverGroup),
       notifyGroup: String(req.body.notifyGroup || DEFAULT_SETTINGS.notifyGroup),
       itemsJson: String(req.body.itemsJson || DEFAULT_SETTINGS.itemsJson),
+      itemsSource: String(req.body.itemsSource || DEFAULT_SETTINGS.itemsSource),
+      ha_itemsFormType: String(req.body.ha_itemsFormType || DEFAULT_SETTINGS.ha_itemsFormType),
+      ha_itemsFormSlug: String(req.body.ha_itemsFormSlug || DEFAULT_SETTINGS.ha_itemsFormSlug),
+      ha_locationMapJson: String(req.body.ha_locationMapJson || DEFAULT_SETTINGS.ha_locationMapJson),
       ha_clientId: String(req.body.ha_clientId || ''),
       ha_clientSecret: String(req.body.ha_clientSecret || ''),
       ha_organizationSlug: String(req.body.ha_organizationSlug || ''),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "0.8.0",
+  "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.4",
+  "version": "0.4.7",
   "minver": "4.7.1"
 }

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

@@ -9,6 +9,11 @@
   </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 }}}
@@ -18,5 +23,32 @@
     <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>