@7365admin1/core 3.63.0 → 3.64.0

package/dist/index.mjs

@@ -10513,7 +10513,7 @@ import {
   BadRequestError as BadRequestError31,
   NotFoundError as NotFoundError11,
   InternalServerError as InternalServerError15,
-  UnauthorizedError as UnauthorizedError3,
+  UnauthorizedError as UnauthorizedError4,
   useAtlas as useAtlas21
 } from "@7365admin1/node-server-utils";
 
@@ -10948,9 +10948,9 @@ var SUBSCRIPTION_AUTO_SUSPEND_ENABLED = process.env.SUBSCRIPTION_AUTO_SUSPEND_EN
 // src/repositories/organization.repo.ts
 import {
   AppError as AppError3,
-  BadRequestError as BadRequestError19,
+  BadRequestError as BadRequestError20,
   InternalServerError as InternalServerError9,
-  logger as logger9,
+  logger as logger10,
   makeCacheKey as makeCacheKey7,
   NotFoundError as NotFoundError7,
   paginate as paginate7,
@@ -10959,9 +10959,9 @@ import {
 } from "@7365admin1/node-server-utils";
 
 // src/models/organization.model.ts
-import { BadRequestError as BadRequestError18 } from "@7365admin1/node-server-utils";
-import Joi9 from "joi";
-import { ObjectId as ObjectId18 } from "mongodb";
+import { BadRequestError as BadRequestError19 } from "@7365admin1/node-server-utils";
+import Joi10 from "joi";
+import { ObjectId as ObjectId19 } from "mongodb";
 
 // src/utils/org-modules.util.ts
 import Joi8 from "joi";
@@ -10981,6 +10981,285 @@ function normaliseModules(modules) {
   }
   return out;
 }
