nodebb-plugin-onekite-calendar 2.0.96 → 2.0.98

package/lib/helloassoWebhook.js

@@ -133,6 +133,27 @@ function getCheckoutIntentIdFromPayload(payload) {
   return null;
 }
 
+// Returns true for event types and states that represent a HelloAsso refund.
+function isRefundEvent(payload) {
+  try {
+    if (!payload) return false;
+    const eventType = String(payload.eventType || '').toLowerCase();
+    if (eventType === 'refund') return true;
+    const data = _payloadData(payload);
+    if (!data) return false;
+    const orderPayments = (data.order && Array.isArray(data.order.payments)) ? data.order.payments : [];
+    const state = String(
+      data.state || data.status || data.paymentState ||
+      (orderPayments.length ? (orderPayments[0].state || orderPayments[0].status) : '') ||
+      (data.order && (data.order.state || data.order.status)) ||
+      ''
+    ).toLowerCase();
+    return ['refunded', 'refund', 'refundpending'].includes(state);
+  } catch (e) {
+    return false;
+  }
+}
+
 // Returns true for event types and states that represent a completed payment.
 function isConfirmedPayment(payload) {
   try {
@@ -235,6 +256,129 @@ async function tryRecoverRidFromPayment(settings, paymentId) {
   }
 }
 
+// ---------------------------------------------------------------------------
+// Refund handler (called from main handler when isRefundEvent() is true)
+// ---------------------------------------------------------------------------
+
+async function handleRefund(req, res, payload, settings, _d) {
+  try {
+    const rid = getReservationIdFromPayload(payload);
+    const checkoutIntentId = getCheckoutIntentIdFromPayload(payload);
+
+    // Refund idempotency key — prefix with "refund_" to avoid collision with payment IDs.
+    const _payments = (_d && _d.order && Array.isArray(_d.order.payments)) ? _d.order.payments : [];
+    const refundId = _d && _d.id != null ? String(_d.id) : null;
+    const idempotencyKey = refundId
+      ? `refund_${refundId}`
+      : (!payload.data && checkoutIntentId ? `refund_ci_${checkoutIntentId}` : null);
+
+    if (!idempotencyKey) {
+      // eslint-disable-next-line no-console
+      console.warn('[calendar-onekite] HelloAsso webhook refund: missing refund id', { dataKeys: _d ? Object.keys(_d) : [] });
+      return res.json({ ok: true, ignored: true, missingRefundId: true });
+    }
+
+    if (await alreadyProcessed(idempotencyKey)) {
+      return res.json({ ok: true, duplicate: true });
+    }
+
+    // Resolve reservation ID
+    let resolvedRid = rid;
+    if (!resolvedRid && checkoutIntentId) {
+      resolvedRid = await tryRecoverRidFromCheckoutIntent(settings, checkoutIntentId);
+    }
+    const paymentIdForRecovery = payload.data
+      ? (_d && (_d.id || _d.paymentId))
+      : (_payments.length ? _payments[0].id : null);
+    if (!resolvedRid && paymentIdForRecovery) {
+      resolvedRid = await tryRecoverRidFromPayment(settings, paymentIdForRecovery);
+    }
+    if (!resolvedRid) {
+      // eslint-disable-next-line no-console
+      console.warn('[calendar-onekite] HelloAsso webhook refund: could not resolve reservationId', { refundId, checkoutIntentId });
+      return res.json({ ok: true, processed: false, missingReservationId: true });
+    }
+
+    // eslint-disable-next-line no-console
+    console.info('[calendar-onekite] HelloAsso webhook refund received', { rid: resolvedRid, refundId });
+
+    const r = await dbLayer.getReservation(resolvedRid);
+    if (!r) {
+      await markProcessed(idempotencyKey);
+      return res.json({ ok: true, processed: true, reservationNotFound: true });
+    }
+
+    if (r.status === 'cancelled') {
+      await markProcessed(idempotencyKey);
+      return res.json({ ok: true, processed: true, alreadyCancelled: true });
+    }
+
+    r.status = 'cancelled';
+    r.cancelledAt = Date.now();
+    r.cancelledBy = 0;
+    r.cancelledByUsername = 'HelloAsso (remboursement)';
+    r.refundedAt = r.cancelledAt;
+    if (refundId) r.refundId = refundId;
+
+    await dbLayer.saveReservation(r);
+
+    await auditLog('reservation_refunded', 0, {
+      targetType: 'reservation',
+      targetId: String(r.rid),
+      reservationUid: Number(r.uid) || 0,
+      reservationUsername: String(r.username || ''),
+      itemIds: arrayifyIds(r),
+      itemNames: arrayifyNames(r),
+      startDate: r.startDate || '',
+      endDate: r.endDate || '',
+      refundId: refundId || '',
+    });
+
+    realtime.emitCalendarUpdated({ kind: 'reservation', action: 'cancelled', rid: String(r.rid), status: r.status });
+
+    // Email requester
+    try {
+      const requesterUid = parseInt(r.uid, 10);
+      const requester = await user.getUserFields(requesterUid, ['username']);
+      if (requesterUid) {
+        await sendEmail('calendar-onekite_cancelled', requesterUid, 'Location matériel - Réservation annulée (remboursement)', {
+          uid: requesterUid,
+          username: requester && requester.username ? requester.username : '',
+          itemName: arrayifyNames(r).join(', '),
+          itemNames: arrayifyNames(r),
+          dateRange: `Du ${formatFR(r.start)} au ${formatFR(r.end)}`,
+          cancelledBy: 'HelloAsso (remboursement)',
+          cancelledByUrl: '',
+        });
+      }
+    } catch (e) {}
+
+    // Discord notification
+    try {
+      await discord.notifyReservationCancelled(settings, {
+        rid: r.rid,
+        uid: r.uid,
+        username: r.username || '',
+        itemIds: arrayifyIds(r),
+        itemNames: arrayifyNames(r),
+        start: r.start,
+        end: r.end,
+        status: r.status,
+        cancelledAt: r.cancelledAt,
+        cancelledBy: 0,
+        cancelledByUsername: r.cancelledByUsername,
+      });
+    } catch (e) {}
+
+    await markProcessed(idempotencyKey);
+    return res.json({ ok: true, processed: true, refunded: true });
+  } catch (err) {
+    // eslint-disable-next-line no-console
+    console.error('[calendar-onekite] HelloAsso webhook refund: unhandled error', err && err.message ? err.message : String(err));
+    return res.status(500).json({ ok: false, error: 'internal-error' });
+  }
+}
+
 // ---------------------------------------------------------------------------
 // Webhook handler
 // ---------------------------------------------------------------------------
@@ -308,6 +452,11 @@ async function handler(req, res, next) {
       contentType: req.headers && req.headers['content-type'],
     });
 
