fix: Update hint for smtp username

.env.local_dev

@@ -8,11 +8,13 @@ PUBLIC_URL=https://localhost:3001
 GENERATE_SOURCEMAP=false
 # Set it to the URL from where APIs will be accessible, for local development it should be localhost:3000/api/app (use your local port number instead)
 # REACT_APP_SERVERURL=http://localhost:8080/app
-# (DEPRECATED) This should not be changed if provided; it should be 'opensign'.
+# A 12 character long random app identifier. The value of this should be same as APP_ID which is a variable used by backend API.
 REACT_APP_APPID=opensign
 
 
 # Backend ExpressJS config ****************************************************************************************************************************************************************************************
+# A 12 character long random app identifier. The value of this should be same as REACT_APP_APPID which is a variable used by Frontend React App.
+APP_ID=opensign
 # Name of the app. It will be visible in the verification emails sent out.
 appName=open_sign_server
 # A 12 character long random secret key that allows access to all the data. It is used in Parse dashboard config to view all the data in the database.
@@ -109,6 +111,3 @@ CRUxFgQUDYlgGVxSxuOknhQc256x3++7BDwwMTAhMAkGBSsOAwIaBQAEFFjASdYl
 
 # Provide Pass pharse of above PFX or p12 document
 PASS_PHRASE=opensign 
-
-# (DEPRECATED) This should not be changed if provided; it should be 'opensign'.
-APP_ID=opensign

Caddyfile

