Skip to content

🔥 The free & Open Source DocuSign alternative

refactor: change parameter for custom mail adapter

prafull-opensignlabs1d39db6d7daa
diff --git a/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js b/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js
index 671b91d9d..286a18c6e 100644
--- a/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js
+++ b/apps/OpenSignServer/cloud/parsefunction/getUserDetails.js
@@ -5,6 +5,7 @@ async function getUserDetails(request) {
userQuery.equalTo('Email', request.params.email);
userQuery.include('TenantId');
userQuery.include('UserId');
+ userQuery.exclude('google_refresh_token')
if (userId) {
userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
}
diff --git a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.min.js b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.min.js
index 13977ad76..6b249f797 100644
--- a/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.min.js
+++ b/apps/OpenSignServer/cloud/parsefunction/pdf/PDF.min.js
@@ -102,7 +102,7 @@ async function sendCompletedMail(e) {
subject: o,
pdfName: r,
html: n,
- isMailProvider: e.isMailProvider,
+ mailProvider: e.mailProvider,
};
await axios.post(serverUrl + '/functions/sendmailv3', g, {
headers: {
@@ -175,7 +175,7 @@ async function PDF(o) {
var n = o.params.docId,
e = o.params.userId,
l = o.params.isCustomCompletionMail || !1,
- d = o.params.isMailProvider || !1,
+ d = o.params.mailProvider || '',
c = await axios.get(
serverUrl + '/classes/contracts_Document/' + n + '?include=ExtUserPtr,Signers',
{
@@ -293,20 +293,20 @@ async function PDF(o) {
F,
C,
T,
- M,
- N = await uploadFile(S, _);
- if (N && N.imageUrl)
+ N,
+ M = await uploadFile(S, _);
+ if (M && M.imageUrl)
return (
(A = await updateDoc(
o.params.docId,
- N.imageUrl,
+ M.imageUrl,
r.data.results[0].objectId,
o.headers['x-real-ip'],
c.data,
i
)),
- sendDoctoWebhook(c, N.imageUrl, 'signed', r?.data.results?.[0]),
- saveFileUsage(s, N.imageUrl, p.data.objectId),
+ sendDoctoWebhook(c, M.imageUrl, 'signed', r?.data.results?.[0]),
+ saveFileUsage(s, M.imageUrl, p.data.objectId),
A &&
A.isCompleted &&
((x = { ...c.data, AuditTrail: A.AuditTrail }),
@@ -322,13 +322,13 @@ async function PDF(o) {
(F = Buffer.from(k)),
(C = await new SignPDF(F, f).signPDF()),
fs.writeFileSync('./exports/certificate.pdf', C),
- (M = {
+ (N = {
CertificateUrl: (T = await uploadFile(
'certificate.pdf',
'./exports/certificate.pdf'
)).imageUrl,
}),
- await axios.put(serverUrl + '/classes/contracts_Document/' + n, M, {
+ await axios.put(serverUrl + '/classes/contracts_Document/' + n, N, {
headers: {
'Content-Type': 'application/json',
'X-Parse-Application-Id': APPID,
@@ -338,17 +338,17 @@ async function PDF(o) {
c.data.IsSendMail && !1 === c.data.IsSendMail
? console.log("don't send mail")
: sendCompletedMail({
- url: N.imageUrl,
+ url: M.imageUrl,
isCustomMail: l,
doc: c.data,
- isMailProvider: d,
+ mailProvider: d,
}),
saveFileUsage(F.length, T.imageUrl, p.data.objectId),
- sendDoctoWebhook(c, N.imageUrl, 'completed')),
+ sendDoctoWebhook(c, M.imageUrl, 'completed')),
fs.unlinkSync(_),
console.log('New Signed PDF created called: ' + _),
'success' === A.message
- ? { status: 'success', data: N.imageUrl }
+ ? { status: 'success', data: M.imageUrl }
: { status: 'error', message: 'Please provide required parameters!' }
);
}
diff --git a/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js b/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js
index 4cb5fc427..c09694a4d 100644
--- a/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js
+++ b/apps/OpenSignServer/cloud/parsefunction/sendMailv3.js
@@ -159,8 +159,8 @@ async function sendMailProvider(req) {
}
}
async function sendmailv3(req) {
- const isMailProvider = req.params.isMailProvider || false;
- if (isMailProvider) {
+ const mailProvider = req.params.mailProvider || 'default';
+ if (mailProvider) {
try {
const extUserId = req.params.extUserId || '';
const pdfName = req.params.pdfName || '';
@@ -176,7 +176,7 @@ async function sendmailv3(req) {
const extRes = await extUserQuery.get(extUserId, { useMasterKey: true });
if (extRes) {
const _extRes = JSON.parse(JSON.stringify(extRes));
- if (_extRes.google_refresh_token) {
+ if (_extRes.google_refresh_token && mailProvider === 'google') {
const res = await sendMailGmailProvider(_extRes, template);
if (res.code === 200) {
await updateMailCount(req.params.extUserId);