Merge pull request #1323 from OpenSignLabs/react-tour

Fix: resolved text box font size issue during resizing and prevented unnecessary popups from opening when resizing widgets.
Update Placeholder.js
2026-09-03 16:28:56 +02:00 · 2024-10-11 19:15:26 +05:30 · 2024-10-11 19:13:00 +05:30 · 2024-10-11 19:07:54 +05:30 · 2024-10-10 17:17:04 +05:30 · 2024-10-10 17:13:22 +05:30
77 changed files with 3346 additions and 256016 deletions
@@ -6,14 +6,14 @@
    "@formkit/auto-animate": "^0.8.2",
    "@lottiefiles/dotlottie-react": "^0.9.0",
    "@pdf-lib/fontkit": "^1.1.1",
-    "@radix-ui/themes": "^3.1.3",
+    "@radix-ui/themes": "^3.1.4",
    "@react-pdf/renderer": "^4.0.0",
    "@reduxjs/toolkit": "^2.2.7",
    "axios": "^1.7.7",
    "file-saver": "^2.0.5",
-    "i18next": "^23.15.1",
+    "i18next": "^23.15.2",
    "i18next-browser-languagedetector": "^8.0.0",
-    "i18next-http-backend": "^2.6.1",
+    "i18next-http-backend": "^2.6.2",
    "jszip": "^3.10.1",
    "jwt-decode": "^4.0.0",
    "moment": "^2.30.1",
@@ -37,7 +37,7 @@
    "react-i18next": "^15.0.2",
    "react-konva": "^18.2.10",
    "react-pdf": "^9.1.1",
-    "react-quill-new": "^3.3.2",
+    "react-quill-new": "^3.3.3",
    "react-redux": "^9.1.2",
    "react-rnd": "^10.4.13",
    "react-router-dom": "^6.26.2",
@@ -95,22 +95,22 @@
    }
  },
  "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
-    "@babel/runtime-corejs2": "^7.25.6",
+    "@babel/core": "^7.25.7",
+    "@babel/preset-env": "^7.25.7",
+    "@babel/preset-react": "^7.25.7",
+    "@babel/runtime-corejs2": "^7.25.7",
    "autoprefixer": "^10.4.20",
    "babel-loader": "^9.2.1",
    "clean-webpack-plugin": "^4.0.0",
    "commitizen": "^4.3.1",
    "concurrently": "^9.0.1",
    "css-loader": "^7.1.2",
-    "daisyui": "^4.12.10",
+    "daisyui": "^4.12.12",
    "dotenv": "^16.4.5",
    "dotenv-webpack": "^8.1.0",
-    "eslint": "^9.11.1",
+    "eslint": "^9.12.0",
    "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-react": "^7.37.0",
+    "eslint-plugin-react": "^7.37.1",
    "lint-staged": "^15.2.10",
    "mini-css-extract-plugin": "^2.9.1",
    "postcss": "^8.4.47",
@@ -123,5 +123,8 @@
  "overrides": {
    "nth-check": "$nth-check",
    "ws": "$ws"
+  },
+  "engines": {
+    "node": "18 || 20 || 22"
  }
 }
@@ -672,7 +672,16 @@
  "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.",
+   "enable-tour":"Enable Tour",
+   "istourenabled-help":{
+     "p1":"This will enable a guided tour for signers, providing instructions during the signing process.",
+     "p2":"This will disable the guided tour, ensuring a faster, uninterrupted signing experience.",
+     "p3":"Tip: If your signers are familiar with OpenSign and frequently use it, you may want to disable the guided tour for a more seamless experience. Choose the option that best fits your document signing needs."
+   },
+   "form-title-1":"Document Flow Setting",
+   "form-title-2":"Security Setting",
  "public-tour-message":"The template needs to be public before you can generate a shareable link.",
-  "add-user-template": "You need to add a role before you can add fields for it."
+  "add-user-template": "You need to add a role before you can add fields for it.",
+  "pdf-uncompatible": "This pdf is not compatible with opensign, please contact <support@opensignlabs.com>"

 }
@@ -673,5 +673,15 @@
  "server-down": "No se pudo conectar al servidor de OpenSign. Si estás alojando OpenSign por tu cuenta, por favor, asegúrate de que todos los pasos de la documentación han sido seguidos correctamente. Si estás ejecutando OpenSign localmente, puedes estar accediendo a OpenSign por un número de puerto incorrecto.",
  "admin-exists": "El administrador ya existe. Por favor, inicia sesión en la aplicación usando las credenciales de administrador para poder administrar los usuarios.",
  "public-tour-message": "Por favor, convierte la plantilla en pública para copiar la URL pública",
-  "add-user-template": "Es necesario agregar un rol antes de poder agregarle campos."
+  "add-user-template": "Es necesario agregar un rol antes de poder agregarle campos.",
+  "pdf-uncompatible": "Este pdf no es compatible con opensign, comuníquese con <support@opensignlabs.com>",
+  "enable-tour": "Habilitar recorrido",
+   "istourenabled-help":{
+     "p1": "Esto permitirá realizar una visita guiada para los firmantes, brindando instrucciones durante el proceso de firma.",
+     "p2": "Esto desactivará la visita guiada, lo que garantizará una experiencia de firma más rápida e ininterrumpida.",
+     "p3": "Consejo: si sus firmantes están familiarizados con OpenSign y lo utilizan con frecuencia, es posible que desee desactivar la visita guiada para disfrutar de una experiencia más fluida. Elija la opción que mejor se adapte a sus necesidades de firma de documentos"
+   },
+   "form-title-1": "Configuración del flujo de documentos",
+   "form-title-2": "Configuración de seguridad"
+
 }
@@ -671,8 +671,17 @@
  "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.",
+  "enable-tour": "Activer la visite",
+  "istourenabled-otp-help":{
+    "p1": "Cela permettra une visite guidée pour les signataires, fournissant des instructions pendant le processus de signature.",
+    "p2": "Cela désactivera la visite guidée, garantissant ainsi une expérience de signature plus rapide et ininterrompue.",
+    "p3":  "Conseil : si vos signataires connaissent OpenSign et l'utilisent fréquemment, vous souhaiterez peut-être désactiver la visite guidée pour une expérience plus fluide. Choisissez l'option qui correspond le mieux à vos besoins en matière de signature de documents."
+  },
+   "form-title-1": "Paramètre du flux de documents",
+   "form-title-2": "Paramètre de sécurité",
  "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.",
-  "add-user-template":"Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. "
+  "add-user-template":"Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. ",
+  "pdf-uncompatible":"Ce pdf n'est pas compatible avec opensign, veuillez contacter <support@opensignlabs.com>"


 }
@@ -1,11 +1,24 @@
 import React from "react";

