@7365admin1/core 3.62.1-staging.277 → 3.62.1-staging.278

package/.changeset/site-module-allowlist.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": minor
+---
+
+Tier two of the module cascade: `sites.metadata.modules`, the modules a site offers, plus `PATCH /sites/:id/modules` for the organisation to set it. The write refuses any key Seven365 never gave the organisation (owner requirement R1); the read fails open at every tier, so absent and empty both mean "everything the organisation has" and no site or role editor changes until somebody sets a list.

package/dist/index.d.ts

@@ -2126,6 +2126,8 @@ declare enum SiteCategories {
     HOSPITALITY = "hospitality"
 }
 type TSiteMetadata = {
+    /** Tier two of the module cascade — see `site-modules.util.ts`. */
+    modules?: string[];
     block?: number;
     guardPosts?: number;
     gracePeriod?: number;
@@ -2310,6 +2312,7 @@ declare function useSiteController(): {
     updateSiteBlock: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     deleteSite: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    updateSiteModules: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateGuardPostsById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     siteInformation: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAllSitesForResidentCreation: (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/index.js

@@ -12397,6 +12397,23 @@ var import_mongodb21 = require("mongodb");
 // src/models/site.model.ts
 var import_node_server_utils22 = require("@7365admin1/node-server-utils");
 var import_joi10 = __toESM(require("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
 var import_mongodb20 = require("mongodb");
 
 // src/utils/site-timezone.util.ts
@@ -12465,6 +12482,23 @@ var hidQrCodePassSchema = import_joi10.default.object({
   updatedAt: import_joi10.default.string().isoDate().required()
 });
 var metadataSchema3 = import_joi10.default.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: import_joi10.default.number().optional(),
   guardPosts: import_joi10.default.number().optional(),
   gracePeriod: import_joi10.default.number().optional(),
@@ -38364,6 +38398,7 @@ function useSiteController() {
     deleteSite: _deleteSite,
     getAllSitesForResidentCreation: _getAllSitesForResidentCreation
   } = useSiteRepo();
+  const { getById: _getOrgById } = useOrgRepo();
   const { updateGuardPostById, siteInformation: _siteInformation } = useSiteService();
   async function createSite(req, res, next) {
     const payload = { ...req.body };
@@ -38522,6 +38557,45 @@ function useSiteController() {
       return;
     }
   }
+  async function updateSiteModules(req, res, next) {
+    const validation = import_joi51.default.object({ modules: siteModulesSchema.required() });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      import_node_server_utils104.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils104.BadRequestError(error.message));
+      return;
+    }
+    const siteId = req.params.id ?? "";
+    try {
+      await requireSiteWrite(req, siteId);
+      const site = await _getSiteById(siteId);
+      if (!site) {
+        next(new import_node_server_utils104.BadRequestError("Site not found."));
+        return;
+      }
+      const org = site.orgId ? await _getOrgById(site.orgId.toString()) : null;
+      const rejected = rejectedSiteModules(
+        org?.modules,
+        req.body.modules
+      );
+      if (rejected.length) {
+        next(new import_node_server_utils104.BadRequestError(rejectedSiteModulesMessage(rejected)));
+        return;
+      }
+      const modules = normaliseModules(req.body.modules);
+      await _updateById(siteId, {
+        ...site,
+        metadata: { ...site.metadata ?? {}, modules }
+      });
+      const data = await _getSiteById(siteId);
+      res.json({ message: "Site modules updated successfully.", data });
+      return;
+    } catch (error2) {
+      import_node_server_utils104.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   async function updateGuardPostsById(req, res, next) {
     const validation = import_joi51.default.object({
       _id: import_joi51.default.string().hex().required(),
@@ -38614,6 +38688,7 @@ function useSiteController() {
     updateSiteBlock,
     deleteSite,
     updateById,
+    updateSiteModules,
     updateGuardPostsById,
     siteInformation,
     getAllSitesForResidentCreation