+function orgAllowsModule(modules, resource) {
+  if (!Array.isArray(modules) || modules.length === 0)
+    return true;
+  const key = typeof resource === "string" ? resource.trim() : "";
+  if (!key)
+    return true;
+  return modules.includes(key);
+}
+
+// src/models/site.model.ts
+import {
+  BadRequestError as BadRequestError18,
+  logger as logger9
+} from "@7365admin1/node-server-utils";
+import Joi9 from "joi";
+
+// src/utils/site-modules.util.ts
+import { UnauthorizedError } from "@7365admin1/node-server-utils";
+var siteModulesSchema = modulesSchema;
+function narrows(modules) {
+  return Array.isArray(modules) && modules.length > 0;
+}
+function effectiveSiteModules(orgModules, siteModules) {
+  const org = narrows(orgModules) ? normaliseModules(orgModules) : [];
+  const site = narrows(siteModules) ? normaliseModules(siteModules) : [];
+  if (!org.length)
+    return site;
+  if (!site.length)
+    return org;
+  const allowed = site.filter((key) => org.includes(key));
+  return allowed.length ? allowed : org;
+}
+function rejectedSiteModules(orgModules, requested) {
+  if (!narrows(orgModules))
+    return [];
+  const org = normaliseModules(orgModules);
+  return normaliseModules(requested).filter((key) => !org.includes(key));
+}
+function rejectedSiteModulesMessage(rejected) {
+  return `This organisation has not been given ${rejected.join(", ")}, so a site cannot offer it. Ask Seven365 to add it to the organisation first.`;
+}
+function permissionsOutsideModules(effective, next, previous) {
+  if (!narrows(effective))
+    return [];
+  if (!Array.isArray(next) || !next.length || next.includes("*"))
+    return [];
+  const held = new Set(Array.isArray(previous) ? previous : []);
+  const allowed = normaliseModules(effective);
+  const refused = [];
+  for (const permission of next) {
+    if (typeof permission !== "string")
+      continue;
+    if (held.has(permission))
+      continue;
+    const resource = permission.split(":")[0]?.trim();
+    if (!resource)
+      continue;
+    if (!orgAllowsModule(allowed, resource))
+      refused.push(permission);
+  }
+  return refused;
+}
+function requireWithinModules(effective, next, previous) {
+  const refused = permissionsOutsideModules(effective, next, previous);
+  if (!refused.length)
+    return;
+  throw new UnauthorizedError(
+    "This site has not been given " + refused.join(", ") + ". Ask Seven365 to add the module to the organisation first."
+  );
+}
+
+// src/models/site.model.ts
+import { ObjectId as ObjectId18 } from "mongodb";
+
+// src/utils/site-timezone.util.ts
+import moment from "moment-timezone";
+var DEFAULT_SITE_TIMEZONE = "Asia/Singapore";
+function isValidTimezone(tz) {
+  return typeof tz === "string" && tz.length > 0 && !!moment.tz.zone(tz);
+}
+function resolveSiteTimezone(site) {
+  const tz = site?.timezone;
+  return isValidTimezone(tz) ? tz : DEFAULT_SITE_TIMEZONE;
+}
+function siteDayBounds(value, timezone) {
+  if (!value)
+    return null;
+  const tz = isValidTimezone(timezone) ? timezone : DEFAULT_SITE_TIMEZONE;
+  const isDateOnly = typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value);
+  const m = isDateOnly ? moment.tz(value, "YYYY-MM-DD", tz) : typeof value === "string" ? moment.tz(value, moment.ISO_8601, tz) : moment.tz(value, tz);
+  if (!m.isValid())
+    return null;
+  return {
+    start: m.clone().startOf("day").toDate(),
+    end: m.clone().endOf("day").toDate(),
+    date: m.format("YYYY-MM-DD")
+  };
+}
+
+// src/models/site.model.ts
+function siteTimezoneValidator(value, helpers) {
+  return isValidTimezone(value) ? value : helpers.error("any.invalid");
+}
+var addressSchema = Joi9.object({
+  line1: Joi9.string().min(3).required(),
+  line2: Joi9.string().allow("", null),
+  city: Joi9.string().min(2).required(),
+  state: Joi9.string().allow("", null),
+  postalCode: Joi9.string().min(3).required(),
+  country: Joi9.string().min(2).required()
+});
+var hidQrCodePassSchema = Joi9.object({
+  enabled: Joi9.boolean().required(),
+  onlineMode: Joi9.boolean().optional(),
+  readerId: Joi9.string().hex().length(24).allow("").required(),
+  qrGatePermissions: Joi9.object({
+    resident: Joi9.array().items(Joi9.string().hex().length(24)).unique().default([]),
+    propertyManagement: Joi9.array().items(Joi9.string().hex().length(24)).unique().default([])
+  }).optional(),
+  qrFormat: Joi9.string().valid("0", "1", "2").required(),
+  identificationMethods: Joi9.object({
+    facial: Joi9.boolean().required(),
+    card: Joi9.boolean().required(),
+    qrCode: Joi9.boolean().required(),
+    idPassword: Joi9.boolean().required(),
+    pin: Joi9.boolean().required(),
+    bluetooth: Joi9.boolean().required()
+  }).optional(),
+  printer: Joi9.object({
+    vendorId: Joi9.string().allow("").required(),
+    productId: Joi9.string().allow("").required()
+  }).required(),
+  template: Joi9.object({
+    header: Joi9.string().allow("").required(),
+    subtext: Joi9.string().allow("").required()
+  }).required(),
+  validityMinutes: Joi9.number().integer().min(1).allow(null).required(),
+  updatedAt: Joi9.string().isoDate().required()
+});
+var residentAppModulesSchema = Joi9.object({
+  feedback: Joi9.boolean(),
+  bulletin: Joi9.boolean(),
+  bulletinVideos: Joi9.boolean(),
+  inviteVisitors: Joi9.boolean(),
+  myVisitors: Joi9.boolean(),
+  billingAndSoa: Joi9.boolean(),
+  access: Joi9.boolean(),
+  facilityBooking: Joi9.boolean(),
+  onlineForm: Joi9.boolean(),
+  emergencyContact: Joi9.boolean()
+});
+var metadataSchema3 = Joi9.object({
+  /**
+   * The catalogue modules THIS SITE offers — tier two of the cascade.
+   *
+   * Owner requirement R1: whatever Seven365 gives an organisation is the only
+   * set that organisation may then give to each site it creates. The
+   * organisation's own list is `organizations.modules`; this narrows it per
+   * site, and `site-modules.util.ts` holds both the read (fails open) and the
+   * write rule (refuses a key the organisation was never given).
+   *
+   * ABSENT AND EMPTY BOTH MEAN "everything the organisation has" — never
+   * "nothing". No site has this field today.
+   *
+   * It lives in `metadata` because `MSite` is a whitelist: a new top-level
+   * field is silently dropped, while `metadata` is passed through wholesale.
+   * `residentAppModules` below is the same pattern for the same reason.
+   */
+  modules: siteModulesSchema.optional(),
+  block: Joi9.number().optional(),
+  guardPosts: Joi9.number().optional(),
+  gracePeriod: Joi9.number().optional(),
+  incidentCounter: Joi9.number().optional(),
+  incidentLogo: Joi9.string().optional().allow("", null),
+  services: Joi9.array().items(Joi9.object().unknown(true)).optional(),
+  residentAppModules: residentAppModulesSchema.optional(),
+  hidQrCodePass: hidQrCodePassSchema.optional()
+});
+var residentAppModuleKeys = [
+  "feedback",
+  "bulletin",
+  "bulletinVideos",
+  "inviteVisitors",
+  "myVisitors",
+  "billingAndSoa",
+  "access",
+  "facilityBooking",
+  "onlineForm",
+  "emergencyContact"
+];
+var updateAddressSchema = Joi9.object({
+  line1: Joi9.string().min(3).allow("", null),
+  line2: Joi9.string().allow("", null),
+  city: Joi9.string().min(2).allow("", null),
+  state: Joi9.string().allow("", null),
+  postalCode: Joi9.string().min(3).allow("", null),
+  country: Joi9.string().min(2).allow("", null)
+});
+var SiteStatus = /* @__PURE__ */ ((SiteStatus2) => {
+  SiteStatus2["ACTIVE"] = "active";
+  SiteStatus2["PENDING"] = "pending";
+  return SiteStatus2;
+})(SiteStatus || {});
+var SiteCategories = /* @__PURE__ */ ((SiteCategories2) => {
+  SiteCategories2["RESIDENTIAL"] = "residential";
+  SiteCategories2["COMMERCIAL"] = "commercial";
+  SiteCategories2["INDUSTRIAL"] = "industrial";
+  SiteCategories2["MIXED_DEVELOPMENT"] = "mixed_development";
+  SiteCategories2["INSTITUTIONAL"] = "institutional";
+  SiteCategories2["INFRASTRUCTURE"] = "infrastructure";
+  SiteCategories2["HOSPITALITY"] = "hospitality";
+  return SiteCategories2;
+})(SiteCategories || {});
+var allowedFieldsSite = [
+  "metadata.block",
+  "metadata.guardPosts",
+  "metadata.gracePeriod",
+  "metadata.incidentCounter",
+  "metadata.incidentLogo",
+  "metadata.services",
+  "metadata.hidQrCodePass"
+];
+var siteSchema = Joi9.object({
+  name: Joi9.string().required(),
+  description: Joi9.string().optional().allow("", null),
+  orgId: Joi9.string().hex().required(),
+  customerId: Joi9.string().hex().optional().allow("", null),
+  address: addressSchema.optional(),
+  timezone: Joi9.string().custom(siteTimezoneValidator, "IANA timezone").optional().default(DEFAULT_SITE_TIMEZONE),
+  category: Joi9.string().valid(...Object.values(SiteCategories)).default("commercial" /* COMMERCIAL */),
+  deliveryCompanyList: Joi9.array().items(Joi9.string()).optional().allow(null),
+  isOpenGate: Joi9.boolean().optional().default(false),
+  dahuaTimeExpiration: Joi9.number().optional().allow(null),
+  siteDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, "")),
+  unitDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, ""))
+});
+var updateSiteSchema = Joi9.object({
+  _id: Joi9.string().hex().length(24).required(),
+  address: updateAddressSchema.optional(),
+  timezone: Joi9.string().custom(siteTimezoneValidator, "IANA timezone").optional(),
+  metadata: metadataSchema3.optional(),
+  deliveryCompanyList: Joi9.array().items(Joi9.string().trim()).optional().allow(null),
+  isOpenGate: Joi9.boolean().optional().allow(null),
+  dahuaTimeExpiration: Joi9.number().optional().allow(null),
+  siteDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, "")),
+  unitDocs: Joi9.array().items(Joi9.string().hex().length(24).allow(null, ""))
+});
+function MSite(value) {
+  const { error } = siteSchema.validate(value);
+  if (error) {
+    logger9.log({ level: "error", message: error.message });
+    throw new BadRequestError18(error.message);
+  }
+  if (value.orgId) {
+    try {
+      value.orgId = new ObjectId18(value.orgId);
+    } catch (error2) {
+      throw new BadRequestError18("Invalid org ID format.");
+    }
+  }
+  return {
+    name: value.name ?? "",
+    description: value.description ?? "",
+    orgId: value.orgId ?? "",
+    metadata: value.metadata ?? {},
+    status: "active",
+    createdAt: /* @__PURE__ */ new Date(),
+    address: value.address,
+    timezone: value.timezone ?? DEFAULT_SITE_TIMEZONE,
+    category: value.category,
+    deliveryCompanyList: value.deliveryCompanyList ?? [],
+    isOpenGate: value.isOpenGate,
+    dahuaTimeExpiration: value.dahuaTimeExpiration,
+    siteDocs: value.siteDocs ?? [],
+    unitDocs: value.unitDocs ?? [],
+    updatedAt: value.updatedAt ?? "",
+    deletedAt: value.deletedAt ?? ""
+  };
+}
 
 // src/models/organization.model.ts
 var allowedNatures = [
@@ -10993,38 +11272,39 @@ var allowedNatures = [
   "pest_control_services",
   "pool_maintenance_services"
 ];
-var orgSchema = Joi9.object({
-  _id: Joi9.string().hex().optional().allow("", null),
-  name: Joi9.string().required(),
-  description: Joi9.string().optional().allow("", null),
-  type: Joi9.string().required(),
-  nature: Joi9.string().valid(...allowedNatures).required(),
+var orgSchema = Joi10.object({
+  _id: Joi10.string().hex().optional().allow("", null),
+  name: Joi10.string().required(),
+  description: Joi10.string().optional().allow("", null),
+  type: Joi10.string().required(),
+  nature: Joi10.string().valid(...allowedNatures).required(),
   modules: modulesSchema.optional(),
-  email: Joi9.string().email().required(),
-  contact: Joi9.string().optional().allow("", null),
-  country: Joi9.string().optional().allow("", null),
-  busInst: Joi9.string().optional().allow("", null),
-  status: Joi9.string().optional().allow("", null),
-  defaultSite: Joi9.string().hex().optional().allow("", null),
-  createdBy: Joi9.string().hex().optional().allow("", null),
-  invitedFrom: Joi9.string().hex().optional().allow("", null),
-  invitedRole: Joi9.string().hex().optional().allow("", null),
-  terms: Joi9.string().optional().allow("", null),
-  policies: Joi9.string().optional().allow("", null),
-  createdAt: Joi9.string().optional().allow("", null),
-  updatedAt: Joi9.string().optional().allow("", null),
-  deletedAt: Joi9.string().optional().allow("", null)
+  residentAppModules: residentAppModulesSchema.optional(),
+  email: Joi10.string().email().required(),
+  contact: Joi10.string().optional().allow("", null),
+  country: Joi10.string().optional().allow("", null),
+  busInst: Joi10.string().optional().allow("", null),
+  status: Joi10.string().optional().allow("", null),
+  defaultSite: Joi10.string().hex().optional().allow("", null),
+  createdBy: Joi10.string().hex().optional().allow("", null),
+  invitedFrom: Joi10.string().hex().optional().allow("", null),
+  invitedRole: Joi10.string().hex().optional().allow("", null),
+  terms: Joi10.string().optional().allow("", null),
+  policies: Joi10.string().optional().allow("", null),
+  createdAt: Joi10.string().optional().allow("", null),
+  updatedAt: Joi10.string().optional().allow("", null),
+  deletedAt: Joi10.string().optional().allow("", null)
 });
 function MOrg(value) {
   const { error } = orgSchema.validate(value);
   if (error) {
-    throw new BadRequestError18(error.message);
+    throw new BadRequestError19(error.message);
   }
   if (value._id) {
     try {
-      value._id = new ObjectId18(value._id);
+      value._id = new ObjectId19(value._id);
     } catch (error2) {
-      throw new BadRequestError18("Invalid organization ID format.");
+      throw new BadRequestError19("Invalid organization ID format.");
     }
   }
   return {
@@ -11037,15 +11317,20 @@ function MOrg(value) {
     // deliberate empty list to any later reader, and would put the field on all
     // 168 live organisations for no reason.
     ...value.modules === void 0 ? {} : { modules: normaliseModules(value.modules) },
+    // Same rule for the resident app's own tier (R4). Absent stays ABSENT, and
+    // MOrg is a WHITELIST — a new top-level field that is not named here is
+    // silently dropped on the way to Mongo, which is how this one has to be
+    // added at all.
+    ...value.residentAppModules === void 0 ? {} : { residentAppModules: value.residentAppModules },
     email: value.email,
     contact: value.contact,
     country: value.country ?? "",
     busInst: value.busInst,
     status: value.status || "active",
     defaultSite: value.defaultSite,
-    createdBy: value.createdBy && ObjectId18.isValid(value.createdBy.toString()) ? new ObjectId18(value.createdBy.toString()) : void 0,
-    invitedFrom: value.invitedFrom && ObjectId18.isValid(value.invitedFrom.toString()) ? new ObjectId18(value.invitedFrom.toString()) : null,
-    invitedRole: value.invitedRole && ObjectId18.isValid(value.invitedRole.toString()) ? new ObjectId18(value.invitedRole.toString()) : null,
+    createdBy: value.createdBy && ObjectId19.isValid(value.createdBy.toString()) ? new ObjectId19(value.createdBy.toString()) : void 0,
+    invitedFrom: value.invitedFrom && ObjectId19.isValid(value.invitedFrom.toString()) ? new ObjectId19(value.invitedFrom.toString()) : null,
+    invitedRole: value.invitedRole && ObjectId19.isValid(value.invitedRole.toString()) ? new ObjectId19(value.invitedRole.toString()) : null,
     terms: value.terms ?? "",
     policies: value.policies ?? "",
     createdAt: value.createdAt || /* @__PURE__ */ new Date(),
@@ -11055,7 +11340,7 @@ function MOrg(value) {
 }
 
 // src/repositories/organization.repo.ts
-import { ObjectId as ObjectId19 } from "mongodb";
+import { ObjectId as ObjectId20 } from "mongodb";
 var DUPLICATE_FIELD_LABEL = {
   name: "name",
   email: "email address"
@@ -11114,12 +11399,12 @@ function useOrgRepo() {
       return null;
     try {
       return await collection.findOne({
-        createdBy: new ObjectId19(createdBy.toString()),
+        createdBy: new ObjectId20(createdBy.toString()),
         nature,
         status: { $ne: "deleted" }
       });
     } catch (error) {
-      logger9.log({
+      logger10.log({
         level: "error",
         message: `Failed to look up an existing ${nature} organisation for ${createdBy}`
       });
@@ -11131,22 +11416,22 @@ function useOrgRepo() {
       value = MOrg(value);
       const res = await collection.insertOne(value, { session });
       delNamespace().then(() => {
-        logger9.info(`Cache cleared for namespace: ${namespace_collection2}`);
+        logger10.info(`Cache cleared for namespace: ${namespace_collection2}`);
       }).catch((err) => {
-        logger9.error(
+        logger10.error(
           `Failed to clear cache for namespace: ${namespace_collection2}`,
           err
         );
       });
       return res.insertedId;
     } catch (error) {
-      logger9.log({ level: "error", message: error.message });
+      logger10.log({ level: "error", message: error.message });
       if (error instanceof AppError3) {
         throw error;
       } else {
         const isDuplicated = error.message.includes("duplicate");
         if (isDuplicated) {
-          throw new BadRequestError19("Organization already exist.");
+          throw new BadRequestError20("Organization already exist.");
         }
         throw new InternalServerError9("Failed to create organization.");
       }
@@ -11155,7 +11440,7 @@ function useOrgRepo() {
   async function update(id, value, session) {
     try {
       await collection.updateOne(
-        { _id: new ObjectId19(id) },
+        { _id: new ObjectId20(id) },
         {
           $set: {
             ...value,
@@ -11167,7 +11452,7 @@ function useOrgRepo() {
       await delNamespace();
       return id;
     } catch (error) {
-      logger9.log({
+      logger10.log({
         level: "error",
         message: `Organization update failed for ${id}: ${error?.name ?? "Error"}${error?.code !== void 0 ? ` code=${error.code}` : ""}${duplicatedField(error) ? ` key=${duplicatedField(error)}` : ""} fields=[${Object.keys(value ?? {}).join(",")}] ${error?.message ?? ""}`
       });
@@ -11175,7 +11460,7 @@ function useOrgRepo() {
         throw error;
       const field = duplicatedField(error);
       if (field) {
-        throw new BadRequestError19(
+        throw new BadRequestError20(
           `Another organization already uses this ${DUPLICATE_FIELD_LABEL[field] ?? field}. Please use a different one.`
         );
       }
@@ -11203,12 +11488,12 @@ function useOrgRepo() {
     };
     if (scope) {
       const ids2 = Array.from(
-        new Set((scope.orgIds ?? []).filter((id) => ObjectId19.isValid(id)))
+        new Set((scope.orgIds ?? []).filter((id) => ObjectId20.isValid(id)))
       ).sort();
       const email = (scope.email ?? "").trim();
       const reach = [];
       if (ids2.length)
-        reach.push({ _id: { $in: ids2.map((id) => new ObjectId19(id)) } });
+        reach.push({ _id: { $in: ids2.map((id) => new ObjectId20(id)) } });
       if (email)
         reach.push({ email });
       if (!reach.length) {
@@ -11228,7 +11513,7 @@ function useOrgRepo() {
     const cacheKey = makeCacheKey7(namespace_collection2, cacheOptions);
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger9.info(`Cache hit for key: ${cacheKey}`);
+      logger10.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     const normalizedPage = page > 0 ? page - 1 : 0;
@@ -11253,21 +11538,21 @@ function useOrgRepo() {
       const length = await collection.countDocuments(query2);
       const data = paginate7(items, normalizedPage, limit, length);
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger9.info(`Cache set for key: ${cacheKey}`);
+        logger10.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger9.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger10.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
-      logger9.log({ level: "error", message: `${error}` });
+      logger10.log({ level: "error", message: `${error}` });
       throw error;
     }
   }
   async function getNameById(_id) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid organization ID format.");
+      throw new BadRequestError20("Invalid organization ID format.");
     }
     const data = await collection.findOne(
       { _id },
@@ -11280,16 +11565,16 @@ function useOrgRepo() {
   }
   async function getById(_id) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid organization ID format.");
+      throw new BadRequestError20("Invalid organization ID format.");
     }
     const cacheKey = makeCacheKey7(namespace_collection2, {
       _id: _id.toString()
     });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger9.info(`Cache hit for key: ${cacheKey}`);
+      logger10.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -11298,9 +11583,9 @@ function useOrgRepo() {
         throw new NotFoundError7("Organization not found.");
       }
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger9.info(`Cache set for key: ${cacheKey}`);
+        logger10.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger9.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger10.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -11320,13 +11605,13 @@ function useOrgRepo() {
       const cacheKey = makeCacheKey7(namespace_collection2, { name });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
-        logger9.info(`Cache hit for key: ${cacheKey}`);
+        logger10.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger9.info(`Cache set for key: ${cacheKey}`);
+        logger10.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger9.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger10.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -11341,15 +11626,15 @@ function useOrgRepo() {
     const cacheKey = makeCacheKey7(namespace_collection2, { email });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger9.info(`Cache hit for key: ${cacheKey}`);
+      logger10.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
       const data = await collection.findOne({ email });
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger9.info(`Cache set for key: ${cacheKey}`);
+        logger10.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger9.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger10.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -11362,7 +11647,7 @@ function useOrgRepo() {
     });
     const cachedData = await getCache(cacheKey);
     if (cachedData) {
-      logger9.info(`Cache hit for key: ${cacheKey}`);
+      logger10.info(`Cache hit for key: ${cacheKey}`);
       return cachedData;
     }
     try {
@@ -11370,9 +11655,9 @@ function useOrgRepo() {
         email
       }).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
-        logger9.info(`Cache set for key: ${cacheKey}`);
+        logger10.info(`Cache set for key: ${cacheKey}`);
       }).catch((err) => {
-        logger9.error(`Failed to set cache for key: ${cacheKey}`, err);
+        logger10.error(`Failed to set cache for key: ${cacheKey}`, err);
       });
       return data;
     } catch (error) {
@@ -11386,14 +11671,14 @@ function useOrgRepo() {
   }, session) {
     const allowedFields = ["name", "description", "defaultSite"];
     if (!allowedFields.includes(field)) {
-      throw new BadRequestError19(
+      throw new BadRequestError20(
         `Field "${field}" is not allowed to be updated.`
       );
     }
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid organization ID format.");
+      throw new BadRequestError20("Invalid organization ID format.");
     }
     try {
       await collection.updateOne(
@@ -11403,9 +11688,9 @@ function useOrgRepo() {
         { session }
       );
       delNamespace().then(() => {
-        logger9.info(`Cache cleared for namespace: ${namespace_collection2}`);
+        logger10.info(`Cache cleared for namespace: ${namespace_collection2}`);
       }).catch((err) => {
-        logger9.error(
+        logger10.error(
           `Failed to clear cache for namespace: ${namespace_collection2}`,
           err
         );
@@ -11417,9 +11702,9 @@ function useOrgRepo() {
   }
   async function deleteById(_id) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid organization ID format.");
+      throw new BadRequestError20("Invalid organization ID format.");
     }
     try {
       await collection.updateOne(
@@ -11427,9 +11712,9 @@ function useOrgRepo() {
         { $set: { status: "deleted", deletedAt: (/* @__PURE__ */ new Date()).toISOString() } }
       );
       delNamespace().then(() => {
-        logger9.info(`Cache cleared for namespace: ${namespace_collection2}`);
+        logger10.info(`Cache cleared for namespace: ${namespace_collection2}`);
       }).catch((err) => {
-        logger9.error(
+        logger10.error(
           `Failed to clear cache for namespace: ${namespace_collection2}`,
           err
         );
@@ -11441,9 +11726,9 @@ function useOrgRepo() {
   }
   async function updateStatusById(_id, status) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid organization ID format.");
+      throw new BadRequestError20("Invalid organization ID format.");
     }
     try {
       const result = await collection.updateOne(
@@ -11454,9 +11739,9 @@ function useOrgRepo() {
         throw new NotFoundError7("Organization not found.");
       }
       delNamespace().then(() => {
-        logger9.info(`Cache cleared for namespace: ${namespace_collection2}`);
+        logger10.info(`Cache cleared for namespace: ${namespace_collection2}`);
       }).catch((err) => {
-        logger9.error(
+        logger10.error(
           `Failed to clear cache for namespace: ${namespace_collection2}`,
           err
         );
@@ -11611,7 +11896,7 @@ function useOrgRepo() {
         totalItems
       );
     } catch (error) {
-      logger9.log({
+      logger10.log({
         level: "error",
         message: `${error}`
       });
@@ -11624,7 +11909,7 @@ function useOrgRepo() {
       throw new NotFoundError7("Admin role not found.");
     let orgId;
     try {
-      orgId = new ObjectId19(role.org);
+      orgId = new ObjectId20(role.org);
     } catch {
       throw new InternalServerError9(
         "Invalid organization reference in admin role."
@@ -11640,9 +11925,9 @@ function useOrgRepo() {
   }
   async function completeOnboardingById(_id, session) {
     try {
-      _id = new ObjectId19(_id);
+      _id = new ObjectId20(_id);
     } catch (error) {
-      throw new BadRequestError19("Invalid organization ID format.");
+      throw new BadRequestError20("Invalid organization ID format.");
     }
     try {
       const result = await collection.updateOne(
@@ -11694,238 +11979,6 @@ function useOrgRepo() {
 
 // src/repositories/site.repo.ts
 import { ObjectId as ObjectId21 } from "mongodb";
-
-// src/models/site.model.ts
-import {
-  BadRequestError as BadRequestError20,
-  logger as logger10
-} from "@7365admin1/node-server-utils";
-import Joi10 from "joi";
-
-// src/utils/site-modules.util.ts
-var siteModulesSchema = modulesSchema;
-function narrows(modules) {
-  return Array.isArray(modules) && modules.length > 0;
-}
-function rejectedSiteModules(orgModules, requested) {
-  if (!narrows(orgModules))
-    return [];
-  const org = normaliseModules(orgModules);
-  return normaliseModules(requested).filter((key) => !org.includes(key));
-}
-function rejectedSiteModulesMessage(rejected) {
-  return `This organisation has not been given ${rejected.join(", ")}, so a site cannot offer it. Ask Seven365 to add it to the organisation first.`;
-}
-
-// src/models/site.model.ts
-import { ObjectId as ObjectId20 } from "mongodb";
-
-// src/utils/site-timezone.util.ts
-import moment from "moment-timezone";
-var DEFAULT_SITE_TIMEZONE = "Asia/Singapore";
-function isValidTimezone(tz) {
-  return typeof tz === "string" && tz.length > 0 && !!moment.tz.zone(tz);
-}
-function resolveSiteTimezone(site) {
-  const tz = site?.timezone;
-  return isValidTimezone(tz) ? tz : DEFAULT_SITE_TIMEZONE;
-}
-function siteDayBounds(value, timezone) {
-  if (!value)
-    return null;
-  const tz = isValidTimezone(timezone) ? timezone : DEFAULT_SITE_TIMEZONE;
-  const isDateOnly = typeof value === "string" && /^\d{4}-\d{2}-\d{2}$/.test(value);
-  const m = isDateOnly ? moment.tz(value, "YYYY-MM-DD", tz) : typeof value === "string" ? moment.tz(value, moment.ISO_8601, tz) : moment.tz(value, tz);
-  if (!m.isValid())
-    return null;
-  return {
-    start: m.clone().startOf("day").toDate(),
-    end: m.clone().endOf("day").toDate(),
-    date: m.format("YYYY-MM-DD")
-  };
-}
-
-// src/models/site.model.ts
-function siteTimezoneValidator(value, helpers) {
-  return isValidTimezone(value) ? value : helpers.error("any.invalid");
-}
-var addressSchema = Joi10.object({
-  line1: Joi10.string().min(3).required(),
-  line2: Joi10.string().allow("", null),
-  city: Joi10.string().min(2).required(),
-  state: Joi10.string().allow("", null),
-  postalCode: Joi10.string().min(3).required(),
-  country: Joi10.string().min(2).required()
-});
-var hidQrCodePassSchema = Joi10.object({
-  enabled: Joi10.boolean().required(),
-  onlineMode: Joi10.boolean().optional(),
-  readerId: Joi10.string().hex().length(24).allow("").required(),
-  qrGatePermissions: Joi10.object({
-    resident: Joi10.array().items(Joi10.string().hex().length(24)).unique().default([]),
-    propertyManagement: Joi10.array().items(Joi10.string().hex().length(24)).unique().default([])
-  }).optional(),
-  qrFormat: Joi10.string().valid("0", "1", "2").required(),
-  identificationMethods: Joi10.object({
-    facial: Joi10.boolean().required(),
-    card: Joi10.boolean().required(),
-    qrCode: Joi10.boolean().required(),
-    idPassword: Joi10.boolean().required(),
-    pin: Joi10.boolean().required(),
-    bluetooth: Joi10.boolean().required()
-  }).optional(),
-  printer: Joi10.object({
-    vendorId: Joi10.string().allow("").required(),
-    productId: Joi10.string().allow("").required()
-  }).required(),
-  template: Joi10.object({
-    header: Joi10.string().allow("").required(),
-    subtext: Joi10.string().allow("").required()
-  }).required(),
-  validityMinutes: Joi10.number().integer().min(1).allow(null).required(),
-  updatedAt: Joi10.string().isoDate().required()
-});
-var metadataSchema3 = Joi10.object({
-  /**
-   * The catalogue modules THIS SITE offers — tier two of the cascade.
-   *
-   * Owner requirement R1: whatever Seven365 gives an organisation is the only
-   * set that organisation may then give to each site it creates. The
-   * organisation's own list is `organizations.modules`; this narrows it per
-   * site, and `site-modules.util.ts` holds both the read (fails open) and the
-   * write rule (refuses a key the organisation was never given).
-   *
-   * ABSENT AND EMPTY BOTH MEAN "everything the organisation has" — never
-   * "nothing". No site has this field today.
-   *
-   * It lives in `metadata` because `MSite` is a whitelist: a new top-level
-   * field is silently dropped, while `metadata` is passed through wholesale.
-   * `residentAppModules` below is the same pattern for the same reason.
-   */
-  modules: siteModulesSchema.optional(),
-  block: Joi10.number().optional(),
-  guardPosts: Joi10.number().optional(),
-  gracePeriod: Joi10.number().optional(),
-  incidentCounter: Joi10.number().optional(),
-  incidentLogo: Joi10.string().optional().allow("", null),
-  services: Joi10.array().items(Joi10.object().unknown(true)).optional(),
-  residentAppModules: Joi10.object({
-    feedback: Joi10.boolean(),
-    bulletin: Joi10.boolean(),
-    bulletinVideos: Joi10.boolean(),
-    inviteVisitors: Joi10.boolean(),
-    myVisitors: Joi10.boolean(),
-    billingAndSoa: Joi10.boolean(),
-    access: Joi10.boolean(),
-    facilityBooking: Joi10.boolean(),
-    onlineForm: Joi10.boolean(),
-    emergencyContact: Joi10.boolean()
-  }).optional(),
-  hidQrCodePass: hidQrCodePassSchema.optional()
-});
-var residentAppModuleKeys = [
-  "feedback",
-  "bulletin",
-  "bulletinVideos",
-  "inviteVisitors",
-  "myVisitors",
-  "billingAndSoa",
-  "access",
-  "facilityBooking",
-  "onlineForm",
-  "emergencyContact"
-];
-var updateAddressSchema = Joi10.object({
-  line1: Joi10.string().min(3).allow("", null),
-  line2: Joi10.string().allow("", null),
-  city: Joi10.string().min(2).allow("", null),
-  state: Joi10.string().allow("", null),
-  postalCode: Joi10.string().min(3).allow("", null),
-  country: Joi10.string().min(2).allow("", null)
-});
-var SiteStatus = /* @__PURE__ */ ((SiteStatus2) => {
-  SiteStatus2["ACTIVE"] = "active";
-  SiteStatus2["PENDING"] = "pending";
-  return SiteStatus2;
-})(SiteStatus || {});
-var SiteCategories = /* @__PURE__ */ ((SiteCategories2) => {
-  SiteCategories2["RESIDENTIAL"] = "residential";
-  SiteCategories2["COMMERCIAL"] = "commercial";
-  SiteCategories2["INDUSTRIAL"] = "industrial";
-  SiteCategories2["MIXED_DEVELOPMENT"] = "mixed_development";
-  SiteCategories2["INSTITUTIONAL"] = "institutional";
-  SiteCategories2["INFRASTRUCTURE"] = "infrastructure";
-  SiteCategories2["HOSPITALITY"] = "hospitality";
-  return SiteCategories2;
-})(SiteCategories || {});
-var allowedFieldsSite = [
-  "metadata.block",
-  "metadata.guardPosts",
-  "metadata.gracePeriod",
-  "metadata.incidentCounter",
-  "metadata.incidentLogo",
-  "metadata.services",
-  "metadata.hidQrCodePass"
-];
-var siteSchema = Joi10.object({
-  name: Joi10.string().required(),
-  description: Joi10.string().optional().allow("", null),
-  orgId: Joi10.string().hex().required(),
-  customerId: Joi10.string().hex().optional().allow("", null),
-  address: addressSchema.optional(),
-  timezone: Joi10.string().custom(siteTimezoneValidator, "IANA timezone").optional().default(DEFAULT_SITE_TIMEZONE),
-  category: Joi10.string().valid(...Object.values(SiteCategories)).default("commercial" /* COMMERCIAL */),
-  deliveryCompanyList: Joi10.array().items(Joi10.string()).optional().allow(null),
-  isOpenGate: Joi10.boolean().optional().default(false),
-  dahuaTimeExpiration: Joi10.number().optional().allow(null),
-  siteDocs: Joi10.array().items(Joi10.string().hex().length(24).allow(null, "")),
-  unitDocs: Joi10.array().items(Joi10.string().hex().length(24).allow(null, ""))
-});
-var updateSiteSchema = Joi10.object({
-  _id: Joi10.string().hex().length(24).required(),
-  address: updateAddressSchema.optional(),
-  timezone: Joi10.string().custom(siteTimezoneValidator, "IANA timezone").optional(),
-  metadata: metadataSchema3.optional(),
-  deliveryCompanyList: Joi10.array().items(Joi10.string().trim()).optional().allow(null),
-  isOpenGate: Joi10.boolean().optional().allow(null),
-  dahuaTimeExpiration: Joi10.number().optional().allow(null),
-  siteDocs: Joi10.array().items(Joi10.string().hex().length(24).allow(null, "")),
-  unitDocs: Joi10.array().items(Joi10.string().hex().length(24).allow(null, ""))
-});
-function MSite(value) {
-  const { error } = siteSchema.validate(value);
-  if (error) {
-    logger10.log({ level: "error", message: error.message });
-    throw new BadRequestError20(error.message);
-  }
-  if (value.orgId) {
-    try {
-      value.orgId = new ObjectId20(value.orgId);
-    } catch (error2) {
-      throw new BadRequestError20("Invalid org ID format.");
-    }
-  }
-  return {
-    name: value.name ?? "",
-    description: value.description ?? "",
-    orgId: value.orgId ?? "",
-    metadata: value.metadata ?? {},
-    status: "active",
-    createdAt: /* @__PURE__ */ new Date(),
-    address: value.address,
-    timezone: value.timezone ?? DEFAULT_SITE_TIMEZONE,
-    category: value.category,
-    deliveryCompanyList: value.deliveryCompanyList ?? [],
-    isOpenGate: value.isOpenGate,
-    dahuaTimeExpiration: value.dahuaTimeExpiration,
-    siteDocs: value.siteDocs ?? [],
-    unitDocs: value.unitDocs ?? [],
-    updatedAt: value.updatedAt ?? "",
-    deletedAt: value.deletedAt ?? ""
-  };
-}
-
-// src/repositories/site.repo.ts
 import {
   useAtlas as useAtlas13,
   InternalServerError as InternalServerError10,
@@ -13875,7 +13928,7 @@ async function holdsRole(userId, roleId) {
 // src/services/service-provider-invite.service.ts
 import {
   BadRequestError as BadRequestError30,
-  UnauthorizedError as UnauthorizedError2,
+  UnauthorizedError as UnauthorizedError3,
   NotFoundError as NotFoundError10,
   compileHandlebar,
   getDirectory,
@@ -15130,7 +15183,7 @@ var NotificationService = class {
 // src/utils/console-authz.util.ts
 import {
   BadRequestError as BadRequestError29,
-  UnauthorizedError,
+  UnauthorizedError as UnauthorizedError2,
   useAtlas as useAtlas20
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId31 } from "mongodb";
@@ -15307,10 +15360,10 @@ async function requirePlatformStaff(req, grant) {
   const id = callerId(req);
   const role = id ? await resolveStaffRole(id) : null;
   if (!role) {
-    throw new UnauthorizedError("Not authorized.");
+    throw new UnauthorizedError2("Not authorized.");
   }
   if (grant && !consoleRoleAllows(role.permissions, grant.resource, grant.action)) {
-    throw new UnauthorizedError("Not authorized.");
+    throw new UnauthorizedError2("Not authorized.");
   }
   return id;
 }
@@ -15330,7 +15383,7 @@ async function requireOrgAccess(req, orgId) {
 async function requirePlatformOwner(req, grant) {
   const id = callerId(req);
   if (!id || !await isPlatformOwner(id)) {
-    throw new UnauthorizedError("Not authorized.");
+    throw new UnauthorizedError2("Not authorized.");
   }
   if (grant)
     await requirePlatformStaff(req, grant);
@@ -15339,7 +15392,7 @@ async function requirePlatformOwner(req, grant) {
 async function requireOrgReach(req, orgId) {
   const id = callerId(req);
   if (!id)
-    throw new UnauthorizedError("Not authorized.");
+    throw new UnauthorizedError2("Not authorized.");
   const org = orgId?.toString() ?? "";
   const actor = await resolveInviteActor(id);
   if (staffMayBypass(actor))
@@ -15350,7 +15403,7 @@ async function requireOrgReach(req, orgId) {
     return id;
   if (org && await hasOrgOwnership(id, org))
     return id;
-  throw new UnauthorizedError("Not authorized.");
+  throw new UnauthorizedError2("Not authorized.");
 }
 async function requireRoleInvitable(role, org, apps) {
   const roleId = role?.toString() ?? "";
@@ -15490,13 +15543,13 @@ function useServiceProviderInviteService() {
     const org = inviteOrgId(invite);
     if (org && actor.orgIds.includes(org))
       return;
-    throw new UnauthorizedError2(
+    throw new UnauthorizedError3(
       "This invitation belongs to another organisation."
     );
   }
   function assertSuperAdmin(actor) {
     if (!staffMayBypass(actor)) {
-      throw new UnauthorizedError2(
+      throw new UnauthorizedError3(
         "Only a Seven365 administrator can approve or reject invitations."
       );
     }
@@ -15509,7 +15562,7 @@ function useServiceProviderInviteService() {
   async function actorFor(userId) {
     const actor = await resolveInviteActor(userId);
     if (!actor.id)
-      throw new UnauthorizedError2("Sign in to continue.");
+      throw new UnauthorizedError3("Sign in to continue.");
     return actor;
   }
   async function listApprovals({
@@ -15546,7 +15599,7 @@ function useServiceProviderInviteService() {
     let scope = actor.orgIds;
     if (orgId) {
       if (!staffMayBypass(actor) && !actor.orgIds.includes(orgId)) {
-        throw new UnauthorizedError2(
+        throw new UnauthorizedError3(
           "You are not a member of that organisation."
         );
       }
@@ -15705,7 +15758,7 @@ function useServiceProviderInviteService() {
     );
     const invitedUserId = user?._id?.toString();
     if (!invitedUserId || invitedUserId !== userId) {
-      throw new UnauthorizedError2("This invitation was sent to someone else.");
+      throw new UnauthorizedError3("This invitation was sent to someone else.");
     }
   }
   async function decline({ id, userId }) {
@@ -16006,10 +16059,10 @@ function useVerificationService() {
       const org = await getOrgById(orgId);
       const actor = await resolveInviteActor(invitedBy);
       if (!actor.id) {
-        throw new UnauthorizedError3("Sign in to continue.");
+        throw new UnauthorizedError4("Sign in to continue.");
       }
       if (!staffMayBypass(actor) && !actor.orgIds.includes(orgId)) {
-        throw new UnauthorizedError3(
+        throw new UnauthorizedError4(
           "You can only invite service providers to your own organisation's sites."
         );
       }
@@ -19080,7 +19133,7 @@ function useRoleService() {
 }
 
 // src/utils/role-scope.util.ts
-import { UnauthorizedError as UnauthorizedError4 } from "@7365admin1/node-server-utils";
+import { UnauthorizedError as UnauthorizedError5 } from "@7365admin1/node-server-utils";
 function roleScope(role) {
   if ((role?.type ?? "") === PLATFORM_STAFF_ROLE_TYPE)
     return "platform";
@@ -19114,7 +19167,7 @@ function requireNoPlatformGrant(role, next) {
   const added = platformPermissionsAdded(next, role?.permissions);
   if (added.length === 0)
     return;
-  throw new UnauthorizedError4(
+  throw new UnauthorizedError5(
     "These are Seven365 console permissions and cannot be granted on a client role: " + added.join(", ")
   );
 }
@@ -19128,14 +19181,14 @@ function refuseSharedClientTemplate(role, next) {
     return true;
   if (Array.isArray(next) && restorableFromHistory(role, next))
     return true;
-  throw new UnauthorizedError4(
+  throw new UnauthorizedError5(
     "This role is shared by every client that was invited with it and cannot be changed here."
   );
 }
 function refuseNewSharedClientTemplate(role) {
   if (roleScope(role) !== "client-template")
     return;
-  throw new UnauthorizedError4(
+  throw new UnauthorizedError5(
     "A role with no organisation would be shared by every client and cannot be created. Choose the organisation this role belongs to."
   );
 }
@@ -19270,6 +19323,28 @@ async function healOrgDefaultRoles(deps, org) {
   }
 }
 
+// src/utils/module-ceiling.util.ts
+async function moduleCeiling(org, site) {
+  const orgId = org?.toString() ?? "";
+  const siteId = site?.toString() ?? "";
+  if (!orgId && !siteId)
+    return [];
+  try {
+    const { getById: getOrgById } = useOrgRepo();
+    const { getSiteById } = useSiteRepo();
+    const [orgDoc, siteDoc] = await Promise.all([
+      orgId ? getOrgById(orgId).catch(() => null) : null,
+      siteId ? getSiteById(siteId).catch(() => null) : null
+    ]);
+    return effectiveSiteModules(
+      orgDoc?.modules,
+      siteDoc?.metadata?.modules
+    );
+  } catch {
+    return [];
+  }
+}
+
 // src/controllers/role.controller.ts
 async function requireRoleOrg(req, org) {
   const orgId = org?.toString() ?? "";
@@ -19371,6 +19446,10 @@ function useRoleController() {
         { type: payload.type, org: payload.org, permissions: [] },
         payload.permissions
       );
+      requireWithinModules(
+        await moduleCeiling(payload.org, payload.site),
+        payload.permissions
+      );
       const role = await _createRole(payload);
       res.status(201).json({ message: "Successfully created role.", data: { role } });
       return;
@@ -19488,6 +19567,11 @@ function useRoleController() {
         throw new NotFoundError14("Role not found.");
       const isRestore = await requireRoleWrite(req, existing, permissions);
       requireNoPlatformGrant(existing, permissions);
+      requireWithinModules(
+        await moduleCeiling(existing?.org, existing?.site),
+        permissions,
+        existing?.permissions
+      );
       if (isRestore)
         await recordPriorPermissions(
           _appendPermissionHistory,
@@ -19526,6 +19610,11 @@ function useRoleController() {
         throw new NotFoundError14("Role not found.");
       const isRestore = await requireRoleWrite(req, existing, permissions);
       requireNoPlatformGrant(existing, permissions);
+      requireWithinModules(
+        await moduleCeiling(existing?.org, existing?.site),
+        permissions,
+        existing?.permissions
+      );
       if (isRestore)
         await recordPriorPermissions(
           _appendPermissionHistory,
@@ -19646,12 +19735,12 @@ import { BadRequestError as BadRequestError49, logger as logger34 } from "@7365a
 // src/services/member.service.ts
 import {
   BadRequestError as BadRequestError41,
-  UnauthorizedError as UnauthorizedError5,
+  UnauthorizedError as UnauthorizedError6,
   useAtlas as useAtlas28
 } from "@7365admin1/node-server-utils";
 async function requireStaffCaller(callerId5, what) {
   if (!await isSuperAdmin(callerId5)) {
-    throw new UnauthorizedError5(
+    throw new UnauthorizedError6(
       `Only Seven365 staff can ${what}.`
     );
   }
@@ -19868,14 +19957,14 @@ function useMemberService() {
 }
 
 // src/utils/site-reach.util.ts
-import { useAtlas as useAtlas35, UnauthorizedError as UnauthorizedError7 } from "@7365admin1/node-server-utils";
+import { useAtlas as useAtlas35, UnauthorizedError as UnauthorizedError8 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId48 } from "mongodb";
 
 // src/services/camera-view.service.ts
 import {
   BadRequestError as BadRequestError48,
   NotFoundError as NotFoundError16,
-  UnauthorizedError as UnauthorizedError6,
+  UnauthorizedError as UnauthorizedError7,
   logger as logger33,
   useAtlas as useAtlas34,
   useCache as useCache19
@@ -26322,7 +26411,7 @@ function useCameraViewService() {
   }
   async function authorizeCamera(params) {
     if (!params.userId || !ObjectId47.isValid(params.userId)) {
-      throw new UnauthorizedError6("Not signed in.");
+      throw new UnauthorizedError7("Not signed in.");
     }
     if (!ObjectId47.isValid(params.cameraId)) {
       throw new BadRequestError48("Invalid camera id.");
@@ -26351,7 +26440,7 @@ function useCameraViewService() {
       memberships
     );
     if (!hasAnyPermission(permissions, params.permissions)) {
-      throw new UnauthorizedError6(
+      throw new UnauthorizedError7(
         "You do not have permission to use this camera."
       );
     }
@@ -26459,7 +26548,7 @@ function useCameraViewService() {
   }
   async function entitleSite(params) {
     if (!params.userId || !ObjectId47.isValid(params.userId)) {
-      throw new UnauthorizedError6("Not signed in.");
+      throw new UnauthorizedError7("Not signed in.");
     }
     if (!ObjectId47.isValid(params.siteId)) {
       throw new BadRequestError48("Invalid site id.");
@@ -26491,7 +26580,7 @@ function useCameraViewService() {
     );
     const required = params.permissions ?? CAMERA_VIEW_PERMISSIONS;
     if (!hasAnyPermission(permissions, required)) {
-      throw new UnauthorizedError6(
+      throw new UnauthorizedError7(
         params.message ?? (required === CAMERA_VIEW_PERMISSIONS ? "You do not have permission to view these cameras." : "You do not have permission to set up cameras on this site.")
       );
     }
@@ -26900,7 +26989,7 @@ function idText(value) {
 async function requireSiteReach(req, site, permission) {
   const siteId = site?.toString?.() ?? "";
   if (!siteId)
-    throw new UnauthorizedError7("Not authorized.");
+    throw new UnauthorizedError8("Not authorized.");
   const actor = await resolveInviteActor(callerId(req));
   if (staffMayBypass(actor))
     return;
@@ -27886,7 +27975,7 @@ function useVerificationController() {
 // src/controllers/file.controller.ts
 import {
   BadRequestError as BadRequestError51,
-  UnauthorizedError as UnauthorizedError8,
+  UnauthorizedError as UnauthorizedError9,
   logger as logger36
 } from "@7365admin1/node-server-utils";
 import Joi28 from "joi";
@@ -27915,7 +28004,7 @@ async function requireFileDelete(req, file) {
     return;
   const caller = callerId(req);
   if (!caller)
-    throw new UnauthorizedError8("Not authorized.");
+    throw new UnauthorizedError9("Not authorized.");
   if (caller === ownerId)
     return;
   const [me, owner] = await Promise.all([
@@ -27931,7 +28020,7 @@ async function requireFileDelete(req, file) {
   })) {
     return;
   }
-  throw new UnauthorizedError8("Not authorized.");
+  throw new UnauthorizedError9("Not authorized.");
 }
 function useFileController() {
   const { createFile, deleteFile: _deleteFile } = useFileService();
@@ -28004,7 +28093,7 @@ import {
   BadRequestError as BadRequestError55,
   logger as logger39,
   NotFoundError as NotFoundError17,
-  UnauthorizedError as UnauthorizedError9
+  UnauthorizedError as UnauthorizedError10
 } from "@7365admin1/node-server-utils";
 import Joi32 from "joi";
 
@@ -29291,7 +29380,7 @@ function useOrgController() {
     try {
       const createdBy = callerId(req);
       if (!createdBy)
-        throw new UnauthorizedError9("Not authorized.");
+        throw new UnauthorizedError10("Not authorized.");
       const { inviteId, ...body } = req.body ?? {};
       let invitedFrom = null;
       let invitedRole = null;
@@ -29543,7 +29632,8 @@ function useOrgController() {
   }
   async function updateModules(req, res, next) {
     const validation = Joi32.object({
-      modules: modulesSchema.required()
+      modules: modulesSchema.required(),
+      residentAppModules: residentAppModulesSchema.optional()
     });
     const { error } = validation.validate(req.body);
     if (error) {
@@ -29554,7 +29644,14 @@ function useOrgController() {
     try {
       const staffId = await requireConsolePermission(req, "organizations");
       const modules = normaliseModules(req.body.modules);
-      await _update(orgId, { modules });
+      const residentAppModules = req.body.residentAppModules;
+      await _update(orgId, {
+        modules,
+        // Absent stays ABSENT. Writing `{}` would put the field on an
+        // organisation nobody has configured, and `{}` is not distinguishable
+        // later from a deliberate "all ten on".
+        ...residentAppModules === void 0 ? {} : { residentAppModules }
+      });
       const data = await _getById(orgId);
       await recordConsoleAction({
         action: "client.modules-changed" /* CLIENT_MODULES_CHANGED */,
@@ -29564,7 +29661,14 @@ function useOrgController() {
         targetType: "organization" /* ORGANIZATION */,
         after: pickAuditFields("client.modules-changed" /* CLIENT_MODULES_CHANGED */, {
           modules: modules.join(", "),
-          moduleCount: modules.length
+          moduleCount: modules.length,
+          // Joined for the same reason as `modules`: `auditValue` drops an
+          // object, which would leave a row saying something changed without
+          // saying what to. Only the switches turned OFF are worth recording -
+          // absent means on, so the off list IS the decision.
+          ...residentAppModules === void 0 ? {} : {
+            residentAppModulesOff: Object.keys(residentAppModules).filter((key) => residentAppModules[key] === false).join(", ")
+          }
         })
       });
       res.json({
@@ -31887,7 +31991,7 @@ function useSubscriptionService() {
 import Joi37 from "joi";
 import {
   BadRequestError as BadRequestError71,
-  UnauthorizedError as UnauthorizedError10,
+  UnauthorizedError as UnauthorizedError11,
   logger as logger49
 } from "@7365admin1/node-server-utils";
 
@@ -32308,7 +32412,7 @@ function useSubscriptionController() {
     try {
       const subscription = await _getSubscriptionById(subscriptionId);
       if (!subscription) {
-        throw new UnauthorizedError10("Not authorized.");
+        throw new UnauthorizedError11("Not authorized.");
       }
       await requireOrgAccess(req, subscription.org?.toString());
       const _res = await _updateSubscriptionSeats({
@@ -37771,6 +37875,32 @@ function useSiteService() {
 
 // src/controllers/site.controller.ts
 import { BadRequestError as BadRequestError92, logger as logger66 } 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) {
+  const org = asModules(orgModules);
+  const wanted = asModules(requested);
+  return residentAppModuleKeys.filter(
+    (key) => org[key] === false && wanted[key] === true
+  );
+}
+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 asModules(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : {};
+}
+
+// src/controllers/site.controller.ts
 import Joi51 from "joi";
 async function requireSiteWrite(req, siteId) {
   const actor = await resolveInviteActor(callerId(req));
@@ -37868,6 +37998,25 @@ function useSiteController() {
       return;
     }
   }
+  async function withResidentAppCeiling(site) {
+    if (!site || typeof site !== "object")
+      return site;
+    try {
+      const org = site.orgId ? await _getOrgById(site.orgId.toString()).catch(() => null) : null;
+      return {
+        ...site,
+        metadata: {
+          ...site.metadata ?? {},
+          residentAppModulesEffective: effectiveResidentAppModules(
+            org?.residentAppModules,
+            site.metadata?.residentAppModules
+          )
+        }
+      };
+    } catch {
+      return site;
+    }
+  }
   async function getSiteById(req, res, next) {
     const validation = Joi51.string().hex().required();
     const _id = req.params.id;
@@ -37880,7 +38029,7 @@ function useSiteController() {
     try {
       const site = await _getSiteById(_id);
       await requireSiteRead(req, _id, site);
-      res.json(site);
+      res.json(await withResidentAppCeiling(site));
       return;
     } catch (error2) {
       logger66.log({ level: "error", message: error2.message });
@@ -37946,6 +38095,22 @@ function useSiteController() {
       }
       const { _id, ...rest } = value;
       await requireSiteWrite(req, _id);
+      if (rest?.metadata?.residentAppModules) {
+        const existing = await _getSiteById(_id);
+        const org = existing?.orgId ? await _getOrgById(existing.orgId.toString()).catch(
+          () => null
+        ) : null;
+        const above = residentAppModulesAboveCeiling(
+          org?.residentAppModules,
+          rest.metadata.residentAppModules
+        );
+        if (above.length) {
+          next(
+            new BadRequestError92(residentAppModulesAboveCeilingMessage(above))
+          );
+          return;
+        }
+      }
       await _updateById(_id, rest);
       res.json({ message: "Successfully updated site." });
       return;
@@ -42685,7 +42850,7 @@ function useCustomerSiteService() {
 import Joi60 from "joi";
 import {
   BadRequestError as BadRequestError107,
-  UnauthorizedError as UnauthorizedError11,
+  UnauthorizedError as UnauthorizedError12,
   logger as logger79
 } from "@7365admin1/node-server-utils";
 async function requireEitherOrg(req, ...orgs) {
@@ -42694,7 +42859,7 @@ async function requireEitherOrg(req, ...orgs) {
   if (staffMayBypass(actor))
     return;
   if (wanted.length === 0 || !wanted.some((org) => actor.orgIds.includes(org))) {
-    throw new UnauthorizedError11("Not authorized.");
+    throw new UnauthorizedError12("Not authorized.");
   }
 }
 function useCustomerSiteController() {
@@ -45906,7 +46071,7 @@ import {
   BadRequestError as BadRequestError121,
   InternalServerError as InternalServerError43,
   NotFoundError as NotFoundError34,
-  UnauthorizedError as UnauthorizedError12,
+  UnauthorizedError as UnauthorizedError13,
   logger as logger91
 } from "@7365admin1/node-server-utils";
 
@@ -49440,8 +49605,8 @@ function useHidAmicoService() {
         await siteAccess.authorizeSite({ siteId, userId: value.userId, permissions });
       }
     } catch (error) {
-      if (error instanceof UnauthorizedError12) {
-        throw new UnauthorizedError12("You do not have permission to manage HID access at this site.");
+      if (error instanceof UnauthorizedError13) {
+        throw new UnauthorizedError13("You do not have permission to manage HID access at this site.");
       }
       throw error;
     }
@@ -49465,7 +49630,7 @@ function useHidAmicoService() {
     try {
       await authorizeSiteForCaller(String(reader.site || ""), userId);
     } catch (error) {
-      if (error instanceof UnauthorizedError12)
+      if (error instanceof UnauthorizedError13)
         throw error;
       throw new NotFoundError34(HID_READER_NOT_FOUND);
     }
@@ -49517,10 +49682,10 @@ function useHidAmicoService() {
   async function assertUserReaderPermission(reader, userId, options = {}) {
     const permission = await getReaderPermissionForUser(reader, userId);
     if (!permission.granted) {
-      throw new UnauthorizedError12("You do not have HID access permission for this reader.");
+      throw new UnauthorizedError13("You do not have HID access permission for this reader.");
     }
     if (options.intercom && !permission.intercom) {
-      throw new UnauthorizedError12("You do not have HID intercom permission for this reader.");
+      throw new UnauthorizedError13("You do not have HID intercom permission for this reader.");
     }
     return permission;
   }
@@ -50858,10 +51023,10 @@ function useHidAmicoService() {
     const hasActiveMembership = memberships.some((membership) => membership.status !== "deleted" && membership.status !== "inactive");
     const resolvedIssuer = issuer || (hasResidentMembership ? "resident" : "property_management");
     if (resolvedIssuer === "resident" && !hasResidentMembership) {
-      throw new UnauthorizedError12("Only a Resident account can issue a Resident visitor QR code.");
+      throw new UnauthorizedError13("Only a Resident account can issue a Resident visitor QR code.");
     }
     if (resolvedIssuer === "property_management" && !hasActiveMembership) {
-      throw new UnauthorizedError12("Only a site Property Management account can issue this visitor QR code.");
+      throw new UnauthorizedError13("Only a site Property Management account can issue this visitor QR code.");
     }
     const configuredGateIds = site?.metadata?.hidQrCodePass?.qrGatePermissions?.[resolvedIssuer === "resident" ? "resident" : "propertyManagement"] || [];
     const gateReaderIds = configuredGateIds.filter((readerId) => typeof readerId === "string" && /^[a-f0-9]{24}$/i.test(readerId)).map(String);
@@ -53454,7 +53619,7 @@ function useVisitorTransactionService() {
 import Joi69 from "joi";
 import moment5 from "moment-timezone";
 import { ObjectId as ObjectId91 } from "mongodb";
-import { BadRequestError as BadRequestError124, NotFoundError as NotFoundError36, InternalServerError as InternalServerError45, UnauthorizedError as UnauthorizedError13, logger as logger95 } from "@7365admin1/node-server-utils";
+import { BadRequestError as BadRequestError124, NotFoundError as NotFoundError36, InternalServerError as InternalServerError45, UnauthorizedError as UnauthorizedError14, logger as logger95 } from "@7365admin1/node-server-utils";
 
 // src/models/visitor-invite.model.ts
 import Joi67 from "joi";
@@ -58238,7 +58403,7 @@ function useVisitorTransactionController() {
     }
     const inviterUserId = callerId(req);
     if (!inviterUserId) {
-      next(new UnauthorizedError13("Not authorized."));
+      next(new UnauthorizedError14("Not authorized."));
       return;
     }
     try {
@@ -58802,7 +58967,7 @@ function useGuestManagementController() {
 // src/controllers/person.controller.ts
 import Joi72 from "joi";
 import { BadRequestError as BadRequestError127, logger as logger98 } from "@7365admin1/node-server-utils";
-import { NotFoundError as NotFoundError37, UnauthorizedError as UnauthorizedError14 } from "@7365admin1/node-server-utils";
+import { NotFoundError as NotFoundError37, UnauthorizedError as UnauthorizedError15 } from "@7365admin1/node-server-utils";
 
 // src/utils/self-signup-files.util.ts
 function dropUnsentFiles(body) {
@@ -58854,7 +59019,7 @@ function usePersonController() {
     }
     const org = person.org?.toString() ?? "";
     if (!org || !actor.orgIds.includes(org)) {
-      throw new UnauthorizedError14("Not authorized.");
+      throw new UnauthorizedError15("Not authorized.");
     }
     return actor;
   }
@@ -58985,7 +59150,7 @@ function usePersonController() {
           });
         } else if (org) {
           if (!actor.orgIds.includes(org)) {
-            throw new UnauthorizedError14("Not authorized.");
+            throw new UnauthorizedError15("Not authorized.");
           }
         } else {
           orgs = actor.orgIds;
@@ -63305,7 +63470,7 @@ function useSiteFacilityService() {
 import {
   BadRequestError as BadRequestError149,
   NotFoundError as NotFoundError43,
-  UnauthorizedError as UnauthorizedError15,
+  UnauthorizedError as UnauthorizedError16,
   logger as logger117
 } from "@7365admin1/node-server-utils";
 import Joi84 from "joi";
@@ -63392,7 +63557,7 @@ function useSiteFacilityController() {
       } else {
         const { actor } = await siteReachOf(req);
         if (!actor.isSuperAdmin)
-          throw new UnauthorizedError15("Not authorized.");
+          throw new UnauthorizedError16("Not authorized.");
       }
       const data = await _getAll({
         search,
@@ -66427,7 +66592,7 @@ function useBulletinBoardService() {
 import {
   BadRequestError as BadRequestError158,
   NotFoundError as NotFoundError51,
-  UnauthorizedError as UnauthorizedError16,
+  UnauthorizedError as UnauthorizedError17,
   logger as logger126
 } from "@7365admin1/node-server-utils";
 import Joi92 from "joi";
@@ -66463,7 +66628,7 @@ function useBulletinBoardController() {
       } else {
         const { canReach } = await siteReachOf(req);
         if (!await canReach(scopeOf(value))) {
-          throw new UnauthorizedError16("Not authorized.");
+          throw new UnauthorizedError17("Not authorized.");
         }
       }
       const data = await _add(value);
@@ -67020,7 +67185,7 @@ import { BadRequestError as BadRequestError164, logger as logger132 } from "@736
 import {
   BadRequestError as BadRequestError163,
   logger as logger131,
-  UnauthorizedError as UnauthorizedError17,
+  UnauthorizedError as UnauthorizedError18,
   useAtlas as useAtlas90
 } from "@7365admin1/node-server-utils";
 
@@ -67404,7 +67569,7 @@ function useSiteBillingItemService() {
   function assertUnitAtSite(buildingUnit, site) {
     const siteId = site?.toString?.() ?? "";
     if (!siteId || (buildingUnit?.site?.toString() ?? "") !== siteId) {
-      throw new UnauthorizedError17("Not authorized.");
+      throw new UnauthorizedError18("Not authorized.");
     }
   }
   async function add(value) {
@@ -67575,7 +67740,7 @@ function useSiteBillingItemService() {
         message: error.message
       });
       await session.abortTransaction();
-      if (error instanceof BadRequestError163 || error instanceof UnauthorizedError17) {
+      if (error instanceof BadRequestError163 || error instanceof UnauthorizedError18) {
         throw error;
       }
       throw new BadRequestError163("Failed to update Site Billing Item.");
@@ -69544,7 +69709,7 @@ import Joi100 from "joi";
 
 // src/utils/resident-unit.util.ts
 import { ObjectId as ObjectId125 } from "mongodb";
-import { UnauthorizedError as UnauthorizedError18, useAtlas as useAtlas96 } from "@7365admin1/node-server-utils";
+import { UnauthorizedError as UnauthorizedError19, useAtlas as useAtlas96 } from "@7365admin1/node-server-utils";
 async function requireOwnUnit(req, site, unitId) {
   const actor = await resolveInviteActor(callerId(req));
   if (staffMayBypass(actor))
@@ -69552,7 +69717,7 @@ async function requireOwnUnit(req, site, unitId) {
   const unit = unitId?.toString?.() ?? "";
   const siteId = site?.toString?.() ?? "";
   if (!ObjectId125.isValid(unit) || !ObjectId125.isValid(siteId) || !actor.id) {
-    throw new UnauthorizedError18("Not authorized.");
+    throw new UnauthorizedError19("Not authorized.");
   }
   const db2 = useAtlas96.getDb();
   if (!db2)
@@ -69564,7 +69729,7 @@ async function requireOwnUnit(req, site, unitId) {
     status: { $ne: "deleted" }
   });
   if (!own)
-    throw new UnauthorizedError18("Not authorized.");
+    throw new UnauthorizedError19("Not authorized.");
 }
 
 // src/controllers/site-unit-billing.controller.ts
@@ -78116,7 +78281,7 @@ function useOnlineFormRepo() {
 import {
   BadRequestError as BadRequestError204,
   NotFoundError as NotFoundError71,
-  UnauthorizedError as UnauthorizedError19,
+  UnauthorizedError as UnauthorizedError20,
   logger as logger170
 } from "@7365admin1/node-server-utils";
 import Joi123 from "joi";
@@ -78188,10 +78353,10 @@ function useOnlineFormController() {
       if (site) {
         await requireSiteReach(req, site);
       } else if (!staffMayBypass(actor)) {
-        throw new UnauthorizedError19("Not authorized.");
+        throw new UnauthorizedError20("Not authorized.");
       }
       if (org && !staffMayBypass(actor) && !actor.orgIds.includes(org)) {
-        throw new UnauthorizedError19("Not authorized.");
+        throw new UnauthorizedError20("Not authorized.");
       }
       const data = await _getAll({ search, page, limit, status, org, site });
       res.json(data);
@@ -78256,7 +78421,7 @@ function useOnlineFormController() {
       if (payload.org) {
         const { actor } = await siteReachOf(req);
         if (!staffMayBypass(actor) && !actor.orgIds.includes(payload.org)) {
-          throw new UnauthorizedError19("Not authorized.");
+          throw new UnauthorizedError20("Not authorized.");
         }
       }
       await _updateOnlineFormById(_id, payload);
@@ -85502,7 +85667,7 @@ import {
   BadRequestError as BadRequestError231,
   NotFoundError as NotFoundError80,
   InternalServerError as InternalServerError84,
-  UnauthorizedError as UnauthorizedError20,
+  UnauthorizedError as UnauthorizedError21,
   useAtlas as useAtlas135,
   hashPassword as hashPassword4
 } from "@7365admin1/node-server-utils";
@@ -86425,10 +86590,10 @@ function useVerificationServiceV2() {
       const org = await getOrgById(orgId);
       const actor = await resolveInviteActor(invitedBy);
       if (!actor.id) {
-        throw new UnauthorizedError20("Sign in to continue.");
+        throw new UnauthorizedError21("Sign in to continue.");
       }
       if (!staffMayBypass(actor) && !actor.orgIds.includes(orgId)) {
-        throw new UnauthorizedError20(
+        throw new UnauthorizedError21(
           "You can only invite service providers to your own organisation's sites."
         );
       }
@@ -86741,7 +86906,7 @@ function useVerificationServiceV2() {
     const user = await _getUserById(userId).catch(() => null);
     const email = user?.email;
     if (!email) {
-      throw new UnauthorizedError20("Not authorized.");
+      throw new UnauthorizedError21("Not authorized.");
     }
     return email;
   }
@@ -86779,7 +86944,7 @@ function useVerificationServiceV2() {
       throw new NotFoundError80("Invitation not found.");
     }
     if (invite.email.toLowerCase() !== email.toLowerCase()) {
-      throw new UnauthorizedError20("Not authorized.");
+      throw new UnauthorizedError21("Not authorized.");
     }
     await _setOnboardingById({
       _id: inviteId,
@@ -88366,6 +88531,10 @@ function useRoleControllerV2() {
       if (value.org) {
         await requireOrgReach(req, value.org);
       }
+      requireWithinModules(
+        await moduleCeiling(value.org, value.site),
+        value.permissions
+      );
       const role = await _createRole(value);
       res.status(201).json({ message: "Successfully created role.", data: { role } });
       return;
@@ -90677,7 +90846,7 @@ import Joi159 from "joi";
 import { ObjectId as ObjectId180 } from "mongodb";
 import {
   InternalServerError as InternalServerError94,
-  UnauthorizedError as UnauthorizedError21,
+  UnauthorizedError as UnauthorizedError22,
   useAtlas as useAtlas147
 } from "@7365admin1/node-server-utils";
 function db() {
@@ -90693,7 +90862,7 @@ function asObjectId(value) {
 function requireCaller(req) {
   const id = callerId(req);
   if (!id || !ObjectId180.isValid(id)) {
-    throw new UnauthorizedError21("Not authorized.");
+    throw new UnauthorizedError22("Not authorized.");
   }
   return id;
 }
@@ -90701,7 +90870,7 @@ function requireSelfId(req, claimed) {
   const caller = requireCaller(req);
   const asked = claimed?.toString?.() ?? "";
   if (!asked || asked !== caller) {
-    throw new UnauthorizedError21("Not authorized.");
+    throw new UnauthorizedError22("Not authorized.");
   }
   return caller;
 }
@@ -90709,11 +90878,11 @@ async function requireOwnChannel(req, channelId) {
   const caller = requireCaller(req);
   const _id = asObjectId(channelId);
   if (!_id)
-    throw new UnauthorizedError21("Not authorized.");
+    throw new UnauthorizedError22("Not authorized.");
   const channel = await db().collection("channel-preloved").findOne({ _id }, { projection: { senderId: 1, receiverId: 1, postId: 1 } });
   const participants = [channel?.senderId, channel?.receiverId].map((id) => id?.toString?.() ?? "").filter(Boolean);
   if (!channel || !participants.includes(caller)) {
-    throw new UnauthorizedError21("Not authorized.");
+    throw new UnauthorizedError22("Not authorized.");
   }
   return { caller, channel };
 }
@@ -90721,10 +90890,10 @@ async function requireOwnChatMessage(req, chatId) {
   const caller = requireCaller(req);
   const _id = asObjectId(chatId);
   if (!_id)
-    throw new UnauthorizedError21("Not authorized.");
+    throw new UnauthorizedError22("Not authorized.");
   const message = await db().collection("chat-preloved").findOne({ _id }, { projection: { senderId: 1 } });
   if (!message || message.senderId?.toString?.() !== caller) {
-    throw new UnauthorizedError21("Not authorized.");
+    throw new UnauthorizedError22("Not authorized.");
   }
   return caller;
 }
@@ -91150,7 +91319,7 @@ function useBidPrelovedService() {
 // src/controllers/bid-preloved.controller.ts
 import {
   BadRequestError as BadRequestError252,
-  UnauthorizedError as UnauthorizedError22,
+  UnauthorizedError as UnauthorizedError23,
   logger as logger213
 } from "@7365admin1/node-server-utils";
 import Joi162 from "joi";
@@ -91202,7 +91371,7 @@ function useBidPrelovedController() {
       const bid = await _getById(params.id);
       const seller = await sellerOfPost(bid?.postId);
       if (!seller || seller !== caller) {
-        throw new UnauthorizedError22("Not authorized.");
+        throw new UnauthorizedError23("Not authorized.");
       }
       const data = await _updateStatus(params.id, body.status);
       res.status(200).json(data);
@@ -91226,7 +91395,7 @@ function useBidPrelovedController() {
       const data = await _getById(params.id);
       const seller = await sellerOfPost(data?.postId);
       if (data?.buyerId?.toString?.() !== caller && seller !== caller) {
-        throw new UnauthorizedError22("Not authorized.");
+        throw new UnauthorizedError23("Not authorized.");
       }
       res.status(200).json(data);
     } catch (error2) {
@@ -91624,7 +91793,7 @@ function useFormEntryRepo() {
 import {
   BadRequestError as BadRequestError254,
   NotFoundError as NotFoundError89,
-  UnauthorizedError as UnauthorizedError23,
+  UnauthorizedError as UnauthorizedError24,
   logger as logger215
 } from "@7365admin1/node-server-utils";
 import Joi164 from "joi";
@@ -91734,7 +91903,7 @@ function useFormEntryController() {
       } else {
         const { actor } = await siteReachOf(req);
         if (!actor.isSuperAdmin)
-          throw new UnauthorizedError23("Not authorized.");
+          throw new UnauthorizedError24("Not authorized.");
       }
       const data = await _getAll({ search, page, limit, status, org, site });
       res.json(data);
@@ -91785,7 +91954,7 @@ function useFormEntryController() {
         await requireSiteReach(req, rest.site);
       delete rest.userId;
       if (isOwner && rest.status && rest.status !== "pending") {
-        throw new UnauthorizedError23("Not authorized.");
+        throw new UnauthorizedError24("Not authorized.");
       }
       await _updateFormEntryById(_id, rest);
       res.json({ message: "Successfully updated online form." });
@@ -91842,7 +92011,7 @@ function useFormEntryController() {
   async function residentFormSubmission(req, res, next) {
     const userId = callerId(req);
     if (!userId) {
-      next(new UnauthorizedError23("Not authorized."));
+      next(new UnauthorizedError24("Not authorized."));
       return;
     }
     const payload = { ...req.body, userId };
@@ -93073,7 +93242,7 @@ function useHidAmicoController() {
 import {
   BadRequestError as BadRequestError257,
   logger as logger217,
-  UnauthorizedError as UnauthorizedError24
+  UnauthorizedError as UnauthorizedError25
 } from "@7365admin1/node-server-utils";
 import Joi166 from "joi";
 function usePlatformTermsController() {
@@ -93089,7 +93258,7 @@ function usePlatformTermsController() {
   async function requireOwnRecord(req, user, { staffMayRead = false } = {}) {
     const id = callerId(req);
     if (!id) {
-      throw new UnauthorizedError24("Not authorized.");
+      throw new UnauthorizedError25("Not authorized.");
     }
     if (id === user) {
       return id;
@@ -93097,7 +93266,7 @@ function usePlatformTermsController() {
     if (staffMayRead) {
       return await requireConsolePermission(req, "platform-terms", "see-platform-terms");
     }
-    throw new UnauthorizedError24("Not authorized.");
+    throw new UnauthorizedError25("Not authorized.");
   }
   async function getLatest(_req, res, next) {
     try {
@@ -93306,7 +93475,7 @@ function useConsoleAuditController() {
 // src/controllers/notification.controller.ts
 import {
   BadRequestError as BadRequestError259,
-  UnauthorizedError as UnauthorizedError25,
+  UnauthorizedError as UnauthorizedError26,
   logger as logger219
 } from "@7365admin1/node-server-utils";
 function useNotificationController() {
@@ -93324,10 +93493,10 @@ function useNotificationController() {
   function inboxOwner(req, claimed) {
     const caller = callerId5(req);
     if (!caller) {
-      throw new UnauthorizedError25("Not authorized.");
+      throw new UnauthorizedError26("Not authorized.");
     }
     if (claimed && claimed !== caller) {
-      throw new UnauthorizedError25("Not authorized.");
+      throw new UnauthorizedError26("Not authorized.");
     }
     return caller;
   }
@@ -93339,7 +93508,7 @@ function useNotificationController() {
     }
     try {
       if (!await isSuperAdmin(callerId5(req))) {
-        throw new UnauthorizedError25("Not authorized.");
+        throw new UnauthorizedError26("Not authorized.");
       }
       const inserted = await _addMany(value.to, {
         title: value.title,
@@ -94174,6 +94343,7 @@ export {
   requirePlatformStaff,
   resetCameraTransports,
   residentAppModuleKeys,
+  residentAppModulesSchema,
   residentFormEntry,
   resolutionRefusalReason,
   resolveCamera,