@easy-cms/plugin-multi-tenant 0.45.0 → 0.47.0

package/dist/index.js

@@ -61,7 +61,7 @@ import {
 // src/info.ts
 var INFO = {
   name: "@easy-cms/plugin-multi-tenant",
-  ...true ? { version: "0.45.0" } : {}
+  ...true ? { version: "0.47.0" } : {}
 };
 
 // src/members.ts
@@ -417,7 +417,7 @@ function multiTenantPlugin(options) {
       icon: "building",
       useAsTitle: "name",
       admin: {
-        group: "settings",
+        group: "settings.people",
         // Deleting a tenant deletes its content: its name is typed, and what goes is shown.
         confirmDelete: { typeTitle: true, impact: "/tenant-impact" }
       },
@@ -522,11 +522,11 @@ function multiTenantPlugin(options) {
       );
       const bound = user?.apiKey?.permissions?.context;
       const boundTenant = bound ? tenantOf(bound) : void 0;
-      if (user && isSuper(user) && (!boundTenant || boundTenant.tenant === null)) {
+      if (user && user.member !== true && isSuper(user) && (!boundTenant || boundTenant.tenant === null)) {
         const chosen2 = asked === ALL ? void 0 : findTenant(list, asked);
         return { user, context: { ...context, tenant: chosen2?.id ?? null, allTenants: true } };
       }
-      if (user) {
+      if (user && user.member !== true) {
         const mine = membershipsOf(user);
         const member = (t) => t ? mine.find((m) => sameId(m.tenant, t.id)) : void 0;
         const membership = boundTenant && boundTenant.tenant !== null ? mine.find((m) => sameId(m.tenant, boundTenant.tenant)) ?? (isSuper(user) ? { tenant: boundTenant.tenant, role: user.role } : void 0) : member(findTenant(list, asked)) ?? member(byHost) ?? mine.find((m) => list.some((t) => sameId(t.id, m.tenant)));
@@ -686,7 +686,7 @@ of its own. Run it once after adding the plugin to a site that has content.
             path: "tenant-members",
             label: { en: "Members", th: "\u0E2A\u0E21\u0E32\u0E0A\u0E34\u0E01" },
             icon: "users",
-            group: "settings",
+            group: "settings.people",
             // Admins of a tenant (and users with access to all, once they choose one).
             access: ({ user }) => user.role === "admin",
             component: { tag: "ecms-tenant-members" }

package/package.json

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