nodebb-plugin-equipment-calendar 9.0.13 → 9.0.15

package/library.js

@@ -28,7 +28,6 @@ function generateId() {
   }
 }
 
-
 function normalizeItemIds(itemIdsRaw) {
   if (!itemIdsRaw) return [];
   if (Array.isArray(itemIdsRaw)) {
@@ -45,7 +44,6 @@ function normalizeItemIds(itemIdsRaw) {
   }
 }
 
-
 function parseDateInput(v) {
   if (v === null || v === undefined) return null;
   if (typeof v === 'number' || (typeof v === 'string' && v.trim() && /^\d+$/.test(v.trim()))) {
@@ -71,7 +69,6 @@ function parseDateInput(v) {
   }
 }
 
-
 function tzOffsetMs(date, timeZone) {
   const asTz = new Date(date.toLocaleString('en-US', { timeZone }));
   return asTz.getTime() - date.getTime();
@@ -100,8 +97,6 @@ function addDaysIso(iso, days) {
   return dt.getUTCFullYear() + '-' + pad(dt.getUTCMonth() + 1) + '-' + pad(dt.getUTCDate());
 }
 
-
-
 function formatDateTimeFR(ms) {
   const n = Number(ms || 0);
   if (!n) return '';
@@ -124,8 +119,6 @@ function formatDateTimeFR(ms) {
   }
 }
 
-
-
 const axios = require('axios');
 const { DateTime } = require('luxon');
 const { v4: uuidv4 } = require('uuid');
@@ -190,53 +183,6 @@ async function setSettings(payload) {
   Object.keys(payload || {}).forEach((k) => {
     sets[k] = JSON.stringify(payload[k]);
   });
-  await meta.settings.set('equipmentCalendar', sets);
-}
-function parseLocationMap(locationMapJson) {
-  try {
-    const obj = JSON.parse(locationMapJson || '{}');
-    return (obj && typeof obj === 'object') ? obj : {};
-  } catch (e) {
-    return {};
-  }
-}
-
-let haTokenCache = null; // { accessToken, refreshToken, expMs }
-
-async function getHelloAssoAccessToken(settings, opts = {}) {
-  const now = Date.now();
-  if (!opts.force && haTokenCache && haTokenCache.accessToken && haTokenCache.expMs && now < haTokenCache.expMs - 30_000) {
-    return haTokenCache.accessToken;
-  }
-
-  const tokenKey = 'equipmentCalendar:ha:token';
-  if (opts.clearStored) {
-    try { await db.delete(tokenKey); } catch (e) {}
-  }
-  let stored = null;
-  try {
-    stored = await db.getObject(tokenKey);
-  } catch (e) {}
-
-  // If refresh token exists and not expired locally, try refresh flow first
-  const canRefresh = !opts.force && stored && stored.refresh_token;
-  const useRefresh = canRefresh && stored.refresh_expires_at && now < parseInt(stored.refresh_expires_at, 10);
-
-  const formBody = new URLSearchParams();
-  if (useRefresh) {
-    formBody.set('grant_type', 'refresh_token');
-    formBody.set('refresh_token', stored.refresh_token);
-  } else {
-    formBody.set('grant_type', 'client_credentials');
-    formBody.set('client_id', String(settings.ha_clientId || ''));
-    formBody.set('client_secret', String(settings.ha_clientSecret || ''));
-  }
-
-  const resp = await fetchFn('https://api.helloasso.com/oauth2/token', {
-    method: 'POST',
-    headers: { 'content-type': 'application/x-www-form-urlencoded' },
-    body: formBody.toString(),
-  });
   if (!resp.ok) {
     const t = await resp.text();
     throw new Error(`HelloAsso token error: ${resp.status} ${t}`);
@@ -263,7 +209,6 @@ async function getHelloAssoAccessToken(settings, opts = {}) {
   return accessToken;
 }
 
-
 async function createHelloAssoCheckoutIntent(settings, bookingId, reservations) {
   const org = String(settings.ha_organizationSlug || '').trim();
   if (!org) throw new Error('HelloAsso organization slug missing');
@@ -350,7 +295,6 @@ function isCheckoutPaid(checkout) {
   return false;
 }
 
-
 async function fetchHelloAssoItems(settings) {
   const org = String(settings.ha_organizationSlug || '').trim();
   const formType = String(settings.ha_itemsFormType || '').trim();
@@ -424,8 +368,6 @@ async function fetchHelloAssoItems(settings) {
   return out;
 }
 
-
-
 async function getActiveItems() {
   const settings = await getSettings();
   const rawItems = await fetchHelloAssoItems(settings);
@@ -438,7 +380,6 @@ async function getActiveItems() {
   return items;
 }
 
-
 // --- Data layer ---
 // Keys:
 // item hash: equipmentCalendar:items (stored in settings as JSON)
@@ -455,9 +396,6 @@ function statusBlocksItem(status) {
   return (s === 'pending' || s === 'approved' || s === 'payment_pending' || s === 'paid');
 }
 
-
-
-
 async function saveBooking(booking) {
   const bid = booking.bookingId;
   await db.setObject(`equipmentCalendar:booking:${bid}`, booking);
@@ -490,7 +428,6 @@ async function getReservation(rid) {
   return await db.getObject(resKey(id));
 }
 
-
 async function setReservationStatus(rid, status) {
   const r = await getReservation(rid);
   if (!r) throw new Error('not_found');
@@ -509,7 +446,6 @@ async function deleteReservation(rid) {
   await db.delete(resKey(rid));
 }
 
-
 function normalizeReservation(obj) {
   const startMs = Number(obj.startMs);
   const endMs = Number(obj.endMs);
@@ -736,13 +672,8 @@ plugin.init = async function (params) {
   // Admin (ACP) routes
   if (mid && mid.admin) {
     
-        await meta.settings.set('equipmentCalendar', out);
-      return res.redirect(nconf.get('relative_path') + '/admin/plugins/equipment-calendar?saved=1');
-    } catch (e) {
-      winston.error('[equipment-calendar] admin save error', e);
-      return res.redirect(nconf.get('relative_path') + '/admin/plugins/equipment-calendar?error=1');
-    }
-  });
+        
+
 
 router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.buildHeader, renderAdminPage);
     router.get('/admin/plugins/equipment-calendar/reservations', middleware.applyCSRF, mid.admin.buildHeader, renderAdminReservationsPage);
@@ -759,7 +690,6 @@ router.get('/admin/plugins/equipment-calendar', middleware.applyCSRF, mid.admin.
   // Convenience alias (optional): /calendar -> /equipment/calendar
   router.get('/calendar', (req, res) => res.redirect('/equipment/calendar'));
 
-
   // To verify webhook signature we need raw body; add a rawBody collector for this route only
   router.post('/equipment/webhook/helloasso',
     require.main.require('body-parser').text({ type: '*/*' }),
@@ -870,7 +800,6 @@ plugin.addAdminRoutes = async function (params) {
   router.get('/api/admin/plugins/equipment-calendar', middleware.applyCSRF, renderAdminPage);
 };
 
-
 async function renderAdminReservationsPage(req, res) {
   if (!(await ensureIsAdmin(req, res))) return;
 
@@ -995,7 +924,6 @@ async function handleAdminDelete(req, res) {
   return res.redirect('/admin/plugins/equipment-calendar/reservations?updated=1');
 }
 
-
 async function handleHelloAssoTest(req, res) {
   const isAdmin = req.uid ? await groups.isMember(req.uid, 'administrators') : false;
   if (!isAdmin) return helpers.notAllowed(req, res);
@@ -1196,11 +1124,8 @@ async function renderCalendarPage(req, res) {
   });
 }
 
-
 // --- Approvals page ---
 
-
-
 async function notifyApprovers(reservations, settings) {
   const groupName = (settings.notifyGroup || settings.approverGroup || 'administrators').trim();
   if (!groupName) return;
@@ -1431,8 +1356,6 @@ async function handleCreateReservation(req, res) {
   }
 }
 
-
-
 async function handleApproveReservation(req, res) {
   try {
     const settings = await getSettings();
@@ -1512,9 +1435,6 @@ async function handleRejectReservation(req, res) {
   }
 }
 
-
-
-
 async function ensureIsAdmin(req, res) {
   const isAdmin = req.uid ? await groups.isMember(req.uid, 'administrators') : false;
   if (!isAdmin) {
@@ -1593,8 +1513,6 @@ async function handleAdminPurge(req, res) {
   }
 }
 
-
-
 let paymentTimeoutInterval = null;
 
 function startPaymentTimeoutScheduler() {
@@ -1646,7 +1564,6 @@ function startPaymentTimeoutScheduler() {
 
 module.exports = plugin;
 
-
 async function handleGetReservation(req, res) {
   if (!req.uid) return res.status(403).json({ error: 'not-logged-in' });
   const rid = String(req.params.id || '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodebb-plugin-equipment-calendar",
-  "version": "9.0.13",
+  "version": "9.0.15",
   "description": "Equipment reservation calendar for NodeBB (FullCalendar, approvals, HelloAsso payments)",
   "main": "library.js",
   "scripts": {

package/plugin.json

@@ -25,7 +25,7 @@
   "scripts": [
     "public/js/client.js"
   ],
-  "version": "3.0.0-stable5a-acp-official-behavior",
+  "version": "3.0.0-stable5c-syntaxfix2",
   "minver": "4.7.1",
   "acpScripts": [
     "public/js/admin.js"