Merge pull request #998 from OpenSignLabs/input_text_darkmode

fix: type initials and signature looks blurry on download pdf

.env.local_dev

@@ -20,7 +20,7 @@ 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.
 MASTER_KEY=XnAadwKxxByMr
 # Mongodb URI to connect to
-MONGODB_URI=mongodb://host.docker.internal:27018/OpenSignDB
+MONGODB_URI=mongodb://mongo-container:27017/OpenSignDB
 # Path on which APIs should be mounted. Do not change this. This variable shall be removed & value hardcoded in the source code in coming versions.
 PARSE_MOUNT=/app
 # Set it to the URL from where APIs will be accessible to the NodeJS functions, for local development it should be localhost:3000/api/app (use your local port number instead)

apps/OpenSign/package.json

@@ -4,10 +4,10 @@
   "private": true,
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.7.2",
+    "@lottiefiles/dotlottie-react": "^0.8.5",
     "@radix-ui/themes": "^3.1.1",
     "@react-pdf/renderer": "^3.4.4",
-    "@reduxjs/toolkit": "^2.2.6",
+    "@reduxjs/toolkit": "^2.2.7",
     "axios": "^1.7.2",
     "file-saver": "^2.0.5",
     "jwt-decode": "^4.0.0",
@@ -20,8 +20,8 @@
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.4",
     "react-confetti": "^6.1.0",
-    "react-cookie": "^7.1.4",
-    "react-datepicker": "^7.2.0",
+    "react-cookie": "^7.2.0",
+    "react-datepicker": "^7.3.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dnd-multi-backend": "^8.0.3",
@@ -46,7 +46,7 @@
     "redux-thunk": "^3.1.0",
     "regex-parser": "^2.3.0",
     "serve": "^14.2.3",
-    "styled-components": "^4.4.1",
+    "styled-components": "^5.3.0",
     "web-vitals": "^4.2.2",
     "ws": "^8.18.0"
   },
@@ -88,10 +88,10 @@
     }
   },
   "devDependencies": {
-    "@babel/core": "^7.24.6",
-    "@babel/preset-env": "^7.24.6",
-    "@babel/preset-react": "^7.24.6",
-    "@babel/runtime-corejs2": "^7.24.7",
+    "@babel/core": "^7.25.2",
+    "@babel/preset-env": "^7.25.3",
+    "@babel/preset-react": "^7.24.7",
+    "@babel/runtime-corejs2": "^7.25.0",
     "autoprefixer": "^10.4.19",
     "babel-loader": "^9.1.3",
     "clean-webpack-plugin": "^4.0.0",
@@ -102,14 +102,14 @@
     "dotenv": "^16.4.5",
     "dotenv-webpack": "^8.1.0",
     "eslint": "^8.57.0",
-    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.34.3",
     "lint-staged": "^15.2.7",
     "mini-css-extract-plugin": "^2.9.0",
-    "postcss": "^8.4.39",
+    "postcss": "^8.4.40",
     "prettier": "^3.3.3",
     "pretty-quick": "^4.0.0",
-    "tailwindcss": "^3.4.6",
+    "tailwindcss": "^3.4.7",
     "terser-webpack-plugin": "^5.3.10",
     "webpack-cli": "^5.1.4"
   },

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

@@ -15,7 +15,7 @@ import "../../styles/signature.css";
 import RegexParser from "regex-parser";
 import { emailRegex } from "../../constant/const";
 const textWidgetCls =
