Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into raktima-patch-2

apps/OpenSign/package-lock.json

@@ -28,7 +28,7 @@
         "print-js": "^1.6.0",
         "radix-ui": "^1.0.1",
         "react": "^18.2.0",
-        "react-bootstrap": "^2.10.5",
+        "react-bootstrap": "^2.10.4",
         "react-confetti": "^6.1.0",
         "react-cookie": "^7.2.0",
         "react-datepicker": "^7.4.0",
@@ -70,7 +70,7 @@
         "autoprefixer": "^10.4.20",
         "babel-loader": "^9.2.1",
         "clean-webpack-plugin": "^4.0.0",
-        "commitizen": "^4.3.1",
+        "commitizen": "^4.3.0",
         "concurrently": "^9.0.1",
         "css-loader": "^7.1.2",
         "daisyui": "^4.12.10",
@@ -78,7 +78,7 @@
         "dotenv-webpack": "^8.1.0",
         "eslint": "^9.11.1",
         "eslint-plugin-prettier": "^5.2.1",
-        "eslint-plugin-react": "^7.37.0",
+        "eslint-plugin-react": "^7.36.1",
         "lint-staged": "^15.2.10",
         "mini-css-extract-plugin": "^2.9.1",
         "postcss": "^8.4.47",
@@ -8750,9 +8750,9 @@
       }
     },
     "node_modules/commitizen": {
-      "version": "4.3.1",
+      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-4.3.1.tgz",
+      "resolved": "https://registry.npmjs.org/commitizen/-/commitizen-4.3.0.tgz",
-      "integrity": "sha512-gwAPAVTy/j5YcOOebcCRIijn+mSjWJC+IYKivTu6aG8Ei/scoXgfsMRnuAk6b0GRste2J4NGxVdMN3ZpfNaVaw==",
+      "integrity": "sha512-H0iNtClNEhT0fotHvGV3E9tDejDeS04sN1veIebsKYGMuGscFaswRoYJKmT3eW85eIJAs0F28bG2+a/9wCOfPw==",
       "dev": true,
       "dependencies": {
         "cachedir": "2.3.0",
@@ -10856,9 +10856,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.37.0",
+      "version": "7.36.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.0.tgz",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.36.1.tgz",
-      "integrity": "sha512-IHBePmfWH5lKhJnJ7WB1V+v/GolbB0rjS8XYVCSQCZKaQCAUhMoVoOEn1Ef8Z8Wf0a7l8KTJvuZg5/e4qrZ6nA==",
+      "integrity": "sha512-/qwbqNXZoq+VP30s1d4Nc1C5GTxjJQjk4Jzs4Wq2qzxFM7dSmuG2UkIjg2USMLh3A/aVcUNrK7v0J5U1XEGGwA==",
       "dependencies": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
@@ -20271,9 +20271,9 @@
       "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg=="
     },
     "node_modules/react-bootstrap": {
-      "version": "2.10.5",
+      "version": "2.10.4",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.5.tgz",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.4.tgz",
-      "integrity": "sha512-XueAOEn64RRkZ0s6yzUTdpFtdUXs5L5491QU//8ZcODKJNDLt/r01tNyriZccjgRImH1REynUc9pqjiRMpDLWQ==",
+      "integrity": "sha512-W3398nBM2CBfmGP2evneEO3ZZwEMPtHs72q++eNw60uDGDAdiGn0f9yNys91eo7/y8CTF5Ke1C0QO8JFVPU40Q==",
       "dependencies": {
         "@babel/runtime": "^7.24.7",
         "@restart/hooks": "^0.4.9",
@@ -22508,9 +22508,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "2.79.2",
+      "version": "2.79.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
-      "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
       "bin": {
         "rollup": "dist/bin/rollup"
       },

apps/OpenSign/package.json

@@ -23,7 +23,7 @@
     "print-js": "^1.6.0",
     "radix-ui": "^1.0.1",
     "react": "^18.2.0",
-    "react-bootstrap": "^2.10.5",
+    "react-bootstrap": "^2.10.4",
     "react-confetti": "^6.1.0",
     "react-cookie": "^7.2.0",
     "react-datepicker": "^7.4.0",
@@ -102,7 +102,7 @@
     "autoprefixer": "^10.4.20",
     "babel-loader": "^9.2.1",
     "clean-webpack-plugin": "^4.0.0",
-    "commitizen": "^4.3.1",
+    "commitizen": "^4.3.0",
     "concurrently": "^9.0.1",
     "css-loader": "^7.1.2",
     "daisyui": "^4.12.10",
@@ -110,7 +110,7 @@
     "dotenv-webpack": "^8.1.0",
     "eslint": "^9.11.1",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.0",
+    "eslint-plugin-react": "^7.36.1",
     "lint-staged": "^15.2.10",
     "mini-css-extract-plugin": "^2.9.1",
     "postcss": "^8.4.47",

apps/OpenSign/public/locales/en/translation.json

@@ -132,8 +132,7 @@
     "View": "View",
     "option": "Option",
     "Embed": "Embed",
-    "Copy TemplateId":"Copy TemplateId",
+    "Copy TemplateId":"Copy TemplateId"
-    "Copy Public URL":"Copy Public URL"
   },
   "report-heading": {
     "Sr.No": "Sr.No",
@@ -640,7 +639,7 @@
   "public-template-mssg-3"  :"Need more details or examples?",
   "public-template-mssg-4": "Visit the",
   "public-template-mssg-5": " npm for the latest updates, detailed documentation, and version history.",
-  "public-template-mssg-6" :"Before you can use this code snippet, you must make this template public.",
+  "public-template-mssg-6" :"You need to set this template as public before you can utilize this code snippet.",
   "copy-code":"COPY",
   "copied-code":"COPIED",
   "Installation":"Installation",
@@ -669,9 +668,6 @@
   "download-files":"Download files",
   "download-pdf":"Download Pdf",
   "pdf-certificate":"Download Pdf + Certificate",
-  "document-logs":"Document logs",
+  "document-logs":"Document logs"
-  "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.",
-  "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.",
-   "public-tour-message":"Please make template public to copy public URL"
 
 }

apps/OpenSign/public/locales/fr/translation.json

@@ -152,8 +152,7 @@
     "View": "Voir",
     "option": "Option",
     "Embed": "Intégrer",
-    "Copy TemplateId": "Copier l'ID du modèle",
+    "Copy TemplateId": "Copier l'ID du modèle"
-    "Copy Public URL":"Copier l'URL publique"
   },
   "report-help": {
     "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -639,7 +638,7 @@
   "public-template-mssg-3" :"Besoin de plus de détails ou d'exemples ?",
   "public-template-mssg-4": "Visitez le",
   "public-template-mssg-5":  "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
-  "public-template-mssg-6":"Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
+  "public-template-mssg-6":"Vous devez définir ce modèle comme public avant de pouvoir utiliser cet extrait de code.",
   "copy-code":"COPIE",
   "copied-code":"COPIÉ",
   "Installation":"Installation",
@@ -668,10 +667,6 @@
    "download-files" :"Télécharger des fichiers",
    "download-pdf" :"Télécharger le PDF",
   "pdf-certificate"  :"Télécharger Pdf + Certificat",
-  "document-logs":"Journaux de documents",
+  "document-logs":"Journaux de documents"
-  "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.",
-  "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.",
-  "public-tour-message":"Veuillez rendre le modèle public pour copier l'URL publique"
-
 
 }

apps/OpenSign/src/components/opensigndrive/DriveBody.js

@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef } from "react";
 import "../../styles/opensigndrive.css";
 import axios from "axios";
 import * as ContextMenu from "@radix-ui/react-context-menu";
