@7365admin1/core 3.53.0 → 3.53.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 3.53.1
+
+### Patch Changes
+
+- bb5fb95: Scope the roles list to a site. `GET /api/roles` now accepts an optional `site`, and `role.repo.getRoles` filters on it: a role created on a site is listed only on that site, while roles with no site remain the organisation's own and stay visible on every site. `site` is part of the cache key. No stored document changes.
+
 ## 3.53.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -306,13 +306,14 @@ declare function useRoleRepo(): {
     getRoleByUserId: (value: string | ObjectId) => Promise<TRole | null>;
     getRoleById: (_id: string | ObjectId) => Promise<TRole | null>;
     getRoleByName: (name: string, type?: string) => Promise<TRole | null>;
-    getRoles: ({ search, page, limit, sort, type, org, }: {
+    getRoles: ({ search, page, limit, sort, type, org, site, }: {
         search?: string | undefined;
         page?: number | undefined;
         limit?: number | undefined;
         sort?: any;
         type?: string | undefined;
         org: string | ObjectId;
+        site?: string | ObjectId | undefined;
     }) => Promise<{}>;
     getActiveByTypeOrg: (type: string, org: string | ObjectId) => Promise<TRole[]>;
     updateRole: (_id: string | ObjectId, value: TMiniRole, session?: ClientSession) => Promise<ObjectId>;

package/dist/index.js

@@ -16609,7 +16609,8 @@ function useRoleRepo() {
     limit = 10,
     sort = {},
     type = "",
-    org = ""
+    org = "",
+    site = ""
   }) {
     page = page > 0 ? page - 1 : 0;
     if (org && typeof org === "string" && org.length === 24) {
@@ -16619,8 +16620,19 @@ function useRoleRepo() {
         throw new import_node_server_utils36.BadRequestError("Invalid organization ID format.");
       }
     }
+    if (site && typeof site === "string" && site.length === 24) {
+      try {
+        site = new import_mongodb33.ObjectId(site);
+      } catch (error) {
+        throw new import_node_server_utils36.BadRequestError("Invalid site ID format.");
+      }
+    }
     const query2 = { status: "active", org };
     const cacheOptions = { status: "active", org };
+    if (site) {
+      query2.$or = [{ site }, { site: "" }, { site: null }];
+      cacheOptions.site = site.toString();
+    }
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     cacheOptions.sort = JSON.stringify(sort);
     if (search) {
@@ -19168,7 +19180,8 @@ function useRoleController() {
       page: import_joi19.default.number().integer().min(1).allow("", null).default(1),
       limit: import_joi19.default.number().integer().min(1).max(100).allow("", null).default(10),
       type: import_joi19.default.string().optional().allow("", null),
-      org: import_joi19.default.string().hex().optional().allow("", null)
+      org: import_joi19.default.string().hex().optional().allow("", null),
+      site: import_joi19.default.string().hex().optional().allow("", null)
     });
     const query2 = { ...req.query };
     const { error } = validation.validate(query2);
@@ -19182,11 +19195,12 @@ function useRoleController() {
     const limit = parseInt(req.query.limit ?? "10");
     const type = req.query.type ?? "";
     const org = req.query.org ?? "";
+    const site = req.query.site ?? "";
     try {
       if (org) {
         await requireOrgReach(req, org);
       }
-      const data = await _getRoles({ search, page, limit, type, org });
+      const data = await _getRoles({ search, page, limit, type, org, site });
       res.json(data);
       return;
     } catch (error2) {