nodebb-plugin-calendar-onekite 11.1.14 → 11.1.16

package/lib/admin.js

@@ -157,4 +157,66 @@ admin.purgeByYear = async function (req, res) {
   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 },
+    items: { 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 };
+
+    try {
+      const items = await helloasso.listItems({
+        env,
+        token,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        formType: settings.helloassoFormType,
+        formSlug: settings.helloassoFormSlug,
+      });
+      const arr = Array.isArray(items) ? items : [];
+      out.items.ok = true;
+      out.items.count = arr.length;
+      out.items.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.items = { 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);
+  }
+};
+
 module.exports = admin;

package/library.js

@@ -36,11 +36,11 @@ Plugin.init = async function (params) {
   );
 
   // Admin API (JSON)
-  const adminMws = mw(
-    middleware.exposeUid,
-    middleware.ensureLoggedIn,
-    middleware.admin && middleware.admin.checkPrivileges
-  );
+  // checkPrivileges() returns a middleware when called with a privilege string.
+  const privMw = (middleware.admin && typeof middleware.admin.checkPrivileges === 'function')
+    ? middleware.admin.checkPrivileges('admin:settings')
+    : null;
+  const adminMws = mw(middleware.exposeUid, middleware.ensureLoggedIn, privMw);
 
   router.get('/api/v3/admin/plugins/calendar-onekite/settings', adminMws, admin.getSettings);
   router.put('/api/v3/admin/plugins/calendar-onekite/settings', adminMws, admin.saveSettings);
@@ -51,6 +51,8 @@ Plugin.init = async function (params) {
 
   router.post('/api/v3/admin/plugins/calendar-onekite/purge', adminMws, admin.purgeByYear);
 
+  router.get('/api/v3/admin/plugins/calendar-onekite/debug', adminMws, admin.debugHelloAsso);
+
   scheduler.start();
 };
 

package/package.json

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

package/public/admin.js

@@ -106,6 +106,10 @@ define('admin/plugins/calendar-onekite', ['alerts', 'bootbox'], function (alerts
     });
   }
 
+  async function debugHelloAsso() {
+    return await fetchJson('/api/v3/admin/plugins/calendar-onekite/debug');
+  }
+
   async function init() {
     const form = document.getElementById('onekite-settings-form');
     if (!form) return;
@@ -194,6 +198,27 @@ define('admin/plugins/calendar-onekite', ['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);
+          if (result && result.items && result.items.ok) {
+            showAlert('success', `Items HelloAsso: ${result.items.count}`);
+          } else {
+            showAlert('error', 'HelloAsso: impossible de récupérer les items.');
+          }
+        } catch (e) {
+          if (out) out.textContent = String(e && e.message ? e.message : e);
+          showAlert('error', 'Debug impossible.');
+        }
+      });
+    }
   }
 
   return { init };

package/templates/admin/plugins/calendar-onekite.tpl

@@ -1,12 +1,27 @@
 <!-- IMPORT admin/partials/settings/header.tpl -->
 
 <div class="acp-page-container">
-  <div class="row">
-    <div class="col-lg-8">
-      <h2>Calendar OneKite</h2>
-      <div class="alert alert-info">Paramètres du plugin de calendrier / réservation.</div>
+  <h2>Calendar OneKite</h2>
+  <div class="alert alert-info">Paramètres du plugin de calendrier / réservation.</div>
 
-      <form id="onekite-settings-form">
+  <ul class="nav nav-tabs" role="tablist">
+    <li class="nav-item" role="presentation">
+      <button class="nav-link active" id="onekite-tab-settings" data-bs-toggle="tab" data-bs-target="#onekite-pane-settings" type="button" role="tab">Paramètres</button>
+    </li>
+    <li class="nav-item" role="presentation">
+      <button class="nav-link" id="onekite-tab-pending" data-bs-toggle="tab" data-bs-target="#onekite-pane-pending" type="button" role="tab">Demandes</button>
+    </li>
+    <li class="nav-item" role="presentation">
+      <button class="nav-link" id="onekite-tab-purge" data-bs-toggle="tab" data-bs-target="#onekite-pane-purge" type="button" role="tab">Purge</button>
+    </li>
+    <li class="nav-item" role="presentation">
+      <button class="nav-link" id="onekite-tab-debug" data-bs-toggle="tab" data-bs-target="#onekite-pane-debug" type="button" role="tab">Debug</button>
+    </li>
+  </ul>
+
+  <div class="tab-content pt-3">
+    <div class="tab-pane fade show active" id="onekite-pane-settings" role="tabpanel" aria-labelledby="onekite-tab-settings">
+      <form id="onekite-settings-form" style="max-width: 860px;">
         <div class="mb-3">
           <label class="form-label">Groupes autorisés (séparés par virgules)</label>
           <input class="form-control" name="allowedGroups" placeholder="registered-users, membres">
@@ -54,8 +69,13 @@
 
         <button type="button" class="btn btn-primary" id="onekite-save">Enregistrer</button>
       </form>
+    </div>
 
-      <hr>
+    <div class="tab-pane fade" id="onekite-pane-pending" role="tabpanel" aria-labelledby="onekite-tab-pending">
+      <div id="onekite-pending" class="list-group" style="max-width: 860px;"></div>
+    </div>
+
+    <div class="tab-pane fade" id="onekite-pane-purge" role="tabpanel" aria-labelledby="onekite-tab-purge">
       <h5>Purger</h5>
       <div class="input-group" style="max-width: 280px;">
         <input id="onekite-purge-year" class="form-control" placeholder="YYYY" maxlength="4">
@@ -64,9 +84,12 @@
       <small class="text-muted">Supprime toutes les réservations dont la date de début est dans l'année donnée.</small>
     </div>
 
-    <div class="col-lg-4">
-      <h5>Demandes en attente</h5>
-      <div id="onekite-pending" class="list-group"></div>
+    <div class="tab-pane fade" id="onekite-pane-debug" role="tabpanel" aria-labelledby="onekite-tab-debug">
+      <div class="mb-2">
+        <button type="button" class="btn btn-outline-secondary" id="onekite-debug-run">Tester le chargement du matériel (HelloAsso)</button>
+      </div>
+      <pre id="onekite-debug-output" class="p-2 bg-body-tertiary" style="border-radius: 8px; max-width: 860px; min-height: 160px; overflow:auto;"></pre>
+      <small class="text-muted">Affiche l'état du token OAuth2 et un échantillon des items récupérés.</small>
     </div>
   </div>
 </div>