@@ -1,7 +1,7 @@
 {$HOST_URL} {
     reverse_proxy client:3000
-    handle_path /api/* {
+    handle_path /app/* {
         reverse_proxy server:8080
-            rewrite * {uri}
+            rewrite * /app{uri}
     }
 }

apps/OpenSign/Dockerhubfile

@@ -16,7 +16,6 @@ COPY apps/OpenSign/.husky .
 
 # Define environment variables if needed
 ENV NODE_ENV=production
-ENV GENERATE_SOURCEMAP=false
 # build
 RUN npm run build
 

apps/OpenSign/src/components/AddUser.js

@@ -2,8 +2,13 @@ import React, { useEffect, useState } from "react";
 import Parse from "parse";
 import Title from "./Title";
 import Loader from "../primitives/Loader";
-import { copytoData, usertimezone } from "../constant/Utils";
+import {
-import { emailRegex } from "../constant/const";
+  copytoData,
+  usertimezone
+} from "../constant/Utils";
+import {
+  emailRegex,
+} from "../constant/const";
 import { useTranslation } from "react-i18next";
 function generatePassword(length) {
   const characters =
@@ -279,7 +284,9 @@ const AddUser = (props) => {
                           name="name"
                           value={formdata.name}
                           onChange={(e) => handleChange(e)}
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
+                          onInvalid={(e) =>
+                            e.target.setCustomValidity(t("input-required"))
+                          }
                           onInput={(e) => e.target.setCustomValidity("")}
                           required
                           className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
@@ -299,7 +306,9 @@ const AddUser = (props) => {
                           value={formdata.email}
                           onChange={(e) => handleChange(e)}
                           required
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
+                          onInvalid={(e) =>
+                            e.target.setCustomValidity(t("input-required"))
+                          }
                           onInput={(e) => e.target.setCustomValidity("")}
                           className="op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content w-full text-xs"
                         />
@@ -349,7 +358,9 @@ const AddUser = (props) => {
                           onChange={(e) => handleChange(e)}
                           name="role"
                           className="op-select op-select-bordered op-select-sm focus:outline-none hover:border-base-content w-full text-xs"
-              onInvalid={(e) => e.target.setCustomValidity(t("input-required"))}
+                          onInvalid={(e) =>
+                            e.target.setCustomValidity(t("input-required"))
+                          }
                           onInput={(e) => e.target.setCustomValidity("")}
                           required
                         >

apps/OpenSign/src/components/pdf/EditTemplate.js

@@ -1,11 +1,19 @@
-import React, { useState } from "react";
+import React, {
-import { getFileName } from "../../constant/Utils";
+  useState,
+} from "react";
+import {
+  getFileName
+} from "../../constant/Utils";
 import { useTranslation } from "react-i18next";
 import { Tooltip } from "react-tooltip";
 import SignersInput from "../shared/fields/SignersInput";
 
-const EditTemplate = ({ template, onSuccess }) => {
+const EditTemplate = ({
-  const appName = "OpenSign™";
+  template,
+  onSuccess,
+}) => {
+  const appName =
+    "OpenSign™";
   const { t } = useTranslation();
   const [formData, setFormData] = useState({
     Name: template?.Name || "",
@@ -246,7 +254,11 @@ const EditTemplate = ({ template, onSuccess }) => {
               </Tooltip>
             </label>
             <div className="flex flex-col md:flex-row md:gap-4">
-              <div className={`flex items-center gap-2 ml-2 mb-1`}>
+              <div
+                className={
+                  `flex items-center gap-2 ml-2 mb-1`
+                }
+              >
                 <input
                   className="mr-[2px] op-radio op-radio-xs"
                   type="radio"
@@ -255,7 +267,11 @@ const EditTemplate = ({ template, onSuccess }) => {
                 />
                 <div className="text-center">{t("yes")}</div>
               </div>
-              <div className={`flex items-center gap-2 ml-2 mb-1`}>
+              <div
+                className={
+                  `flex items-center gap-2 ml-2 mb-1`
+                }
+              >
                 <input
                   className="mr-[2px] op-radio op-radio-xs"
                   type="radio"

apps/OpenSign/src/components/pdf/EmailComponent.js

@@ -35,7 +35,8 @@ function EmailComponent({
         setEmailList([]);
       }, 1500);
       setIsLoading(false);
-    } else {
+    }
+    else {
       setIsLoading(false);
       setIsEmail(false);
       setIsAlert({

apps/OpenSign/src/components/pdf/WidgetNameModal.js

@@ -117,6 +117,7 @@ const WidgetNameModal = (props) => {
     }
   }
 
+
   const handleCheckboxChange = (index) => {
     // Update the state with the modified array
     setSignatureType((prev) =>

apps/OpenSign/src/constant/Utils.js

@@ -7,7 +7,9 @@ import { appInfo } from "./appinfo";
 import { saveAs } from "file-saver";
 import printModule from "print-js";
 import fontkit from "@pdf-lib/fontkit";
-import { themeColor } from "./const";
+import {
+  themeColor
+} from "./const";
 
 export const fontsizeArr = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
 export const fontColorArr = ["red", "black", "blue", "yellow"];
@@ -134,12 +136,14 @@ export const pdfNewWidthFun = (divRef) => {
 };
 
 //`contractUsers` function is used to get contract_User details
-export const contractUsers = async () => {
+export const contractUsers = async (
+) => {
   try {
     const url = `${localStorage.getItem("baseUrl")}functions/getUserDetails`;
     const parseAppId = localStorage.getItem("parseAppId");
     const accesstoken = localStorage.getItem("accesstoken");
-    const token = { "X-Parse-Session-Token": accesstoken };
+    const token =
+          { "X-Parse-Session-Token": accesstoken };
     const headers = {
       headers: {
         "Content-Type": "application/json",
@@ -491,7 +495,7 @@ export const signPdfFun = async (
   documentId,
   signerObjectId,
   objectId,
-  widgets
+  widgets,
 ) => {
   let isCustomCompletionMail = false;
   try {
@@ -500,7 +504,10 @@ export const signPdfFun = async (
     if (tenantDetails && tenantDetails === "user does not exist!") {
       return { status: "error", message: "User does not exist." };
     } else {
-      if (tenantDetails?.CompletionBody && tenantDetails?.CompletionSubject) {
+      if (
+        tenantDetails?.CompletionBody &&
+        tenantDetails?.CompletionSubject
+      ) {
         isCustomCompletionMail = true;
       }
     }
@@ -1004,7 +1011,8 @@ export const addInitialData = (signerPos, setXyPosition, value, userId) => {
 
 //function for embed document id
 export const embedDocId = async (pdfDoc, documentId, allPages) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   // `fontBytes` is used to embed custom font in pdf
   const fontBytes = await fileasbytes(
     "https://cdn.opensignlabs.com/webfonts/times.ttf"
@@ -1866,9 +1874,12 @@ export const contactBook = async (objectId) => {
 };
 
 //function for getting document details from contract_Documents class
-export const contractDocument = async (documentId) => {
+export const contractDocument = async (
+  documentId,
+) => {
   const data = { docId: documentId };
-  const token = { sessionToken: localStorage.getItem("accesstoken") };
+  const token =
+        { sessionToken: localStorage.getItem("accesstoken") };
   const documentDeatils = await axios
     .post(`${localStorage.getItem("baseUrl")}functions/getDocument`, data, {
       headers: {
@@ -2070,13 +2081,18 @@ export const getAppLogo = async () => {
       }
     }
 };
-export const getTenantDetails = async (objectId, contactId) => {
+export const getTenantDetails = async (
+  objectId,
+  contactId
+) => {
   try {
     const url = `${localStorage.getItem("baseUrl")}functions/gettenant`;
     const parseAppId = localStorage.getItem("parseAppId");
     const accesstoken = localStorage.getItem("accesstoken");
-    const token = { "X-Parse-Session-Token": accesstoken };
+    const token =
-    const data = { userId: objectId, contactId: contactId };
+          { "X-Parse-Session-Token": accesstoken };
+    const data =
+          { userId: objectId, contactId: contactId };
     const res = await axios.post(url, data, {
       headers: {
         "Content-Type": "application/json",
@@ -2163,7 +2179,8 @@ export const handleSendOTP = async (email) => {
   }
 };
 export const fetchUrl = async (url, pdfName) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   try {
     const response = await fetch(url);
     if (!response.ok) {
@@ -2177,7 +2194,11 @@ export const fetchUrl = async (url, pdfName) => {
     console.error("Error downloading the file:", error);
   }
 };
-export const getSignedUrl = async (pdfUrl, docId, templateId) => {
+export const getSignedUrl = async (
+  pdfUrl,
+  docId,
+  templateId
+) => {
   //use only axios here due to public template sign
   const axiosRes = await axios.post(
     `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
@@ -2238,7 +2259,10 @@ export const handleDownloadPdf = async (
     setIsDownloading && setIsDownloading("pdf");
     const docId = pdfDetails?.[0]?.objectId || "";
     try {
-      const url = await getSignedUrl(pdfUrl, docId);
+      const url = await getSignedUrl(
+        pdfUrl,
+        docId,
+      );
       await fetchUrl(url, pdfName);
       setIsDownloading && setIsDownloading("");
     } catch (err) {
@@ -2268,7 +2292,7 @@ export const handleToPrint = async (event, setIsDownloading, pdfDetails) => {
       `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
       {
         url: pdfUrl,
-        docId: docId
+        docId: docId,
       },
       {
         headers: {
@@ -2312,7 +2336,8 @@ export const handleDownloadCertificate = async (
   setIsDownloading,
   isZip
 ) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   if (pdfDetails?.length > 0 && pdfDetails[0]?.CertificateUrl) {
     try {
       await fetch(pdfDetails[0] && pdfDetails[0]?.CertificateUrl);
@@ -2396,13 +2421,14 @@ export const handleDownloadCertificate = async (
 export function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"); // Escape special characters
 }
-export async function findContact(value) {
+export async function findContact(
+  value,
+) {
   try {
     const baseURL = localStorage.getItem("baseUrl");
     const url = `${baseURL}functions/getsigners`;
-    const token = {
+    const token =
-      "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+          { "X-Parse-Session-Token": localStorage.getItem("accesstoken") };
-    };
     const headers = {
       "Content-Type": "application/json",
       "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
@@ -2614,7 +2640,10 @@ export function base64ToArrayBuffer(base64) {
   return bytes.buffer;
 }
 
-export const convertBase64ToFile = async (pdfName, pdfBase64) => {
+export const convertBase64ToFile = async (
+  pdfName,
+  pdfBase64,
+) => {
   const fileName = sanitizeFileName(pdfName) + ".pdf";
     try {
         const pdfFile = new Parse.File(fileName, { base64: pdfBase64 });
@@ -2926,10 +2955,13 @@ export const flattenPdf = async (pdfFile) => {
 };
 
 export const mailTemplate = (param) => {
-  const appName = "OpenSign™";
+  const appName =
-  const logo = `<div style='padding:10px'><img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' /></div>`;
+    "OpenSign™";
+  const logo =
+        `<div style='padding:10px'><img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' /></div>`;
 
-  const opurl = ` <a href='https://www.opensignlabs.com' target=_blank>here</a>.</p></div></div></body></html>`;
+  const opurl =
+        ` <a href='https://www.opensignlabs.com' target=_blank>here</a>.</p></div></div></body></html>`;
 
   const subject = `${param.senderName} has requested you to sign "${param.title}"`;
   const body =

apps/OpenSign/src/constant/appinfo.js

@@ -4,7 +4,7 @@ export function serverUrl_fn() {
   let baseUrl;
     baseUrl = process.env.REACT_APP_SERVERURL
       ? process.env.REACT_APP_SERVERURL
-      : window.location.origin + "/api/app";
+      : window.location.origin + "/app";
 
   return baseUrl;
 }

apps/OpenSign/src/pages/Form.js

@@ -36,7 +36,8 @@ function Form() {
 }
 
 const Forms = (props) => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   const { t } = useTranslation();
   const maxFileSize = 20;
   const abortController = new AbortController();
@@ -241,7 +242,9 @@ const Forms = (props) => {
                         if (fileRes.url) {
                           setFileUpload(fileRes.url);
                           removeFile();
-                      const title = generateTitleFromFilename(files?.[0]?.name);
+                          const title = generateTitleFromFilename(
+                            files?.[0]?.name
+                          );
                           setFormData((obj) => ({ ...obj, Name: title }));
                           const tenantId = localStorage.getItem("TenantId");
                           SaveFileSize(size, fileRes.url, tenantId);
@@ -441,7 +444,8 @@ const Forms = (props) => {
           setSigners([]);
           setBcc([]);
           setFolder({ ObjectId: "", Name: "" });
-          const notifySign = extUserData?.NotifyOnSignatures
+          const notifySign =
+                extUserData?.NotifyOnSignatures
                 ? extUserData?.NotifyOnSignatures
                 : true;
           setFormData({
@@ -519,7 +523,8 @@ const Forms = (props) => {
     setSigners([]);
     setBcc([]);
     setFolder({ ObjectId: "", Name: "" });
-    const notifySign = extUserData?.NotifyOnSignatures
+    const notifySign =
+          extUserData?.NotifyOnSignatures
           ? extUserData?.NotifyOnSignatures
           : true;
     let obj = {
@@ -734,7 +739,9 @@ const Forms = (props) => {
             )}
             <div className="text-xs">
               <label className="block">
-                {`${`${t("report-heading.File")} (${t("file-type")}`}${")"}`}
+                {`${`${t("report-heading.File")} (${t("file-type")}`}${
+                      ")"
+                }`}
                 <span className="text-red-500 text-[13px]">*</span>
               </label>
               {fileupload.length > 0 ? (
@@ -758,7 +765,9 @@ const Forms = (props) => {
                     className="op-file-input op-file-input-bordered op-file-input-sm focus:outline-none hover:border-base-content w-full text-xs"
                     onChange={(e) => handleFileInput(e)}
                     ref={inputFileRef}
-                    accept={"application/pdf,image/png,image/jpeg"}
+                    accept={
+                          "application/pdf,image/png,image/jpeg"
+                    }
                     onInvalid={(e) =>
                       e.target.setCustomValidity(t("input-required"))
                     }
@@ -1048,7 +1057,10 @@ const Forms = (props) => {
                 {isAdvanceOpt && (
                   <div
                     style={{
-                      height: props.title === "New Template" ? "100px" : "280px"
+                      height:
+                              props.title === "New Template"
+                            ? "100px"
+                            : "280px"
                     }}
                     className="w-[1px] bg-gray-300 m-auto hidden md:inline-block"
                   ></div>
@@ -1157,7 +1169,11 @@ const Forms = (props) => {
                         </Tooltip>
                       </label>
                       <div className="flex flex-col md:flex-row md:gap-4">
-                        <div className={`flex items-center gap-2 ml-2 mb-1`}>
+                        <div
+                          className={
+                            `flex items-center gap-2 ml-2 mb-1`
+                          }
+                        >
                           <input
                             className="mr-[2px] op-radio op-radio-xs"
                             type="radio"
@@ -1166,7 +1182,11 @@ const Forms = (props) => {
                           />
                           <div className="text-center">{t("yes")}</div>
                         </div>
-                        <div className={`flex items-center gap-2 ml-2 mb-1`}>
+                        <div
+                          className={
+                            `flex items-center gap-2 ml-2 mb-1`
+                          }
+                        >
                           <input
                             className="mr-[2px] op-radio op-radio-xs"
                             type="radio"

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -69,7 +69,8 @@ import AddContact from "../primitives/AddContact";
 function PlaceHolderSign() {
   const { t } = useTranslation();
   const copyUrlRef = useRef(null);
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   const editorRef = useRef();
   const { state } = useLocation();
   const navigate = useNavigate();
@@ -863,7 +864,11 @@ function PlaceHolderSign() {
           scale
         );
         const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64,
+          "",
+        );
         const tenantId = localStorage.getItem("TenantId");
         const buffer = atob(pdfBase64);
         SaveFileSize(buffer.length, pdfUrl, tenantId);
@@ -875,7 +880,11 @@ function PlaceHolderSign() {
     } else if (pdfBase64Url) {
       try {
         const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64Url,
+          "",
+        );
         return pdfUrl;
       } catch (err) {
         console.log("error to convertBase64ToFile in placeholder flow", err);
@@ -981,7 +990,11 @@ function PlaceHolderSign() {
     let pdfUrl;
     if (isUploadPdf) {
       const pdfName = generatePdfName(16);
-      pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+      pdfUrl = await convertBase64ToFile(
+        pdfName,
+        pdfBase64Url,
+        "",
+      );
     }
     try {
       const docCls = new Parse.Object("contracts_Document");
@@ -1140,7 +1153,8 @@ function PlaceHolderSign() {
       year: "numeric"
     });
 
-    let senderEmail = pdfDetails?.[0]?.ExtUserPtr?.Email;
+    let senderEmail =
+      pdfDetails?.[0]?.ExtUserPtr?.Email;
     let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
     let signerMail = signersdata.slice();
 
@@ -1166,11 +1180,16 @@ function PlaceHolderSign() {
         const orgName = pdfDetails[0]?.ExtUserPtr.Company
           ? pdfDetails[0].ExtUserPtr.Company
           : "";
-        const senderName = pdfDetails?.[0].ExtUserPtr.Name;
+        const senderName =
+          pdfDetails?.[0].ExtUserPtr.Name;
         const documentName = `${pdfDetails?.[0].Name}`;
         let replaceVar;
 
-        if (requestBody && requestSubject && isCustomize) {
+        if (
+          requestBody &&
+          requestSubject &&
+          isCustomize
+        ) {
           const replacedRequestBody = requestBody.replace(/"/g, "'");
           htmlReqBody =
             "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
@@ -1194,7 +1213,10 @@ function PlaceHolderSign() {
             htmlReqBody,
             variables
           );
-        } else if (tenantMailTemplate?.body && tenantMailTemplate?.subject) {
+        } else if (
+          tenantMailTemplate?.body &&
+          tenantMailTemplate?.subject
+        ) {
           const mailBody = tenantMailTemplate?.body;
           const mailSubject = tenantMailTemplate?.subject;
           const replacedRequestBody = mailBody.replace(/"/g, "'");
@@ -1231,7 +1253,8 @@ function PlaceHolderSign() {
             ? replaceVar?.subject
             : mailTemplate(mailparam).subject,
           replyto: senderEmail,
-          from: senderEmail,
+          from:
+            senderEmail,
           html: replaceVar?.body
             ? replaceVar?.body
             : mailTemplate(mailparam).body
@@ -1246,13 +1269,20 @@ function PlaceHolderSign() {
       setMailStatus("success");
       try {
         let data;
-        if (requestBody && requestSubject && isCustomize) {
+        if (
+          requestBody &&
+          requestSubject &&
+          isCustomize
+        ) {
           data = {
             RequestBody: htmlReqBody,
             RequestSubject: requestSubject,
             SendMail: true
           };
-        } else if (tenantMailTemplate?.body && tenantMailTemplate?.subject) {
+        } else if (
+          tenantMailTemplate?.body &&
+          tenantMailTemplate?.subject
+        ) {
           data = {
             RequestBody: tenantMailTemplate?.body,
             RequestSubject: tenantMailTemplate?.subject,
@@ -1290,7 +1320,8 @@ function PlaceHolderSign() {
       setIsSend(true);
       setIsMailSend(true);
       setIsUiLoading(false);
-    } else {
+    }
+    else {
       setMailStatus("failed");
       setIsSend(true);
       setIsMailSend(true);
@@ -1531,7 +1562,8 @@ function PlaceHolderSign() {
                   status: defaultdata?.status || "required",
                   hint: defaultdata?.hint || "",
                   defaultValue: defaultdata?.defaultValue || "",
-                  validation: {},
+                  validation:
+                        {},
                   fontSize:
                     fontSize || currWidgetsDetails?.options?.fontSize || 12,
                   fontColor:
@@ -2006,13 +2038,16 @@ function PlaceHolderSign() {
                           {!isCustomize && (
                             <span>{t("placeholder-alert-3")}</span>
                           )}
-                          {isCustomize && (
+                          {
+                              isCustomize && (
                                 <>
                                   <EmailBody
                                     editorRef={editorRef}
                                     requestBody={requestBody}
                                     requestSubject={requestSubject}
-                                handleOnchangeRequest={handleOnchangeRequest}
+                                    handleOnchangeRequest={
+                                      handleOnchangeRequest
+                                    }
                                     setRequestSubject={setRequestSubject}
                                   />
                                   <div
@@ -2025,7 +2060,8 @@ function PlaceHolderSign() {
                                     <span>{t("reset-to-default")}</span>
                                   </div>
                                 </>
-                          )}
+                              )
+                          }
                           <div className="flex flex-row items-center gap-2 md:gap-6 mt-2">
                             <div className="flex flex-row gap-2">
                               <button
@@ -2043,14 +2079,16 @@ function PlaceHolderSign() {
                                 </button>
                               )}
                             </div>
-                            {!isCustomize && (
+                            {
+                                !isCustomize && (
                                   <span
                                     className="op-link op-link-accent text-sm"
                                     onClick={() => setIsCustomize(!isCustomize)}
                                   >
                                     {t("cutomize-email")}
                                   </span>
-                            )}
+                                )
+                            }
                           </div>
                         </>
                       )}

apps/OpenSign/src/pages/Preferences.js

@@ -22,7 +22,8 @@ import EditorToolbar, {
 } from "../components/pdf/EditorToolbar";
 
 const Preferences = () => {
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   const { t } = useTranslation();
   const editorRef = useRef();
   const editorRefCom = useRef();
@@ -341,9 +342,7 @@ const Preferences = () => {
                       onClick={() => setactiveTab(ind)}
                       key={ind}
                       role="tab"
-                      className={`${
+                      className={`${activeTab === ind ? "op-tab-active" : ""} op-tab text-xs md:text-base pb-2 md:pb-0 }`}
-                        activeTab === ind ? "op-tab-active" : ""
-                      } op-tab text-xs md:text-base pb-2 md:pb-0 }`}
                     >
                       <i className={tabData.icon}></i>
                       <span className="ml-1 md:ml-2">{tabData.title}</span>
@@ -451,7 +450,11 @@ const Preferences = () => {
                         </ReactTooltip>
                       </label>
                       <div className="flex flex-col md:flex-row md:gap-4">
-                        <div className={"flex items-center gap-2 ml-2 mb-1"}>
+                        <div
+                          className={
+                            "flex items-center gap-2 ml-2 mb-1"
+                          }
+                        >
                           <input
                             className="mr-[2px] op-radio op-radio-xs"
                             type="radio"
@@ -462,7 +465,11 @@ const Preferences = () => {
                             {t("yes")}
                           </div>
                         </div>
-                        <div className={"flex items-center gap-2 ml-2 mb-1"}>
+                        <div
+                          className={
+                            "flex items-center gap-2 ml-2 mb-1"
+                          }
+                        >
                           <input
                             className="mr-[2px] op-radio op-radio-xs"
                             type="radio"
@@ -635,9 +642,7 @@ const Preferences = () => {
                               {t("subject")}
                               <Tooltip
                                 id={"request-sub-tooltip"}
-                                message={`${t(
+                                message={`${t("variables-use")}: {{sender_name}} {{document_title}}`}
-                                  "variables-use"
-                                )}: {{sender_name}} {{document_title}}`}
                               />
                             </label>
                             <input
@@ -646,9 +651,7 @@ const Preferences = () => {
                               onChange={(e) =>
                                 setRequestSubject(e.target.value)
                               }
-                              placeholder={`{{sender_name}} ${t(
+                              placeholder={`{{sender_name}} ${t("send-to-sign")} {{document_title}}`}
-                                "send-to-sign"
-                              )} {{document_title}}`}
                               className="w-full op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content text-xs"
                             />
                           </div>
@@ -657,9 +660,7 @@ const Preferences = () => {
                               {t("body")}
                               <Tooltip
                                 id={"request-body-tooltip"}
-                                message={`${t(
+                                message={`${t("variables-use")}: {{sender_name}} {{document_title}}`}
-                                  "variables-use"
-                                )}: {{sender_name}} {{document_title}}`}
                               />
                             </label>
                             <EditorToolbar containerId="toolbar1" />
@@ -705,9 +706,7 @@ const Preferences = () => {
                               {t("subject")}
                               <Tooltip
                                 id={"complete-sub-tooltip"}
-                                message={`${t(
+                                message={`${t("variables-use")}:{{sender_name}} {{document_title}}`}
-                                  "variables-use"
-                                )}:{{sender_name}} {{document_title}}`}
                               />
                             </label>
                             <input
@@ -716,9 +715,7 @@ const Preferences = () => {
                               onChange={(e) =>
                                 setCompletionSubject(e.target.value)
                               }
-                              placeholder={`{{sender_name}}  ${t(
+                              placeholder={`{{sender_name}}  ${t("send-to-sign")} {{document_title}}`}
-                                "send-to-sign"
-                              )} {{document_title}}`}
                               className="w-full op-input op-input-bordered op-input-sm focus:outline-none hover:border-base-content text-xs"
                             />
                           </div>
@@ -727,9 +724,7 @@ const Preferences = () => {
                               {t("body")}
                               <Tooltip
                                 id={"complete-body-tooltip"}
-                                message={`${t(
+                                message={`${t("variables-use")}:{{sender_name}} {{document_title}} {{signing_url}}`}
-                                  "variables-use"
-                                )}:{{sender_name}} {{document_title}} {{signing_url}}`}
                               />
                             </label>
                             <EditorToolbar containerId="toolbar2" />

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -66,7 +66,8 @@ import LoaderWithMsg from "../primitives/LoaderWithMsg";
 function SignYourSelf() {
   const { t } = useTranslation();
   const { docId } = useParams();
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   const divRef = useRef(null);
   const nodeRef = useRef(null);
   const imageRef = useRef(null);
@@ -561,7 +562,11 @@ function SignYourSelf() {
     let pdfUrl;
     if (isUploadPdf) {
       const pdfName = generatePdfName(16);
-      pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+      pdfUrl = await convertBase64ToFile(
+        pdfName,
+        pdfBase64Url,
+        "",
+      );
     }
     const widgetsType = ["signature", "stamp", "image", "initials"];
     let updatedXYPosition;
@@ -747,7 +752,10 @@ function SignYourSelf() {
     if (tenantDetails && tenantDetails === "user does not exist!") {
       alert(t("user-not-exist"));
     } else {
-      if (tenantDetails?.CompletionBody && tenantDetails?.CompletionSubject) {
+      if (
+        tenantDetails?.CompletionBody &&
+        tenantDetails?.CompletionSubject
+      ) {
         isCustomCompletionMail = true;
       }
     }
@@ -783,7 +791,7 @@ function SignYourSelf() {
       pdfFile: base64Url,
       docId: documentId,
       isCustomCompletionMail: isCustomCompletionMail,
-      signature: suffixbase64
+      signature: suffixbase64,
     };
     const resSignPdf = await Parse.Cloud.run("signPdf", params);
     if (resSignPdf) {
@@ -1358,7 +1366,7 @@ function SignYourSelf() {
                     setCurrWidgetsDetails={setCurrWidgetsDetails}
                   />
                 )}
-                {/*render email component to send email after finish signature on document */}
+                {/*render email component to send email after finish signature on document 
                 <EmailComponent
                   isEmail={isEmail}
                   setIsEmail={setIsEmail}
@@ -1367,6 +1375,7 @@ function SignYourSelf() {
                   setIsAlert={setIsAlert}
                   setIsDownloadModal={setIsDownloadModal}
                 />
+                */}
                 {/* pdf header which contain funish back button */}
                 <Header
                   pageNumber={pageNumber}

