@7365admin1/core 3.65.0 → 3.65.2

package/dist/index.mjs

@@ -11042,6 +11042,13 @@ function effectiveSiteModules(orgModules, siteModules) {
   const allowed = site.filter((key) => org.includes(key));
   return allowed.length ? allowed : org;
 }
+function siteModulesForOrg(site, orgId) {
+  const org = orgId?.toString() ?? "";
+  if (!org)
+    return site?.metadata?.modules;
+  const owner = String(site?.orgId ?? site?.org ?? "");
+  return owner && owner === org ? site?.metadata?.modules : void 0;
+}
 function rejectedSiteModules(orgModules, requested) {
   if (!narrows(orgModules))
     return [];
@@ -20424,7 +20431,7 @@ async function moduleCeiling(org, site) {
     ]);
     return effectiveSiteModules(
       orgDoc?.modules,
-      siteDoc?.metadata?.modules
+      siteModulesForOrg(siteDoc, orgId)
     );
   } catch {
     return [];
@@ -28194,6 +28201,31 @@ async function requireMemberOrg(req, org) {
   }
   await requireOrgAccess(req, orgId);
 }
+async function membershipsInReach(req, items) {
+  const warn = (error) => {
+    logger37.log({ level: "warn", message: `members/users reach check: ${error?.message}` });
+    return false;
+  };
+  if (!await callerAccountApproved(callerId(req)).catch(warn)) {
+    return { items: [], total: 0 };
+  }
+  const orgs = new Set(
+    items.map((m) => m?.org?.toString?.() ?? "").filter(Boolean)
+  );
+  const own = new Set(
+    await resolveInviteActor(callerId(req)).then((actor) => actor.orgIds.map(String)).catch((error) => (warn(error), []))
+  );
+  const reached = new Set([...orgs].filter((org) => own.has(org)));
+  for (const org of orgs) {
+    if (reached.has(org))
+      continue;
+    const ok = await requireOrgReach(req, org).then(() => true, () => false);
+    if (ok)
+      reached.add(org);
+  }
+  const kept = items.filter((m) => reached.has(m?.org?.toString?.() ?? ""));
+  return { items: kept, total: kept.length };
+}
 function memberModulesHandlers({
   requireSelfOrPlatformStaff: requireSelfOrPlatformStaff2,
   gateData
@@ -28297,7 +28329,11 @@ function useMemberController() {
     }
     try {
       const data = await _getAllByUser(userId);
-      res.json(data);
+      const whole = await requireSelfOrPlatformStaff(req, userId, {
+        resource: "members",
+        action: "view-members"
+      }).then(() => true, () => false);
+      res.json(whole ? data : await membershipsInReach(req, data.items));
       return;
     } catch (error2) {
       logger37.log({