-function BorderResize({ right, top }) {
+function BorderResize(props) {
+  const getHeight = () => {
+    const height = props.posHeight(props.pos, props.isSignYourself);
+    if (height > 14) {
+      return "14px";
+    } else {
+      return `${height}px`;
+    }
+  };
+
  return (
    <div
-      className={`${right ? `-right-[12px]` : "-right-[1px]"} ${
-        top ? `-bottom-[11px]` : "-bottom-[1px]"
-      } absolute inline-block w-[14px] h-[14px] hover:cursor-sw-resize border-r-[3px] border-b-[3px] border-[#188ae2]`}
+      style={{
+        width: getHeight() || "14px",
+        height: getHeight() || "14px"
+      }}
+      className={`${props.right ? `-right-[12px]` : "-right-[2px]"} ${
+        props.top ? `-bottom-[12px]` : "-bottom-[2px] "
+      } absolute inline-block hover:cursor-sw-resize border-r-[3px] border-b-[3px] border-[#188ae2]`}
    ></div>
  );
 }
@@ -17,7 +17,10 @@ const EditTemplate = ({ template, onSuccess }) => {
    SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false",
    AutomaticReminders: template?.AutomaticReminders || false,
    RemindOnceInEvery: template?.RemindOnceInEvery || 5,
-    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false"
+    IsEnableOTP: template?.IsEnableOTP ? `${template?.IsEnableOTP}` : "false",
+    IsTourEnabled: template?.IsTourEnabled
+      ? `${template?.IsTourEnabled}`
+      : "false"
  });
  const [isSubscribe, setIsSubscribe] = useState(false);
  useEffect(() => {
@@ -43,6 +46,7 @@ const EditTemplate = ({ template, onSuccess }) => {
    e.preventDefault();
    e.stopPropagation();
    const isChecked = formData.SendinOrder === "true" ? true : false;
+    const isTourEnabled = formData?.IsTourEnabled === "false" ? false : true;
    const AutoReminder = formData?.AutomaticReminders || false;
    const IsEnableOTP = formData.IsEnableOTP === "true" ? true : false;
    let reminderDate = {};
@@ -56,6 +60,7 @@ const EditTemplate = ({ template, onSuccess }) => {
      ...formData,
      SendinOrder: isChecked,
      IsEnableOTP: IsEnableOTP,
+      IsTourEnabled: isTourEnabled,
      ...reminderDate
    };
    onSuccess(data);
@@ -256,6 +261,59 @@ const EditTemplate = ({ template, onSuccess }) => {
              </div>
            </div>
          )}
+
+          <div className="text-xs mt-2">
+            <label className="block">
+              <span>
+                {t("enable-tour")}
+                <a data-tooltip-id="istourenabled-tooltip" className="ml-1">
+                  <sup>
+                    <i className="fa-light fa-question rounded-full border-[#33bbff] text-[#33bbff] text-[13px] border-[1px] py-[1.5px] px-[4px]"></i>
+                  </sup>
+                </a>{" "}
+              </span>
+              <Tooltip id="istourenabled-tooltip" className="z-50">
+                <div className="max-w-[200px] md:max-w-[450px]">
+                  <p className="font-bold">{t("enable-tour")}</p>
+                  <p className="p-[5px]">
+                    <ol className="list-disc">
+                      <li>
+                        <span className="font-bold">{t("yes")}: </span>
+                        <span>{t("istourenabled-help.p1")}</span>
+                      </li>
+                      <li>
+                        <span className="font-bold">{t("no")}: </span>
+                        <span>{t("istourenabled-help.p2")}</span>
+                      </li>
+                    </ol>
+                  </p>
+                  <p>{t("istourenabled-help.p3")}</p>
+                </div>
+              </Tooltip>
+            </label>
+            <div className={`  flex items-center gap-2 ml-2 mb-1 `}>
+              <input
+                type="radio"
+                value={"true"}
+                className="op-radio op-radio-xs"
+                name="IsTourEnabled"
+                checked={formData.IsTourEnabled === "true"}
+                onChange={handleStrInput}
+              />
+              <div className="text-center">{t("yes")}</div>
+            </div>
+            <div className={` flex items-center gap-2 ml-2 mb-1 `}>
+              <input
+                type="radio"
+                value={"false"}
+                name="IsTourEnabled"
+                className="op-radio op-radio-xs"
+                checked={formData.IsTourEnabled === "false"}
+                onChange={handleStrInput}
+              />
+              <div className="text-center">{t("no")}</div>
+            </div>
+          </div>
          <div className="mt-[1rem] flex justify-start">
            <button type="submit" className="op-btn op-btn-primary">
              {t("submit")}
@@ -30,16 +30,15 @@ function EmailComponent({
    const pdfName = pdfDetails[0]?.Name;
    setIsLoading(true);
    let sendMail;
-
-    const docId = !pdfDetails?.[0]?.IsEnableOTP
-      ? pdfDetails?.[0]?.objectId
+    const docId = pdfDetails?.[0]?.objectId || "";
+    const FileAdapterId = pdfDetails?.[0]?.FileAdapterId
+      ? pdfDetails?.[0]?.FileAdapterId
      : "";
    let presignedUrl = pdfUrl;
    try {
-      // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
      const axiosRes = await axios.post(
        `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
-        { url: pdfUrl, docId: docId },
+        { url: pdfUrl, docId: docId, fileAdapterId: FileAdapterId },
        {
          headers: {
            "content-type": "Application/json",
@@ -651,6 +651,21 @@ function Placeholder(props) {
      }
    }
  };
+  //function to calculate font size
+  const calculateFont = (size, isMinHeight) => {
+    const containerScale = getContainerScale(
+      props.pdfOriginalWH,
+      props.pageNumber,
+      props.containerWH
+    );
+    const fontSize = (size || 12) * containerScale * props.scale;
+    //isMinHeight to set text box minimum height
+    if (isMinHeight) {
+      return fontSize * 1.5 + "px";
+    } else {
+      return fontSize + "px";
+    }
+  };

  const getCursor = () => {
    if (props.data && props.isNeedSign) {
@@ -745,12 +760,16 @@ function Placeholder(props) {
              ? "auto"
              : props.posHeight(props.pos, props.isSignYourself)
        }}
+        minHeight={calculateFont(props.pos.options?.fontSize, true)}
+        maxHeight="auto"
        onResizeStart={() => {
          setDraggingEnabled(true);
          props.setIsResize && props.setIsResize(true);
        }}
        onResizeStop={(e, direction, ref) => {
-          props.setIsResize && props.setIsResize(false);
+          setTimeout(() => {
+            props.setIsResize && props.setIsResize(false);
+          }, 50);
          props.handleSignYourselfImageResize &&
            props.handleSignYourselfImageResize(
              ref,
@@ -785,18 +804,28 @@ function Placeholder(props) {
            h: ref.offsetHeight / (props.scale * containerScale)
          });
        }}
-        onClick={() => handleOnClickPlaceholder()}
+        onClick={() => !props.isResize && handleOnClickPlaceholder()}
      >
        {props.isShowBorder &&
        props.pos.type !== radioButtonWidget &&
        props.pos.type !== "checkbox" &&
        props.pos.key === props.selectWidgetId ? (
-          <BorderResize right={-12} top={-11} />
+          <BorderResize
+            right={-12}
+            top={-11}
+            pos={props.pos}
+            posHeight={props.posHeight}
+            isSignYourself={props.isSignYourself}
+          />
        ) : props.data && props.isNeedSign && props.pos.type !== "checkbox" ? (
          props.data?.signerObjId === props.signerObjId &&
          props.pos.type !== radioButtonWidget &&
          props.pos.type !== "checkbox" ? (
-            <BorderResize />
+            <BorderResize
+              posHeight={props.posHeight}
+              isSignYourself={props.isSignYourself}
+              pos={props.pos}
+            />
          ) : (
            <></>
          )
@@ -862,6 +891,7 @@ function Placeholder(props) {
              startDate={startDate}
              handleSaveDate={handleSaveDate}
              xPos={props.xPos}
+              calculateFont={calculateFont}
            />
          </div>
        ) : (
@@ -889,6 +919,7 @@ function Placeholder(props) {
              startDate={startDate}
              handleSaveDate={handleSaveDate}
              xPos={props.xPos}
+              calculateFont={calculateFont}
            />
          </>
        )}
@@ -29,7 +29,7 @@ function PlaceholderType(props) {
  const [textValue, setTextValue] = useState();
  const [selectedCheckbox, setSelectedCheckbox] = useState([]);
  const years = range(1990, getYear(new Date()) + 16, 1);
-  const fontSize = (props.pos.options?.fontSize || "12") + "px";
+  const fontSize = props.calculateFont(props.pos.options?.fontSize);
  const fontColor = props.pos.options?.fontColor || "black";
  const months = [
    "January",
@@ -65,7 +65,8 @@ function RenderPdf({
  fontSize,
  setFontSize,
  fontColor,
-  setFontColor
+  setFontColor,
+  isResize
 }) {
  const { t } = useTranslation();
  const isMobile = window.innerWidth < 767;
@@ -104,6 +105,7 @@ function RenderPdf({
      }
    }
  };
+
  const posHeight = (pos, signYourself) => {
    const containerScale = getContainerScale(
      pdfOriginalWH,
@@ -207,6 +209,7 @@ function RenderPdf({
                        pageNumber={pageNumber}
                        ispublicTemplate={ispublicTemplate}
                        handleUserDetails={handleUserDetails}
+                        isResize={isResize}
                      />
                    </React.Fragment>
                  )
@@ -357,6 +360,7 @@ function RenderPdf({
                                            setFontSize={setFontSize}
                                            fontColor={fontColor}
                                            setFontColor={setFontColor}
+                                            isResize={isResize}
                                          />
                                        </React.Fragment>
                                      );
@@ -417,6 +421,8 @@ function RenderPdf({
                                    setFontSize={setFontSize}
                                    fontColor={fontColor}
                                    setFontColor={setFontColor}
+                                    isResize={isResize}
+                                    setIsResize={setIsResize}
                                  />
                                )
                              );
@@ -548,6 +554,7 @@ function RenderPdf({
                                            setFontSize={setFontSize}
                                            fontColor={fontColor}
                                            setFontColor={setFontColor}
+                                            isResize={isResize}
                                          />
                                        </React.Fragment>
                                      );
@@ -611,6 +618,8 @@ function RenderPdf({
                                    setFontSize={setFontSize}
                                    fontColor={fontColor}
                                    setFontColor={setFontColor}
+                                    isResize={isResize}
+                                    setIsResize={setIsResize}
                                  />
                                </React.Fragment>
                              );
@@ -41,9 +41,9 @@ const SuggestionInput = (props) => {

  const handleInputChange = async (e) => {
    const value = e.target.value;
-    setInputValue(value?.toLowerCase());
+    setInputValue(value?.toLowerCase()?.replace(/\s/g, ""));
    if (props.onChange) {
-      props.onChange(value);
+      props.onChange(value?.toLowerCase()?.replace(/\s/g, ""));
    }

    if (value.trim() === "") {
@@ -710,7 +710,9 @@ export const createDocument = async (
      SendinOrder: Doc?.SendinOrder || false,
      AutomaticReminders: Doc?.AutomaticReminders || false,
      RemindOnceInEvery: parseInt(Doc?.RemindOnceInEvery || 5),
-      IsEnableOTP: Doc?.IsEnableOTP || false
+      IsEnableOTP: Doc?.IsEnableOTP || false,
+      IsTourEnabled: Doc?.IsTourEnabled || false,
+      FileAdapterId: Doc?.FileAdapterId || ""
    };

    try {
@@ -1086,18 +1088,22 @@ export const embedDocId = async (pdfDoc, documentId, allPages) => {
    const textContent = documentId && `OpenSign™ DocumentId: ${documentId} `;
    const pages = pdfDoc.getPages();
    const page = pages[i];
-    const getObj = compensateRotation(
-      page.getRotation().angle,
-      10,
-      5,
-      1,
-      page.getSize(),
-      fontSize,
-      rgb(0.5, 0.5, 0.5),
-      font,
-      page
-    );
-    page.drawText(textContent, getObj);
+    try {
+      const getObj = compensateRotation(
+        page.getRotation().angle,
+        10,
+        5,
+        1,
+        page.getSize(),
+        fontSize,
+        rgb(0.5, 0.5, 0.5),
+        font,
+        page
+      );
+      page.drawText(textContent, getObj);
+    } catch (err) {
+      console.log("Err in embed docId on page", i + 1, err?.message);
+    }
  }
 };

@@ -1321,7 +1327,9 @@ export const multiSignEmbed = async (
  );
  pdfDoc.registerFontkit(fontkit);
  const font = await pdfDoc.embedFont(fontBytes, { subset: true });
+  let hasError = false;
  for (let item of widgets) {
+    if (hasError) break; // Stop the outer loop if an error occurred
    const containerScale = getContainerScale(
      pdfOriginalWH,
      item?.pageNumber,
@@ -1364,307 +1372,323 @@ 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") {
-          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 (position.ImageType && position.ImageType === "image/jpeg") {
-          img = await pdfDoc.embedJpg(images[id]);
-        } else {
-          img = await pdfDoc.embedPng(images[id]);
-        }
-      }
-      let widgetWidth, widgetHeight;
-      widgetWidth = placeholderWidth(position);
-      widgetHeight = placeholderHeight(position);
-      const xPos = (position) => {
-        const resizePos = position.xPosition;
-        //first two condition handle to old data already saved from mobile view which scale point diffrent
-        if (isMobile && position.isMobile) {
-          //if pos.isMobile false -- placeholder saved from desktop view then handle position in mobile view divided by scale
-          const x = resizePos * (position.scale / scale);
-          return x * scale;
-        } else if (position.isMobile && position.scale) {
-          const x = resizePos * position.scale;
-          return x;
-        } else {
-          return resizePos;
-        }
-      };
-      const yPos = (position) => {
-        const resizePos = position.yPosition;
-
-        if (position.isMobile && position.scale) {
-          if (position.IsResize) {
-            const y = resizePos * position.scale;
-            return y;
+    for (let [id, position] of widgetsPositionArr.entries()) {
+      if (hasError) break; // Stop the inner loop if an error occurred
+      try {
+        let img;
+        if (
+          ["signature", "stamp", "initials", "image"].includes(position.type)
+        ) {
+          if (position.ImageType && position.ImageType === "image/jpeg") {
+            img = await pdfDoc.embedJpg(images[id]);
          } else {
-            const y = resizePos * position.scale;
-            return y;
+            img = await pdfDoc.embedPng(images[id]);
          }
-        } else {
-          return resizePos;
-        }
-      };
-      const color = position?.options?.fontColor;
-      const updateColorInRgb = getWidgetsFontColor(color);
-      const fontSize = parseInt(position?.options?.fontSize || 12);
-      const widgetTypeExist = [
-        textWidget,
-        textInputWidget,
-        "name",
-        "company",
-        "job title",
-        "date",
-        "email"
-      ].includes(position.type);
-      if (position.type === "checkbox") {
-        let checkboxGapFromTop, isCheck;
-        let y = yPos(position);
-        const optionsFontSize = fontSize || 13;
-        const checkboxSize = fontSize;
-        const checkboxTextGapFromLeft = fontSize + 5 || 22;
-        if (position?.options?.values.length > 0) {
-          position?.options?.values.forEach((item, ind) => {
-            const checkboxRandomId = "checkbox" + randomId();
-
-            if (
-              position?.options?.response &&
-              position?.options?.response?.length > 0
-            ) {
-              isCheck = position?.options?.response?.includes(ind);
-            } else if (position?.options?.defaultValue) {
-              isCheck = position?.options?.defaultValue?.includes(ind);
-            }
-
-            const checkbox = form.createCheckBox(checkboxRandomId);
-
-            if (ind > 0) {
-              y = y + checkboxGapFromTop;
-            } else {
-              checkboxGapFromTop = fontSize + 5 || 26;
-            }
-
-            if (!position?.options?.isHideLabel) {
-              // below line of code is used to embed label with radio button in pdf
-              const optionsPosition = compensateRotation(
-                page.getRotation().angle,
-                xPos(position) + checkboxTextGapFromLeft,
-                y,
-                1,
-                page.getSize(),
-                optionsFontSize,
-                updateColorInRgb,
-                font,
-                page
-              );
-              page.drawText(item, optionsPosition);
-            }
-            let checkboxObj = {
-              x: xPos(position),
-              y: y,
-              width: checkboxSize,
-              height: checkboxSize
-            };
-            checkboxObj = getWidgetPosition(page, checkboxObj, 1);
-            checkbox.addToPage(page, checkboxObj);
-
-            //applied which checkbox should be checked
-            if (isCheck) {
-              checkbox.check();
-            } else {
-              checkbox.uncheck();
-            }
-            checkbox.enableReadOnly();
-          });
-        }
-      } else if (widgetTypeExist) {
-        const fontSize = calculateFontSize(
-          position,
-          containerScale,
-          signyourself
-        );
-        parseInt(fontSize);
-        let textContent;
-        if (position?.options?.response) {
-          textContent = position.options?.response;
-        } else if (position?.options?.defaultValue) {
-          textContent = position?.options?.defaultValue;
-        }
-        const fixedWidth = widgetWidth; // Set your fixed width
-        const isNewOnEnterLineExist = textContent.includes("\n");
-
-        // Function to break text into lines based on the fixed width
-        const NewbreakTextIntoLines = (textContent, width) => {
-          const lines = [];
-          let currentLine = "";
-
-          for (const word of textContent.split(" ")) {
-            //get text line width
-            const lineWidth = font.widthOfTextAtSize(
-              `${currentLine} ${word}`,
-              fontSize
-            );
-            //check text content line width is less or equal to container width
-            if (lineWidth <= width) {
-              currentLine += ` ${word}`;
-            } else {
-              lines.push(currentLine.trim());
-              currentLine = `${word}`;
-            }
+        } else if (!position.type) {
+          //  to handle old widget when only stamp and signature are exists
+          if (position.ImageType && position.ImageType === "image/jpeg") {
+            img = await pdfDoc.embedJpg(images[id]);
+          } else {
+            img = await pdfDoc.embedPng(images[id]);
+          }
+        }
+        let widgetWidth, widgetHeight;
+        widgetWidth = placeholderWidth(position);
+        widgetHeight = placeholderHeight(position);
+        const xPos = (position) => {
+          const resizePos = position.xPosition;
+          //first two condition handle to old data already saved from mobile view which scale point diffrent
+          if (isMobile && position.isMobile) {
+            //if pos.isMobile false -- placeholder saved from desktop view then handle position in mobile view divided by scale
+            const x = resizePos * (position.scale / scale);
+            return x * scale;
+          } else if (position.isMobile && position.scale) {
+            const x = resizePos * position.scale;
+            return x;
+          } else {
+            return resizePos;
          }
-          lines.push(currentLine.trim());
-          return lines;
        };
+        const yPos = (position) => {
+          const resizePos = position.yPosition;

-        // Function to break text into lines based on when user go next line on press enter button
-        const breakTextIntoLines = (textContent, width) => {
-          const lines = [];
-
-          for (const word of textContent.split("\n")) {
-            const lineWidth = font.widthOfTextAtSize(`${word}`, fontSize);
-            //checking string length to container width
-            //if string length is less then container width it means user press enter button
-            if (lineWidth <= width) {
-              lines.push(word);
-            }
-            //else adjust text content according to width and send it in new line
-            else {
-              const newLine = NewbreakTextIntoLines(word, width);
-              lines.push(...newLine);
+          if (position.isMobile && position.scale) {
+            if (position.IsResize) {
+              const y = resizePos * position.scale;
+              return y;
+            } else {
+              const y = resizePos * position.scale;
+              return y;
            }
+          } else {
+            return resizePos;
          }
-
-          return lines;
        };
+        const color = position?.options?.fontColor;
+        const updateColorInRgb = getWidgetsFontColor(color);
+        const fontSize = parseInt(position?.options?.fontSize || 12);
+        const widgetTypeExist = [
+          textWidget,
+          textInputWidget,
+          "name",
+          "company",
+          "job title",
+          "date",
+          "email"
+        ].includes(position.type);
+        if (position.type === "checkbox") {
+          let checkboxGapFromTop, isCheck;
+          let y = yPos(position);
+          const optionsFontSize = fontSize || 13;
+          const checkboxSize = fontSize;
+          const checkboxTextGapFromLeft = fontSize + 5 || 22;
+          if (position?.options?.values.length > 0) {
+            position?.options?.values.forEach((item, ind) => {
+              const checkboxRandomId = "checkbox" + randomId();

-        //check if text content have `\n` string it means user press enter to go next line and handle condition
-        //else auto adjust text content according to container width
-        const lines = isNewOnEnterLineExist
-          ? breakTextIntoLines(textContent, fixedWidth)
-          : NewbreakTextIntoLines(textContent, fixedWidth);
-        // Set initial y-coordinate for the first line
-        let x = xPos(position);
-        let y = yPos(position);
-        // Embed each line on the page
-        for (const line of lines) {
-          const textPosition = compensateRotation(
-            page.getRotation().angle,
-            x,
-            y,
-            1,
-            page.getSize(),
-            fontSize,
-            updateColorInRgb,
-            font,
-            page
+              if (
+                position?.options?.response &&
+                position?.options?.response?.length > 0
+              ) {
+                isCheck = position?.options?.response?.includes(ind);
+              } else if (position?.options?.defaultValue) {
+                isCheck = position?.options?.defaultValue?.includes(ind);
+              }
+
+              const checkbox = form.createCheckBox(checkboxRandomId);
+
+              if (ind > 0) {
+                y = y + checkboxGapFromTop;
+              } else {
+                checkboxGapFromTop = fontSize + 5 || 26;
+              }
+
+              if (!position?.options?.isHideLabel) {
+                // below line of code is used to embed label with radio button in pdf
+                const optionsPosition = compensateRotation(
+                  page.getRotation().angle,
+                  xPos(position) + checkboxTextGapFromLeft,
+                  y,
+                  1,
+                  page.getSize(),
+                  optionsFontSize,
+                  updateColorInRgb,
+                  font,
+                  page
+                );
+                page.drawText(item, optionsPosition);
+              }
+              let checkboxObj = {
+                x: xPos(position),
+                y: y,
+                width: checkboxSize,
+                height: checkboxSize
+              };
+              checkboxObj = getWidgetPosition(page, checkboxObj, 1);
+              checkbox.addToPage(page, checkboxObj);
+
+              //applied which checkbox should be checked
+              if (isCheck) {
+                checkbox.check();
+              } else {
+                checkbox.uncheck();
+              }
+              checkbox.enableReadOnly();
+            });
+          }
+        } else if (widgetTypeExist) {
+          const fontSize = calculateFontSize(
+            position,
+            containerScale,
+            signyourself
          );
-          page.drawText(line, textPosition);
-          y += 18; // Adjust the line height as needed
-        }
-      } else if (position.type === "dropdown") {
-        const fontsize = parseInt(position?.options?.fontSize) || 12;
+          parseInt(fontSize);
+          let textContent;
+          if (position?.options?.response) {
+            textContent = position.options?.response;
+          } else if (position?.options?.defaultValue) {
+            textContent = position?.options?.defaultValue;
+          }
+          const fixedWidth = widgetWidth; // Set your fixed width
+          const isNewOnEnterLineExist = textContent.includes("\n");

-        const dropdownRandomId = "dropdown" + randomId();
-        const dropdown = form.createDropdown(dropdownRandomId);
-        dropdown.addOptions(position?.options?.values);
-        if (position?.options?.response) {
-          dropdown.select(position.options?.response);
-        } else if (position?.options?.defaultValue) {
-          dropdown.select(position?.options?.defaultValue);
-        }
-        // Define the default appearance string
-        // Example format: `/FontName FontSize Tf 0 g` where:
-        // - `/FontName` is the name of the font (e.g., `/Helv` for Helvetica)
-        // - `FontSize` is the size you want to set (e.g., 12)
-        // - `Tf` specifies the font and size
-        // - `0 g` sets the text color to black
-        const defaultAppearance = `/Helv ${fontsize} Tf 0 g`;
-        // Set the default appearance for the dropdown field
-        dropdown.acroField.setDefaultAppearance(defaultAppearance);
-        dropdown.setFontSize(fontsize);
-        const dropdownObj = {
-          x: xPos(position),
-          y: yPos(position),
-          width: widgetWidth,
-          height: widgetHeight
-        };
-        const dropdownOption = getWidgetPosition(page, dropdownObj, 1);
-        const dropdownSelected = { ...dropdownOption, font: font };
-        dropdown.defaultUpdateAppearances(font);
-        dropdown.addToPage(page, dropdownSelected);
-        dropdown.enableReadOnly();
-      } else if (position.type === radioButtonWidget) {
-        const radioRandomId = "radio" + randomId();
-        const radioGroup = form.createRadioGroup(radioRandomId);
-        let radioOptionGapFromTop;
-        const optionsFontSize = fontSize || 13;
-        const radioTextGapFromLeft = fontSize + 5 || 20;
-        const radioSize = fontSize;
-        let y = yPos(position);
-        if (position?.options?.values.length > 0) {
-          position?.options?.values.forEach((item, ind) => {
-            if (ind > 0) {
-              y = y + radioOptionGapFromTop;
-            } else {
-              radioOptionGapFromTop = fontSize + 10 || 25;
-            }
-            if (!position?.options?.isHideLabel) {
-              // below line of code is used to embed label with radio button in pdf
+          // Function to break text into lines based on the fixed width
+          const NewbreakTextIntoLines = (textContent, width) => {
+            const lines = [];
+            let currentLine = "";

-              const optionsPosition = compensateRotation(
-                page.getRotation().angle,
-                xPos(position) + radioTextGapFromLeft,
-                y,
-                1,
-                page.getSize(),
-                optionsFontSize,
-                updateColorInRgb,
-                font,
-                page
+            for (const word of textContent.split(" ")) {
+              //get text line width
+              const lineWidth = font.widthOfTextAtSize(
+                `${currentLine} ${word}`,
+                fontSize
              );
-
-              page.drawText(item, optionsPosition);
+              //check text content line width is less or equal to container width
+              if (lineWidth <= width) {
+                currentLine += ` ${word}`;
+              } else {
+                lines.push(currentLine.trim());
+                currentLine = `${word}`;
+              }
            }
-            let radioObj = {
-              x: xPos(position),
-              y: y,
-              width: radioSize,
-              height: radioSize
-            };
+            lines.push(currentLine.trim());
+            return lines;
+          };

-            radioObj = getWidgetPosition(page, radioObj, 1);
-            radioGroup.addOptionToPage(item, page, radioObj);
-          });
-        }
-        if (position?.options?.response) {
-          radioGroup.select(position.options?.response);
-        } else if (position?.options?.defaultValue) {
-          radioGroup.select(position?.options?.defaultValue);
-        }
-        radioGroup.enableReadOnly();
-      } else {
-        const signature = {
-          x: xPos(position),
-          y: yPos(position),
-          width: widgetWidth,
-          height: widgetHeight
-        };
+          // Function to break text into lines based on when user go next line on press enter button
+          const breakTextIntoLines = (textContent, width) => {
+            const lines = [];

-        const imageOptions = getWidgetPosition(page, signature, 1);
-        page.drawImage(img, imageOptions);
+            for (const word of textContent.split("\n")) {
+              const lineWidth = font.widthOfTextAtSize(`${word}`, fontSize);
+              //checking string length to container width
+              //if string length is less then container width it means user press enter button
+              if (lineWidth <= width) {
+                lines.push(word);
+              }
+              //else adjust text content according to width and send it in new line
+              else {
+                const newLine = NewbreakTextIntoLines(word, width);
+                lines.push(...newLine);
+              }
+            }
+
+            return lines;
+          };
+
+          //check if text content have `\n` string it means user press enter to go next line and handle condition
+          //else auto adjust text content according to container width
+          const lines = isNewOnEnterLineExist
+            ? breakTextIntoLines(textContent, fixedWidth)
+            : NewbreakTextIntoLines(textContent, fixedWidth);
+          // Set initial y-coordinate for the first line
+          let x = xPos(position);
+          let y = yPos(position);
+          // Embed each line on the page
+          for (const line of lines) {
+            const textPosition = compensateRotation(
+              page.getRotation().angle,
+              x,
+              y,
+              1,
+              page.getSize(),
+              fontSize,
+              updateColorInRgb,
+              font,
+              page
+            );
+            page.drawText(line, textPosition);
+            y += 18; // Adjust the line height as needed
+          }
+        } else if (position.type === "dropdown") {
+          const fontsize = parseInt(position?.options?.fontSize) || 12;
+
+          const dropdownRandomId = "dropdown" + randomId();
+          const dropdown = form.createDropdown(dropdownRandomId);
+          dropdown.addOptions(position?.options?.values);
+          if (position?.options?.response) {
+            dropdown.select(position.options?.response);
+          } else if (position?.options?.defaultValue) {
+            dropdown.select(position?.options?.defaultValue);
+          }
+          // Define the default appearance string
+          // Example format: `/FontName FontSize Tf 0 g` where:
+          // - `/FontName` is the name of the font (e.g., `/Helv` for Helvetica)
+          // - `FontSize` is the size you want to set (e.g., 12)
+          // - `Tf` specifies the font and size
+          // - `0 g` sets the text color to black
+          const defaultAppearance = `/Helv ${fontsize} Tf 0 g`;
+          // Set the default appearance for the dropdown field
+          dropdown.acroField.setDefaultAppearance(defaultAppearance);
+          dropdown.setFontSize(fontsize);
+          const dropdownObj = {
+            x: xPos(position),
+            y: yPos(position),
+            width: widgetWidth,
+            height: widgetHeight
+          };
+          const dropdownOption = getWidgetPosition(page, dropdownObj, 1);
+          const dropdownSelected = { ...dropdownOption, font: font };
+          dropdown.defaultUpdateAppearances(font);
+          dropdown.addToPage(page, dropdownSelected);
+          dropdown.enableReadOnly();
+        } else if (position.type === radioButtonWidget) {
+          const radioRandomId = "radio" + randomId();
+          const radioGroup = form.createRadioGroup(radioRandomId);
+          let radioOptionGapFromTop;
+          const optionsFontSize = fontSize || 13;
+          const radioTextGapFromLeft = fontSize + 5 || 20;
+          const radioSize = fontSize;
+          let y = yPos(position);
+          if (position?.options?.values.length > 0) {
+            position?.options?.values.forEach((item, ind) => {
+              if (ind > 0) {
+                y = y + radioOptionGapFromTop;
+              } else {
+                radioOptionGapFromTop = fontSize + 10 || 25;
+              }
+              if (!position?.options?.isHideLabel) {
+                // below line of code is used to embed label with radio button in pdf
+
+                const optionsPosition = compensateRotation(
+                  page.getRotation().angle,
+                  xPos(position) + radioTextGapFromLeft,
+                  y,
+                  1,
+                  page.getSize(),
+                  optionsFontSize,
+                  updateColorInRgb,
+                  font,
+                  page
+                );
+
+                page.drawText(item, optionsPosition);
+              }
+              let radioObj = {
+                x: xPos(position),
+                y: y,
+                width: radioSize,
+                height: radioSize
+              };
+
+              radioObj = getWidgetPosition(page, radioObj, 1);
+              radioGroup.addOptionToPage(item, page, radioObj);
+            });
+          }
+          if (position?.options?.response) {
+            radioGroup.select(position.options?.response);
+          } else if (position?.options?.defaultValue) {
+            radioGroup.select(position?.options?.defaultValue);
+          }
+          radioGroup.enableReadOnly();
+        } else {
+          const signature = {
+            x: xPos(position),
+            y: yPos(position),
+            width: widgetWidth,
+            height: widgetHeight
+          };
+
+          const imageOptions = getWidgetPosition(page, signature, 1);
+          page.drawImage(img, imageOptions);
+        }
+      } catch (err) {
+        console.log("Err in embed widget on page ", pageNo, err?.message);
+        hasError = true; // Set the flag to stop both loops
+        break; // Exit inner loop
      }
-    });
+    }
+  }
+  if (!hasError) {
+    const pdfBytes = await pdfDoc.saveAsBase64({ useObjectStreams: false });
+    // console.log("pdf", pdfBytes);
+    return pdfBytes;
+  } else {
+    return {
+      error:
+        "This pdf is not compatible with opensign please contact <support@opensignlabs.com>"
+    };
  }
-  const pdfBytes = await pdfDoc.saveAsBase64({ useObjectStreams: false });
-  //console.log("pdf", pdfBytes);
-  return pdfBytes;
 };

 // function for validating URLs
@@ -2041,11 +2065,21 @@ export const fetchUrl = async (url, pdfName) => {
    console.error("Error downloading the file:", error);
  }
 };
-export const getSignedUrl = async (pdfUrl, docId) => {
+export const getSignedUrl = async (
+  pdfUrl,
+  docId,
+  fileAdapterId,
+  templateId
+) => {
  //use only axios here due to public template sign
  const axiosRes = await axios.post(
    `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
-    { url: pdfUrl, docId: docId || "" },
+    {
+      url: pdfUrl,
+      docId: docId || "",
+      fileAdapterId: fileAdapterId,
+      templateId: templateId || ""
+    },
    {
      headers: {
        "content-type": "Application/json",
@@ -2062,9 +2096,12 @@ export const handleDownloadPdf = async (pdfDetails, setIsDownloading) => {
  const pdfName = pdfDetails[0] && pdfDetails[0]?.Name;
  const pdfUrl = pdfDetails?.[0]?.SignedUrl || pdfDetails?.[0]?.URL;
  setIsDownloading && setIsDownloading("pdf");
-  const docId = !pdfDetails?.[0]?.IsEnableOTP ? pdfDetails?.[0]?.objectId : "";
+  const docId = pdfDetails?.[0]?.objectId || "";
+  const fileAdapterId = pdfDetails?.[0]?.FileAdapterId
+    ? pdfDetails?.[0]?.FileAdapterId
+    : "";
  try {
-    const url = await getSignedUrl(pdfUrl, docId);
+    const url = await getSignedUrl(pdfUrl, docId, fileAdapterId);
    await fetchUrl(url, pdfName);
    setIsDownloading && setIsDownloading("");
  } catch (err) {
@@ -2087,14 +2124,17 @@ export const handleToPrint = async (
 ) => {
  event.preventDefault();
  setIsDownloading("pdf");
-  const docId = !pdfDetails?.[0]?.IsEnableOTP ? pdfDetails?.[0]?.objectId : "";
+  const docId = pdfDetails?.[0]?.objectId || "";
+  const FileAdapterId = pdfDetails?.[0]?.FileAdapterId
+    ? pdfDetails?.[0]?.FileAdapterId
+    : "";
  try {
    // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
    //`localStorage.getItem("baseUrl")` is also use in public-profile flow for public-sign
    //if we give this `appInfo.baseUrl` as a base url then in public-profile it will create base url of it's window.location.origin ex- opensign.me which is not base url
    const axiosRes = await axios.post(
      `${localStorage.getItem("baseUrl")}/functions/getsignedurl`,
-      { url: pdfUrl, docId: docId },
+      { url: pdfUrl, docId: docId, fileAdapterId: FileAdapterId },
      {
        headers: {
          "content-type": "Application/json",
@@ -224,23 +224,13 @@ const HomeLayout = () => {

  async function checkTourStatus() {
    const cloudRes = await Parse.Cloud.run("getUserDetails");
-    const res = { data: cloudRes.toJSON() };
-    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
-      const tourStatus = res.data.TourStatus;
-      // console.log("res ", res.data.TourStatus);
+    if (cloudRes) {
+      const extUser = JSON.parse(JSON.stringify(cloudRes));
+      localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+      const tourStatus = extUser?.TourStatus || [];
      setTourStatusArr(tourStatus);
-      const filteredtourStatus = tourStatus.filter((obj) => obj["loginTour"]);
-      if (filteredtourStatus.length > 0) {
-        const loginTour = filteredtourStatus[0]["loginTour"];
-        // console.log("loginTour", loginTour);
-        if (loginTour) {
-          setIsTour(false);
-        } else {
-          setIsTour(true);
-        }
-      } else {
-        setIsTour(true);
-      }
+      const loginTour = tourStatus.find((obj) => obj.loginTour)?.loginTour;
+      setIsTour(!loginTour);
    } else {
      setIsTour(true);
    }
@@ -45,7 +45,9 @@ const AddAdmin = () => {
    setState((prev) => ({ ...prev, loading: true }));
    try {
      const app = await getAppLogo();
-      if (app?.user === "exist") {
+      if (app?.error === "invalid_json") {
+        setErrMsg(t("server-down"));
+      } else if (app?.user === "exist") {
        setErrMsg(t("admin-exists"));
      }
    } catch (err) {
@@ -499,22 +499,13 @@ function Opensigndrive() {
  //function to use check tour status of open sign drive
  async function checkTourStatus() {
    const cloudRes = await Parse.Cloud.run("getUserDetails");
-    const res = { data: cloudRes.toJSON() };
-    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
-      const tourStatus = res.data.TourStatus;
+    if (cloudRes) {
+      const extUser = JSON.parse(JSON.stringify(cloudRes));
+      localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+      const tourStatus = extUser?.TourStatus || [];
      setTourStatusArr(tourStatus);
-      const filteredtourStatus = tourStatus.filter((obj) => obj["driveTour"]);
-      if (filteredtourStatus.length > 0) {
-        const driveTour = filteredtourStatus[0]["driveTour"];
-        // console.log("loginTour", loginTour);
-        if (driveTour) {
-          setIsTour(false);
-        } else {
-          setIsTour(true);
-        }
-      } else {
-        setIsTour(true);
-      }
+      const driveTour = tourStatus.find((obj) => obj.driveTour)?.driveTour;
+      setIsTour(!driveTour);
    } else {
      setIsTour(true);
    }
@@ -423,6 +423,8 @@ function PdfRequestFiles(props) {
        const expireUpdateDate = new Date(expireDate).getTime();
        const currDate = new Date().getTime();
        const getSigners = documentData[0].Signers;
+        const isTourEnabled =
+          documentData[0]?.IsTourEnabled === true ? true : false;
        const getCurrentSigner = getSigners?.find(
          (data) => data.UserId.objectId === jsonSender?.objectId
        );
@@ -598,7 +600,8 @@ function PdfRequestFiles(props) {
          checkAlreadySign ||
          !currUserId ||
          declined ||
-          currDate > expireUpdateDate
+          currDate > expireUpdateDate ||
+          !isTourEnabled
        ) {
          setRequestSignTour(true);
        } else {
@@ -626,6 +629,8 @@ function PdfRequestFiles(props) {
                  tourData?.some((data) => data?.requestSign) || false;
                setTourStatus(tourData);
                setRequestSignTour(checkTourRequest);
+              } else {
+                setRequestSignTour(false);
              }
            } catch (err) {
              console.log("err while getting tourstatus", err);
@@ -647,6 +652,8 @@ function PdfRequestFiles(props) {
                );
                setTourStatus(tourData);
                setRequestSignTour(checkTourRequest[0]?.requestSign || false);
+              } else {
+                setRequestSignTour(false);
              }
            } else if (res?.length === 0) {
              const res = await contactBook(currUserId);
@@ -663,6 +670,8 @@ function PdfRequestFiles(props) {
                  );
                  setTourStatus(tourData);
                  setRequestSignTour(checkTourRequest[0]?.requestSign || false);
+                } else {
+                  setRequestSignTour(false);
                }
              } else if (res.length === 0) {
                setHandleError(t("user-not-exist"));
@@ -907,163 +916,171 @@ function PdfRequestFiles(props) {
              );
              // console.log("pdfte", pdfBytes);
              //get ExistUserPtr object id of user class to get tenantDetails
-              const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
-              let activeMailAdapter =
-                pdfDetails?.[0]?.ExtUserPtr?.active_mail_adapter;
-
-              //function for call to embed signature in pdf and get digital signature pdf
-              const resSign = await signPdfFun(
-                pdfBytes,
-                documentId,
-                signerObjectId,
-                objectId,
-                isSubscribed,
-                activeMailAdapter,
-                widgets
-              );
-              if (resSign && resSign.status === "success") {
-                setPdfUrl(resSign.data);
-                setIsSigned(true);
-                setSignedSigners([]);
-                setUnSignedSigners([]);
-                getDocumentDetails(documentId, true);
-                const index = pdfDetails?.[0]?.Signers.findIndex(
-                  (x) => x.objectId === signerObjectId
+              if (!pdfBytes?.error) {
+                const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
+                let activeMailAdapter =
+                  pdfDetails?.[0]?.ExtUserPtr?.active_mail_adapter;
+                //function for call to embed signature in pdf and get digital signature pdf
+                const resSign = await signPdfFun(
+                  pdfBytes,
+                  documentId,
+                  signerObjectId,
+                  objectId,
+                  isSubscribed,
+                  activeMailAdapter,
+                  widgets
                );
-                const newIndex = index + 1;
-                const usermail = {
-                  Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
-                };
-                const user = usermail?.Email
-                  ? usermail
-                  : pdfDetails?.[0]?.Signers[newIndex];
-                if (sendmail !== "false" && sendInOrder) {
-                  const requestBody = pdfDetails?.[0]?.RequestBody;
-                  const requestSubject = pdfDetails?.[0]?.RequestSubject;
-                  if (user) {
-                    const expireDate = pdfDetails?.[0].ExpiryDate.iso;
-                    const newDate = new Date(expireDate);
-                    const localExpireDate = newDate.toLocaleDateString(
-                      "en-US",
-                      {
-                        day: "numeric",
-                        month: "long",
-                        year: "numeric"
-                      }
-                    );
-                    let senderEmail = pdfDetails?.[0].ExtUserPtr.Email;
-                    let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
-                    const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`;
+                if (resSign && resSign.status === "success") {
+                  setPdfUrl(resSign.data);
+                  setIsSigned(true);
+                  setSignedSigners([]);
+                  setUnSignedSigners([]);
+                  getDocumentDetails(documentId, true);
+                  const index = pdfDetails?.[0]?.Signers.findIndex(
+                    (x) => x.objectId === signerObjectId
+                  );
+                  const newIndex = index + 1;
+                  const usermail = {
+                    Email: pdfDetails?.[0]?.Placeholders[newIndex]?.email || ""
+                  };
+                  const user = usermail?.Email
+                    ? usermail
+                    : pdfDetails?.[0]?.Signers[newIndex];
+                  if (sendmail !== "false" && sendInOrder) {
+                    const requestBody = pdfDetails?.[0]?.RequestBody;
+                    const requestSubject = pdfDetails?.[0]?.RequestSubject;
+                    if (user) {
+                      const expireDate = pdfDetails?.[0].ExpiryDate.iso;
+                      const newDate = new Date(expireDate);
+                      const localExpireDate = newDate.toLocaleDateString(
+                        "en-US",
+                        {
+                          day: "numeric",
+                          month: "long",
+                          year: "numeric"
+                        }
+                      );
+                      let senderEmail = pdfDetails?.[0].ExtUserPtr.Email;
+                      let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
+                      const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`;

-                    try {
-                      const imgPng =
-                        "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
-                      let url = `${localStorage.getItem(
-                        "baseUrl"
-                      )}functions/sendmailv3`;
-                      const headers = {
-                        "Content-Type": "application/json",
-                        "X-Parse-Application-Id":
-                          localStorage.getItem("parseAppId"),
-                        sessionToken: localStorage.getItem("accesstoken")
-                      };
-                      const objectId = user?.objectId;
-                      const hostUrl = window.location.origin;
-                      //encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
-                      let encodeBase64;
-                      if (objectId) {
-                        encodeBase64 = btoa(
-                          `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
-                        );
-                      } else {
-                        encodeBase64 = btoa(
-                          `${pdfDetails?.[0].objectId}/${user.Email}`
-                        );
-                      }
-                      const hostPublicUrl = isStaging
-                        ? "https://staging-app.opensignlabs.com"
-                        : "https://app.opensignlabs.com";
-                      let signPdf = props?.templateId
-                        ? `${hostPublicUrl}/login/${encodeBase64}`
-                        : `${hostUrl}/login/${encodeBase64}`;
-                      const openSignUrl =
-                        "https://www.opensignlabs.com/contact-us";
-                      const orgName = pdfDetails[0]?.ExtUserPtr.Company
-                        ? pdfDetails[0].ExtUserPtr.Company
-                        : "";
-                      const themeBGcolor = themeColor;
-                      let replaceVar;
-                      if (requestBody && requestSubject && isSubscribed) {
-                        const replacedRequestBody = requestBody.replace(
-                          /"/g,
-                          "'"
-                        );
-                        const htmlReqBody =
-                          "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
-                          replacedRequestBody +
-                          "</body> </html>";
-
-                        const variables = {
-                          document_title: pdfDetails?.[0].Name,
-                          sender_name: senderName,
-                          sender_mail: senderEmail,
-                          sender_phone: senderPhone,
-                          receiver_name: user.Name,
-                          receiver_email: user.Email,
-                          receiver_phone: user.Phone,
-                          expiry_date: localExpireDate,
-                          company_name: orgName,
-                          signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+                      try {
+                        const imgPng =
+                          "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
+                        let url = `${localStorage.getItem(
+                          "baseUrl"
+                        )}functions/sendmailv3`;
+                        const headers = {
+                          "Content-Type": "application/json",
+                          "X-Parse-Application-Id":
+                            localStorage.getItem("parseAppId"),
+                          sessionToken: localStorage.getItem("accesstoken")
                        };
-                        replaceVar = replaceMailVaribles(
-                          requestSubject,
-                          htmlReqBody,
-                          variables
-                        );
-                      }
+                        const objectId = user?.objectId;
+                        const hostUrl = window.location.origin;
+                        //encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
+                        let encodeBase64;
+                        if (objectId) {
+                          encodeBase64 = btoa(
+                            `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
+                          );
+                        } else {
+                          encodeBase64 = btoa(
+                            `${pdfDetails?.[0].objectId}/${user.Email}`
+                          );
+                        }
+                        const hostPublicUrl = isStaging
+                          ? "https://staging-app.opensignlabs.com"
+                          : "https://app.opensignlabs.com";
+                        let signPdf = props?.templateId
+                          ? `${hostPublicUrl}/login/${encodeBase64}`
+                          : `${hostUrl}/login/${encodeBase64}`;
+                        const openSignUrl =
+                          "https://www.opensignlabs.com/contact-us";
+                        const orgName = pdfDetails[0]?.ExtUserPtr.Company
+                          ? pdfDetails[0].ExtUserPtr.Company
+                          : "";
+                        const themeBGcolor = themeColor;
+                        let replaceVar;
+                        if (requestBody && requestSubject && isSubscribed) {
+                          const replacedRequestBody = requestBody.replace(
+                            /"/g,
+                            "'"
+                          );
+                          const htmlReqBody =
+                            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
+                            replacedRequestBody +
+                            "</body> </html>";

-                      let params = {
-                        mailProvider: activeMailAdapter,
-                        extUserId: extUserId,
-                        recipient: user.Email,
-                        subject: requestSubject
-                          ? replaceVar?.subject
-                          : `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign "${pdfDetails?.[0].Name}"`,
-                        from: senderEmail,
-                        plan: plancode,
-                        html: requestBody
-                          ? replaceVar?.body
-                          : "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /> </head>   <body> <div style='background-color: #f5f5f5; padding: 20px'=> <div   style=' box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><img src=" +
-                            imgPng +
-                            " height='50' style='padding: 20px,width:170px,height:40px' /></div>  <div  style=' padding: 2px;font-family: system-ui;background-color:" +
-                            themeBGcolor +
-                            ";'><p style='font-size: 20px;font-weight: 400;color: white;padding-left: 20px;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px;   margin-bottom: 10px;'> " +
-                            pdfDetails?.[0].ExtUserPtr.Name +
-                            " has requested you to review and sign <strong> " +
-                            pdfDetails?.[0].Name +
-                            "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
-                            senderEmail +
-                            "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
-                            orgName +
-                            "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
-                            localExpireDate +
-                            "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
-                            signPdf +
-                            "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
-                            senderEmail +
-                            " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™   <a href= " +
-                            openSignUrl +
-                            " target=_blank>here</a>.</p> </div></div></body> </html>"
-                      };
-                      await axios.post(url, params, { headers: headers });
-                    } catch (error) {
-                      console.log("error", error);
+                          const variables = {
+                            document_title: pdfDetails?.[0].Name,
+                            sender_name: senderName,
+                            sender_mail: senderEmail,
+                            sender_phone: senderPhone,
+                            receiver_name: user.Name,
+                            receiver_email: user.Email,
+                            receiver_phone: user.Phone,
+                            expiry_date: localExpireDate,
+                            company_name: orgName,
+                            signing_url: `<a href=${signPdf} target=_blank>Sign here</a>`
+                          };
+                          replaceVar = replaceMailVaribles(
+                            requestSubject,
+                            htmlReqBody,
+                            variables
+                          );
+                        }
+
+                        let params = {
+                          mailProvider: activeMailAdapter,
+                          extUserId: extUserId,
+                          recipient: user.Email,
+                          subject: requestSubject
+                            ? replaceVar?.subject
+                            : `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign "${pdfDetails?.[0].Name}"`,
+                          from: senderEmail,
+                          plan: plancode,
+                          html: requestBody
+                            ? replaceVar?.body
+                            : "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /> </head>   <body> <div style='background-color: #f5f5f5; padding: 20px'=> <div   style=' box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><img src=" +
+                              imgPng +
+                              " height='50' style='padding: 20px,width:170px,height:40px' /></div>  <div  style=' padding: 2px;font-family: system-ui;background-color:" +
+                              themeBGcolor +
+                              ";'><p style='font-size: 20px;font-weight: 400;color: white;padding-left: 20px;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px;   margin-bottom: 10px;'> " +
+                              pdfDetails?.[0].ExtUserPtr.Name +
+                              " has requested you to review and sign <strong> " +
+                              pdfDetails?.[0].Name +
+                              "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
+                              senderEmail +
+                              "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
+                              orgName +
+                              "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
+                              localExpireDate +
+                              "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a target=_blank href=" +
+                              signPdf +
+                              "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
+                              senderEmail +
+                              " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™   <a href= " +
+                              openSignUrl +
+                              " target=_blank>here</a>.</p> </div></div></body> </html>"
+                        };
+                        await axios.post(url, params, { headers: headers });
+                      } catch (error) {
+                        console.log("error", error);
+                      }
                    }
                  }
+                } else {
+                  setIsUiLoading(false);
+                  setIsAlert({ isShow: true, alertMessage: resSign.message });
                }
              } else {
                setIsUiLoading(false);
-                setIsAlert({ isShow: true, alertMessage: resSign.message });
+                setIsAlert({
+                  header: t("error"),
+                  isShow: true,
+                  alertMessage: t("pdf-uncompatible")
+                });
              }
            } catch (err) {
              setIsUiLoading(false);
@@ -901,7 +901,7 @@ function PlaceHolderSign() {

  useEffect(() => {
    const timer = setTimeout(() => {
-      if (signerPos?.length > 0) {
+      if (signerPos?.length > 0 && !pdfDetails?.[0]?.IsCompleted) {
        autosavedetails();
      }
    }, 2000);
@@ -2058,6 +2058,7 @@ function PlaceHolderSign() {
                        setSignerPos={setSignerPos}
                        containerWH={containerWH}
                        setIsResize={setIsResize}
+                        isResize={isResize}
                        setZIndex={setZIndex}
                        setIsPageCopy={setIsPageCopy}
                        signersdata={signersdata}
@@ -132,6 +132,7 @@ function SignYourSelf() {
  const [isRotate, setIsRotate] = useState({ status: false, degree: 0 });
  const [isSubscribe, setIsSubscribe] = useState({ plan: "", isValid: true });
  const [isDownloadModal, setIsDownloadModal] = useState(false);
+  const [isResize, setIsResize] = useState(false);
  const divRef = useRef(null);
  const nodeRef = useRef(null);
  const [, drop] = useDrop({
@@ -558,7 +559,7 @@ function SignYourSelf() {
  };
  useEffect(() => {
    const timer = setTimeout(() => {
-      if (xyPostion?.length > 0) {
+      if (xyPostion?.length > 0 && !pdfDetails?.[0]?.IsCompleted) {
        autosavedetails();
      }
    }, 2000);
@@ -617,12 +618,8 @@ function SignYourSelf() {
                const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
                let checkDefaultSigned =
                  requiredWidgets[i]?.options?.defaultValue;
-                if (!checkSignUrl) {
-                  if (!checkDefaultSigned) {
-                    if (!showAlert) {
-                      showAlert = true;
-                    }
-                  }
+                if (!checkSignUrl && !checkDefaultSigned && !showAlert) {
+                  showAlert = true;
                }
              }
            }
@@ -649,10 +646,9 @@ function SignYourSelf() {
          return;
        } else {
          setIsUiLoading(true);
-          const existingPdfBytes = pdfArrayBuffer;
          // Load a PDFDocument from the existing PDF bytes
          try {
-            const pdfDoc = await PDFDocument.load(existingPdfBytes);
+            const pdfDoc = await PDFDocument.load(pdfArrayBuffer);
            const isSignYourSelfFlow = true;
            const extUserPtr = pdfDetails[0].ExtUserPtr;
            const HeaderDocId = extUserPtr?.HeaderDocId;
@@ -671,8 +667,15 @@ function SignYourSelf() {
            );
            // console.log("pdf", pdfBytes);
            //function for call to embed signature in pdf and get digital signature pdf
-            if (pdfBytes) {
+            if (!pdfBytes?.error) {
              await signPdfFun(pdfBytes, documentId);
+            } else {
+              setIsUiLoading(false);
+              setIsAlert({
+                header: t("error"),
+                isShow: true,
+                alertMessage: t("pdf-uncompatible")
+              });
            }
          } catch (err) {
            setIsUiLoading(false);
@@ -783,7 +786,7 @@ function SignYourSelf() {
  const handleStop = (event, dragElement) => {
    setFontSize();
    setFontColor();
-    if (isDragging && dragElement) {
+    if (!isResize && isDragging && dragElement) {
      event.preventDefault();
      const containerScale = getContainerScale(
        pdfOriginalWH,
@@ -1400,6 +1403,8 @@ function SignYourSelf() {
                      setFontSize={setFontSize}
                      fontColor={fontColor}
                      setFontColor={setFontColor}
+                      isResize={isResize}
+                      setIsResize={setIsResize}
                    />
                  )}
                </div>
@@ -781,6 +781,7 @@ const TemplatePlaceholder = () => {
          RemindOnceInEvery: parseInt(pdfDetails[0]?.RemindOnceInEvery),
          NextReminderDate: pdfDetails[0]?.NextReminderDate,
          IsEnableOTP: pdfDetails[0]?.IsEnableOTP === true ? true : false,
+          IsTourEnabled: pdfDetails[0]?.IsTourEnabled === true ? true : false,
          URL: pdfUrl
        };
        const updateTemplate = new Parse.Object("contracts_Template");
@@ -1599,6 +1600,7 @@ const TemplatePlaceholder = () => {
                        setFontSize={setFontSize}
                        fontColor={fontColor}
                        setFontColor={setFontColor}
+                        isResize={isResize}
                      />
                    )}
                  </div>
@@ -34,11 +34,13 @@ function DownloadPdfZip(props) {

      try {
        // Fetch the first PDF (Signed Document)
-        const docId =
-          props.isDocId && !pdfDetails?.[0]?.IsEnableOTP
-            ? pdfDetails?.[0]?.objectId
-            : "";
-        const signedUrl = await getSignedUrl(pdfUrl, docId);
+        const docId = pdfDetails?.[0]?.objectId || "";
+        const fileAdapterId = pdfDetails?.[0]?.FileAdapterId
+          ? pdfDetails?.[0]?.FileAdapterId
+          : "";
+        console.log("pdfDetails?.[0] ", pdfDetails?.[0]);
+        const signedUrl = await getSignedUrl(pdfUrl, docId, fileAdapterId);
+        console.log("signedUrl ", signedUrl);
        const pdf1Response = await fetch(signedUrl);
        if (!pdf1Response.ok) {
          throw new Error(`Failed to fetch PDF: ${signedUrl}`);
@@ -274,7 +274,8 @@ const ReportTable = (props) => {
                SendinOrder: Doc?.SendinOrder || false,
                AutomaticReminders: Doc?.AutomaticReminders || false,
                RemindOnceInEvery: Doc?.RemindOnceInEvery || 5,
-                IsEnableOTP: Doc?.IsEnableOTP || false
+                IsEnableOTP: Doc?.IsEnableOTP || false,
+                FileAdapterId: Doc?.FileAdapterId || ""
              };
              try {
                const res = await axios.post(
@@ -602,25 +603,15 @@ const ReportTable = (props) => {

  async function checkTourStatus() {
    const cloudRes = await Parse.Cloud.run("getUserDetails");
-    const res = { data: cloudRes.toJSON() };
-    if (res.data && res.data.TourStatus && res.data.TourStatus.length > 0) {
-      const tourStatus = res.data.TourStatus;
-      // console.log("res ", res.data.TourStatus);
+    if (cloudRes) {
+      const extUser = JSON.parse(JSON.stringify(cloudRes));
+      localStorage.setItem("Extand_Class", JSON.stringify([extUser]));
+      const tourStatus = extUser?.TourStatus || [];
      setTourStatusArr(tourStatus);
-      const filteredtourStatus = tourStatus.filter(
-        (obj) => obj["templateTour"]
-      );
-      if (filteredtourStatus.length > 0) {
-        const templateTour = filteredtourStatus[0]["templateTour"];
-
-        if (templateTour) {
-          setIsTour(false);
-        } else {
-          setIsTour(true);
-        }
-      } else {
-        setIsTour(true);
-      }
+      const templateTour = tourStatus.find(
+        (obj) => obj.templateTour
+      )?.templateTour;
+      setIsTour(!templateTour);
    } else {
      setIsTour(true);
    }
@@ -671,12 +662,21 @@ const ReportTable = (props) => {
    const url = item?.SignedUrl || item?.URL || "";
    const pdfName = item?.Name || "exported_file";
    const isCompleted = item?.IsCompleted || false;
+    const templateId = props?.ReportName === "Templates" && item.objectId;
+    const docId = props?.ReportName !== "Templates" && item.objectId;
+    const fileAdapterId = item?.FileAdapterId ? item?.FileAdapterId : "";
+
    if (url) {
      try {
        if (isCompleted) {
          setIsDownloadModal({ [item.objectId]: true });
        } else {
-          const signedUrl = await getSignedUrl(url);
+          const signedUrl = await getSignedUrl(
+            url,
+            docId,
+            fileAdapterId,
+            templateId
+          );
          await fetchUrl(signedUrl, pdfName);
        }
        setActLoader({});
@@ -672,6 +672,16 @@
  "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":"The template needs to be public before you can generate a shareable link.",
-  "add-user-template": "You need to add a role before you can add fields for it."
+  "enable-tour": "Enable Tour",
+  "istourenabled-help": {
+    "p1": "This will enable a guided tour for signers, providing instructions during the signing process.",
+    "p2": "This will disable the guided tour, ensuring a faster, uninterrupted signing experience.",
+    "p3": "Tip: If your signers are familiar with OpenSign and frequently use it, you may want to disable the guided tour for a more seamless experience. Choose the option that best fits your document signing needs."
+  },
+  "form-title-1": "Document Flow Setting",
+  "form-title-2": "Security Setting",
+  "public-tour-message": "The template needs to be public before you can generate a shareable link.",
+  "add-user-template": "You need to add a role before you can add fields for it.",
+  "pdf-uncompatible": "This pdf is not compatible with opensign, please contact <support@opensignlabs.com>"
+ 
 }
@@ -673,5 +673,14 @@
  "server-down": "No se pudo conectar al servidor de OpenSign. Si estás alojando OpenSign por tu cuenta, por favor, asegúrate de que todos los pasos de la documentación han sido seguidos correctamente. Si estás ejecutando OpenSign localmente, puedes estar accediendo a OpenSign por un número de puerto incorrecto.",
  "admin-exists": "El administrador ya existe. Por favor, inicia sesión en la aplicación usando las credenciales de administrador para poder administrar los usuarios.",
  "public-tour-message": "Por favor, convierte la plantilla en pública para copiar la URL pública",
-  "add-user-template": "Es necesario agregar un rol antes de poder agregarle campos."
+  "add-user-template": "Es necesario agregar un rol antes de poder agregarle campos.",
+  "pdf-uncompatible": "Este pdf no es compatible con opensign, comuníquese con <support@opensignlabs.com>",
+  "enable-tour": "Habilitar recorrido",
+  "istourenabled-help":{
+    "p1": "Esto permitirá realizar una visita guiada para los firmantes, brindando instrucciones durante el proceso de firma.",
+    "p2": "Esto desactivará la visita guiada, lo que garantizará una experiencia de firma más rápida e ininterrumpida.",
+    "p3": "Consejo: si sus firmantes están familiarizados con OpenSign y lo utilizan con frecuencia, es posible que desee desactivar la visita guiada para disfrutar de una experiencia más fluida. Elija la opción que mejor se adapte a sus necesidades de firma de documentos"
+  },
+  "form-title-1": "Configuración del flujo de documentos",
+  "form-title-2": "Configuración de seguridad"
 }
@@ -639,7 +639,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": "Avant de pouvoir utiliser cet extrait de code, vous devez rendre ce modèle public.",
  "copy-code": "COPIE",
  "copied-code": "COPIÉ",
  "Installation": "Installation",
@@ -671,6 +671,15 @@
  "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.",
+  "enable-tour": "Activer la visite",
+  "istourenabled-otp-help":{
+    "p1": "Cela permettra une visite guidée pour les signataires, fournissant des instructions pendant le processus de signature.",
+    "p2": "Cela désactivera la visite guidée, garantissant ainsi une expérience de signature plus rapide et ininterrompue.",
+    "p3":  "Conseil : si vos signataires connaissent OpenSign et l'utilisent fréquemment, vous souhaiterez peut-être désactiver la visite guidée pour une expérience plus fluide. Choisissez l'option qui correspond le mieux à vos besoins en matière de signature de documents."
+  },
+  "form-title-1": "Paramètre du flux de documents",
+  "form-title-2": "Paramètre de sécurité",
  "public-tour-message": "Le modèle doit être public avant que vous puissiez générer un lien partageable.",
-  "add-user-template":"Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. "
+  "add-user-template": "Vous devez ajouter un rôle avant de pouvoir lui ajouter des champs. ",
+  "pdf-uncompatible": "Ce pdf n'est pas compatible avec opensign, veuillez contacter <support@opensignlabs.com>"
 }
@@ -88,7 +88,7 @@ export default async function autoReminder(request, response) {
    docQuery.exists('Signers');
    docQuery.exists('SignedUrl');
    docQuery.descending('createdAt');
-    docQuery.include('Signers,AuditTrail.UserPtr,ExtUserPtr');
+    docQuery.include('Signers,AuditTrail.UserPtr,ExtUserPtr,ExtUserPtr.TenantId');
    docQuery.notEqualTo('IsCompleted', true);
    docQuery.notEqualTo('IsDeclined', true);
    docQuery.notEqualTo('IsArchive', true);
@@ -10,7 +10,6 @@ import getContact from './routes/getContact.js';
 import deleteContact from './routes/deleteContact.js';
 import getContactList from './routes/getContactList.js';
 import draftDocument from './routes/draftDocument.js';
-import createTemplate from './routes/createTemplate.js';
 import getTemplate from './routes/getTemplate.js';
 import deletedTemplate from './routes/deleteTemplate.js';
 import getTemplatetList from './routes/getTemplateList.js';
@@ -81,9 +80,6 @@ app.get('/documentlist/:doctype', getDocumentList);
 // create Template with co-ordinate
 app.post('/createtemplate', createTemplatewithCoordinate);

-// create Template
-app.post('/drafttemplate', createTemplate);
-
 // create Template with binary
 app.post('/createtemplatewithbinary', upload.array('file', 1), createTemplatewithCoordinate);

@@ -91,6 +91,7 @@ export default async function createDocumentWithTemplate(request, response) {
        if (totalcredits > 0) {
          const templateQuery = new Parse.Query('contracts_Template');
          templateQuery.include('ExtUserPtr');
+          templateQuery.include('ExtUserPtr.TenantId');
          const templateRes = await templateQuery.get(templateId, { useMasterKey: true });
          if (templateRes) {
            const template = JSON.parse(JSON.stringify(templateRes));
@@ -199,6 +200,10 @@ export default async function createDocumentWithTemplate(request, response) {
                const enableOTP = request.body?.enableOTP;
                const IsEnableOTP =
                  enableOTP !== undefined ? enableOTP : template?.IsEnableOTP || false;
+                const enableTour = request.body?.enableTour;
+                const isTourEnabled =
+                  enableTour !== undefined ? enableTour : template?.IsTourEnabled || false;
+                object.set('IsTourEnabled', isTourEnabled);
                object.set('IsEnableOTP', IsEnableOTP);
                object.set('CreatedBy', template.CreatedBy);
                object.set('ExtUserPtr', {
@@ -209,6 +214,9 @@ export default async function createDocumentWithTemplate(request, response) {
                if (folderId) {
                  object.set('Folder', folderPtr);
                }
+                if (template?.FileAdapterId) {
+                  object.set('FileAdapterId', template?.FileAdapterId);
+                }
                const newACL = new Parse.ACL();
                newACL.setPublicReadAccess(false);
                newACL.setPublicWriteAccess(false);
@@ -8,6 +8,7 @@ import {
  sanitizeFileName,
  cloudServerUrl,
 } from '../../../../Utils.js';
+import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';

 // `sendDoctoWebhook` is used to send res data of document on webhook
 async function sendDoctoWebhook(doc, WebhookUrl, userId) {
@@ -64,6 +65,7 @@ export default async function createDocumentwithCoordinate(request, response) {
  const sendInOrder = request.body.sendInOrder || false;
  const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
  const IsEnableOTP = request.body?.enableOTP === true ? true : false;
+  const isTourEnabled = request.body?.enableTour || false;
  // console.log('fileData ', fileData);
  const protocol = customAPIurl();
  const baseUrl = new URL(process.env.PUBLIC_URL);
@@ -87,6 +89,7 @@ export default async function createDocumentwithCoordinate(request, response) {
      };
      const extUsers = new Parse.Query('contracts_Users');
      extUsers.equalTo('UserId', userPtr);
+      extUsers.include('TenantId');
      const extUser = await extUsers.first({ useMasterKey: true });

      const subscription = new Parse.Query('contracts_Subscriptions');
@@ -114,6 +117,7 @@ export default async function createDocumentwithCoordinate(request, response) {
                .status(400)
                .json({ error: 'Please add at least one signature widget for all signers' });
            }
+            const parseExtUser = JSON.parse(JSON.stringify(extUser));
            let fileUrl;
            if (request.files?.[0]) {
              const base64 = fileData?.toString('base64');
@@ -126,23 +130,29 @@ export default async function createDocumentwithCoordinate(request, response) {
              saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
            } else {
              const filename = sanitizeFileName(`${name}.pdf`);
-              const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-              await file.save({ useMasterKey: true });
-              fileUrl = file.url();
+              let adapter = {};
+              const ActiveFileAdapter = parseExtUser?.TenantId?.ActiveFileAdapter || '';
+              if (ActiveFileAdapter) {
+                adapter =
+                  parseExtUser?.TenantId?.FileAdapters?.find(x => (x.id = ActiveFileAdapter)) || {};
+              }
+              if (adapter?.id) {
+                const filedata = Buffer.from(base64File, 'base64');
+                // `uploadFileToS3` is used to save document in user's file storage
+                fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);
+              } else {
+                const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
+                await file.save({ useMasterKey: true });
+                fileUrl = file.url();
+              }
              const buffer = Buffer.from(base64File, 'base64');
              saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
            }
-            const contractsUser = new Parse.Query('contracts_Users');
-            contractsUser.equalTo('UserId', userPtr);
-            const extUser = await contractsUser.first({ useMasterKey: true });
-            const parseExtUser = JSON.parse(JSON.stringify(extUser));
-
            const extUserPtr = {
              __type: 'Pointer',
              className: 'contracts_Users',
              objectId: extUser.id,
            };
-
            const object = new Parse.Object('contracts_Document');
            object.set('Name', name);

@@ -164,7 +174,11 @@ export default async function createDocumentwithCoordinate(request, response) {
              object.set('TimeToCompleteDays', TimeToCompleteDays);
            }
            object.set('IsEnableOTP', IsEnableOTP);
+            object.set('IsTourEnabled', isTourEnabled);
            object.set('IsSendMail', send_email);
+            if (parseExtUser?.TenantId?.ActiveFileAdapter) {
+              object.set('FileAdapterId', parseExtUser?.TenantId?.ActiveFileAdapter);
+            }
            let contact = [];
            if (signers && signers.length > 0) {
              let parseSigners;
@@ -1,140 +0,0 @@
-import { saveFileUsage } from '../../../../Utils.js';
-export default async function createTemplate(request, response) {
-  const name = request.body?.title;
-  const note = request.body?.note;
-  const description = request.body?.description;
-  const signers = request.body?.signers;
-  const folderId = request.body?.folderId;
-  const base64File = request.body.file;
-  const SendinOrder = request.body.sendInOrder || false;
-  const fileData = request.files?.[0] ? request.files[0].buffer : null;
-  const baseUrl = new URL(process.env.PUBLIC_URL);
-  const isEnableOTP = request.body?.enableOTP === true ? true : false;
-
-  try {
-    const reqToken = request.headers['x-api-token'];
-    if (!reqToken) {
-      return response.status(400).json({ error: 'Please Provide API Token' });
-    }
-    const tokenQuery = new Parse.Query('appToken');
-    tokenQuery.equalTo('token', reqToken);
-    tokenQuery.include('userId');
-    const token = await tokenQuery.first({ useMasterKey: true });
-    if (token !== undefined) {
-      // Valid Token then proceed request
-      const parseUser = JSON.parse(JSON.stringify(token));
-      const userPtr = {
-        __type: 'Pointer',
-        className: '_User',
-        objectId: parseUser.userId.objectId,
-      };
-      let fileUrl;
-      if (base64File) {
-        const file = new Parse.File(`${name}.pdf`, {
-          base64: base64File,
-        });
-        await file.save({ useMasterKey: true });
-        fileUrl = file.url();
-        const buffer = Buffer.from(base64File, 'base64');
-        saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
-      } else {
-        const base64 = fileData?.toString('base64');
-        const file = new Parse.File(request.files?.[0]?.originalname, {
-          base64: base64,
-        });
-        await file.save({ useMasterKey: true });
-        fileUrl = file.url();
-        const buffer = Buffer.from(base64, 'base64');
-        saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
-      }
-
-      const contractsUser = new Parse.Query('contracts_Users');
-      contractsUser.equalTo('UserId', userPtr);
-      const extUser = await contractsUser.first({ useMasterKey: true });
-      const extUserPtr = { __type: 'Pointer', className: 'contracts_Users', objectId: extUser.id };
-
-      const folderPtr = { __type: 'Pointer', className: 'contracts_Template', objectId: folderId };
-
-      const object = new Parse.Object('contracts_Template');
-      object.set('Name', name);
-      if (note) {
-        object.set('Note', note);
-      }
-      if (description) {
-        object.set('Description', description);
-      }
-      object.set('URL', fileUrl);
-      object.set('CreatedBy', userPtr);
-      object.set('ExtUserPtr', extUserPtr);
-      object.set('IsEnableOTP', isEnableOTP);
-      if (SendinOrder) {
-        object.set('SendinOrder', SendinOrder);
-      }
-      if (signers && signers.length > 0) {
-        let parseSigners;
-        if (base64File) {
-          parseSigners = signers;
-        } else {
-          parseSigners = JSON.parse(signers);
-        }
-        let createContactUrl = protocol + '/v1/createcontact';
-
-        let contact = [];
-        for (const obj of parseSigners) {
-          const body = {
-            name: obj?.name || '',
-            email: obj?.email || '',
-            phone: obj?.phone || '',
-          };
-          try {
-            const res = await axios.post(createContactUrl, body, {
-              headers: { 'Content-Type': 'application/json', 'x-api-token': reqToken },
-            });
-            // console.log('res ', res.data);
-            contact.push({
-              __type: 'Pointer',
-              className: 'contracts_Contactbook',
-              objectId: res.data?.objectId,
-            });
-          } catch (err) {
-            // console.log('err ', err.response);
-            if (err?.response?.data?.objectId) {
-              contact.push({
-                __type: 'Pointer',
-                className: 'contracts_Contactbook',
-                objectId: err.response.data?.objectId,
-              });
-            }
-          }
-        }
-        object.set('Signers', contact);
-      }
-      if (folderId) {
-        object.set('Folder', folderPtr);
-      }
-      const newACL = new Parse.ACL();
-      newACL.setPublicReadAccess(false);
-      newACL.setPublicWriteAccess(false);
-      newACL.setReadAccess(userPtr.objectId, true);
-      newACL.setWriteAccess(userPtr.objectId, true);
-      object.setACL(newACL);
-      const res = await object.save(null, { useMasterKey: true });
-      if (request.posthog) {
-        request.posthog?.capture({
-          distinctId: parseUser.userId.email,
-          event: 'api_draft_template',
-          properties: { response_code: 200 },
-        });
-      }
-      return response.json({
-        objectId: res.id,
-        url: baseUrl.origin + '/template/' + res.id,
-      });
-    } else {
-      return response.status(405).json({ error: 'Invalid API Token!' });
-    }
-  } catch (err) {
-    console.log('err ', err);
-    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
-  }
-}
@@ -6,6 +6,7 @@ import {
  formatWidgetOptions,
  sanitizeFileName,
 } from '../../../../Utils.js';
+import uploadFileToS3 from '../../../parsefunction/uploadFiletoS3.js';

 const randomId = () => Math.floor(1000 + Math.random() * 9000);
 export default async function createTemplatewithCoordinate(request, response) {
@@ -18,6 +19,7 @@ export default async function createTemplatewithCoordinate(request, response) {
  const fileData = request.files?.[0] ? request.files[0].buffer : null;
  const SendinOrder = request.body.sendInOrder || false;
  const isEnableOTP = request.body?.enableOTP === true ? true : false;
+  const isTourEnabled = request.body?.enableTour || false;

  // console.log('fileData ', fileData);
  const protocol = customAPIurl();
@@ -40,6 +42,11 @@ export default async function createTemplatewithCoordinate(request, response) {
        objectId: parseUser.userId.objectId,
      };
      if (signers && signers.length > 0) {
+        const contractsUser = new Parse.Query('contracts_Users');
+        contractsUser.equalTo('UserId', userPtr);
+        contractsUser.include('TenantId');
+        const extUser = await contractsUser.first({ useMasterKey: true });
+        const parseExtUser = JSON.parse(JSON.stringify(extUser));
        let fileUrl;
        if (request.files?.[0]) {
          const base64 = fileData?.toString('base64');
@@ -52,24 +59,31 @@ export default async function createTemplatewithCoordinate(request, response) {
          saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
        } else {
          const filename = sanitizeFileName(`${name}.pdf`);
-          const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
-          await file.save({ useMasterKey: true });
-          fileUrl = file.url();
+          let adapter = {};
+          const ActiveFileAdapter = parseExtUser?.TenantId?.ActiveFileAdapter || '';
+          if (ActiveFileAdapter) {
+            adapter =
+              parseExtUser?.TenantId?.FileAdapters?.find(x => (x.id = ActiveFileAdapter)) || {};
+          }
+          if (adapter?.id) {
+            const filedata = Buffer.from(base64File, 'base64');
+            // `uploadFileToS3` is used to save document in user's file storage
+            fileUrl = await uploadFileToS3(filedata, filename, 'application/pdf', adapter);
+          } else {
+            const file = new Parse.File(filename, { base64: base64File }, 'application/pdf');
+            await file.save({ useMasterKey: true });
+            fileUrl = file.url();
+          }
          const buffer = Buffer.from(base64File, 'base64');
          saveFileUsage(buffer.length, fileUrl, parseUser.userId.objectId);
        }
-        const contractsUser = new Parse.Query('contracts_Users');
-        contractsUser.equalTo('UserId', userPtr);
-        const extUser = await contractsUser.first({ useMasterKey: true });
        const extUserPtr = {
          __type: 'Pointer',
          className: 'contracts_Users',
          objectId: extUser.id,
        };
-
        const object = new Parse.Object('contracts_Template');
        object.set('Name', name);
-
        if (note) {
          object.set('Note', note);
        }
@@ -83,6 +97,7 @@ export default async function createTemplatewithCoordinate(request, response) {
        object.set('CreatedBy', userPtr);
        object.set('ExtUserPtr', extUserPtr);
        object.set('IsEnableOTP', isEnableOTP);
+        object.set('IsTourEnabled', isTourEnabled);
        let contact = [];
        if (signers && signers.length > 0) {
          let parseSigners;
@@ -186,6 +201,9 @@ export default async function createTemplatewithCoordinate(request, response) {
            objectId: folderId,
          });
        }
+        if (parseExtUser?.TenantId?.ActiveFileAdapter) {
+          object.set('FileAdapterId', parseExtUser?.TenantId?.ActiveFileAdapter);
+        }
        const newACL = new Parse.ACL();
        newACL.setPublicReadAccess(false);
        newACL.setPublicWriteAccess(false);
@@ -20,6 +20,7 @@ export default async function deleteDocument(request, response) {
      const Document = new Parse.Query('contracts_Document');
      Document.equalTo('objectId', request.params.document_id);
      Document.equalTo('CreatedBy', userPtr);
+      Document.include('ExtUserPtr.TenantId');
      const res = await Document.first({ useMasterKey: true });
      if (res) {
        const isArchive = res.get('IsArchive');
@@ -22,6 +22,7 @@ export default async function deleteFolder(request, response) {
      obj.equalTo('objectId', folderId);
      obj.equalTo('IsArchive', true);
      obj.equalTo('CreatedBy', userPtr);
+      obj.include('ExtUserPtr.TenantId');
      const isFolderDeleted = await obj.first({ useMasterKey: true });
      if (!isFolderDeleted) {
        const folder = new Parse.Query('contracts_Document');
@@ -34,6 +35,7 @@ export default async function deleteFolder(request, response) {
        folder.notEqualTo('IsArchive', true);
        folder.equalTo('CreatedBy', userPtr);
        folder.equalTo('Type', 'Folder');
+        folder.include('ExtUserPtr.TenantId');
        const isSubItems = await folder.first({ useMasterKey: true });
        // console.log('isSubItems ', isSubItems);
        if (isSubItems) {
@@ -19,6 +19,7 @@ export default async function deletedTemplate(request, response) {
      const template = new Parse.Query('contracts_Template');
      template.equalTo('objectId', request.params.template_id);
      template.equalTo('CreatedBy', userPtr);
+      template.include('ExtUserPtr.TenantId');
      const res = await template.first({ useMasterKey: true });
      if (res) {
        const isArchive = res.get('IsArchive');
@@ -13,6 +13,7 @@ export default async function draftDocument(request, response) {
  const fileData = request.files?.[0] ? request.files[0].buffer : null;
  const SendinOrder = request.body.sendInOrder || false;
  const isEnableOTP = request.body?.enableOTP === true ? true : false;
+  const isTourEnabled = request.body?.enableTour || false;

  // console.log('fileData ', fileData);
  const protocol = customAPIurl();
@@ -86,6 +87,7 @@ export default async function draftDocument(request, response) {
        object.set('ExtUserPtr', extUserPtr);
        object.set('IsSendMail', send_email);
        object.set('IsEnableOTP', isEnableOTP);
+        object.set('IsTourEnabled', isTourEnabled);
        if (signers && signers.length > 0) {
          let parseSigners;
          if (base64File) {
@@ -24,6 +24,7 @@ export default async function getDocument(request, response) {
      Document.include('Folder');
      Document.include('ExtUserPtr');
      Document.include('Placeholders.signerPtr');
+      Document.include('ExtUserPtr.TenantId');
      const res = await Document.first({ useMasterKey: true });
      if (res) {
        const document = JSON.parse(JSON.stringify(res));
@@ -65,6 +66,7 @@ export default async function getDocument(request, response) {
          enableOTP: document?.IsEnableOTP || false,
          createdAt: document.createdAt,
          updatedAt: document.updatedAt,
+          enableTour: document?.IsTourEnabled || false,
        });
      } else {
        if (request.posthog) {
@@ -62,7 +62,7 @@ export default async function getDocumentList(request, response) {
          'X-Parse-Application-Id': appId,
          'X-Parse-Master-Key': process.env.MASTER_KEY,
        };
-        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys},Placeholders&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
+        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys},Placeholders&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr,ExtUserPtr.TenantId`;
        try {
          const res = await axios.get(url, { headers: headers });
          if (res.data && res.data.results.length > 0) {
@@ -103,6 +103,7 @@ export default async function getDocumentList(request, response) {
              enableOTP: x?.IsEnableOTP || false,
              createdAt: x.createdAt,
              updatedAt: x.updatedAt,
+              enableTour: x?.IsTourEnabled || false,
            }));
            return response.json({ result: updateRes });
          } else {
@@ -25,7 +25,7 @@ export default async function getFolder(request, response) {
      folderCls.notEqualTo('IsArchive', true);
      folderCls.descending('createdAt');
      folderCls.include('Folder');
-
+      folderCls.include('ExtUserPtr.TenantId');
      const res = await folderCls.first({ useMasterKey: true });
      if (res) {
        const parseRes = JSON.parse(JSON.stringify(res));
@@ -35,6 +35,7 @@ export default async function getFolderList(request, response) {
        folderCls.doesNotExist('Folder');
      }
      folderCls.descending('createdAt');
+      folderCls.include('ExtUserPtr.TenantId');
      folderCls.limit(limit);
      folderCls.skip(skip);
      const res = await folderCls.find({ useMasterKey: true });
@@ -25,6 +25,7 @@ export default async function getTemplate(request, response) {
      Template.include('Folder');
      Template.include('ExtUserPtr');
      Template.include('Placeholders.signerPtr');
+      Template.include('ExtUserPtr.TenantId');
      const res = await Template.first({ useMasterKey: true });
      if (res) {
        const template = JSON.parse(JSON.stringify(res));
@@ -64,6 +65,7 @@ export default async function getTemplate(request, response) {
          enableOTP: template?.IsEnableOTP || false,
          createdAt: template.createdAt,
          updatedAt: template.updatedAt,
+          enableTour: template?.IsTourEnabled || false,
        });
      } else {
        if (request.posthog) {
@@ -53,7 +53,7 @@ export default async function getTemplatetList(request, response) {
        'X-Parse-Application-Id': appId,
        'X-Parse-Master-Key': process.env.MASTER_KEY,
      };
-      const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
+      const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr,ExtUserPtr.TenantId`;
      const res = await axios.get(url, { headers: headers });
      if (res.data && res.data.results.length > 0) {
        if (request.posthog) {
@@ -91,6 +91,7 @@ export default async function getTemplatetList(request, response) {
          enableOTP: template?.IsEnableOTP || false,
          createdAt: template.createdAt,
          updatedAt: template.updatedAt,
+          enableTour: template?.IsTourEnabled || false,
        }));

        return response.json({ result: updateRes });
@@ -35,7 +35,7 @@ export default async function resendMail(request, response) {
      docQuery.notEqualTo('IsArchive', true);
      docQuery.greaterThanOrEqualTo('ExpiryDate', new Date());
      docQuery.exists('SignedUrl');
-
+      docQuery.include('ExtUserPtr.TenantId');
      const resDoc = await docQuery.first({ useMasterKey: true });
      // console.log("resDoc ",resDoc)
      if (resDoc) {
@@ -10,7 +10,7 @@ export default async function updateDocument(request, response) {
    const token = await tokenQuery.first({ useMasterKey: true });
    if (token !== undefined) {
      // Valid Token then proceed request
-      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP'];
+      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP', 'enableTour'];
      const objectKeys = Object.keys(request.body);
      const isValid = objectKeys.every(key => allowedKeys.includes(key)) && objectKeys.length > 0;
      const parseUser = JSON.parse(JSON.stringify(token));
@@ -23,6 +23,7 @@ export default async function updateDocument(request, response) {
        const document = new Parse.Query('contracts_Document');
        document.equalTo('objectId', request.params.document_id);
        document.equalTo('CreatedBy', userPtr);
+        document.include('ExtUserPtr.TenantId');
        const res = await document.first({ useMasterKey: true });
        if (res) {
          const isArchive = res.get('IsArchive');
@@ -51,7 +52,9 @@ export default async function updateDocument(request, response) {
            if (request.body?.enableOTP !== undefined) {
              updateQuery.set('IsEnableOTP', request.body?.enableOTP);
            }
-
+            if (request.body?.enableTour !== undefined) {
+              updateQuery.set('IsTourEnabled', request.body?.enableTour);
+            }
            const updatedRes = await updateQuery.save(null, { useMasterKey: true });
            if (updatedRes) {
              if (request.posthog) {
@@ -25,7 +25,7 @@ export default async function updateFolder(request, response) {
      folderCls.equalTo('objectId', folderId);
      folderCls.equalTo('Type', 'Folder');
      folderCls.notEqualTo('IsArchive', true);
-
+      folderCls.include('ExtUserPtr.TenantId');
      const res = await folderCls.first({ useMasterKey: true });
      if (res) {
        const updateFolder = new Parse.Object('contracts_Document');
@@ -10,7 +10,7 @@ export default async function updateTemplate(request, response) {
    const token = await tokenQuery.first({ useMasterKey: true });
    if (token !== undefined) {
      // Valid Token then proceed request
-      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP'];
+      const allowedKeys = ['name', 'note', 'description', 'folderId', 'enableOTP', 'enableTour'];
      const objectKeys = Object.keys(request.body);
      const isValid = objectKeys.every(key => allowedKeys.includes(key)) && objectKeys.length > 0;
      const parseUser = JSON.parse(JSON.stringify(token));
@@ -23,6 +23,7 @@ export default async function updateTemplate(request, response) {
        const template = new Parse.Query('contracts_Template');
        template.equalTo('objectId', request.params.template_id);
        template.equalTo('CreatedBy', userPtr);
+        template.include('ExtUserPtr.TenantId');
        const res = await template.first({ useMasterKey: true });
        if (res) {
          const isArchive = res.get('IsArchive');
@@ -51,6 +52,9 @@ export default async function updateTemplate(request, response) {
            if (request.body?.enableOTP !== undefined) {
              updateQuery.set('IsEnableOTP', request.body?.enableOTP);
            }
+            if (request.body?.enableTour !== undefined) {
+              updateQuery.set('IsTourEnabled', request.body?.enableTour);
+            }
            const updatedRes = await updateQuery.save(null, { useMasterKey: true });
            if (updatedRes) {
              if (request.posthog) {
@@ -70,6 +70,9 @@ import updateContactTour from './parsefunction/updateContactTour.js';
 import declinedocument from './parsefunction/declinedocument.js';
 import addcustomsmtp from './parsefunction/addcustomsmtp.js';
 import deactivateMailAdapter from './parsefunction/deactivateMailAdapter.js';
+import addFileAdapter from './parsefunction/addFileAdapter.js';
+import saveToFileAdapter from './parsefunction/saveToFileAdapter.js';
+import getFileAdapter from './parsefunction/getFileAdapter.js';

 // This afterSave function triggers after an object is added or updated in the specified class, allowing for post-processing logic.
 Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
@@ -152,3 +155,6 @@ Parse.Cloud.define('updatecontacttour', updateContactTour);
 Parse.Cloud.define('declinedoc', declinedocument);
 Parse.Cloud.define('addsmtp', addcustomsmtp);
 Parse.Cloud.define('deactivatemailadapter', deactivateMailAdapter);
+Parse.Cloud.define('savetofileadapter', saveToFileAdapter);
+Parse.Cloud.define('addfileadapter', addFileAdapter);
+Parse.Cloud.define('getfileadapter', getFileAdapter);
@@ -2,21 +2,30 @@ import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';

 async function DocumentAfterFind(request) {
-  if (useLocal !== 'true') {
-    if (request.objects.length === 1) {
-      if (request.objects) {
-        const obj = request.objects[0];
+  if (request.objects.length === 1) {
+    if (request.objects) {
+      const obj = request.objects[0];
+      const FileAdapterId = obj?.get('FileAdapterId') || '';
+      if (FileAdapterId || useLocal !== 'true') {
        const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
        const Url = obj?.get('URL') && obj?.get('URL');
        const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
+        let fileAdapter = {};
+        if (FileAdapterId) {
+          const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');
+          if (tenantId) {
+            const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));
+            fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};
+          }
+        }
        if (SignedUrl) {
-          obj.set('SignedUrl', getPresignedUrl(SignedUrl));
+          obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));
        }
        if (Url) {
-          obj.set('URL', getPresignedUrl(Url));
+          obj.set('URL', getPresignedUrl(Url, fileAdapter));
        }
        if (certificateUrl) {
-          obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
+          obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));
        }
        return [obj];
      }
@@ -12,6 +12,7 @@ async function DocumentAftersave(request) {
        const ExpiryDate = new Date(createdAt);
        ExpiryDate.setDate(ExpiryDate.getDate() + TimeToCompleteDays);
        const documentQuery = new Parse.Query('contracts_Document');
+        documentQuery.include('ExtUserPtr.TenantId');
        const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
        updateQuery.set('ExpiryDate', ExpiryDate);
        if (!originIp) {
@@ -30,6 +31,7 @@ async function DocumentAftersave(request) {
        const ExpiryDate = new Date(createdAt);
        ExpiryDate.setDate(ExpiryDate.getDate() + TimeToCompleteDays);
        const documentQuery = new Parse.Query('contracts_Document');
+        documentQuery.include('ExtUserPtr.TenantId');
        const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
        updateQuery.set('ExpiryDate', ExpiryDate);
        if (!originIp) {
@@ -76,6 +78,7 @@ async function DocumentAftersave(request) {
    // console.log(objId)
    const Query = new Parse.Query('contracts_Document');
    Query.include('Signers');
+    Query.include('ExtUserPtr.TenantId');
    Query.include('CreatedBy');
    const updateACL = await Query.get(objId, { useMasterKey: true });
    const res = JSON.parse(JSON.stringify(updateACL));
@@ -116,6 +119,7 @@ async function DocumentAftersave(request) {
    // console.log(objId)
    const Query = new Parse.Query('contracts_Document');
    Query.include('CreatedBy');
+    Query.include('ExtUserPtr.TenantId');
    const updateACL = await Query.get(objId, { useMasterKey: true });
    const res = JSON.parse(JSON.stringify(updateACL));
    // console.log("res");
@@ -20,6 +20,7 @@ async function GetPublicTemplate(request) {
        templatQuery.descending('updatedAt');
        templatQuery.equalTo('IsPublic', true);
        templatQuery.notEqualTo('IsArchive', true);
+        templatQuery.include('ExtUserPtr.TenantId');
        const getTemplate = await templatQuery.find({ useMasterKey: true });
        const extcls = new Parse.Query('contracts_Users');
        extcls.equalTo('Email', user.get('email'));
@@ -22,7 +22,7 @@ export default async function GetTemplate(request) {
          template.include('ExtUserPtr');
          template.include('Signers');
          template.include('CreatedBy');
-
+          template.include('ExtUserPtr.TenantId');
          const extUserQuery = new Parse.Query('contracts_Users');
          extUserQuery.equalTo('Email', userRes.data.email);
          extUserQuery.include('TeamIds');
@@ -48,12 +48,14 @@ export default async function GetTemplate(request) {
              template.include('ExtUserPtr');
              template.include('Signers');
              template.include('CreatedBy');
+              template.include('ExtUserPtr.TenantId');
            }
          }
          const res = await template.first({ useMasterKey: true });
          if (res) {
-            // console.log("res ",res)
-            return res;
+            const templateRes = JSON.parse(JSON.stringify(res));
+            delete templateRes?.ExtUserPtr?.TenantId?.FileAdapters;
+            return templateRes;
          } else {
            return { error: "You don't have access of this document!" };
          }
@@ -69,10 +71,13 @@ export default async function GetTemplate(request) {
        template.include('ExtUserPtr');
        template.include('Signers');
        template.include('CreatedBy');
+        template.include('ExtUserPtr.TenantId');
        const res = await template.first({ useMasterKey: true });
        // console.log("res ", res)
        if (res) {
-          return res;
+          const templateRes = JSON.parse(JSON.stringify(res));
+          delete templateRes?.ExtUserPtr?.TenantId?.FileAdapters;
+          return templateRes;
        } else {
          return { error: "You don't have access of this document!" };
        }
@@ -31,7 +31,13 @@ const saveRoleContact = async contact => {
  contactQuery.set('CreatedBy', contact.CreatedBy);
  contactQuery.set('UserId', contact.UserId);
  contactQuery.set('UserRole', 'contracts_Guest');
-  contactQuery.set('TenantId', contact.TenantId);
+  if (contact?.TenantId) {
+    contactQuery.set('TenantId', {
+      __type: 'Pointer',
+      className: 'partners_Tenant',
+      objectId: contact.TenantId,
+    });
+  }
  contactQuery.set('IsDeleted', false);
  const acl = new Parse.ACL();
  acl.setReadAccess(contact.CreatedBy.objectId, true);
@@ -55,7 +61,7 @@ const createDocumentFromTemplate = async (template, existContact, index) => {
      object.set('Description', template?.Description);
      object.set('Note', template?.Note);
      object.set('TimeToCompleteDays', template?.TimeToCompleteDays || 15);
-      object.set('SendinOrder', template?.SendinOrder);
+      object.set('SendinOrder', template?.SendinOrder || false);
      object.set('AutomaticReminders', template?.AutomaticReminders || false);
      object.set('RemindOnceInEvery', template?.RemindOnceInEvery || 5);
      object.set('URL', template?.URL);
@@ -63,6 +69,8 @@ const createDocumentFromTemplate = async (template, existContact, index) => {
      object.set('ExtUserPtr', template?.ExtUserPtr);
      object.set('OriginIp', template?.OriginIp || '');
      object.set('IsEnableOTP', template?.IsEnableOTP || false);
+      object.set('IsTourEnabled', template?.IsTourEnabled || false);
+      object.set('FileAdapterId', template?.FileAdapterId || '');
      let signers = template?.Signers || [];
      const signerobj = {
        __type: 'Pointer',
@@ -97,7 +105,7 @@ const sendMailToAllSigners = async docId => {
  try {
    //get document details that recenlty created from public template
    const docQuery = new Parse.Query('contracts_Document');
-    docQuery.include('ExtUserPtr');
+    docQuery.include('ExtUserPtr,ExtUserPtr.TenantId');
    docQuery.include('Signers');
    const docRes = await docQuery.get(docId, { useMasterKey: true });
    const Doc = JSON.parse(JSON.stringify(docRes));
@@ -254,6 +262,7 @@ export default async function PublicUserLinkContactToDoc(req) {
      // Execute the query to get the template with the specified 'templateid'
      const docQuery = new Parse.Query('contracts_Template');
      docQuery.include('ExtUserPtr');
+      docQuery.include('ExtUserPtr.TenantId');
      const tempRes = await docQuery.get(templateid, { useMasterKey: true });
      // Check if the template was found; if not, throw an error indicating the template was not found
      if (!tempRes) {
@@ -315,7 +324,7 @@ export default async function PublicUserLinkContactToDoc(req) {
                  Email: email,
                  Phone: _extUser?.Phone ? _extUser.Phone : '',
                  CreatedBy: _tempRes.CreatedBy,
-                  TenantId: _tempRes.ExtUserPtr.TenantId,
+                  TenantId: _tempRes.ExtUserPtr?.TenantId?.objectId,
                };
                const template_json = JSON.parse(JSON.stringify(tempRes));
                // if user present on platform create contact on the basis of extended user details
@@ -342,7 +351,7 @@ export default async function PublicUserLinkContactToDoc(req) {
                      Email: email,
                      Phone: phone,
                      CreatedBy: _tempRes.CreatedBy,
-                      TenantId: _tempRes.ExtUserPtr.TenantId,
+                      TenantId: _tempRes.ExtUserPtr?.TenantId?.objectId,
                    };
                    const template_json = JSON.parse(JSON.stringify(tempRes));
                    // Create new contract on the basis provided contact details by user and userId from _User class
@@ -379,7 +388,7 @@ export default async function PublicUserLinkContactToDoc(req) {
                      Email: email,
                      Phone: phone,
                      CreatedBy: _tempRes.CreatedBy,
-                      TenantId: _tempRes.ExtUserPtr.TenantId,
+                      TenantId: _tempRes.ExtUserPtr?.TenantId?.objectId,
                    };
                    const template_json = JSON.parse(JSON.stringify(tempRes));
                    // Create new contract on the basis provided contact details by user and userId from _User class
@@ -7,6 +7,7 @@ async function getDocument(docId) {
    query.include('CreatedBy');
    query.include('Signers');
    query.include('AuditTrail.UserPtr');
+    query.include('ExtUserPtr.TenantId');
    query.include('Placeholders');
    query.notEqualTo('IsArchive', true);
    const res = await query.first({ useMasterKey: true });
@@ -2,23 +2,31 @@ import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';

 async function TemplateAfterFind(request) {
-  if (useLocal !== 'true') {
-    if (request.objects.length === 1) {
-      if (request.objects) {
-        const obj = request.objects[0];
+  if (request.objects.length === 1) {
+    if (request.objects) {
+      const obj = request.objects[0];
+      const FileAdapterId = obj?.get('FileAdapterId') || '';
+      if (FileAdapterId || useLocal !== 'true') {
        const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
        const Url = obj?.get('URL') && obj?.get('URL');
        const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
+        let fileAdapter = {};
+        if (FileAdapterId) {
+          const tenantId = obj?.get('ExtUserPtr')?.get('TenantId');
+          if (tenantId) {
+            const _tenantId = JSON.parse(JSON.stringify(obj?.get('ExtUserPtr')?.get('TenantId')));
+            fileAdapter = _tenantId?.FileAdapters?.find(x => x.id === FileAdapterId) || {};
+          }
+        }
        if (SignedUrl) {
-          obj.set('SignedUrl', getPresignedUrl(SignedUrl));
+          obj.set('SignedUrl', getPresignedUrl(SignedUrl, fileAdapter));
        }
        if (Url) {
-          obj.set('URL', getPresignedUrl(Url));
+          obj.set('URL', getPresignedUrl(Url, fileAdapter));
        }
        if (certificateUrl) {
-          obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
+          obj.set('CertificateUrl', getPresignedUrl(certificateUrl, fileAdapter));
        }
-
        return [obj];
      }
    }
@@ -44,6 +44,7 @@ export default async function TemplateAfterSave(request) {
    const Query = new Parse.Query('contracts_Template');
    Query.include('Signers');
    Query.include('CreatedBy');
+    Query.include('ExtUserPtr.TenantId');
    const updateACL = await Query.get(objId, { useMasterKey: true });
    const res = JSON.parse(JSON.stringify(updateACL));
    // console.log("res");
@@ -85,6 +86,7 @@ export default async function TemplateAfterSave(request) {

    const Query = new Parse.Query('contracts_Template');
    Query.include('CreatedBy');
+    Query.include('ExtUserPtr.TenantId');
    const updateACL = await Query.get(objId, { useMasterKey: true });
    const res = JSON.parse(JSON.stringify(updateACL));
    // console.log("res");
@@ -0,0 +1,141 @@
+// `generateId` is used to unique Id for fileAdapter
+function generateId(length) {
+  const characters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+  let result = '';
+  const charactersLength = characters.length;
+  for (let i = 0; i < length; i++) {
+    result += characters.charAt(Math.floor(Math.random() * charactersLength));
+  }
+  return result;
+}
+
+export default async function addFileAdapter(request) {
+  if (!request?.user) {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+  }
+  const fileAdapterName = request.params.fileAdapterName;
+  const bucketName = request.params.bucketName;
+  const region = request.params.region;
+  const endpoint = request.params.endpoint;
+  const baseUrl = request.params.baseUrl;
+  const accessKeyId = request.params.accessKeyId;
+  const secretAccessKey = request.params.secretAccessKey;
+  const adapter = request.params.fileAdapter;
+
+  if (fileAdapterName && accessKeyId && secretAccessKey && adapter) {
+    try {
+      const extUserCls = new Parse.Query('contracts_Users');
+      extUserCls.equalTo('UserId', request.user);
+      extUserCls.include('TenantId');
+      const extUser = await extUserCls.first({ useMasterKey: true });
+      if (extUser) {
+        const _extUser = JSON.parse(JSON.stringify(extUser));
+        const tenantCls = new Parse.Object('partners_Tenant');
+        tenantCls.id = extUser?.get('TenantId')?.id;
+        const existsFileAdaptes = _extUser?.TenantId?.FileAdapters
+          ? _extUser?.TenantId?.FileAdapters
+          : [];
+
+        // assign existing file adapters or empty array
+        let updatedFileAdapters = existsFileAdaptes;
+        const uniqueId = generateId(10);
+        let id = extUser?.get('TenantId')?.id + '_' + uniqueId;
+        const index = updatedFileAdapters?.findIndex(x => x.fileAdapterName === fileAdapterName);
+
+        if (index !== -1) {
+          // If an object with the same fileAdapterName exists, update it
+          if (bucketName || region || endpoint || baseUrl) {
+            throw new Parse.Error(
+              Parse.Error.INVALID_QUERY,
+              'Cannot update bucketName, region, endpoint, baseUrl.'
+            );
+          } else {
+            const adapterConfig = { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey };
+            updatedFileAdapters[index] = { ...updatedFileAdapters[index], ...adapterConfig };
+            id = updatedFileAdapters[index].id;
+          }
+        } else {
+          if (bucketName && region && endpoint && baseUrl) {
+            // If the object with the given fileAdapterName doesn't exist, add a new one
+            updatedFileAdapters.push({
+              id: id,
+              fileAdapterName: fileAdapterName,
+              fileAdapter: adapter,
+              bucketName: bucketName,
+              region: region,
+              endpoint: endpoint,
+              baseUrl: baseUrl,
+              accessKeyId: accessKeyId,
+              secretAccessKey: secretAccessKey,
+            });
+          } else {
+            throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please provide all parameters.');
+          }
+        }
+        tenantCls.set('FileAdapters', updatedFileAdapters);
+        if (adapter) {
+          tenantCls.set('ActiveFileAdapter', id);
+        } else {
+          tenantCls.unset('ActiveFileAdapter');
+        }
+        const updateTenant = await tenantCls.save(null, { useMasterKey: true });
+        const tenantSchema = new Parse.Schema('partners_Tenant');
+        tenantSchema.setCLP({
+          get: { '*': true },
+          find: { '*': true },
+          count: { '*': true },
+          create: { '*': true },
+          update: { '*': true },
+          delete: { '*': true },
+          addField: { '*': true },
+          protectedFields: { '*': ['FileAdapters'] },
+        });
+        await tenantSchema.update();
+        const ActiveFileAdapter = adapter === 'opensign' ? 'opensign' : id;
+        return { ActiveFileAdapter: ActiveFileAdapter, updateAt: updateTenant.updatedAt };
+      } else {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
+      }
+    } catch (err) {
+      console.log('Err in add custom file adapter', err);
+      const code = err.code || 400;
+      const msg = err.message || 'Something went wrong.';
+      throw new Parse.Error(code, msg);
+    }
+  } else if (adapter === 'opensign') {
+    try {
+      const extUserCls = new Parse.Query('contracts_Users');
+      extUserCls.equalTo('UserId', request.user);
+      extUserCls.include('TenantId');
+      const extUser = await extUserCls.first({ useMasterKey: true });
+      if (extUser) {
+        const tenantCls = new Parse.Object('partners_Tenant');
+        tenantCls.id = extUser?.get('TenantId')?.id;
+        tenantCls.unset('ActiveFileAdapter');
+        const updateTenant = await tenantCls.save(null, { useMasterKey: true });
+        const tenantSchema = new Parse.Schema('partners_Tenant');
+        tenantSchema.setCLP({
+          get: { '*': true },
+          find: { '*': true },
+          count: { '*': true },
+          create: { '*': true },
+          update: { '*': true },
+          delete: { '*': true },
+          addField: { '*': true },
+          protectedFields: { '*': ['FileAdapters'] },
+        });
+        await tenantSchema.update();
+        return { ActiveFileAdapter: 'opensign', updateAt: updateTenant.updatedAt };
+      } else {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
+      }
+    } catch (err) {
+      console.log('Err in add custom file adapter', 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_QUERY, 'Please provide all parameters.');
+  }
+}
@@ -9,6 +9,7 @@ export default async function callWebhook(request) {
  const appId = process.env.APP_ID;
  try {
    const docQuery = new Parse.Query('contracts_Document');
+    docQuery.include('ExtUserPtr.TenantId');
    const docRes = await docQuery.get(docId, { useMasterKey: true });
    const isEnableOTP = docRes?.get('IsEnableOTP') || false;
    let userId;
@@ -201,6 +201,8 @@ export default async function createBatchDocs(request) {
                OriginIp: Ip,
                DocSentAt: { __type: 'Date', iso: isoDate },
                IsEnableOTP: x?.IsEnableOTP || false,
+                IsTourEnabled: x?.IsTourEnabled || false,
+                FileAdapterId: x?.FileAdapterId || '',
              },
            };
          });
@@ -9,6 +9,7 @@ export default async function declinedocument(request) {

  try {
    const docCls = new Parse.Query('contracts_Document');
+    docCls.include('ExtUserPtr.TenantId');
    const updateDoc = await docCls.get(docId, { useMasterKey: true });
    if (updateDoc) {
      const isEnableOTP = updateDoc?.get('IsEnableOTP') || false;
@@ -11,6 +11,7 @@ export default async function getDocument(request) {
        const query = new Parse.Query('contracts_Document');
        query.equalTo('objectId', docId);
        query.include('ExtUserPtr');
+        query.include('ExtUserPtr.TenantId');
        query.include('CreatedBy');
        query.include('Signers');
        query.include('AuditTrail.UserPtr');
@@ -20,8 +21,10 @@ export default async function getDocument(request) {
        const res = await query.first({ useMasterKey: true });
        if (res) {
          const IsEnableOTP = res?.get('IsEnableOTP') || false;
+          const document = JSON.parse(JSON.stringify(res));
+          delete document.ExtUserPtr.TenantId.FileAdapters;
          if (!IsEnableOTP) {
-            return res;
+            return document;
          } else {
            if (request?.headers?.['sessiontoken']) {
              try {
@@ -34,7 +37,7 @@ export default async function getDocument(request) {
                const userId = userRes.data && userRes.data?.objectId;
                const acl = res.getACL();
                if (userId && acl && acl.getReadAccess(userId)) {
-                  return res;
+                  return document;
                } else {
                  return { error: "You don't have access of this document!" };
                }
@@ -18,9 +18,9 @@ export default async function getDrive(request) {
    if (userId) {
      let url;
      if (docId) {
-        url = `${classUrl}?where={"Folder":{"__type":"Pointer","className":"contracts_Document","objectId":"${docId}"},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"},"IsArchive":{"$ne":true}}&include=ExtUserPtr,Signers,Folder&skip=${skip}&limit=${limit}`;
+        url = `${classUrl}?where={"Folder":{"__type":"Pointer","className":"contracts_Document","objectId":"${docId}"},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"},"IsArchive":{"$ne":true}}&include=ExtUserPtr,ExtUserPtr.TenantId,Signers,Folder&order=-updatedAt&skip=${skip}&limit=${limit}`;
      } else {
-        url = `${classUrl}?where={"Folder":{"$exists":false},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"},"IsArchive":{"$ne":true}}&include=ExtUserPtr,Signers&skip=${skip}&limit=${limit}`;
+        url = `${classUrl}?where={"Folder":{"$exists":false},"CreatedBy":{"__type":"Pointer","className":"_User","objectId":"${userId}"},"IsArchive":{"$ne":true}}&include=ExtUserPtr,ExtUserPtr.TenantId,Signers&order=-updatedAt&skip=${skip}&limit=${limit}`;
      }
      try {
        const res = await axios.get(url, {
@@ -0,0 +1,25 @@
+export default async function getFileAdapter(request) {
+  if (!request?.user) {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+  }
+  try {
+    const extUserCls = new Parse.Query('contracts_Users');
+    extUserCls.equalTo('UserId', request.user);
+    extUserCls.include('TenantId');
+    const extUser = await extUserCls.first({ useMasterKey: true });
+    if (extUser) {
+      const _extUser = JSON.parse(JSON.stringify(extUser));
+      const FileAdapters =
+        _extUser?.TenantId?.FileAdapters?.length > 0 ? _extUser?.TenantId?.FileAdapters : [];
+      const ActiveFileAdapter = _extUser?.TenantId?.ActiveFileAdapter || 'opensign';
+      return { ActiveFileAdapter: ActiveFileAdapter, FileAdapters: FileAdapters };
+    } else {
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
+    }
+  } catch (err) {
+    console.log('Err in add custom file adapter', err);
+    const code = err.code || 400;
+    const msg = err.message || 'Something went wrong.';
+    throw new Parse.Error(code, msg);
+  }
+}
@@ -52,11 +52,7 @@ export default async function getReport(request) {
            } else {
              strParams = JSON.stringify({
                ...params,
-                CreatedBy: {
-                  __type: 'Pointer',
-                  className: '_User',
-                  objectId: userId,
-                },
+                CreatedBy: { __type: 'Pointer', className: '_User', objectId: userId },
              });
            }
          }
@@ -66,7 +62,7 @@ export default async function getReport(request) {
          'X-Parse-Application-Id': appId,
          'X-Parse-Master-Key': masterKey,
        };
-        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
+        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr,ExtUserPtr.TenantId`;
        const res = await axios.get(url, { headers: headers });
        if (res.data && res.data.results) {
          return res.data.results;
@@ -1,12 +1,12 @@
 import AWS from 'aws-sdk';
 import { useLocal } from '../../Utils.js';
-export default function getPresignedUrl(url) {
+export default function getPresignedUrl(url, adapter) {
  const credentials = {
-    accessKeyId: process.env.DO_ACCESS_KEY_ID,
-    secretAccessKey: process.env.DO_SECRET_ACCESS_KEY,
+    accessKeyId: adapter?.accessKeyId || process.env.DO_ACCESS_KEY_ID,
+    secretAccessKey: adapter?.secretAccessKey || process.env.DO_SECRET_ACCESS_KEY,
  };
-  AWS.config.update({ credentials: credentials, region: process.env.DO_REGION });
-  const spacesEndpoint = new AWS.Endpoint(process.env.DO_ENDPOINT);
+  AWS.config.update({ credentials: credentials, region: adapter?.region || process.env.DO_REGION });
+  const spacesEndpoint = adapter?.endpoint || new AWS.Endpoint(process.env.DO_ENDPOINT);

  const s3 = new AWS.S3({ endpoint: spacesEndpoint });

@@ -19,7 +19,7 @@ export default function getPresignedUrl(url) {

  // presignedGETURL return presignedUrl with expires time
  const presignedGETURL = s3.getSignedUrl('getObject', {
-    Bucket: process.env.DO_SPACE,
+    Bucket: adapter?.bucketName || process.env.DO_SPACE,
    Key: filename, //filename
    Expires: 160, //time to expire in seconds
  });
@@ -29,26 +29,51 @@ export default function getPresignedUrl(url) {
 export async function getSignedUrl(request) {
  try {
    const docId = request.params.docId || '';
+    const templateId = request.params.templateId || '';
    const url = request.params.url;
-    if (docId) {
+    const fileAdapterId = request.params.fileAdapterId || '';
+    if (docId || templateId) {
      try {
-        const query = new Parse.Query('contracts_Document');
-        query.equalTo('objectId', docId);
-        query.notEqualTo('IsEnableOTP', true);
-        query.include('CreatedBy');
-        query.include('Signers');
-        query.include('AuditTrail.UserPtr');
-        query.include('Placeholders');
-        query.include('DeclineBy');
-        query.notEqualTo('IsArchive', true);
-        const res = await query.first({ useMasterKey: true });
-        if (res) {
-          if (useLocal !== 'true') {
-            const presignedUrl = getPresignedUrl(url);
-            return presignedUrl;
-          } else {
-            return url;
+        if (fileAdapterId || useLocal !== 'true') {
+          const query = new Parse.Query(docId ? 'contracts_Document' : 'contracts_Template');
+          query.equalTo('objectId', docId ? docId : templateId);
+          query.include('ExtUserPtr.TenantId');
+          query.notEqualTo('IsArchive', true);
+          const res = await query.first({ useMasterKey: true });
+          if (res) {
+            const _resDoc = JSON.parse(JSON.stringify(res));
+            if (_resDoc?.IsEnableOTP) {
+              if (!request?.user) {
+                throw new Parse.Error(
+                  Parse.Error.INVALID_SESSION_TOKEN,
+                  'User is not authenticated.'
+                );
+              } else {
+                let adapterConfig = {};
+                if (fileAdapterId) {
+                  // `adapterConfig` is used to get file in user's fileAdapter
+                  adapterConfig =
+                    _resDoc?.ExtUserPtr?.TenantId?.FileAdapters?.find(
+                      x => x.id === fileAdapterId
+                    ) || {};
+                }
+                const presignedUrl = getPresignedUrl(url, adapterConfig);
+                return presignedUrl;
+              }
+            } else {
+              let adapterConfig = {};
+              if (fileAdapterId) {
+                // `adapterConfig` is used to get file in user's fileAdapter
+                adapterConfig =
+                  _resDoc?.ExtUserPtr?.TenantId?.FileAdapters?.find(x => x.id === fileAdapterId) ||
+                  {};
+              }
+              const presignedUrl = getPresignedUrl(url, adapterConfig);
+              return presignedUrl;
+            }
          }
+        } else {
+          return url;
        }
      } catch (err) {
        console.log('Err in presigned url', err);
@@ -14,6 +14,7 @@ async function getUserDetails(request) {
      userQuery.include('UserId');
      userQuery.include('CreatedBy');
      userQuery.exclude('CreatedBy.authData');
+      userQuery.exclude('TenantId.FileAdapters');
      userQuery.exclude('google_refresh_token');
      if (userId) {
        userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
@@ -29,7 +29,13 @@ const saveRoleContact = async contact => {
  contactQuery.set('CreatedBy', contact.CreatedBy);
  contactQuery.set('UserId', contact.UserId);
  contactQuery.set('UserRole', 'contracts_Guest');
-  contactQuery.set('TenantId', contact.TenantId);
+  if (contact?.TenantId) {
+    contactQuery.set('TenantId', {
+      __type: 'Pointer',
+      className: 'partners_Tenant',
+      objectId: contact.TenantId,
+    });
+  }
  contactQuery.set('IsDeleted', false);
  const acl = new Parse.ACL();
  acl.setReadAccess(contact.CreatedBy.objectId, true);
@@ -54,7 +60,7 @@ export default async function linkContactToDoc(req) {
    if (docId) {
      // Execute the query to get the document with the specified 'docId'
      const docQuery = new Parse.Query('contracts_Document');
-      docQuery.include('ExtUserPtr');
+      docQuery.include('ExtUserPtr,ExtUserPtr.TenantId');
      const docRes = await docQuery.get(docId, { useMasterKey: true });
      // Check if the document was found; if not, throw an error indicating the document was not found
      if (!docRes) {
@@ -125,7 +131,7 @@ export default async function linkContactToDoc(req) {
              Email: email,
              Phone: _extUser?.Phone ? _extUser.Phone : '',
              CreatedBy: _docRes.CreatedBy,
-              TenantId: _docRes.ExtUserPtr.TenantId,
+              TenantId: _docRes.ExtUserPtr?.TenantId?.objectId,
            };
            // if user present on platform create contact on the basis of extended user details
            const contactRes = await saveRoleContact(contact);
@@ -177,7 +183,7 @@ export default async function linkContactToDoc(req) {
                  Email: email,
                  Phone: phone,
                  CreatedBy: _docRes.CreatedBy,
-                  TenantId: _docRes.ExtUserPtr.TenantId,
+                  TenantId: _docRes.ExtUserPtr?.TenantId?.objectId,
                };
                // Create new contract on the basis provided contact details by user and userId from _User class
                const contactRes = await saveRoleContact(contact);
@@ -234,7 +240,7 @@ export default async function linkContactToDoc(req) {
                  Email: email,
                  Phone: phone,
                  CreatedBy: _docRes.CreatedBy,
-                  TenantId: _docRes.ExtUserPtr.TenantId,
+                  TenantId: _docRes.ExtUserPtr?.TenantId?.objectId,
                };
                // Create new contract on the basis provided contact details by user and userId from _User class
                const contactRes = await saveRoleContact(contact);
@@ -274,7 +280,7 @@ export default async function linkContactToDoc(req) {
                }
              }
            } catch (err) {
-              console.log('Err', err);
+              console.log('Err while creating contact link to doc', err);
            }
          } else {
            throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
@@ -6,18 +6,36 @@ import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
 import { PDFDocument } from 'pdf-lib';
 import { cloudServerUrl, replaceMailVaribles, saveFileUsage } from '../../../Utils.js';
 import GenerateCertificate from './GenerateCertificate.js';
+import uploadFileToS3 from '../uploadFiletoS3.js';
 const serverUrl = cloudServerUrl; // process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
 const masterKEY = process.env.MASTER_KEY;
 const eSignName = 'opensign';
 const eSigncontact = 'hello@opensignlabs.com';
 // `updateDoc` is used to create url in from pdfFile
-async function uploadFile(pdfName, filepath) {
+async function uploadFile(pdfName, filepath, adapter) {
  try {
    const filedata = fs.readFileSync(filepath);
-    const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
-    await file.save({ useMasterKey: true });
-    const fileUrl = file.url();
+    let fileUrl;
+    if (adapter?.bucketName) {
+      const adapterConfig = {
+        id: adapter?.id,
+        fileAdapter: adapter?.fileAdapter,
+        bucketName: adapter?.bucketName,
+        region: adapter?.region,
+        endpoint: adapter?.endpoint,
+        accessKeyId: adapter?.accessKeyId,
+        secretAccessKey: adapter?.secretAccessKey,
+        baseUrl: adapter?.baseUrl,
+      };
+      // `uploadFileToS3` is used to save document in user's file storage
+      fileUrl = await uploadFileToS3(filedata, pdfName, 'application/pdf', adapterConfig);
+    } else {
+      const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
+      await file.save({ useMasterKey: true });
+      fileUrl = file.url();
+    }
+
    return { imageUrl: fileUrl };
  } catch (err) {
    console.log('Err ', err);
@@ -79,12 +97,13 @@ async function updateDoc(docId, url, userId, ipAddress, data, className, sign) {

 // `sendCompletedMail` is used to send copy of completed document mail
 async function sendCompletedMail(obj) {
-  const url = obj.url;
+  const url = obj.doc?.SignedUrl;
  const doc = obj.doc;
  const sender = obj.doc.ExtUserPtr;
  const pdfName = doc.Name;
  const mailLogo = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
-  const recipient = sender.Email;
+  const recipient =
+    doc?.Signers?.length > 0 ? doc?.Signers?.map(x => x?.Email)?.join(',') : sender.Email;
  let subject = `Document "${pdfName}" has been signed by all parties`;
  let body =
    "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>  <div style='background-color:#f5f5f5;padding:20px'>    <div style='box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background-color:white;'> <div><img src=" +
@@ -223,7 +242,7 @@ async function sendDoctoWebhook(doc, Url, event, signUser, certificateUrl) {
 }

 // `sendMailsaveCertifcate` is used send completion mail and update complete status of document
-const sendMailsaveCertifcate = async (doc, P12Buffer, url, isCustomMail, mailProvider, userId) => {
+async function sendMailsaveCertifcate(doc, P12Buffer, isCustomMail, mailProvider, adapterConfig) {
  const certificate = await GenerateCertificate(doc);
  const certificatePdf = await PDFDocument.load(certificate);
  const p12 = new P12Signer(P12Buffer, { passphrase: process.env.PASS_PHRASE || null });
@@ -245,7 +264,7 @@ const sendMailsaveCertifcate = async (doc, P12Buffer, url, isCustomMail, mailPro

  //below is used to save signed certificate in exports folder
  fs.writeFileSync('./exports/certificate.pdf', signedCertificate);
-  const file = await uploadFile('certificate.pdf', './exports/certificate.pdf');
+  const file = await uploadFile('certificate.pdf', './exports/certificate.pdf', adapterConfig);
  const body = { CertificateUrl: file.imageUrl };
  await axios.put(serverUrl + '/classes/contracts_Document/' + doc.objectId, body, {
    headers: {
@@ -258,12 +277,11 @@ const sendMailsaveCertifcate = async (doc, P12Buffer, url, isCustomMail, mailPro
  if (doc.IsSendMail === false) {
    console.log("don't send mail");
  } else {
-    const mailObj = { url: url, isCustomMail: isCustomMail, doc: doc, mailProvider: mailProvider };
-    sendCompletedMail(mailObj);
+    sendCompletedMail({ isCustomMail, doc, mailProvider });
  }
-  saveFileUsage(CertificateBuffer.length, file.imageUrl, userId);
-  sendDoctoWebhook(doc, url, 'completed', '', file.imageUrl);
-};
+  saveFileUsage(CertificateBuffer.length, file.imageUrl, doc?.CreatedBy?.objectId);
+  sendDoctoWebhook(doc, doc?.SignedUrl, 'completed', '', file.imageUrl);
+}
 /**
 *
 * @param docId Id of Document in which user is signing
@@ -280,7 +298,7 @@ async function PDF(req) {
    const sign = req.params.signature || '';
    // below bode is used to get info of docId
    const docQuery = new Parse.Query('contracts_Document');
-    docQuery.include('ExtUserPtr,Signers');
+    docQuery.include('ExtUserPtr,Signers,ExtUserPtr.TenantId');
    docQuery.equalTo('objectId', docId);
    const resDoc = await docQuery.first({ useMasterKey: true });
    if (!resDoc) {
@@ -294,6 +312,14 @@ async function PDF(req) {
      }
    }
    const _resDoc = resDoc?.toJSON();
+    // `FileAdapter` && `ActiveFileAdapter` is used to save file in user's fileAdapter
+    const ActiveFileAdapter = _resDoc?.ExtUserPtr?.TenantId?.ActiveFileAdapter;
+    const FileAdapter =
+      _resDoc?.ExtUserPtr?.TenantId?.FileAdapters?.find(x => x.id === ActiveFileAdapter) || {};
+    let adapterConfig = {};
+    if (FileAdapter && ActiveFileAdapter) {
+      adapterConfig = { ActiveFileAdapter: ActiveFileAdapter, ...FileAdapter };
+    }
    let signUser;
    let className;
    // `reqUserId` is send throught pdfrequest signing flow
@@ -339,7 +365,7 @@ async function PDF(req) {
      }
      const randomNumber = Math.floor(Math.random() * 5000);
      const name = `exported_file_${randomNumber}.pdf`;
-      const pdfName = `./exports/${name}`;
+      const filePath = `./exports/${name}`;
      let pdfSize = PdfBuffer.length;
      if (isCompleted) {
        const signersName = _resDoc.Signers?.map(x => x.Name + ' <' + x.Email + '>');
@@ -376,22 +402,22 @@ async function PDF(req) {
        const signedDocs = await OBJ.sign(PdfBuffer, p12Cert);

        //`saveUrl` is used to save signed pdf in exports folder
-        const saveUrl = fs.writeFileSync(pdfName, signedDocs);
+        fs.writeFileSync(filePath, signedDocs);
        pdfSize = signedDocs.length;
      } else {
        //`saveUrl` is used to save signed pdf in exports folder
-        const saveUrl = fs.writeFileSync(pdfName, PdfBuffer);
+        fs.writeFileSync(filePath, PdfBuffer);
        pdfSize = PdfBuffer.length;
      }

      // `uploadFile` is used to upload pdf to aws s3 and get it's url
-      const data = await uploadFile(name, pdfName);
+      const data = await uploadFile(name, filePath, adapterConfig);

      if (data && data.imageUrl) {
        // `axios` is used to update signed pdf url in contracts_Document classes for given DocId
        const updatedDoc = await updateDoc(
          req.params.docId, //docId
-          data.imageUrl, // url
+          data.imageUrl, // SignedUrl
          signUser.objectId, // userID
          userIP, // client ipAddress,
          _resDoc, // auditTrail, signers, etc data
@@ -401,19 +427,12 @@ async function PDF(req) {
        sendDoctoWebhook(_resDoc, data.imageUrl, 'signed', signUser);
        saveFileUsage(pdfSize, data.imageUrl, _resDoc?.CreatedBy?.objectId);
        if (updatedDoc && updatedDoc.isCompleted) {
-          const doc = { ..._resDoc, AuditTrail: updatedDoc.AuditTrail };
-          sendMailsaveCertifcate(
-            doc,
-            P12Buffer,
-            data.imageUrl,
-            isCustomMail,
-            mailProvider,
-            _resDoc?.CreatedBy?.objectId
-          );
+          const doc = { ..._resDoc, AuditTrail: updatedDoc.AuditTrail, SignedUrl: data.imageUrl };
+          sendMailsaveCertifcate(doc, P12Buffer, isCustomMail, mailProvider, adapterConfig);
        }
        // `fs.unlinkSync` is used to remove exported signed pdf file from exports folder
-        fs.unlinkSync(pdfName);
-        console.log(`New Signed PDF created called: ${pdfName}`);
+        fs.unlinkSync(filePath);
+        console.log(`New Signed PDF created called: ${filePath}`);
        if (updatedDoc.message === 'success') {
          return { status: 'success', data: data.imageUrl };
        } else {
@@ -29,6 +29,7 @@ export default function reportJson(id, userId) {
          'Signers.Phone',
          'Placeholders',
          'IsSignyourself',
+          'FileAdapterId',
        ],
      };

@@ -74,6 +75,7 @@ export default function reportJson(id, userId) {
          'AuditTrail',
          'Placeholders',
          'SignedUrl',
+          'FileAdapterId',
        ],
      };
    // In progess report
@@ -113,6 +115,7 @@ export default function reportJson(id, userId) {
          'SendMail',
          'Placeholders',
          'SignedUrl',
+          'FileAdapterId',
        ],
      };
    // completed documents report
@@ -144,6 +147,7 @@ export default function reportJson(id, userId) {
          'Placeholders',
          'IsSignyourself',
          'IsCompleted',
+          'FileAdapterId',
        ],
      };
    //  declined documents report
@@ -173,6 +177,7 @@ export default function reportJson(id, userId) {
          'Placeholders',
          'DeclineReason',
          'SignedUrl',
+          'FileAdapterId',
        ],
      };
    //  Expired Documents report
@@ -205,6 +210,7 @@ export default function reportJson(id, userId) {
          'Signers.Phone',
          'Placeholders',
          'SignedUrl',
+          'FileAdapterId',
        ],
      };
    //  Recently sent for signatures report show on dashboard
@@ -242,6 +248,7 @@ export default function reportJson(id, userId) {
          'ExpiryDate',
          'Placeholders',
          'SignedUrl',
+          'FileAdapterId',
        ],
      };
    //  Recent signature requests report show on dashboard
@@ -284,6 +291,7 @@ export default function reportJson(id, userId) {
          'Signers.Phone',
          'Placeholders',
          'SignedUrl',
+          'FileAdapterId',
        ],
      };
    // Drafts report show on dashboard
@@ -312,6 +320,7 @@ export default function reportJson(id, userId) {
          'Signers.Email',
          'Signers.Phone',
          'Placeholders',
+          'FileAdapterId',
        ],
      };
    // contact book report
@@ -352,6 +361,7 @@ export default function reportJson(id, userId) {
          'IsPublic',
          'SharedWith.Name',
          'SendinOrder',
+          'FileAdapterId',
        ],
      };
    default:
@@ -0,0 +1,60 @@
+import uploadFileToS3 from './uploadFiletoS3.js';
+
+export default async function saveToFileAdapter(request) {
+  if (!request?.user) {
+    throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+  }
+
+  if (!request.params.fileBase64) {
+    throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Please provide file.');
+  }
+  const fileBase64 = request.params.fileBase64;
+  const id = request.params.id;
+  try {
+    const extCls = new Parse.Query('contracts_Users');
+    extCls.equalTo('UserId', request.user);
+    extCls.include('TenantId');
+    const resExt = await extCls.first({ useMasterKey: true });
+    if (resExt) {
+      const _resExt = JSON.parse(JSON.stringify(resExt));
+      const fileAdapters = _resExt?.TenantId.FileAdapters || [];
+      const fileAdapter = fileAdapters?.find(x => x.id === id) || {};
+      if (fileAdapter?.accessKeyId) {
+        const adapterConfig = {
+          id: id,
+          fileAdapter: fileAdapter?.fileAdapter,
+          bucketName: fileAdapter?.bucketName,
+          region: fileAdapter?.region,
+          endpoint: fileAdapter?.endpoint,
+          accessKeyId: fileAdapter?.accessKeyId,
+          secretAccessKey: fileAdapter?.secretAccessKey,
+          baseUrl: fileAdapter?.baseUrl,
+        };
+        const buffer = Buffer.from(fileBase64, 'base64');
+        const fileName = request.params.fileName;
+        const ext = request.params.fileName?.split('.')?.pop();
+        let mimeType;
+        if (ext === 'pdf') {
+          mimeType = 'application/pdf';
+        } else if (ext === 'png' || ext === 'jpeg' || ext === 'jpg') {
+          mimeType = `image/${ext}`;
+        }
+        try {
+          const presignedUrl = await uploadFileToS3(buffer, fileName, mimeType, adapterConfig);
+          return { url: presignedUrl };
+        } catch (err) {
+          console.error('Error generate presigned url:', err);
+          const msg = 'Fileadapter credentials are invalid.';
+          throw new Parse.Error(400, msg);
+        }
+      } else {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'S3 credentials not found.');
+      }
+    } else {
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
+    }
+  } catch (err) {
+    console.log('err in savetoS3', err);
+    throw err;
+  }
+}
@@ -37,7 +37,8 @@ const makeEmail = async (to, from, subject, html, url, pdfName) => {
    let Pdf = fs.createWriteStream('test.pdf');
    const writeToLocalDisk = () => {
      return new Promise((resolve, reject) => {
-        if (useLocal !== 'true') {
+        const isSecure = new URL(url)?.protocol === 'https:';
+        if (useLocal !== 'true' || isSecure) {
          https.get(url, async function (response) {
            response.pipe(Pdf);
            response.on('end', () => resolve('success'));
@@ -33,7 +33,8 @@ async function sendMailProvider(req, plan, monthchange) {
      let Pdf = fs.createWriteStream('test.pdf');
      const writeToLocalDisk = () => {
        return new Promise((resolve, reject) => {
-          if (useLocal !== 'true') {
+          const isSecure = new URL(req.params.url)?.protocol === 'https:';
+          if (useLocal !== 'true' || isSecure) {
            https.get(req.params.url, async function (response) {
              response.pipe(Pdf);
              response.on('end', () => resolve('success'));
@@ -199,7 +200,8 @@ async function sendcustomsmtp(extRes, req) {
    let Pdf = fs.createWriteStream('test.pdf');
    const writeToLocalDisk = () => {
      return new Promise((resolve, reject) => {
-        if (useLocal !== 'true') {
+        const isSecure = new URL(req.params.url)?.protocol === 'https:';
+        if (useLocal !== 'true' || isSecure) {
          https.get(req.params.url, async function (response) {
            response.pipe(Pdf);
            response.on('end', () => resolve('success'));
@@ -0,0 +1,38 @@
+import { S3Client, PutObjectCommand, GetObjectCommand } from '@aws-sdk/client-s3';
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner';
+import * as crypto from 'node:crypto';
+async function uploadFileToS3(buffer, fileName, mimeType, adapter) {
+  const bucketName = adapter?.bucketName;
+  let client;
+  if (adapter?.fileAdapter === 'digitalocean') {
+    client = new S3Client({
+      endpoint: adapter?.endpoint,
+      region: adapter?.region,
+      credentials: { accessKeyId: adapter?.accessKeyId, secretAccessKey: adapter?.secretAccessKey },
+    });
+  } else {
+    client = new S3Client({
+      region: adapter?.region,
+      credentials: { accessKeyId: adapter?.accessKeyId, secretAccessKey: adapter?.secretAccessKey },
+    });
+  }
+  const prefixId = crypto.randomBytes(16).toString('hex');
+  const fileKey = `${prefixId}_${fileName}`;
+  const uploadParams = { Bucket: bucketName, Key: fileKey, Body: buffer, ContentType: mimeType };
+
+  try {
+    // Upload the buffer to the Space
+    const command = new PutObjectCommand(uploadParams);
+    await client.send(command);
+    const getCommand = new GetObjectCommand({ Bucket: bucketName, Key: fileKey });
+
+    // Generate a presigned URL for the uploaded file
+    const presignedUrl = await getSignedUrl(client, getCommand, { expiresIn: 900 }); // URL expiration time in seconds (e.g., 15 min)
+    return presignedUrl;
+  } catch (error) {
+    console.error('Error uploading file to aws:', error?.message);
+    throw error;
+  }
+}
+
+export default uploadFileToS3;
@@ -0,0 +1,29 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async (Parse) => {
+  const templateSchema = new Parse.Schema('contracts_Template');
+  templateSchema.addBoolean('IsTourEnabled');
+  await templateSchema.update();
+
+  const className = 'contracts_Document';
+  const schema = new Parse.Schema(className);
+  schema.addBoolean('IsTourEnabled');
+  return schema.update();
+};
+
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.down = async (Parse) => {
+  const templateSchema = new Parse.Schema('contracts_Template');
+  templateSchema.deleteField('IsTourEnabled');
+  await templateSchema.update();
+
+  const className = 'contracts_Document';
+  const schema = new Parse.Schema(className);
+  schema.deleteField('IsTourEnabled');
+  return schema.update();
+};
@@ -0,0 +1,21 @@
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.up = async Parse => {
+  const className = 'contracts_Document';
+  const schema = new Parse.Schema(className);
+  schema.addString('FileAdapterId');
+  return schema.update();
+};
+
+/**
+ *
+ * @param {Parse} Parse
+ */
+exports.down = async Parse => {
+  const className = 'contracts_Document';
+  const schema = new Parse.Schema(className);
+  schema.deleteField('FileAdapterId');
+  return schema.update();
+};
@@ -18,6 +18,8 @@
    "watch": "nodemon index.js"
  },
  "dependencies": {
+    "@aws-sdk/client-s3": "^3.665.0",
+    "@aws-sdk/s3-request-presigner": "^3.665.0",
    "@parse/fs-files-adapter": "^3.0.0",
    "@parse/s3-files-adapter": "^2.2.0",
    "@pdf-lib/fontkit": "^1.1.1",
@@ -32,7 +34,6 @@
    "form-data": "^4.0.0",
    "generate-api-key": "^1.0.2",
    "googleapis": "^144.0.0",
-    "jsonschema": "^1.4.1",
    "mailgun.js": "^10.2.3",
    "mongoose": "^8.7.0",
    "multer": "^1.4.5-lts.1",
@@ -41,7 +42,7 @@
    "nodemailer": "^6.9.15",
    "parse": "^5.3.0",
    "parse-dbtool": "^1.2.0",
-    "parse-server": "^7.3.0-alpha.8",
+    "parse-server": "^7.3.0",
    "parse-server-api-mail-adapter": "^4.0.0",
    "pdf-lib": "^1.17.1",
    "posthog-node": "^4.2.0",
@@ -49,10 +50,10 @@
  },
  "type": "module",
  "devDependencies": {
-    "@babel/eslint-parser": "^7.25.1",
-    "eslint": "^9.11.1",
-    "jasmine": "^5.3.0",
-    "mongodb-runner": "^5.6.6",
+    "@babel/eslint-parser": "^7.25.7",
+    "eslint": "^9.12.0",
+    "jasmine": "^5.3.1",
+    "mongodb-runner": "^5.7.0",
    "nodemon": "^3.1.7",
    "nyc": "^17.1.0",
    "prettier": "^3.3.3"
Author	SHA1	Message	Date
prafull-opensignlabsandGitHub	716023b534	Merge pull request #1323 from OpenSignLabs/react-tour Fix: resolved text box font size issue during resizing and prevented unnecessary popups from opening when resizing widgets.	2024-10-11 19:15:26 +05:30
RaktimaandGitHub	67b3417ac9	Update Placeholder.js	2024-10-11 19:13:00 +05:30
RaktimaandGitHub	f3667f6aaf	Update Placeholder.js	2024-10-11 19:07:54 +05:30
AndrewandGitHub	7b35e71f3d	Merge pull request #1321 from OpenSignLabs/validation	2024-10-10 17:17:04 +05:30
prafull-opensignlabs	51031878eb	Fix 'something went wrong' error when non-existing signer attempts to sign the document	2024-10-10 17:13:22 +05:30
prafull-opensignlabsandGitHub	19d96230cd	Merge pull request #1320 from OpenSignLabs/raktima-patch-5 fix: enableTour issue when enableOtp enabled	2024-10-10 14:50:15 +05:30
RaktimaNXG	dbee7e2894	fix: enableTour issue when enableOtp enabled	2024-10-10 14:46:59 +05:30
AndrewandGitHub	656241da54	Merge pull request #1318 from OpenSignLabs/validation	2024-10-10 13:33:51 +05:30
prafull-opensignlabs	2a3947ea1d	feat: send completed mail to all signers	2024-10-10 12:50:26 +05:30
prafull-opensignlabsandGitHub	9c1b4261dc	Merge pull request #1316 from OpenSignLabs/validation refactor: changes in output of file-adapter's cloud function	2024-10-09 18:41:07 +05:30
prafull-opensignlabs	7c37d8128e	refactor: changes in output of fileadapter's cloud function	2024-10-09 18:39:33 +05:30
RaktimaNXG	404785bf29	fix: text box font size issue	2024-10-09 18:05:10 +05:30
prafull-opensignlabsandGitHub	dc7fd34b07	Merge pull request #1315 from OpenSignLabs/validation fix: url is not define	2024-10-09 15:09:09 +05:30
prafull-opensignlabs	86a2975b3c	fix: url is not define	2024-10-09 15:06:49 +05:30
prafull-opensignlabsandGitHub	f824fc7c81	Merge pull request #1314 from OpenSignLabs/react-tour fix: issue of enableTour in createDocumentWithTemplate api	2024-10-09 14:39:46 +05:30
RaktimaNXG	244cc30eb6	fix: issue of enableTour in createDocumentWithTemplate api	2024-10-09 14:36:29 +05:30
AndrewandGitHub	a833ed8060	Merge pull request #1313 from OpenSignLabs/validation	2024-10-09 13:52:19 +05:30
prafull-opensignlabs	1e869d2d2b	fix: handle server down error in add admin for self-hosting	2024-10-09 13:50:20 +05:30
prafull-opensignlabsandGitHub	64df5cfff3	Merge pull request #1312 from OpenSignLabs/validation fix: handle invalid credentials err while uploading file in form	2024-10-09 11:42:07 +05:30
prafull-opensignlabs	d8b2a80e90	fix: handle invalid credentials err while uploading file in form	2024-10-09 11:39:59 +05:30
prafull-opensignlabsandGitHub	10061c061e	Merge pull request #1311 from OpenSignLabs/validation fix: correct migration script	2024-10-09 10:55:04 +05:30
prafull-opensignlabs	6a4124fdf0	fix: migration script	2024-10-09 10:52:38 +05:30
RaktimaandGitHub	faaa915163	Merge pull request #1308 from OpenSignLabs/react-tour fix: resolve duplicate auto-reminder input box issue in request signature form	2024-10-08 21:18:19 +05:30
AndrewandGitHub	3fb911298d	Merge pull request #1309 from OpenSignLabs/validation	2024-10-08 20:14:26 +05:30
prafull-opensignlabs	761f81d27c	fix: pdf is not loading when custom file storage change	2024-10-08 20:09:38 +05:30
RaktimaNXG	d4b7c8ae97	fix: resolve duplicate auto-reminder input box issue in request signature form	2024-10-08 19:02:47 +05:30
prafull-opensignlabsandGitHub	23679e58e1	Merge pull request #1307 from OpenSignLabs/react-tour fix: enable tour is not working	2024-10-08 16:47:05 +05:30
RaktimaNXG	f3e39f18ef	fix: enable tour is not working	2024-10-08 16:38:06 +05:30
prafull-opensignlabsandGitHub	55a4cda351	Merge pull request #1302 from OpenSignLabs/react-tour feat: add enable tour option in request signature and template form	2024-10-08 14:15:19 +05:30
RaktimaNXG	f0f270b44d	fix: handle form advanced options data for self hosting user	2024-10-08 13:31:30 +05:30
RaktimaNXG	529de2bd90	fix: refactor code	2024-10-08 11:53:06 +05:30
RaktimaNXG	51dd83df09	refactor code	2024-10-08 10:29:14 +05:30
RaktimaNXG	9abe4ffd8e	feat: update translation file	2024-10-08 10:27:26 +05:30
RaktimaNXG	cdd92f6990	Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into react-tour	2024-10-08 10:18:05 +05:30
prafull-opensignlabsandGitHub	b08fa9bf60	Merge pull request #1298 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSign/react-quill-new-3.3.3 build(deps): bump react-quill-new from 3.3.2 to 3.3.3 in /apps/OpenSign	2024-10-08 10:12:20 +05:30
prafull-opensignlabsandGitHub	f0bcc3c3e7	Merge pull request #1299 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSignServer/aws-sdk/s3-request-presigner-3.665.0 build(deps): bump @aws-sdk/s3-request-presigner from 3.664.0 to 3.665.0 in /apps/OpenSignServer	2024-10-08 10:11:59 +05:30
ZathielandGitHub	b9c45f24f5	Merge pull request #1295 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSign/i18next-23.15.2 build(deps): bump i18next from 23.15.1 to 23.15.2 in /apps/OpenSign	2024-10-07 20:33:06 +02:00
ZathielandGitHub	d5f3967558	Merge pull request #1296 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSign/daisyui-4.12.12 build(deps-dev): bump daisyui from 4.12.11 to 4.12.12 in /apps/OpenSign	2024-10-07 20:32:25 +02:00
ZathielandGitHub	d3fccc9b87	Merge pull request #1297 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSign/eslint-9.12.0 build(deps-dev): bump eslint from 9.11.1 to 9.12.0 in /apps/OpenSign	2024-10-07 20:31:19 +02:00
dependabot[bot]andGitHub	7e6c03faf5	build(deps): bump @aws-sdk/s3-request-presigner in /apps/OpenSignServer Bumps [@aws-sdk/s3-request-presigner](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/packages/s3-request-presigner) from 3.664.0 to 3.665.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/packages/s3-request-presigner/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.665.0/packages/s3-request-presigner) --- updated-dependencies: - dependency-name: "@aws-sdk/s3-request-presigner" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 18:28:34 +00:00
ZathielandGitHub	02b2a52280	Merge pull request #1300 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSignServer/eslint-9.12.0 build(deps-dev): bump eslint from 9.11.1 to 9.12.0 in /apps/OpenSignServer	2024-10-07 20:28:06 +02:00
ZathielandGitHub	6eb708b155	Merge pull request #1301 from OpenSignLabs/dependabot/npm_and_yarn/apps/OpenSignServer/aws-sdk/client-s3-3.665.0 build(deps): bump @aws-sdk/client-s3 from 3.664.0 to 3.665.0 in /apps/OpenSignServer	2024-10-07 20:26:18 +02:00
prafull-opensignlabsandGitHub	83e6444ddc	Merge pull request #1306 from OpenSignLabs/validation fix: custom file storage not working while create document using template	2024-10-07 16:42:40 +05:30
prafull-opensignlabs	168fe4d680	fix: custom file storage not working while create document using template	2024-10-07 16:40:49 +05:30
prafull-opensignlabsandGitHub	0a10c9a7c9	Merge pull request #1305 from OpenSignLabs/validation refactor: remove unnecessary code	2024-10-07 14:29:11 +05:30
prafull-opensignlabs	204c530712	refactor: remove unncessary code	2024-10-07 14:22:18 +05:30
RaktimaandGitHub	5e55f0debf	Merge branch 'staging' into react-tour	2024-10-07 11:31:58 +05:30
prafull-opensignlabsandGitHub	f8bd5a6c86	Merge pull request #1304 from OpenSignLabs/validation fix: custom file storage not working in use template	2024-10-07 11:29:09 +05:30
prafull-opensignlabs	101e7a9a49	fix: custom file storage not working in use template	2024-10-07 11:27:45 +05:30
RaktimaandGitHub	271e79d6a2	Update translation.json	2024-10-07 10:38:57 +05:30
RaktimaandGitHub	2ca8f8aff8	Update translation.json	2024-10-07 10:38:34 +05:30
RaktimaandGitHub	bc6891e746	Update translation.json	2024-10-07 10:38:10 +05:30
RaktimaandGitHub	26aaeccf11	Update translation.json	2024-10-07 10:37:38 +05:30
RaktimaandGitHub	91b512b693	Merge branch 'staging' into react-tour	2024-10-07 10:05:50 +05:30
dependabot[bot]andGitHub	88d7917a84	build(deps): bump @aws-sdk/client-s3 in /apps/OpenSignServer Bumps [@aws-sdk/client-s3](https://github.com/aws/aws-sdk-js-v3/tree/HEAD/clients/client-s3) from 3.664.0 to 3.665.0. - [Release notes](https://github.com/aws/aws-sdk-js-v3/releases) - [Changelog](https://github.com/aws/aws-sdk-js-v3/blob/main/clients/client-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-js-v3/commits/v3.665.0/clients/client-s3) --- updated-dependencies: - dependency-name: "@aws-sdk/client-s3" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 00:57:25 +00:00
dependabot[bot]andGitHub	7ae0964dd1	build(deps-dev): bump eslint in /apps/OpenSignServer Bumps [eslint](https://github.com/eslint/eslint) from 9.11.1 to 9.12.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.11.1...v9.12.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 00:57:02 +00:00
dependabot[bot]andGitHub	edb0c305dd	build(deps): bump react-quill-new from 3.3.2 to 3.3.3 in /apps/OpenSign Bumps [react-quill-new](https://github.com/VaguelySerious/react-quill) from 3.3.2 to 3.3.3. - [Changelog](https://github.com/VaguelySerious/react-quill/blob/master/CHANGELOG.md) - [Commits](https://github.com/VaguelySerious/react-quill/commits) --- updated-dependencies: - dependency-name: react-quill-new dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 00:08:54 +00:00
dependabot[bot]andGitHub	0321f35869	build(deps-dev): bump eslint from 9.11.1 to 9.12.0 in /apps/OpenSign Bumps [eslint](https://github.com/eslint/eslint) from 9.11.1 to 9.12.0. - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.11.1...v9.12.0) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 00:08:42 +00:00
dependabot[bot]andGitHub	1870f8e90e	build(deps-dev): bump daisyui from 4.12.11 to 4.12.12 in /apps/OpenSign Bumps [daisyui](https://github.com/saadeghi/daisyui) from 4.12.11 to 4.12.12. - [Release notes](https://github.com/saadeghi/daisyui/releases) - [Changelog](https://github.com/saadeghi/daisyui/blob/master/CHANGELOG.md) - [Commits](https://github.com/saadeghi/daisyui/compare/v4.12.11...v4.12.12) --- updated-dependencies: - dependency-name: daisyui dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 00:08:30 +00:00
dependabot[bot]andGitHub	6e112b904f	build(deps): bump i18next from 23.15.1 to 23.15.2 in /apps/OpenSign Bumps [i18next](https://github.com/i18next/i18next) from 23.15.1 to 23.15.2. - [Release notes](https://github.com/i18next/i18next/releases) - [Changelog](https://github.com/i18next/i18next/blob/master/CHANGELOG.md) - [Commits](https://github.com/i18next/i18next/compare/v23.15.1...v23.15.2) --- updated-dependencies: - dependency-name: i18next dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-10-07 00:08:12 +00:00
AndrewandGitHub	dca8d2533e	Merge pull request #1294 from OpenSignLabs/validation	2024-10-04 18:59:29 +05:30
prafull-opensignlabs	c57957b56d	fix: add error for uncompatible pdf	2024-10-04 18:45:15 +05:30
AndrewandGitHub	1f5ab87653	Merge pull request #1293 from OpenSignLabs/validation	2024-10-04 15:28:55 +05:30
RaktimaNXG	d5513e90bd	fix: update form advanced option layout design	2024-10-04 15:17:15 +05:30
prafull-opensignlabs	00fcd17285	feat: enable custom file storage for document siging	2024-10-04 12:59:10 +05:30
AndrewandGitHub	356ab4e7cb	Merge pull request #1291 from OpenSignLabs/form-layout fix: mobile view issue with text box widget design for value entry.	2024-10-03 21:36:56 +05:30
AndrewandGitHub	572cb55bf8	Update node version	2024-10-03 21:33:25 +05:30
RaktimaNXG	08b83469e3	fix: text box widgets font size issue	2024-10-03 20:36:34 +05:30
RaktimaNXG	a5f8e4fc58	fix: updated documents order issue in opensign drive	2024-10-03 16:52:15 +05:30
RaktimaNXG	0c472ba22c	fix: update form advanced options design	2024-10-03 14:20:28 +05:30
RaktimaNXG	634744c22d	fix: text box widgets design to enter value issue in mobile view	2024-10-01 17:58:30 +05:30
RaktimaNXG	85ad7ca187	feat: re-design form layout	2024-09-30 17:20:31 +05:30
RaktimaNXG	66a56757d1	Merge branch 'staging' of https://github.com/OpenSignLabs/OpenSign into react-tour	2024-09-30 12:35:11 +05:30
RaktimaNXG	088ec5580a	feat: add enable tour option in request signature and template form	2024-09-30 12:27:33 +05:30