@7365admin1/core 3.68.1 → 3.68.3

package/dist/index.mjs

@@ -9073,6 +9073,9 @@ import { BadRequestError as BadRequestError12 } from "@7365admin1/node-server-ut
 import Joi7 from "joi";
 import { ObjectId as ObjectId12 } from "mongodb";
 var PLATFORM_STAFF_MEMBER_TYPE = "admin";
+function isDuplicateMemberError(error) {
+  return error?.code === 11e3 || /E11000|duplicate key/i.test(error?.message ?? "");
+}
 var MEMBER_TYPES = [
   PLATFORM_STAFF_MEMBER_TYPE,
   "organization",
@@ -9226,8 +9229,7 @@ function useMemberRepo() {
       });
       return "Successfully added member.";
     } catch (error) {
-      const isDuplicated = error.message.includes("duplicate");
-      if (isDuplicated && error.message.includes("org_1_user_1"))
+      if (isDuplicateMemberError(error))
         throw new BadRequestError13(
           "The user is already a member of this organization."
         );
@@ -10517,17 +10519,6 @@ import {
   useAtlas as useAtlas23
 } from "@7365admin1/node-server-utils";
 
-// src/repositories/verification.repo.ts
-import {
-  BadRequestError as BadRequestError17,
-  InternalServerError as InternalServerError8,
-  logger as logger8,
-  makeCacheKey as makeCacheKey6,
-  paginate as paginate6,
-  useAtlas as useAtlas11,
-  useCache as useCache8
-} from "@7365admin1/node-server-utils";
-
 // src/models/verification.model.ts
 import { BadRequestError as BadRequestError16 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId16 } from "mongodb";
@@ -10576,6 +10567,15 @@ var MVerification = class {
 };
 
 // src/repositories/verification.repo.ts
+import {
+  BadRequestError as BadRequestError17,
+  InternalServerError as InternalServerError8,
+  logger as logger8,
+  makeCacheKey as makeCacheKey6,
+  paginate as paginate6,
+  useAtlas as useAtlas11,
+  useCache as useCache8
+} from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId17 } from "mongodb";
 function useVerificationRepo() {
   const db2 = useAtlas11.getDb();
@@ -10805,6 +10805,28 @@ function useVerificationRepo() {
       throw new InternalServerError8("Error updating verification status.");
     }
   }
