Fix merge conflicts

2026-09-22 13:39:35 +00:00 · 2023-06-29 17:53:33 +07:00
parent c4da5a6ead d1af399489
commit 114d488345
38 changed files with 5718 additions and 4180 deletions
--- a/backend/src/controllers/v2/serviceTokenDataController.ts
+++ b/backend/src/controllers/v2/serviceTokenDataController.ts
@@ -53,7 +53,7 @@ export const getServiceTokenData = async (req: Request, res: Response) => {
    req.authData.authPayload._id
  )
    .select("+encryptedKey +iv +tag")
-    .populate("user");
+    .populate("user").lean();

  return res.status(200).json(serviceTokenData);
 };