diff --git a/apps/OpenSign/src/primitives/GetReportDisplay.js b/apps/OpenSign/src/primitives/GetReportDisplay.js index 1da433681..e3f6c8d97 100644 --- a/apps/OpenSign/src/primitives/GetReportDisplay.js +++ b/apps/OpenSign/src/primitives/GetReportDisplay.js @@ -777,8 +777,9 @@ const ReportTable = (props) => { "X-Parse-Application-Id": localStorage.getItem("parseAppId"), sessionToken: localStorage.getItem("accesstoken") }; + console.log("doc?.ExtUserPtr ", doc?.ExtUserPtr); let params = { - mailProvider: doc?.ExtUserPtr?.active_mail_adapter, + mailProvider: doc?.ExtUserPtr?.active_mail_adapter || "", extUserId: doc?.ExtUserPtr?.objectId, recipient: userDetails?.Email, subject: mail.subject, diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js index f23f1b330..ec344b130 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js @@ -315,6 +315,7 @@ export default async function createDocumentWithTemplate(request, response) { from: sender, html: html, extUserId: template.ExtUserPtr.objectId, + mailProvider: template?.ExtUserPtr?.active_mail_adapter || '', }; sendMail = await axios.post(url, params, { headers: headers }); } catch (error) { diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js index 45e6eab4e..29404049c 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js @@ -371,6 +371,7 @@ export default async function createDocumentwithCoordinate(request, response) { from: sender, html: html, extUserId: extUser.id, + mailProvider: parseExtUser?.active_mail_adapter || '', }; await axios.post(url, params, { headers: headers }); diff --git a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js index c525bb0eb..794fc8943 100644 --- a/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js +++ b/apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js @@ -41,6 +41,7 @@ export default async function resendMail(request, response) { if (resDoc) { const _resDoc = resDoc.toJSON(); const contact = _resDoc.Signers.find(x => x.Email === userMail); + const activeMailAdapter = _resDoc?.ExtUserPtr?.active_mail_adapter || ''; if (contact) { try { const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png'; @@ -131,6 +132,7 @@ export default async function resendMail(request, response) { from: sender, html: html, extUserId: _resDoc.ExtUserPtr.objectId, + mailProvider: activeMailAdapter, }; const res = await axios.post(url, params, { headers: headers }); diff --git a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js index b3afa2a02..3df13cc65 100644 --- a/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js +++ b/apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js @@ -74,6 +74,7 @@ async function sendMail(document, sessionToken) { const orgName = document.ExtUserPtr.Company ? document.ExtUserPtr.Company : ''; const themeBGcolor = '#47a3ad'; let params = { + mailProvider: document?.ExtUserPtr?.active_mail_adapter || '', extUserId: document.ExtUserPtr.objectId, recipient: objectId ? existSigner?.Email : signerMail[i].email, subject: `${document.ExtUserPtr.Name} has requested you to sign "${document.Name}"`, diff --git a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js index 49f5b42e4..b3b4f599c 100644 --- a/apps/OpenSignServer/cloud/parsefunction/reportsJson.js +++ b/apps/OpenSignServer/cloud/parsefunction/reportsJson.js @@ -65,6 +65,7 @@ export default function reportJson(id, userId) { 'Folder.Name', 'URL', 'ExtUserPtr.Name', + 'ExtUserPtr.active_mail_adapter', 'Signers.Name', 'Signers.Email', 'Signers.Phone', @@ -100,6 +101,7 @@ export default function reportJson(id, userId) { 'Folder.Name', 'URL', 'ExtUserPtr.Name', + 'ExtUserPtr.active_mail_adapter', 'Signers.Name', 'Signers.Email', 'Signers.Phone', @@ -227,6 +229,7 @@ export default function reportJson(id, userId) { 'Folder.Name', 'URL', 'ExtUserPtr.Name', + 'ExtUserPtr.active_mail_adapter', 'Signers.Name', 'Signers.Email', 'Signers.Phone', @@ -268,6 +271,7 @@ export default function reportJson(id, userId) { 'Name', 'URL', 'ExtUserPtr.Name', + 'ExtUserPtr.active_mail_adapter', 'Signers.Name', 'Signers.UserId', 'AuditTrail', @@ -335,6 +339,7 @@ export default function reportJson(id, userId) { 'Folder.Name', 'URL', 'ExtUserPtr.Name', + 'ExtUserPtr.active_mail_adapter', 'Signers.Name', 'Signers.Email', 'Signers.Phone',