WEBDIENSTE/OpenSign
1
0
Fork 0
mirror of https://github.com/OpenSignLabs/OpenSign.git synced 2026-09-20 16:47:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1243 from OpenSignLabs/validation

Browse Source
This commit is contained in:
Andrew
2024-09-23 11:54:22 +05:30
committed by GitHub
parent b7a22d94db f699d93e44
commit 2e7cf7a9df
6 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSign/src/primitives/GetReportDisplay.js
+2 -1
View File
@@ -785,8 +785,9 @@ const ReportTable = (props) => {
"X-Parse-Application-Id": localStorage.getItem("parseAppId"), "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
sessionToken: localStorage.getItem("accesstoken") sessionToken: localStorage.getItem("accesstoken")
}; };
console.log("doc?.ExtUserPtr ", doc?.ExtUserPtr);
let params = { let params = {
mailProvider: doc?.ExtUserPtr?.active_mail_adapter, mailProvider: doc?.ExtUserPtr?.active_mail_adapter || "",
extUserId: doc?.ExtUserPtr?.objectId, extUserId: doc?.ExtUserPtr?.objectId,
recipient: userDetails?.Email, recipient: userDetails?.Email,
subject: mail.subject, subject: mail.subject,
apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js
+1
View File
@@ -315,6 +315,7 @@ export default async function createDocumentWithTemplate(request, response) {
from: sender, from: sender,
html: html, html: html,
extUserId: template.ExtUserPtr.objectId, extUserId: template.ExtUserPtr.objectId,
mailProvider: template?.ExtUserPtr?.active_mail_adapter || '',
}; };
sendMail = await axios.post(url, params, { headers: headers }); sendMail = await axios.post(url, params, { headers: headers });
} catch (error) { } catch (error) {
apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js
+1
View File
@@ -371,6 +371,7 @@ export default async function createDocumentwithCoordinate(request, response) {
from: sender, from: sender,
html: html, html: html,
extUserId: extUser.id, extUserId: extUser.id,
mailProvider: parseExtUser?.active_mail_adapter || '',
}; };
await axios.post(url, params, { headers: headers }); await axios.post(url, params, { headers: headers });
apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js
+2
View File
@@ -41,6 +41,7 @@ export default async function resendMail(request, response) {
if (resDoc) { if (resDoc) {
const _resDoc = resDoc.toJSON(); const _resDoc = resDoc.toJSON();
const contact = _resDoc.Signers.find(x => x.Email === userMail); const contact = _resDoc.Signers.find(x => x.Email === userMail);
const activeMailAdapter = _resDoc?.ExtUserPtr?.active_mail_adapter || '';
if (contact) { if (contact) {
try { try {
const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png'; const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
@@ -131,6 +132,7 @@ export default async function resendMail(request, response) {
from: sender, from: sender,
html: html, html: html,
extUserId: _resDoc.ExtUserPtr.objectId, extUserId: _resDoc.ExtUserPtr.objectId,
mailProvider: activeMailAdapter,
}; };
const res = await axios.post(url, params, { headers: headers }); const res = await axios.post(url, params, { headers: headers });
apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js
+1
View File
@@ -74,6 +74,7 @@ async function sendMail(document, sessionToken) {
const orgName = document.ExtUserPtr.Company ? document.ExtUserPtr.Company : ''; const orgName = document.ExtUserPtr.Company ? document.ExtUserPtr.Company : '';
const themeBGcolor = '#47a3ad'; const themeBGcolor = '#47a3ad';
let params = { let params = {
mailProvider: document?.ExtUserPtr?.active_mail_adapter || '',
extUserId: document.ExtUserPtr.objectId, extUserId: document.ExtUserPtr.objectId,
recipient: objectId ? existSigner?.Email : signerMail[i].email, recipient: objectId ? existSigner?.Email : signerMail[i].email,
subject: `${document.ExtUserPtr.Name} has requested you to sign "${document.Name}"`, subject: `${document.ExtUserPtr.Name} has requested you to sign "${document.Name}"`,
apps/OpenSignServer/cloud/parsefunction/reportsJson.js
+5
View File
@@ -65,6 +65,7 @@ export default function reportJson(id, userId) {
'Folder.Name', 'Folder.Name',
'URL', 'URL',
'ExtUserPtr.Name', 'ExtUserPtr.Name',
'ExtUserPtr.active_mail_adapter',
'Signers.Name', 'Signers.Name',
'Signers.Email', 'Signers.Email',
'Signers.Phone', 'Signers.Phone',
@@ -100,6 +101,7 @@ export default function reportJson(id, userId) {
'Folder.Name', 'Folder.Name',
'URL', 'URL',
'ExtUserPtr.Name', 'ExtUserPtr.Name',
'ExtUserPtr.active_mail_adapter',
'Signers.Name', 'Signers.Name',
'Signers.Email', 'Signers.Email',
'Signers.Phone', 'Signers.Phone',
@@ -228,6 +230,7 @@ export default function reportJson(id, userId) {
'Folder.Name', 'Folder.Name',
'URL', 'URL',
'ExtUserPtr.Name', 'ExtUserPtr.Name',
'ExtUserPtr.active_mail_adapter',
'Signers.Name', 'Signers.Name',
'Signers.Email', 'Signers.Email',
'Signers.Phone', 'Signers.Phone',
@@ -269,6 +272,7 @@ export default function reportJson(id, userId) {
'Name', 'Name',
'URL', 'URL',
'ExtUserPtr.Name', 'ExtUserPtr.Name',
'ExtUserPtr.active_mail_adapter',
'Signers.Name', 'Signers.Name',
'Signers.UserId', 'Signers.UserId',
'AuditTrail', 'AuditTrail',
@@ -336,6 +340,7 @@ export default function reportJson(id, userId) {
'Folder.Name', 'Folder.Name',
'URL', 'URL',
'ExtUserPtr.Name', 'ExtUserPtr.Name',
'ExtUserPtr.active_mail_adapter',
'Signers.Name', 'Signers.Name',
'Signers.Email', 'Signers.Email',
'Signers.Phone', 'Signers.Phone',