nodebb-plugin-onekite-calendar 2.0.98 → 2.1.0

package/lib/api.js

@@ -1502,7 +1502,6 @@ api.createReservation = async function (req, res) {
               start: formatFR(start),
               end: formatFR(end),
               total: resv.total || 0,
-              adminUrl: `${forumBaseUrl()}/admin/plugins/calendar-onekite`,
             });
           }
         }

package/lib/helloasso.js

@@ -26,15 +26,16 @@ function requestJson(method, url, headers = {}, bodyObj = null) {
         resp.on('data', (chunk) => { data += chunk; });
         resp.on('end', () => {
           const status = resp.statusCode || 0;
+          const headers = resp.headers || {};
 
           // Try JSON first, but never throw from here (avoid crashing NodeBB).
           try {
             const json = data ? JSON.parse(data) : null;
-            return resolve({ status, json });
+            return resolve({ status, json, headers });
           } catch (e) {
             // Non-JSON response (HTML/proxy error/etc.)
             const snippet = String(data || '').slice(0, 500);
-            return resolve({ status, json: null, raw: snippet });
+            return resolve({ status, json: null, raw: snippet, headers });
           }
         });
       }
@@ -177,6 +178,14 @@ async function _fetchAccessTokenWithRetry(params) {
   return { token: null, expiresAt: 0 };
 }
 
