@7365admin1/core 3.64.3-staging.283 → 3.64.3-staging.285

package/dist/index.d.ts

@@ -4851,7 +4851,6 @@ declare function MPerson(value: TPerson): {
     end: string | Date | undefined;
     type: "resident" | "walk-in" | "drop-off" | "contractor" | "delivery" | "pick-up" | "guest" | "tenant" | undefined;
     email: string | undefined;
-    password: string;
     status: string;
     nric: string | undefined;
     remarks: string | undefined;
@@ -7577,6 +7576,7 @@ declare function UseAccessManagementRepo(): {
         userType: string;
         type: string;
         search: string;
+        userId?: string | null;
     }) => Promise<bson.Document>;
     acknowlegdeCardRepo: (params: {
         userId: string[];

package/dist/index.js

@@ -9035,6 +9035,14 @@ var MVerificationV2 = class {
   }
 };
 
+// src/utils/email-match.util.ts
+function escapeRegex(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function emailFilter(email) {
+  return { $regex: `^${escapeRegex(email)}$`, $options: "i" };
+}
+
 // src/repositories/user.repo.ts
 function useUserRepo() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -9099,7 +9107,7 @@ function useUserRepo() {
   async function getUserByEmail(email) {
     try {
       const data = await collection.findOne({
-        email: { $regex: `^${email}$`, $options: "i" }
+        email: emailFilter(email)
       });
       return data;
     } catch (error) {
@@ -9109,7 +9117,7 @@ function useUserRepo() {
   async function userExistsByEmail(email) {
     try {
       const data = await collection.findOne(
-        { email: { $regex: `^${email}$`, $options: "i" } },
+        { email: emailFilter(email) },
         { projection: { _id: 1 } }
       );
       return Boolean(data);
@@ -9130,7 +9138,7 @@ function useUserRepo() {
         return cachedData;
       }
       const query2 = {
-        email: { $regex: `^${email}$`, $options: "i" },
+        email: emailFilter(email),
         status: "complete" /* COMPLETE */
       };
       const data = await collection.findOne(query2);
@@ -18301,7 +18309,12 @@ function MPerson(value) {
     end: value.end,
     type: value.type,
     email: value.email,
-    password: value.password ?? "",
+    // No `password` here, deliberately. This return is the whitelist that
+    // decides what reaches the `people` collection, and it used to carry the
+    // admin-typed password in clear text — into a document that
+    // `GET /api/people` hands back to the console. The only copy that should
+    // exist is the hash `person.service` writes to the `users` row before the
+    // insert, and nothing anywhere reads it back off the person.
     status: value.status ?? "active",
     nric: value.nric,
     remarks: value.remarks,
@@ -22720,7 +22733,7 @@ function useVehicleRepo() {
     let query2 = { ...baseQuery };
     if (search)
       query2.$text = { $search: search };
-    const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const escapeRegex2 = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const buildGroupedPipeline = (matchQuery) => [
       { $match: matchQuery },
       {
@@ -22892,7 +22905,7 @@ function useVehicleRepo() {
       const countResult = await collection.aggregate(buildGroupedCountPipeline(query2)).toArray();
       length = countResult[0]?.total || 0;
       if ((!items || items.length === 0) && search) {
-        const escaped = escapeRegex(search);
+        const escaped = escapeRegex2(search);
         const regexQuery = {
           ...baseQuery,
           $or: [
@@ -23498,7 +23511,7 @@ function useVehicleRepo() {
       ...baseQuery,
       ...search && { $text: { $search: search } }
     };
-    const escapeRegex = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const escapeRegex2 = (input) => input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const buildPipeline = (matchQuery) => [
       { $match: matchQuery },
       {
@@ -23526,7 +23539,7 @@ function useVehicleRepo() {
       const countResult = await collection.aggregate(buildCountPipeline(query2)).toArray();
       length = countResult[0]?.total || 0;
       if ((!items || items.length === 0) && search) {
-        const escaped = escapeRegex(search);
+        const escaped = escapeRegex2(search);
         const regexQuery = {
           ...baseQuery,
           $or: [
@@ -36675,9 +36688,10 @@ function useBuildingUnitRepo() {
       building_units_namespace_collection,
       cacheOptions
     );
-    const buildingCollection = await db2?.collection("buildings").findOne({ _id: (0, import_node_server_utils102.toObjectId)(block) });
+    const blockObjectId = (0, import_node_server_utils102.toObjectId)(block);
+    const buildingCollection = await db2?.collection("buildings").findOne({ _id: blockObjectId });
     const blockNumber = buildingCollection?.block;
-    query2.block = blockNumber !== void 0 ? blockNumber : block;
+    query2.block = blockNumber !== void 0 ? { $in: [blockNumber, blockObjectId] } : blockObjectId;
     try {
       const data = await collection.aggregate([{ $match: query2 }, { $project: { name: 1 } }]).toArray();
       setCache(cacheKey, data, 15 * 60).then(() => {
@@ -44768,6 +44782,24 @@ var import_mongodb88 = require("mongodb");
 var import_node_server_utils134 = require("@7365admin1/node-server-utils");
 var import_mongodb83 = require("mongodb");
 
+// src/utils/resident-account.util.ts
+function residentAccountGaps(value) {
+  const gaps = [];
+  if (!value.name)
+    gaps.push("a name");
+  if (!value.email)
+    gaps.push("an email address");
+  if (!value.password)
+    gaps.push("a password");
+  return gaps;
+}
+function residentAccountGapMessage(value) {
+  const gaps = residentAccountGaps(value);
+  if (gaps.length === 0)
+    return "";
+  return `A ${value.type} needs ${gaps.join(", ")} to be able to sign in. Please complete the form and try again.`;
+}
+
 // src/services/platform-terms.service.ts
 var import_node_server_utils133 = require("@7365admin1/node-server-utils");
 
@@ -45115,6 +45147,69 @@ function usePersonService() {
     acceptByUserId: _acceptTermsByUserId,
     assertLatestTerms: _assertLatestTerms
   } = usePlatformTermsService();
+  async function ensureResidentAccount(value, session) {
+    const gap = residentAccountGapMessage(value);
+    if (gap) {
+      throw new import_node_server_utils134.BadRequestError(gap);
+    }
+    const _user = await getUserByEmail(value.email);
+    if (_user) {
+      throw new import_node_server_utils134.BadRequestError(`User already exists: ${value.email}.`);
+    }
+    const hashedPassword = await (0, import_node_server_utils134.hashPassword)(value.password);
+    const user = {
+      email: value.email,
+      password: hashedPassword,
+      name: value.name,
+      status: value.platform == "mobile" ? "pending" : "active",
+      defaultOrg: value.org?.toString() || "",
+      block: value.block,
+      level: value.level,
+      type: value.type,
+      unitName: value.unitName,
+      contact: value.contact,
+      site: value.site?.toString() || "",
+      unitId: value.unit?.toString() || ""
+    };
+    const userId = await addUser(user, session);
+    if (!userId) {
+      throw new import_node_server_utils134.BadRequestError(
+        `Could not create the sign-in account for ${value.email}.`
+      );
+    }
+    let org = null;
+    if (value?.org) {
+      org = await getOrgById(value.org);
+      if (!org) {
+        value.org = "";
+      }
+    }
+    let site;
+    if (value.site) {
+      site = await getSiteById(value.site);
+    }
+    await addMember(
+      {
+        org: value.org?.toString() || "",
+        orgName: org?.name || "",
+        user: userId.toString(),
+        name: value.name,
+        role: "",
+        type: "resident",
+        siteId: value.site?.toString() || "",
+        siteName: site?.name || ""
+      },
+      session
+    );
+    if (value.acceptedTerms) {
+      await _acceptTermsByUserId(
+        userId.toString(),
+        value.acceptedTerms,
+        session
+      );
+    }
+    return userId.toString();
+  }
   async function add(value) {
     const session = import_node_server_utils134.useAtlas.getClient()?.startSession();
     if (!session) {
@@ -45138,61 +45233,8 @@ function usePersonService() {
       const isValidType = ["resident" /* RESIDENT */, "tenant" /* TENANT */].includes(
         value?.type
       );
-      if (value.email && value.password && value.name && isValidType) {
-        const _user = await getUserByEmail(value.email);
-        if (_user) {
-          throw new import_node_server_utils134.BadRequestError(`User already exists: ${value.email}.`);
-        }
-        const hashedPassword = await (0, import_node_server_utils134.hashPassword)(value.password);
-        const user = {
-          email: value.email,
-          password: hashedPassword,
-          name: value.name,
-          status: value.platform == "mobile" ? "pending" : "active",
-          defaultOrg: value.org?.toString() || "",
-          block: value.block,
-          level: value.level,
-          type: value.type,
-          unitName: value.unitName,
-          contact: value.contact,
-          site: value.site?.toString() || "",
-          unitId: value.unit?.toString() || ""
-        };
-        const userId = await addUser(user, session);
-        value.user = userId.toString();
-        let org = null;
-        if (userId) {
-          if (value?.org) {
-            org = await getOrgById(value.org);
-            if (!org) {
-              value.org = "";
-            }
-          }
-          let site;
-          if (value.site) {
-            site = await getSiteById(value.site);
-          }
-          await addMember(
-            {
-              org: value.org?.toString() || "",
-              orgName: org?.name || "",
-              user: userId.toString(),
-              name: value.name,
-              role: "",
-              type: "resident",
-              siteId: value.site?.toString() || "",
-              siteName: site?.name || ""
-            },
-            session
-          );
-          if (value.acceptedTerms) {
-            await _acceptTermsByUserId(
-              userId.toString(),
-              value.acceptedTerms,
-              session
-            );
-          }
-        }
+      if (isValidType) {
+        value.user = await ensureResidentAccount(value, session);
       }
       if (value.isOwner && value.unit) {
         const unit = await _getUnitById(value.unit.toString());
@@ -45263,6 +45305,18 @@ function usePersonService() {
       const isBlockChanged = "block" in value && toKey(value.block) !== toKey(person.block);
       const isLevelChanged = "level" in value && toKey(value.level) !== toKey(person.level);
       const isUnitChanged = "unit" in value && toKey(value.unit) !== toKey(person.unit);
+      const personType = value.type ?? person.type;
+      const carriesLogin = [
+        "resident" /* RESIDENT */,
+        "tenant" /* TENANT */
+      ].includes(personType);
+      if (carriesLogin && !person.user && value.password) {
+        value.user = await ensureResidentAccount(
+          { ...person, ...value, type: personType },
+          session
+        );
+      }
+      delete value.password;
       await _updateById(_id, value, session);
       if (isOrgChanged && person.user) {
         await _updateUserOrgById(
@@ -45509,7 +45563,7 @@ function usePersonService() {
     let set = {};
     const cleanInput = (str) => str.replace(/\s+/g, "");
     const cleanPhone = (str) => str.replace(/\D/g, "");
-    const escapeRegex = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const escapeRegex2 = (str) => str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     const nric = value.nric ? cleanInput(value.nric) : "";
     const name = value.name?.trim();
     const contact = value.contact?.trim();
@@ -45517,8 +45571,8 @@ function usePersonService() {
     const email = value.email?.trim();
     const type = value.type?.trim();
     const company = value.company?.trim();
-    const nricQuery = nric ? { nric: { $regex: `^${escapeRegex(nric)}$`, $options: "i" } } : null;
-    const nameQuery = name ? { name: { $regex: `^${escapeRegex(name)}$`, $options: "i" } } : null;
+    const nricQuery = nric ? { nric: { $regex: `^${escapeRegex2(nric)}$`, $options: "i" } } : null;
+    const nameQuery = name ? { name: { $regex: `^${escapeRegex2(name)}$`, $options: "i" } } : null;
     let nricCondition = null;
     if (nric) {
       if (nric.length < 9) {
@@ -45531,8 +45585,8 @@ function usePersonService() {
     }
     const orConditions = [
       ...nricCondition ? [nricCondition] : [],
-      ...contact ? [{ contacts: { $regex: `^\\+?${cleanPhone(escapeRegex(contact))}$`, $options: "i" } }] : [],
-      ...plateNumber ? [{ plateNumbers: { $regex: `^${escapeRegex(plateNumber)}$`, $options: "i" } }] : []
+      ...contact ? [{ contacts: { $regex: `^\\+?${cleanPhone(escapeRegex2(contact))}$`, $options: "i" } }] : [],
+      ...plateNumber ? [{ plateNumbers: { $regex: `^${escapeRegex2(plateNumber)}$`, $options: "i" } }] : []
     ];
     const existingPerson2 = await findFirstTen(
       {
@@ -47441,7 +47495,7 @@ function useHidAmicoRepo() {
       passwordSet: Boolean(password)
     };
   }
-  function escapeRegex(value) {
+  function escapeRegex2(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   }
   function buildIdentityKeyQuery(value) {
@@ -47650,7 +47704,7 @@ function useHidAmicoRepo() {
       { serviceProvider: { $in: subjectIds } },
       { user: { $in: subjectIds } }
     ] : null;
-    const search = value.search ? escapeRegex(value.search) : "";
+    const search = value.search ? escapeRegex2(value.search) : "";
     const searchOr = search ? [
       { hidUserId: { $regex: search, $options: "i" } },
       { registration: { $regex: search, $options: "i" } },
@@ -47914,7 +47968,7 @@ function useHidAmicoRepo() {
     const text2 = search.trim();
     if (!text2)
       return {};
-    const pattern = { $regex: escapeRegex(text2), $options: "i" };
+    const pattern = { $regex: escapeRegex2(text2), $options: "i" };
     return {
       $or: [
         { name: pattern },
@@ -55965,6 +56019,7 @@ function UseAccessManagementRepo() {
       const type = params.type;
       const search = params.search;
       const typeFilter = type.toLowerCase() === "all" ? [] : [{ $eq: ["$type", type] }];
+      const userIdFilter = params.userId ? [{ $eq: ["$userId", new import_mongodb90.ObjectId(params.userId)] }] : [];
       const searchFilter = search ? [
         {
           $or: [
@@ -56038,7 +56093,8 @@ function UseAccessManagementRepo() {
                         { $eq: ["$site", site] },
                         { $eq: ["$isActivated", true] },
                         { $eq: ["$userType", userType] },
-                        ...typeFilter
+                        ...typeFilter,
+                        ...userIdFilter
                       ]
                     },
                     ...searchFilter[0]
@@ -62786,7 +62842,7 @@ function usePatrolEmailRepo() {
       throw new import_node_server_utils163.BadRequestError(`Invalid ${label} format.`);
     }
   }
-  function escapeRegex(value) {
+  function escapeRegex2(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
   }
   async function createIndexes() {
@@ -62923,8 +62979,8 @@ function usePatrolEmailRepo() {
       ...status ? { status } : { status: { $ne: "deleted" } },
       ...search && {
         $or: [
-          { subject: { $regex: escapeRegex(search), $options: "i" } },
-          { recipients: { $regex: escapeRegex(search), $options: "i" } }
+          { subject: { $regex: escapeRegex2(search), $options: "i" } },
+          { recipients: { $regex: escapeRegex2(search), $options: "i" } }
         ]
       }
     };
@@ -71097,21 +71153,24 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search = ""
+        search = "",
+        userId = ""
       } = req.query;
       const schema2 = import_joi101.default.object({
         site: import_joi101.default.string().hex().required(),
         unitId: import_joi101.default.string().hex().required(),
         userType: import_joi101.default.string().required(),
         type: import_joi101.default.string().valid("all", ...Object.values(EAccessCardTypes)).required(),
-        search: import_joi101.default.string().optional().allow("", null)
+        search: import_joi101.default.string().optional().allow("", null),
+        userId: import_joi101.default.string().hex().optional().allow("", null)
       });
       const { error } = schema2.validate({
         site,
         unitId,
         userType,
         type,
-        search
+        search,
+        userId
       });
       if (error) {
         return res.status(400).json({ message: error.message });
@@ -71123,7 +71182,8 @@ function useAccessManagementController() {
         unitId,
         userType,
         type,
-        search
+        search,
+        userId
       });
       return res.status(200).json({ message: "Success", data: result });
     } catch (error) {