@easy-cms/plugin-multi-tenant 0.47.2 → 0.47.4

package/dist/index.js

@@ -61,7 +61,7 @@ import {
 // src/info.ts
 var INFO = {
   name: "@easy-cms/plugin-multi-tenant",
-  ...true ? { version: "0.47.2" } : {}
+  ...true ? { version: "0.47.4" } : {}
 };
 
 // src/members.ts
@@ -70,6 +70,24 @@ import {
   NotFoundError,
   ValidationError
 } from "@easy-cms/core";
+async function addedEmail(cms, tenantsSlug, tenant, to, origin) {
+  const found = await cms.findById(tenantsSlug, tenant, { depth: 0 });
+  const name = typeof found?.name === "string" ? found.name : String(tenant);
+  const admin = `${cms.config.serverURL ?? origin}${cms.config.admin.path}`;
+  return {
+    to,
+    subject: `You were added to ${name}`,
+    text: [
+      `An admin of ${name} added you to it. Sign in as before to work there:`,
+      admin,
+      "",
+      `\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25\u0E02\u0E2D\u0E07 ${name} \u0E40\u0E1E\u0E34\u0E48\u0E21\u0E04\u0E38\u0E13\u0E40\u0E02\u0E49\u0E32\u0E44\u0E1B\u0E41\u0E25\u0E49\u0E27 \u0E40\u0E02\u0E49\u0E32\u0E2A\u0E39\u0E48\u0E23\u0E30\u0E1A\u0E1A\u0E14\u0E49\u0E27\u0E22\u0E1A\u0E31\u0E0D\u0E0A\u0E35\u0E40\u0E14\u0E34\u0E21\u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E17\u0E33\u0E07\u0E32\u0E19\u0E17\u0E35\u0E48\u0E19\u0E31\u0E48\u0E19:`,
+      admin,
+      "",
+      "If you don't know why, ask your admin. / \u0E2B\u0E32\u0E01\u0E44\u0E21\u0E48\u0E17\u0E23\u0E32\u0E1A\u0E17\u0E35\u0E48\u0E21\u0E32 \u0E42\u0E1B\u0E23\u0E14\u0E2A\u0E2D\u0E1A\u0E16\u0E32\u0E21\u0E1C\u0E39\u0E49\u0E14\u0E39\u0E41\u0E25"
+    ].join("\n")
+  };
+}
 function membersEndpoints(options) {
   const tenantFor = (user, context) => {
     const { tenant } = tenantOf(context);
@@ -139,6 +157,12 @@ function membersEndpoints(options) {
         });
         const existing = docs[0];
         if (existing) {
+          const account = { id: existing.id, email, role: existing.role };
+          const memberRoles = cms.config.auth.members?.roles ?? [];
+          if (memberRoles.includes(String(existing.role)) || options.isSuper(account))
+            throw new ValidationError("users", [
+              { field: "email", message: "can't be added to a tenant" }
+            ]);
           const list = rows(existing).filter((row) => !sameId(row.tenant, tenant));
           const doc2 = await cms.update(
             "users",
@@ -146,7 +170,17 @@ function membersEndpoints(options) {
             { [MEMBERSHIPS_FIELD]: [...list, { tenant, role }] },
             { depth: 0 }
           );
-          return { member: member(doc2, tenant), invited: false };
+          let invited2 = false;
+          if (cms.auth.canSendPasswordLinks(url.origin)) {
+            await cms.sendEmail(
+              await addedEmail(cms, options.tenantsSlug, tenant, email, url.origin)
+            );
+            invited2 = true;
+          }
+          return Response.json(
+            { member: { ...member(doc2, tenant), name: null }, invited: invited2 },
+            { status: 201 }
+          );
         }
         const doc = await cms.create(
           "users",
@@ -238,14 +272,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 +354,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 +421,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 } }] };
@@ -661,7 +696,7 @@ of its own. Run it once after adding the plugin to a site that has content.
         ...config.endpoints ?? [],
         optionsEndpoint,
         impactEndpoint,
-        ...membersEndpoints({ tenantsSlug, superUser })
+        ...membersEndpoints({ tenantsSlug, superUser, isSuper })
       ],
       commands: [...config.commands ?? [], assign],
       // Audit log entries belong to their tenant: its admins see them.

package/package.json

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