@7365admin1/core 3.73.1 → 3.75.0

package/dist/index.mjs

@@ -3166,6 +3166,16 @@ import {
 } from "@7365admin1/node-server-utils";
 import { v4 as uuidv4 } from "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;
+}
+
 // src/repositories/member.repo.ts
 import {
   AppError as AppError2,
@@ -3328,7 +3338,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(() => {
         logger7.info(`Cache cleared for namespace: ${namespace_collection3}`);
@@ -3456,6 +3466,7 @@ function useMemberRepo() {
     }
   }
   async function getByUserIdType(user, type) {
+    type = serviceAppType(type);
     try {
       user = new ObjectId13(user);
     } catch (error) {
@@ -3615,7 +3626,7 @@ function useMemberRepo() {
     search = search || "";
     page = page > 0 ? page - 1 : 0;
     const query2 = {
-      type,
+      type: serviceAppType(type),
       status
     };
     const cacheOptions = {
@@ -4137,6 +4148,7 @@ function useMemberRepo() {
     }
   }
   async function getByUserIdTypeOrg(user, type, org) {
+    type = serviceAppType(type);
     try {
       user = new ObjectId13(user);
     } catch {
@@ -11751,7 +11763,7 @@ function useRoleRepo() {
   const { delNamespace, setCache, getCache } = useCache14(namespace_collection3);
   const { delNamespace: _delDashboardNameSpace } = useCache14("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(() => {
@@ -11854,6 +11866,7 @@ function useRoleRepo() {
     if (!name) {
       throw new BadRequestError33("Role name is required.");
     }
+    type = serviceAppType(type);
     const query2 = type ? { name, type } : { name };
     try {
       const cacheKey = makeCacheKey11(namespace_collection3, query2);
@@ -11910,8 +11923,8 @@ function useRoleRepo() {
       cacheOptions.search = search;
     }
     if (type) {
-      query2.type = type;
-      cacheOptions.type = type;
+      query2.type = serviceAppType(type);
+      cacheOptions.type = query2.type;
     }
     const cacheKey = makeCacheKey11(namespace_collection3, cacheOptions);
     const cachedData = await getCache(cacheKey);
@@ -14552,13 +14565,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;
 }
@@ -14643,15 +14657,17 @@ 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)
+    const appType = serviceAppType(orgDoc?.nature);
+    if (!orgDoc?.invitedRole || appType !== 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 && role.type === appType && Array.isArray(permissions) && permissions.length > 0 && !permissions.includes("*");
     return chosen ? permissions.map(String) : null;
   } catch {
     return null;
@@ -23571,6 +23587,44 @@ function useMemberController() {
 // src/controllers/verification.controller.ts
 import { BadRequestError as BadRequestError51, logger as logger38 } from "@7365admin1/node-server-utils";
 import Joi28 from "joi";
+
+// src/utils/resident-app-modules.util.ts
+var RESIDENT_APP_NATURES = Object.freeze([
+  "property_management_agency",
+  "real_estate_developer"
+]);
+function effectiveResidentAppModules(orgModules, siteModules) {
+  const org = asModules(orgModules);
+  const site = asModules(siteModules);
+  const effective = {};
+  for (const key of residentAppModuleKeys) {
+    effective[key] = org[key] !== false && site[key] !== false;
+  }
+  return effective;
+}
+function residentAppModulesAboveCeiling(orgModules, requested, stored) {
+  const org = asModules(orgModules);
+  const wanted = asModules(requested);
+  const had = asModules(stored);
+  return residentAppModuleKeys.filter(
+    (key) => org[key] === false && wanted[key] === true && had[key] === false
+  );
+}
+function residentAppModulesAboveCeilingMessage(rejected) {
+  return `This client has not been given ${rejected.join(", ")} in the resident app, so a site cannot switch it on. Ask Seven365 to add it to the organisation first.`;
+}
+function withoutDerivedSiteMetadata(metadata) {
+  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
+    return metadata;
+  }
+  const { residentAppModulesEffective: _derived, ...stored } = metadata;
+  return stored;
+}
+function asModules(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+
+// src/controllers/verification.controller.ts
 var withoutEmail = (payload) => JSON.stringify({ ...payload, email: payload?.email ? "[redacted]" : void 0 });
 function callerId2(req) {
   const user = req.user;
@@ -23652,7 +23706,11 @@ function useVerificationController() {
       modules: modulesSchema.optional(),
       // The new client owner's permissions in that application, chosen with
       // the modules (owner, 2026-09-15). Only accepted together with modules.
-      permissions: permissionsSchema.optional()
+      permissions: permissionsSchema.optional(),
+      // The Service365 resident app switches for a Property Management (or
+      // real estate developer) client, same shape the Client details card saves
+      // to `organizations.residentAppModules`. Only accepted with modules.
+      residentAppModules: residentAppModulesSchema.optional()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -23672,7 +23730,8 @@ function useVerificationController() {
         siteId,
         siteName,
         modules,
-        permissions
+        permissions,
+        residentAppModules
       } = value;
       const newClient = !org && !app.includes(PLATFORM_STAFF_MEMBER_TYPE);
       const role = newClient ? "" : value.role;
@@ -23702,6 +23761,14 @@ function useVerificationController() {
         }
         clientModules.permissions = chosen;
       }
+      if (residentAppModules !== void 0) {
+        if (!clientModules || !RESIDENT_APP_NATURES.includes(app[0])) {
+          throw new BadRequestError51(
+            "Service365 resident app modules can only be chosen with the modules of a new Property Management client."
+          );
+        }
+        clientModules.residentAppModules = residentAppModules;
+      }
       await requireInviteReach(req, org, app, role);
       const verificationIds = await _createSimpleUserInvite({
         email,
@@ -25535,10 +25602,12 @@ function useOrgController() {
           const invitedBy = invite.metadata?.invitedBy;
           if (chosen.length && invitedBy && invite.metadata?.app === body.nature) {
             const permissions = clientInviteOwnerPermissionsOn() ? normalisePermissions(invite.metadata?.permissions) : [];
+            const residentApp = RESIDENT_APP_NATURES.includes(body.nature) ? residentAppModulesSchema.validate(invite.metadata?.residentAppModules) : null;
             invitedModules = {
               modules: chosen,
               invitedBy: String(invitedBy),
-              permissions: permissionsOutsideModules(permissions, chosen).length ? [] : permissions
+              permissions: permissionsOutsideModules(permissions, chosen).length ? [] : permissions,
+              ...residentApp?.value && !residentApp.error ? { residentAppModules: residentApp.value } : {}
             };
           }
         } else {
@@ -25561,7 +25630,10 @@ function useOrgController() {
         createdBy,
         invitedFrom,
         invitedRole,
-        ...invitedModules && { modules: invitedModules.modules }
+        ...invitedModules && { modules: invitedModules.modules },
+        ...invitedModules?.residentAppModules && {
+          residentAppModules: invitedModules.residentAppModules
+        }
       });
       if (invitedModules) {
         await recordConsoleAction({
@@ -25575,7 +25647,10 @@ function useOrgController() {
             moduleCount: invitedModules.modules.length,
             gateListHash: moduleListHash(invitedModules.modules),
             acknowledged: false,
-            impactMemberCount: 0
+            impactMemberCount: 0,
+            ...invitedModules.residentAppModules && {
+              residentAppModulesOff: Object.keys(invitedModules.residentAppModules).filter((key) => invitedModules.residentAppModules[key] === false).join(", ")
+            }
           })
         });
       }
@@ -25598,7 +25673,7 @@ function useOrgController() {
         invitedModules?.permissions
       );
       const appOwnerRole = invitedModules?.permissions.length ? seededRoles.find(
-        (role) => role.type === body.nature && role.name === "owner"
+        (role) => role.type === serviceAppType(body.nature) && role.name === "owner"
       ) : void 0;
       if (appOwnerRole) {
         try {
@@ -34301,40 +34376,6 @@ import {
   UnauthorizedError as UnauthorizedError14,
   useAtlas as useAtlas56
 } from "@7365admin1/node-server-utils";
-
-// src/utils/resident-app-modules.util.ts
-function effectiveResidentAppModules(orgModules, siteModules) {
-  const org = asModules(orgModules);
-  const site = asModules(siteModules);
-  const effective = {};
-  for (const key of residentAppModuleKeys) {
-    effective[key] = org[key] !== false && site[key] !== false;
-  }
-  return effective;
-}
-function residentAppModulesAboveCeiling(orgModules, requested, stored) {
-  const org = asModules(orgModules);
-  const wanted = asModules(requested);
-  const had = asModules(stored);
-  return residentAppModuleKeys.filter(
-    (key) => org[key] === false && wanted[key] === true && had[key] === false
-  );
-}
-function residentAppModulesAboveCeilingMessage(rejected) {
-  return `This client has not been given ${rejected.join(", ")} in the resident app, so a site cannot switch it on. Ask Seven365 to add it to the organisation first.`;
-}
-function withoutDerivedSiteMetadata(metadata) {
-  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
-    return metadata;
-  }
-  const { residentAppModulesEffective: _derived, ...stored } = metadata;
-  return stored;
-}
-function asModules(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
-}
-
-// src/controllers/site.controller.ts
 import Joi51 from "joi";
 import { ObjectId as ObjectId74 } from "mongodb";
 async function requireSiteWrite(req, siteId) {