@easy-cms/plugin-multi-tenant 0.65.0 → 0.66.1

package/dist/index.js

@@ -62,7 +62,7 @@ var INFO = {
   name: "@easy-cms/plugin-multi-tenant",
   // The plugin API it is written for (`PLUGIN_API_VERSION` of @easy-cms/core).
   apiVersion: 1,
-  ...true ? { version: "0.65.0" } : {}
+  ...true ? { version: "0.66.1" } : {}
 };
 
 // src/members.ts
@@ -234,6 +234,23 @@ function membersEndpoints(options) {
 }
 
 // src/plugin.ts
+var PLUGIN_GROUPS = [
+  { plugin: "formBuilderPlugin", slugs: ["forms", "form-submissions"] },
+  {
+    plugin: "ecommercePlugin",
+    slugs: [
+      "products",
+      "variant-types",
+      "variant-options",
+      "variants",
+      "carts",
+      "addresses",
+      "orders",
+      "transactions",
+      "shop-counters"
+    ]
+  }
+];
 var BUILTIN_ACCESS = {
   [MEDIA]: { read: () => true, create: isStaff, update: isStaff, delete: isStaff },
   [MEDIA_FOLDERS]: { read: isStaff, create: isStaff, update: isStaff, delete: isStaff }
@@ -266,6 +283,15 @@ function multiTenantPlugin(options) {
       );
     if (scoped.has(tenantsSlug) || scoped.has("users"))
       throw new Error(`multiTenantPlugin: "${tenantsSlug}" and "users" can't belong to a tenant`);
+    const partly = PLUGIN_GROUPS.flatMap(({ plugin, slugs }) => {
+      const present = slugs.filter((slug) => declared.has(slug));
+      const listed = present.filter((slug) => scoped.has(slug));
+      const shared = present.filter((slug) => !scoped.has(slug));
+      return listed.length > 0 && shared.length > 0 ? [
+        `multiTenantPlugin: ${shared.map((x) => `"${x}"`).join(", ")} of ${plugin} are shared by all tenants while ${listed.map((x) => `"${x}"`).join(", ")} belong to one; list them all in \`collections\`, or none`
+      ] : [];
+    });
+    let warned = partly.length === 0;
     const perTenant = new Set(options.globals ?? []);
     const unknownGlobals = [...perTenant].filter(
       (g) => !(config.globals ?? []).some((global) => global.slug === g)
@@ -439,6 +465,23 @@ function multiTenantPlugin(options) {
         delete: and(custom?.delete, ({ user, context }) => superUser(user, context))
       };
     };
+    const ownMemberships = ({ doc, user, context }) => {
+      if (!user || superUser(user, context) || sameId(doc.id, user.id)) return doc;
+      const list = doc[MEMBERSHIPS_FIELD];
+      if (!Array.isArray(list)) return doc;
+      const { tenant } = tenantOf(context);
+      const idOf = (value) => typeof value === "object" && value !== null ? value.id : value;
+      return {
+        ...doc,
+        [MEMBERSHIPS_FIELD]: list.filter(
+          (m) => tenant !== null && sameId(idOf(m.tenant), tenant)
+        )
+      };
+    };
+    const usersHooks = (hooks = {}) => ({
+      ...hooks,
+      afterRead: [...hooks.afterRead ?? [], ownMemberships]
+    });
     const tenantsAccess = {
       read: ({ user, context }) => {
         if (!user) return false;
@@ -517,7 +560,8 @@ function multiTenantPlugin(options) {
         collections.push({
           ...c,
           fields: [...withTenantFilters(c.fields), memberships],
-          access: { ...c.access, ...usersAccess(c.access) }
+          access: { ...c.access, ...usersAccess(c.access) },
+          hooks: usersHooks(c.hooks)
         });
       } else if (scoped.has(c.slug)) collections.push(scopeCollection(c, BUILTIN_ACCESS[c.slug]));
       else
@@ -532,7 +576,13 @@ function multiTenantPlugin(options) {
           }
         });
     }
-    if (!hasUsers) collections.push({ slug: "users", fields: [memberships], access: usersAccess() });
+    if (!hasUsers)
+      collections.push({
+        slug: "users",
+        fields: [memberships],
+        access: usersAccess(),
+        hooks: usersHooks()
+      });
     for (const builtin of [MEDIA, MEDIA_FOLDERS]) {
       if (scoped.has(builtin) && !declared.has(builtin))
         collections.push(
@@ -564,6 +614,10 @@ function multiTenantPlugin(options) {
     });
     const previous = config.onRequest;
     const onRequest = async (args) => {
+      if (!warned) {
+        warned = true;
+        for (const message of partly) args.cms.logger.warn(message);
+      }
       const user = args.user;
       const list = await tenantList(args.cms, tenantsSlug);
       const asked = args.headers.get(header) ?? args.url?.searchParams.get("tenant") ?? readCookie(args.headers.get("cookie"), cookie) ?? null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/plugin-multi-tenant",
-  "version": "0.65.0",
+  "version": "0.66.1",
   "description": "Multi-tenant Easy CMS: several sites or clients in one CMS, each with its own content, members and roles",
   "license": "MIT",
   "type": "module",
@@ -17,14 +17,14 @@
     "dist"
   ],
   "peerDependencies": {
-    "@easy-cms/core": "^0.65.0"
+    "@easy-cms/core": "^0.66.1"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.65.0",
-    "@easy-cms/plugin-form-builder": "^0.65.0",
-    "@easy-cms/db-sqlite": "^0.65.0",
-    "@easy-cms/plugin-nested-docs": "^0.65.0",
-    "@easy-cms/plugin-redirects": "^0.65.0"
+    "@easy-cms/core": "^0.66.1",
+    "@easy-cms/db-sqlite": "^0.66.1",
+    "@easy-cms/plugin-nested-docs": "^0.66.1",
+    "@easy-cms/plugin-redirects": "^0.66.1",
+    "@easy-cms/plugin-form-builder": "^0.66.1"
   },
   "engines": {
     "node": ">=22.12"