apps/OpenSign/src/pages/TemplatePlaceholder.js

@@ -165,6 +165,7 @@ const TemplatePlaceholder = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [divRef.current, isHeader]);
 
+
   //function to fetch tenant Details
   const fetchTenantDetails = async () => {
     const user = JSON.parse(
@@ -777,7 +778,11 @@ const TemplatePlaceholder = () => {
     let pdfUrl;
     if (isUploadPdf) {
       const pdfName = generatePdfName(16);
-      pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+      pdfUrl = await convertBase64ToFile(
+        pdfName,
+        pdfBase64Url,
+        "",
+      );
     }
     if (signersdata?.length > 0) {
       signersdata.forEach((x) => {
@@ -844,7 +849,11 @@ const TemplatePlaceholder = () => {
           scale
         );
         const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64,
+          "",
+        );
         const tenantId = localStorage.getItem("TenantId");
         const buffer = atob(pdfBase64);
         SaveFileSize(buffer.length, pdfUrl, tenantId);
@@ -856,7 +865,11 @@ const TemplatePlaceholder = () => {
     } else if (pdfBase64Url) {
       try {
         const pdfName = generatePdfName(16);
-        const pdfUrl = await convertBase64ToFile(pdfName, pdfBase64Url, "");
+        const pdfUrl = await convertBase64ToFile(
+          pdfName,
+          pdfBase64Url,
+          "",
+        );
         return pdfUrl;
       } catch (err) {
         console.log("error to convertBase64ToFile in placeholder flow", err);
@@ -1456,7 +1469,8 @@ const TemplatePlaceholder = () => {
                   status: defaultdata?.status || "required",
                   hint: defaultdata?.hint || "",
                   defaultValue: defaultdata?.defaultValue || "",
-                  validation: {},
+                  validation:
+                        {},
                   fontSize:
                     fontSize || currWidgetsDetails?.options?.fontSize || 12,
                   fontColor:

apps/OpenSign/src/pages/UserList.js

@@ -206,11 +206,14 @@ const UserList = () => {
         </div>
       )}
 
-      {!isLoader && (
+      {
+          !isLoader && (
             <>
               {isAdmin ? (
                 <div className="p-2 w-full bg-base-100 text-base-content op-card shadow-lg">
-              {isAlert.msg && <Alert type={isAlert.type}>{isAlert.msg}</Alert>}
+                  {isAlert.msg && (
+                    <Alert type={isAlert.type}>{isAlert.msg}</Alert>
+                  )}
                   <div className="flex flex-row items-center justify-between my-2 mx-3 text-[20px] md:text-[23px]">
                     <div className="font-light">
                       {t("report-name.Users")}{" "}
@@ -250,8 +253,12 @@ const UserList = () => {
                               <td className="px-4 py-2 font-semibold">
                                 {item?.Name}{" "}
                               </td>
-                          <td className="px-4 py-2 ">{item?.Email || "-"}</td>
+                              <td className="px-4 py-2 ">
-                          <td className="px-4 py-2">{item?.Phone || "-"}</td>
+                                {item?.Email || "-"}
+                              </td>
+                              <td className="px-4 py-2">
+                                {item?.Phone || "-"}
+                              </td>
                               <td className="px-4 py-2">
                                 {item?.UserRole?.split("_").pop() || "-"}
                               </td>
@@ -285,7 +292,9 @@ const UserList = () => {
                                         <hr className="bg-[#ccc] mt-4 " />
                                         <div className="flex items-center mt-3 gap-2 text-white">
                                           <button
-                                        onClick={() => handleToggleSubmit(item)}
+                                            onClick={() =>
+                                              handleToggleSubmit(item)
+                                            }
                                             className="op-btn op-btn-primary"
                                           >
                                             {t("yes")}
@@ -386,7 +395,8 @@ const UserList = () => {
                 </div>
               )}
             </>
-      )}
+          )
+      }
     </div>
   );
 };

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -4,7 +4,9 @@ import { useLocation, useNavigate } from "react-router";
 import axios from "axios";
 import ModalUi from "./ModalUi";
 import AddSigner from "../components/AddSigner";
-import { emailRegex } from "../constant/const";
+import {
+  emailRegex,
+} from "../constant/const";
 import Alert from "./Alert";
 import Tooltip from "./Tooltip";
 import { RWebShare } from "react-web-share";
@@ -37,7 +39,8 @@ import EditContactForm from "../components/EditContactForm";
 
 const ReportTable = (props) => {
   const copyUrlRef = useRef(null);
-  const appName = "OpenSign™";
+  const appName =
+    "OpenSign™";
   const drivename = appName === "OpenSign™" ? "OpenSign™" : "";
   const { t } = useTranslation();
   const navigate = useNavigate();
@@ -408,7 +411,8 @@ const ReportTable = (props) => {
         setSelectedTeam(formatedList);
       }
       setIsShareWith({ [item.objectId]: true });
-    } else if (act.action === "duplicate") {
+    }
+    else if (act.action === "duplicate") {
       setIsModal({ [`duplicate_${item.objectId}`]: true });
     } else if (act.action === "rename") {
       setIsModal({ [`rename_${item.objectId}`]: true });
@@ -492,7 +496,8 @@ const ReportTable = (props) => {
       setActLoader({});
     }
   };
-  const handleClose = () => {
+  const handleClose = (
+  ) => {
     setIsRevoke({});
     setIsDeleteModal({});
     setReason("");
@@ -651,7 +656,11 @@ const ReportTable = (props) => {
         if (isCompleted) {
           setIsDownloadModal({ [item.objectId]: true });
         } else {
-          const signedUrl = await getSignedUrl(url, docId, templateId);
+          const signedUrl = await getSignedUrl(
+            url,
+            docId,
+            templateId
+          );
           await fetchUrl(signedUrl, pdfName);
         }
         setActLoader({});
@@ -678,8 +687,10 @@ const ReportTable = (props) => {
     const signPdf = `${window.location.origin}/login/${encodeBase64}`;
     const variables = {
       document_title: doc.Name,
-      sender_name: doc.ExtUserPtr.Name,
+      sender_name:
-      sender_mail: doc.ExtUserPtr.Email,
+        doc.ExtUserPtr.Name,
+      sender_mail:
+        doc.ExtUserPtr.Email,
       sender_phone: doc.ExtUserPtr?.Phone || "",
       receiver_name: userDetails?.Name || "",
       receiver_email: userDetails?.Email,
@@ -707,8 +718,10 @@ const ReportTable = (props) => {
     const signPdf = `${window.location.origin}/login/${encodeBase64}`;
     const variables = {
       document_title: doc.Name,
-      sender_name: doc.ExtUserPtr.Name,
+      sender_name:
-      sender_mail: doc.ExtUserPtr.Email,
+        doc.ExtUserPtr.Name,
+      sender_mail:
+        doc.ExtUserPtr.Email,
       sender_phone: doc.ExtUserPtr?.Phone || "",
       receiver_name: userDetails?.Name || "",
       receiver_email: userDetails?.Email || "",
@@ -748,8 +761,10 @@ const ReportTable = (props) => {
     const signPdf = `${window.location.origin}/login/${encodeBase64}`;
     const variables = {
       document_title: doc.Name,
-      sender_name: doc.ExtUserPtr.Name,
+      sender_name:
-      sender_mail: doc.ExtUserPtr.Email,
+        doc.ExtUserPtr.Name,
+      sender_mail:
+        doc.ExtUserPtr.Email,
       sender_phone: doc.ExtUserPtr?.Phone || "",
       receiver_name: user?.signerPtr?.Name || "",
       receiver_email: user?.email ? user?.email : user?.signerPtr?.Email,
@@ -779,11 +794,14 @@ const ReportTable = (props) => {
       sessionToken: localStorage.getItem("accesstoken")
     };
     let params = {
-      replyto: doc?.ExtUserPtr?.Email || "",
+      replyto:
+        doc?.ExtUserPtr?.Email ||
+        "",
       extUserId: doc?.ExtUserPtr?.objectId,
       recipient: userDetails?.Email,
       subject: mail.subject,
-      from: doc?.ExtUserPtr?.Email,
+      from:
+        doc?.ExtUserPtr?.Email,
       html: mail.body
     };
     try {
@@ -792,7 +810,8 @@ const ReportTable = (props) => {
         setIsAlert(true);
         setAlertMsg({ type: "success", message: t("mail-sent-alert") });
         setIsResendMail({});
-      } else {
+      }
+      else {
         setIsAlert(true);
         setAlertMsg({
           type: "danger",
@@ -1726,7 +1745,11 @@ const ReportTable = (props) => {
                                         <i className={act.btnIcon}></i>
                                         {act.btnLabel && (
                                           <span className="uppercase font-medium">
-                                            {`${t(`btnLabel.${act.btnLabel}`)}`}
+                                            {
+                                                  `${t(
+                                                    `btnLabel.${act.btnLabel}`
+                                                  )}`
+                                            }
                                           </span>
                                         )}
                                         {/* template report */}
@@ -1806,9 +1829,7 @@ const ReportTable = (props) => {
                                         title={t(`btnLabel.${act.hoverLabel}`)}
                                         className={
                                           act.action !== "option"
-                                            ? `${
+                                            ? `${act?.btnColor || ""} op-btn op-btn-sm mr-1`
-                                                act?.btnColor || ""
-                                              } op-btn op-btn-sm mr-1`
                                             : "text-base-content focus:outline-none text-lg mr-2 relative"
                                         }
                                       >
@@ -1910,7 +1931,9 @@ const ReportTable = (props) => {
                                         </div>
                                       </div>
                                       <button
-                                  onClick={(e) => handleShareWith(e, item)}
+                                        onClick={(e) =>
+                                          handleShareWith(e, item)
+                                        }
                                         className="op-btn op-btn-primary ml-[10px] my-3"
                                       >
                                         {t("submit")}
@@ -2007,7 +2030,9 @@ const ReportTable = (props) => {
                           {isBulkSend[item.objectId] && (
                             <ModalUi
                               isOpen
-                              title={t("quick-send")}
+                              title={
+                                    t("quick-send")
+                              }
                               handleClose={() => setIsBulkSend({})}
                             >
                               {isLoader[item.objectId] ? (

apps/OpenSignServer/Utils.js

@@ -5,7 +5,8 @@ import { PDFDocument } from 'pdf-lib';
 dotenv.config();
 
 export const cloudServerUrl = 'http://localhost:8080/app';
-export const appName = 'OpenSign™';
+export const appName =
+  'OpenSign™';
 export function customAPIurl() {
   const url = new URL(cloudServerUrl);
   return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;
@@ -150,6 +151,7 @@ export const smtpsecure = process.env.SMTP_PORT && process.env.SMTP_PORT !== '46
 export const smtpenable =
   process.env.SMTP_ENABLE && process.env.SMTP_ENABLE.toLowerCase() === 'true' ? true : false;
 
+
 // `generateId` is used to unique Id for fileAdapter
 export function generateId(length) {
   const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
@@ -229,9 +231,11 @@ export const flattenPdf = async pdfFile => {
 export const mailTemplate = param => {
   const themeColor = '#47a3ad';
   const subject = `${param.senderName} has requested you to sign "${param.title}"`;
-  const logo = `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' />`;
+  const logo =
+        `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' />`;
 
-  const opurl = ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
+  const opurl =
+        ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
 
   const body =
     "<html><head><meta http-equiv='Content-Type' content='text/html;charset=UTF-8' /></head><body><div style='background-color:#f5f5f5;padding:20px'><div style='background:white;padding-bottom:20px'><div style='padding:10px'>" +

apps/OpenSignServer/cloud/main.js

@@ -1,3 +1,4 @@
+
 import PDF from './parsefunction/pdf/PDF.js';
 import sendmailv3 from './parsefunction/sendMailv3.js';
 import usersignup from './parsefunction/usersignup.js';
@@ -52,6 +53,7 @@ import getUserListByOrg from './parsefunction/getUserListByOrg.js';
 import editContact from './parsefunction/editContact.js';
 import forwardDoc from './parsefunction/ForwardDoc.js';
 
+
 // This afterSave function triggers after an object is added or updated in the specified class, allowing for post-processing logic.
 Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
 Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);

apps/OpenSignServer/cloud/parsefunction/ForwardDoc.js

@@ -28,15 +28,20 @@ export default async function forwardDoc(request) {
       const docName = _docRes.Name;
       const fileAdapterId = _docRes?.FileAdapterId || '';
       const extUserId = _docRes?.ExtUserPtr?.objectId;
-      const from = _docRes?.ExtUserPtr?.Email;
+      const from =
-      const replyTo = _docRes?.ExtUserPtr?.Email;
+        _docRes?.ExtUserPtr?.Email;
-      const senderName = _docRes?.ExtUserPtr?.Name;
+      const replyTo =
+        _docRes?.ExtUserPtr?.Email;
+      const senderName =
+        _docRes?.ExtUserPtr?.Name;
 
       try {
         let mailRes;
         for (let i = 0; i < recipients.length; i++) {
-          const logo = `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>`;
+          const logo =
-          const opurl = ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
+                `<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>`;
+          const opurl =
+                ` <a href='www.opensignlabs.com' target=_blank>here</a>`;
           const themeColor = '#47a3ad';
 
           let params = {

apps/OpenSignServer/cloud/parsefunction/Newsletter.js

@@ -4,7 +4,7 @@ export default async function Newsletter(request) {
   const email = request.params.email;
   const domain = request.params.domain;
   try {
-    const envAppId = process.env.REACT_APP_APPID || 'opensign';
+    const envAppId = process.env.REACT_APP_APPID || 'legadranaxn';
     const headers = { 'Content-Type': 'application/json', 'X-Parse-Application-Id': envAppId };
     const envProdServer = process.env.REACT_APP_SERVERURL || 'https://app.opensignlabs.com/api/app';
     const newsletter = await axios.post(

apps/OpenSignServer/cloud/parsefunction/generateCertificatebydocId.js

@@ -12,7 +12,10 @@ const eSignName = 'OpenSign';
 const eSigncontact = 'hello@opensignlabs.com';
 
 // `uploadFile` is used to create url in from pdfFile
-async function uploadFile(pdfName, filepath) {
+async function uploadFile(
+  pdfName,
+  filepath,
+) {
   try {
     const filedata = fs.readFileSync(filepath);
     let fileUrl;
@@ -83,7 +86,10 @@ export default async function generateCertificatebydocId(req) {
 
       //below is used to save signed certificate in exports folder
       fs.writeFileSync(certificatePath, signedCertificate);
-      const file = await uploadFile('certificate.pdf', certificatePath);
+      const file = await uploadFile(
+        'certificate.pdf',
+        certificatePath,
+      );
       const updateDoc = new Parse.Object('contracts_Document');
       updateDoc.id = doc.objectId;
       updateDoc.set('CertificateUrl', file.imageUrl);

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

@@ -9,22 +9,21 @@ import {
   appName,
 } from '../../../Utils.js';
 import GenerateCertificate from './GenerateCertificate.js';
-import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
+import DigitalSign, { retryAsync } from './DigitalSign.js';
-import { Placeholder } from './Placeholder.js';
-import { SignPdf } from '@signpdf/signpdf';
-import { P12Signer } from '@signpdf/signer-p12';
-
 const serverUrl = cloudServerUrl; // process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 const eSignName = 'OpenSign';
-const eSigncontact = 'hello@opensignlabs.com';
 const logo =
       "<img src='https://qikinnovation.ams3.digitaloceanspaces.com/logo.png' height='50' style='padding:20px'/>";
-const opurl = ` <a href=www.opensignlabs.com target=_blank>here</a>`;
+const opurl =
+      ` <a href=www.opensignlabs.com target=_blank>here</a>`;
 
 // `updateDoc` is used to create url in from pdfFile
-async function uploadFile(pdfName, filepath) {
+async function uploadFile(
+  pdfName,
+  filepath,
+) {
   try {
     const filedata = fs.readFileSync(filepath);
     let fileUrl;
@@ -196,7 +195,8 @@ async function sendCompletedMail(obj) {
 
     const variables = {
       document_title: pdfName,
-      sender_name: sender.Name,
+      sender_name:
+        sender.Name,
       sender_mail: doc?.SenderMail || sender.Email,
       sender_phone: sender?.Phone || '',
       receiver_name: sender.Name,
@@ -213,8 +213,11 @@ async function sendCompletedMail(obj) {
   const params = {
     extUserId: sender.objectId,
     url: url,
-    from: appName,
+    from:
-    replyto: doc?.ExtUserPtr?.Email || '',
+      appName,
+    replyto:
+      doc?.ExtUserPtr?.Email ||
+      '',
     recipient: recipient,
     subject: subject,
     pdfName: pdfName,
@@ -241,32 +244,48 @@ async function sendCompletedMail(obj) {
   }
 }
 
+
 // `sendMailsaveCertifcate` is used send completion mail and update complete status of document
-async function sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, filename) {
+async function sendMailsaveCertifcate(
+  doc,
+  pfx,
+  isCustomMail,
+  mailProvider,
+  filename,
+) {
   const certificate = await GenerateCertificate(doc);
   const certificatePdf = await PDFDocument.load(certificate);
-  const P12Buffer = fs.readFileSync(pfx.name);
+
-  const p12 = new P12Signer(P12Buffer, { passphrase: pfx.passphrase || null });
-  //  `pdflibAddPlaceholder` is used to add code of only digitial sign in certificate
-  pdflibAddPlaceholder({
-    pdfDoc: certificatePdf,
-    reason: `Digitally signed by ${eSignName}.`,
-    location: 'n/a',
-    name: eSignName,
-    contactInfo: eSigncontact,
-    signatureLength: 15000,
-  });
   const pdfWithPlaceholderBytes = await certificatePdf.save();
   const CertificateBuffer = Buffer.from(pdfWithPlaceholderBytes);
-  //`new signPDF` create new instance of CertificateBuffer and p12Buffer
-  const certificateOBJ = new SignPdf();
-  // `signedCertificate` is used to sign certificate digitally
-  const signedCertificate = await certificateOBJ.sign(CertificateBuffer, p12);
-  const certificatePath = `./exports/signed_certificate_${doc.objectId}.pdf`;
 
+  let certificatePath = `./exports/certificate_${doc.objectId}.pdf`;
   //below is used to save signed certificate in exports folder
-  fs.writeFileSync(certificatePath, signedCertificate);
+  fs.writeFileSync(certificatePath, CertificateBuffer);
-  const file = await uploadFile('certificate.pdf', certificatePath);
+  const details = { reason: `Digitally signed by ${eSignName}.`, location: 'n/a', name: eSignName };
+
+  const res = await retryAsync(DigitalSign, [certificatePath, pfx, details]);
+  // console.log('res', res);
+  // const res = await DigitalSign(certificatePath, pfx, details);
+  if (res) {
+    const CreatedBy = {
+      __type: 'Pointer',
+      className: '_User',
+      objectId: doc.CreatedBy.objectId,
+    };
+    let logbody = {
+      documentId: doc.objectId,
+      attempt: res.attempt,
+      createdBy: CreatedBy,
+      email: doc.ExtUserPtr.Email,
+    };
+    if (fs.existsSync(certificatePath)) {
+      fs.unlinkSync(certificatePath);
+      certificatePath = `./exports/signed_certificate_${doc.objectId}.pdf`;
+      const file = await uploadFile(
+        'certificate.pdf',
+        certificatePath,
+      );
       const body = { CertificateUrl: file.imageUrl };
       await axios.put(serverUrl + '/classes/contracts_Document/' + doc.objectId, body, {
         headers: {
@@ -283,6 +302,24 @@ async function sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, file
       }
       saveFileUsage(CertificateBuffer.length, file.imageUrl, doc?.CreatedBy?.objectId);
       fs.unlinkSync(pfx.name);
+      if (res.attempt > 1) {
+        logbody = { ...logbody, status: 'success' };
+        axios.post(`${cloudServerUrl}/classes/logs_SignRetry`, logbody, {
+          headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
+        });
+      }
+    } else {
+      fs.unlinkSync(certificatePath);
+      fs.unlinkSync(pfx.name);
+      const error = new Error('certificate: ' + res.error);
+      error.code = 400; // Set the error code (e.g., 400 for bad request)
+      logbody = { ...logbody, status: 'failure', stackTrace: 'certificate: ' + res.error };
+      axios.post(`${cloudServerUrl}/classes/logs_SignRetry`, logbody, {
+        headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
+      });
+      throw error;
+    }
+  }
 }
 /**
  *
@@ -383,27 +420,54 @@ async function PDF(req) {
         form.updateFieldAppearances();
         // Flattens the form, converting all form fields into non-editable, static content
         form.flatten();
-        const p12Cert = new P12Signer(P12Buffer, { passphrase: passphrase || null });
+        const pdfWithPlaceholderBytes = await pdfDoc.save();
-        signedFilePath = `./exports/signed_${name}`;
+        PdfBuffer = Buffer.from(pdfWithPlaceholderBytes);
-        Placeholder({
+
-          pdfDoc: pdfDoc,
+        // `saveUrl` is used to save signed pdf in exports folder
+        fs.writeFileSync(filePath, PdfBuffer);
+        const details = {
           reason: `Digitally signed by ${eSignName} for ${reason}`,
           location: 'n/a',
           name: eSignName,
-          contactInfo: eSigncontact,
+        };
-          signatureLength: 15000,
+        const res = await retryAsync(DigitalSign, [filePath, pfx, details]);
+        // const res = await DigitalSign(filePath, pfx, details);
+        // console.log('res', res);
+        if (res) {
+          signedFilePath = `./exports/signed_${name}`;
+          const CreatedBy = {
+            __type: 'Pointer',
+            className: '_User',
+            objectId: _resDoc.CreatedBy.objectId,
+          };
+          let logbody = {
+            documentId: _resDoc.objectId,
+            attempt: res.attempt,
+            createdBy: CreatedBy,
+            email: _resDoc.ExtUserPtr.Email,
+          };
+          if (fs.existsSync(signedFilePath)) {
+            const signedPdf = fs.readFileSync(signedFilePath);
+            pdfSize = signedPdf.length;
+            console.log(`✅ New Signed PDF created called: ${signedFilePath} \n`);
+            fs.unlinkSync(filePath);
+            if (res.attempt > 1) {
+              logbody = { ...logbody, status: 'success' };
+              axios.post(`${cloudServerUrl}/classes/logs_SignRetry`, logbody, {
+                headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
               });
-        const pdfWithPlaceholderBytes = await pdfDoc.save();
+            }
-        PdfBuffer = Buffer.from(pdfWithPlaceholderBytes);
+          } else {
-        //`new signPDF` create new instance of pdfBuffer and p12Buffer
+            fs.unlinkSync(filePath);
-        const OBJ = new SignPdf();
+            const error = new Error(res.error);
-        // `signedDocs` is used to signpdf digitally
+            error.code = 400; // Set the error code (e.g., 400 for bad request)
-        const signedDocs = await OBJ.sign(PdfBuffer, p12Cert);
+            logbody = { ...logbody, status: 'failure', stackTrace: res.error };
-
+            axios.post(`${cloudServerUrl}/classes/logs_SignRetry`, logbody, {
-        //`saveUrl` is used to save signed pdf in exports folder
+              headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
-        fs.writeFileSync(signedFilePath, signedDocs);
+            });
-        pdfSize = signedDocs.length;
+            throw error;
-        console.log(`✅ PDF digitally signed created: ${signedFilePath} \n`);
+          }
+        }
       } else {
         //`saveUrl` is used to save signed pdf in exports folder
         fs.writeFileSync(signedFilePath, PdfBuffer);
@@ -412,7 +476,10 @@ async function PDF(req) {
       }
 
       // `uploadFile` is used to upload pdf to aws s3 and get it's url
-      const data = await uploadFile(`signed_${name}`, signedFilePath);
+      const data = await uploadFile(
+        `signed_${name}`,
+        signedFilePath,
+      );
 
       if (data && data.imageUrl) {
         // `axios` is used to update signed pdf url in contracts_Document classes for given DocId
@@ -429,7 +496,13 @@ async function PDF(req) {
         saveFileUsage(pdfSize, data.imageUrl, _resDoc?.CreatedBy?.objectId);
         if (updatedDoc && updatedDoc.isCompleted) {
           const doc = { ..._resDoc, AuditTrail: updatedDoc.AuditTrail, SignedUrl: data.imageUrl };
-          sendMailsaveCertifcate(doc, pfx, isCustomMail, mailProvider, `signed_${name}`);
+          sendMailsaveCertifcate(
+            doc,
+            pfx,
+            isCustomMail,
+            mailProvider,
+            `signed_${name}`,
+          );
         } else {
           fs.unlinkSync(pfxname);
         }

docker-compose.yml

@@ -11,8 +11,7 @@ services:
     env_file: .env.prod
     environment:
       - NODE_ENV=production
-      - SERVER_URL=${HOST_URL:-https://localhost:3001}/api/app
+      - SERVER_URL=${HOST_URL:-https://localhost:3001}/app
-      - PUBLIC_URL=${HOST_URL:-https://localhost:3001}
     networks:
       - app-network
   mongo: