Skip to content

Commit 0ba29eb

Browse files
Merge pull request #1626 from OpenSignLabs/updates-13647292049
Merge pull request #356 from OpenSignLabs/correct_cond
2 parents f78451d + d0dd571 commit 0ba29eb

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

apps/OpenSignServer/cloud/parsefunction/getUserDetails.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ async function getUserDetails(request) {
1717
userQuery.exclude('TenantId.FileAdapters');
1818
userQuery.exclude('google_refresh_token');
1919
userQuery.exclude('TenantId.PfxFile');
20+
userQuery.exclude('DailyEmailReset');
21+
userQuery.exclude('DailyEmailCount');
2022
if (userId) {
2123
userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
2224
}

apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ export default async function getUserListByOrg(req) {
1313
extUser.equalTo('OrganizationId', orgPtr);
1414
extUser.include('TeamIds');
1515
extUser.descending('createdAt');
16+
extUser.exclude('DailyEmailReset');
17+
extUser.exclude('DailyEmailCount');
1618
const userRes = await extUser.find({ useMasterKey: true });
1719
if (userRes.length > 0) {
1820
const _userRes = JSON.parse(JSON.stringify(userRes));

apps/OpenSignServer/cloud/parsefunction/sendMailv3.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,7 @@ async function sendMailProvider(req, plan, monthchange) {
230230
}
231231

232232
async function sendmailv3(req) {
233-
const nonCustomMail = await sendMailProvider(req);
234-
return nonCustomMail;
233+
return { status: 'error' };
235234
}
236235

237236
export default sendmailv3;

apps/OpenSignServer/package-lock.json

Lines changed: 12 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/OpenSignServer/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"generate-api-key": "^1.0.2",
3737
"googleapis": "^144.0.0",
3838
"mailgun.js": "^11.1.0",
39-
"mongodb": "^6.14.0",
39+
"mongodb": "^6.13.0",
4040
"multer": "^1.4.5-lts.1",
4141
"multer-s3": "^3.0.1",
4242
"node-forge": "^1.3.1",
@@ -46,7 +46,7 @@
4646
"parse-server": "^7.4.0",
4747
"parse-server-api-mail-adapter": "^4.1.0",
4848
"pdf-lib": "^1.17.1",
49-
"posthog-node": "^4.8.1",
49+
"posthog-node": "^4.5.0",
5050
"ws": "^8.18.0"
5151
},
5252
"type": "module",

0 commit comments

Comments
 (0)