@7365admin1/core 2.50.0 → 2.51.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/core
 
+## 2.51.0
+
+### Minor Changes
+
+- ab30f16: get latest changes for new onboarding process
+
 ## 2.50.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -337,6 +337,7 @@ declare function useMemberController(): {
     getOrgsByMembership: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateMemberStatus: (req: Request, res: Response, next: NextFunction) => Promise<void>;
     updateRoleById: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    createMemberDirect: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 
 type TVerificationMetadata = {
@@ -390,6 +391,7 @@ declare function useVerificationRepo(): {
     getByIdByType: (type: string) => Promise<TVerification[]>;
     updateStatusById: (_id: string | ObjectId, status: string, session?: ClientSession) => Promise<mongodb.UpdateResult<bson.Document>>;
     getByStatus: (status: string) => Promise<TVerification[]>;
+    findOne: (query: any) => Promise<mongodb.WithId<bson.Document> | null>;
 };
 
 type TKeyValuePair<K extends string | number | symbol = string, V = any> = {

package/dist/index.js

@@ -4333,6 +4333,9 @@ function useVerificationRepo() {
       return Promise.reject(error);
     }
   }
+  async function findOne(query) {
+    return await collection.findOne(query);
+  }
   return {
     createIndex,
     createTextIndex,
@@ -4341,7 +4344,8 @@ function useVerificationRepo() {
     getVerifications,
     getByIdByType,
     updateStatusById,
-    getByStatus
+    getByStatus,
+    findOne
   };
 }
 
@@ -5645,29 +5649,28 @@ function useVerificationService() {
       throw error;
     }
   }
-  async function createSimpleUserInvite({
-    email,
-    metadata
-  }) {
+  async function createSimpleUserInvite({ email, metadata }) {
     const type = "user-invite";
+    if (metadata?.org)
+      await getOrgById(metadata.org);
+    if (metadata?.siteId)
+      await getSiteById(metadata.siteId);
+    const existing = await useVerificationRepo().findOne({
+      type,
+      email,
+      "metadata.org": metadata?.org,
+      "metadata.siteId": metadata?.siteId
+    });
+    if (existing)
+      return existing._id;
     const value = {
       type,
       email,
       metadata,
-      expireAt: new Date(
-        (/* @__PURE__ */ new Date()).getTime() + 72 * 60 * 60 * 1e3
-      ).toISOString(),
+      expireAt: new Date(Date.now() + 72 * 60 * 60 * 1e3).toISOString(),
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    if (value.metadata?.org) {
-      await getOrgById(value.metadata?.org);
-    }
-    if (value.metadata?.siteId) {
-      await getSiteById(value.metadata?.siteId);
-    }
     const res = await add(value);
-    const dir = __dirname;
-    const filePath = (0, import_node_server_utils21.getDirectory)(dir, "./public/handlebars/user-invite");
     const link = `${APP_MAIN}/verify/invitation/${res}`;
     const emailContent = (0, import_node_server_utils21.compileHandlebar)({
       context: {
@@ -5675,9 +5678,9 @@ function useVerificationService() {
         validity: VERIFICATION_USER_INVITE_DURATION,
         link
       },
-      filePath
+      filePath: (0, import_node_server_utils21.getDirectory)(__dirname, "./public/handlebars/user-invite")
     });
-    mailer.sendMail({
+    await mailer.sendMail({
       to: email,
       subject: "User Invite",
       html: emailContent,
@@ -7504,7 +7507,7 @@ function useMemberService() {
     getByRoles
   } = useMemberRepo();
   const { getById: _getVerificationById, updateStatusById } = useVerificationRepo();
-  const { getUserByEmail, updateDefaultOrgByEmail } = useUserRepo();
+  const { getUserByEmail, updateDefaultOrgByEmail, getUserById } = useUserRepo();
   const { getById: getOrgById } = useOrgRepo();
   const { getSiteById } = useSiteRepo();
   const { getOwnerRolesByTypeOrg } = useRoleRepo();
@@ -7566,6 +7569,52 @@ function useMemberService() {
       session?.endSession();
     }
   }
+  async function createMemberDirect({
+    userId,
+    orgId,
+    roleId,
+    app,
+    siteId,
+    siteName
+  }) {
+    const session = import_node_server_utils30.useAtlas.getClient()?.startSession();
+    session?.startTransaction();
+    try {
+      const org = await getOrgById(orgId);
+      if (!org)
+        throw new import_node_server_utils30.BadRequestError("Organization not found.");
+      const user = await getUserById(userId);
+      if (!user)
+        throw new import_node_server_utils30.BadRequestError("User not found.");
+      const member = await addMember(
+        {
+          org: org._id?.toString() || "",
+          orgName: org.name || "",
+          user: user._id?.toString() || "",
+          name: user?.email,
+          role: roleId,
+          type: app,
+          siteId: siteId ?? "",
+          siteName: siteName ?? ""
+        },
+        session
+      );
+      if (!user.defaultOrg) {
+        await updateDefaultOrgByEmail(
+          user.email,
+          org._id?.toString() || "",
+          session
+        );
+      }
+      await session?.commitTransaction();
+      return { member };
+    } catch (error) {
+      await session?.abortTransaction();
+      throw error;
+    } finally {
+      session?.endSession();
+    }
+  }
   async function updateRoleById(id, role, type, org) {
     const owner = await getOwnerRolesByTypeOrg(type, org);
     if (!owner.length) {
@@ -7593,6 +7642,7 @@ function useMemberService() {
   }
   return {
     createMember,
+    createMemberDirect,
     updateRoleById
   };
 }
@@ -7607,7 +7657,7 @@ function useMemberController() {
     updateMemberStatus: _updateMemberStatus,
     updateStatusByUserId: _updateStatusByUserId
   } = useMemberRepo();
-  const { createMember: _createMember, updateRoleById: _updateRoleById } = useMemberService();
+  const { createMember: _createMember, createMemberDirect: _createMemberDirect, updateRoleById: _updateRoleById } = useMemberService();
   async function createMember(req, res, next) {
     const validation = import_joi15.default.string().hex().required();
     const _id = req.params.id;
@@ -7796,6 +7846,32 @@ function useMemberController() {
       return;
     }
   }
+  async function createMemberDirect(req, res, next) {
+    const validation = import_joi15.default.object({
+      userId: import_joi15.default.string().hex().required(),
+      orgId: import_joi15.default.string().hex().required(),
+      roleId: import_joi15.default.string().hex().required(),
+      app: import_joi15.default.string().required(),
+      siteId: import_joi15.default.string().hex().optional().allow("", null),
+      siteName: import_joi15.default.string().optional().allow("", null)
+    });
+    const { error } = validation.validate(req.body);
+    if (error) {
+      import_node_server_utils31.logger.log({ level: "error", message: error.message });
+      next(new import_node_server_utils31.BadRequestError(error.message));
+      return;
+    }
+    const { userId, orgId, roleId, app, siteId, siteName } = req.body;
+    try {
+      const data = await _createMemberDirect({ userId, orgId, roleId, app, siteId, siteName });
+      res.status(201).json(data);
+      return;
+    } catch (error2) {
+      import_node_server_utils31.logger.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     createMember,
     getByUserId,
@@ -7803,7 +7879,8 @@ function useMemberController() {
     getAll,
     getOrgsByMembership,
     updateMemberStatus,
-    updateRoleById
+    updateRoleById,
+    createMemberDirect
   };
 }