@7365admin1/core 3.53.0 → 3.53.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.53.2
+
+### Patch Changes
+
+- 972c701: Scope file deletion to the uploader's tenant. New uploads are stamped with the caller's user id server-side; a stamped file can only be deleted by its uploader, someone sharing an organisation with them, or a super admin. Files with no stamp (everything uploaded before this change, and the anonymous resident sign-up upload) behave exactly as before — no backfill, no migration.
+
+## 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>;
@@ -643,6 +644,13 @@ type TFile = {
     size?: number;
     status?: string;
     createdAt: string;
+    /**
+     * The signed-in user who uploaded this file, stamped server-side from the
+     * session. OPTIONAL on purpose: every row written before this shipped has no
+     * stamp, and the delete gate leaves those exactly as they were. See
+     * `utils/file-owner.util.ts`.
+     */
+    createdBy?: string;
 };
 declare class MFile implements TFile {
     _id?: ObjectId;
@@ -651,6 +659,7 @@ declare class MFile implements TFile {
     size?: number;
     status?: string;
     createdAt: string;
+    createdBy?: string;
     constructor(value: TFile);
 }
 
@@ -664,7 +673,7 @@ declare function useFileRepo(): {
 };
 
 declare function useFileService(): {
-    createFile: (value: Express.Multer.File, folder?: string) => Promise<string>;
+    createFile: (value: Express.Multer.File, folder?: string, createdBy?: string) => Promise<string>;
     deleteFile: (id: string) => Promise<string>;
     deleteDraft: () => void;
 };

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) {
@@ -16824,6 +16836,8 @@ var MFile = class {
     this.size = value.size ?? 0;
     this.status = value.status ?? "draft";
     this.createdAt = value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString();
+    if (value.createdBy)
+      this.createdBy = value.createdBy.toString();
   }
 };
 
@@ -19168,7 +19182,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 +19197,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) {
@@ -22518,13 +22534,14 @@ function useFileService() {
     bucket: SPACES_BUCKET,
     forcePathStyle: true
   });
-  async function createFile(value, folder = "default") {
+  async function createFile(value, folder = "default", createdBy) {
     const session = import_node_server_utils51.useAtlas.getClient()?.startSession();
     session?.startTransaction();
     const file = {
       name: value.originalname,
       size: value.size ?? (value.buffer ? value.buffer.length : 0),
-      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      ...createdBy ? { createdBy } : {}
     };
     try {
       const id = await _createFile(file, session);
@@ -27610,6 +27627,49 @@ function useVerificationController() {
 // src/controllers/file.controller.ts
 var import_node_server_utils59 = require("@7365admin1/node-server-utils");
 var import_joi27 = __toESM(require("joi"));
+
+// src/utils/file-owner.util.ts
+function fileOwnerId(file) {
+  return file?.createdBy?.toString?.() ?? "";
+}
+function mayDeleteFile(params) {
+  if (!params.ownerId)
+    return true;
+  if (!params.callerId)
+    return false;
+  if (params.callerId === params.ownerId)
+    return true;
+  if (params.callerIsSuperAdmin)
+    return true;
+  const ownerOrgs = new Set((params.ownerOrgIds ?? []).map(String));
+  return (params.callerOrgIds ?? []).some((org) => ownerOrgs.has(String(org)));
+}
+
+// src/controllers/file.controller.ts
+async function requireFileDelete(req, file) {
+  const ownerId = fileOwnerId(file);
+  if (!ownerId)
+    return;
+  const caller = callerId(req);
+  if (!caller)
+    throw new import_node_server_utils59.UnauthorizedError("Not authorized.");
+  if (caller === ownerId)
+    return;
+  const [me, owner] = await Promise.all([
+    resolveInviteActor(caller),
+    resolveInviteActor(ownerId)
+  ]);
+  if (mayDeleteFile({
+    ownerId,
+    callerId: caller,
+    callerIsSuperAdmin: me.isSuperAdmin,
+    callerOrgIds: me.orgIds,
+    ownerOrgIds: owner.orgIds
+  })) {
+    return;
+  }
+  throw new import_node_server_utils59.UnauthorizedError("Not authorized.");
+}
 function useFileController() {
   const { createFile, deleteFile: _deleteFile } = useFileService();
   const { getFileById: _getFileById } = useFileRepo();
@@ -27619,7 +27679,7 @@ function useFileController() {
       return;
     }
     try {
-      const id = await createFile(req.file);
+      const id = await createFile(req.file, "default", callerId(req) || void 0);
       res.status(201).json({ message: "Successfully uploaded file", id });
       return;
     } catch (error) {
@@ -27638,6 +27698,7 @@ function useFileController() {
       return;
     }
     try {
+      await requireFileDelete(req, await _getFileById(_id));
       const message = await _deleteFile(_id);
       res.json({ message });
       return;