fix: error in auto-sign feature unexpected issue encountered - something went wrong

fix: not able to create user using add user form

apps/OpenSign/package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@formkit/auto-animate": "^0.8.2",
-        "@lottiefiles/dotlottie-react": "^0.8.5",
+        "@lottiefiles/dotlottie-react": "^0.8.6",
         "@radix-ui/themes": "^3.1.1",
         "@react-pdf/renderer": "^3.4.4",
         "@reduxjs/toolkit": "^2.2.7",
@@ -39,12 +39,12 @@
         "react-quill": "^2.0.0",
         "react-redux": "^9.1.2",
         "react-rnd": "^10.4.11",
-        "react-router-dom": "^6.25.1",
+        "react-router-dom": "^6.26.0",
         "react-scripts": "5.0.1",
         "react-scrollbars-custom": "^4.1.1",
         "react-select": "^5.8.0",
         "react-signature-canvas": "^1.0.6",
-        "react-tooltip": "^5.27.1",
+        "react-tooltip": "^5.28.0",
         "react-web-share": "^2.0.2",
         "reactour": "^1.19.4",
         "redux": "^5.0.1",
@@ -72,9 +72,9 @@
         "eslint": "^8.57.0",
         "eslint-plugin-prettier": "^5.2.1",
         "eslint-plugin-react": "^7.34.3",
-        "lint-staged": "^15.2.7",
+        "lint-staged": "^15.2.8",
         "mini-css-extract-plugin": "^2.9.0",
-        "postcss": "^8.4.40",
+        "postcss": "^8.4.41",
         "prettier": "^3.3.3",
         "pretty-quick": "^4.0.0",
         "tailwindcss": "^3.4.7",
