Merge pull request #739 from OpenSignLabs/staging

v1.7.2

Author: nxglabs

apps/OpenSignServer/cloud/customRoute/v1/routes/CreateDocumentWithTemplate.js

@@ -50,7 +50,7 @@ export default async function createDocumentWithTemplate(request, response) {
   const folderId = request.body.folderId;
   const templateId = request.params.template_id;
   const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
   const send_email = request.body.send_email;
   const email_subject = request.body.email_subject;
   const email_body = request.body.email_body;

apps/OpenSignServer/cloud/customRoute/v1/routes/createDocumentwithCoordinate.js

@@ -69,7 +69,7 @@ export default async function createDocumentwithCoordinate(request, response) {
   const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
   // console.log('fileData ', fileData);
   const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
   const reqToken = request.headers['x-api-token'];
   if (!reqToken) {
     return response.status(400).json({ error: 'Please Provide API Token' });

apps/OpenSignServer/cloud/customRoute/v1/routes/createTemplate.js

@@ -8,7 +8,7 @@ export default async function createTemplate(request, response) {
   const base64File = request.body.file;
   const SendinOrder = request.body.sendInOrder || false;
   const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
 
   try {
     const reqToken = request.headers['x-api-token'];

apps/OpenSignServer/cloud/customRoute/v1/routes/draftDocument.js

@@ -14,7 +14,7 @@ export default async function draftDocument(request, response) {
   const SendinOrder = request.body.sendInOrder || false;
   // console.log('fileData ', fileData);
   const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
 
   try {
     const reqToken = request.headers['x-api-token'];

apps/OpenSignServer/cloud/customRoute/v1/routes/resendMail.js

@@ -33,10 +33,11 @@ export default async function resendMail(request, response) {
       docQuery.notEqualTo('IsCompleted', true);
       docQuery.notEqualTo('IsDeclined', true);
       docQuery.notEqualTo('IsArchive', true);
-      docQuery.lessThanOrEqualTo('ExpiryDate', new Date());
+      docQuery.greaterThanOrEqualTo('ExpiryDate', new Date());
       docQuery.exists('SignedUrl');
 
       const resDoc = await docQuery.first({ useMasterKey: true });
+      // console.log("resDoc ",resDoc)
       if (resDoc) {
         const _resDoc = resDoc.toJSON();
         const contact = _resDoc.Signers.find(x => x.Email === userMail);

apps/OpenSignServer/cloud/parsefunction/callWebhook.js

@@ -48,8 +48,11 @@ export default async function callWebhook(request) {
         }
       }
     }
+    const docQuery = new Parse.Query('contracts_Document');
+    const resDoc = await docQuery.get(docId, { useMasterKey: true });
     const extendcls = new Parse.Query('contracts_Users');
-    extendcls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
+    extendcls.equalTo('objectId', resDoc.get('ExtUserPtr')?.id);
+    // extendcls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
     const res = await extendcls.first({ useMasterKey: true });
     if (res) {
       const extUser = JSON.parse(JSON.stringify(res));

apps/OpenSignServer/cloud/parsefunction/pdf/PDF.min.js

@@ -123,22 +123,23 @@ async function sendCompletedMail(e) {
     },
   });
 }
-async function sendDoctoWebhook(a, e, t, r) {
-  let i = [];
-  (i = r
+async function sendDoctoWebhook(a, e, t, r, i) {
+  let s = [];
+  (s = r
     ? { name: r?.Name, email: r?.Email, phone: r?.Phone }
     : a?.Signers?.map(e => ({ name: e.Name, email: e.Email, phone: e.Phone })) || [
         { name: a?.ExtUserPtr?.Name, email: a?.ExtUserPtr?.Email, phone: a?.ExtUserPtr?.Phone },
       ]),
     a.ExtUserPtr?.Webhook &&
       ((r =
         'signed' === t
-          ? { signer: i, signedAt: new Date() }
-          : { signers: i, completedAt: new Date() }),
+          ? { signer: s, signedAt: new Date() }
+          : { signers: s, completedAt: new Date() }),
       (t = {
         event: t,
         objectId: a?.objectId,
         file: e || '',
+        ...(i ? { certificate: i } : {}),
         name: a?.Name,
         note: a?.Note || '',
         description: a?.Description || '',
@@ -205,7 +206,7 @@ const sendMailsaveCertifcate = async (e, t, a, r, i, s) => {
       ? console.log("don't send mail")
       : sendCompletedMail({ url: a, isCustomMail: r, doc: e, mailProvider: i }),
     saveFileUsage(o.length, t.imageUrl, s),
-    sendDoctoWebhook(e, a, 'completed');
+    sendDoctoWebhook(e, a, 'completed', '', t.imageUrl);
 };
 async function PDF(o) {
   try {