@7365admin1/core 3.74.0 → 3.75.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.75.1
+
+### Patch Changes
+
+- da435e7: Membership and role lookups by type match every stored spelling of an application: a Property Management lookup finds rows stored as `real_estate_developer` (written before 3.75.0) as well as `property_management_agency`, including the module deny list and the owner-grant cap.
+
+## 3.75.0
+
+### Minor Changes
+
+- 75fb139: Real Estate Developer clients use the Property Management application: membership and role types `real_estate_developer` are stored and looked up as `property_management_agency`, so a developer's owner can open the Property Management app and the owner grant caps their roles.
+
 ## 3.74.0
 
 ### Minor Changes

package/dist/index.js

@@ -3974,6 +3974,30 @@ function useUserRepo() {
 var import_node_server_utils17 = require("@7365admin1/node-server-utils");
 var import_uuid = require("uuid");
 
+// src/utils/service-app-type.util.ts
+var APP_TYPE_ALIASES = Object.freeze({
+  real_estate_developer: "property_management_agency"
+});
+function serviceAppType(type) {
+  if (typeof type !== "string")
+    return type;
+  return APP_TYPE_ALIASES[type] ?? type;
+}
+function storedAppTypes(type) {
+  const app = serviceAppType(type);
+  return [
+    app,
+    ...Object.keys(APP_TYPE_ALIASES).filter((alias) => APP_TYPE_ALIASES[alias] === app)
+  ];
+}
+function appTypeQuery(type) {
+  const types = storedAppTypes(type);
+  return types.length === 1 ? types[0] : { $in: types };
+}
+function sameAppType(a, b) {
+  return !!a && !!b && serviceAppType(a) === serviceAppType(b);
+}
+
 // src/repositories/member.repo.ts
 var import_node_server_utils14 = require("@7365admin1/node-server-utils");
 
@@ -4126,7 +4150,7 @@ function useMemberRepo() {
   }
   async function add(value, session) {
     try {
-      value = MMember(value);
+      value = MMember({ ...value, type: serviceAppType(value.type) });
       await collection.insertOne(value, { session });
       delNamespace().then(() => {
         import_node_server_utils14.logger.info(`Cache cleared for namespace: ${namespace_collection3}`);
@@ -4254,6 +4278,7 @@ function useMemberRepo() {
     }
   }
   async function getByUserIdType(user, type) {
+    type = serviceAppType(type);
     try {
       user = new import_mongodb13.ObjectId(user);
     } catch (error) {
@@ -4269,7 +4294,7 @@ function useMemberRepo() {
       return cachedData;
     }
     try {
-      const data = await collection.findOne({ user, type });
+      const data = await collection.findOne({ user, type: appTypeQuery(type) });
       if (!data) {
         throw new import_node_server_utils14.NotFoundError("Member not found.");
       }
@@ -4413,7 +4438,7 @@ function useMemberRepo() {
     search = search || "";
     page = page > 0 ? page - 1 : 0;
     const query2 = {
-      type,
+      type: type ? appTypeQuery(type) : type,
       status
     };
     const cacheOptions = {
@@ -4542,7 +4567,7 @@ function useMemberRepo() {
     const query2 = {
       user,
       org: { $nin: [null, ""] },
-      type
+      type: appTypeQuery(type)
     };
     const cacheOptions = {
       page,
@@ -4935,6 +4960,7 @@ function useMemberRepo() {
     }
   }
   async function getByUserIdTypeOrg(user, type, org) {
+    type = serviceAppType(type);
     try {
       user = new import_mongodb13.ObjectId(user);
     } catch {
@@ -4958,7 +4984,7 @@ function useMemberRepo() {
     try {
       const data = await collection.findOne({
         user,
-        type,
+        type: appTypeQuery(type),
         org
       });
       if (!data) {
@@ -10536,7 +10562,7 @@ function pickSiteMembership(rows, type, site, org = "") {
   if (!site)
     return null;
   const live = rows.filter(
-    (m) => m.type === type && isLiveMembership(m) && (!org || idOf2(m.org) === org)
+    (m) => sameAppType(m.type, type) && isLiveMembership(m) && (!org || idOf2(m.org) === org)
   );
   const atSite = live.find((m) => idOf2(m.siteId) === site);
   if (atSite)
@@ -10550,10 +10576,10 @@ function pickLookupMembership(rows, type, site = "", org = "") {
   const atSite = site ? pickSiteMembership(list, type, site, org) : null;
   if (atSite)
     return atSite;
-  const inOrg = org ? list.find((m) => m.type === type && idOf2(m.org) === org.toLowerCase()) : void 0;
+  const inOrg = org ? list.find((m) => sameAppType(m.type, type) && idOf2(m.org) === org.toLowerCase()) : void 0;
   if (inOrg && isLiveMembership(inOrg))
     return inOrg;
-  return list.find((m) => m.type === type) ?? null;
+  return list.find((m) => sameAppType(m.type, type)) ?? null;
 }
 function memberListSiteScope(memberships, org) {
   const inOrg = (memberships ?? []).filter((m) => idOf2(m.org) === idOf2(org));
@@ -12442,7 +12468,7 @@ function useRoleRepo() {
   const { delNamespace, setCache, getCache } = (0, import_node_server_utils42.useCache)(namespace_collection3);
   const { delNamespace: _delDashboardNameSpace } = (0, import_node_server_utils42.useCache)("dashboard");
   async function addRole(value, session) {
-    value = new MRole(value);
+    value = new MRole({ ...value, type: serviceAppType(value.type) });
     try {
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
@@ -12506,7 +12532,7 @@ function useRoleRepo() {
       return cachedData;
     }
     try {
-      const data = await collection.find({ org, permissions: "*", type, status: "active" }).toArray();
+      const data = await collection.find({ org, permissions: "*", type: appTypeQuery(type), status: "active" }).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
         import_node_server_utils42.logger.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
@@ -12545,7 +12571,8 @@ function useRoleRepo() {
     if (!name) {
       throw new import_node_server_utils42.BadRequestError("Role name is required.");
     }
-    const query2 = type ? { name, type } : { name };
+    type = serviceAppType(type);
+    const query2 = type ? { name, type: appTypeQuery(type) } : { name };
     try {
       const cacheKey = (0, import_node_server_utils42.makeCacheKey)(namespace_collection3, query2);
       const cachedData = await getCache(cacheKey);
@@ -12601,8 +12628,8 @@ function useRoleRepo() {
       cacheOptions.search = search;
     }
     if (type) {
-      query2.type = type;
-      cacheOptions.type = type;
+      query2.type = appTypeQuery(type);
+      cacheOptions.type = serviceAppType(type);
     }
     const cacheKey = (0, import_node_server_utils42.makeCacheKey)(namespace_collection3, cacheOptions);
     const cachedData = await getCache(cacheKey);
@@ -15216,13 +15243,14 @@ function defaultOwnerRoles(org, nature, appOwnerPermissions) {
     { ...owner, type: "organization" },
     { ...administrator, type: "organization" }
   ];
-  if (nature && APP_SERVICE_TYPES.has(nature)) {
+  const appType = serviceAppType(nature);
+  if (appType && APP_SERVICE_TYPES.has(appType)) {
     roles.push({
       ...owner,
-      type: nature,
+      type: appType,
       ...appOwnerPermissions?.length && { permissions: [...appOwnerPermissions] }
     });
-    roles.push({ ...administrator, type: nature });
+    roles.push({ ...administrator, type: appType });
   }
   return roles;
 }
@@ -15307,15 +15335,16 @@ async function moduleCeiling(org, site) {
 }
 async function ownerGrantCeiling(org, type) {
   const orgId = org?.toString() ?? "";
+  type = serviceAppType(type);
   if (!orgId || !type)
     return null;
   try {
     const orgDoc = await useOrgRepo().getById(orgId).catch(() => null);
-    if (!orgDoc?.invitedRole || orgDoc.nature !== type)
+    if (!orgDoc?.invitedRole || !sameAppType(orgDoc?.nature, type))
       return null;
     const role = await useRoleRepo().getRoleById(String(orgDoc.invitedRole)).catch(() => null);
     const permissions = role?.permissions;
-    const chosen = role && String(role.org ?? "") === orgId && role.default === true && role.type === orgDoc.nature && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
+    const chosen = role && String(role.org ?? "") === orgId && role.default === true && sameAppType(role.type, type) && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
     return chosen ? permissions.map(String) : null;
   } catch {
     return null;
@@ -26267,7 +26296,7 @@ function useOrgController() {
         invitedModules?.permissions
       );
       const appOwnerRole = invitedModules?.permissions.length ? seededRoles.find(
-        (role) => role.type === body.nature && role.name === "owner"
+        (role) => sameAppType(role.type, body.nature) && role.name === "owner"
       ) : void 0;
       if (appOwnerRole) {
         try {