From a611877b4c2b76d11d73b59404a10b2adc6d3aa5 Mon Sep 17 00:00:00 2001
From: prafull-opensignlabs <prafull-opensignlabs@users.noreply.github.com>
Date: Mon, 3 Mar 2025 18:50:50 +0000
Subject: [PATCH] Merge pull request #353 from OpenSignLabs/mismatch_attach

fix: exclude DailyEmailReset and DailyEmailCount from query
---
 .../cloud/parsefunction/getUserListByOrg.js   |  2 ++
 apps/OpenSignServer/package-lock.json         | 25 +++++++++----------
 apps/OpenSignServer/package.json              |  4 +--
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js b/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js
index ffb173a6c..74b8730bb 100644
--- a/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js
+++ b/apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js
@@ -13,6 +13,8 @@ export default async function getUserListByOrg(req) {
       extUser.equalTo('OrganizationId', orgPtr);
       extUser.include('TeamIds');
       extUser.descending('createdAt');
+      extUser.exclude('DailyEmailReset');
+      extUser.exclude('DailyEmailCount');
       const userRes = await extUser.find({ useMasterKey: true });
       if (userRes.length > 0) {
         const _userRes = JSON.parse(JSON.stringify(userRes));
diff --git a/apps/OpenSignServer/package-lock.json b/apps/OpenSignServer/package-lock.json
index f40291ad9..8c0672e8c 100644
--- a/apps/OpenSignServer/package-lock.json
+++ b/apps/OpenSignServer/package-lock.json
@@ -27,7 +27,7 @@
         "generate-api-key": "^1.0.2",
         "googleapis": "^144.0.0",
         "mailgun.js": "^11.1.0",
-        "mongodb": "^6.14.0",
+        "mongodb": "^6.13.0",
         "multer": "^1.4.5-lts.1",
         "multer-s3": "^3.0.1",
         "node-forge": "^1.3.1",
@@ -37,7 +37,7 @@
         "parse-server": "^7.4.0",
         "parse-server-api-mail-adapter": "^4.1.0",
         "pdf-lib": "^1.17.1",
-        "posthog-node": "^4.8.1",
+        "posthog-node": "^4.5.0",
         "ws": "^8.18.0"
       },
       "devDependencies": {
@@ -11739,10 +11739,9 @@
       }
     },
     "node_modules/bson": {
-      "version": "6.10.3",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.3.tgz",
-      "integrity": "sha512-MTxGsqgYTwfshYWTRdmZRC+M7FnG1b4y7RO7p2k3X24Wq0yv1m77Wsj0BzlPzd/IowgESfsruQCUToa7vbOpPQ==",
-      "license": "Apache-2.0",
+      "version": "6.10.1",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.1.tgz",
+      "integrity": "sha512-P92xmHDQjSKPLHqFxefqMxASNq/aWJMEZugpCjf+AF/pgcUpMMQCg7t7+ewko0/u8AapvF3luf/FoehddEK+sA==",
       "engines": {
         "node": ">=16.20.1"
       }
@@ -15434,13 +15433,13 @@
       }
     },
     "node_modules/mongodb": {
-      "version": "6.14.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.14.0.tgz",
-      "integrity": "sha512-AlM6alTx98vcnk/jMMmoYuBrm4qpe1/VrbwvL2SXEHjdtJ1ZbVZmrpyjUx9mqS94e9HcemzpLn+CxzhmT7b0uw==",
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.13.0.tgz",
+      "integrity": "sha512-KeESYR5TEaFxOuwRqkOm3XOsMqCSkdeDMjaW5u2nuKfX7rqaofp7JQGoi7sVqQcNJTKuveNbzZtWMstb8ABP6Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mongodb-js/saslprep": "^1.1.9",
-        "bson": "^6.10.3",
+        "bson": "^6.10.1",
         "mongodb-connection-string-url": "^3.0.0"
       },
       "engines": {
@@ -16906,9 +16905,9 @@
       }
     },
     "node_modules/posthog-node": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.8.1.tgz",
-      "integrity": "sha512-ApMEC1+DbctP/88+VhaCl8SRKpIoReibMf7Mb3rxw3yMthr1rKaM4opbHdZJ0buLhwS5zX8B2ckqLjpwpSjRPg==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.5.0.tgz",
+      "integrity": "sha512-h1WTHYvgOZ7kBGH0XfKVOVsSyFgCEbgzC2RIw7fetsW6RrSvxPYcaycKUDfqa5EGbvU0SYLbqAeeqNZjPDaznA==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.7.4"
diff --git a/apps/OpenSignServer/package.json b/apps/OpenSignServer/package.json
index 2b59daa35..8c3b51102 100644
--- a/apps/OpenSignServer/package.json
+++ b/apps/OpenSignServer/package.json
@@ -36,7 +36,7 @@
     "generate-api-key": "^1.0.2",
     "googleapis": "^144.0.0",
     "mailgun.js": "^11.1.0",
-    "mongodb": "^6.14.0",
+    "mongodb": "^6.13.0",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",
     "node-forge": "^1.3.1",
@@ -46,7 +46,7 @@
     "parse-server": "^7.4.0",
     "parse-server-api-mail-adapter": "^4.1.0",
     "pdf-lib": "^1.17.1",
-    "posthog-node": "^4.8.1",
+    "posthog-node": "^4.5.0",
     "ws": "^8.18.0"
   },
   "type": "module",