@7365admin1/core 3.68.2 → 3.69.0

package/dist/index.mjs

@@ -10519,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";
@@ -10578,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();
@@ -10807,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();
@@ -10876,6 +10896,7 @@ function useVerificationRepo() {
     getVerifications,
     getByIdByType,
     updateStatusById,
+    reissuePendingById,
     getByStatus,
     findOne,
     completePendingInvites
@@ -16937,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();
@@ -17012,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,
@@ -17029,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({
@@ -29193,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?.();
@@ -29259,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(),
@@ -29268,7 +29301,9 @@ function useVerificationController() {
       name: Joi28.string().optional().allow("", null),
       org: Joi28.string().hex().optional().allow("", null),
       siteId: Joi28.string().hex().optional().allow("", null),
-      siteName: Joi28.string().optional().allow("", null)
+      siteName: Joi28.string().optional().allow("", null),
+      // The modules Seven365 gives a NEW client (the console's Invite Client).
+      modules: modulesSchema.optional()
     });
     const { error, value } = validation.validate(payload);
     if (error) {
@@ -29283,12 +29318,24 @@ function useVerificationController() {
       const {
         email,
         app,
-        role,
         name,
         org,
         siteId,
-        siteName
+        siteName,
+        modules
       } = value;
+      const newClient = !org && !app.includes(PLATFORM_STAFF_MEMBER_TYPE);
+      const role = newClient ? "" : value.role;
+      let clientModules;
+      if (modules !== void 0) {
+        const invitedBy = await requireConsolePermission(req, "organizations");
+        if (!newClient || app.length !== 1) {
+          throw new BadRequestError51(
+            "Modules can only be chosen when inviting a new client, one application at a time."
+          );
+        }
+        clientModules = { modules: normaliseModules(modules), invitedBy };
+      }
       await requireInviteReach(req, org, app, role);
       const verificationIds = await _createSimpleUserInvite({
         email,
@@ -29298,7 +29345,8 @@ function useVerificationController() {
           name,
           org,
           siteId,
-          siteName
+          siteName,
+          ...clientModules
         }
       });
       const responseBody = {
@@ -29315,7 +29363,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;
@@ -29325,7 +29373,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(),
@@ -29377,7 +29425,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;
@@ -29387,7 +29435,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(),
@@ -29444,7 +29492,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;
@@ -31103,6 +31151,7 @@ function useOrgController() {
       let invitedFrom = null;
       let invitedRole = null;
       let inviteAlreadyComplete = false;
+      let invitedModules = null;
       let self = null;
       if (inviteId) {
         const [invite, caller] = await Promise.all([
@@ -31115,6 +31164,11 @@ function useOrgController() {
           invitedFrom = String(invite._id);
           invitedRole = invite.metadata?.role ? String(invite.metadata.role) : null;
           inviteAlreadyComplete = invite.status === "complete" /* COMPLETE */;
+          const chosen = normaliseModules(invite.metadata?.modules);
+          const invitedBy = invite.metadata?.invitedBy;
+          if (chosen.length && invitedBy && invite.metadata?.app === body.nature) {
+            invitedModules = { modules: chosen, invitedBy: String(invitedBy) };
+          }
         } else {
           logger41.log({
             level: "warn",
@@ -31130,7 +31184,29 @@ function useOrgController() {
           );
         }
       }
-      const _id = await _add({ ...body, createdBy, invitedFrom, invitedRole });
+      const _id = await _add({
+        ...body,
+        createdBy,
+        invitedFrom,
+        invitedRole,
+        ...invitedModules && { modules: invitedModules.modules }
+      });
+      if (invitedModules) {
+        await recordConsoleAction({
+          action: "client.modules-changed" /* CLIENT_MODULES_CHANGED */,
+          actor: invitedModules.invitedBy,
+          org: String(_id),
+          target: String(_id).toLowerCase(),
+          targetType: "organization" /* ORGANIZATION */,
+          after: pickAuditFields("client.modules-changed" /* CLIENT_MODULES_CHANGED */, {
+            modules: invitedModules.modules.join(", "),
+            moduleCount: invitedModules.modules.length,
+            gateListHash: moduleListHash(invitedModules.modules),
+            acknowledged: false,
+            impactMemberCount: 0
+          })
+        });
+      }
       if (invitedFrom && !inviteAlreadyComplete) {
         try {
           await useVerificationRepoV2().updateStatusById(