nodebb-plugin-onekite-calendar 2.0.88 → 2.0.90

package/lib/admin.js

@@ -17,6 +17,7 @@ const {
   calendarDaysExclusiveYmd,
   yearFromTs,
   autoFormSlugForYear,
+  forumBaseUrl,
 } = shared;
 
 const dbLayer = require('./db');
@@ -213,6 +214,7 @@ admin.approveReservation = async function (req, res) {
         itemNames: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])),
         dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
         paymentUrl: paymentUrl || '',
+        calendarUrl: `${forumBaseUrl()}/calendar`,
         pickupAddress: r.pickupAddress || '',
         notes: r.notes || '',
         pickupTime: r.pickupTime || '',

package/lib/api.js

@@ -621,6 +621,110 @@ api.getReservationDetails = async function (req, res) {
   return res.json(out);
 };
 
+/**
+ * Return a fresh HelloAsso payment URL for a reservation in awaiting_payment status.
+ * HelloAsso checkout intents expire after ~30 minutes, so stored URLs become stale.
+ * This endpoint regenerates a new intent on demand and persists the fresh URL.
+ *
+ * @route GET /api/v3/plugins/calendar-onekite/reservations/:rid/payment-url
+ */
+api.getFreshPaymentUrl = async function (req, res) {
+  const uid = req.uid;
+  if (!uid) return res.status(401).json({ error: 'not-logged-in' });
+
+  const settings = await getSettings();
+  const rid = String(req.params.rid || '').trim();
+  if (!rid) return res.status(400).json({ error: 'missing-rid' });
+
+  const r = await dbLayer.getReservation(rid);
+  if (!r) return res.status(404).json({ error: 'not-found' });
+
+  const isOwner = String(r.uid) === String(uid);
+  const isMod = await canValidate(uid, settings);
+  if (!isOwner && !isMod) return res.status(403).json({ error: 'not-allowed' });
+
+  if (r.status !== 'awaiting_payment') {
+    return res.status(409).json({ error: 'wrong-status', status: r.status });
+  }
+
+  // Build a fresh checkout intent
+  const env = settings.helloassoEnv || 'prod';
+  const token = await helloasso.getAccessToken({
+    env,
+    clientId: settings.helloassoClientId,
+    clientSecret: settings.helloassoClientSecret,
+  });
+
+  if (!token) {
+    return res.status(503).json({ error: 'helloasso-unavailable' });
+  }
+
+  const requester = await user.getUserFields(r.uid, ['email']);
+  const year = yearFromTs(Number(r.start));
+  const formSlug = autoFormSlugForYear(year);
+
+  // Recompute total from HelloAsso catalog to always use up-to-date prices.
+  let recomputedTotalCents = null;
+  try {
+    const { items: catalog } = await helloasso.listCatalogItems({
+      env,
+      token,
+      organizationSlug: settings.helloassoOrganizationSlug,
+      formType: settings.helloassoFormType,
+      formSlug,
+    });
+    const byId = new Map((catalog || []).map((it) => [String(it.id), (typeof it.price === 'number' ? it.price : 0)]));
+    const ids = (Array.isArray(r.itemIds) ? r.itemIds : (r.itemId ? [r.itemId] : [])).map(String);
+    const days = calendarDaysExclusiveYmd(r.startDate, r.endDate) || 1;
+    const sumCentsPerDay = ids.reduce((acc, id) => acc + (byId.get(id) || 0), 0);
+    if (sumCentsPerDay > 0) {
+      recomputedTotalCents = Math.max(0, Math.round(sumCentsPerDay * days));
+    }
+  } catch (e) { /* fallback to stored total */ }
+
+  const totalAmount = (typeof recomputedTotalCents === 'number')
+    ? recomputedTotalCents
+    : Math.max(0, Math.round((Number(r.total) || 0) * 100));
+
+  if (!totalAmount) {
+    return res.status(422).json({ error: 'zero-amount' });
+  }
+
+  const intent = await helloasso.createCheckoutIntent({
+    env,
+    token,
+    organizationSlug: settings.helloassoOrganizationSlug,
+    formType: settings.helloassoFormType,
+    formSlug,
+    totalAmount,
+    payerEmail: requester && requester.email ? requester.email : '',
+    callbackUrl: normalizeReturnUrl(),
+    webhookUrl: normalizeCallbackUrl(settings.helloassoCallbackUrl),
+    itemName: buildHelloAssoItemName('Réservation matériel Onekite', r.itemNames || (r.itemName ? [r.itemName] : []), r.start, r.end),
+    containsDonation: false,
+    metadata: {
+      reservationId: String(rid),
+      items: (Array.isArray(r.itemNames) ? r.itemNames : (r.itemName ? [r.itemName] : [])).filter(Boolean),
+      dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+    },
+  });
+
+  const paymentUrl = intent && (intent.paymentUrl || intent.redirectUrl)
+    ? (intent.paymentUrl || intent.redirectUrl)
+    : (typeof intent === 'string' ? intent : null);
+
+  if (!paymentUrl) {
+    return res.status(502).json({ error: 'intent-creation-failed' });
+  }
+
+  // Persist the fresh URL so subsequent requests can also renew from DB.
+  r.paymentUrl = paymentUrl;
+  if (intent && intent.checkoutIntentId) r.checkoutIntentId = intent.checkoutIntentId;
+  await dbLayer.saveReservation(r);
+
+  return res.json({ ok: true, paymentUrl });
+};
+
 /**
  * Get detailed information about a special event.
  * 
@@ -1549,6 +1653,7 @@ api.createReservation = async function (req, res) {
           pickupLon: '',
           mapUrl: '',
           paymentUrl: resv.paymentUrl || '',
+          calendarUrl: `${forumBaseUrl()}/calendar`,
           validatedBy: creatorUsername || '',
           validatedByUrl: creatorUsername ? `${forumBaseUrl()}/user/${encodeURIComponent(String(creatorUsername))}` : '',
           ...buildCalendarLinks({
@@ -1785,6 +1890,7 @@ api.approveReservation = async function (req, res) {
       pickupLon: r.pickupLon || '',
       mapUrl,
       paymentUrl: r.paymentUrl || '',
+      calendarUrl: `${forumBaseUrl()}/calendar`,
       ...buildCalendarLinks({
         type: 'reservation',
         id: String(r.rid),

package/lib/scheduler.js

@@ -253,6 +253,7 @@ async function processAwaitingPayment(preIds, preReservations) {
           itemNames: arrayifyNames(r),
           dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
           paymentUrl: r.paymentUrl || '',
+          calendarUrl: `${forumBaseUrl()}/calendar`,
           delayMinutes: holdMins,
           pickupLine: r.pickupTime ? (r.adminNote ? `${r.pickupTime} à ${r.adminNote}` : r.pickupTime) : '',
         });

package/library.js

@@ -76,6 +76,7 @@ Plugin.init = async function (params) {
 
   router.post('/api/v3/plugins/calendar-onekite/reservations', ...publicExpose, api.createReservation);
   router.get('/api/v3/plugins/calendar-onekite/reservations/:rid', ...publicExpose, api.getReservationDetails);
+  router.get('/api/v3/plugins/calendar-onekite/reservations/:rid/payment-url', ...publicExpose, api.getFreshPaymentUrl);
   router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/approve', ...publicExpose, api.approveReservation);
   router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/refuse', ...publicExpose, api.refuseReservation);
   router.put('/api/v3/plugins/calendar-onekite/reservations/:rid/cancel', ...publicExpose, api.cancelReservation);

package/package.json

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

package/public/client.js

@@ -2403,9 +2403,22 @@ function toDatetimeLocalValue(date) {
             label: 'Payer maintenant',
             className: 'btn-primary',
             callback: () => {
-              try {
-                window.open(paymentUrl, '_blank', 'noopener');
-              } catch (e) {}
+              (async () => {
+                try {
+                  // Always fetch a fresh checkout intent — HelloAsso URLs expire after ~30 min.
+                  const resp = await fetchJson(
+                    `/api/v3/plugins/calendar-onekite/reservations/${encodeURIComponent(String(rid))}/payment-url`
+                  );
+                  const freshUrl = resp && resp.paymentUrl ? String(resp.paymentUrl) : '';
+                  if (freshUrl && /^https?:\/\//i.test(freshUrl)) {
+                    window.open(freshUrl, '_blank', 'noopener');
+                  } else {
+                    showAlert('error', 'Impossible de générer le lien de paiement. Veuillez réessayer.');
+                  }
+                } catch (e) {
+                  showAlert('error', 'Erreur lors de la génération du lien de paiement.');
+                }
+              })();
               return false;
             },
           };

package/templates/emails/calendar-onekite_approved.tpl

@@ -40,11 +40,16 @@
 <p><strong>Notes :</strong><br>{notes}</p>
 <!-- ENDIF notes -->
 
-<!-- IF paymentUrl -->
+<!-- IF calendarUrl -->
 <p>
-  <a href="{paymentUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
-    Payer maintenant
+  <a href="{calendarUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
+    Accéder au calendrier pour payer
   </a>
 </p>
-<p style="font-size: 12px; color: #666;">Si le bouton ne fonctionne pas, utilisez ce lien : <a href="{paymentUrl}">{paymentUrl}</a></p>
-<!-- ENDIF paymentUrl -->
+<p style="font-size: 12px; color: #666;">
+  Sur le calendrier, cliquez sur votre réservation puis sur le bouton <strong>« Payer maintenant »</strong>.
+  <!-- IF paymentUrl -->
+  <br>Vous pouvez aussi payer directement via ce lien (valable quelques heures) : <a href="{paymentUrl}">{paymentUrl}</a>
+  <!-- ENDIF paymentUrl -->
+</p>
+<!-- ENDIF calendarUrl -->

package/templates/emails/calendar-onekite_reminder.tpl

@@ -10,11 +10,16 @@
 
 <p>{dateRange}</p>
 
-<!-- IF paymentUrl -->
+<!-- IF calendarUrl -->
 <p>
-  <a href="{paymentUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
-    Payer maintenant
+  <a href="{calendarUrl}" style="display:inline-block;padding:12px 18px;border-radius:6px;text-decoration:none;border:1px solid #333;">
+    Accéder au calendrier pour payer
   </a>
 </p>
-<p style="font-size: 12px; color: #666;">Si le bouton ne fonctionne pas, utilisez ce lien : <a href="{paymentUrl}">{paymentUrl}</a></p>
-<!-- ENDIF paymentUrl -->
+<p style="font-size: 12px; color: #666;">
+  Sur le calendrier, cliquez sur votre réservation puis sur le bouton <strong>« Payer maintenant »</strong>.
+  <!-- IF paymentUrl -->
+  <br>Vous pouvez aussi payer directement via ce lien (valable quelques heures) : <a href="{paymentUrl}">{paymentUrl}</a>
+  <!-- ENDIF paymentUrl -->
+</p>
+<!-- ENDIF calendarUrl -->