+    // Handle refund events before the confirmed-payment check.
+    if (isRefundEvent(payload)) {
+      return await handleRefund(req, res, payload, settings, _d);
+    }
+
     if (!isConfirmedPayment(payload)) {
       // eslint-disable-next-line no-console
       console.warn('[calendar-onekite] HelloAsso webhook: payment not confirmed — ignored', {
@@ -336,17 +485,22 @@ async function handler(req, res, next) {
     // Extract paymentId.
     // Format A: data.id is the payment ID.
     // Format B: order.payments[0].id is the payment ID (data.id is the checkout intent ID).
+    // For Format B, HelloAsso sometimes omits order.payments — fall back to checkoutIntentId
+    // as the idempotency key (prefixed to avoid collision with numeric payment IDs).
     const _payments = (_d && _d.order && Array.isArray(_d.order.payments)) ? _d.order.payments : [];
     const paymentId = payload.data
       ? (_d.id || _d.paymentId)
       : (_payments.length ? _payments[0].id : null);
-    if (!paymentId) {
+    const idempotencyKey = paymentId
+      ? String(paymentId)
+      : (!payload.data && checkoutIntentId ? `ci_${checkoutIntentId}` : null);
+    if (!idempotencyKey) {
       // eslint-disable-next-line no-console
-      console.warn('[calendar-onekite] HelloAsso webhook: missing payment id', { eventType, dataKeys: _d ? Object.keys(_d) : [] });
+      console.warn('[calendar-onekite] HelloAsso webhook: missing payment id and checkout intent id', { eventType, dataKeys: _d ? Object.keys(_d) : [] });
       return res.json({ ok: true, ignored: true, missingPaymentId: true });
     }
 
-    if (await alreadyProcessed(paymentId)) {
+    if (await alreadyProcessed(idempotencyKey)) {
       return res.json({ ok: true, duplicate: true });
     }
 
@@ -369,13 +523,13 @@ async function handler(req, res, next) {
     if (!r) {
       // eslint-disable-next-line no-console
       console.warn('[calendar-onekite] HelloAsso webhook: reservation not found (expired/deleted?)', { rid: resolvedRid, paymentId });
-      await markProcessed(paymentId);
+      await markProcessed(idempotencyKey);
       return res.json({ ok: true, processed: true, reservationNotFound: true });
     }
 
     // Idempotency: already paid → just mark as processed and return.
     if (r.status === 'paid') {
-      await markProcessed(paymentId);
+      await markProcessed(idempotencyKey);
       return res.json({ ok: true, processed: true, alreadyPaid: true });
     }
 
@@ -384,7 +538,7 @@ async function handler(req, res, next) {
 
     r.status = 'paid';
     r.paidAt = Date.now();
-    r.paymentId = String(paymentId);
+    if (paymentId) r.paymentId = String(paymentId);
     // paymentReceiptUrl: Format A = data.paymentReceiptUrl, Format B = order.payments[0].paymentReceiptUrl
     const _receiptUrl = (payload.data && payload.data.paymentReceiptUrl)
       ? String(payload.data.paymentReceiptUrl)
@@ -444,7 +598,7 @@ async function handler(req, res, next) {
       });
     } catch (e) {}
 
-    await markProcessed(paymentId);
+    await markProcessed(idempotencyKey);
     return res.json({ ok: true, processed: true });
   } catch (err) {
     return next(err);

package/lib/scheduler.js

@@ -1,8 +1,54 @@
 'use strict';
 
 const nconf = require.main.require('nconf');
+const meta = require.main.require('./src/meta');
+
+const dbLayer = require('./db');
+const { syncPayment } = require('./syncPayment');
+
+const SETTINGS_KEY = 'calendar-onekite';
+const SYNC_INTERVAL_MS = 60 * 1000;
+// Minimum time between HelloAsso API checks for the same reservation (avoid spamming)
+const MIN_CHECK_INTERVAL_MS = 2 * 60 * 1000;
 
 let timer = null;
+const lastChecked = new Map(); // rid → timestamp of last HelloAsso check
+
+async function runPaymentSync() {
+  try {
+    const settings = await meta.settings.get(SETTINGS_KEY);
+    if (!settings || !settings.helloassoClientId || !settings.helloassoClientSecret) return;
+
+    const ids = await dbLayer.listAllReservationIds(5000);
+    if (!ids || !ids.length) return;
+
+    const reservations = await dbLayer.getReservations(ids);
+    const now = Date.now();
+
+    const toSync = (reservations || []).filter((r) => {
+      if (!r || r.status !== 'awaiting_payment' || !r.checkoutIntentId) return false;
+      const last = lastChecked.get(String(r.rid));
+      return !last || (now - last) >= MIN_CHECK_INTERVAL_MS;
+    });
+
+    for (const r of toSync) {
+      lastChecked.set(String(r.rid), now);
+      try {
+        const result = await syncPayment({ r, settings, actorUid: 0 });
+        if (result.synced) {
+          // eslint-disable-next-line no-console
+          console.info('[calendar-onekite] Scheduler: auto-synced payment from HelloAsso', { rid: r.rid });
+        }
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.warn('[calendar-onekite] Scheduler: syncPayment error', { rid: r.rid, err: e && e.message });
+      }
+    }
+  } catch (e) {
+    // eslint-disable-next-line no-console
+    console.warn('[calendar-onekite] Scheduler: payment sync error', { err: e && e.message });
+  }
+}
 
 function start() {
   const runJobs = nconf.get('runJobs');
@@ -11,8 +57,9 @@ function start() {
     console.info('[calendar-onekite] Scheduler disabled (runJobs=false)');
     return;
   }
+  timer = setInterval(runPaymentSync, SYNC_INTERVAL_MS);
   // eslint-disable-next-line no-console
-  console.info('[calendar-onekite] Scheduler started (no expiry timers configured)');
+  console.info('[calendar-onekite] Scheduler started');
 }
 
 function stop() {

package/package.json

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