Skip to content

fix: customsmtp is not used for resend mail #1243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 23, 2024
Merged

fix: customsmtp is not used for resend mail #1243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/OpenSign/src/primitives/GetReportDisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
1 change: 1 addition & 0 deletions apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
2 changes: 2 additions & 0 deletions apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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 });
Expand Down
1 change: 1 addition & 0 deletions apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"`,
Expand Down
5 changes: 5 additions & 0 deletions apps/OpenSignServer/cloud/parsefunction/reportsJson.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -268,6 +271,7 @@ export default function reportJson(id, userId) {
'Name',
'URL',
'ExtUserPtr.Name',
'ExtUserPtr.active_mail_adapter',
'Signers.Name',
'Signers.UserId',
'AuditTrail',
Expand Down Expand Up @@ -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',
Expand Down