+import { saveAs } from "file-saver";
 import { useNavigate } from "react-router-dom";
 import Table from "react-bootstrap/Table";
 import * as HoverCard from "@radix-ui/react-hover-card";
@@ -263,6 +264,12 @@ function DriveBody(props) {
       setIsOpenMoveModal(false);
     }
   };
+
+  const sanitizeFileName = (pdfName) => {
+    // Replace spaces with underscore
+    return pdfName.replace(/ /g, "_");
+  };
+
   const handleEnterPress = (e, data) => {
     if (e.key === "Enter") {
       handledRenameDoc(data);

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

@@ -34,7 +34,7 @@ export function App() {
       <Opensign
         onLoad={() => console.log("success")}
         onLoadError={(error) => console.log(error)}
-        templateId= "${props.templateId}"
+        templateId= {"${props.templateId}"}
       />
     </div>
   );
@@ -63,10 +63,10 @@ import {OpensignComponent} from "@opensign/angular"
   selector:'app-root',
   standalone: true,
   imports: [OpensignComponent], 
-  template:\`<opensign templateId="${props.templateId}"
+  template: '<opensign templateId={"${props.templateId}"}
             (onLoad)="handleLoad()"
             (onLoadError)="handleError($event)"
-             ></opensign>\`,
+             ></opensign>',
 })
 export class AppComponent{
   handleLoad() {
@@ -129,11 +129,9 @@ export class AppComponent{
                   <p className="font-medium text-[18px]">
                     {t(`${data.title}`)}
                   </p>
-                  {ind === 0 && (
                   <p className="text-[13px] mt-2">
                     {t("public-template-mssg-1")}
                   </p>
-                  )}
                   <div className="relative p-1">
                     <div
                       onClick={() => handleCopy(data.codeString, ind)}
@@ -212,11 +210,11 @@ export class AppComponent{
                     <p className="font-medium text-[18px]">
                       {t(`${data.title}`)}
                     </p>
-                    {ind === 0 && (
+
                     <p className="text-[13px] mt-2">
                       {t("angular-npm-mssg-1")}
                     </p>
-                    )}
+
                     <div className="relative p-1">
                       <div
                         onClick={() => handleCopy(data.codeString, ind)}

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

@@ -725,9 +725,7 @@ function Placeholder(props) {
               : props?.pos?.zIndex
                 ? props.pos.zIndex
                 : "5",
-          background: props.data
+          background: props.data ? props.data.blockColor : "rgb(203 233 237)"
-            ? props.data?.blockColor + "b0"
-            : "rgba(203, 233, 237, 0.69)"
         }}
         onDrag={() => {
           setDraggingEnabled(true);

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

@@ -596,7 +596,7 @@ function SignPad({
                           borderRadius: "2px"
                         }
                       }}
-                      // backgroundColor="rgb(255, 255, 255)"
+                      backgroundColor="rgb(255, 255, 255)"
                       onEnd={() =>
                         handleSignatureChange(canvasRef.current?.toDataURL())
                       }

apps/OpenSign/src/constant/Utils.js

@@ -1350,6 +1350,11 @@ export const multiSignEmbed = async (
       widgetsPositionArr.map(async (url) => {
         let signUrl = url.SignUrl && url.SignUrl;
         if (signUrl) {
+          if (url.ImageType === "image/png") {
+            //function for convert signature png base64 url to jpeg base64
+            const newUrl = await convertPNGtoJPEG(signUrl);
+            signUrl = newUrl;
+          }
           const res = await fetch(signUrl);
           return res.arrayBuffer();
         }
@@ -1359,14 +1364,19 @@ export const multiSignEmbed = async (
     widgetsPositionArr.forEach(async (position, id) => {
       let img;
       if (["signature", "stamp", "initials", "image"].includes(position.type)) {
-        if (position.ImageType && position.ImageType === "image/jpeg") {
+        if (
+          (position.ImageType && position.ImageType === "image/png") ||
+          position.ImageType === "image/jpeg"
+        ) {
           img = await pdfDoc.embedJpg(images[id]);
         } else {
           img = await pdfDoc.embedPng(images[id]);
         }
       } else if (!position.type) {
-        //  to handle old widget when only stamp and signature are exists
+        if (
-        if (position.ImageType && position.ImageType === "image/jpeg") {
+          (position.ImageType && position.ImageType === "image/png") ||
+          position.ImageType === "image/jpeg"
+        ) {
           img = await pdfDoc.embedJpg(images[id]);
         } else {
           img = await pdfDoc.embedPng(images[id]);
@@ -1926,13 +1936,9 @@ export const getAppLogo = async () => {
       }
     } catch (err) {
       console.log("err in getlogo ", err);
-      if (err?.message?.includes("valid JSON")) {
-        return { logo: appInfo.applogo, user: "exist", error: "invalid_json" };
-      } else {
       return { logo: appInfo.applogo, user: "exist" };
     }
   }
-  }
 };
 
 export const getTenantDetails = async (objectId) => {

apps/OpenSign/src/json/ReportJson.js

@@ -39,13 +39,6 @@ export default function reportJson(id) {
           hoverLabel: "Copy TemplateId",
           btnIcon: "fa-light fa-copy",
           action: "CopyTemplateId"
-        },
-        {
-          btnId: "2434",
-          btnLabel: "Copy Public URL",
-          hoverLabel: "Copy Public URL",
-          btnIcon: "fa-light fa-copy",
-          action: "CopyPublicURL"
         }
       ]
     : [];
@@ -412,15 +405,18 @@ export default function reportJson(id) {
             if (item.action === "option") {
               // Make a shallow copy of the item
               const newItem = { ...item };
-              //splice method used to add `Share with team` option on second index of list
+              newItem.subaction = [
-              newItem.subaction.splice(1, 0, {
+                {
                   btnId: "1873",
                   btnLabel: "Share with team",
                   hoverLabel: "Share with team",
                   btnIcon: "fa-light fa-share-nodes",
                   redirectUrl: "",
                   action: "sharewith"
-              });
+                },
+                ...newItem.subaction
+              ];
+
               return newItem;
             }
             return item;

apps/OpenSign/src/pages/AddAdmin.js

@@ -46,7 +46,7 @@ const AddAdmin = () => {
     try {
       const app = await getAppLogo();
       if (app?.user === "exist") {
-        setErrMsg(t("admin-exists"));
+        setErrMsg(t("admin-already-exist"));
       }
     } catch (err) {
       setErrMsg(t("something-went-wrong-mssg"));

apps/OpenSign/src/pages/Login.js

@@ -51,7 +51,6 @@ function Login() {
   const [isModal, setIsModal] = useState(false);
   const [image, setImage] = useState();
   const [isLoginSSO, setIsLoginSSO] = useState(false);
-  const [errMsg, setErrMsg] = useState();
 
   useEffect(() => {
     checkUserExt();
@@ -60,9 +59,7 @@ function Login() {
 
   const checkUserExt = async () => {
     const app = await getAppLogo();
-    if (app?.error === "invalid_json") {
+    if (!isEnableSubscription && app?.user === "not_exist") {
-      setErrMsg(t("server-down"));
-    } else if (!isEnableSubscription && app?.user === "not_exist") {
       navigate("/addadmin");
     }
     if (app?.logo) {
@@ -623,11 +620,7 @@ function Login() {
     }
   };
 
-  return errMsg ? (
+  return (
-    <div className="h-screen flex justify-center text-center items-center p-4 text-gray-500 text-base">
-      {errMsg}
-    </div>
-  ) : (
     <div>
       <Title title={"Login Page"} />
       {state.loading && (

apps/OpenSign/src/pages/Managesign.js

@@ -2,13 +2,12 @@ import React, { useState, useRef, useEffect } from "react";
 import SignatureCanvas from "react-signature-canvas";
 import "../styles/managesign.css";
 import "../styles/signature.css";
-import { generateTitleFromFilename, toDataUrl } from "../constant/Utils";
+import { toDataUrl } from "../constant/Utils";
 import Parse from "parse";
 import { SaveFileSize } from "../constant/saveFileSize";
 import Alert from "../primitives/Alert";
 import Loader from "../primitives/Loader";
 import { useTranslation } from "react-i18next";
-import sanitizeFileName from "../primitives/sanitizeFileName";
 const ManageSign = () => {
   const { t } = useTranslation();
   const [penColor, setPenColor] = useState("blue");
@@ -24,11 +23,9 @@ const ManageSign = () => {
   const [Initials, setInitials] = useState("");
   const [isInitials, setIsInitials] = useState(false);
   const [id, setId] = useState("");
-  const [imgInitials, setImgInitials] = useState("");
   const canvasRef = useRef(null);
   const imageRef = useRef(null);
   const initailsRef = useRef(null);
-  const imgInitialsRef = useRef(null);
   useEffect(() => {
     fetchUserSign();
     // eslint-disable-next-line
@@ -49,23 +46,14 @@ const ManageSign = () => {
         if (signRes) {
           const res = signRes.toJSON();
           setId(res.objectId);
-          if (res?.SignatureName) {
+          setSignName(res?.SignatureName);
-            const sanitizename = generateTitleFromFilename(res?.SignatureName);
+          setImage(res.ImageURL);
-            const replaceSpace = sanitizeFileName(sanitizename);
-            setSignName(replaceSpace);
-          }
-          setImage(res?.ImageURL);
           if (res && res.Initials) {
-            // setInitials(res.Initials);
+            setInitials(res.Initials);
             setIsInitials(true);
-            setImgInitials(res?.Initials);
           }
         } else {
-          if (User?.get("name")) {
+          setSignName(User?.get("name") || "");
-            const sanitizename = generateTitleFromFilename(User?.get("name"));
-            const replaceSpace = sanitizeFileName(sanitizename);
-            setSignName(replaceSpace);
-          }
         }
         setIsLoader(false);
       } catch (err) {
@@ -98,14 +86,8 @@ const ManageSign = () => {
     if (initailsRef.current) {
       initailsRef.current.clear();
     }
-    if (imgInitialsRef.current) {
-      imgInitialsRef.current.value = "";
-    }
-    setImgInitials("");
     setInitials("");
-    if (image) {
     setIsValue(true);
-    }
     setIsInitials(false);
   };
 
@@ -119,54 +101,40 @@ const ManageSign = () => {
       const base64Img = await toDataUrl(file);
       setImage(base64Img);
       setIsValue(true);
-    } else {
-      setImage("");
-      setIsValue(false);
     }
   };
   const handleSubmit = async (e) => {
     e.preventDefault();
-    const isUrl = image?.includes("https") || image?.includes("http");
+    const isUrl = image.includes("https");
+
     if (!isvalue) {
       setWarning(true);
       setTimeout(() => setWarning(false), 1000);
     } else {
       setIsLoader(true);
-      const sanitizename = generateTitleFromFilename(signName);
+      const replaceSpace = signName.replace(/ /g, "_");
-      const replaceSpace = sanitizeFileName(sanitizename);
       let file;
       if (signature) {
         file = base64StringtoFile(signature, `${replaceSpace}_sign.png`);
       } else {
-        if (image && !isUrl) {
+        if (!isUrl) {
           file = base64StringtoFile(image, `${replaceSpace}__sign.png`);
         }
       }
       let imgUrl;
-      if (file && !isUrl) {
+      if (!isUrl) {
         imgUrl = await uploadFile(file);
       } else {
         imgUrl = image;
       }
-      const isInitialsUrl =
+      let initialsUrl = "";
-        imgInitials?.includes("https") || imgInitials?.includes("http");
+      const isInitialsUrl = Initials.includes("https");
-
+      if (!isInitialsUrl && Initials) {
-      let initialFile;
+        const initialsImg = base64StringtoFile(
-      if (Initials) {
+          Initials,
-        initialFile = base64StringtoFile(Initials, `${replaceSpace}_sign.png`);
+          `${replaceSpace}_initials.png`
-      } else {
-        if (imgInitials && !isInitialsUrl) {
-          initialFile = base64StringtoFile(
-            imgInitials,
-            `${replaceSpace}__sign.png`
         );
-        }
+        initialsUrl = await uploadFile(initialsImg);
-      }
-      let initialsUrl;
-      if (initialFile && !isInitialsUrl) {
-        initialsUrl = await uploadFile(initialFile);
-      } else {
-        initialsUrl = imgInitials;
       }
       if (imgUrl) {
         await saveEntry({
@@ -178,7 +146,7 @@ const ManageSign = () => {
     }
   };
   function base64StringtoFile(base64String, filename) {
-    let arr = base64String.split(","),
+    var arr = base64String.split(","),
       mime = arr[0].match(/:(.*?);/)[1],
       bstr = atob(arr[1]),
       n = bstr.length,
@@ -207,24 +175,31 @@ const ManageSign = () => {
 
   const saveEntry = async (obj) => {
     const signCls = "contracts_Signature";
-    const User = Parse?.User?.current()?.id;
+    const User = Parse.User.current().id;
     const userId = { __type: "Pointer", className: "_User", objectId: User };
     if (id) {
       try {
         const updateSign = new Parse.Object(signCls);
         updateSign.id = id;
         updateSign.set("Initials", obj.initialsUrl ? obj.initialsUrl : "");
-        updateSign.set("ImageURL", obj.url ? obj.url : "");
+        updateSign.set("ImageURL", obj.url);
         updateSign.set("SignatureName", obj.name);
         updateSign.set("UserId", userId);
         const res = await updateSign.save();
-        setIsAlert({ type: "success", message: t("signature-saved-alert") });
+        setIsLoader(false);
+        setIsAlert({
+          type: "success",
+          message: t("signature-saved-alert")
+        });
+        setTimeout(() => setIsAlert({}), 2000);
         return res;
       } catch (err) {
         console.log(err);
-        setIsAlert({ type: "danger", message: `${err.message}` });
-      } finally {
         setIsLoader(false);
+        setIsAlert({
+          type: "danger",
+          message: `${err.message}`
+        });
         setTimeout(() => setIsAlert({}), 2000);
       }
     } else {
@@ -235,13 +210,20 @@ const ManageSign = () => {
         updateSign.set("SignatureName", obj.name);
         updateSign.set("UserId", userId);
         const res = await updateSign.save();
-        setIsAlert({ type: "success", message: t("signature-saved-alert") });
+        setIsLoader(false);
+        setIsAlert({
+          type: "success",
+          message: t("signature-saved-alert")
+        });
+        setTimeout(() => setIsAlert({}), 2000);
         return res;
       } catch (err) {
         console.log(err);
-        setIsAlert({ type: "success", message: `${err.message}` });
-      } finally {
         setIsLoader(false);
+        setIsAlert({
+          type: "success",
+          message: `${err.message}`
+        });
         setTimeout(() => setIsAlert({}), 2000);
       }
     }
@@ -252,29 +234,7 @@ const ManageSign = () => {
   };
   const handleInitialsChange = () => {
     setInitials(initailsRef.current.toDataURL());
-    if (image || signature) {
     setIsValue(true);
-    }
-  };
-  const handleUploadInitials = () => {
-    imgInitialsRef.current.click();
-  };
-  const onImgInitialsChange = async (event) => {
-    if (initailsRef.current) {
-      initailsRef.current.clear();
-    }
-    setInitials("");
-    if (event.target.files && event.target.files[0]) {
-      const file = event.target.files[0];
-      const base64Img = await toDataUrl(file);
-      setImgInitials(base64Img);
-      if (image || signature) {
-        setIsValue(true);
-      }
-    } else {
-      setImgInitials("");
-      setIsValue(false);
-    }
   };
   return (
     <div className="relative h-full bg-base-100 text-base-content flex shadow-md rounded-box overflow-auto">
@@ -321,7 +281,7 @@ const ManageSign = () => {
                         height: "180px",
                         className: "signatureCanvas rounded-box"
                       }}
-                      // backgroundColor="rgb(255, 255, 255)"
+                      backgroundColor="rgb(255, 255, 255)"
                       onEnd={() =>
                         handleSignatureChange(canvasRef.current.toDataURL())
                       }
@@ -372,7 +332,7 @@ const ManageSign = () => {
                         className="op-link"
                         onClick={() => handleUploadBtn()}
                       >
-                        {t("upload")}
+                        {t("upload-image")}
                       </div>
                       <div
                         type="button"
@@ -396,21 +356,17 @@ const ManageSign = () => {
               <span className="font-medium select-none flex mb-[10px] pl-[10px]">
                 {t("initials")}
               </span>
-              <input
-                type="file"
-                onChange={onImgInitialsChange}
-                className="filetype"
-                accept="image/*"
-                ref={imgInitialsRef}
-                hidden
-              />
               <div>
-                {imgInitials ? (
+                {isInitials ? (
                   <div className="intialSignature relative border-[1px] border-[#888] rounded-box overflow-hidden">
                     <img
                       alt="inititals"
-                      src={imgInitials}
+                      src={Initials}
-                      className="w-[100%] h-[100%] object-contain"
+                      style={{
+                        width: "100%",
+                        height: "100%",
+                        objectFit: "contain"
+                      }}
                     />
                   </div>
                 ) : (
@@ -420,8 +376,10 @@ const ManageSign = () => {
                     canvasProps={{
                       className: "intialSignature rounded-box"
                     }}
-                    // backgroundColor="rgb(255, 255, 255)"
+                    backgroundColor="rgb(255, 255, 255)"
-                    onEnd={() => handleInitialsChange()}
+                    onEnd={() =>
+                      handleInitialsChange(initailsRef.current.toDataURL())
+                    }
                     dotSize={1}
                   />
                 )}
@@ -444,7 +402,6 @@ const ManageSign = () => {
                                         ? "2px solid black"
                                         : "2px solid white"
                               }}
-                              className="fa-light fa-pen-nib"
                               onClick={() => {
                                 if (key === 0) {
                                   setInitialPen("blue");
@@ -455,6 +412,7 @@ const ManageSign = () => {
                                 }
                               }}
                               key={key}
+                              className="fa-light fa-pen-nib"
                               width={20}
                               height={20}
                             ></i>
@@ -463,14 +421,6 @@ const ManageSign = () => {
                       </div>
                     )}
                   </div>
-                  <div className="flex flex-row gap-1">
-                    <div
-                      type="button"
-                      className="op-link text-sm md:text-base mr-1"
-                      onClick={() => handleUploadInitials()}
-                    >
-                      {t("upload")}
-                    </div>
                   <div>
                     <div
                       type="button"
@@ -484,7 +434,6 @@ const ManageSign = () => {
               </div>
             </div>
           </div>
-          </div>
           <div className="pt-3 ml-2 md:ml-0">
             <button
               className="op-btn op-btn-primary"

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -51,6 +51,7 @@ import LoaderWithMsg from "../primitives/LoaderWithMsg";
 import DownloadPdfZip from "../primitives/DownloadPdfZip";
 import Loader from "../primitives/Loader";
 import PdfDeclineModal from "../primitives/PdfDeclineModal";
+import Agreement from "../primitives/Agreement";
 
 function PdfRequestFiles(props) {
   const { t } = useTranslation();
@@ -137,6 +138,8 @@ function PdfRequestFiles(props) {
   const isHeader = useSelector((state) => state.showHeader);
   const divRef = useRef(null);
   const [isDownloadModal, setIsDownloadModal] = useState(false);
+  const [isAgree, setIsAgree] = useState(false);
+  const [isAgreeTour, setIsAgreeTour] = useState(false);
 
   const isMobile = window.innerWidth < 767;
 
@@ -284,7 +287,6 @@ function PdfRequestFiles(props) {
     }
   }
   //function for get document details for perticular signer with signer'object id
-  //whenever change anything in this function check react/angular packages also in plan js
   const getTemplateDetails = async () => {
     try {
       const params = { templateId: props.templateId, ispublic: true };
@@ -310,7 +312,6 @@ function PdfRequestFiles(props) {
         throw new Error("error: Invalid TemplateId");
       } else if (documentData && documentData.length > 0) {
         if (documentData[0]?.IsPublic) {
-          //handle condition when someone use plan js then setTemplateStatus is not supporting
           props?.setTemplateStatus &&
             props?.setTemplateStatus({
               status: "Success"
@@ -1674,6 +1675,17 @@ function PdfRequestFiles(props) {
       </div>
     );
   };
+  const AgreementTour = [
+    {
+      selector: '[data-tut="IsAgree"]',
+      content: "Please agree & continue to start signing",
+      position: "top",
+      style: { fontSize: "13px" }
+    }
+  ];
+  const handleCloseAgreeTour = () => {
+    setIsAgreeTour(false);
+  };
   return (
     <DndProvider backend={HTML5Backend}>
       <Title title={props.templateId ? "Public Sign" : "Request Sign"} />
@@ -1696,7 +1708,23 @@ function PdfRequestFiles(props) {
           ) : handleError ? (
             <HandleError handleError={handleError} />
           ) : (
-            <div>
+            <div onClick={() => !isAgree && setIsAgreeTour(true)}>
+              {!isAgree && (
+                <Agreement
+                  setIsAgree={setIsAgree}
+                  setIsAgreeTour={setIsAgreeTour}
+                />
+              )}
+              <Tour
+                showNumber={false}
+                showNavigation={false}
+                showNavigationNumber={false}
+                onRequestClose={handleCloseAgreeTour}
+                steps={AgreementTour}
+                isOpen={isAgreeTour}
+                rounded={5}
+                closeWithMask={false}
+              />
               {isUiLoading && (
                 <div className="absolute h-[100vh] w-full flex flex-col justify-center items-center z-[999] bg-[#e6f2f2] bg-opacity-80">
                   <Loader />
@@ -1715,6 +1743,7 @@ function PdfRequestFiles(props) {
                   />
                 </div>
               )}
+
               <div
                 style={{
                   pointerEvents:

apps/OpenSign/src/pages/UpdateExistUserAdmin.js

@@ -15,7 +15,6 @@ const UpdateExistUserAdmin = () => {
   const [isAlert, setIsAlert] = useState({ type: "danger", msg: "" });
   useEffect(() => {
     checkIsAdminExist();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const checkIsAdminExist = async () => {
@@ -23,7 +22,7 @@ const UpdateExistUserAdmin = () => {
       const isAdminExist = await Parse.Cloud.run("checkadminexist");
       if (isAdminExist !== "not_exist") {
         // console.log("isAdminExist ", isAdminExist);
-        setErrMsg(t("admin-exists"));
+        setErrMsg("Admin already exists.");
       }
     } catch (err) {
       console.log("Err in checkadminexist", err);
@@ -53,7 +52,7 @@ const UpdateExistUserAdmin = () => {
       } else if (err.code === 101) {
         setIsAlert((prev) => ({ ...prev, msg: t("user-not-found") }));
       } else if (err.code === 137) {
-        setIsAlert((prev) => ({ ...prev, msg: t("admin-exists") }));
+        setIsAlert((prev) => ({ ...prev, msg: t("admin-already-exist") }));
       } else {
         setErrMsg(t("something-went-wrong-mssg"));
       }

apps/OpenSign/src/primitives/Agreement.js

@@ -0,0 +1,43 @@
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+function Agreement(props) {
+  const { t } = useTranslation();
+  const [isChecked, setIsChecked] = useState(false);
+  return (
+    <div className="flex justify-between  mx-2 mb-2 pt-1" data-tut="IsAgree">
+      <div className="flex items-center">
+        <input
+          className="mr-3 op-checkbox op-checkbox-m"
+          type="checkbox"
+          value={isChecked}
+          onChange={(e) => {
+            setIsChecked(e.target.checked);
+            if (e.target.checked) {
+              props.setIsAgreeTour(false);
+            }
+          }}
+        />
+        I confirm that I have read and understood the &apos;Electronic Record
+        and Signature Disclosure&apos; and consent to use electronic records and
+        signatures.
+      </div>
+
+      <div className="flex">
+        <button
+          onClick={() => {
+            if (isChecked) {
+              props.setIsAgreeTour(false);
+              props.setIsAgree(true);
+            }
+          }}
+          className="op-btn op-btn-primary op-btn-sm"
+        >
+          Agree & Continue
+        </button>
+      </div>
+    </div>
+  );
+}
+
+export default Agreement;

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -76,7 +76,6 @@ const ReportTable = (props) => {
   const [reason, setReason] = useState("");
   const [isDownloadModal, setIsDownloadModal] = useState(false);
   const [isEmbed, setIsEmbed] = useState(false);
-  const [isPublicTour, setIsPublicTour] = useState();
   const Extand_Class = localStorage.getItem("Extand_Class");
   const extClass = Extand_Class && JSON.parse(Extand_Class);
   const startIndex = (currentPage - 1) * props.docPerPage;
@@ -374,19 +373,6 @@ const ReportTable = (props) => {
       handleEmbedFunction(item);
     } else if (act.action === "CopyTemplateId") {
       copyTemplateId(item.objectId);
-    } else if (act.action === "CopyPublicURL") {
-      const isPublic = item?.IsPublic;
-      if (isPublic) {
-        let publicUrl = "";
-        if (isStaging) {
-          publicUrl = `https://staging.opensign.me/publicsign?templateid=${item.objectId}`;
-        } else {
-          publicUrl = `https://opensign.me/publicsign?templateid=${item.objectId}`;
-        }
-        copyTemplateId(publicUrl);
-      } else {
-        setIsPublicTour({ [item.objectId]: true });
-      }
     }
   };
   // Get current list