-  "w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center whitespace-pre-wrap";
+  "w-full h-full md:min-w-full md:min-h-full z-[999] text-[12px] rounded-[2px] border-[1px] border-[#007bff] overflow-hidden resize-none outline-none text-base-content item-center whitespace-pre-wrap bg-white";
 const selectWidgetCls =
   "w-full h-full absolute left-0 top-0 border-[1px] border-[#007bff] rounded-[2px] focus:outline-none text-base-content";
 function PlaceholderType(props) {
@@ -430,7 +430,7 @@ function PlaceholderType(props) {
     case "dropdown":
       return props.data?.signerObjId === props.signerObjId ? (
         <select
-          className={`${selectWidgetCls} text-[12px]`}
+          className={`${selectWidgetCls} text-[12px] bg-inherit`}
           id="myDropdown"
           value={selectOption}
           onChange={(e) => {

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

@@ -579,7 +579,7 @@ function RenderPdf({
             {/* this component for render pdf document is in middle of the component */}
             <Document
               onLoadError={() => {
-                pdfLoad(false);
+                setPdfLoad(false);
               }}
               loading={"Loading Document.."}
               onLoadSuccess={pageDetails}

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

@@ -1,6 +1,5 @@
 import React, { useRef, useState, useEffect } from "react";
 import SignatureCanvas from "react-signature-canvas";
-
 function SignPad({
   isSignPad,
   isStamp,
@@ -99,7 +98,12 @@ function SignPad({
               } else {
                 if (isTab === "type") {
                   setIsSignImg("");
-                  onSaveSign(null, false, textWidth, textHeight);
+                  onSaveSign(
+                    null,
+                    false,
+                    !isInitial && textWidth > 150 ? 150 : textWidth,
+                    !isInitial && textHeight > 35 ? 35 : textHeight
+                  );
                 } else {
                   setIsSignImg("");
                   canvasRef.current.clear();
@@ -211,11 +215,11 @@ function SignPad({
       : fontSelect
         ? fontSelect
         : "Fasthand";
-
+    const fontSizeValue = "40px";
     //creating span for getting text content width
     const span = document.createElement("span");
     span.textContent = textContent;
-    span.style.font = `20px ${fontfamily}`; // here put your text size and font family
+    span.style.font = `${fontSizeValue} ${fontfamily}`; // here put your text size and font family
     span.style.color = color ? color : penColor;
     span.style.display = "hidden";
     document.body.appendChild(span); // Replace 'container' with the ID of the container element
@@ -225,7 +229,8 @@ function SignPad({
     // Draw the text content on the canvas
     const ctx = canvasElement.getContext("2d");
     const pixelRatio = window.devicePixelRatio || 1;
-    const width = span.offsetWidth;
+    const addExtraWidth = isInitial ? 10 : 50;
+    const width = span.offsetWidth + addExtraWidth;
     const height = span.offsetHeight;
     setTextWidth(width);
     setTextHeight(height);

apps/OpenSign/src/components/shared/fields/DropboxChoose.js

@@ -54,7 +54,7 @@ export default function DropboxChooser({ children, onSuccess, onCancel }) {
   return (
     <div onClick={handleChoose}>
       {children || (
-        <button className="px-2 py-[2px] text-2xl rounded border-[1px] text-blue-400 border-gray-300 w-full">
+        <button className="cursor-pointer op-input op-input-bordered focus:outline-none hover:border-base-content max-h-[35px] max-w-[45px] flex justify-center items-center">
           <i className="fa-brands fa-dropbox"></i>
         </button>
       )}

apps/OpenSign/src/constant/Utils.js

@@ -598,7 +598,7 @@ export const signPdfFun = async (
         console.log("error", e);
       }
     }
-    //change image width and height to 104/44 in png base64
+    //change image width and height to 100/40 in png base64
     const getNewse64 = await changeImageWH(base64Sign);
     //remove suffiix of base64
     const suffixbase64 = getNewse64 && getNewse64.split(",").pop();
@@ -1238,9 +1238,8 @@ export const changeImageWH = async (base64Image) => {
       const ctx = canvas.getContext("2d");
       canvas.width = newWidth;
       canvas.height = newHeight;
-      ctx.imageSmoothingEnabled = false;
       ctx.drawImage(img, 0, 0, newWidth, newHeight);
-      const resizedBase64 = canvas.toDataURL("image/png", 1);
+      const resizedBase64 = canvas.toDataURL("image/png", 1.0);
       resolve(resizedBase64);
     };
     img.onerror = (error) => {
@@ -1979,6 +1978,20 @@ export const handleSendOTP = async (email) => {
     alert(error.message);
   }
 };
+export const fetchUrl = async (url, pdfName) => {
+  try {
+    const response = await fetch(url);
+    if (!response.ok) {
+      alert("something went wrong, please try again later.");
+      throw new Error("Network response was not ok");
+    }
+    const blob = await response.blob();
+    saveAs(blob, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
+  } catch (error) {
+    alert("something went wrong, please try again later.");
+    console.error("Error downloading the file:", error);
+  }
+};
 //handle download signed pdf
 export const handleDownloadPdf = async (
   pdfDetails,
@@ -2001,7 +2014,7 @@ export const handleDownloadPdf = async (
       }
     );
     const url = axiosRes.data.result;
-    saveAs(url, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
+    await fetchUrl(url, pdfName);
     setIsDownloading("");
   } catch (err) {
     console.log("err in getsignedurl", err);

apps/OpenSign/src/pages/Form.js

@@ -643,9 +643,9 @@ const Forms = (props) => {
                 <span className="text-red-500 text-[13px]">*</span>
               </label>
               {fileupload.length > 0 ? (
-                <div className="flex gap-2 justify-center items-center">
+                <div className="flex gap-1 justify-center items-center">
                   <div className="flex justify-between items-center op-input op-input-bordered op-input-sm w-full h-full text-[13px]">
-                    <div className="break-all">
+                    <div className="break-all cursor-default">
                       file selected: {getFileName(fileupload)}
                     </div>
                     <div
@@ -663,7 +663,7 @@ const Forms = (props) => {
                   )}
                 </div>
               ) : (
-                <div className="flex gap-2 justify-center items-center ">
+                <div className="flex gap-1 justify-center items-center">
                   <input
                     type="file"
                     className="op-file-input op-file-input-bordered op-file-input-sm focus:outline-none hover:border-base-content w-full text-xs"

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -771,7 +771,7 @@ function SignYourSelf() {
         console.log("error", e);
       }
     }
-    //change image width and height to 104/44 in png base64
+    //change image width and height to 100/40 in png base64
     const getNewse64 = await changeImageWH(base64Sign);
     //remove suffiix of base64
     const suffixbase64 = getNewse64 && getNewse64.split(",").pop();

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -10,10 +10,10 @@ import Tooltip from "./Tooltip";
 import { RWebShare } from "react-web-share";
 import Tour from "reactour";
 import Parse from "parse";
-import { saveAs } from "file-saver";
 import {
   checkIsSubscribedTeam,
   copytoData,
+  fetchUrl,
   replaceMailVaribles
 } from "../constant/Utils";
 import Confetti from "react-confetti";
@@ -595,14 +595,18 @@ const ReportTable = (props) => {
 
   // `handleDownload` is used to get valid doc url available in completed report
   const handleDownload = async (item) => {
+    setActLoader({ [`${item.objectId}`]: true });
     const url = item?.SignedUrl || item?.URL || "";
+    const pdfName = item?.Name || "exported_file";
     if (url) {
       try {
         const signedUrl = await Parse.Cloud.run("getsignedurl", { url: url });
-        saveAs(signedUrl);
+        await fetchUrl(signedUrl, pdfName);
+        setActLoader({});
       } catch (err) {
         console.log("err in getsignedurl", err);
         alert("something went wrong, please try again later.");
+        setActLoader({});
       }
     }
   };

apps/OpenSign/src/primitives/ValidateRoute.js

@@ -20,15 +20,21 @@ const ValidateRoute = () => {
     })();
   }, []);
   const handlelogout = async () => {
-    try {
-      // if (Parse?.User?.current()) {
-      //   Parse?.User?.logOut();
-      // }
-      localStorage.removeItem("accesstoken");
-    } catch (err) {
-      console.log("err ", err);
-      localStorage.removeItem("accesstoken");
-    }
+    let appdata = localStorage.getItem("userSettings");
+    let applogo = localStorage.getItem("appLogo");
+    let defaultmenuid = localStorage.getItem("defaultmenuid");
+    let PageLanding = localStorage.getItem("PageLanding");
+    let baseUrl = localStorage.getItem("baseUrl");
+    let appid = localStorage.getItem("parseAppId");
+
+    localStorage.clear();
+
+    localStorage.setItem("appLogo", applogo);
+    localStorage.setItem("defaultmenuid", defaultmenuid);
+    localStorage.setItem("PageLanding", PageLanding);
+    localStorage.setItem("userSettings", appdata);
+    localStorage.setItem("baseUrl", baseUrl);
+    localStorage.setItem("parseAppId", appid);
   };
   return <div>{<Outlet />}</div>;
 };

apps/OpenSign/tailwind.config.js

@@ -8,38 +8,7 @@ module.exports = {
   daisyui: {
     // themes: true,
     themes: [
-      "light",
       "dark",
-      "cupcake",
-      "bumblebee",
-      "emerald",
-      "corporate",
-      "synthwave",
-      "retro",
-      "cyberpunk",
-      "valentine",
-      "halloween",
-      "garden",
-      "forest",
-      "aqua",
-      "lofi",
-      "pastel",
-      "fantasy",
-      "wireframe",
-      "black",
-      "luxury",
-      "dracula",
-      "cmyk",
-      "autumn",
-      "business",
-      "acid",
-      "lemonade",
-      "night",
-      "coffee",
-      "winter",
-      "dim",
-      "nord",
-      "sunset",
       {
         opensigncss: {
           primary: "#002864",

apps/OpenSignServer/Utils.js

@@ -4,8 +4,9 @@ dotenv.config();
 
 const appId = process.env.APP_ID;
 const serverUrl = process.env.SERVER_URL;
+export const cloudServerUrl = 'http://localhost:8080/app';
 export function customAPIurl() {
-  const url = new URL(process.env.SERVER_URL);
+  const url = new URL(cloudServerUrl);
   return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;
 }
 

apps/OpenSignServer/cloud/customRoute/autoReminder.js

@@ -1,4 +1,5 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
 // `replaceMailVaribles` is used to replace variables from mail with there actual values
 function replaceMailVaribles(subject, body, variables) {
@@ -26,7 +27,7 @@ function replaceMailVaribles(subject, body, variables) {
 async function sendMail(doc, signer) {
   const subject = `{{sender_name}} has requested you to sign "{{document_title}}"`;
   const body = `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}}&nbsp;has requested you to review and sign&nbsp;<b>"{{document_title}}"</b>.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p>{{signing_url}}</p><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team OpenSign™</p><br></body> </html>`;
-  const url = `${process.env.SERVER_URL}/functions/sendmailv3`;
+  const url = `${cloudServerUrl}/functions/sendmailv3`;
   const headers = {
     'Content-Type': 'application/json',
     'X-Parse-Application-Id': process.env.APP_ID,

apps/OpenSignServer/cloud/customRoute/googleauth.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 const appId = process.env.APP_ID;
-const serverUrl = process.env.SERVER_URL;
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 export default async function gooogleauth(request, response) {
   const code = request.body.code;
   const baseUrl = new URL(process.env.SERVER_URL);

apps/OpenSignServer/cloud/customRoute/uploadFile.js

@@ -3,7 +3,7 @@ import multer from 'multer';
 import multerS3 from 'multer-s3';
 import aws from 'aws-sdk';
 import dotenv from 'dotenv';
-import { useLocal } from '../../Utils.js';
+import { cloudServerUrl, useLocal } from '../../Utils.js';
 dotenv.config();
 
 function sanitizeFileName(fileName) {
@@ -49,7 +49,7 @@ async function uploadFile(req, res) {
     const DO_SECRET_ACCESS_KEY = process.env.DO_SECRET_ACCESS_KEY;
     const DO_SPACE = process.env.DO_SPACE;
 
-    const parseBaseUrl = process.env.SERVER_URL;
+    const parseBaseUrl = cloudServerUrl; //process.env.SERVER_URL;
     const parseAppId = process.env.APP_ID;
     let fileStorage;
     if (useLocal === 'true') {

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

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { customAPIurl, replaceMailVaribles } from '../../../../Utils.js';
+import { cloudServerUrl, customAPIurl, replaceMailVaribles } from '../../../../Utils.js';
 
 // `sendDoctoWebhook` is used to send res data of document on webhook
 async function sendDoctoWebhook(doc, WebhookUrl, userId) {
@@ -220,7 +220,7 @@ export default async function createDocumentWithTemplate(request, response) {
               for (let i = 0; i < contactMail.length; i++) {
                 try {
                   const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
-                  let url = `${process.env.SERVER_URL}/functions/sendmailv3/`;
+                  let url = `${cloudServerUrl}/functions/sendmailv3/`;
                   const headers = {
                     'Content-Type': 'application/json',
                     'X-Parse-Application-Id': process.env.APP_ID,

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

@@ -6,6 +6,7 @@ import {
   saveFileUsage,
   formatWidgetOptions,
   sanitizeFileName,
+  cloudServerUrl,
 } from '../../../../Utils.js';
 
 // `sendDoctoWebhook` is used to send res data of document on webhook
@@ -281,7 +282,7 @@ export default async function createDocumentwithCoordinate(request, response) {
           for (let i = 0; i < contactMail.length; i++) {
             try {
               const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
-              let url = `${process.env.SERVER_URL}/functions/sendmailv3/`;
+              let url = `${cloudServerUrl}/functions/sendmailv3/`;
               const headers = {
                 'Content-Type': 'application/json',
                 'X-Parse-Application-Id': process.env.APP_ID,

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

@@ -1,12 +1,13 @@
 import axios from 'axios';
 import reportJson from '../../../parsefunction/reportsJson.js';
 import dotenv from 'dotenv';
+import { cloudServerUrl } from '../../../../Utils.js';
 dotenv.config();
 
 export default async function getDocumentList(request, response) {
   const reqToken = request.headers['x-api-token'];
   const appId = process.env.APP_ID;
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   if (!reqToken) {
     return response.status(400).json({ error: 'Please Provide API Token' });
   }

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

@@ -1,10 +1,11 @@
 import axios from 'axios';
 import dotenv from 'dotenv';
+import { cloudServerUrl } from '../../../../Utils.js';
 dotenv.config();
 export default async function getTemplatetList(request, response) {
   const reqToken = request.headers['x-api-token'];
   const appId = process.env.APP_ID;
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   if (!reqToken) {
     return response.status(400).json({ error: 'Please Provide API Token' });
   }

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

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { replaceMailVaribles } from '../../../../Utils.js';
+import { cloudServerUrl, replaceMailVaribles } from '../../../../Utils.js';
 
 export default async function resendMail(request, response) {
   try {
@@ -44,7 +44,7 @@ export default async function resendMail(request, response) {
         if (contact) {
           try {
             const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
-            let url = `${process.env.SERVER_URL}/functions/sendmailv3/`;
+            let url = `${cloudServerUrl}/functions/sendmailv3/`;
             const headers = {
               'Content-Type': 'application/json',
               'X-Parse-Application-Id': process.env.APP_ID,

apps/OpenSignServer/cloud/parsefunction/AddAdmin.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
-const serverUrl = process.env.SERVER_URL;
+import { cloudServerUrl } from '../../Utils.js';
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 async function addTeamAndOrg(extUser) {

apps/OpenSignServer/cloud/parsefunction/AuthLoginAsMail.js

@@ -1,8 +1,9 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 async function AuthLoginAsMail(request) {
   try {
     //function for login user using user objectId without touching user's password
-    const serverUrl = process.env.SERVER_URL;
+    const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
     const APPID = process.env.APP_ID;
     const masterKEY = process.env.MASTER_KEY;
 

apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js

@@ -4,7 +4,8 @@ async function DocumentAftersave(request) {
       console.log('new entry is insert in contracts_Document');
       const createdAt = request.object.get('createdAt');
       const Folder = request.object.get('Type');
-      const ip = request?.headers?.['x-real-ip'] || request.object?.get('OriginIp') || '';
+      const ip = request?.headers?.['x-real-ip'] || '';
+      const originIp = request?.object?.get('OriginIp') || '';
       if (createdAt && Folder === undefined) {
         // console.log("IN If condition")
         const TimeToCompleteDays = request.object.get('TimeToCompleteDays') || 15;
@@ -13,7 +14,9 @@ async function DocumentAftersave(request) {
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
-        updateQuery.set('OriginIp', ip);
+        if (!originIp) {
+          updateQuery.set('OriginIp', ip);
+        }
         const AutoReminder = request?.object?.get('AutomaticReminders') || false;
         if (AutoReminder) {
           const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
@@ -29,7 +32,9 @@ async function DocumentAftersave(request) {
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
-        updateQuery.set('OriginIp', ip);
+        if (!originIp) {
+          updateQuery.set('OriginIp', ip);
+        }
         const AutoReminder = request?.object?.get('AutomaticReminders') || false;
         if (AutoReminder) {
           const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;

apps/OpenSignServer/cloud/parsefunction/FacebookSign.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
-const serverUrl = process.env.SERVER_URL;
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 

apps/OpenSignServer/cloud/parsefunction/GetTemplate.js

@@ -1,7 +1,8 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
 export default async function GetTemplate(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const templateId = request.params.templateId;
   const ispublic = request.params.ispublic;
 

apps/OpenSignServer/cloud/parsefunction/GoogleSign.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
-const serverUrl = process.env.SERVER_URL;
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 

apps/OpenSignServer/cloud/parsefunction/callWebhook.js

@@ -1,10 +1,11 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 export default async function callWebhook(request) {
   const event = request.params.event;
   const body = request.params.body;
   const docId = body.objectId;
   const contactId = request.params.contactId;
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const userRes = await axios.get(serverUrl + '/users/me', {
     headers: {

apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
-const serverUrl = process.env.SERVER_URL;
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const appId = process.env.APP_ID;
 
 async function sendMail(document, sessionToken) {

apps/OpenSignServer/cloud/parsefunction/generateApiToken.js

@@ -1,7 +1,8 @@
 import { generateApiKey } from 'generate-api-key';
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 export default async function generateApiToken(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   try {
     const userRes = await axios.get(serverUrl + '/users/me', {
       headers: {

apps/OpenSignServer/cloud/parsefunction/getDocument.js

@@ -1,7 +1,8 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
 export default async function getDocument(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const docId = request.params.docId;
 
   try {

apps/OpenSignServer/cloud/parsefunction/getDrive.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 export default async function getDrive(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const limit = request.params.limit;
   const skip = request.params.skip;

apps/OpenSignServer/cloud/parsefunction/getInvoices.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
-const serverUrl = process.env.SERVER_URL;
+import { cloudServerUrl } from '../../Utils.js';
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const appId = process.env.APP_ID;
 export default async function getInvoices(request) {
   const limit = request.params.limit || 100;

apps/OpenSignServer/cloud/parsefunction/getPayments.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
-const serverUrl = process.env.SERVER_URL;
+import { cloudServerUrl } from '../../Utils.js';
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const appId = process.env.APP_ID;
 export default async function getPayments(request) {
   const limit = request.params.limit || 100;

apps/OpenSignServer/cloud/parsefunction/getReport.js

@@ -1,3 +1,4 @@
+import { cloudServerUrl } from '../../Utils.js';
 import reportJson from './reportsJson.js';
 import axios from 'axios';
 
@@ -6,7 +7,7 @@ export default async function getReport(request) {
   const limit = request.params.limit;
   const skip = request.params.skip;
 
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const masterKey = process.env.MASTER_KEY;
   try {

apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
-const serverUrl = process.env.SERVER_URL;
+import { cloudServerUrl } from '../../Utils.js';
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const appId = process.env.APP_ID;
 export default async function getSubscription(request) {
   const extUserId = request.params.extUserId || '';

apps/OpenSignServer/cloud/parsefunction/getapitoken.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 export default async function getapitoken(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   try {
     const userRes = await axios.get(serverUrl + '/users/me', {
       headers: {

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

@@ -4,9 +4,9 @@ import { SignPdf } from '@signpdf/signpdf';
 import { P12Signer } from '@signpdf/signer-p12';
 import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
 import { PDFDocument } from 'pdf-lib';
-import { replaceMailVaribles, saveFileUsage } from '../../../Utils.js';
+import { cloudServerUrl, replaceMailVaribles, saveFileUsage } from '../../../Utils.js';
 import GenerateCertificate from './GenerateCertificate.js';
-const serverUrl = process.env.SERVER_URL;
+const serverUrl = cloudServerUrl; // process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 const eSignName = 'opensign';

apps/OpenSignServer/cloud/parsefunction/saveSubscription.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 export default async function saveSubscription(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const subscription = request.params.subscription;
   const SubscriptionId = subscription.data.subscription.subscription_id;

apps/OpenSignServer/cloud/parsefunction/saveWebhook.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 export default async function savewebhook(request) {
-  const serverUrl = process.env.SERVER_URL;
+  const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
   try {
     const userRes = await axios.get(serverUrl + '/users/me', {
       headers: {

apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js

@@ -2,6 +2,8 @@ import axios from 'axios';
 import { google } from 'googleapis';
 import fs from 'node:fs';
 import https from 'https';
+import http from 'http';
+import { useLocal } from '../../Utils.js';
 const clientId = process.env.GOOGLE_CLIENT_ID;
 const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
 // Function to create a Gmail client
@@ -26,6 +28,7 @@ const refreshAccessToken = async refreshToken => {
 
 // Function to create a raw email message
 const makeEmail = async (to, from, subject, html, url, pdfName) => {
+  const protocol = new URL(process.env.SERVER_URL);
   const htmlContent = html;
   const boundary = 'boundary_' + Date.now().toString(16);
   let str;
@@ -34,10 +37,17 @@ const makeEmail = async (to, from, subject, html, url, pdfName) => {
     let Pdf = fs.createWriteStream('test.pdf');
     const writeToLocalDisk = () => {
       return new Promise((resolve, reject) => {
-        https.get(url, async function (response) {
-          response.pipe(Pdf);
-          response.on('end', () => resolve('success'));
-        });
+        if (useLocal !== 'true' && protocol.hostname !== 'localhost') {
+          https.get(url, async function (response) {
+            response.pipe(Pdf);
+            response.on('end', () => resolve('success'));
+          });
+        } else {
+          http.get(url, async function (response) {
+            response.pipe(Pdf);
+            response.on('end', () => resolve('success'));
+          });
+        }
       });
     };
     // `writeToLocalDisk` is used to create pdf file from doc url
@@ -130,7 +140,7 @@ export default async function sendMailGmailProvider(_extRes, template) {
           raw: email,
         },
       });
-    //   console.log('response ', response);
+      //   console.log('response ', response);
 
       return { code: 200, message: 'Email sent successfully' };
     } catch (error) {

apps/OpenSignServer/cloud/parsefunction/sendMailv3.js

@@ -1,11 +1,13 @@
 import fs from 'node:fs';
 import https from 'https';
+import http from 'http';
 import formData from 'form-data';
 import Mailgun from 'mailgun.js';
-import { smtpenable, smtpsecure, updateMailCount } from '../../Utils.js';
+import { smtpenable, smtpsecure, updateMailCount, useLocal } from '../../Utils.js';
 import sendMailGmailProvider from './sendMailGmailProvider.js';
 import { createTransport } from 'nodemailer';
 async function sendMailProvider(req) {
+  const protocol = new URL(process.env.SERVER_URL);
   try {
     let transporterSMTP;
     let mailgunClient;
@@ -32,10 +34,17 @@ async function sendMailProvider(req) {
       let Pdf = fs.createWriteStream('test.pdf');
       const writeToLocalDisk = () => {
         return new Promise((resolve, reject) => {
-          https.get(req.params.url, async function (response) {
-            response.pipe(Pdf);
-            response.on('end', () => resolve('success'));
-          });
+          if (useLocal !== 'true' && protocol.hostname !== 'localhost') {
+            https.get(req.params.url, async function (response) {
+              response.pipe(Pdf);
+              response.on('end', () => resolve('success'));
+            });
+          } else {
+            http.get(req.params.url, async function (response) {
+              response.pipe(Pdf);
+              response.on('end', () => resolve('success'));
+            });
+          }
         });
       };
       // `writeToLocalDisk` is used to create pdf file from doc url

apps/OpenSignServer/cloud/parsefunction/ssoSignin.js

@@ -1,6 +1,7 @@
 import axios from 'axios';
+import { cloudServerUrl } from '../../Utils.js';
 
-const serverUrl = process.env.SERVER_URL;
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 const clientUrl = process.env.PUBLIC_URL;

apps/OpenSignServer/cloud/parsefunction/usersignup.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
-const serverUrl = process.env.SERVER_URL;
+import { cloudServerUrl } from '../../Utils.js';
+const serverUrl = cloudServerUrl; //process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 

apps/OpenSignServer/package.json

@@ -24,39 +24,43 @@
     "@signpdf/placeholder-pdf-lib": "^3.2.4",
     "@signpdf/signer-p12": "^3.2.4",
     "@signpdf/signpdf": "^3.2.4",
-    "aws-sdk": "^2.1659.0",
+    "aws-sdk": "^2.1665.0",
     "axios": "^1.7.2",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",
-    "express-sse": "^0.5.3",
     "form-data": "^4.0.0",
     "generate-api-key": "^1.0.2",
     "googleapis": "^140.0.1",
     "jsonschema": "^1.4.1",
     "mailgun.js": "^10.2.3",
-    "mongoose": "^8.5.1",
+    "mongoose": "^8.5.2",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",
     "node-forge": "^1.3.1",
     "nodemailer": "^6.9.14",
     "parse": "^5.3.0",
     "parse-dbtool": "^1.2.0",
-    "parse-server": "^7.1.0",
+    "parse-server": "^7.2.0",
     "parse-server-api-mail-adapter": "^4.0.0",
     "pdf-lib": "^1.17.1",
-    "posthog-node": "^4.0.1"
+    "posthog-node": "^4.0.1",
+    "ws": "^8.18.0"
   },
   "type": "module",
   "devDependencies": {
-    "@babel/eslint-parser": "^7.24.8",
-    "eslint": "^9.7.0",
-    "jasmine": "^5.1.0",
+    "@babel/eslint-parser": "^7.25.1",
+    "eslint": "^9.8.0",
+    "jasmine": "^5.2.0",
     "mongodb-runner": "^5.6.4",
     "nodemon": "^3.1.4",
     "nyc": "^17.0.0",
     "prettier": "^3.3.3"
   },
+  "overrides": {
+    "ws": "$ws",
+    "parse": "$parse"
+  },
   "engines": {
     "node": ">=12.22.10 <21"
   }