@@ -3610,11 +3610,11 @@
       "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
     },
     "node_modules/@lottiefiles/dotlottie-react": {
-      "version": "0.8.5",
+      "version": "0.8.6",
-      "resolved": "https://registry.npmjs.org/@lottiefiles/dotlottie-react/-/dotlottie-react-0.8.5.tgz",
+      "resolved": "https://registry.npmjs.org/@lottiefiles/dotlottie-react/-/dotlottie-react-0.8.6.tgz",
-      "integrity": "sha512-n2/lsjqijma+dUZpNXoqVLNFOY81gzLi596pQJcCAOYVTI9mzoDnCGLA6S5XwSInDlF+tprEkftmyFEmGOIwfA==",
+      "integrity": "sha512-Xy4IYU7auoQ+PTc6sESviK6Izh1LgCK710LcRehyQArjYMw/4SxfNB6sdX5qVdGeBbo/JbM9tOAd1MULEmfebQ==",
       "dependencies": {
-        "@lottiefiles/dotlottie-web": "0.30.1",
+        "@lottiefiles/dotlottie-web": "0.30.2",
         "debounce": "^2.0.0"
       },
       "peerDependencies": {
@@ -3623,9 +3623,9 @@
       }
     },
     "node_modules/@lottiefiles/dotlottie-web": {
-      "version": "0.30.1",
+      "version": "0.30.2",
-      "resolved": "https://registry.npmjs.org/@lottiefiles/dotlottie-web/-/dotlottie-web-0.30.1.tgz",
+      "resolved": "https://registry.npmjs.org/@lottiefiles/dotlottie-web/-/dotlottie-web-0.30.2.tgz",
-      "integrity": "sha512-D5ZpD4XteU/SwJacnkcALwpSUK0I456uvg1fxdBn5F+DIAbkbcacSsA8E3ISLD1dBhWCds+nIeh8DnLFrALLNw=="
+      "integrity": "sha512-HAUDPouNGqSIB+6b72bSmv6AC+RpMKk5RAzd9G2Wj9m/+pZRlQTFRUYBMqcRgkCtXIOagkgtwQw9fMg1/a4gxQ=="
     },
     "node_modules/@mapbox/node-pre-gyp": {
       "version": "1.0.11",
@@ -5406,9 +5406,9 @@
       }
     },
     "node_modules/@remix-run/router": {
-      "version": "1.18.0",
+      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.18.0.tgz",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.0.tgz",
-      "integrity": "sha512-L3jkqmqoSVBVKHfpGZmLrex0lxR5SucGA0sUfFzGctehw+S/ggL9L/0NnC5mw6P8HUWpFZ3nQw3cRApjjWx9Sw==",
+      "integrity": "sha512-zDICCLKEwbVYTS6TjYaWtHXxkdoUvD/QXvyVZjGCsWz5vyH7aFeONlPffPdW+Y/t6KT0MgXb2Mfjun9YpWN1dA==",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -16319,21 +16319,21 @@
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/lint-staged": {
-      "version": "15.2.7",
+      "version": "15.2.8",
-      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.7.tgz",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.8.tgz",
-      "integrity": "sha512-+FdVbbCZ+yoh7E/RosSdqKJyUM2OEjTciH0TFNkawKgvFp1zbGlEC39RADg+xKBG1R4mhoH2j85myBQZ5wR+lw==",
+      "integrity": "sha512-PUWFf2zQzsd9EFU+kM1d7UP+AZDbKFKuj+9JNVTBkhUFhbg4MAt6WfyMMwBfM4lYqd4D2Jwac5iuTu9rVj4zCQ==",
       "dev": true,
       "dependencies": {
         "chalk": "~5.3.0",
         "commander": "~12.1.0",
-        "debug": "~4.3.4",
+        "debug": "~4.3.6",
         "execa": "~8.0.1",
-        "lilconfig": "~3.1.1",
+        "lilconfig": "~3.1.2",
-        "listr2": "~8.2.1",
+        "listr2": "~8.2.4",
         "micromatch": "~4.0.7",
         "pidtree": "~0.6.0",
         "string-argv": "~0.3.2",
-        "yaml": "~2.4.2"
+        "yaml": "~2.5.0"
       },
       "bin": {
         "lint-staged": "bin/lint-staged.js"
@@ -18224,9 +18224,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.40",
+      "version": "8.4.41",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-      "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
       "funding": [
         {
           "type": "opencollective",
@@ -20726,11 +20726,11 @@
       "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
     },
     "node_modules/react-router": {
-      "version": "6.25.1",
+      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.25.1.tgz",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.0.tgz",
-      "integrity": "sha512-u8ELFr5Z6g02nUtpPAggP73Jigj1mRePSwhS/2nkTrlPU5yEkH1vYzWNyvSnSzeeE2DNqWdH+P8OhIh9wuXhTw==",
+      "integrity": "sha512-wVQq0/iFYd3iZ9H2l3N3k4PL8EEHcb0XlU2Na8nEwmiXgIUElEH6gaJDtUQxJ+JFzmIXaQjfdpcGWaM6IoQGxg==",
       "dependencies": {
-        "@remix-run/router": "1.18.0"
+        "@remix-run/router": "1.19.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -20740,12 +20740,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "6.25.1",
+      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.25.1.tgz",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.0.tgz",
-      "integrity": "sha512-0tUDpbFvk35iv+N89dWNrJp+afLgd+y4VtorJZuOCXK0kkCWjEvb3vTJM++SYvMEpbVwXKf3FjeVveVEb6JpDQ==",
+      "integrity": "sha512-RRGUIiDtLrkX3uYcFiCIxKFWMcWQGMojpYZfcstc63A1+sSnVgILGIm9gNUA6na3Fm1QuPGSBQH2EMbAZOnMsQ==",
       "dependencies": {
-        "@remix-run/router": "1.18.0",
+        "@remix-run/router": "1.19.0",
-        "react-router": "6.25.1"
+        "react-router": "6.26.0"
       },
       "engines": {
         "node": ">=14.0.0"
@@ -21557,9 +21557,9 @@
       }
     },
     "node_modules/react-tooltip": {
-      "version": "5.27.1",
+      "version": "5.28.0",
-      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.27.1.tgz",
+      "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-5.28.0.tgz",
-      "integrity": "sha512-a+micPXcMOMt11CYlwJD4XShcqGziasHco4NPe1OFw298WBTILMyzUgNC1LAFViAe791JdHNVSJIpzhZm2MvDA==",
+      "integrity": "sha512-R5cO3JPPXk6FRbBHMO0rI9nkUG/JKfalBSQfZedZYzmqaZQgq7GLzF8vcCWx6IhUCKg0yPqJhXIzmIO5ff15xg==",
       "dependencies": {
         "@floating-ui/dom": "^1.6.1",
         "classnames": "^2.3.0"
@@ -25725,9 +25725,9 @@
       "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
     },
     "node_modules/yaml": {
-      "version": "2.4.5",
+      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
-      "integrity": "sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==",
+      "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
       "bin": {
         "yaml": "bin.mjs"
       },

apps/OpenSign/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
-    "@lottiefiles/dotlottie-react": "^0.8.5",
+    "@lottiefiles/dotlottie-react": "^0.8.6",
     "@radix-ui/themes": "^3.1.1",
     "@react-pdf/renderer": "^3.4.4",
     "@reduxjs/toolkit": "^2.2.7",
@@ -34,12 +34,12 @@
     "react-quill": "^2.0.0",
     "react-redux": "^9.1.2",
     "react-rnd": "^10.4.11",
-    "react-router-dom": "^6.25.1",
+    "react-router-dom": "^6.26.0",
     "react-scripts": "5.0.1",
     "react-scrollbars-custom": "^4.1.1",
     "react-select": "^5.8.0",
     "react-signature-canvas": "^1.0.6",
-    "react-tooltip": "^5.27.1",
+    "react-tooltip": "^5.28.0",
     "react-web-share": "^2.0.2",
     "reactour": "^1.19.4",
     "redux": "^5.0.1",
@@ -104,9 +104,9 @@
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-react": "^7.34.3",
-    "lint-staged": "^15.2.7",
+    "lint-staged": "^15.2.8",
     "mini-css-extract-plugin": "^2.9.0",
-    "postcss": "^8.4.40",
+    "postcss": "^8.4.41",
     "prettier": "^3.3.3",
     "pretty-quick": "^4.0.0",
     "tailwindcss": "^3.4.7",

apps/OpenSign/src/components/AddTeam.js

@@ -125,10 +125,10 @@ const AddTeam = (props) => {
   };
 
   return (
-    <div className="shadow-md rounded-box my-[1px] p-3 bg-[#ffffff]">
+    <div className="shadow-md rounded-box my-[1px] p-3 bg-base-100 relative">
       <Title title="Add Team" />
       {isLoader && (
-        <div className="fixed inset-0 flex justify-center items-center bg-black bg-opacity-30 z-50 rounded-box">
+        <div className="absolute w-full h-full inset-0 flex justify-center items-center bg-base-content/30 z-50">
           <Loader />
         </div>
       )}

apps/OpenSign/src/components/dashboard/DashboardCard.js

@@ -23,17 +23,12 @@ const DashboardCard = (props) => {
           sessionToken: localStorage.getItem("accesstoken")
         };
         let body = {};
-        let currentUser;
-        let currentUser1 = Parse.User.current();
-        currentUser = currentUser1.id;
         let res;
         if (localStorage.getItem("Extand_Class")) {
           let data = JSON.parse(localStorage.getItem("Extand_Class"));
           res = data[0];
         } else {
-          res = await Parse.Cloud.run("getUserDetails", {
+          res = await Parse.Cloud.run("getUserDetails");
-            email: currentUser.get("email")
-          });
           if (res) res = res.toJSON();
         }
         if (res) {
@@ -94,9 +89,7 @@ const DashboardCard = (props) => {
             let data = JSON.parse(localStorage.getItem("Extand_Class"));
             resr = data[0];
           } else {
-            resr = await Parse.Cloud.run("getUserDetails", {
+            resr = await Parse.Cloud.run("getUserDetails");
-              email: currentUser.get("email")
-            });
             if (resr) resr = resr.toJSON();
           }
 
@@ -218,15 +211,12 @@ const DashboardCard = (props) => {
 
         if (restr.includes("#")) {
           try {
-            const currentUser = Parse.User.current();
             let res;
             if (localStorage.getItem("Extand_Class")) {
               let data = JSON.parse(localStorage.getItem("Extand_Class"));
               res = data[0];
             } else {
-              let resr = await Parse.Cloud.run("getUserDetails", {
+              let resr = await Parse.Cloud.run("getUserDetails");
-                email: currentUser.get("email")
-              });
               if (res) res = resr.toJSON();
             }
 

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

@@ -1,9 +1,7 @@
 import React, { useState } from "react";
-import { saveAs } from "file-saver";
 import axios from "axios";
-import { getBase64FromUrl } from "../../constant/Utils";
+import { handleDownloadPdf, handleToPrint } from "../../constant/Utils";
 import { themeColor, emailRegex } from "../../constant/const";
-import printModule from "print-js";
 import Loader from "../../primitives/Loader";
 import ModalUi from "../../primitives/ModalUi";
 
@@ -12,7 +10,7 @@ function EmailComponent({
   pdfUrl,
   setIsEmail,
   setSuccessEmail,
-  pdfName,
+  pdfDetails,
   sender,
   setIsAlert,
   extUserId,
@@ -22,8 +20,11 @@ function EmailComponent({
   const [emailValue, setEmailValue] = useState("");
   const [isLoading, setIsLoading] = useState(false);
   const [emailErr, setEmailErr] = useState(false);
+  const [isDownloading, setIsDownloading] = useState("");
+  const isAndroid = /Android/i.test(navigator.userAgent);
   //function for send email
   const sendEmail = async () => {
+    const pdfName = pdfDetails[0]?.Name;
     setIsLoading(true);
 
     let sendMail;
@@ -138,43 +139,6 @@ function EmailComponent({
       }
     }
   };
-
-  // function for print signed pdf
-  const handleToPrint = async (event) => {
-    event.preventDefault();
-
-    const pdf = await getBase64FromUrl(pdfUrl);
-    const isAndroidDevice = navigator.userAgent.match(/Android/i);
-    const isAppleDevice =
-      (/iPad|iPhone|iPod/.test(navigator.platform) ||
-        (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)) &&
-      !window.MSStream;
-    if (isAndroidDevice || isAppleDevice) {
-      const byteArray = Uint8Array.from(
-        atob(pdf)
-          .split("")
-          .map((char) => char.charCodeAt(0))
-      );
-      const blob = new Blob([byteArray], { type: "application/pdf" });
-      const blobUrl = URL.createObjectURL(blob);
-      window.open(blobUrl, "_blank");
-    } else {
-      printModule({ printable: pdf, type: "pdf", base64: true });
-    }
-  };
-
-  //handle download signed pdf
-  const handleDownloadPdf = () => {
-    saveAs(pdfUrl, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
-  };
-
-  const sanitizeFileName = (pdfName) => {
-    // Replace spaces with underscore
-    return pdfName.replace(/ /g, "_");
-  };
-
-  const isAndroid = /Android/i.test(navigator.userAgent);
-
   return (
     <div>
       {/* isEmail */}
@@ -188,6 +152,11 @@ function EmailComponent({
               </span>
             </div>
           )}
+          {isDownloading === "pdf" && (
+            <div className="fixed z-[200] inset-0 flex justify-center items-center bg-black bg-opacity-30">
+              <Loader />
+            </div>
+          )}
           <div className="flex justify-between items-center py-[10px] px-[20px] border-b-[1px] border-base-content">
             <span className="text-base-content font-semibold">
               Successfully signed!
@@ -195,7 +164,7 @@ function EmailComponent({
             <div className="flex flex-row">
               {!isAndroid && (
                 <button
-                  onClick={handleToPrint}
+                  onClick={(e) => handleToPrint(e, pdfUrl, setIsDownloading)}
                   className="op-btn op-btn-neutral op-btn-sm text-[15px]"
                 >
                   <i className="fa-light fa-print" aria-hidden="true"></i>
@@ -204,7 +173,9 @@ function EmailComponent({
               )}
               <button
                 className="op-btn op-btn-primary op-btn-sm text-[15px] ml-2"
-                onClick={() => handleDownloadPdf()}
+                onClick={() =>
+                  handleDownloadPdf(pdfDetails, pdfUrl, setIsDownloading)
+                }
               >
                 <i className="fa-light fa-download" aria-hidden="true"></i>
                 Download

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

@@ -414,19 +414,15 @@ function Header({
               </button>
             </div>
           ) : isPublicTemplate ? (
-            <>
             <div className="flex">
               <button
                 type="button"
                 className="op-btn op-btn-primary op-btn-sm  shadow"
-                  onClick={() => {
+                onClick={() => embedWidgetsData()}
-                    embedWidgetsData();
-                  }}
               >
                 Sign Now
               </button>
             </div>
-            </>
           ) : (
             <div className="flex">
               <button

apps/OpenSign/src/constant/Utils.js

@@ -6,6 +6,7 @@ import Parse from "parse";
 import { appInfo } from "./appinfo";
 import { saveAs } from "file-saver";
 import printModule from "print-js";
+import { validplan } from "../json/plansArr";
 
 export const fontsizeArr = [2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28];
 export const fontColorArr = ["red", "black", "blue", "yellow"];
@@ -90,13 +91,7 @@ export async function checkIsSubscribedTeam() {
     if (res.plan === "freeplan") {
       return false;
     } else if (res.billingDate) {
-      const plan =
+      const plan = validplan[res.plan] || false;
-        res.plan === "team-weekly" ||
-        res.plan === "team-yearly" ||
-        res.plan === "teams-monthly" ||
-        res.plan === "teams-yearly" ||
-        res.plan === "enterprise-monthly" ||
-        res.plan === "enterprise-yearly";
       if (plan && new Date(res.billingDate) > new Date()) {
         return true;
       } else {
@@ -192,32 +187,19 @@ export const pdfNewWidthFun = (divRef) => {
 };
 
 //`contractUsers` function is used to get contract_User details
-export const contractUsers = async (email) => {
+export const contractUsers = async () => {
-  const data = {
+  try {
-    email: email
+    const userDetails = await Parse.Cloud.run("getUserDetails");
-  };
-  const userDetails = await axios
-    .post(`${localStorage.getItem("baseUrl")}functions/getUserDetails`, data, {
-      headers: {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-        sessionToken: localStorage.getItem("accesstoken")
-      }
-    })
-    .then((Listdata) => {
-      const json = Listdata.data;
     let data = [];
-      if (json && json.result) {
+    if (userDetails) {
-        data.push(json.result);
+      const json = JSON.parse(JSON.stringify(userDetails));
+      data.push(json);
     }
     return data;
-    })
+  } catch (err) {
-    .catch((err) => {
     console.log("Err in getUserDetails cloud function", err);
     return "Error: Something went wrong!";
-    });
+  }
-
-  return userDetails;
 };
 
 //function for resize image and update width and height for mulitisigners
@@ -458,7 +440,7 @@ export const resizeBorderExtraWidth = () => {
   return 20;
 };
 
-export async function getBase64FromUrl(url) {
+export async function getBase64FromUrl(url, autosign) {
   const data = await fetch(url);
   const blob = await data.blob();
   return new Promise((resolve) => {
@@ -466,8 +448,12 @@ export async function getBase64FromUrl(url) {
     reader.readAsDataURL(blob);
     reader.onloadend = function () {
       const pdfBase = this.result;
+      if (autosign) {
+        resolve(pdfBase);
+      } else {
         const suffixbase64 = pdfBase.split(",").pop();
         resolve(suffixbase64);
+      }
     };
   });
 }
@@ -550,20 +536,17 @@ export const signPdfFun = async (
   base64Url,
   documentId,
   signerObjectId,
-  setIsAlert,
   objectId,
   isSubscribed,
   activeMailAdapter,
-  xyPosition
+  widgets
 ) => {
-  let singleSign,
+  let isCustomCompletionMail = false;
-    isCustomCompletionMail = false;
-
   try {
     //get tenant details
     const tenantDetails = await getTenantDetails(objectId);
     if (tenantDetails && tenantDetails === "user does not exist!") {
-      alert("User does not exist");
+      return { status: "error", message: "User does not exist." };
     } else {
       if (
         tenantDetails?.CompletionBody &&
@@ -577,7 +560,7 @@ export const signPdfFun = async (
     // below for loop is used to get first signature of user to send if to signpdf
     // for adding it in completion certificate
     let getSignature;
-    for (let item of xyPosition) {
+    for (let item of widgets) {
       if (!getSignature) {
         const typeExist = item.pos.some((data) => data?.type);
         if (typeExist) {
@@ -596,6 +579,7 @@ export const signPdfFun = async (
         base64Sign = await fetchImageBase64(base64Sign);
       } catch (e) {
         console.log("error", e);
+        return { status: "error", message: "something went wrong." };
       }
     }
     //change image width and height to 100/40 in png base64
@@ -603,7 +587,7 @@ export const signPdfFun = async (
     //remove suffiix of base64
     const suffixbase64 = getNewse64 && getNewse64.split(",").pop();
 
-    singleSign = {
+    const params = {
       mailProvider: activeMailAdapter,
       pdfFile: base64Url,
       docId: documentId,
@@ -611,34 +595,25 @@ export const signPdfFun = async (
       isCustomCompletionMail: isCustomCompletionMail,
       signature: suffixbase64
     };
-    const response = await axios
+    const resSignPdf = await Parse.Cloud.run("signPdf", params);
-      .post(`${localStorage.getItem("baseUrl")}functions/signPdf`, singleSign, {
+    if (resSignPdf) {
-        headers: {
+      const signedPdf = JSON.parse(JSON.stringify(resSignPdf));
-          "Content-Type": "application/json",
+      return signedPdf;
-          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-          //  sessionToken: localStorage.getItem("accesstoken")
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
     }
-      })
-      .then((Listdata) => {
-        const json = Listdata.data;
-        const res = json.result;
-        return res;
-      })
-      .catch((err) => {
-        console.log("Err in signPdf cloud function ", err);
-        setIsAlert({
-          isShow: true,
-          alertMessage: "something went wrong"
-        });
-      });
-
-    return response;
   } catch (e) {
-    setIsAlert({
+    console.log("Err in signPdf cloud function ", e.message);
-      isShow: true,
+    if (e && e?.message?.includes("is encrypted.")) {
-      alertMessage: "something went wrong"
+      return {
-    });
+        status: "error",
+        message: "Currently encrypted pdf files are not supported."
+      };
+    } else if (
+      e.message === "PKCS#12 MAC could not be verified. Invalid password?"
+    ) {
+      return { status: "error", message: "PFX file password is invalid." };
+    } else {
+      return { status: "error", message: "something went wrong." };
+    }
   }
 };
 
@@ -1259,14 +1234,14 @@ const calculateFontSize = (position, containerScale, signyourself) => {
 };
 //function for embed multiple signature using pdf-lib
 export const multiSignEmbed = async (
-  xyPositionArray,
+  widgets,
   pdfDoc,
   signyourself,
   scale,
   pdfOriginalWH,
   containerWH
 ) => {
-  for (let item of xyPositionArray) {
+  for (let item of widgets) {
     const containerScale = getContainerScale(
       pdfOriginalWH,
       item?.pageNumber,
@@ -2254,3 +2229,42 @@ export const getContainerScale = (pdfOriginalWH, pageNumber, containerWH) => {
   const containerScale = containerWH?.width / getPdfPageWidth?.width || 1;
   return containerScale;
 };
+//function to get default signatur eof current user from `contracts_Signature` class
+export const getDefaultSignature = async (objectId) => {
+  try {
+    const result = await axios.get(
+      `${localStorage.getItem(
+        "baseUrl"
+      )}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${objectId}"}}`,
+      {
+        headers: {
+          "Content-Type": "application/json",
+          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+        }
+      }
+    );
+    const res = result.data?.results;
+    if (res[0] && res.length > 0) {
+      const defaultSignature = res[0]?.ImageURL
+        ? await getBase64FromUrl(res[0]?.ImageURL, true)
+        : "";
+      const defaultInitial = res[0]?.Initials
+        ? await getBase64FromUrl(res[0]?.Initials, true)
+        : "";
+
+      return {
+        status: "success",
+        res: {
+          defaultSignature: defaultSignature,
+          defaultInitial: defaultInitial
+        }
+      };
+    }
+  } catch (err) {
+    console.log("Error: error in fetch data in contracts_Signature", err);
+    return {
+      status: "error"
+    };
+  }
+};

apps/OpenSign/src/json/plansArr.js

@@ -163,4 +163,12 @@ const plans = [
   }
 ];
 
+export const validplan = {
+  "team-weekly": true,
+  "team-yearly": true,
+  "teams-monthly": true,
+  "teams-yearly": true,
+  "enterprise-monthly": true,
+  "enterprise-yearly": true
+};
 export default plans;

apps/OpenSign/src/layout/HomeLayout.js

@@ -212,10 +212,7 @@ const HomeLayout = () => {
   };
 
   async function checkTourStatus() {
-    const currentUser = Parse.User.current();
+    const cloudRes = await Parse.Cloud.run("getUserDetails");
-    const cloudRes = await Parse.Cloud.run("getUserDetails", {
-      email: currentUser.get("email")
-    });
     const res = { data: cloudRes.toJSON() };
     if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
       const tourStatus = res.data.TourStatus;

apps/OpenSign/src/pages/AddAdmin.js

@@ -165,10 +165,7 @@ const AddAdmin = () => {
       // Check extended class user role and tenentId
       try {
         const userSettings = appInfo.settings;
-        const currentUser = Parse.User.current();
+        const extUser = await Parse.Cloud.run("getUserDetails");
-        const extUser = await Parse.Cloud.run("getUserDetails", {
-          email: currentUser.get("email")
-        });
         if (extUser) {
           const IsDisabled = extUser?.get("IsDisabled") || false;
           if (!IsDisabled) {

apps/OpenSign/src/pages/GuestLogin.js

@@ -124,8 +124,9 @@ function GuestLogin() {
           setLoading(false);
         } else {
           let _user = user.data.result;
+          await Parse.User.become(_user.sessionToken);
           const parseId = localStorage.getItem("parseAppId");
-          const contractUserDetails = await contractUsers(_user.email);
+          const contractUserDetails = await contractUsers();
           localStorage.setItem("UserInformation", JSON.stringify(_user));
           localStorage.setItem(
             `Parse/${parseId}/currentUser`,

apps/OpenSign/src/pages/Login.js

@@ -44,16 +44,11 @@ function Login() {
   const [isLoginSSO, setIsLoginSSO] = useState(false);
 
   useEffect(() => {
-    if (localStorage.getItem("accesstoken")) {
+    checkUserExt();
-      setState({ ...state, loading: true });
-      GetLoginData();
-    }
-    dispatch(fetchAppInfo());
-    saveLogo();
     // eslint-disable-next-line
   }, []);
 
-  const saveLogo = async () => {
+  const checkUserExt = async () => {
     const app = await getAppLogo();
     if (!isEnableSubscription && app?.user === "not_exist") {
       navigate("/addadmin");
@@ -63,6 +58,11 @@ function Login() {
     } else {
       setImage(appInfo?.applogo || undefined);
     }
+    if (localStorage.getItem("accesstoken")) {
+      setState({ ...state, loading: true });
+      GetLoginData();
+    }
+    dispatch(fetchAppInfo());
   };
   const handleChange = (event) => {
     const { name, value } = event.target;
@@ -93,10 +93,7 @@ function Login() {
           // Check extended class user role and tenentId
           try {
             const userSettings = appInfo.settings;
-            const currentUser = Parse.User.current();
+            await Parse.Cloud.run("getUserDetails")
-            await Parse.Cloud.run("getUserDetails", {
-              email: currentUser.get("email")
-            })
               .then(async (extUser) => {
                 if (extUser) {
                   const IsDisabled = extUser?.get("IsDisabled") || false;
@@ -279,10 +276,7 @@ function Login() {
       // Check extended class user role and tenentId
       try {
         const userSettings = appInfo.settings;
-        const currentUser = Parse.User.current();
+        await Parse.Cloud.run("getUserDetails")
-        await Parse.Cloud.run("getUserDetails", {
-          email: currentUser.get("email")
-        })
           .then(async (extUser) => {
             if (extUser) {
               const IsDisabled = extUser?.get("IsDisabled") || false;
@@ -408,9 +402,7 @@ function Login() {
         localStorage.setItem("profileImg", "");
       }
       const userSettings = appInfo.settings;
-      await Parse.Cloud.run("getUserDetails", {
+      await Parse.Cloud.run("getUserDetails").then(async (extUser) => {
-        email: _user.email
-      }).then(async (extUser) => {
         if (extUser) {
           const IsDisabled = extUser?.get("IsDisabled") || false;
           if (!IsDisabled) {

apps/OpenSign/src/pages/Opensigndrive.js

@@ -496,10 +496,7 @@ function Opensigndrive() {
   };
   //function to use check tour status of open sign drive
   async function checkTourStatus() {
-    const currentUser = Parse.User.current();
+    const cloudRes = await Parse.Cloud.run("getUserDetails");
-    const cloudRes = await Parse.Cloud.run("getUserDetails", {
-      email: currentUser.get("email")
-    });
     const res = { data: cloudRes.toJSON() };
     if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
       const tourStatus = res.data.TourStatus;

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -30,7 +30,8 @@ import {
   contactBook,
   handleDownloadPdf,
   handleToPrint,
-  handleDownloadCertificate
+  handleDownloadCertificate,
+  getDefaultSignature
 } from "../constant/Utils";
 import LoaderWithMsg from "../primitives/LoaderWithMsg";
 import HandleError from "../primitives/HandleError";
@@ -337,6 +338,7 @@ function PdfRequestFiles(props) {
   };
   //function for get document details for perticular signer with signer'object id
   const getDocumentDetails = async (docId, isNextUser) => {
+    try {
       const senderUser = localStorage.getItem(
         `Parse/${localStorage.getItem("parseAppId")}/currentUser`
       );
@@ -349,7 +351,8 @@ function PdfRequestFiles(props) {
         const isCompleted =
           documentData[0].IsCompleted && documentData[0].IsCompleted;
         const expireDate = documentData[0].ExpiryDate.iso;
-      const declined = documentData[0].IsDeclined && documentData[0].IsDeclined;
+        const declined =
+          documentData[0].IsDeclined && documentData[0].IsDeclined;
         const expireUpdateDate = new Date(expireDate).getTime();
         const currDate = new Date().getTime();
         const getSigners = documentData[0].Signers;
@@ -422,7 +425,9 @@ function PdfRequestFiles(props) {
         const audittrailData =
           documentData[0].AuditTrail &&
           documentData[0].AuditTrail.length > 0 &&
-        documentData[0].AuditTrail.filter((data) => data.Activity === "Signed");
+          documentData[0].AuditTrail.filter(
+            (data) => data.Activity === "Signed"
+          );
 
         const checkAlreadySign =
           documentData[0].AuditTrail &&
@@ -474,7 +479,8 @@ function PdfRequestFiles(props) {
                 {
                   headers: {
                     "Content-Type": "application/json",
-                  "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+                    "X-Parse-Application-Id":
+                      localStorage.getItem("parseAppId"),
                     sessiontoken: localStorage.getItem("accesstoken")
                   }
                 }
@@ -551,13 +557,8 @@ function PdfRequestFiles(props) {
           setRequestSignTour(true);
         } else {
           //else condition to check current user exist in contracts_Users class and check tour message status
-        //if not then check user exist in contracts_Contactbook class and check tour message status
+          //if not then check user exist in contracts_Contactbook class and check tour message statu
-        const localuser = localStorage.getItem(
+          const res = await contractUsers();
-          `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-        );
-        const currentUser = JSON.parse(localuser);
-        const currentUserEmail = currentUser.email;
-        const res = await contractUsers(currentUserEmail);
           if (res === "Error: Something went wrong!") {
             setHandleError("Error: Something went wrong!");
           } else if (res[0] && res?.length) {
@@ -609,42 +610,24 @@ function PdfRequestFiles(props) {
           isLoad: false
         });
       }
-    await axios
+      //function to get default signatur eof current user from `contracts_Signature` class
-      .get(
+      const defaultSignRes = await getDefaultSignature(jsonSender.objectId);
-        `${localStorage.getItem(
+      if (defaultSignRes?.status === "success") {
-          "baseUrl"
+        setDefaultSignImg(defaultSignRes?.res?.defaultSignature);
-        )}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${
+        setMyInitial(defaultSignRes?.res?.defaultInitial);
-          jsonSender?.objectId
+      } else if (defaultSignRes?.status === "error") {
-        }"}}`,
-        {
-          headers: {
-            "Content-Type": "application/json",
-            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-          }
-        }
-      )
-      .then((Listdata) => {
-        const json = Listdata.data;
-        const res = json.results;
-
-        if (res[0] && res.length > 0) {
-          setDefaultSignImg(res[0].ImageURL);
-          setMyInitial(res[0]?.Initials);
-        }
-
-        const loadObj = {
-          isLoad: false
-        };
-        setIsLoading(loadObj);
-      })
-      .catch((err) => {
-        console.log("Err in contracts_Signature class", err);
         setHandleError("Error: Something went wrong!");
         setIsLoading({
           isLoad: false
         });
+      }
+    } catch (err) {
+      console.log("Error: error in getDocumentDetails", err);
+      setHandleError("Error: Something went wrong!");
+      setIsLoading({
+        isLoad: false
       });
+    }
   };
   //function for embed signature or image url in pdf
   async function embedWidgetsData() {
@@ -819,8 +802,8 @@ function PdfRequestFiles(props) {
             setWidgetsTour(true);
           } else {
             setIsUiLoading(true);
-
+            // `widgets` is Used to return widgets details with page number of current user
-            const pngUrl = checkUser[0].placeHolder;
+            const widgets = checkUser?.[0]?.placeHolder;
             let pdfArrBuffer;
             //`contractDocument` function used to get updated SignedUrl
             //resolved issue of sign document by multiple signers simultaneously
@@ -858,7 +841,7 @@ function PdfRequestFiles(props) {
               }
               //embed multi signature in pdf
               const pdfBytes = await multiSignEmbed(
-                pngUrl,
+                widgets,
                 pdfDoc,
                 isSignYourSelfFlow,
                 scale,
@@ -869,32 +852,27 @@ function PdfRequestFiles(props) {
               //get ExistUserPtr object id of user class to get tenantDetails
               const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
               //get ExistUserPtr email to get userDetails
-              const currentUserEmail = pdfDetails?.[0]?.ExtUserPtr?.Email;
+              const res = await contractUsers();
-              const res = await contractUsers(currentUserEmail);
               let activeMailAdapter = "";
               if (res === "Error: Something went wrong!") {
                 setHandleError("Error: Something went wrong!");
-                setIsLoading({
+                setIsLoading({ isLoad: false });
-                  isLoad: false
-                });
               } else if (!res || res?.length === 0) {
                 activeMailAdapter = "";
               } else if (res[0] && res.length) {
                 activeMailAdapter = res[0]?.active_mail_adapter;
               }
               //function for call to embed signature in pdf and get digital signature pdf
-              try {
+              const resSign = await signPdfFun(
-                const res = await signPdfFun(
                 pdfBytes,
                 documentId,
                 signerObjectId,
-                  setIsAlert,
                 objectId,
                 isSubscribed,
                 activeMailAdapter,
-                  pngUrl
+                widgets
               );
-                if (res && res.status === "success") {
+              if (resSign && resSign.status === "success") {
                 setPdfUrl(res.data);
                 setIsSigned(true);
                 setSignedSigners([]);
@@ -1036,16 +1014,8 @@ function PdfRequestFiles(props) {
                   }
                 }
               } else {
-                  setIsAlert({
+                setIsUiLoading(false);
-                    isShow: true,
+                setIsAlert({ isShow: true, alertMessage: resSign.message });
-                    alertMessage: "something went wrong"
-                  });
-                }
-              } catch (err) {
-                setIsAlert({
-                  isShow: true,
-                  alertMessage: "something went wrong"
-                });
               }
             } catch (err) {
               setIsUiLoading(false);
@@ -1558,7 +1528,8 @@ function PdfRequestFiles(props) {
         } else {
           let _user = user.data.result;
           const parseId = localStorage.getItem("parseAppId");
-          const contractUserDetails = await contractUsers(_user.email);
+          await Parse.User.become(_user.sessionToken);
+          const contractUserDetails = await contractUsers();
           localStorage.setItem("UserInformation", JSON.stringify(_user));
           localStorage.setItem(
             `Parse/${parseId}/currentUser`,
@@ -1657,26 +1628,19 @@ function PdfRequestFiles(props) {
                   requestSignTourFunction()}
                 <ModalUi
                   isOpen={isAlert.isShow}
-                  title={"Alert message"}
+                  title={"Alert"}
-                  handleClose={() => {
+                  handleClose={() =>
-                    setIsAlert({
+                    setIsAlert({ isShow: false, alertMessage: "" })
-                      isShow: false,
+                  }
-                      alertMessage: ""
-                    });
-                  }}
                 >
                   <div className="h-full p-[20px]">
                     <p>{isAlert.alertMessage}</p>
-                    <div className="h-[1px] w-full my-[15px] bg-[#9f9f9f]"></div>
                     <button
-                      onClick={() => {
+                      onClick={() =>
-                        setIsAlert({
+                        setIsAlert({ isShow: false, alertMessage: "" })
-                          isShow: false,
+                      }
-                          alertMessage: ""
-                        });
-                      }}
                       type="button"
-                      className="op-btn op-btn-primary"
+                      className="op-btn op-btn-primary mt-3 px-4"
                     >
                       Ok
                     </button>
@@ -2180,7 +2144,6 @@ function PdfRequestFiles(props) {
                     {defaultSignImg && !alreadySign && currentSigner && (
                       <DefaultSignature
                         defaultSignImg={defaultSignImg}
-                        setDefaultSignImg={setDefaultSignImg}
                         userObjectId={signerObjectId}
                         setIsLoading={setIsLoading}
                         xyPostion={signerPos}

apps/OpenSign/src/pages/Pgsignup.js

@@ -71,9 +71,7 @@ const PgSignUp = () => {
           if (res) {
             localStorage.removeItem("userDetails");
             try {
-              const extUser = await Parse.Cloud.run("getUserDetails", {
+              const extUser = await Parse.Cloud.run("getUserDetails");
-                email: userDetails.email
-              });
               const userRole = extUser?.get("UserRole");
               const _currentRole = userRole;
               const _role = _currentRole.replace("contracts_", "");
@@ -230,10 +228,7 @@ const PgSignUp = () => {
       // Check extended class user role and tenentId
       try {
         const userSettings = appInfo.settings;
-        const currentUser = Parse.User.current();
+        const extUser = await Parse.Cloud.run("getUserDetails");
-        const extUser = await Parse.Cloud.run("getUserDetails", {
-          email: currentUser.get("email")
-        });
         if (extUser) {
           const IsDisabled = extUser?.get("IsDisabled") || false;
           if (!IsDisabled) {

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -404,8 +404,7 @@ function PlaceHolderSign() {
       };
       setIsLoading(loadObj);
     }
-    const currentUserEmail = documentData[0]?.ExtUserPtr?.Email;
+    const res = await contractUsers();
-    const res = await contractUsers(currentUserEmail);
     if (res === "Error: Something went wrong!") {
       const loadObj = {
         isLoad: false

apps/OpenSign/src/pages/SSOVerify.js

@@ -149,10 +149,7 @@ const SSOVerify = () => {
         // Check extended class user role and tenentId
         try {
           const userSettings = appInfo.settings;
-          const currentUser = Parse.User.current();
+          await Parse.Cloud.run("getUserDetails")
-          await Parse.Cloud.run("getUserDetails", {
-            email: currentUser.get("email")
-          })
             .then(async (extUser) => {
               if (extUser) {
                 const IsDisabled = extUser?.get("IsDisabled") || false;

apps/OpenSign/src/pages/Signup.js

@@ -192,10 +192,7 @@ const Signup = () => {
       // Check extended class user role and tenentId
       try {
         const userSettings = appInfo.settings;
-        const currentUser = Parse.User.current();
+        await Parse.Cloud.run("getUserDetails")
-        await Parse.Cloud.run("getUserDetails", {
-          email: currentUser.get("email")
-        })
           .then(async (extUser) => {
             if (extUser) {
               const IsDisabled = extUser?.get("IsDisabled") || false;

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -33,7 +33,8 @@ import {
   fetchImageBase64,
   changeImageWH,
   handleSendOTP,
-  getContainerScale
+  getContainerScale,
+  getDefaultSignature
 } from "../constant/Utils";
 import { useParams } from "react-router-dom";
 import Tour from "reactour";
@@ -205,6 +206,7 @@ function SignYourSelf() {
   }, [divRef.current, isHeader]);
   //function for get document details for perticular signer with signer'object id
   const getDocumentDetails = async (showComplete) => {
+    try {
       let isCompleted;
       //getting document details
       const documentData = await contractDocument(documentId);
@@ -224,7 +226,8 @@ function SignYourSelf() {
         } else {
           setHandleError("Error: Something went wrong!");
         }
-      isCompleted = documentData[0].IsCompleted && documentData[0].IsCompleted;
+        isCompleted =
+          documentData[0].IsCompleted && documentData[0].IsCompleted;
         if (isCompleted) {
           setIsCelebration(true);
           setTimeout(() => {
@@ -262,38 +265,20 @@ function SignYourSelf() {
         };
         setIsLoading(loadObj);
       }
-    await axios
+
-      .get(
+      //function to get default signatur eof current user from `contracts_Signature` class
-        `${localStorage.getItem(
+      const defaultSignRes = await getDefaultSignature(jsonSender.objectId);
-          "baseUrl"
+      console.log("defaultSignRes", defaultSignRes);
-        )}classes/contracts_Signature?where={"UserId": {"__type": "Pointer","className": "_User", "objectId":"${
+      if (defaultSignRes?.status === "success") {
-          jsonSender.objectId
+        setDefaultSignImg(defaultSignRes?.res?.defaultSignature);
-        }"}}`,
+        setMyInitial(defaultSignRes?.res?.defaultInitial);
-        {
+      } else if (defaultSignRes?.status === "error") {
-          headers: {
-            "Content-Type": "application/json",
-            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-          }
-        }
-      )
-      .then((Listdata) => {
-        const json = Listdata.data;
-        const res = json.results;
-        if (res[0] && res.length > 0) {
-          setDefaultSignImg(res[0].ImageURL);
-          setMyInitial(res[0]?.Initials);
-        }
-      })
-      .catch((err) => {
-        console.log("Err ", err);
-        const loadObj = {
-          isLoad: false
-        };
         setHandleError("Error: Something went wrong!");
-        setIsLoading(loadObj);
+        setIsLoading({
+          isLoad: false
         });
-    const contractUsersRes = await contractUsers(jsonSender.email);
+      }
+      const contractUsersRes = await contractUsers();
       if (contractUsersRes === "Error: Something went wrong!") {
         const loadObj = {
           isLoad: false
@@ -349,7 +334,15 @@ function SignYourSelf() {
         };
         setIsLoading(loadObj);
       }
+    } catch (err) {
+      console.log("Error: error in getDocumentDetails", err);
+      setHandleError("Error: Something went wrong!");
+      setIsLoading({
+        isLoad: false
+      });
+    }
   };
+
   const getWidgetValue = (type) => {
     switch (type) {
       case "name":
@@ -710,22 +703,36 @@ function SignYourSelf() {
             setIsUiLoading(false);
             if (err && err.message.includes("is encrypted.")) {
               setIsAlert({
+                header: "Error",
                 isShow: true,
                 alertMessage: `Currently encrypted pdf files are not supported.`
               });
             } else {
-              console.log("err in signing", err);
+              console.log("err in signing", err.message);
+              if (
+                err.message ===
+                "PKCS#12 MAC could not be verified. Invalid password?"
+              ) {
                 setIsAlert({
+                  header: "Error",
+                  isShow: true,
+                  alertMessage: `PFX file password is invalid.`
+                });
+              } else {
+                setIsAlert({
+                  header: "Error",
                   isShow: true,
                   alertMessage: `Something went wrong.`
                 });
               }
             }
           }
+        }
       } catch (err) {
         console.log("err in embedselfsign ", err);
         setIsUiLoading(false);
         setIsAlert({
+          header: "Error",
           isShow: true,
           alertMessage: "something went wrong, please try again later."
         });
@@ -776,34 +783,19 @@ function SignYourSelf() {
     //remove suffiix of base64
     const suffixbase64 = getNewse64 && getNewse64.split(",").pop();
 
-    let singleSign = {
+    const params = {
       pdfFile: base64Url,
       docId: documentId,
       isCustomCompletionMail: isCustomCompletionMail,
       mailProvider: activeMailAdapter,
       signature: suffixbase64
     };
-
+    const resSignPdf = await Parse.Cloud.run("signPdf", params);
-    await axios
+    if (resSignPdf) {
-      .post(`${localStorage.getItem("baseUrl")}functions/signPdf`, singleSign, {
+      const signedpdf = JSON.parse(JSON.stringify(resSignPdf));
-        headers: {
+      setPdfUrl(signedpdf);
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-          // sessionToken: localStorage.getItem("accesstoken")
-          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-        }
-      })
-      .then((Listdata) => {
-        const json = Listdata.data;
-
-        setPdfUrl(json.result.data);
-        if (json.result.data) {
       getDocumentDetails(false);
     }
-      })
-      .catch((err) => {
-        console.log("axois err ", err);
-      });
   };
 
   //function for save x and y position and show signature  tab on that position
@@ -1234,12 +1226,9 @@ function SignYourSelf() {
                 <ModalUi
                   isOpen={isAlert.isShow}
                   title={isAlert?.header || "Alert"}
-                  handleClose={() => {
+                  handleClose={() =>
-                    setIsAlert({
+                    setIsAlert({ isShow: false, alertMessage: "" })
-                      isShow: false,
+                  }
-                      alertMessage: ""
-                    });
-                  }}
                 >
                   <div className="p-[20px] h-full">
                     <p>{isAlert.alertMessage}</p>
@@ -1314,12 +1303,12 @@ function SignYourSelf() {
                   isEmail={isEmail}
                   pdfUrl={pdfUrl}
                   setIsEmail={setIsEmail}
-                  pdfName={pdfDetails[0] && pdfDetails[0].Name}
                   setSuccessEmail={setSuccessEmail}
                   sender={jsonSender}
                   setIsAlert={setIsAlert}
                   extUserId={extUserId}
                   activeMailAdapter={activeMailAdapter}
+                  pdfDetails={pdfDetails}
                 />
                 {/* pdf header which contain funish back button */}
                 <Header

apps/OpenSign/src/pages/TemplatePlaceholder.js

@@ -153,14 +153,6 @@ const TemplatePlaceholder = () => {
   const [fontColor, setFontColor] = useState();
   const [zoomPercent, setZoomPercent] = useState(0);
   const [scale, setScale] = useState(1);
-  const senderUser =
-    localStorage.getItem(
-      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-    ) &&
-    localStorage.getItem(
-      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-    );
-  const jsonSender = JSON.parse(senderUser);
 
   useEffect(() => {
     fetchTemplate();
@@ -317,7 +309,7 @@ const TemplatePlaceholder = () => {
         setHandleError("Error: Something went wrong!");
       }
     }
-    const res = await contractUsers(jsonSender.email);
+    const res = await contractUsers();
     if (res[0] && res.length) {
       setSignerUserId(res[0].objectId);
       setCurrentEmail(res[0].Email);
@@ -1354,9 +1346,7 @@ const TemplatePlaceholder = () => {
                       {currentEmail.length > 0 && (
                         <>
                           <button
-                            onClick={() => {
+                            onClick={() => handleCreateDocModal()}
-                              handleCreateDocModal();
-                            }}
                             type="button"
                             className="op-btn op-btn-primary"
                           >
@@ -1379,18 +1369,14 @@ const TemplatePlaceholder = () => {
                   {isCreateDoc && <LoaderWithMsg isLoading={isLoading} />}
                   <ModalUi
                     isOpen={isShowEmail}
-                    title={"signers alert"}
+                    title={"Signers alert"}
-                    handleClose={() => {
+                    handleClose={() => setIsShowEmail(false)}
-                      setIsShowEmail(false);
-                    }}
                   >
                     <div className="h-full p-[20px]">
                       <p>Please select signer for add placeholder!</p>
                       <div className="h-[1px] w-full my-[15px] bg-[#9f9f9f]"></div>
                       <button
-                        onClick={() => {
+                        onClick={() => setIsShowEmail(false)}
-                          setIsShowEmail(false);
-                        }}
                         type="button"
                         className="op-btn op-btn-primary"
                       >
@@ -1439,7 +1425,6 @@ const TemplatePlaceholder = () => {
                     allPages={allPages}
                     pageNumber={pageNumber}
                     signKey={signKey}
-                    // signerObjId={signerObjId}
                     Id={uniqueId}
                   />
                   {/* pdf header which contain funish back button */}
@@ -1551,10 +1536,8 @@ const TemplatePlaceholder = () => {
                   />
                 </div>
               ) : (
-                <div
+                <div className="w-[23%] bg-base-100 min-h-screen overflow-y-auto hide-scrollbar">
-                  className={`w-[23%] bg-[#FFFFFF] min-h-screen overflow-y-auto hide-scrollbar`}
+                  <div className="max-h-screen">
-                >
-                  <div className={`max-h-screen`}>
                     <SignerListPlace
                       isMailSend={isMailSend}
                       signerPos={signerPos}
@@ -1601,7 +1584,6 @@ const TemplatePlaceholder = () => {
             </div>
           </div>
         )}
-
         <div data-tut="reactourAddbtn--observe">
           <AddRoleModal
             isModalRole={isModalRole}

apps/OpenSign/src/pages/UserList.js

@@ -221,9 +221,9 @@ const UserList = () => {
                   <thead className="text-[14px]">
                     <tr className="border-y-[1px]">
                       {heading?.map((item, index) => (
-                        <React.Fragment key={index}>
+                        <th key={index} className="px-4 py-2">
-                          <th className="px-4 py-2">{item}</th>
+                          {item}
-                        </React.Fragment>
+                        </th>
                       ))}
                     </tr>
                   </thead>

apps/OpenSign/src/pages/UserProfile.js

@@ -313,9 +313,7 @@ function UserProfile() {
       ) : (
         <div className="flex justify-center items-center w-full relative">
           {userNameError && (
-            <div
+            <div className="z-[1000] fixed top-[50%] transform border-[1px] text-sm border-[#f0a8a8] bg-[#f4bebe] text-[#c42121] rounded py-[.75rem] px-[1.25rem]">
-              className={`z-[1000] fixed top-[50%] transform border-[1px] text-sm border-[#f0a8a8] bg-[#f4bebe] text-[#c42121] rounded py-[.75rem] px-[1.25rem]`}
-            >
               {userNameError}
             </div>
           )}

apps/OpenSign/src/pages/Webhook.js

@@ -32,14 +32,12 @@ function Webhook() {
   }, []);
 
   const fetchWebhook = async () => {
-    const email = Parse.User.current().getEmail();
     if (isEnableSubscription) {
       const getIsSubscribe = await checkIsSubscribed();
       setIsSubscribe(getIsSubscribe);
     }
-    const params = { email: email };
     try {
-      const extRes = await Parse.Cloud.run("getUserDetails", params);
+      const extRes = await Parse.Cloud.run("getUserDetails");
       if (extRes) {
         setWebhook(extRes.get("Webhook"));
       }

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -526,10 +526,7 @@ const ReportTable = (props) => {
   };
 
   async function checkTourStatus() {
-    const currentUser = Parse.User.current();
+    const cloudRes = await Parse.Cloud.run("getUserDetails");
-    const cloudRes = await Parse.Cloud.run("getUserDetails", {
-      email: currentUser.get("email")
-    });
     const res = { data: cloudRes.toJSON() };
     if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
       const tourStatus = res.data.TourStatus;

apps/OpenSign/src/primitives/Validate.js

@@ -8,13 +8,13 @@ const Validate = () => {
   const [isUserValid, setIsUserValid] = useState(true);
   useEffect(() => {
     (async () => {
+      if (localStorage.getItem("accesstoken")) {
         try {
           const userDetails = JSON.parse(
             localStorage.getItem(
               `Parse/${localStorage.getItem("parseAppId")}/currentUser`
             )
           );
-
           // Use the session token to validate the user
           const userQuery = new Parse.Query(Parse.User);
           const user = await userQuery.get(userDetails?.objectId, {
@@ -29,6 +29,7 @@ const Validate = () => {
           // Session token is invalid or there was an error
           setIsUserValid(false);
         }
+      }
     })();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps

apps/OpenSign/src/primitives/ValidateRoute.js

@@ -4,6 +4,7 @@ import { Outlet } from "react-router-dom";
 const ValidateRoute = () => {
   useEffect(() => {
     (async () => {
+      if (localStorage.getItem("accesstoken")) {
         try {
           // Use the session token to validate the user
           const userQuery = new Parse.Query(Parse.User);
@@ -17,6 +18,7 @@ const ValidateRoute = () => {
           console.log("err in validate route", error);
           handlelogout();
         }
+      }
     })();
   }, []);
   const handlelogout = async () => {

apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js

@@ -22,11 +22,16 @@ async function GetPublicTemplate(request) {
         templatQuery.notEqualTo('IsArchive', true);
         const getTemplate = await templatQuery.find({ useMasterKey: true });
 
-        const extend_Res = await Parse.Cloud.run('getUserDetails', {
+        const extcls = new Parse.Query('contracts_Users');
-          email: user.get('email'),
+        extcls.equalTo('email', user.get('email'));
-        });
+        const res = await extcls.first({ useMasterKey: true });
-        if (extend_Res) {
+        if (res) {
-          return { template: getTemplate, user: user, extend_User: extend_Res };
+          const _res = JSON.parse(JSON.stringify(_res));
+          return {
+            template: getTemplate,
+            user: user,
+            extend_User: { Tagline: _res?.Tagline || '', SearchIndex: _res?.SearchIndex || '' },
+          };
         } else {
           throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Template not found');
         }

apps/OpenSignServer/cloud/parsefunction/getUserDetails.js

@@ -1,19 +1,39 @@
 async function getUserDetails(request) {
+  const reqEmail = request.params.email;
+  if (reqEmail || request.user) {
     try {
       const userId = request.params.userId;
       const userQuery = new Parse.Query('contracts_Users');
-    userQuery.equalTo('Email', request.params.email);
+      if (request?.user) {
+        const email = request.user.get('email');
+        userQuery.equalTo('Email', email);
+      } else {
+        userQuery.equalTo('Email', reqEmail);
+      }
       userQuery.include('TenantId');
       userQuery.include('UserId');
-    userQuery.exclude('google_refresh_token')
+      userQuery.exclude('google_refresh_token');
       if (userId) {
         userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
       }
       const res = await userQuery.first({ useMasterKey: true });
+      if (res) {
+        if (reqEmail) {
+          return { objectId: res.id };
+        } else {
           return res;
+        }
+      } else {
+        return '';
+      }
     } catch (err) {
       console.log('Err ', err);
-    return err;
+      const code = err?.code || 400;
+      const msg = err?.message || 'Something went wrong.';
+      throw new Parse.Error(code, msg);
+    }
+  } else {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
   }
 }
 export default getUserDetails;

apps/OpenSignServer/index.js

@@ -17,7 +17,7 @@ import { exec } from 'child_process';
 import { createTransport } from 'nodemailer';
 import { app as v1 } from './cloud/customRoute/v1/apiV1.js';
 import { PostHog } from 'posthog-node';
-import { smtpenable, smtpsecure, useLocal } from './Utils.js';
+import { cloudServerUrl, smtpenable, smtpsecure, useLocal } from './Utils.js';
 import { SSOAuth } from './auth/authadapter.js';
 let fsAdapter;
 if (useLocal !== 'true') {
@@ -98,9 +98,9 @@ export const config = {
   maxUploadSize: '30mb',
   masterKey: process.env.MASTER_KEY, //Add your master key here. Keep it secret!
   masterKeyIps: ['0.0.0.0/0', '::/0'], // '::1'
-  serverURL: 'http://localhost:8080/app', // Don't forget to change to https if needed
+  serverURL: cloudServerUrl, // Don't forget to change to https if needed
   verifyUserEmails: false,
-  publicServerURL: process.env.SERVER_URL || 'http://localhost:8080/app',
+  publicServerURL: process.env.SERVER_URL || cloudServerUrl,
   // Your apps name. This will appear in the subject and body of the emails that are sent.
   appName: 'Opensign',
   allowClientClassCreation: false,
@@ -219,8 +219,8 @@ if (!process.env.TESTING) {
     // console.log('isWindows', isWindows);
 
     const migrate = isWindows
-      ? `set APPLICATION_ID=${process.env.APP_ID}&& set SERVER_URL=http://localhost:8080/app&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`
+      ? `set APPLICATION_ID=${process.env.APP_ID}&& set SERVER_URL=${cloudServerUrl}&& set MASTER_KEY=${process.env.MASTER_KEY}&& npx parse-dbtool migrate`
-      : `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=http://localhost:8080/app MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
+      : `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${cloudServerUrl} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
     exec(migrate, (error, stdout, stderr) => {
       if (error) {
         console.error(`Error: ${error.message}`);

apps/OpenSignServer/package-lock.json

@@ -15,8 +15,8 @@
         "@signpdf/placeholder-pdf-lib": "^3.2.4",
         "@signpdf/signer-p12": "^3.2.4",
         "@signpdf/signpdf": "^3.2.4",
-        "aws-sdk": "^2.1665.0",
+        "aws-sdk": "^2.1667.0",
-        "axios": "^1.7.2",
+        "axios": "^1.7.3",
         "cors": "^2.8.5",
         "dotenv": "^16.4.5",
         "express": "^4.19.2",
@@ -4134,9 +4134,9 @@
       }
     },
     "node_modules/aws-sdk": {
-      "version": "2.1665.0",
+      "version": "2.1667.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1665.0.tgz",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1667.0.tgz",
-      "integrity": "sha512-IhEcdGmiplF3l/pCROxEYIdi0s+LZ2VkbMAq3RgoXTHxY5cgqVRNaqsEsgIHev2Clxa9V08HttnIERTIUqb1+Q==",
+      "integrity": "sha512-hE4FmdZRMc3bYeC5LUAAU/ryYpjhEm1xdi4aVtUiZ14rrfMd0li6XQIM00a9ctZwDJpwJppcSXfDj6bVBCzvXQ==",
       "hasInstallScript": true,
       "dependencies": {
         "buffer": "4.9.2",
@@ -4176,9 +4176,9 @@
       "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g=="
     },
     "node_modules/axios": {
-      "version": "1.7.2",
+      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
-      "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+      "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",

apps/OpenSignServer/package.json

@@ -24,8 +24,8 @@
     "@signpdf/placeholder-pdf-lib": "^3.2.4",
     "@signpdf/signer-p12": "^3.2.4",
     "@signpdf/signpdf": "^3.2.4",
-    "aws-sdk": "^2.1665.0",
+    "aws-sdk": "^2.1667.0",
-    "axios": "^1.7.2",
+    "axios": "^1.7.3",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.19.2",

apps/OpenSignServer/runmigrate.js

@@ -1,37 +0,0 @@
-// const { exec } = require('child_process');
-import { exec } from 'child_process';
-
-const migrate =
-  'APPLICATION_ID=legadranaxn SERVER_URL=http://localhost:8080/app MASTER_KEY=XnAwPDRQQyMr npx parse-dbtool migrate';
-// `APPLICATION_ID=${process.env.APP_ID} SERVER_URL=${process.env.SERVER_URL} MASTER_KEY=${process.env.MASTER_KEY} npx parse-dbtool migrate`;
-
-exec(migrate, (error, stdout, stderr) => {
-  if (error) {
-    console.error(`Error: ${error.message}`);
-    return;
-  }
-
-  if (stderr) {
-    console.error(`Error: ${stderr}`);
-    return;
-  }
-
-  console.log(`Command output: ${stdout}`);
-});
-
-// const seeder =
-//   'APPLICATION_ID=legadranaxn SERVER_URL=http://localhost:8080/app MASTER_KEY=XnAwPDRQQyMr npx parse-dbtool seed';
-
-// exec(seeder, (error, stdout, stderr) => {
-//   if (error) {
-//     console.error(`Error: ${error.message}`);
-//     return;
-//   }
-
-//   if (stderr) {
-//     console.error(`Error: ${stderr}`);
-//     return;
-//   }
-
-//   console.log(`Command output: ${stdout}`);
-// });