@@ -1147,17 +1133,6 @@ const ReportTable = (props) => {
     setIsPublicUserName(extendUser[0]?.UserName || "");
   };
 
-  const publicTourConfig = [
-    {
-      selector: '[data-tut="IsPublic"]',
-      content: t("public-tour-message"),
-      position: "top",
-      style: { fontSize: "13px" }
-    }
-  ];
-  const closePublicTour = () => {
-    setIsPublicTour();
-  };
   return (
     <div className="relative">
       {Object.keys(actLoader)?.length > 0 && (
@@ -1178,7 +1153,6 @@ const ReportTable = (props) => {
         )}
         {isAlert && <Alert type={alertMsg.type}>{alertMsg.message}</Alert>}
         {props.tourData && props.ReportName === "Templates" && (
-          <>
           <Tour
             onRequestClose={closeTour}
             steps={props.tourData}
@@ -1186,19 +1160,6 @@ const ReportTable = (props) => {
             // rounded={5}
             closeWithMask={false}
           />
-            {isPublicTour && (
-              <Tour
-                showNumber={false}
-                showNavigation={false}
-                showNavigationNumber={false}
-                onRequestClose={closePublicTour}
-                steps={publicTourConfig}
-                isOpen={true}
-                rounded={5}
-                closeWithMask={false}
-              />
-            )}
-          </>
         )}
         <div className="flex flex-row items-center justify-between my-2 mx-3 text-[20px] md:text-[23px]">
           <div className="font-light">
@@ -1414,17 +1375,13 @@ const ReportTable = (props) => {
                           isEnableSubscription && (
                             <td className=" pl-[20px] py-2">
                               {props.ReportName === "Templates" && (
-                                <div
+                                <div className="flex flex-row">
-                                  className="flex flex-row "
-                                  data-tut="IsPublic"
-                                >
                                   <label className="cursor-pointer relative inline-flex items-center mb-0">
                                     <input
                                       checked={props.isPublic?.[item.objectId]}
-                                      onChange={(e) => {
+                                      onChange={(e) =>
-                                        setIsPublicTour();
+                                        handlePublicChange(e, item)
-                                        handlePublicChange(e, item);
+                                      }
-                                      }}
                                       type="checkbox"
                                       value=""
                                       className="sr-only peer"

apps/OpenSign/src/script/locales/en/translation.json

@@ -132,8 +132,7 @@
     "View": "View",
     "option": "Option",
     "Embed": "Embed",
-    "Copy TemplateId": "Copy TemplateId",
+    "Copy TemplateId":"Copy TemplateId"
-    "Copy Public URL": "Copy Public URL"
   },
   "report-heading": {
     "Sr.No": "Sr.No",
@@ -640,7 +639,7 @@
   "public-template-mssg-3"  :"Need more details or examples?",
   "public-template-mssg-4": "Visit the",
   "public-template-mssg-5": " npm for the latest updates, detailed documentation, and version history.",
-  "public-template-mssg-6": "Before you can use this code snippet, you must make this template public.",
+  "public-template-mssg-6" :"You need to set this template as public before you can utilize this code snippet.",
   "copy-code":"COPY",
   "copied-code":"COPIED",
   "Installation":"Installation",
@@ -669,8 +668,5 @@
   "download-files":"Download files",
   "download-pdf":"Download Pdf",
   "pdf-certificate":"Download Pdf + Certificate",
-  "document-logs": "Document logs",
+  "document-logs":"Document logs"
-  "server-down": "Unable to connect to the OpenSign server. If you are self-hosting OpenSign, please ensure that all the steps in the documentation have been followed correctly. If you're running OpenSign locally, you might be accessing it through an incorrect port number.",
-  "admin-exists": "Admin already exists. Please login to the application using admin credentials in order to manage users.",
-  "public-tour-message": "Please make template public to copy public URL"
 }

apps/OpenSign/src/script/locales/fr/translation.json

@@ -152,8 +152,7 @@
     "View": "Voir",
     "option": "Option",
     "Embed": "Intégrer",
-    "Copy TemplateId": "Copier l'ID du modèle",
+    "Copy TemplateId": "Copier l'ID du modèle"
-    "Copy Public URL": "Copier l'URL publique"
   },
   "report-help": {
     "Draft Documents": "Il s'agit de documents que vous avez commencés mais que vous n'avez pas finalisés pour envoi.",
@@ -639,7 +638,7 @@
   "public-template-mssg-3" :"Besoin de plus de détails ou d'exemples ?",
   "public-template-mssg-4": "Visitez le",
   "public-template-mssg-5":  "npm pour les dernières mises à jour, une documentation détaillée et l'historique des versions.",
-  "public-template-mssg-6":  "Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
+  "public-template-mssg-6":"Vous devez définir ce modèle comme public avant de pouvoir utiliser cet extrait de code.",
   "copy-code":"COPIE",
   "copied-code":"COPIÉ",
   "Installation":"Installation",
@@ -668,8 +667,6 @@
    "download-files" :"Télécharger des fichiers",
    "download-pdf" :"Télécharger le PDF",
   "pdf-certificate"  :"Télécharger Pdf + Certificat",
-  "document-logs": "Journaux de documents",
+  "document-logs":"Journaux de documents"
-  "server-down": "Impossible de se connecter au serveur OpenSign. Si vous hébergez vous-même OpenSign, veuillez vous assurer que toutes les étapes de la documentation ont été correctement suivies. Si vous exécutez OpenSign localement, vous y accédez peut-être via un numéro de port incorrect.",
+
-  "admin-exists": "L'administrateur existe déjà. Veuillez vous connecter à l'application en utilisant les informations d'identification de l'administrateur afin de gérer les utilisateurs.",
-  "public-tour-message": "Veuillez rendre le modèle public pour copier l'URL publique"
 }

apps/OpenSign/src/styles/managesign.css

@@ -4,6 +4,7 @@
   border: 1px solid black;
   background: white;
   border-radius: 5px;
+  animation: inAnimation 2s ease-in-out;
   z-index: 1;
 }
 

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

@@ -196,9 +196,8 @@ export default async function createDocumentWithTemplate(request, response) {
                 if (TimeToCompleteDays) {
                   object.set('TimeToCompleteDays', TimeToCompleteDays);
                 }
-                const enableOTP = request.body?.enableOTP;
+                const enableOTP = request.body?.enableOTP === true ? true : false;
-                const IsEnableOTP =
+                const IsEnableOTP = enableOTP || template?.IsEnableOTP || false;
-                  enableOTP !== undefined ? enableOTP : template?.IsEnableOTP || false;
                 object.set('IsEnableOTP', IsEnableOTP);
                 object.set('CreatedBy', template.CreatedBy);
                 object.set('ExtUserPtr', {

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

@@ -48,10 +48,10 @@ export default async function updateDocument(request, response) {
                 objectId: request?.body?.folderId,
               });
             }
-            if (request.body?.enableOTP !== undefined) {
+
+            if (request.body?.enableOTP) {
               updateQuery.set('IsEnableOTP', request.body?.enableOTP);
             }
-
             const updatedRes = await updateQuery.save(null, { useMasterKey: true });
             if (updatedRes) {
               if (request.posthog) {

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

@@ -48,7 +48,7 @@ export default async function updateTemplate(request, response) {
                 objectId: request?.body?.folderId,
               });
             }
-            if (request.body?.enableOTP !== undefined) {
+            if (request.body?.enableOTP) {
               updateQuery.set('IsEnableOTP', request.body?.enableOTP);
             }
             const updatedRes = await updateQuery.save(null, { useMasterKey: true });

apps/OpenSignServer/cloud/parsefunction/UpdateExistUserAsAdmin.js

@@ -51,10 +51,7 @@ export default async function UpdateExistUserAsAdmin(request) {
     extClsQuery.notEqualTo('IsDisabled', true);
     const extAdminRes = await extClsQuery.find({ useMasterKey: true });
     if (extAdminRes && extAdminRes.length === 1 && extAdminRes?.[0]?.get('OrganizationId')) {
-      throw new Parse.Error(
+      throw new Parse.Error(Parse.Error.DUPLICATE_VALUE, 'Admin already exist.');
-        Parse.Error.DUPLICATE_VALUE,
-        'Admin already exists. Please login to the application using admin credentials in order to manage users.'
-      );
     } else {
       const extCls = new Parse.Query('contracts_Users');
       extCls.equalTo('Email', email);

apps/OpenSignServer/package-lock.json

@@ -25,7 +25,7 @@
         "googleapis": "^144.0.0",
         "jsonschema": "^1.4.1",
         "mailgun.js": "^10.2.3",
-        "mongoose": "^8.7.0",
+        "mongoose": "^8.6.3",
         "multer": "^1.4.5-lts.1",
         "multer-s3": "^3.0.1",
         "node-forge": "^1.3.1",
@@ -8247,13 +8247,13 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.7.0",
+      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.7.0.tgz",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.6.3.tgz",
-      "integrity": "sha512-rUCSF1mMYQXjXYdqEQLLlMD3xbcj2j1/hRn+9VnVj7ipzru/UoUZxlj/hWmteKMAh4EFnDZ+BIrmma9l/0Hi1g==",
+      "integrity": "sha512-++yRmm7hjMbqVA/8WeiygTnEfrFbiy+OBjQi49GFJIvCQuSYE56myyQWo4j5hbpcHjhHQU8NukMNGTwAWFWjIw==",
       "dependencies": {
         "bson": "^6.7.0",
         "kareem": "2.6.3",
-        "mongodb": "6.9.0",
+        "mongodb": "6.8.0",
         "mpath": "0.9.0",
         "mquery": "5.0.0",
         "ms": "2.1.3",
@@ -8325,9 +8325,9 @@
       }
     },
     "node_modules/mongoose/node_modules/mongodb": {
-      "version": "6.9.0",
+      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.9.0.tgz",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.8.0.tgz",
-      "integrity": "sha512-UMopBVx1LmEUbW/QE0Hw18u583PEDVQmUmVzzBRH0o/xtE9DBRA5ZYLOjpLIa03i8FXjzvQECJcqoMvCXftTUA==",
+      "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==",
       "dependencies": {
         "@mongodb-js/saslprep": "^1.1.5",
         "bson": "^6.7.0",

apps/OpenSignServer/package.json

@@ -34,7 +34,7 @@
     "googleapis": "^144.0.0",
     "jsonschema": "^1.4.1",
     "mailgun.js": "^10.2.3",
-    "mongoose": "^8.7.0",
+    "mongoose": "^8.6.3",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",
     "node-forge": "^1.3.1",

docker-compose.yml

@@ -2,8 +2,6 @@ services:
   server:
     image: opensign/opensignserver:main
     container_name: OpenSignServer-container
-    volumes:
-      - opensign-files:/usr/src/app/files
     ports:
       - "8080:8080"
     depends_on:
@@ -58,4 +56,3 @@ volumes:
   web-root:
   caddy_data:
   caddy_config:
-  opensign-files: