@7365admin1/core 3.52.17 → 3.52.19

package/dist/index.mjs

@@ -11006,6 +11006,19 @@ function MOrg(value) {
 
 // src/repositories/organization.repo.ts
 import { ObjectId as ObjectId19 } from "mongodb";
+var DUPLICATE_FIELD_LABEL = {
+  name: "name",
+  email: "email address"
+};
+function duplicatedField(error) {
+  if (error?.code !== 11e3 && !/duplicate/i.test(error?.message ?? "")) {
+    return "";
+  }
+  const fromPattern = Object.keys(error?.keyPattern ?? {})[0];
+  if (fromPattern)
+    return fromPattern;
+  return /index:\s*([A-Za-z0-9_]+?)_\d/.exec(error?.message ?? "")?.[1] ?? "";
+}
 function useOrgRepo() {
   const db2 = useAtlas12.getDb();
   if (!db2) {
@@ -11087,8 +11100,21 @@ function useOrgRepo() {
       await delNamespace();
       return id;
     } catch (error) {
-      logger9.log({ level: "error", message: error.message });
-      throw new InternalServerError9("Failed to update organization.");
+      logger9.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 ?? ""}`
+      });
+      if (error instanceof AppError3)
+        throw error;
+      const field = duplicatedField(error);
+      if (field) {
+        throw new BadRequestError19(
+          `Another organization already uses this ${DUPLICATE_FIELD_LABEL[field] ?? field}. Please use a different one.`
+        );
+      }
+      throw new InternalServerError9(
+        `Failed to update organization${error?.code !== void 0 ? ` (${error.code})` : ""}.`
+      );
     }
   }
   async function getAll({
@@ -18091,11 +18117,11 @@ async function requireUserFieldWrite(req, userId, field) {
 }
 
 // src/utils/user-response.util.ts
-function withoutCredentials(user) {
+function publicIdentity(user) {
   if (!user || typeof user !== "object")
     return user;
-  const { password, sid, ...rest } = user;
-  return rest;
+  const { _id, name, email } = user;
+  return { _id, name, email };
 }
 
 // src/controllers/user.controller.ts
@@ -18187,7 +18213,7 @@ function useUserController() {
         return;
       }
       const user = await _getByEmail(email);
-      res.json(withoutCredentials(user));
+      res.json(publicIdentity(user));
       return;
     } catch (error2) {
       logger24.log({ level: "error", message: `${error2.message}` });
@@ -31232,6 +31258,7 @@ function useSubscriptionController() {
       return;
     }
     try {
+      await requireOrgAccess(req, _id);
       const data = await _getByOrgId(_id);
       res.json(data);
       return;
@@ -31258,6 +31285,7 @@ function useSubscriptionController() {
     const page = parseInt(req.query.page ?? "1");
     const status = req.query.status ?? "active";
     try {
+      await requirePlatformStaff(req);
       const data = await _getSubscriptions({ search, page, status });
       res.json(data);
       return;
@@ -86217,7 +86245,7 @@ function useUserControllerV2() {
       return rejectValidation(error, next);
     try {
       const user = await _getUserByEmail(value);
-      res.json(withoutCredentials(user));
+      res.json(publicIdentity(user));
       return;
     } catch (err) {
       logger202.log({ level: "error", message: `${err.message}` });