@7365admin1/core 3.64.5-staging.307 → 3.64.5-staging.308

package/.changeset/user-invite-dedupe.md

@@ -0,0 +1,5 @@
+---
+"@7365admin1/core": patch
+---
+
+Re-inviting the same person to the same app, organisation and site now re-sends the pending invitation instead of adding a duplicate; invite request logs no longer record the invitee's e-mail address.

package/dist/index.d.ts

@@ -1057,6 +1057,10 @@ declare class MVerification implements TVerification {
     constructor(value: TVerification);
 }
 
+type TKeyValuePair<K extends string | number | symbol = string, V = any> = {
+    [key in K]: V;
+};
+
 declare function useVerificationRepo(): {
     createIndex: () => Promise<void>;
     createTextIndex: () => Promise<void>;
@@ -1076,6 +1080,10 @@ declare function useVerificationRepo(): {
     }) => Promise<{}>;
     getByIdByType: (type: string) => Promise<TVerification[]>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
+    reissuePendingById: (_id: string | ObjectId, { metadata, expireAt }: {
+        metadata: TKeyValuePair;
+        expireAt: string;
+    }) => Promise<number>;
     getByStatus: (status: string) => Promise<TVerification[]>;
     findOne: (query: any) => Promise<mongodb.WithId<bson.Document> | null>;
     completePendingInvites: ({ email, orgId, siteId, app, session, }: {
@@ -1087,10 +1095,6 @@ declare function useVerificationRepo(): {
     }) => Promise<mongodb.UpdateResult<bson.Document>>;
 };
 
-type TKeyValuePair<K extends string | number | symbol = string, V = any> = {
-    [key in K]: V;
-};
-
 declare function useVerificationService(): {
     createUserInvite: ({ email, metadata, }: {
         email: string;

package/dist/index.js

@@ -11278,9 +11278,6 @@ var import_node_server_utils45 = require("@7365admin1/node-server-utils");
 // src/services/verification.service.ts
 var import_node_server_utils41 = require("@7365admin1/node-server-utils");
 
-// src/repositories/verification.repo.ts
-var import_node_server_utils19 = require("@7365admin1/node-server-utils");
-
 // src/models/verification.model.ts
 var import_node_server_utils18 = require("@7365admin1/node-server-utils");
 var import_mongodb16 = require("mongodb");
@@ -11329,6 +11326,7 @@ var MVerification = class {
 };
 
 // src/repositories/verification.repo.ts
+var import_node_server_utils19 = require("@7365admin1/node-server-utils");
 var import_mongodb17 = require("mongodb");
 function useVerificationRepo() {
   const db2 = import_node_server_utils19.useAtlas.getDb();
@@ -11558,6 +11556,28 @@ function useVerificationRepo() {
       throw new import_node_server_utils19.InternalServerError("Error updating verification status.");
     }
   }
+  async function reissuePendingById(_id, { metadata, expireAt }) {
+    try {
+      _id = new import_mongodb17.ObjectId(_id);
+    } catch (error) {
+      throw new import_node_server_utils19.BadRequestError("Invalid verification ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id, status: "pending" },
+        { $set: { metadata, expireAt, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } }
+      );
+      delNamespace().catch(
+        (err) => import_node_server_utils19.logger.error(`Failed to clear cache for namespace: ${namespace_collection3}`, err)
+      );
+      delCache((0, import_node_server_utils19.makeCacheKey)(namespace_collection3, { _id })).catch(
+        (err) => import_node_server_utils19.logger.error(`Failed to delete cache for verification ${_id}`, err)
+      );
+      return result.modifiedCount;
+    } catch (error) {
+      throw new import_node_server_utils19.InternalServerError("Error re-sending the invitation.");
+    }
+  }
   async function getByStatus(status) {
     try {
       const data = await collection.find({ status }).toArray();
@@ -11627,6 +11647,7 @@ function useVerificationRepo() {
     getVerifications,
     getByIdByType,
     updateStatusById,
+    reissuePendingById,
     getByStatus,
     findOne,
     completePendingInvites
@@ -17616,7 +17637,8 @@ function useVerificationService() {
     add,
     getById: _getById,
     updateStatusById: _updateStatusById,
-    getByStatus: _getByStatus
+    getByStatus: _getByStatus,
+    reissuePendingById
   } = useVerificationRepo();
   const { getUserByEmail } = useUserRepo();
   const { getById: getOrgById, getByEmail: getOrgByEmail } = useOrgRepo();
@@ -17691,13 +17713,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,
@@ -17708,7 +17723,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 = (0, import_node_server_utils41.compileHandlebar)({
@@ -29973,6 +30005,7 @@ function useMemberController() {
 // src/controllers/verification.controller.ts
 var import_node_server_utils66 = require("@7365admin1/node-server-utils");
 var import_joi28 = __toESM(require("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?.();
@@ -30039,7 +30072,7 @@ function useVerificationController() {
     const payload = { ...req.body };
     import_node_server_utils66.logger.log({
       level: "info",
-      message: `[invite/user] payload: ${JSON.stringify(payload)}`
+      message: `[invite/user] payload: ${withoutEmail(payload)}`
     });
     const validation = import_joi28.default.object({
       email: import_joi28.default.string().email().required(),
@@ -30095,7 +30128,7 @@ function useVerificationController() {
     } catch (error2) {
       import_node_server_utils66.logger.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;
@@ -30105,7 +30138,7 @@ function useVerificationController() {
     const payload = { ...req.body };
     import_node_server_utils66.logger.log({
       level: "info",
-      message: `[invite/member] payload: ${JSON.stringify(payload)}`
+      message: `[invite/member] payload: ${withoutEmail(payload)}`
     });
     const validation = import_joi28.default.object({
       email: import_joi28.default.string().email().required(),
@@ -30157,7 +30190,7 @@ function useVerificationController() {
     } catch (error2) {
       import_node_server_utils66.logger.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;
@@ -30167,7 +30200,7 @@ function useVerificationController() {
     const payload = req.body;
     import_node_server_utils66.logger.log({
       level: "info",
-      message: `[service-providers/invite] payload: ${JSON.stringify(payload)}`
+      message: `[service-providers/invite] payload: ${withoutEmail(payload)}`
     });
     const validation = import_joi28.default.object({
       email: import_joi28.default.string().email().required(),
@@ -30224,7 +30257,7 @@ function useVerificationController() {
     } catch (error2) {
       import_node_server_utils66.logger.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;