+// Force the next getAccessToken() call to fetch a fresh token instead of reusing
+// the in-memory cache. Callers should invoke this after a downstream API call
+// comes back 401/403 with a cached token, since a stale/rotated-secret token
+// would otherwise keep failing silently for up to ~1h (the normal cache TTL).
+function invalidateTokenCache() {
+  _tokenCache = { token: null, expiresAt: 0 };
+}
+
 async function getAccessToken({ env, clientId, clientSecret }) {
   if (!clientId || !clientSecret) return null;
 
@@ -331,18 +340,60 @@ async function getPaymentDetails({ env, token, paymentId }) {
 
 
 
+// Returns { ok, status, reason, json }. On success, ok=true and json is the checkout
+// intent payload. On failure, ok=false and `reason` distinguishes a genuine 404 from
+// transient errors (rate-limit, auth, network, 5xx) so callers don't misreport
+// "does not exist" for issues that are actually retryable.
 async function getCheckoutIntentDetails({ env, token, organizationSlug, checkoutIntentId }) {
-  if (!token || !organizationSlug || !checkoutIntentId) return null;
+  if (!token || !organizationSlug || !checkoutIntentId) {
+    return { ok: false, status: 0, reason: 'missing-params', json: null };
+  }
   const url = `${baseUrl(env)}/v5/organizations/${encodeURIComponent(String(organizationSlug))}/checkout-intents/${encodeURIComponent(String(checkoutIntentId))}`;
-  const { status, json } = await requestJson('GET', url, { Authorization: `Bearer ${token}` });
-  if (status >= 200 && status < 300) {
-    return json || null;
+
+  let last = { status: 0, json: null };
+  for (let attempt = 0; attempt < 3; attempt++) {
+    // eslint-disable-next-line no-await-in-loop
+    const result = await requestJson('GET', url, { Authorization: `Bearer ${token}` });
+    last = result;
+    const { status, json, raw, headers } = result;
+
+    if (status >= 200 && status < 300) {
+      return { ok: true, status, reason: null, json: json || null };
+    }
+
+    const rateLimited = _isRateLimited(status, json, raw);
+    const networkish = status === 0;
+
+    if ((rateLimited || networkish) && attempt < 2) {
+      const base = 1000 * (2 ** attempt);
+      const ra = _retryAfterMs(headers);
+      const jitter = Math.floor(Math.random() * 200);
+      // eslint-disable-next-line no-await-in-loop
+      await _sleep(Math.min(15_000, Math.max(base, ra) + jitter));
+      continue;
+    }
+    break;
   }
-  return null;
+
+  const { status, json, raw, error } = last;
+  let reason = 'http-error';
+  if (status === 0) reason = 'network-error';
+  else if (status === 401 || status === 403) reason = 'unauthorized';
+  else if (status === 404) reason = 'not-found';
+  else if (status === 429) reason = 'rate-limited';
+  else if (status >= 500) reason = 'server-error';
+
+  // eslint-disable-next-line no-console
+  console.warn('[calendar-onekite] HelloAsso getCheckoutIntentDetails failed', {
+    checkoutIntentId, status, reason, detail: raw || error || (json ? JSON.stringify(json).slice(0, 300) : ''),
+  });
+
+  return { ok: false, status, reason, json: json || null };
 }
 
 module.exports = {
   getAccessToken,
+  invalidateTokenCache,
   listItems,
   getFormPublic,
   extractCatalogItems,

package/lib/helloassoWebhook.js

@@ -218,13 +218,14 @@ async function tryRecoverRidFromCheckoutIntent(settings, checkoutIntentId) {
       clientSecret: settings.helloassoClientSecret,
     });
     if (!token) return null;
-    const details = await helloasso.getCheckoutIntentDetails({
+    const detailsResult = await helloasso.getCheckoutIntentDetails({
       env: settings.helloassoEnv || 'prod',
       token,
       organizationSlug: settings.helloassoOrganizationSlug,
       checkoutIntentId,
     });
-    if (!details) return null;
+    if (!detailsResult.ok || !detailsResult.json) return null;
+    const details = detailsResult.json;
     const rid = getReservationIdFromPayload({ data: details });
     if (rid) {
       try { await db.setObjectField(dbLayer.KEY_CHECKOUT_INTENT_TO_RID, String(checkoutIntentId), String(rid)); } catch (e) {}

package/lib/syncPayment.js

@@ -42,13 +42,52 @@ async function syncPayment({ r, settings, actorUid }) {
   });
   if (!token) return { ok: false, reason: 'helloasso-auth-failed' };
 
-  const details = await helloasso.getCheckoutIntentDetails({
+  let detailsResult = await helloasso.getCheckoutIntentDetails({
     env: settings.helloassoEnv || 'prod',
     token,
     organizationSlug: settings.helloassoOrganizationSlug,
     checkoutIntentId,
   });
-  if (!details) return { ok: false, reason: 'checkout-intent-not-found' };
+
+  // A cached token can go stale (e.g. HelloAsso secret rotated in ACP) and would
+  // otherwise keep failing every retry for up to ~1h. Force one fresh-token retry.
+  if (!detailsResult.ok && detailsResult.reason === 'unauthorized') {
+    helloasso.invalidateTokenCache();
+    const freshToken = await helloasso.getAccessToken({
+      env: settings.helloassoEnv || 'prod',
+      clientId: settings.helloassoClientId,
+      clientSecret: settings.helloassoClientSecret,
+    });
+    if (freshToken) {
+      detailsResult = await helloasso.getCheckoutIntentDetails({
+        env: settings.helloassoEnv || 'prod',
+        token: freshToken,
+        organizationSlug: settings.helloassoOrganizationSlug,
+        checkoutIntentId,
+      });
+    }
+  }
+
+  if (!detailsResult.ok) {
+    // Only a genuine HTTP 404 means "does not exist on HelloAsso". Everything else
+    // (rate-limit, auth, network, 5xx) is transient — surface it distinctly so the
+    // admin knows to retry rather than assuming the payment is missing.
+    const reasonMap = {
+      'not-found': 'checkout-intent-not-found',
+      'rate-limited': 'helloasso-rate-limited-try-again',
+      'unauthorized': 'helloasso-auth-failed',
+      'network-error': 'helloasso-network-error-try-again',
+      'server-error': 'helloasso-server-error-try-again',
+      'missing-params': 'no-checkout-intent-id',
+    };
+    return {
+      ok: false,
+      reason: reasonMap[detailsResult.reason] || `helloasso-error-${detailsResult.status || 'unknown'}`,
+      httpStatus: detailsResult.status,
+    };
+  }
+  const details = detailsResult.json;
+  if (!details) return { ok: false, reason: 'checkout-intent-empty-response' };
 
   const order = details.order ? details.order : details;
   const orderState = String((order.state || order.status) || '').toLowerCase();

package/package.json

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

package/public/client.js

@@ -2433,7 +2433,22 @@ function toDatetimeLocalValue(date) {
                     try { bootbox.hideAll(); } catch (e) {}
                   } else {
                     const reason = (resp && resp.reason) || 'inconnu';
-                    showAlert('warning', `Paiement non confirmé chez HelloAsso (${reason}).`);
+                    const retryReasons = [
+                      'helloasso-rate-limited-try-again',
+                      'helloasso-network-error-try-again',
+                      'helloasso-server-error-try-again',
+                    ];
+                    if (retryReasons.includes(reason)) {
+                      showAlert('warning', 'HelloAsso est momentanément indisponible (limite de requêtes ou erreur réseau) — réessayez dans quelques secondes.');
+                    } else if (reason === 'helloasso-auth-failed') {
+                      showAlert('warning', 'Connexion à HelloAsso impossible (identifiants API) — vérifiez la configuration dans les réglages du plugin.');
+                    } else if (reason === 'checkout-intent-not-found') {
+                      showAlert('warning', 'HelloAsso ne trouve plus ce paiement (checkout intent introuvable) — vérifiez manuellement dans le back-office HelloAsso.');
+                    } else if (reason === 'not-paid-on-helloasso') {
+                      showAlert('warning', 'Paiement pas encore confirmé chez HelloAsso.');
+                    } else {
+                      showAlert('warning', `Paiement non confirmé chez HelloAsso (${reason}).`);
+                    }
                   }
                 } catch (e) {
                   showAlert('error', 'Erreur lors de la vérification du paiement.');

package/templates/emails/calendar-onekite_pending.tpl

@@ -18,4 +18,4 @@
 
 <p><strong>Total estimé :</strong> {total} €</p>
 
-<p><a href="{adminUrl}">Ouvrir l'ACP</a></p>
+<p><a href="https://www.onekite.com/calendar">Voir le calendrier</a></p>

package/templates/emails/calendar-onekite_validator_reminder.tpl

@@ -13,4 +13,4 @@
 
 <p>{dateRange}</p>
 
-<p><a href="{adminUrl}">Ouvrir l'ACP (Demandes en attente)</a></p>
+<p><a href="https://www.onekite.com/calendar">Voir le calendrier</a></p>