nodebb-plugin-calendar-onekite 12.0.14 → 12.0.15

package/lib/api.js

@@ -205,11 +205,11 @@ function autoFormSlugForYear(year) {
 }
 
 async function canRequest(uid, settings, startTs) {
-  if (!uid) return { ok: false, allowed: [], candidates: [], startTs };
+  if (!uid) return false;
 
   // Always allow administrators to create.
   try {
-    if (await groups.isMember(uid, 'administrators')) return { ok: true, allowed: [], candidates: [], startTs };
+    if (await groups.isMember(uid, 'administrators')) return true;
   } catch (e) {}
 
   const year = yearFromTs(startTs);
@@ -219,13 +219,23 @@ async function canRequest(uid, settings, startTs) {
   const raw = settings.creatorGroups ?? settings.allowedGroups ?? [];
   const extraGroups = normalizeAllowedGroups(raw);
 
-  const allowed = [defaultGroup, ...extraGroups].filter(Boolean);
-
-  const chk = await checkAnyMembership(uid, allowed, 'canRequest');
-  if (chk.ok) return { ok: true, allowed, candidates: chk.candidates, startTs };
+  const allowedSlugs = [...new Set([defaultGroup, ...extraGroups].filter(Boolean))];
 
-  logger.warn('[calendar-onekite] not-allowed in canRequest', { uid, startTs, allowed, candidates: chk.candidates, raw });
-  return { ok: false, allowed, candidates: chk.candidates, startTs };
+  // Use getUserGroups (returns group objects) and compare slugs.
+  try {
+    const ug = await groups.getUserGroups([uid]);
+    const list = (ug && ug[0]) ? ug[0] : [];
+    const userSlugs = list.map(g => (g && g.slug) ? String(g.slug) : '').filter(Boolean);
+    return allowedSlugs.some(s => userSlugs.includes(s));
+  } catch (e) {
+    // Fallback: try isMember on each allowed slug (some installs accept slug)
+    for (const g of allowedSlugs) {
+      try {
+        if (await groups.isMember(uid, g)) return true;
+      } catch (err) {}
+    }
+    return false;
+  }
 }
 
 async function canValidate(uid, settings) {

package/package.json

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