+  async function reissuePendingById(_id, { metadata, expireAt }) {
+    try {
+      _id = new ObjectId17(_id);
+    } catch (error) {
+      throw new BadRequestError17("Invalid verification ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id, status: "pending" },
+        { $set: { metadata, expireAt, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } }
+      );
+      delNamespace().catch(
+        (err) => logger8.error(`Failed to clear cache for namespace: ${namespace_collection3}`, err)
+      );
+      delCache(makeCacheKey6(namespace_collection3, { _id })).catch(
+        (err) => logger8.error(`Failed to delete cache for verification ${_id}`, err)
+      );
+      return result.modifiedCount;
+    } catch (error) {
+      throw new InternalServerError8("Error re-sending the invitation.");
+    }
+  }
   async function getByStatus(status) {
     try {
       const data = await collection.find({ status }).toArray();
@@ -10874,6 +10896,7 @@ function useVerificationRepo() {
     getVerifications,
     getByIdByType,
     updateStatusById,
+    reissuePendingById,
     getByStatus,
     findOne,
     completePendingInvites
@@ -16935,7 +16958,8 @@ function useVerificationService() {
     add,
     getById: _getById,
     updateStatusById: _updateStatusById,
-    getByStatus: _getByStatus
+    getByStatus: _getByStatus,
+    reissuePendingById
   } = useVerificationRepo();
   const { getUserByEmail } = useUserRepo();
   const { getById: getOrgById, getByEmail: getOrgByEmail } = useOrgRepo();
@@ -17010,13 +17034,6 @@ function useVerificationService() {
     }
     const verificationIds = [];
     for (const app of apps) {
-      await useVerificationRepo().findOne({
-        type,
-        email,
-        "metadata.app": app,
-        "metadata.org": metadata.org,
-        "metadata.siteId": metadata.siteId
-      });
       const value = {
         type,
         email,
@@ -17027,7 +17044,24 @@ function useVerificationService() {
         expireAt: new Date(Date.now() + 72 * 60 * 60 * 1e3).toISOString(),
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const createdId = await add(value);
+      const stored = new MVerification({
+        ...value,
+        metadata: { ...value.metadata }
+      }).metadata;
+      const pending = await useVerificationRepo().findOne({
+        type,
+        // same address in any letter case, as `completePendingInvites` reads it
+        email: new RegExp(`^${email.replace(/[.*+?^$()|[\]{}\\]/g, "\\$&")}$`, "i"),
+        status: "pending",
+        "metadata.app": app,
+        "metadata.org": stored.org,
+        "metadata.siteId": stored.siteId
+      });
+      const reissued = pending?._id && await reissuePendingById(pending._id, {
+        metadata: stored,
+        expireAt: value.expireAt
+      });
+      const createdId = reissued ? pending._id : await add(value);
       verificationIds.push(createdId.toString());
       const link = `${APP_MAIN}/verify/invitation/${createdId}`;
       const emailContent = compileHandlebar2({
@@ -29191,6 +29225,7 @@ function useMemberController() {
 // src/controllers/verification.controller.ts
 import { BadRequestError as BadRequestError51, logger as logger38 } from "@7365admin1/node-server-utils";
 import Joi28 from "joi";
+var withoutEmail = (payload) => JSON.stringify({ ...payload, email: payload?.email ? "[redacted]" : void 0 });
 function callerId2(req) {
   const user = req.user;
   return user?.user?.toString?.() || user?._id?.toString?.();
@@ -29257,7 +29292,7 @@ function useVerificationController() {
     const payload = { ...req.body };
     logger38.log({
       level: "info",
-      message: `[invite/user] payload: ${JSON.stringify(payload)}`
+      message: `[invite/user] payload: ${withoutEmail(payload)}`
     });
     const validation = Joi28.object({
       email: Joi28.string().email().required(),
@@ -29313,7 +29348,7 @@ function useVerificationController() {
     } catch (error2) {
       logger38.log({
         level: "error",
-        message: `[invite/user] error for payload ${JSON.stringify(payload)}: ${error2.message}`
+        message: `[invite/user] error for payload ${withoutEmail(payload)}: ${error2.message}`
       });
       next(error2);
       return;
@@ -29323,7 +29358,7 @@ function useVerificationController() {
     const payload = { ...req.body };
     logger38.log({
       level: "info",
-      message: `[invite/member] payload: ${JSON.stringify(payload)}`
+      message: `[invite/member] payload: ${withoutEmail(payload)}`
     });
     const validation = Joi28.object({
       email: Joi28.string().email().required(),
@@ -29375,7 +29410,7 @@ function useVerificationController() {
     } catch (error2) {
       logger38.log({
         level: "error",
-        message: `[invite/member] error for payload ${JSON.stringify(payload)}: ${error2.message}`
+        message: `[invite/member] error for payload ${withoutEmail(payload)}: ${error2.message}`
       });
       next(error2);
       return;
@@ -29385,7 +29420,7 @@ function useVerificationController() {
     const payload = req.body;
     logger38.log({
       level: "info",
-      message: `[service-providers/invite] payload: ${JSON.stringify(payload)}`
+      message: `[service-providers/invite] payload: ${withoutEmail(payload)}`
     });
     const validation = Joi28.object({
       email: Joi28.string().email().required(),
@@ -29442,7 +29477,7 @@ function useVerificationController() {
     } catch (error2) {
       logger38.log({
         level: "error",
-        message: `[service-providers/invite] error for payload ${JSON.stringify(payload)}: ${error2.message}`
+        message: `[service-providers/invite] error for payload ${withoutEmail(payload)}: ${error2.message}`
       });
       next(error2);
       return;
@@ -96921,6 +96956,7 @@ export {
   incidents_namespace_collection,
   invitationOffersRole,
   isCameraEntitled,
+  isDuplicateMemberError,
   isDuplicateVersionError,
   isLikelySelfServiceEmail,
   isPatrolCctvCamera,