WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-08-17 21:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1626 from OpenSignLabs/updates-13647292049

Browse Source 
Merge pull request #356 from OpenSignLabs/correct_cond
This commit is contained in:
prafull-opensignlabs
2025-03-04 11:34:02 +05:30
committed by GitHub
parent f78451d3f9 d0dd571478
commit 0ba29eb799
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSignServer/cloud/parsefunction/getUserDetails.js
+2
View File
@@ -17,6 +17,8 @@ async function getUserDetails(request) {
userQuery.exclude('TenantId.FileAdapters');
userQuery.exclude('google_refresh_token');
userQuery.exclude('TenantId.PfxFile');
userQuery.exclude('DailyEmailReset');
userQuery.exclude('DailyEmailCount');
if (userId) {
userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
}
apps/OpenSignServer/cloud/parsefunction/getUserListByOrg.js
+2
View File
@@ -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));
apps/OpenSignServer/cloud/parsefunction/sendMailv3.js
+1 -2
View File
@@ -230,8 +230,7 @@ async function sendMailProvider(req, plan, monthchange) {
}
async function sendmailv3(req) {
const nonCustomMail = await sendMailProvider(req);
return nonCustomMail;
return { status: 'error' };
}
export default sendmailv3;
apps/OpenSignServer/package-lock.json
Generated
+12 -13
View File
@@ -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"
apps/OpenSignServer/package.json
+2 -2
View File
@@ -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",