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://mongo:27017/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-cookie": "^7.2.0",
-    "react-datepicker": "^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/core": "^7.25.2",
-    "@babel/preset-env": "^7.24.6",
+    "@babel/preset-env": "^7.25.3",
-    "@babel/preset-react": "^7.24.6",
+    "@babel/preset-react": "^7.24.7",
-    "@babel/runtime-corejs2": "^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/AddTeam.js

@@ -17,7 +17,7 @@ const AddTeam = (props) => {
   const getTeamList = async () => {
     setIsLoader(true);
     try {
-      const teams = await Parse.Cloud.run("getteams");
+      const teams = await Parse.Cloud.run("getteams", { active: true });
       const teamRes = JSON.parse(JSON.stringify(teams));
       if (teamRes.length > 0) {
         const _teamRes = JSON.parse(JSON.stringify(teamRes));

apps/OpenSign/src/components/AddUser.js

@@ -35,15 +35,7 @@ const AddUser = (props) => {
 
   const getTeamList = async () => {
     setFormdata((prev) => ({ ...prev, password: generatePassword(12) }));
-    const extUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
+    const teamRes = await Parse.Cloud.run("getteams", { active: true });
-    const team = new Parse.Query("contracts_Teams");
-    team.equalTo("OrganizationId", {
-      __type: "Pointer",
-      className: "contracts_Organizations",
-      objectId: extUser.OrganizationId.objectId
-    });
-    team.notEqualTo("IsActive", false);
-    const teamRes = await team.find();
     if (teamRes.length > 0) {
       const _teamRes = JSON.parse(JSON.stringify(teamRes));
       setTeamList(_teamRes);

apps/OpenSign/src/components/Header.js

@@ -4,7 +4,12 @@ import FullScreenButton from "./FullScreenButton";
 import { useNavigate } from "react-router-dom";
 import Parse from "parse";
 import { useWindowSize } from "../hook/useWindowSize";
-import { checkIsSubscribed, getAppLogo, openInNewTab } from "../constant/Utils";
+import {
+  checkIsSubscribed,
+  checkIsSubscribedTeam,
+  getAppLogo,
+  openInNewTab
+} from "../constant/Utils";
 import { isEnableSubscription, isStaging } from "../constant/const";
 
 const Header = ({ showSidebar }) => {
@@ -15,6 +20,7 @@ const Header = ({ showSidebar }) => {
   const [isOpen, setIsOpen] = useState(false);
   const [isSubscribe, setIsSubscribe] = useState(true);
   const [isPro, setIsPro] = useState(false);
+  const [isTeam, setIsTeam] = useState(false);
   const [applogo, setAppLogo] = useState(
     localStorage.getItem("appLogo") || " "
   );
@@ -29,6 +35,7 @@ const Header = ({ showSidebar }) => {
   async function checkSubscription() {
     if (isEnableSubscription) {
       const getIsSubscribe = await checkIsSubscribed();
+      const getIsTeam = await checkIsSubscribedTeam();
       if (getIsSubscribe) {
         const applogo = await getAppLogo();
         if (applogo?.logo) {
@@ -38,6 +45,7 @@ const Header = ({ showSidebar }) => {
         }
       }
       setIsPro(getIsSubscribe);
+      setIsTeam(getIsTeam);
       setIsSubscribe(getIsSubscribe);
     }
   }
@@ -122,11 +130,16 @@ const Header = ({ showSidebar }) => {
             </button>
           </div>
         )}
-        {isPro && (
+        {!isTeam && isPro && (
           <div className="w-[35px] h-[35px] bg-white rounded-full ring-[1px] ring-offset-2 ring-[#002862] text-[#002862] overflow-hidden font-semibold flex items-center justify-center">
             PRO
           </div>
         )}
+        {isTeam && (
+          <div className="w-[35px] h-[35px] bg-white rounded-full ring-[1px] text-[13px] ring-offset-2 ring-[#002862] text-[#002862] overflow-hidden font-semibold flex items-center justify-center">
+            TEAM
+          </div>
+        )}
         <div>
           <FullScreenButton />
         </div>

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

@@ -4,6 +4,7 @@ import PlaceholderBorder from "./PlaceholderBorder";
 import { Rnd } from "react-rnd";
 import {
   defaultWidthHeight,
+  getContainerScale,
   handleCopyNextToWidget,
   isTabAndMobile,
   onChangeInput,
@@ -634,10 +635,11 @@ function Placeholder(props) {
     );
   };
   const xPos = (pos, signYourself) => {
-    const getPdfPageWidth = props.pdfOriginalWH.find(
+    const containerScale = getContainerScale(
-      (data) => data.pageNumber === props.pageNumber
+      props.pdfOriginalWH,
+      props.pageNumber,
+      props.containerWH
     );
-    const containerScale = props.containerWH.width / getPdfPageWidth?.width;
     const resizePos = pos.xPosition;
     if (signYourself) {
       return resizePos * containerScale * props.scale;
@@ -659,10 +661,11 @@ function Placeholder(props) {
     }
   };
   const yPos = (pos, signYourself) => {
-    const getPdfPageWidth = props.pdfOriginalWH.find(
+    const containerScale = getContainerScale(
-      (data) => data.pageNumber === props.pageNumber
+      props.pdfOriginalWH,
+      props.pageNumber,
+      props.containerWH
     );
-    const containerScale = props.containerWH.width / getPdfPageWidth.width;
     const resizePos = pos.yPosition;
 
     if (signYourself) {

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

@@ -47,14 +47,11 @@ function PlaceholderBorder(props) {
       onTouchEnd={() =>
         props.pos.type === textWidget && props?.setDraggingEnabled(true)
       }
-      className="absolute inline-block w-[14px] h-[14px] hover:cursor-sw-resize"
+      className="absolute inline-block w-[14px] h-[14px]  border-[0.2px] overflow-hidden border-dashed"
       style={{
         borderColor: themeColor,
-        borderStyle: "dashed",
         minWidth: handleMinWidth() || 0,
-        minHeight: handleMinHeight() || 0,
+        minHeight: handleMinHeight() || 0
-        borderWidth: "0.2px",
-        overflow: "hidden"
       }}
     ></div>
   );

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) {
@@ -140,8 +140,7 @@ function PlaceholderType(props) {
 
   const ExampleCustomInput = forwardRef(({ value, onClick }, ref) => (
     <div
-      className={`${selectWidgetCls} overflow-hidden`}
+      className={`${selectWidgetCls} text-[12px] overflow-hidden`}
-      style={{ fontSize: calculateFontSize() }}
       onClick={onClick}
       ref={ref}
     >
@@ -172,12 +171,6 @@ function PlaceholderType(props) {
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [type]);
-
-  const calculateFontSize = () => {
-    const fontSize = 10 + Math.min(props.pos.Width, props.pos.Height) * 0.1;
-    const size = fontSize ? fontSize : 12;
-    return size + "px";
-  };
   //function for show checked checkbox
   const selectCheckbox = (ind) => {
     const res = props.pos.options?.response;
@@ -427,7 +420,8 @@ function PlaceholderType(props) {
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",
-            color: props.pos.options?.fontColor || "black"
+            color: props.pos.options?.fontColor || "black",
+            overflow: "hidden"
           }}
         >
           <span>{type}</span>
@@ -436,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) => {
@@ -466,10 +460,7 @@ function PlaceholderType(props) {
           })}
         </select>
       ) : (
-        <div
+        <div className="text-[12px] overflow-hidden">
-          className={selectWidgetCls}
-          style={{ fontSize: calculateFontSize() }}
-        >
           {props.pos?.options?.name ? props.pos.options.name : type}
         </div>
       );
@@ -528,7 +519,9 @@ function PlaceholderType(props) {
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",
-            color: props.pos.options?.fontColor || "black"
+            color: props.pos.options?.fontColor || "black",
+            fontFamily: "Arial, sans-serif",
+            overflow: "hidden"
           }}
         >
           <span>{type}</span>
@@ -570,7 +563,9 @@ function PlaceholderType(props) {
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",
-            color: props.pos.options?.fontColor || "black"
+            color: props.pos.options?.fontColor || "black",
+            overflow: "hidden",
+            fontFamily: "Arial, sans-serif"
           }}
         >
           <span>{type}</span>
@@ -612,7 +607,9 @@ function PlaceholderType(props) {
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",
-            color: props.pos.options?.fontColor || "black"
+            color: props.pos.options?.fontColor || "black",
+            fontFamily: "Arial, sans-serif",
+            overflow: "hidden"
           }}
         >
           <span>{type}</span>
@@ -678,7 +675,7 @@ function PlaceholderType(props) {
           />
         </div>
       ) : (
-        <div className="text-[12px] text-black uppercase items-center">
+        <div className="text-[12px] text-black items-center overflow-hidden">
           <span>
             {props.selectDate
               ? props.selectDate?.format
@@ -733,7 +730,8 @@ function PlaceholderType(props) {
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",
-            color: props.pos.options?.fontColor || "black"
+            color: props.pos.options?.fontColor || "black",
+            fontFamily: "Arial, sans-serif"
           }}
           cols="50"
         />
@@ -743,7 +741,9 @@ function PlaceholderType(props) {
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",
-            color: props.pos.options?.fontColor || "black"
+            color: props.pos.options?.fontColor || "black",
+            fontFamily: "Arial, sans-serif",
+            overflow: "hidden"
           }}
         >
           <span>{type}</span>
@@ -802,6 +802,7 @@ function PlaceholderType(props) {
           }}
           className={textWidgetCls}
           style={{
+            fontFamily: "Arial, sans-serif",
             fontSize: props.pos.options?.fontSize
               ? props.pos.options?.fontSize + "px"
               : "12px",

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

@@ -3,6 +3,7 @@ import RSC from "react-scrollbars-custom";
 import { Document, Page } from "react-pdf";
 import {
   defaultWidthHeight,
+  getContainerScale,
   handleImageResize,
   handleSignYourselfImageResize
 } from "../../constant/Utils";
@@ -68,10 +69,11 @@ function RenderPdf({
 
   // handle signature block width and height according to screen
   const posWidth = (pos, signYourself) => {
-    const getPdfPageWidth = pdfOriginalWH.find(
+    const containerScale = getContainerScale(
-      (data) => data.pageNumber === pageNumber
+      pdfOriginalWH,
+      pageNumber,
+      containerWH
     );
-    const containerScale = containerWH.width / getPdfPageWidth.width || 1;
     const defaultWidth = defaultWidthHeight(pos.type).width;
     const posWidth = pos.Width ? pos.Width : defaultWidth;
     if (signYourself) {
@@ -97,11 +99,11 @@ function RenderPdf({
     }
   };
   const posHeight = (pos, signYourself) => {
-    const getPdfPageWidth = pdfOriginalWH.find(
+    const containerScale = getContainerScale(
-      (data) => data.pageNumber === pageNumber
+      pdfOriginalWH,
+      pageNumber,
+      containerWH
     );
-    const containerScale = containerWH.width / getPdfPageWidth?.width || 1;
-
     const posHeight = pos.Height || defaultWidthHeight(pos.type).height;
     if (signYourself) {
       return posHeight * scale * containerScale;
@@ -577,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

@@ -7,7 +7,7 @@ import { appInfo } from "./appinfo";
 import { saveAs } from "file-saver";
 import printModule from "print-js";
 
-export const fontsizeArr = [7, 8, 9, 10, 11, 12, 13, 14, 15, 18];
+export const fontsizeArr = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
 export const fontColorArr = ["red", "black", "blue", "yellow"];
 export const isMobile = window.innerWidth < 767;
 export const isTabAndMobile = window.innerWidth < 1023;
@@ -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) => {
@@ -1249,14 +1248,30 @@ export const changeImageWH = async (base64Image) => {
   });
 };
 
+//function to calculate font size of text area widgets
+const calculateFontSize = (position, containerScale, signyourself) => {
+  const font = position?.options?.fontSize || 12;
+  if (!signyourself && position?.isMobile && position?.scale) {
+    return font / position?.scale / containerScale;
+  } else {
+    return font / containerScale;
+  }
+};
 //function for embed multiple signature using pdf-lib
 export const multiSignEmbed = async (
   xyPositionArray,
   pdfDoc,
   signyourself,
-  scale
+  scale,
+  pdfOriginalWH,
+  containerWH
 ) => {
   for (let item of xyPositionArray) {
+    const containerScale = getContainerScale(
+      pdfOriginalWH,
+      item?.pageNumber,
+      containerWH
+    );
     const typeExist = item.pos.some((data) => data?.type);
     let updateItem;
 
@@ -1416,7 +1431,13 @@ export const multiSignEmbed = async (
         }
       } else if (widgetTypeExist) {
         const font = await pdfDoc.embedFont("Helvetica");
-        const fontSize = parseInt(position?.options?.fontSize) || 12;
+        const fontSize = calculateFontSize(
+          position,
+          containerScale,
+          signyourself
+        );
+        parseInt(fontSize);
+
         const color = position?.options?.fontColor;
         let updateColorInRgb;
         if (color === "red") {
@@ -1591,7 +1612,7 @@ export const multiSignEmbed = async (
     });
   }
   const pdfBytes = await pdfDoc.saveAsBase64({ useObjectStreams: false });
-  // console.log("pdf", pdfBytes);
+  //console.log("pdf", pdfBytes);
   return pdfBytes;
 };
 
@@ -1957,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,
@@ -1979,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);
@@ -2211,3 +2246,11 @@ function getImagePosition(page, image, sizeRatio) {
     rotate: page.getRotation()
   };
 }
+//function to use calculate pdf rendering scale in the container
+export const getContainerScale = (pdfOriginalWH, pageNumber, containerWH) => {
+  const getPdfPageWidth = pdfOriginalWH.find(
+    (data) => data.pageNumber === pageNumber
+  );
+  const containerScale = containerWH?.width / getPdfPageWidth?.width || 1;
+  return containerScale;
+};

apps/OpenSign/src/constant/const.js

@@ -4,10 +4,10 @@ export const documentCls = "contracts_Document";
 export const themeColor = "#47a3ad";
 export const iconColor = "#686968";
 export const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
-export const isEnableSubscription = true;
+export const isEnableSubscription =
-// process.env.REACT_APP_ENABLE_SUBSCRIPTION &&
+  process.env.REACT_APP_ENABLE_SUBSCRIPTION &&
-// process.env.REACT_APP_ENABLE_SUBSCRIPTION?.toLowerCase() === "true"
+  process.env.REACT_APP_ENABLE_SUBSCRIPTION?.toLowerCase() === "true"
-//   ? true
+    ? true
-//   : false;
+    : false;
-export const isStaging = "http://localhost:3001";
+export const isStaging =
-// window.location.origin === "https://staging-app.opensignlabs.com";
+  window.location.origin === "https://staging-app.opensignlabs.com";

apps/OpenSign/src/json/plansArr.js

@@ -26,6 +26,27 @@ const plans = [
       "Decline document support",
       "Email notifications",
       "Recipient authentication using OTP",
+      "Bulk send (upto 5 docs)",
+      "Public profiles",
+      "And much more"
+    ],
+    yearlyBenefits: [
+      "Unlimited envelopes",
+      "Sign documents yourself",
+      "Request signatures from others",
+      "14 field types",
+      "Automatic e-signatures",
+      "Completion certificates",
+      "Send in order",
+      "Document templates",
+      "Import from Dropbox",
+      "Contact book",
+      "Document expiry support",
+      "Decline document support",
+      "Email notifications",
+      "Recipient authentication using OTP",
+      "Bulk send (upto 5 docs)",
+      "Public profiles",
       "And much more"
     ]
   },
@@ -34,7 +55,7 @@ const plans = [
     img: "professional.png",
     currency: "$",
     monthlyPrice: "29.99",
-    yearlyPrice: `10 <sup style="font-size: 17px;">/month/user</sup>`,
+    yearlyPrice: `9.99<sup style="font-size: 17px;">/month</sup>`,
     subtitle: "Exclusive Access to advanced features.",
     btn: { text: "Subscribe", color: "op-btn-primary" },
     url: isStaging
@@ -53,9 +74,64 @@ const plans = [
       "Zapier integration",
       "API Access",
       "100 API signatures included",
-      "DocumentId removal from signed docs",
       "Custom email templates",
-      "Auto reminders"
+      "Auto reminders",
+      "Bulk send (upto 20 docs)",
+      "Premium Public profile usernames",
+      "Embedding (coming soon)"
+    ],
+    yearlyBenefits: [
+      "Everything in OpenSign™ free",
+      "Field validations",
+      "Regular expression validations",
+      "Organize docs in OpenSign™ Drive",
+      "Webhooks",
+      "Zapier integration",
+      "API Access",
+      "240 API signatures included",
+      "Custom email templates",
+      "Auto reminders",
+      "Bulk send (upto 20 docs)",
+      "Premium Public profile usernames",
+      "Embedding (coming soon)"
+    ]
+  },
+  {
+    planName: "OPENSIGN™ TEAMS",
+    img: "teams.png",
+    currency: "$",
+    monthlyPrice: `39.99<sup style="font-size: 17px;">/user</sup>`,
+    yearlyPrice: `19.99<sup style="font-size: 17px;">/user/month</sup>`,
+    subtitle: "Exclusive Access to advanced features.",
+    btn: { text: "Subscribe", color: "op-btn-accent" },
+    url: isStaging
+      ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/team-weekly"
+      : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901237d0702bfaa959406306635d80f138c/teams-monthly",
+    yearlyUrl: isStaging
+      ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/team-weekly"
+      : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af9011a864994bbeeec71fcf106188630199d/teams-yearly",
+    target: "_self",
+    benefits: [
+      "Everything in OpenSign™ professional",
+      "100 API signatures included",
+      "Teams and Organizations",
+      "Share Templates with teams",
+      "Share Templates with individuals",
+      "DocumentId removal from signed docs",
+      "Bulk send (upto 50 docs)",
+      "Request Payments (coming soon)",
+      "Mobile app (coming soon)"
+    ],
+    yearlyBenefits: [
+      "Everything in OpenSign™ professional",
+      "500 API signatures included",
+      "Teams and Organizations",
+      "Share Templates with teams",
+      "Share Templates with individuals",
+      "DocumentId removal from signed docs",
+      "Bulk send (upto 50 docs)",
+      "Request Payments (coming soon)",
+      "Mobile app (coming soon)"
     ]
   },
   {
@@ -75,36 +151,16 @@ const plans = [
       "Uptime SLA",
       "SSO support",
       "Priority support"
+    ],
+    yearlyBenefits: [
+      "All features",
+      "Custom domain",
+      "Custom branding",
+      "Uptime SLA",
+      "SSO support",
+      "Priority support"
     ]
   }
 ];
-export const stagingPlan = {
+
-  planName: "OPENSIGN™ TEAMS",
-  img: "teams.png",
-  currency: "$",
-  monthlyPrice: "40",
-  yearlyPrice: `20 <sup style="font-size: 17px;">/month/user</sup>`,
-  subtitle: "Exclusive Access to advanced features.",
-  btn: { text: "Subscribe", color: "op-btn-accent" },
-  url: isStaging
-    ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/team-weekly"
-    : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901d1a09dfa8085585cdd4ec4d7f32137f3/professional-monthly",
-  yearlyUrl: isStaging
-    ? "https://billing.zoho.in/subscribe/ed8097273a82b6bf39892c11a3bb3c381eb2705736014cfbdbde1ccf1c7a189d/team-weekly"
-    : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901d8ad1135190dff951330360e47585a71/professional-yearly",
-  target: "_self",
-  benefits: [
-    "Everything in OpenSign™ free, professional",
-    "Field validations",
-    "Regular expression validations",
-    "Organize docs in OpenSign™ Drive",
-    "Webhooks",
-    "Zapier integration",
-    "API Access",
-    "100 API signatures included",
-    "DocumentId removal from signed docs",
-    "Custom email templates",
-    "Auto reminders"
-  ]
-};
 export default plans;

apps/OpenSign/src/layout/HomeLayout.js

@@ -40,7 +40,7 @@ const HomeLayout = () => {
         try {
           // Use the session token to validate the user
           const userQuery = new Parse.Query(Parse.User);
-          const user = await userQuery.get(Parse.User.current().id, {
+          const user = await userQuery.get(Parse?.User?.current()?.id, {
             sessionToken: localStorage.getItem("accesstoken")
           });
           if (user) {
@@ -246,7 +246,7 @@ const HomeLayout = () => {
 
   const handleLoginBtn = () => {
     try {
-      Parse.User.logOut();
+      Parse?.User?.logOut();
     } catch (err) {
       console.log("err ", err);
     } finally {

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/PdfRequestFiles.js

@@ -678,7 +678,7 @@ function PdfRequestFiles(props) {
             widgetKey,
             radioExist,
             requiredCheckbox,
-            pageNumber; // `pageNumber` is used to check on which page user did not fill widget's data then change current pageNumber and show tour message on that page
+            TourPageNumber; // `pageNumber` is used to check on which page user did not fill widget's data then change current pageNumber and show tour message on that page
 
           for (let i = 0; i < checkUser[0].placeHolder.length; i++) {
             for (let j = 0; j < checkUser[0].placeHolder[i].pos.length; j++) {
@@ -726,7 +726,7 @@ function PdfRequestFiles(props) {
                     ) {
                       showAlert = true;
                       widgetKey = requiredCheckbox[i].key;
-                      pageNumber = updatePage;
+                      TourPageNumber = updatePage;
                       setminRequiredCount(parseMin);
                     }
                     //else condition to validate minimum required checkbox
@@ -737,8 +737,7 @@ function PdfRequestFiles(props) {
                       if (!showAlert) {
                         showAlert = true;
                         widgetKey = requiredCheckbox[i].key;
-                        pageNumber = updatePage;
+                        TourPageNumber = updatePage;
-
                         setminRequiredCount(parseMin);
                       }
                     }
@@ -764,7 +763,7 @@ function PdfRequestFiles(props) {
                       if (!checkDefaultSigned && !showAlert) {
                         showAlert = true;
                         widgetKey = requiredRadio[i].key;
-                        pageNumber = updatePage;
+                        TourPageNumber = updatePage;
                         setminRequiredCount(null);
                       }
                     }
@@ -792,7 +791,7 @@ function PdfRequestFiles(props) {
                         if (!checkDefaultSigned && !showAlert) {
                           showAlert = true;
                           widgetKey = requiredWidgets[i].key;
-                          pageNumber = updatePage;
+                          TourPageNumber = updatePage;
                           setminRequiredCount(null);
                         }
                       }
@@ -808,15 +807,15 @@ function PdfRequestFiles(props) {
           }
           if (checkboxExist && requiredCheckbox && showAlert) {
             setUnSignedWidgetId(widgetKey);
-            setPageNumber(pageNumber);
+            setPageNumber(TourPageNumber);
             setWidgetsTour(true);
           } else if (radioExist && showAlert) {
             setUnSignedWidgetId(widgetKey);
-            setPageNumber(pageNumber);
+            setPageNumber(TourPageNumber);
             setWidgetsTour(true);
           } else if (showAlert) {
             setUnSignedWidgetId(widgetKey);
-            setPageNumber(pageNumber);
+            setPageNumber(TourPageNumber);
             setWidgetsTour(true);
           } else {
             setIsUiLoading(true);
@@ -862,7 +861,9 @@ function PdfRequestFiles(props) {
                 pngUrl,
                 pdfDoc,
                 isSignYourSelfFlow,
-                scale
+                scale,
+                pdfOriginalWH,
+                containerWH
               );
               //  console.log("pdfte", pdfBytes);
               //get ExistUserPtr object id of user class to get tenantDetails
@@ -1590,6 +1591,17 @@ function PdfRequestFiles(props) {
       alert("Please Enter OTP!");
     }
   };
+  const handleCloseOtp = () => {
+    setIsPublicContact(false);
+    setLoading(false);
+    setIsOtp(false);
+    setOtp();
+    setContact({
+      name: "",
+      email: "",
+      phone: ""
+    });
+  };
 
   return (
     <DndProvider backend={HTML5Backend}>
@@ -1719,16 +1731,18 @@ function PdfRequestFiles(props) {
 
                 <ModalUi
                   isOpen={isPublicContact}
-                  title={"Contact Details"}
+                  title={isOtp ? "Verify email" : "Contact Details"}
                   handleClose={() => {
-                    setIsPublicContact(false);
+                    handleCloseOtp();
                   }}
                 >
                   <div className="h-full p-[20px]">
                     {isOtp ? (
                       <form onSubmit={VerifyOTP}>
                         <div className="flex flex-col gap-2">
-                          <span>You will get a OTP via Email</span>
+                          <span>
+                            You will get a verification code via email
+                          </span>
                           <label className="op-input op-input-bordered flex items-center gap-2 ">
                             <input
                               type="number"
@@ -1747,16 +1761,7 @@ function PdfRequestFiles(props) {
                             <button
                               className="op-btn op-btn-ghost"
                               onClick={() => {
-                                // document.getElementById("my_modal").close();
+                                handleCloseOtp();
-                                setIsPublicContact(false);
-                                setLoading(false);
-                                setIsOtp(false);
-                                setOtp();
-                                setContact({
-                                  name: "",
-                                  email: "",
-                                  phone: ""
-                                });
                               }}
                             >
                               Cancel
@@ -1840,8 +1845,7 @@ function PdfRequestFiles(props) {
                             <button
                               className="op-btn op-btn-ghost"
                               onClick={() => {
-                                // document.getElementById("my_modal").close();
+                                handleCloseOtp();
-                                setIsPublicContact(false);
                               }}
                             >
                               Close

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -33,7 +33,8 @@ import {
   replaceMailVaribles,
   copytoData,
   fetchSubscription,
-  convertPdfArrayBuffer
+  convertPdfArrayBuffer,
+  getContainerScale
 } from "../constant/Utils";
 import RenderPdf from "../components/pdf/RenderPdf";
 import { useNavigate } from "react-router-dom";
@@ -452,10 +453,11 @@ function PlaceHolderSign() {
       setZIndex(posZIndex);
       const signer = signersdata.find((x) => x.Id === uniqueId);
       const key = randomId();
-      const getPdfPageWidth = pdfOriginalWH.find(
+      const containerScale = getContainerScale(
-        (data) => data.pageNumber === pageNumber
+        pdfOriginalWH,
+        pageNumber,
+        containerWH
       );
-      const containerScale = containerWH?.width / getPdfPageWidth?.width || 1;
       let dropData = [];
       let placeHolder;
       const dragTypeValue = item?.text ? item.text : monitor.type;
@@ -676,11 +678,11 @@ function PlaceHolderSign() {
       updateSignPos.splice(0, updateSignPos.length, ...dataNewPlace);
       const signId = signerId ? signerId : uniqueId; //? signerId : signerObjId;
       const keyValue = key ? key : dragKey;
-      const getPdfPageWidth = pdfOriginalWH.find(
+      const containerScale = getContainerScale(
-        (data) => data.pageNumber === pageNumber
+        pdfOriginalWH,
+        pageNumber,
+        containerWH
       );
-      const containerScale = containerWH.width / getPdfPageWidth?.width;
-
       if (keyValue >= 0) {
         let filterSignerPos;
         if (signId) {
@@ -851,13 +853,14 @@ function PlaceHolderSign() {
       const pdfDoc = await PDFDocument.load(existingPdfBytes, {
         ignoreEncryption: true
       });
-
       const isSignYourSelfFlow = false;
       try {
         const pdfBytes = await multiSignEmbed(
           placeholder,
           pdfDoc,
           isSignYourSelfFlow,
+          scale,
+          pdfOriginalWH,
           containerWH
         );
 

apps/OpenSign/src/pages/PlanSubscriptions.js

@@ -1,12 +1,11 @@
 import React, { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
 import checkmark from "../assets/images/checkmark.png";
-import plansArr, { stagingPlan } from "../json/plansArr";
+import plansArr from "../json/plansArr";
 import Title from "../components/Title";
 import Parse from "parse";
 import { openInNewTab } from "../constant/Utils";
 import Loader from "../primitives/Loader";
-import { isStaging } from "../constant/const";
 const listItemStyle = {
   paddingLeft: "20px", // Add padding to create space for the image
   backgroundImage: `url(${checkmark})`, // Set your image as the list style image
@@ -17,7 +16,6 @@ const listItemStyle = {
 
 const PlanSubscriptions = () => {
   const navigate = useNavigate();
-  const isTeamPlan = plansArr.some((x) => x.planName === "OPENSIGN™ TEAMS");
   const [yearlyVisible, setYearlyVisible] = useState(true);
   const [isLoader, setIsLoader] = useState(true);
   const extUser =
@@ -61,9 +59,6 @@ const PlanSubscriptions = () => {
     phone;
   useEffect(() => {
     setIsLoader(false);
-    if (!isTeamPlan && isStaging) {
-      plansArr.splice(2, 0, stagingPlan);
-    }
     // eslint-disable-next-line
   }, []);
 
@@ -123,7 +118,7 @@ const PlanSubscriptions = () => {
                   role="tab"
                   className={`${yearlyVisible ? "op-tab-active" : ""} op-tab`}
                 >
-                  Yearly (10% off)
+                  Yearly (upto 66% off)
                 </a>
               </div>
               <ul className="op-card flex flex-col md:flex-row h-full bg-base-100 justify-center shadow-lg">
@@ -209,11 +204,18 @@ const PlanSubscriptions = () => {
                     </div>
                     <hr className="w-full bg-gray-300 h-[0.5px]" />
                     <ul className="mx-1 p-3 text-left break-words text-sm list-none">
-                      {item.benefits.map((subitem, index) => (
+                      {!yearlyVisible &&
-                        <li style={listItemStyle} key={index} className="m-1">
+                        item.benefits.map((subitem, index) => (
-                          <span className="relative">{subitem}</span>
+                          <li style={listItemStyle} key={index} className="m-1">
-                        </li>
+                            <span className="relative">{subitem}</span>
-                      ))}
+                          </li>
+                        ))}
+                      {yearlyVisible &&
+                        item?.yearlyBenefits?.map((subitem, index) => (
+                          <li style={listItemStyle} key={index} className="m-1">
+                            <span className="relative">{subitem}</span>
+                          </li>
+                        ))}
                     </ul>
                   </li>
                 ))}

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -32,7 +32,8 @@ import {
   textInputWidget,
   fetchImageBase64,
   changeImageWH,
-  handleSendOTP
+  handleSendOTP,
+  getContainerScale
 } from "../constant/Utils";
 import { useParams } from "react-router-dom";
 import Tour from "reactour";
@@ -442,6 +443,7 @@ function SignYourSelf() {
   };
   //function for setting position after drop signature button over pdf
   const addPositionOfSignature = (item, monitor) => {
+    setCurrWidgetsDetails({});
     const key = randomId();
     let dropData = [];
     let dropObj = {};
@@ -453,10 +455,11 @@ function SignYourSelf() {
     const widgetTypeExist = ["name", "company", "job title", "email"].includes(
       dragTypeValue
     );
-    const getPdfPageWidth = pdfOriginalWH.find(
+    const containerScale = getContainerScale(
-      (data) => data.pageNumber === pageNumber
+      pdfOriginalWH,
+      pageNumber,
+      containerWH
     );
-    const containerScale = containerWH?.width / getPdfPageWidth?.width || 1;
     //adding and updating drop position in array when user drop signature button in div
     if (item === "onclick") {
       const getWidth = widgetTypeExist
@@ -694,7 +697,9 @@ function SignYourSelf() {
               xyPostion,
               pdfDoc,
               isSignYourSelfFlow,
-              scale
+              scale,
+              pdfOriginalWH,
+              containerWH
             );
             // console.log("pdf", pdfBytes);
             //function for call to embed signature in pdf and get digital signature pdf
@@ -766,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();
@@ -812,10 +817,11 @@ function SignYourSelf() {
     setFontColor();
     if (isDragging && dragElement) {
       event.preventDefault();
-      const getPdfPageWidth = pdfOriginalWH.find(
+      const containerScale = getContainerScale(
-        (data) => data.pageNumber === pageNumber
+        pdfOriginalWH,
+        pageNumber,
+        containerWH
       );
-      const containerScale = containerWH.width / getPdfPageWidth?.width || 1;
       if (dragKey >= 0) {
         const filterDropPos = xyPostion.filter(
           (data) => data.pageNumber === pageNumber

apps/OpenSign/src/pages/TeamList.js

@@ -163,7 +163,7 @@ const TeamList = () => {
       setTeamList(newArray);
       try {
         await Parse.Cloud.run("updateteam", {
-          IsActive: !IsActive,
+          IsActive: !IsActive === false ? "false" : "true",
           TeamId: team.objectId
         });
         // console.log("teamRes ", teamRes);

apps/OpenSign/src/pages/TemplatePlaceholder.js

@@ -24,7 +24,8 @@ import {
   addWidgetOptions,
   textInputWidget,
   radioButtonWidget,
-  fetchSubscription
+  fetchSubscription,
+  getContainerScale
 } from "../constant/Utils";
 import RenderPdf from "../components/pdf/RenderPdf";
 import "../styles/AddUser.css";
@@ -364,10 +365,11 @@ const TemplatePlaceholder = () => {
       if (signer) {
         const posZIndex = zIndex + 1;
         setZIndex(posZIndex);
-        const getPdfPageWidth = pdfOriginalWH.find(
+        const containerScale = getContainerScale(
-          (data) => data.pageNumber === pageNumber
+          pdfOriginalWH,
+          pageNumber,
+          containerWH
         );
-        const containerScale = containerWH.width / getPdfPageWidth?.width || 1;
         const key = randomId();
         let filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
         const dragTypeValue = item?.text ? item.text : monitor.type;
@@ -561,10 +563,11 @@ const TemplatePlaceholder = () => {
       updateSignPos.splice(0, updateSignPos.length, ...dataNewPlace);
       const signId = signerId; //? signerId : signerObjId;
       const keyValue = key ? key : dragKey;
-      const getPdfPageWidth = pdfOriginalWH.find(
+      const containerScale = getContainerScale(
-        (data) => data.pageNumber === pageNumber
+        pdfOriginalWH,
+        pageNumber,
+        containerWH
       );
-      const containerScale = containerWH.width / getPdfPageWidth?.width || 1;
       if (keyValue >= 0) {
         const filterSignerPos = updateSignPos.filter(
           (data) => data.Id === signId

apps/OpenSign/src/pages/UserProfile.js

@@ -8,7 +8,11 @@ import sanitizeFileName from "../primitives/sanitizeFileName";
 import axios from "axios";
 import Tooltip from "../primitives/Tooltip";
 import { isEnableSubscription } from "../constant/const";
-import { checkIsSubscribed, handleSendOTP } from "../constant/Utils";
+import {
+  checkIsSubscribed,
+  checkIsSubscribedTeam,
+  handleSendOTP
+} from "../constant/Utils";
 import Upgrade from "../primitives/Upgrade";
 import ModalUi from "../primitives/ModalUi";
 import Loader from "../primitives/Loader";
@@ -46,6 +50,7 @@ function UserProfile() {
   const [tagLine, setTagLine] = useState(
     extendUser && extendUser?.[0]?.Tagline
   );
+  const [isTeam, setIsTeam] = useState(false);
   useEffect(() => {
     getUserDetail();
   }, []);
@@ -57,7 +62,9 @@ function UserProfile() {
     const HeaderDocId = jsonSender[0]?.HeaderDocId;
     if (isEnableSubscription) {
       const getIsSubscribe = await checkIsSubscribed();
+      const getIsTeam = await checkIsSubscribedTeam();
       setIsSubscribe(getIsSubscribe);
+      setIsTeam(getIsTeam);
     }
     if (HeaderDocId) {
       setIsDisableDocId(HeaderDocId);
@@ -511,9 +518,7 @@ function UserProfile() {
                   <div className="flex justify-between items-center py-2">
                     <span
                       className={
-                        isSubscribe
+                        isTeam ? "font-semibold" : "font-semibold text-gray-300"
-                          ? "font-semibold"
-                          : "font-semibold text-gray-300"
                       }
                     >
                       Disable DocumentId :{" "}
@@ -522,17 +527,17 @@ function UserProfile() {
                           "https://docs.opensignlabs.com/docs/help/Settings/disabledocumentid"
                         }
                       />
-                      {!isSubscribe && isEnableSubscription && <Upgrade />}
+                      {!isTeam && isEnableSubscription && <Upgrade />}
                     </span>
                     <label
                       className={`${
-                        isSubscribe
+                        isTeam
                           ? `${editmode ? "cursor-pointer" : ""}`
                           : "pointer-events-none opacity-50"
                       } relative block items-center mb-0`}
                     >
                       <input
-                        disabled={editmode ? false : true}
+                        disabled={isTeam ? false : true}
                         type="checkbox"
                         className="op-toggle transition-all checked:[--tglbg:#3368ff] checked:bg-white"
                         checked={isDisableDocId}

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";
@@ -145,7 +145,7 @@ const ReportTable = (props) => {
       try {
         const extUser = JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
         if (extUser?.OrganizationId?.objectId) {
-          const teamtRes = await Parse.Cloud.run("getteams");
+          const teamtRes = await Parse.Cloud.run("getteams", { active: true });
           if (teamtRes.length > 0) {
             const _teamRes = JSON.parse(JSON.stringify(teamtRes));
             const formatedList = _teamRes.map((x) => ({
@@ -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

@@ -7,26 +7,34 @@ const ValidateRoute = () => {
       try {
         // Use the session token to validate the user
         const userQuery = new Parse.Query(Parse.User);
-        const user = await userQuery.get(Parse.User.current().id, {
+        const user = await userQuery.get(Parse?.User?.current()?.id, {
           sessionToken: localStorage.getItem("accesstoken")
         });
         if (!user) {
           handlelogout();
         }
       } catch (error) {
+        console.log("err in validate route", error);
         handlelogout();
       }
     })();
   }, []);
   const handlelogout = async () => {
-    try {
+    let appdata = localStorage.getItem("userSettings");
-      Parse.User.logOut();
+    let applogo = localStorage.getItem("appLogo");
-      localStorage.removeItem("accesstoken");
+    let defaultmenuid = localStorage.getItem("defaultmenuid");
-    } catch (err) {
+    let PageLanding = localStorage.getItem("PageLanding");
-      console.log("err ", err);
+    let baseUrl = localStorage.getItem("baseUrl");
-    } finally {
+    let appid = localStorage.getItem("parseAppId");
-      localStorage.removeItem("accesstoken");
+
-    }
+    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/Dockerfile

@@ -1,5 +1,5 @@
 # Use an official Node runtime as the base image
-FROM node:18
+FROM node:20
 
 # Set the working directory inside the container
 WORKDIR /usr/src/app

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/main.js

@@ -58,6 +58,8 @@ import updateOrganization from './parsefunction/updateOrganization.js';
 import getTeams from './parsefunction/getTeams.js';
 import addTeam from './parsefunction/addTeam.js';
 import updateTeam from './parsefunction/updateTeam.js';
+import getOrgAdmins from './parsefunction/getOrgAdmins.js';
+import getAllUserTeamByOrg from './parsefunction/getAllUserTeamByOrg.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);
@@ -125,3 +127,5 @@ Parse.Cloud.define('updateorganization', updateOrganization);
 Parse.Cloud.define('getteams', getTeams);
 Parse.Cloud.define('addteam', addTeam);
 Parse.Cloud.define('updateteam', updateTeam);
+Parse.Cloud.define('getorgadmins', getOrgAdmins);
+Parse.Cloud.define('getalluserteambyorg', getAllUserTeamByOrg);

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

@@ -5,6 +5,7 @@ async function DocumentAftersave(request) {
       const createdAt = request.object.get('createdAt');
       const Folder = request.object.get('Type');
       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/GetPublicTemplate.js

@@ -19,6 +19,7 @@ async function GetPublicTemplate(request) {
         });
         templatQuery.descending('updatedAt');
         templatQuery.equalTo('IsPublic', true);
+        templatQuery.notEqualTo('IsArchive', true);
         const getTemplate = await templatQuery.find({ useMasterKey: true });
 
         const extend_Res = await Parse.Cloud.run('getUserDetails', {

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/PublicUserLinkContactToDoc.js

@@ -54,13 +54,14 @@ const createDocumentFromTemplate = async (template, existContact, index) => {
       object.set('Name', template?.Name);
       object.set('Description', template?.Description);
       object.set('Note', template?.Note);
-      object.set('TimeToCompleteDays', template.TimeToCompleteDays || 15);
+      object.set('TimeToCompleteDays', template?.TimeToCompleteDays || 15);
       object.set('SendinOrder', template?.SendinOrder);
-      object.set('AutomaticReminders', template.AutomaticReminders);
+      object.set('AutomaticReminders', template?.AutomaticReminders || false);
-      object.set('RemindOnceInEvery', template?.RemindOnceInEvery);
+      object.set('RemindOnceInEvery', template?.RemindOnceInEvery || 5);
       object.set('URL', template?.URL);
       object.set('CreatedBy', template?.CreatedBy);
       object.set('ExtUserPtr', template?.ExtUserPtr);
+      object.set('OriginIp', template?.OriginIp || '');
       let signers = template?.Signers || [];
       const signerobj = {
         __type: 'Pointer',
@@ -212,11 +213,11 @@ const sendMailToAllSigners = async docId => {
           throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
         }
       } catch (e) {
-        console.log('err in create document from template', err);
+        console.log('error in get partners_Tenant class details', err);
       }
     }
   } catch (e) {
-    console.log('err in create document from template', err);
+    console.log('error in sendMailToAllSigners function', err);
   }
 };
 

apps/OpenSignServer/cloud/parsefunction/TemplateAfterSave.js

@@ -5,13 +5,15 @@ export default async function TemplateAfterSave(request) {
       // update acl of New Document If There are signers present in array
       const signers = request.object.get('Signers');
       const AutoReminder = request?.object?.get('AutomaticReminders') || false;
+      const ip = request?.headers?.['x-real-ip'] || '';
       if (AutoReminder) {
         const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
         const ReminderDate = new Date(request?.object?.get('createdAt'));
         ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
         request.object.set('NextReminderDate', ReminderDate);
-        await request.object.save(null, { useMasterKey: true });
       }
+      request.object.set('OriginIp', ip);
+      await request.object.save(null, { useMasterKey: true });
       if (signers && signers.length > 0) {
         await updateAclDoc(request.object.id);
       } else {

apps/OpenSignServer/cloud/parsefunction/addOrganization.js

@@ -48,6 +48,15 @@ export default async function addOrganization(request) {
         objectId: resExt.id,
       });
       const newResOrg = await newOrg.save(null, { useMasterKey: true });
+      const teamCls = new Parse.Object('contracts_Teams');
+      teamCls.set('Name', 'All Users');
+      teamCls.set('OrganizationId', {
+        __type: 'Pointer',
+        className: 'contracts_Organizations',
+        objectId: newResOrg.id,
+      });
+      teamCls.set('IsActive', true);
+      await teamCls.save(null, { useMasterKey: true });
       if (newResOrg) {
         return newResOrg;
       }

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/getAllUserTeamByOrg.js

@@ -0,0 +1,26 @@
+export default async function getAllUserTeamByOrg(request) {
+  const OrgId = request.params.orgId;
+  if (!request?.user) {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+  }
+  try {
+    const teamCls = new Parse.Query('contracts_Teams');
+    teamCls.equalTo('OrganizationId', {
+      __type: 'Pointer',
+      className: 'contracts_Organizations',
+      objectId: OrgId,
+    });
+    teamCls.equalTo('IsActive', true);
+    const teamRes = await teamCls.first({ useMasterKey: true });
+    if (teamRes) {
+      return teamRes;
+    } else {
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Team not found.');
+    }
+  } catch (err) {
+    console.log('err in getOrganizations', err);
+    const code = err?.code || 400;
+    const msg = err?.message || 'Something went wrong.';
+    throw new Parse.Error(code, msg);
+  }
+}

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/getOrgAdmins.js

@@ -0,0 +1,24 @@
+export default async function getOrgAdmins(req) {
+  if (!req?.user) {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+  } else {
+    try {
+      const extUser = new Parse.Query('contracts_Users');
+      extUser.equalTo('UserRole', 'contracts_OrgAdmin');
+      extUser.equalTo('CreatedBy', req?.user);
+      extUser.notEqualTo('UserId', req?.user);
+      extUser.include('TeamIds,OrganizationId');
+      extUser.descending('createdAt');
+      const userRes = await extUser.find({ useMasterKey: true });
+      if (userRes.length > 0) {
+        const _userRes = JSON.parse(JSON.stringify(userRes));
+        return _userRes;
+      } else {
+        return [];
+      }
+    } catch (err) {
+      console.log('err in getOrgAdmins', err);
+      throw err;
+    }
+  }
+}

apps/OpenSignServer/cloud/parsefunction/getOrganizations.js

@@ -2,6 +2,7 @@ export default async function getOrganizations(request) {
   const limit = request.params.limit || 200;
   const skip = request.params.skip || 0;
   const extUserId = request.params.extUserId;
+  const activeOrgs = request.params.active;
   if (!request?.user) {
     throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
   }
@@ -17,7 +18,9 @@ export default async function getOrganizations(request) {
       className: 'contracts_Users',
       objectId: extUserId,
     });
-    orgQuery.equalTo('IsActive', true);
+    if (activeOrgs) {
+      orgQuery.equalTo('IsActive', true);
+    }
     orgQuery.exclude('ExtUserId');
     orgQuery.limit(limit);
     orgQuery.skip(skip);

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/getTeams.js

@@ -1,4 +1,5 @@
 export default async function getTeams(request) {
+  const activeTeams = request.params.active;
   if (!request?.user) {
     throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
   }
@@ -18,7 +19,9 @@ export default async function getTeams(request) {
       className: 'contracts_Organizations',
       objectId: extUser.OrganizationId.objectId,
     });
-    teamCls.equalTo('IsActive', true);
+    if (activeTeams) {
+      teamCls.equalTo('IsActive', true);
+    }
     teamCls.descending('createdAt');
     const teamRes = await teamCls.find({ useMasterKey: true });
     if (teamRes && teamRes.length > 0) {

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) {
+        if (useLocal !== 'true' && protocol.hostname !== 'localhost') {
-          response.pipe(Pdf);
+          https.get(url, async function (response) {
-          response.on('end', () => resolve('success'));
+            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) {
+          if (useLocal !== 'true' && protocol.hostname !== 'localhost') {
-            response.pipe(Pdf);
+            https.get(req.params.url, async function (response) {
-            response.on('end', () => resolve('success'));
+              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/updateTeam.js

@@ -33,7 +33,8 @@ export default async function updateTeam(request) {
         updateteam.set('Name', Name);
       }
       if (IsActive) {
-        updateteam.set('IsActive', IsActive);
+        const active = IsActive === 'false' ? false : true;
+        updateteam.set('IsActive', active);
       }
       const updateTeamRes = await updateteam.save(null, { useMasterKey: true });
       return updateTeamRes;

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/databases/migrations/20240726114557-update_contracts_template_cjs.cjs

@@ -0,0 +1,32 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async (Parse) => {
+  // TODO: set className here
+  const className = 'contracts_Template';
+  const schema = new Parse.Schema(className);
+  schema.addString('OriginIp');
+ 
+  // TODO: Set the schema here
+  // Example:
+  // schema.addString('name').addNumber('cash');
+
+  return schema.update();
+};
+
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.down = async (Parse) => {
+  // TODO: set className here
+  const className = 'contracts_Template';
+  const schema = new Parse.Schema(className);
+  schema.deleteField('OriginIp');
+  // TODO: Set the schema here
+  // Example:
+  // schema.deleteField('name').deleteField('cash');
+
+  return schema.update();
+};

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",
+    "@babel/eslint-parser": "^7.25.1",
-    "eslint": "^9.7.0",
+    "eslint": "^9.8.0",
-    "jasmine": "^5.1.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"
   }

apps/mongo/Dockerfile

@@ -5,7 +5,7 @@ FROM mongo:latest
 RUN mkdir -p /docker-entrypoint-initdb.d
 
 # Copy default data JSON files to the initialization directory
-COPY ./default-data/*.json /docker-entrypoint-initdb.d/
+# COPY ./default-data/*.json /docker-entrypoint-initdb.d/
 
 # Execute the initialization script during container startup
 CMD ["mongod"]

apps/mongo/default-data/legadraGCva._Role.json

@@ -1,70 +0,0 @@
-[{
-    "_id": "lpm8ijrwod",
-    "name": "contracts_Admin",
-    "_wperm": [
-      "*"
-    ],
-    "_rperm": [
-      "*"
-    ],
-    "_acl": {
-      "*": {
-        "r": true,
-        "w": true
-      }
-    },
-    "_created_at": {
-      "$date": "2023-09-19T09:25:20.205Z"
-    },
-    "_updated_at": {
-      "$date": "2023-09-28T09:47:03.968Z"
-    }
-  },
-  {
-    "_id": "Bz90QJSYMw",
-    "name": "contracts_Guest",
-    "_wperm": [
-      "ZhOmhqvw7S"
-    ],
-    "_rperm": [
-      "*",
-      "ZhOmhqvw7S"
-    ],
-    "_acl": {
-      "ZhOmhqvw7S": {
-        "w": true,
-        "r": true
-      },
-      "*": {
-        "r": true
-      }
-    },
-    "_created_at": {
-      "$date": "2023-10-20T07:56:10.094Z"
-    },
-    "_updated_at": {
-      "$date": "2023-10-20T10:50:36.229Z"
-    }
-  },
-  {
-    "_id": "Tb14x04JK2",
-    "name": "contracts_User",
-    "_wperm": [
-      "*"
-    ],
-    "_rperm": [
-      "*"
-    ],
-    "_acl": {
-      "*": {
-        "r": true,
-        "w": true
-      }
-    },
-    "_created_at": {
-      "$date": "2023-09-19T09:25:20.205Z"
-    },
-    "_updated_at": {
-      "$date": "2023-10-20T06:54:09.836Z"
-    }
-  }]

apps/mongo/default-data/legadraGCva._SCHEMA.json

@@ -1,657 +0,0 @@
-[{
-    "_id": "_Role",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "name": "string",
-    "users": "relation<_User>",
-    "roles": "relation<_Role>",
-    "_metadata": {
-      "indexes": {
-        "name_1": {
-          "name": 1
-        },
-        "_id_": {
-          "_id": 1
-        }
-      },
-      "class_permissions": {
-        "get": {
-          "*": true
-        },
-        "find": {
-          "*": true
-        },
-        "count": {
-          "*": true
-        },
-        "create": {
-          "*": true
-        },
-        "update": {
-          "*": true
-        },
-        "delete": {
-          "*": true
-        },
-        "addField": {},
-        "protectedFields": {
-          "*": []
-        }
-      }
-    }
-  },
-  {
-    "_id": "_Session",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "user": "*_User",
-    "installationId": "string",
-    "sessionToken": "string",
-    "expiresAt": "date",
-    "createdWith": "object",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    }
-  },
-  {
-    "_id": "_User",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "username": "string",
-    "email": "string",
-    "emailVerified": "boolean",
-    "authData": "object",
-    "_metadata": {
-      "indexes": {
-        "phone_1": {
-          "phone": 1
-        },
-        "username_1": {
-          "username": 1
-        },
-        "case_insensitive_username": {
-          "username": 1
-        },
-        "email_1": {
-          "email": 1
-        },
-        "case_insensitive_email": {
-          "email": 1
-        },
-        "_id_": {
-          "_id": 1
-        }
-      },
-      "class_permissions": {
-        "get": {
-          "*": true
-        },
-        "find": {
-          "*": true
-        },
-        "count": {
-          "*": true
-        },
-        "create": {
-          "*": true
-        },
-        "update": {
-          "*": true
-        },
-        "delete": {
-          "*": true
-        },
-        "addField": {},
-        "protectedFields": {
-          "*": [
-            "email"
-          ]
-        }
-      }
-    },
-    "name": "string",
-    "phone": "string",
-    "ProfilePic": "string"
-  },
-  {
-    "_id": "contracts_Contactbook",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "Phone": "string",
-    "Email": "string",
-    "Name": "string",
-    "UserRole": "string",
-    "UserId": "*_User",
-    "CreatedBy": "*_User",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    },
-    "TenantId": "*partners_Tenant",
-    "TourStatus": "array"
-  },
-  {
-    "_id": "contracts_Document",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "_metadata": {
-      "fields_options": {
-        "EnablePhoneOTP": {
-          "required": "false"
-        },
-        "IsCompleted": {
-          "required": "false",
-          "defaultValue": false
-        },
-        "IsDeclined": {
-          "required": "false",
-          "defaultValue": false
-        },
-        "SendinOrder": {
-          "required": "false",
-          "defaultValue": false
-        },
-        "ExpiryDate": {
-          "required": "false"
-        },
-        "Signers": {
-          "required": "false"
-        },
-        "Name": {
-          "required": "false"
-        },
-        "AgreementValidUntil": {
-          "required": "false"
-        },
-        "URL": {
-          "required": "false"
-        },
-        "RemindOnceInEvery": {
-          "required": "false",
-          "defaultValue": 5
-        },
-        "EnableEmailOTP": {
-          "required": "false"
-        },
-        "AutomaticReminders": {
-          "required": "false",
-          "defaultValue": false
-        },
-        "SentToOthers": {
-          "required": "false",
-          "defaultValue": false
-        },
-        "TimeToCompleteDays": {
-          "required": "false",
-          "defaultValue": 15
-        },
-        "Recipients": {
-          "required": "false"
-        },
-        "Type": {
-          "required": "false"
-        },
-        "Description": {
-          "required": "false"
-        },
-        "ExtUserPtr": {
-          "required": "false"
-        },
-        "SignedUrl": {
-          "required": "false"
-        },
-        "AuditTrail": {
-          "required": "false"
-        },
-        "Placeholders": {
-          "required": "false"
-        },
-        "Folder": {
-          "required": "false"
-        },
-        "Note": {
-          "required": false
-        },
-        "Clauses": {
-          "required": false
-        },
-        "AgreementDelta": {
-          "required": false
-        }
-      },
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      },
-      "class_permissions": {
-        "get": {
-          "*": true
-        },
-        "find": {
-          "*": true
-        },
-        "count": {
-          "*": true
-        },
-        "create": {
-          "*": true
-        },
-        "update": {
-          "*": true
-        },
-        "delete": {
-          "*": true
-        },
-        "addField": {},
-        "protectedFields": {
-          "*": []
-        }
-      }
-    },
-    "EnablePhoneOTP": "boolean",
-    "IsCompleted": "boolean",
-    "IsDeclined": "boolean",
-    "SendinOrder": "boolean",
-    "ExpiryDate": "date",
-    "Signers": "array",
-    "Name": "string",
-    "AgreementValidUntil": "date",
-    "URL": "string",
-    "RemindOnceInEvery": "number",
-    "EnableEmailOTP": "boolean",
-    "AutomaticReminders": "boolean",
-    "SentToOthers": "boolean",
-    "TimeToCompleteDays": "number",
-    "Recipients": "array",
-    "Type": "string",
-    "Description": "string",
-    "ExtUserPtr": "*contracts_Users",
-    "SignedUrl": "string",
-    "AuditTrail": "array",
-    "Placeholders": "array",
-    "Folder": "*contracts_Document",
-    "Note": "string",
-    "CreatedBy": "*_User",
-    "Clauses": "array",
-    "AgreementDelta": "array"
-  },
-  {
-    "_id": "contracts_Signature",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "_metadata": {
-      "fields_options": {
-        "SignatureName": {
-          "required": "false"
-        },
-        "SignText": {
-          "required": "false"
-        },
-        "ImageURL": {
-          "required": "false"
-        },
-        "SignTextFont": {
-          "required": "false"
-        },
-        "InitialsText": {
-          "required": "false"
-        },
-        "InitialsFont": {
-          "required": "false"
-        },
-        "UserId": {
-          "required": false
-        }
-      },
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      },
-      "class_permissions": {
-        "get": {
-          "*": true
-        },
-        "find": {
-          "*": true
-        },
-        "count": {
-          "*": true
-        },
-        "create": {
-          "*": true
-        },
-        "update": {
-          "*": true
-        },
-        "delete": {
-          "*": true
-        },
-        "addField": {},
-        "protectedFields": {
-          "*": []
-        }
-      }
-    },
-    "SignatureName": "string",
-    "SignText": "string",
-    "ImageURL": "string",
-    "SignTextFont": "string",
-    "InitialsText": "string",
-    "InitialsFont": "string",
-    "Initials": "string",
-    "UserId": "*_User"
-  },
-  {
-    "_id": "contracts_Users",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "_metadata": {
-      "fields_options": {
-        "Name": {
-          "required": "false"
-        },
-        "Phone": {
-          "required": "false"
-        },
-        "JobTitle": {
-          "required": "false"
-        },
-        "Email": {
-          "required": "false"
-        },
-        "Company": {
-          "required": "false"
-        },
-        "UserId": {
-          "required": "false"
-        },
-        "TenantId": {
-          "required": "false"
-        },
-        "TourStatus": {
-          "required": false
-        },
-        "IsContactEntry": {
-          "required": false,
-          "defaultValue": false
-        },
-        "ShareWithTeam": {
-          "required": false
-        }
-      },
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      },
-      "class_permissions": {
-        "get": {
-          "*": true
-        },
-        "find": {
-          "*": true
-        },
-        "count": {
-          "*": true
-        },
-        "create": {
-          "*": true
-        },
-        "update": {
-          "*": true
-        },
-        "delete": {
-          "*": true
-        },
-        "addField": {},
-        "protectedFields": {
-          "*": []
-        }
-      }
-    },
-    "Name": "string",
-    "Phone": "string",
-    "JobTitle": "string",
-    "Email": "string",
-    "Company": "string",
-    "UserId": "*_User",
-    "TenantId": "*partners_Tenant",
-    "TourStatus": "array",
-    "Plan": "object",
-    "UserRole": "string",
-    "Next_billing_date": "date",
-    "Customer_id": "string",
-    "Subscription_id": "string",
-    "CreatedBy": "*_User",
-    "IsContactEntry": "boolean",
-    "ShareWithTeam": "boolean"
-  },
-  {
-    "_id": "partners_DataFiles",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "FileSize": "number",
-    "FileUrl": "string",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    }
-  },
-  {
-    "_id": "partners_Subscriptions",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date"
-  },
-  {
-    "_id": "partners_Tenant",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "EmailAddress": "string",
-    "TenantName": "string",
-    "IsActive": "boolean",
-    "CreatedBy": "*_User",
-    "ContactNumber": "string",
-    "UserId": "*_User",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    }
-  },
-  {
-    "_id": "partners_TenantCredits",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "usedStorage": "number",
-    "PartnersTenant": "*partners_Tenant",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    }
-  },
-  {
-    "_id": "w_appinfo",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "orgId": "string",
-    "forgetpassFormId": "string",
-    "mainformObjId": "string",
-    "applogo": "string",
-    "fbAppId": "string",
-    "appname": "string",
-    "loginFormId": "string",
-    "baseurl": "string",
-    "org_name": "string",
-    "signUpFormId": "string",
-    "defaultmenuid": "string",
-    "version": "string",
-    "formTitle": "string",
-    "googleClietId": "string",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      },
-      "class_permissions": {
-        "get": {
-          "*": true
-        },
-        "find": {
-          "*": true
-        },
-        "count": {
-          "*": true
-        },
-        "create": {
-          "*": true
-        },
-        "update": {
-          "*": true
-        },
-        "delete": {
-          "*": true
-        },
-        "addField": {
-          "*": true
-        }
-      },
-      "fields_options": {
-        "uploadUrl": {
-          "required": false
-        }
-      }
-    },
-    "class": "string",
-    "LandingPageId": "string",
-    "accessType": "string",
-    "settings": "array",
-    "appTitle": "string",
-    "metaDescription": "string",
-    "branding_image": "string",
-    "fev_Icon": "string",
-    "defaultRole": "string",
-    "results": "array",
-    "loginType": "string",
-    "createdBy": "*_User",
-    "domain": "string",
-    "enableWebNotification": "boolean",
-    "allowWhiteLabel": "boolean",
-    "uploadUrl": "string"
-  },
-  {
-    "_id": "w_dashboard",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "dbDescription": "string",
-    "dbTitle": "string",
-    "bgColor": "string",
-    "rows": "array",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    },
-    "appId": "*w_appinfo"
-  },
-  {
-    "_id": "w_formV3",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "description": "string",
-    "uiSchema": "object",
-    "jsonSchema": "object",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    },
-    "class": "string",
-    "success_message": "string",
-    "restrict_form_entry": "object",
-    "send_email": "boolean",
-    "restrict_form_access": "object",
-    "email_template": "object",
-    "form_permission": "string",
-    "success_redirect": "string",
-    "form_buttons": "object",
-    "buttons": "object",
-    "appId": "*w_appinfo",
-    "rpTitle": "string",
-    "rpDescription": "string",
-    "rpType": "string",
-    "bgColor": "string",
-    "rows": "array",
-    "redirect_id": "string",
-    "formACL": "object",
-    "userSchema": "object",
-    "isRegisterForm": "boolean",
-    "liveValidate": "boolean",
-    "noValidate": "boolean",
-    "validFunction": "string",
-    "help": "object",
-    "name": "string",
-    "phone": "string",
-    "email": "string",
-    "password": "string",
-    "username": "string",
-    "role": "string",
-    "helpText": "object",
-    "helpTextForm": "object",
-    "hideActionsAfter": "number",
-    "rules": "array",
-    "extraActions": "object",
-    "persistentFields": "array"
-  },
-  {
-    "_id": "w_menu",
-    "objectId": "string",
-    "updatedAt": "date",
-    "createdAt": "date",
-    "menuTitle": "string",
-    "menuType": "string",
-    "menuItems": "array",
-    "_metadata": {
-      "indexes": {
-        "_id_": {
-          "_id": 1
-        }
-      }
-    },
-    "appId": "*w_appinfo"
-  }]

apps/mongo/default-data/legadraGCva.w_dashboard.json

@@ -1,104 +0,0 @@
-[{
-    "_id": "35KBoSgoAK",
-    "rows": [
-      {
-        "columns": [
-          {
-            "colxs": "12",
-            "colmd": "6",
-            "collg": "6",
-            "widget": {
-              "type": "Card",
-              "icon": "fas fa-signature",
-              "bgColor": "#f0058e",
-              "label": "Need your Signature",
-              "description": null,
-              "data": {
-                "id": "e04ee9dc-932d-6b80-0202-703fd154eb74",
-                "queryType": "",
-                "class": "contracts_Document",
-                "query": "where={\"$and\":[{\"AuditTrail.UserPtr\":{\"$ne\":{\"__type\":\"Pointer\",\"className\": \"contracts_Users\",\"objectId\":\"#objectId#\"}}},{\"AuditTrail.Activity\":{\"$ne\":\"Signed\"}}],\"Signers\":{\"$in\":[{\"__type\":\"Pointer\",\"className\":\"contracts_Users\",\"objectId\":\"#objectId#\"}]},\"IsDeclined\":{\"$ne\":true},\"IsCompleted\":{\"$ne\":true},\"Type\":{\"$ne\":\"Folder\"},\"Placeholders\":{\"$ne\":null},\"ExpiryDate\":{\"#*gt\":{\"__type\":\"#Date#\",\"iso\":\"#today#\"}}}&count=1",
-                "key": "count",
-                "Redirect_type": "Report",
-                "Redirect_id": "4Hhwbp482K",
-                "tourSection": "tourcard1",
-                "tourMessage": "This card shows the aggregate count of documents that are awaiting your signature. Clicking on this card will seamlessly take you to the detailed list of such documents for your review and action."
-              }
-            }
-          },
-          {
-            "colxs": "12",
-            "colmd": "6",
-            "collg": "6",
-            "widget": {
-              "type": "Card",
-              "icon": "fas fa-sign-out-alt",
-              "bgColor": "#g0058e",
-              "label": "Out for signatures",
-              "description": null,
-              "data": {
-                "id": "c1935cc0-28d4-3d73-b72a-8c1e3d18a17f",
-                "queryType": "",
-                "class": "contracts_Document",
-                "query":  "where={\"IsDeclined\":{\"$ne\":true},\"IsCompleted\":{\"$ne\":true},\"Type\":{\"$ne\":\"Folder\"},\"Placeholders\":{\"$ne\":null},\"ExpiryDate\":{\"#*gt\":{\"__type\":\"#Date#\",\"iso\":\"#today#\"}}}&include=Signers,AuditTrail.UserPtr",
-                "key": "count",
-                "Redirect_type": "Report",
-                "Redirect_id": "1MwEuxLEkF",
-                "tourSection": "tourcard2",
-                "tourMessage": "This card indicates the total number of documents you've sent out for signatures. A single click on this card will navigate you to a comprehensive list of these documents, allowing you to monitor their status."
-              }
-            }
-          },
-          {
-            "colxs": "12",
-            "colmd": "6",
-            "collg": "6",
-            "widget": {
-              "type": "report",
-              "reportId": "5Go51Q7T8r",
-              "data": {
-                "tourSection": "tourreport1",
-                "tourMessage": "Here lies a curated list of documents that are pending your signature. These are requests from other users that require your immediate attention for completion."
-              }
-            }
-          },
-          {
-            "colxs": "12",
-            "colmd": "6",
-            "collg": "6",
-            "widget": {
-              "type": "report",
-              "reportId": "d9k3UfYHBc",
-              "data": {
-                "tourSection": "tourreport2",
-                "tourMessage": "This area displays all the documents you've dispatched for signatures from other parties. It serves as a real-time tracker for documents pending external approval."
-              }
-            }
-          },
-          {
-            "colxs": "12",
-            "colmd": "12",
-            "collg": "12",
-            "widget": {
-              "type": "report",
-              "reportId": "kC5mfynCi4",
-              "data": {
-                "tourSection": "tourreport3",
-                "tourMessage": "In this section, you'll find your draft documents awaiting completion. These are the documents you've initiated but haven't yet finalized for sending."
-              }
-            }
-          }
-        ]
-      }
-    ],
-    "_p_appId": "w_appinfo$aIPmIvMzGM",
-    "dbTitle": "Dashboard",
-    "dbDescription": null,
-    "bgColor": "#ffffff",
-    "_created_at": {
-      "$date": "2023-09-04T13:17:26.707Z"
-    },
-    "_updated_at": {
-      "$date": "2023-09-27T04:53:20.395Z"
-    }
-  }]

apps/mongo/default-data/legadraGCva.w_menu.json

@@ -1,290 +0,0 @@
-[
-  {
-    "_id": "H9vRfEYKhT",
-    "_created_at": {
-      "$date": "2023-09-04T14:04:00.669Z"
-    },
-    "_updated_at": {
-      "$date": "2023-10-20T06:27:02.314Z"
-    },
-    "_p_appId": "w_appinfo$aIPmIvMzGM",
-    "menuItems": [
-      {
-        "icon": "fas fa-tachometer-alt",
-        "title": "Dashboard",
-        "target": "",
-        "pageType": "dashboard",
-        "description": "",
-        "objectId": "35KBoSgoAK"
-      },
-      {
-        "icon": "far fa-newspaper",
-        "title": "New Document",
-        "target": "_self",
-        "pageType": null,
-        "description": null,
-        "objectId": null,
-        "children": [
-          {
-            "icon": "fas fa-pen-nib",
-            "title": "Sign yourself",
-            "target": "_self",
-            "pageType": "form",
-            "description": "",
-            "objectId": "sHAnZphf69"
-          },
-          {
-            "icon": "fas fa-file-signature",
-            "title": "Request signatures",
-            "target": "_self",
-            "pageType": "form",
-            "description": "",
-            "objectId": "8mZzFxbG1z"
-          }
-        ]
-      },
-      {
-        "icon": "fas fa-folder",
-        "title": "OpenSignDrive™",
-        "target": "_self",
-        "pageType": "mf",
-        "description": "",
-        "objectId": "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive"
-      },
-      {
-        "icon": "fas fa-address-card",
-        "title": "Reports",
-        "target": "_self",
-        "pageType": null,
-        "description": "",
-        "objectId": null,
-        "children": [
-          {
-            "icon": "fas fa-signature",
-            "title": "Need your sign",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "4Hhwbp482K"
-          },
-          {
-            "icon": "fas fa-tasks",
-            "title": "In Progress",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "1MwEuxLEkF"
-          },
-          {
-            "icon": "fas fa-check-circle",
-            "title": "Completed",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "kQUoW4hUXz"
-          },
-          {
-            "icon": "fas fa-edit",
-            "title": "Drafts",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "ByHuevtCFY"
-          },
-          {
-            "icon": "fas fa-times-circle",
-            "title": "Declined",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "UPr2Fm5WY3"
-          },
-          {
-            "icon": "fas fa-hourglass-end",
-            "title": "Expired",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "zNqBHXHsYH"
-          },
-          {
-            "icon": "fa-solid fa-address-book",
-            "title": "Contactbook",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "5KhaPr482K"
-          }
-        ]
-      },
-      {
-        "icon": "fas fa-cog",
-        "title": "Settings",
-        "target": "_self",
-        "pageType": null,
-        "description": "",
-        "objectId": null,
-        "children": [
-          {
-            "icon": "fas fa-pen-fancy",
-            "title": "My Signature",
-            "target": "_self",
-            "pageType": "mf",
-            "description": "",
-            "objectId": "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign"
-          }
-        ]
-      }
-    ],
-    "menuTitle": "Default Menu",
-    "menuType": "Side Menu"
-  },
-  {
-    "_id": "VPh91h0ZHk",
-    "_created_at": {
-      "$date": "2023-09-04T14:16:15.424Z"
-    },
-    "_updated_at": {
-      "$date": "2023-10-20T06:25:59.660Z"
-    },
-    "_p_appId": "w_appinfo$aIPmIvMzGM",
-    "menuItems": [
-      {
-        "icon": "fas fa-tachometer-alt",
-        "title": "Dashboard",
-        "target": "",
-        "pageType": "dashboard",
-        "description": "",
-        "objectId": "35KBoSgoAK"
-      },
-      {
-        "icon": "far fa-newspaper",
-        "title": "New Document",
-        "target": "_self",
-        "pageType": null,
-        "description": null,
-        "objectId": null,
-        "children": [
-          {
-            "icon": "fas fa-pen-nib",
-            "title": "Sign yourself",
-            "target": "_self",
-            "pageType": "form",
-            "description": "",
-            "objectId": "sHAnZphf69"
-          },
-          {
-            "icon": "fas fa-file-signature",
-            "title": "Request signatures",
-            "target": "_self",
-            "pageType": "form",
-            "description": "",
-            "objectId": "8mZzFxbG1z"
-          }
-        ]
-      },
-      {
-        "icon": "fas fa-folder",
-        "title": "OpenSignDrive™",
-        "target": "_self",
-        "pageType": "mf",
-        "description": "",
-        "objectId": "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/legadrive"
-      },
-      {
-        "icon": "fas fa-address-card",
-        "title": "Reports",
-        "target": "_self",
-        "pageType": null,
-        "description": "",
-        "objectId": null,
-        "children": [
-          {
-            "icon": "fas fa-signature",
-            "title": "Need your sign",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "4Hhwbp482K"
-          },
-          {
-            "icon": "fas fa-tasks",
-            "title": "In Progress",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "1MwEuxLEkF"
-          },
-          {
-            "icon": "fas fa-check-circle",
-            "title": "Completed",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "kQUoW4hUXz"
-          },
-          {
-            "icon": "fas fa-edit",
-            "title": "Drafts",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "ByHuevtCFY"
-          },
-          {
-            "icon": "fas fa-times-circle",
-            "title": "Declined",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "UPr2Fm5WY3"
-          },
-          {
-            "icon": "fas fa-hourglass-end",
-            "title": "Expired",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "zNqBHXHsYH"
-          },
-          {
-            "icon": "fa-solid fa-address-book",
-            "title": "Contactbook",
-            "target": "_self",
-            "pageType": "report",
-            "description": "",
-            "objectId": "5KhaPr482K"
-          }
-        ]
-      },
-      {
-        "icon": "fas fa-cog",
-        "title": "Settings",
-        "target": "_self",
-        "pageType": null,
-        "description": "",
-        "objectId": null,
-        "children": [
-          {
-            "icon": "fas fa-pen-fancy",
-            "title": "My Signature",
-            "target": "_self",
-            "pageType": "mf",
-            "description": "",
-            "objectId": "remoteUrl=aHR0cHM6Ly9xaWstYWktb3JnLmdpdGh1Yi5pby9TaWduLU1pY3JvYXBwVjIvcmVtb3RlRW50cnkuanM=&moduleToLoad=AppRoutes&remoteName=signmicroapp/managesign"
-          },
-          {
-            "icon": "far fa-user",
-            "title": "Add User",
-            "target": "_self",
-            "pageType": "form",
-            "description": "",
-            "objectId": "lM0xRnM3iE"
-          }
-        ]
-      }
-    ],
-    "menuTitle": "Admin Menu",
-    "menuType": "Side Menu"
-  }
-]

docker-compose.yml

@@ -28,9 +28,8 @@ services:
     image: opensign-mongo
     volumes:
       - data-volume:/data/db
-      - ./apps/mongo/mongo-init.sh:/docker-entrypoint-initdb.d/mongo-init.sh:ro
     ports:
-      - "27017:27017"
+      - "27018:27017"
     networks:
       - app-network
   client: