nodebb-plugin-calendar-onekite 11.1.49 → 11.1.50

package/lib/admin.js

@@ -3,6 +3,12 @@
 const meta = require.main.require('./src/meta');
 const user = require.main.require('./src/user');
 const emailer = require.main.require('./src/emailer');
+const nconf = require.main.require('nconf');
+
+function forumBaseUrl() {
+  const base = String(nconf.get('url') || '').trim().replace(/\/$/, '');
+  return base;
+}
 
 function formatFR(tsOrIso) {
   const d = new Date(typeof tsOrIso === 'string' && /^[0-9]+$/.test(tsOrIso) ? parseInt(tsOrIso, 10) : tsOrIso);
@@ -119,6 +125,9 @@ admin.approveReservation = async function (req, res) {
     const requester = await user.getUserFields(r.uid, ['username', 'email']);
     // r.total is stored as an estimated total in euros; HelloAsso expects cents.
     const totalAmount = Math.max(0, Math.round((Number(r.total) || 0) * 100));
+    const base = forumBaseUrl();
+    const returnUrl = base ? `${base}/calendar` : '';
+    const webhookUrl = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
     paymentUrl = await helloasso.createCheckoutIntent({
       env,
       token,
@@ -127,7 +136,9 @@ admin.approveReservation = async function (req, res) {
       formSlug: settings.helloassoFormSlug,
       totalAmount,
       payerEmail: requester && requester.email,
-      callbackUrl: 'https://api.onekite.com/helloasso',
+      // User return/back/error URLs must be real pages; webhook uses the plugin endpoint.
+      callbackUrl: returnUrl,
+      webhookUrl: webhookUrl,
       itemName: 'Réservation matériel OneKite',
       containsDonation: false,
       metadata: { reservationId: String(rid) },

package/lib/api.js

@@ -72,7 +72,8 @@ function normalizeCallbackUrl(configured, meta) {
   const base = normalizeBaseUrl(meta);
   let url = (configured || '').trim();
   if (!url) {
-    url = base ? `${base}/helloasso` : '';
+    // Default webhook endpoint (recommended): namespaced under /plugins
+    url = base ? `${base}/plugins/calendar-onekite/helloasso` : '';
   }
   if (url && url.startsWith('/') && base) {
     url = `${base}${url}`;

package/library.js

@@ -107,10 +107,14 @@ Plugin.init = async function (params) {
     },
     type: ['application/json', 'application/*+json'],
   });
+  // Accept webhook on both legacy root path and namespaced plugin path.
+  // Some reverse proxies block unknown root paths, so /plugins/... is recommended.
   router.post('/helloasso', helloassoJson, helloassoWebhook.handler);
+  router.post('/plugins/calendar-onekite/helloasso', helloassoJson, helloassoWebhook.handler);
 
-  // Optional: keep GET for simple health-checks without exposing processing.
+  // Optional: health checks
   router.get('/helloasso', (req, res) => res.json({ ok: true }));
+  router.get('/plugins/calendar-onekite/helloasso', (req, res) => res.json({ ok: true }));
 
   scheduler.start();
 };

package/package.json

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

package/plugin.json

@@ -27,5 +27,5 @@
   "acpScripts": [
     "public/admin.js"
   ],
-  "version": "0.0.18"
+  "version": "0.0.19"
 }

package/public/client.js

@@ -309,9 +309,23 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
         const isOwner = uidNow && ownerUid && uidNow === ownerUid;
         const showModeration = canModerate && isPending;
         const showCancel = isOwner && ['pending', 'awaiting_payment'].includes(status);
+        const paymentUrl = String((p && p.paymentUrl) || '');
+        const showPay = isOwner && status === 'awaiting_payment' && /^https?:\/\//i.test(paymentUrl);
         const buttons = {
           close: { label: 'Fermer', className: 'btn-secondary' },
         };
+        if (showPay) {
+          buttons.pay = {
+            label: 'Payer maintenant',
+            className: 'btn-primary',
+            callback: () => {
+              try {
+                window.open(paymentUrl, '_blank', 'noopener');
+              } catch (e) {}
+              return false;
+            },
+          };
+        }
         if (showCancel) {
           buttons.cancel = {
             label: 'Annuler',
@@ -345,8 +359,12 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
             label: 'Valider',
             className: 'btn-success',
             callback: async () => {
-              const itemNames = Array.isArray(p.itemNames) && p.itemNames.length ? p.itemNames : String(itemsLabel || '').split(',').map(s => s.trim()).filter(Boolean);
-              const itemsHtml = itemNames.map(n => `<li>${String(n).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</li>`).join('');
+              const itemNames = Array.isArray(p.itemNames) && p.itemNames.length
+                ? p.itemNames
+                : (p.itemName ? [p.itemName] : []);
+              const itemsListHtml = itemNames.length
+                ? `<div class="mb-2"><strong>Matériel</strong><ul style="margin:0.25rem 0 0 1.1rem; padding:0;">${itemNames.map(n => `<li>${String(n).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</li>`).join('')}</ul></div>`
+                : '';
               const opts = (() => {
                 const out = [];
                 for (let h = 7; h < 24; h++) {
@@ -355,8 +373,9 @@ define('forum/calendar-onekite', ['alerts', 'bootbox', 'hooks'], function (alert
                   }
                 }
                 return out;
-              })().map(t => `<option value="${t}">${t}</option>`).join('');
+              })().map(t => `<option value="${t}" ${t === '07:00' ? 'selected' : ''}>${t}</option>`).join('');
               const html = `
+                ${itemsListHtml}
                 <div class="mb-3">
                   <label class="form-label">Note (incluse dans l'email)</label>
                   <textarea class="form-control" id="onekite-admin-note" rows="3" placeholder="Matériel à récupérer à l'adresse : ..."></textarea>