@7365admin1/core 2.34.0 → 2.35.0

package/dist/index.mjs

@@ -148,7 +148,8 @@ import {
   NotFoundError as NotFoundError4,
   AppError,
   useCache as useCache5,
-  makeCacheKey as makeCacheKey5
+  makeCacheKey as makeCacheKey5,
+  toObjectId
 } from "@7365admin1/node-server-utils";
 
 // src/repositories/feedback.repo.ts
@@ -2210,20 +2211,9 @@ function useUserRepo() {
   }
   async function getUserByEmail(email) {
     try {
-      const cacheKey = makeCacheKey5(namespace_collection, { email });
-      const cachedData = await getCache(cacheKey);
-      if (cachedData) {
-        logger7.info(`Cache hit for key: ${cacheKey}`);
-        return cachedData;
-      }
       const data = await collection.findOne({
         email: { $regex: `^${email}$`, $options: "i" }
       });
-      setCache(cacheKey, data, 15 * 60).then(() => {
-        logger7.info(`Cache set for key: ${cacheKey}`);
-      }).catch((err) => {
-        logger7.error(`Failed to set cache for key: ${cacheKey}`, err);
-      });
       return data;
     } catch (error) {
       throw new InternalServerError5("Failed to get user by email.");
@@ -2530,6 +2520,39 @@ function useUserRepo() {
       throw new InternalServerError5("Failed to update user password.");
     }
   }
+  async function resetPassword({
+    _id,
+    password,
+    sid
+  }, session) {
+    try {
+      _id = new ObjectId9(_id);
+    } catch (error) {
+      throw new BadRequestError9("Invalid user ID format.");
+    }
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { password, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      const cacheKey = makeCacheKey5(namespace_collection, { _id });
+      delCache(cacheKey).then(() => {
+        logger7.info(`Cache deleted for key: ${cacheKey}`);
+      }).catch((err) => {
+        logger7.error(`Failed to delete cache for key: ${cacheKey}`, err);
+      });
+      const authCacheKey = `sid:${sid}`;
+      delCache(authCacheKey).then(() => {
+        logger7.info(`Cache deleted for key: ${authCacheKey}`);
+      }).catch((err) => {
+        logger7.error(`Failed to delete cache for key: ${authCacheKey}`, err);
+      });
+      return result;
+    } catch (error) {
+      throw new InternalServerError5("Failed to update user password.");
+    }
+  }
   async function updateBirthday({
     _id,
     month,
@@ -2622,6 +2645,19 @@ function useUserRepo() {
       throw new InternalServerError5(`Failed to update user ${field}.`);
     }
   }
+  async function updateUserSIDById(id, sid, session) {
+    const _id = toObjectId(id);
+    try {
+      const result = await collection.updateOne(
+        { _id },
+        { $set: { sid, updatedAt: (/* @__PURE__ */ new Date()).toISOString() } },
+        { session }
+      );
+      return result;
+    } catch (error) {
+      throw new InternalServerError5("Failed to update user.");
+    }
+  }
   return {
     createIndex,
     createTextIndex,
@@ -2637,7 +2673,9 @@ function useUserRepo() {
     updateBirthday,
     updateUserFieldById,
     updateDefaultOrgByEmail,
-    getUserByEmailStatus
+    getUserByEmailStatus,
+    updateUserSIDById,
+    resetPassword
   };
 }
 
@@ -3482,7 +3520,11 @@ function useMemberRepo() {
 
 // src/services/auth.service.ts
 function useAuthService() {
-  const { getUserByEmail, getUserById: _getUserById } = useUserRepo();
+  const {
+    getUserByEmail,
+    getUserById: _getUserById,
+    updateUserSIDById: _updateUserSIDById
+  } = useUserRepo();
   const { getByToken, deleteByToken } = useSessionRepo();
   const expiresIn = "15m";
   const { setCache, delCache } = useCache7("sessions");
@@ -3520,7 +3562,9 @@ function useAuthService() {
       }
       const sid = uuidv4();
       const cacheKey = `sid:${sid}`;
-      setCache(cacheKey, user, 14400).then(() => {
+      await _updateUserSIDById(user._id, sid);
+      const updatedUser = await _getUserById(user._id);
+      setCache(cacheKey, updatedUser, 14400).then(() => {
         console.log("Session ID cached successfully");
       }).catch((error) => {
         console.error("Error caching session ID:", error);
@@ -4351,7 +4395,7 @@ import {
   logger as logger12,
   makeCacheKey as makeCacheKey9,
   AppError as AppError4,
-  toObjectId as toObjectId2
+  toObjectId as toObjectId3
 } from "@7365admin1/node-server-utils";
 import Joi10 from "joi";
 function useSiteRepo() {
@@ -4737,7 +4781,7 @@ function useSiteRepo() {
     }
   }
   async function updateSiteById(id, payload, session) {
-    const _id = toObjectId2(id);
+    const _id = toObjectId3(id);
     payload.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
       const res = await collection.updateOne(
@@ -5751,7 +5795,8 @@ function useUserService() {
     getUserById,
     getUserByEmail,
     updatePassword,
-    updateUserFieldById: _updateUserFieldById
+    updateUserFieldById: _updateUserFieldById,
+    resetPassword: _resetPassword
   } = useUserRepo();
   const { getRoleByName, addRole } = useRoleRepo();
   const { add: addMember } = useMemberRepo();
@@ -5927,8 +5972,12 @@ function useUserService() {
         throw new InternalServerError14("Invalid user ID.");
       }
       await updateStatusById(id, "complete", session);
-      await updatePassword(
-        { _id: user._id.toString(), password: hashedPassword },
+      await _resetPassword(
+        {
+          _id: user._id.toString(),
+          password: hashedPassword,
+          sid: user.sid
+        },
         session
       );
       await session?.commitTransaction();
@@ -8652,7 +8701,7 @@ import {
 import { z } from "zod";
 import { ObjectId as ObjectId26 } from "mongodb";
 import { BadRequestError as BadRequestError39 } from "@7365admin1/node-server-utils";
-function toObjectId3(value) {
+function toObjectId4(value) {
   if (typeof value === "string") {
     if (!/^[a-fA-F0-9]{24}$/.test(value)) {
       throw new BadRequestError39(`Invalid ObjectId format: ${value}`);
@@ -8704,7 +8753,7 @@ var TInvoice = z.object({
       message: "Invalid ObjectId: Must be a 24-character hex string."
     }),
     z.instanceof(ObjectId26, { message: "Invalid ObjectId instance." })
-  ]).optional().transform((val) => val ? toObjectId3(val) : void 0),
+  ]).optional().transform((val) => val ? toObjectId4(val) : void 0),
   invoiceNumber: z.string({ required_error: "Invoice number is required." }),
   type: TInvoiceType.default("other"),
   amount: z.number().min(0, { message: "Invoice amount must be at least 0." }),
@@ -12457,7 +12506,7 @@ import {
   logger as logger46,
   makeCacheKey as makeCacheKey21,
   paginate as paginate16,
-  toObjectId as toObjectId5,
+  toObjectId as toObjectId6,
   useAtlas as useAtlas29,
   useCache as useCache22
 } from "@7365admin1/node-server-utils";
@@ -12685,7 +12734,7 @@ function useSiteCameraRepo() {
     });
   }
   async function getBySite(site, options = {}) {
-    const _site = toObjectId5(site);
+    const _site = toObjectId6(site);
     const cacheKeyOptions = {
       site,
       tag: "get-by-site",
@@ -12919,7 +12968,7 @@ import {
   BadRequestError as BadRequestError66,
   InternalServerError as InternalServerError23,
   paginate as paginate17,
-  toObjectId as toObjectId6,
+  toObjectId as toObjectId7,
   useAtlas as useAtlas30
 } from "@7365admin1/node-server-utils";
 
@@ -13561,7 +13610,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getVisitorTransactionById(id) {
-    const _id = toObjectId6(id);
+    const _id = toObjectId7(id);
     try {
       const basePipeline = [{ $match: { _id } }];
       const [result] = await collection.aggregate([
@@ -13603,7 +13652,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getOpenByPlateNumber(plateNumber, site) {
-    const _site = typeof site === "string" ? toObjectId6(site) : site;
+    const _site = typeof site === "string" ? toObjectId7(site) : site;
     const query = {
       plateNumber,
       site: _site,
@@ -13687,7 +13736,7 @@ function useVisitorTransactionRepo() {
     }
   }
   async function getExpiredCheckedOutTransactionsBySite(siteId) {
-    const site = toObjectId6(siteId);
+    const site = toObjectId7(siteId);
     try {
       const now = (/* @__PURE__ */ new Date()).toISOString();
       const expiredTransactions = await collection.find({
@@ -13936,7 +13985,7 @@ import {
   logger as logger49,
   NotFoundError as NotFoundError17,
   paginate as paginate18,
-  toObjectId as toObjectId7,
+  toObjectId as toObjectId8,
   useAtlas as useAtlas31
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId42 } from "mongodb";
@@ -14535,7 +14584,7 @@ function useVehicleRepo() {
     page = page > 0 ? page - 1 : 0;
     const skip = page * limit;
     try {
-      const unit = toObjectId7(unitId);
+      const unit = toObjectId8(unitId);
       const query = {
         unit
       };
@@ -14604,7 +14653,7 @@ import {
   useAtlas as useAtlas32,
   useCache as useCache25,
   AppError as AppError10,
-  toObjectId as toObjectId8
+  toObjectId as toObjectId9
 } from "@7365admin1/node-server-utils";
 import { ObjectId as ObjectId43 } from "mongodb";
 var site_people_namespace_collection = "site.people";
@@ -15085,7 +15134,7 @@ function usePersonRepo() {
   async function pushVehicleById(id, plate, session) {
     const { plateNumber, recNo } = plate;
     const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const _id = toObjectId8(id);
+    const _id = toObjectId9(id);
     try {
       const updateExisting = await collection.updateOne(
         {
@@ -15143,7 +15192,7 @@ function usePersonRepo() {
     }
   }
   async function getByUserId(userId) {
-    const user = toObjectId8(userId);
+    const user = toObjectId9(userId);
     const cacheKey = makeCacheKey24(site_people_namespace_collection, {
       user: userId
     });
@@ -17415,7 +17464,7 @@ import {
   logger as logger60,
   makeCacheKey as makeCacheKey26,
   paginate as paginate21,
-  toObjectId as toObjectId10,
+  toObjectId as toObjectId11,
   useAtlas as useAtlas37,
   useCache as useCache28
 } from "@7365admin1/node-server-utils";
@@ -17580,8 +17629,8 @@ function useBuildingUnitRepo() {
     const query = {
       status,
       ...search && { $text: { $search: search } },
-      ...site && { site: toObjectId10(site) },
-      ...building && { building: toObjectId10(building) }
+      ...site && { site: toObjectId11(site) },
+      ...building && { building: toObjectId11(building) }
     };
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const cacheParams = {
@@ -27215,7 +27264,7 @@ import {
   makeCacheKey as makeCacheKey37,
   NotFoundError as NotFoundError27,
   paginate as paginate31,
-  toObjectId as toObjectId11,
+  toObjectId as toObjectId12,
   useAtlas as useAtlas61,
   useCache as useCache39
 } from "@7365admin1/node-server-utils";
@@ -27271,7 +27320,7 @@ function useSiteFacilityBookingRepo() {
     page = page > 0 ? page - 1 : 0;
     sort = Object.keys(sort).length > 0 ? sort : { _id: -1 };
     const skip = page * limit;
-    const siteId = toObjectId11(site);
+    const siteId = toObjectId12(site);
     const query = {
       site: siteId,
       status,
@@ -27317,7 +27366,7 @@ function useSiteFacilityBookingRepo() {
     }
   }
   async function getSiteFacilityBookingById(id, session) {
-    const _id = toObjectId11(id);
+    const _id = toObjectId12(id);
     const cacheKey = makeCacheKey37(facility_bookings_namespace_collection, {
       id
     });
@@ -27343,17 +27392,17 @@ function useSiteFacilityBookingRepo() {
   }
   async function updateSiteFacilityBookingById(id, value, session) {
     value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-    const _id = toObjectId11(id);
+    const _id = toObjectId12(id);
     if (value.site)
-      value.site = typeof value.site === "string" ? toObjectId11(value.site) : value.site;
+      value.site = typeof value.site === "string" ? toObjectId12(value.site) : value.site;
     if (value.user)
-      value.user = typeof value.user === "string" ? toObjectId11(value.user) : value.user;
+      value.user = typeof value.user === "string" ? toObjectId12(value.user) : value.user;
     if (value.date)
       value.date = value.date ? new Date(value.date).toISOString() : value.date;
     if (value.approvedBy)
-      value.approvedBy = typeof value.approvedBy === "string" ? toObjectId11(value.approvedBy) : value.approvedBy;
+      value.approvedBy = typeof value.approvedBy === "string" ? toObjectId12(value.approvedBy) : value.approvedBy;
     if (value.createdBy)
-      value.createdBy = typeof value.createdBy === "string" ? toObjectId11(value.createdBy) : value.createdBy;
+      value.createdBy = typeof value.createdBy === "string" ? toObjectId12(value.createdBy) : value.createdBy;
     try {
       const res = await collection.updateOne(
         { _id },
@@ -35636,7 +35685,7 @@ import {
   makeCacheKey as makeCacheKey46,
   NotFoundError as NotFoundError37,
   paginate as paginate40,
-  toObjectId as toObjectId12,
+  toObjectId as toObjectId13,
   useAtlas as useAtlas78,
   useCache as useCache48
 } from "@7365admin1/node-server-utils";
@@ -35711,7 +35760,7 @@ function useOccurrenceBookRepo() {
     status = ""
   }, session) {
     page = page > 0 && !date ? page - 1 : 0;
-    const _site = toObjectId12(site);
+    const _site = toObjectId13(site);
     const query = {
       site: _site,
       ...status && { status },
@@ -42173,7 +42222,7 @@ import {
   InternalServerError as InternalServerError59,
   logger as logger155,
   makeCacheKey as makeCacheKey57,
-  toObjectId as toObjectId13,
+  toObjectId as toObjectId14,
   useAtlas as useAtlas98,
   useCache as useCache59
 } from "@7365admin1/node-server-utils";
@@ -42265,7 +42314,7 @@ function useNewDashboardRepo() {
     securityDashboardCollection
   );
   async function getMetric(collectionString, siteId, period) {
-    const site = toObjectId13(siteId);
+    const site = toObjectId14(siteId);
     const range = getPeriodRangeWithPrevious(period);
     const collection = db.collection(collectionString);
     const current = await collection.countDocuments({
@@ -44243,7 +44292,7 @@ import {
   InternalServerError as InternalServerError63,
   logger as logger163,
   makeCacheKey as makeCacheKey61,
-  toObjectId as toObjectId14,
+  toObjectId as toObjectId15,
   useAtlas as useAtlas103,
   useCache as useCache63
 } from "@7365admin1/node-server-utils";
@@ -44322,7 +44371,7 @@ function useOvernightParkingRepo() {
     }
   }
   async function getSiteOvernightParking(site) {
-    const siteId = toObjectId14(site);
+    const siteId = toObjectId15(site);
     const cacheKey = makeCacheKey61(overnight_parking_namespace_collection, {
       site
     });
@@ -44418,7 +44467,7 @@ function useOvernightParkingController() {
 
 // src/models/overnight-parking-request.model.ts
 import Joi118 from "joi";
-import { toObjectId as toObjectId15 } from "@7365admin1/node-server-utils";
+import { toObjectId as toObjectId16 } from "@7365admin1/node-server-utils";
 var OvernightParkingRequestStatus = /* @__PURE__ */ ((OvernightParkingRequestStatus2) => {
   OvernightParkingRequestStatus2["PENDING"] = "pending";
   OvernightParkingRequestStatus2["APPROVED"] = "approved";
@@ -44455,7 +44504,7 @@ function MOvernightParkingRequest(value) {
     throw new Error(error.details[0].message);
   }
   if (value.site && typeof value.site === "string")
-    value.site = toObjectId15(value.site);
+    value.site = toObjectId16(value.site);
   const data = {
     ...value,
     createdAt: value.createdAt ? new Date(value.createdAt).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
@@ -44472,7 +44521,7 @@ import {
   logger as logger165,
   makeCacheKey as makeCacheKey62,
   paginate as paginate54,
-  toObjectId as toObjectId16,
+  toObjectId as toObjectId17,
   useAtlas as useAtlas104,
   useCache as useCache64
 } from "@7365admin1/node-server-utils";
@@ -44540,7 +44589,7 @@ function useOvernightParkingRequestRepo() {
   }) {
     page = page ? page - 1 : 0;
     const skip = page * limit;
-    const siteId = toObjectId16(site);
+    const siteId = toObjectId17(site);
     const query = {
       site: siteId,
       ...status && { status }
@@ -44591,7 +44640,7 @@ function useOvernightParkingRequestRepo() {
         logger165.info(`Cache hit for key: ${cacheKey}`);
         return cachedData;
       }
-      const _id = toObjectId16(id);
+      const _id = toObjectId17(id);
       const data = await collection.findOne({ _id });
       if (!data)
         throw new BadRequestError188("Overnight parking request not found.");
@@ -44607,7 +44656,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function updateOvernightParkingRequestById(id, value, session) {
     try {
-      const _id = toObjectId16(id);
+      const _id = toObjectId17(id);
       value.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
       const data = await collection.updateOne(
         { _id },
@@ -44633,7 +44682,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function deleteOvernightParkingRequestById(id, session) {
     try {
-      const _id = toObjectId16(id);
+      const _id = toObjectId17(id);
       const value = {
         deletedAt: (/* @__PURE__ */ new Date()).toISOString(),
         status: "deleted" /* DELETED */
@@ -44662,7 +44711,7 @@ function useOvernightParkingRequestRepo() {
   }
   async function updateExpiredRequests(site, session) {
     try {
-      const _site = toObjectId16(site);
+      const _site = toObjectId17(site);
       const value = {
         status: "expired" /* EXPIRED */
       };
@@ -47260,7 +47309,7 @@ import {
   logger as logger175,
   makeCacheKey as makeCacheKey64,
   paginate as paginate57,
-  toObjectId as toObjectId17,
+  toObjectId as toObjectId18,
   useAtlas as useAtlas112,
   useCache as useCache66
 } from "@7365admin1/node-server-utils";
@@ -47367,7 +47416,7 @@ function useVerificationRepoV2() {
   }
   async function getVerificationById(id) {
     try {
-      const _id = toObjectId17(id);
+      const _id = toObjectId18(id);
       const cacheKey = makeCacheKey64(namespace_collection, { id });
       const cachedData = await getCache(cacheKey);
       if (cachedData) {
@@ -48073,7 +48122,7 @@ import {
   AppError as AppError27,
   useCache as useCache67,
   makeCacheKey as makeCacheKey65,
-  toObjectId as toObjectId18
+  toObjectId as toObjectId19
 } from "@7365admin1/node-server-utils";
 function useUserRepoV2() {
   const { updateFeedbackCreatedByName } = useFeedbackRepo();
@@ -48174,7 +48223,7 @@ function useUserRepoV2() {
     }
   }
   async function getUserById(id) {
-    const _id = toObjectId18(id);
+    const _id = toObjectId19(id);
     try {
       const cacheKey = makeCacheKey65(namespace_collection, { id });
       const cachedData = await getCache(cacheKey);
@@ -48379,7 +48428,7 @@ function useUserRepoV2() {
   }
   async function updatePasswordById({ _id, password }, session) {
     const cacheKey = makeCacheKey65(namespace_collection, { _id });
-    _id = toObjectId18(_id);
+    _id = toObjectId19(_id);
     try {
       const result = await collection.updateOne(
         { _id },
@@ -48585,9 +48634,25 @@ function useAuthServiceV2() {
       throw new InternalServerError71("Error deleting token");
     }
   }
+  async function verifyPassword(_id, password) {
+    try {
+      const user = await _getUserById(_id);
+      const isPasswordMatch = await comparePassword3(password, user.password);
+      if (!isPasswordMatch) {
+        throw new BadRequestError199("Invalid credentials");
+      }
+      return "Verification successful.";
+    } catch (error) {
+      if (error instanceof BadRequestError199) {
+        throw error;
+      }
+      throw new InternalServerError71("Error during password verification");
+    }
+  }
   return {
     login,
-    logout
+    logout,
+    verifyPassword
   };
 }
 
@@ -48803,7 +48868,11 @@ function useUserServiceV2() {
 // src/controllers/auth-v2.controller.ts
 function useAuthControllerV2() {
   const { signUp: _signUp } = useVerificationServiceV2();
-  const { login: _login, logout: _logout } = useAuthServiceV2();
+  const {
+    login: _login,
+    logout: _logout,
+    verifyPassword: _verifyPassword
+  } = useAuthServiceV2();
   const { resetPassword: _resetPassword } = useUserServiceV2();
   async function signUp(req, res, next) {
     try {
@@ -48917,11 +48986,38 @@ function useAuthControllerV2() {
       return;
     }
   }
+  async function verifyPassword(req, res, next) {
+    const schema2 = Joi127.object({
+      _id: Joi127.string().hex().required(),
+      password: Joi127.string().required().min(8)
+    });
+    const { error, value } = schema2.validate(
+      { _id: req.params.id, ...req.body },
+      { abortEarly: false }
+    );
+    if (error) {
+      const messages = error.details.map((d) => d.message);
+      logger180.log({ level: "error", message: messages.join(", ") });
+      next(new BadRequestError201(messages.join(", ")));
+      return;
+    }
+    const { _id, password } = value;
+    try {
+      const message = await _verifyPassword(_id, password);
+      res.json({ message });
+      return;
+    } catch (error2) {
+      logger180.log({ level: "error", message: error2.message });
+      next(error2);
+      return;
+    }
+  }
   return {
     signUp,
     login,
     logout,
-    resetPassword
+    resetPassword,
+    verifyPassword
   };
 }