@easy-cms/plugin-multi-tenant 0.47.1 → 0.47.3

package/dist/index.js

@@ -61,7 +61,7 @@ import {
 // src/info.ts
 var INFO = {
   name: "@easy-cms/plugin-multi-tenant",
-  ...true ? { version: "0.47.1" } : {}
+  ...true ? { version: "0.47.3" } : {}
 };
 
 // src/members.ts
@@ -238,14 +238,14 @@ function multiTenantPlugin(options) {
       throw new Error(
         `multiTenantPlugin: no global ${unknownGlobals.map((g) => `"${g}"`).join(", ")} in the config`
       );
-    const everywhere = (user, context) => tenantOf(context).allTenants || !!user && user.scoped !== true && isSuper(user);
-    const superUser = (user, context) => !!user && everywhere(user, context);
+    const superUser = (user, _context) => !!user && user.member !== true && user.scoped !== true && isSuper(user);
+    const everywhere = (user, context) => tenantOf(context).allTenants || superUser(user, context);
     const tenantFilter = (args, op) => {
       const { tenant } = tenantOf(args.context);
-      if (op === "create") return tenant !== null || everywhere(args.user, args.context);
+      if (op === "create") return tenant !== null || superUser(args.user, args.context);
       if (tenant !== null) return { [TENANT_FIELD]: { equals: tenant } };
-      if (everywhere(args.user, args.context)) return true;
-      return op === "read" ? NOTHING : false;
+      if (op === "read") return everywhere(args.user, args.context) ? true : NOTHING;
+      return superUser(args.user, args.context);
     };
     const narrow = (original, op) => async (args) => {
       const base = await (original ?? isLoggedIn)(args);
@@ -320,7 +320,7 @@ function multiTenantPlugin(options) {
         throw new ValidationError2(slug, [{ field: TENANT_FIELD, message }]);
       };
       if (value === null) fail("is required: choose a tenant");
-      if (everywhere(user, context)) return data;
+      if (superUser(user, context)) return data;
       if (!sameId(value, tenant)) fail("must be the tenant you work in");
       const before = originalDoc?.[TENANT_FIELD] ?? null;
       if (operation === "update" && before !== null && !sameId(before, value))
@@ -387,6 +387,7 @@ function multiTenantPlugin(options) {
       return {
         read: and(custom?.read, ({ user, context }) => {
           if (!user) return false;
+          if (user.member === true) return self(user);
           if (superUser(user, context)) return true;
           const { tenant } = tenantOf(context);
           return tenant === null ? self(user) : { or: [self(user), { [`${MEMBERSHIPS_FIELD}.tenant`]: { equals: tenant } }] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/plugin-multi-tenant",
-  "version": "0.47.1",
+  "version": "0.47.3",
   "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.47.1"
+    "@easy-cms/core": "^0.47.3"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.47.1",
-    "@easy-cms/db-sqlite": "^0.47.1",
-    "@easy-cms/plugin-form-builder": "^0.47.1",
-    "@easy-cms/plugin-nested-docs": "^0.47.1",
-    "@easy-cms/plugin-redirects": "^0.47.1"
+    "@easy-cms/core": "^0.47.3",
+    "@easy-cms/db-sqlite": "^0.47.3",
+    "@easy-cms/plugin-form-builder": "^0.47.3",
+    "@easy-cms/plugin-nested-docs": "^0.47.3",
+    "@easy-cms/plugin-redirects": "^0.47.3"
   },
   "engines": {
     "node": ">=22.12"