Merge pull request #836 from OpenSignLabs/fix_smtp

Fix: smtp is not working

.env.local_dev

@@ -40,7 +40,7 @@ DO_SECRET_ACCESS_KEY=
 # Digital ocean spaces region or AWS s3 region
 DO_REGION=us-west
 # local storage
-USE_LOCAL=TRUE
+USE_LOCAL=true
 
 # Email mailgun or set SMTP_ENABLE true to use SMTP config (The app will not initialize if any of these 3 variables are not set) *********************************************************************************************************************
 MAILGUN_API_KEY=

README.md

@@ -136,7 +136,7 @@ We would like to thank all our contributors and users for their support and feed
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/VikramNagwal"><img src="https://avatars.githubusercontent.com/u/123088024?v=4?s=100" width="100px;" alt="Vikram"/><br /><sub><b>Vikram</b></sub></a><br /><a href="#code-VikramNagwal" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ugoconsonni"><img src="https://avatars.githubusercontent.com/u/13661702?v=4?s=100" width="100px;" alt="ugoconsonni"/><br /><sub><b>ugoconsonni</b></sub></a><br /><a href="#code-ugoconsonni" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/daniel-mutwiri"><img src="https://avatars.githubusercontent.com/u/8936960?v=4?s=100" width="100px;" alt="Daniel Mutwiri"/><br /><sub><b>Daniel Mutwiri</b></sub></a><br /><a href="#code-daniel-mutwiri" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zathiel"><img src="https://avatars.githubusercontent.com/u/26553418?v=4?s=100" width="100px;" alt="Zathiel"/><br /><sub><b>Zathiel</b></sub></a><br /><a href="#code-Zathiel" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Zathiel"><img src="https://avatars.githubusercontent.com/u/26553418?v=4?s=100" width="100px;" alt="Zathiel"/><br /><sub><b>Zathiel</b></sub></a><br /><a href="#code-Zathiel" title="Code">💻</a><a href="#security-Zathiel" title="Security">🛡️</a></td>
     </tr>
   </tbody>
 </table>

apps/OpenSign/package.json

@@ -4,21 +4,23 @@
   "private": true,
   "dependencies": {
     "@formkit/auto-animate": "^0.8.2",
-    "@radix-ui/themes": "^2.0.3",
+    "@radix-ui/themes": "^3.0.5",
     "@react-pdf/renderer": "^3.4.4",
-    "@reduxjs/toolkit": "^2.2.1",
-    "axios": "^1.6.8",
+    "@reduxjs/toolkit": "^2.2.5",
+    "axios": "^1.7.2",
     "file-saver": "^2.0.5",
     "jwt-decode": "^4.0.0",
     "moment": "^2.30.1",
-    "parse": "^4.3.1",
+    "nth-check": "^2.1.1",
+    "parse": "^5.1.0",
     "pdf-lib": "^1.17.1",
     "print-js": "^1.6.0",
     "radix-ui": "^1.0.1",
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.2",
+    "react-confetti": "^6.1.0",
     "react-cookie": "^7.1.4",
-    "react-datepicker": "^6.4.0",
+    "react-datepicker": "^6.9.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dnd-multi-backend": "^8.0.3",
@@ -28,24 +30,24 @@
     "react-helmet": "^6.1.0",
     "react-konva": "^18.2.10",
     "react-modal": "^3.16.1",
-    "react-pdf": "^7.7.1",
+    "react-pdf": "^9.0.0",
     "react-quill": "^2.0.0",
-    "react-redux": "^9.1.0",
-    "react-rnd": "^10.4.10",
+    "react-redux": "^9.1.2",
+    "react-rnd": "^10.4.11",
     "react-router-dom": "^6.22.3",
     "react-scripts": "5.0.1",
     "react-scrollbars-custom": "^4.1.1",
     "react-select": "^5.8.0",
     "react-signature-canvas": "^1.0.6",
-    "react-tooltip": "^5.26.3",
+    "react-tooltip": "^5.26.4",
     "react-web-share": "^2.0.2",
-    "reactour": "^1.19.3",
+    "reactour": "^1.19.4",
     "redux": "^5.0.1",
     "redux-thunk": "^3.1.0",
     "regex-parser": "^2.3.0",
-    "serve": "^14.2.1",
+    "serve": "^14.2.3",
     "styled-components": "^4.4.1",
-    "web-vitals": "^2.1.4"
+    "web-vitals": "^4.0.1"
   },
   "scripts": {
     "start": "serve -s build",
@@ -83,16 +85,19 @@
     }
   },
   "devDependencies": {
-    "@babel/runtime-corejs2": "^7.24.5",
+    "@babel/runtime-corejs2": "^7.24.7",
     "autoprefixer": "^10.4.19",
     "commitizen": "^4.3.0",
     "eslint": "^8.57.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-react": "^7.34.1",
-    "lint-staged": "^15.2.2",
+    "lint-staged": "^15.2.5",
     "postcss": "^8.4.38",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.3.1",
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.4.4"
+  },
+  "overrides": {
+    "nth-check": "$nth-check"
   }
 }

apps/OpenSign/src/App.js

@@ -16,6 +16,7 @@ import PlaceHolderSign from "./pages/PlaceHolderSign";
 import PdfRequestFiles from "./pages/PdfRequestFiles";
 import LazyPage from "./primitives/LazyPage";
 import { isEnableSubscription } from "./constant/const";
+import SSOVerify from "./pages/SSOVerify";
 const DebugPdf = lazy(() => import("./pages/DebugPdf"));
 const ForgetPassword = lazy(() => import("./pages/ForgetPassword"));
 const GuestLogin = lazy(() => import("./pages/GuestLogin"));
@@ -28,8 +29,7 @@ const Opensigndrive = lazy(() => import("./pages/Opensigndrive"));
 const ManageSign = lazy(() => import("./pages/Managesign"));
 const GenerateToken = lazy(() => import("./pages/GenerateToken"));
 const Webhook = lazy(() => import("./pages/Webhook"));
-pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.js`;
-
+pdfjs.GlobalWorkerOptions.workerSrc = `//cdnjs.cloudflare.com/ajax/libs/pdf.js/${pdfjs.version}/pdf.worker.min.mjs`;
 const Loader = () => {
   return (
     <div
@@ -181,6 +181,7 @@ function App() {
                 element={<PdfRequestFiles />}
               />
             </Route>
+            <Route path="/sso" element={<SSOVerify />} />
             <Route path="*" element={<PageNotFound />} />
           </Routes>
         </BrowserRouter>

apps/OpenSign/src/components/AddSigner.js

@@ -23,7 +23,7 @@ const AddSigner = (props) => {
     );
     if (savedUserDetails && addYourself) {
       setName(savedUserDetails.name);
-      setPhone(savedUserDetails.phone);
+      setPhone(savedUserDetails?.phone || "");
       setEmail(savedUserDetails.email);
     }
   }, [addYourself]);
@@ -49,144 +49,162 @@ const AddSigner = (props) => {
     e.preventDefault();
     e.stopPropagation();
     setIsLoader(true);
-    try {
-      const contactQuery = new Parse.Object("contracts_Contactbook");
-      contactQuery.set("Name", name);
-      contactQuery.set("Phone", phone);
-      contactQuery.set("Email", email);
-      contactQuery.set("UserRole", "contracts_Guest");
-
-      if (localStorage.getItem("TenantId")) {
-        contactQuery.set("TenantId", {
-          __type: "Pointer",
-          className: "partners_Tenant",
-          objectId: localStorage.getItem("TenantId")
-        });
-      }
-
+    if (localStorage.getItem("TenantId")) {
       try {
-        const _users = Parse.Object.extend("User");
-        const _user = new _users();
-        _user.set("name", name);
-        _user.set("username", email);
-        _user.set("email", email);
-        _user.set("phone", phone);
-        _user.set("password", phone);
-
-        const user = await _user.save();
-        if (user) {
-          const roleurl = `${parseBaseUrl}functions/AddUserToRole`;
-          const headers = {
-            "Content-Type": "application/json",
-            "X-Parse-Application-Id": parseAppId,
-            sessionToken: localStorage.getItem("accesstoken")
-          };
-          const body = {
-            appName: localStorage.getItem("_appName"),
-            roleName: "contracts_Guest",
-            userId: user.id
-          };
-          await axios.post(roleurl, body, { headers: headers });
-          const currentUser = Parse.User.current();
-          contactQuery.set(
-            "CreatedBy",
-            Parse.User.createWithoutData(currentUser.id)
-          );
-
-          contactQuery.set("UserId", user);
-          const acl = new Parse.ACL();
-          acl.setPublicReadAccess(true);
-          acl.setPublicWriteAccess(true);
-          acl.setReadAccess(currentUser.id, true);
-          acl.setWriteAccess(currentUser.id, true);
-
-          contactQuery.setACL(acl);
-
-          const res = await contactQuery.save();
-
-          const parseData = JSON.parse(JSON.stringify(res));
-          if (props.details) {
-            props.details({
-              value: parseData[props.valueKey],
-              label: parseData[props.displayKey]
-            });
-          }
-          if (props.closePopup) {
-            props.closePopup();
-          }
-          if (props.handleUserData) {
-            props.handleUserData(parseData);
+        const user = Parse.User.current();
+        const query = new Parse.Query("contracts_Contactbook");
+        query.equalTo("CreatedBy", user);
+        query.notEqualTo("IsDeleted", true);
+        query.equalTo("Email", email);
+        const res = await query.first();
+        // console.log(res);
+        if (!res) {
+          const contactQuery = new Parse.Object("contracts_Contactbook");
+          contactQuery.set("Name", name);
+          if (phone) {
+            contactQuery.set("Phone", phone);
           }
+          contactQuery.set("Email", email);
+          contactQuery.set("UserRole", "contracts_Guest");
 
+          contactQuery.set("TenantId", {
+            __type: "Pointer",
+            className: "partners_Tenant",
+            objectId: localStorage.getItem("TenantId")
+          });
+
+          try {
+            const _users = Parse.Object.extend("User");
+            const _user = new _users();
+            _user.set("name", name);
+            _user.set("username", email);
+            _user.set("email", email);
+            _user.set("password", email);
+            if (phone) {
+              _user.set("phone", phone);
+            }
+            const user = await _user.save();
+            if (user) {
+              const roleurl = `${parseBaseUrl}functions/AddUserToRole`;
+              const headers = {
+                "Content-Type": "application/json",
+                "X-Parse-Application-Id": parseAppId,
+                sessionToken: localStorage.getItem("accesstoken")
+              };
+              const body = {
+                appName: localStorage.getItem("_appName"),
+                roleName: "contracts_Guest",
+                userId: user.id
+              };
+              await axios.post(roleurl, body, { headers: headers });
+              const currentUser = Parse.User.current();
+              contactQuery.set(
+                "CreatedBy",
+                Parse.User.createWithoutData(currentUser.id)
+              );
+
+              contactQuery.set("UserId", user);
+              const acl = new Parse.ACL();
+              acl.setPublicReadAccess(true);
+              acl.setPublicWriteAccess(true);
+              acl.setReadAccess(currentUser.id, true);
+              acl.setWriteAccess(currentUser.id, true);
+
+              contactQuery.setACL(acl);
+
+              const res = await contactQuery.save();
+
+              const parseData = JSON.parse(JSON.stringify(res));
+              if (props.details) {
+                props.details({
+                  value: parseData[props.valueKey],
+                  label: parseData[props.displayKey]
+                });
+              }
+              if (props.closePopup) {
+                props.closePopup();
+              }
+              if (props.handleUserData) {
+                props.handleUserData(parseData);
+              }
+
+              setIsLoader(false);
+              // Reset the form fields
+              setAddYourself(false);
+              setName("");
+              setPhone("");
+              setEmail("");
+            }
+          } catch (err) {
+            console.log("err ", err);
+            if (err.code === 202) {
+              const params = { email: email };
+              const userRes = await Parse.Cloud.run("getUserId", params);
+              const roleurl = `${parseBaseUrl}functions/AddUserToRole`;
+              const headers = {
+                "Content-Type": "application/json",
+                "X-Parse-Application-Id": parseAppId,
+                sessionToken: localStorage.getItem("accesstoken")
+              };
+              const body = {
+                appName: localStorage.getItem("_appName"),
+                roleName: "contracts_Guest",
+                userId: userRes.id
+              };
+              await axios.post(roleurl, body, { headers: headers });
+              const currentUser = Parse.User.current();
+              contactQuery.set(
+                "CreatedBy",
+                Parse.User.createWithoutData(currentUser.id)
+              );
+
+              contactQuery.set("UserId", {
+                __type: "Pointer",
+                className: "_User",
+                objectId: userRes.id
+              });
+              const acl = new Parse.ACL();
+              acl.setPublicReadAccess(true);
+              acl.setPublicWriteAccess(true);
+              acl.setReadAccess(currentUser.id, true);
+              acl.setWriteAccess(currentUser.id, true);
+
+              contactQuery.setACL(acl);
+              const res = await contactQuery.save();
+
+              const parseData = JSON.parse(JSON.stringify(res));
+              if (props.details) {
+                props.details({
+                  value: parseData[props.valueKey],
+                  label: parseData[props.displayKey]
+                });
+              }
+              if (props.closePopup) {
+                props.closePopup();
+              }
+              if (props.handleUserData) {
+                props.handleUserData(parseData);
+              }
+              setIsLoader(false);
+              // Reset the form fields
+              setAddYourself(false);
+              setName("");
+              setPhone("");
+              setEmail("");
+            }
+          }
+        } else {
+          alert("Contact already exist!");
           setIsLoader(false);
-          // Reset the form fields
-          setAddYourself(false);
-          setName("");
-          setPhone("");
-          setEmail("");
         }
       } catch (err) {
-        console.log("err ", err);
-        if (err.code === 202) {
-          const params = { email: email };
-          const userRes = await Parse.Cloud.run("getUserId", params);
-          const roleurl = `${parseBaseUrl}functions/AddUserToRole`;
-          const headers = {
-            "Content-Type": "application/json",
-            "X-Parse-Application-Id": parseAppId,
-            sessionToken: localStorage.getItem("accesstoken")
-          };
-          const body = {
-            appName: localStorage.getItem("_appName"),
-            roleName: "contracts_Guest",
-            userId: userRes.id
-          };
-          await axios.post(roleurl, body, { headers: headers });
-          const currentUser = Parse.User.current();
-          contactQuery.set(
-            "CreatedBy",
-            Parse.User.createWithoutData(currentUser.id)
-          );
-
-          contactQuery.set("UserId", {
-            __type: "Pointer",
-            className: "_User",
-            objectId: userRes.id
-          });
-          const acl = new Parse.ACL();
-          acl.setPublicReadAccess(true);
-          acl.setPublicWriteAccess(true);
-          acl.setReadAccess(currentUser.id, true);
-          acl.setWriteAccess(currentUser.id, true);
-
-          contactQuery.setACL(acl);
-          const res = await contactQuery.save();
-
-          const parseData = JSON.parse(JSON.stringify(res));
-          if (props.details) {
-            props.details({
-              value: parseData[props.valueKey],
-              label: parseData[props.displayKey]
-            });
-          }
-          if (props.closePopup) {
-            props.closePopup();
-          }
-          if (props.handleUserData) {
-            props.handleUserData(parseData);
-          }
-          setIsLoader(false);
-          // Reset the form fields
-          setAddYourself(false);
-          setName("");
-          setPhone("");
-          setEmail("");
-        }
+        console.log("err in fetch contact", err);
+        setIsLoader(false);
+        alert("something went wrong, please try again later");
       }
-    } catch (err) {
-      // console.log("err", err);
+    } else {
       setIsLoader(false);
-      alert("something went wrong!");
+      alert("something went wrong, please try again later");
     }
   };
 
@@ -264,10 +282,10 @@ const AddSigner = (props) => {
               type="email"
               id="email"
               value={email}
-              onChange={(e) => setEmail(e.target.value)}
+              onChange={(e) => setEmail(e.target.value?.toLowerCase())}
               required
               disabled={addYourself}
-              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs lowercase"
             />
           </div>
           <div className="mb-3">
@@ -276,14 +294,12 @@ const AddSigner = (props) => {
               className="block text-xs text-gray-700 font-semibold"
             >
               Phone
-              <span style={{ color: "red", fontSize: 13 }}> *</span>
             </label>
             <input
               type="text"
               id="phone"
               value={phone}
               onChange={(e) => setPhone(e.target.value)}
-              required
               disabled={addYourself}
               className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
             />

apps/OpenSign/src/components/AddUser.js

@@ -62,8 +62,10 @@ const AddUser = (props) => {
           _user.set("name", name);
           _user.set("username", email);
           _user.set("email", email);
-          _user.set("phone", phone);
-          _user.set("password", phone);
+          _user.set("password", email);
+          if (phone) {
+            _user.set("phone", phone);
+          }
 
           const user = await _user.save();
           if (user) {

apps/OpenSign/src/components/BulkSendUi.js

@@ -0,0 +1,261 @@
+import React, { useState, useEffect, useRef } from "react";
+import axios from "axios";
+import SuggestionInput from "./shared/fields/SuggestionInput";
+
+const BulkSendUi = (props) => {
+  const [forms, setForms] = useState([]);
+  const [formId, setFormId] = useState(2);
+  const formRef = useRef(null);
+  const [scrollOnNextUpdate, setScrollOnNextUpdate] = useState(false);
+  const [isSubmit, setIsSubmit] = useState(false);
+  const [allowedForm, setAllowedForm] = useState(0);
+  const [isSignatureExist, setIsSignatureExist] = useState();
+  const allowedSigners = 50;
+  useEffect(() => {
+    signatureExist();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  //function to check atleast one signature field exist
+  const signatureExist = () => {
+    const getPlaceholder = props.item?.Placeholders;
+    const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
+      placeholderObj?.placeHolder?.some((holder) =>
+        holder?.pos?.some((posItem) => posItem?.type === "signature")
+      )
+    );
+    setIsSignatureExist(checkIsSignatureExistt);
+  };
+  useEffect(() => {
+    if (scrollOnNextUpdate && formRef.current) {
+      formRef.current.scrollIntoView({
+        behavior: "smooth",
+        block: "end",
+        inline: "nearest"
+      });
+      setScrollOnNextUpdate(false);
+    }
+  }, [forms, scrollOnNextUpdate]);
+
+  useEffect(() => {
+    (() => {
+      if (props?.Placeholders?.length > 0) {
+        let users = [];
+        props?.Placeholders?.forEach((element) => {
+          if (!element.signerObjId) {
+            users = [
+              ...users,
+              {
+                fieldId: element.Id,
+                email: "",
+                label: element.Role,
+                signer: {}
+              }
+            ];
+          }
+        });
+        setForms((prevForms) => [...prevForms, { Id: 1, fields: users }]);
+        const totalForms = Math.floor(allowedSigners / users?.length);
+        setAllowedForm(totalForms);
+      }
+    })();
+    // eslint-disable-next-line
+  }, []);
+  const handleInputChange = (index, signer, fieldIndex) => {
+    const newForms = [...forms];
+    newForms[index].fields[fieldIndex].email = signer?.Email
+      ? signer?.Email
+      : signer || "";
+    newForms[index].fields[fieldIndex].signer = signer?.objectId ? signer : "";
+    setForms(newForms);
+  };
+
+  const handleAddForm = (e) => {
+    e.preventDefault();
+    // Check if the quick send limit has been reached
+    if (forms?.length < allowedForm) {
+      if (props?.Placeholders.length > 0) {
+        let newForm = [];
+        props?.Placeholders?.forEach((element) => {
+          if (!element.signerObjId) {
+            newForm = [
+              ...newForm,
+              {
+                fieldId: element.Id,
+                email: "",
+                label: element.Role,
+                signer: {}
+              }
+            ];
+          }
+        });
+        setForms([...forms, { Id: formId, fields: newForm }]);
+      }
+      setFormId(formId + 1);
+      setScrollOnNextUpdate(true);
+    } else {
+      // If the limit has been reached, throw an error with the appropriate message
+      alert("Quick send reached limit.");
+    }
+  };
+
+  const handleRemoveForm = (index) => {
+    const updatedForms = forms.filter((_, i) => i !== index);
+    setForms(updatedForms);
+  };
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+    setIsSubmit(true);
+
+    // Create a copy of Placeholders array from props.item
+    let Placeholders = [...props.item.Placeholders];
+    // Initialize an empty array to store updated documents
+    let Documents = [];
+
+    // Loop through each form
+    forms.forEach((form) => {
+      // Map through the copied Placeholders array to update email values
+      const updatedPlaceholders = Placeholders.map((placeholder) => {
+        // Find the field in the current form that matches the placeholder Id
+        const field = form.fields.find(
+          (element) => parseInt(element.fieldId) === placeholder.Id
+        );
+        // If a matching field is found, update the email value in the placeholder
+        const signer = field?.signer?.objectId ? field.signer : {};
+        if (field) {
+          return {
+            ...placeholder,
+            email: field.email,
+            signerObjId: field?.signer?.objectId || "",
+            signerPtr: signer
+          };
+        }
+        // If no matching field is found, keep the placeholder as is
+        return placeholder;
+      });
+
+      // Push a new document object with updated Placeholders into the Documents array
+      Documents.push({ ...props.item, Placeholders: updatedPlaceholders });
+    });
+    // console.log("Documents ", Documents);
+    await batchQuery(Documents);
+  };
+
+  const batchQuery = async (Documents) => {
+    const serverUrl = localStorage.getItem("baseUrl");
+    const functionsUrl = `${serverUrl}functions/batchdocuments`;
+    const headers = {
+      "Content-Type": "application/json",
+      "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+      sessionToken: localStorage.getItem("accesstoken")
+    };
+    const params = {
+      Documents: JSON.stringify(Documents)
+    };
+    try {
+      const res = await axios.post(functionsUrl, params, { headers: headers });
+      // console.log("res ", res);
+      if (res.data && res.data.result) {
+        props.handleClose("success", Documents?.length);
+      }
+    } catch (err) {
+      console.log("Err ", err);
+      props.handleClose("error", 0);
+    } finally {
+      setIsSubmit(false);
+    }
+  };
+
+  return (
+    <>
+      {isSubmit && (
+        <div className="absolute z-[999] h-full w-full flex justify-center items-center bg-black bg-opacity-40">
+          <div
+            style={{
+              fontSize: "45px",
+              color: "#3dd3e0"
+            }}
+            className="loader-37 "
+          ></div>
+        </div>
+      )}
+      {props.Placeholders?.length > 0 ? (
+        isSignatureExist ? (
+          <>
+            {props.Placeholders?.some((x) => !x.signerObjId) ? (
+              <form onSubmit={handleSubmit}>
+                <div className=" min-h-max max-h-[250px] overflow-y-auto">
+                  {forms?.map((form, index) => (
+                    <div
+                      key={form.Id}
+                      className="p-3 rounded-xl border-[1px] border-gray-400 m-4 bg-white text-black grid grid-cols-1 md:grid-cols-2 gap-2 relative"
+                    >
+                      {form?.fields?.map((field, fieldIndex) => (
+                        <div className="flex flex-col " key={field.fieldId}>
+                          <label>{field.label}</label>
+                          <SuggestionInput
+                            required
+                            type="email"
+                            value={field.value}
+                            index={fieldIndex}
+                            onChange={(signer) =>
+                              handleInputChange(index, signer, fieldIndex)
+                            }
+                          />
+                        </div>
+                      ))}
+                      {forms?.length > 1 && (
+                        <button
+                          onClick={() => handleRemoveForm(index)}
+                          className="absolute right-3 top-1 border border-gray-300 rounded-lg px-2 py-1"
+                        >
+                          <i className="fa-solid fa-trash"></i>
+                        </button>
+                      )}
+                      <div ref={formRef}></div>
+                    </div>
+                  ))}
+                </div>
+                <div className="flex flex-col mx-4 mb-4 gap-3">
+                  <button
+                    onClick={handleAddForm}
+                    className="bg-[#32a3ac] p-2 text-white w-full rounded-full focus:outline-none"
+                  >
+                    <i className="fa-solid fa-plus"></i> <span>Add new</span>
+                  </button>
+                  <button
+                    type="submit"
+                    className="bg-[#32a3ac] p-2 text-white w-full rounded-full focus:outline-none"
+                  >
+                    <i className="fa-solid fa-paper-plane"></i>{" "}
+                    <span>Send</span>
+                  </button>
+                </div>
+              </form>
+            ) : (
+              <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
+                All roles in this document are currently linked to contacts. To
+                &apos;quick send&apos; copies of this template to multiple
+                signers, please ensure that at least one role is not linked to
+                any contact.
+              </div>
+            )}
+          </>
+        ) : (
+          <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
+            Please ensure there&#39;s at least one signature widget added for
+            all recipients.
+          </div>
+        )
+      ) : (
+        <div className="text-black p-3 bg-white w-full text-sm md:text-base flex justify-center items-center">
+          Please add at least one role to this template in order to &apos;quick
+          send&apos; copies of it to multiple signers.
+        </div>
+      )}
+    </>
+  );
+};
+
+export default BulkSendUi;

apps/OpenSign/src/components/Header.js

@@ -44,7 +44,9 @@ const Header = ({ showSidebar }) => {
 
   const closeDropdown = () => {
     setIsOpen(false);
-    Parse.User.logOut();
+    if (Parse?.User?.current()) {
+      Parse.User.logOut();
+    }
     let appdata = localStorage.getItem("userSettings");
     let applogo = localStorage.getItem("appLogo");
     let appName = localStorage.getItem("appName");

apps/OpenSign/src/components/LoginFacebook.js

@@ -49,7 +49,7 @@ const LoginFacebook = ({
     const extRes = await Parse.Cloud.run("getUserDetails", params);
     // console.log("extRes ", extRes);
     if (extRes) {
-      const params = { ...details, Phone: extRes.get("Phone") };
+      const params = { ...details, Phone: extRes?.get("Phone") || "" };
       const payload = await Parse.Cloud.run("facebooksign", params);
       //   console.log("payload ", payload);
       if (payload && payload.sessiontoken) {
@@ -59,7 +59,7 @@ const LoginFacebook = ({
         const LocalUserDetails = {
           name: details.Name,
           email: details.Email,
-          phone: extRes.get("Phone"),
+          phone: extRes?.get("Phone") || "",
           company: extRes.get("Company")
         };
         localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));
@@ -75,7 +75,7 @@ const LoginFacebook = ({
   const handleSubmitbtn = async () => {
     if (userDetails.Phone && userDetails.Company) {
       setThirdpartyLoader(true);
-      const params = { ...fBDetails, Phone: userDetails.Phone };
+      const params = { ...fBDetails, Phone: userDetails?.Phone || "" };
       const payload = await Parse.Cloud.run("facebooksign", params);
       // console.log("payload ", payload);
 
@@ -85,7 +85,7 @@ const LoginFacebook = ({
             name: userDetails.Name,
             email: userDetails.Email,
             // "passsword":userDetails.Phone,
-            phone: userDetails.Phone,
+            phone: userDetails?.Phone || "",
             role: "contracts_User",
             company: userDetails.Company
           }
@@ -96,7 +96,7 @@ const LoginFacebook = ({
           const LocalUserDetails = {
             name: userDetails.Name,
             email: userDetails.Email,
-            phone: userDetails.Phone,
+            phone: userDetails?.Phone || "",
             company: userDetails.Company
           };
           localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));

apps/OpenSign/src/components/LoginGoogle.js

@@ -110,7 +110,7 @@ const GoogleSignInBtn = ({
     const extRes = await Parse.Cloud.run("getUserDetails", params);
     // console.log("extRes ", extRes);
     if (extRes) {
-      const params = { ...details, Phone: extRes.get("Phone") };
+      const params = { ...details, Phone: extRes?.get("Phone") || "" };
       const payload = await Parse.Cloud.run("googlesign", params);
       // console.log("payload ", payload);
       if (payload && payload.sessiontoken) {
@@ -121,7 +121,7 @@ const GoogleSignInBtn = ({
         const LocalUserDetails = {
           name: details.Name,
           email: details.Gmail,
-          phone: extRes.get("Phone"),
+          phone: extRes?.get("Phone") || "",
           company: extRes.get("Company")
         };
         localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));
@@ -139,7 +139,7 @@ const GoogleSignInBtn = ({
       setThirdpartyLoader(true);
       // e.preventDefault()
       // console.log("handelSubmit", userDetails);
-      const params = { ...googleDetails, Phone: userDetails.Phone };
+      const params = { ...googleDetails, Phone: userDetails?.Phone };
       const payload = await Parse.Cloud.run("googlesign", params);
 
       // console.log("payload ", payload);
@@ -149,7 +149,7 @@ const GoogleSignInBtn = ({
             name: userDetails.Name,
             email: userDetails.Email,
             // "passsword":userDetails.Phone,
-            phone: userDetails.Phone,
+            phone: userDetails?.Phone || "",
             role: "contracts_User",
             company: userDetails.Company,
             jobTitle: userDetails.Destination
@@ -161,7 +161,7 @@ const GoogleSignInBtn = ({
           const LocalUserDetails = {
             name: userDetails.Name,
             email: userDetails.Email,
-            phone: userDetails.Phone,
+            phone: userDetails?.Phone || "",
             company: userDetails.Company
             // jobTitle: userDetails.JobTitle
           };

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

@@ -17,7 +17,7 @@ function DefaultSignature({ defaultSignImg, xyPostion, setDefaultSignAlert }) {
   };
 
   return (
-    <div>
+    <div data-tut="reactourThird">
       <div
         style={{
           background: themeColor,

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

@@ -1,6 +1,9 @@
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import "../../styles/AddUser.css";
-import { getFileName } from "../../constant/Utils";
+import { checkIsSubscribed, getFileName } from "../../constant/Utils";
+import PremiumAlertHeader from "../../primitives/PremiumAlertHeader";
+import Upgrade from "../../primitives/Upgrade";
+import { isEnableSubscription } from "../../constant/const";
 // import SelectFolder from "../../premitives/SelectFolder";
 
 const EditTemplate = ({ template, onSuccess }) => {
@@ -9,9 +12,21 @@ const EditTemplate = ({ template, onSuccess }) => {
     Name: template?.Name || "",
     Note: template?.Note || "",
     Description: template?.Description || "",
-    SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false"
+    SendinOrder: template?.SendinOrder ? `${template?.SendinOrder}` : "false",
+    AutomaticReminders: template?.AutomaticReminders || false,
+    RemindOnceInEvery: template?.RemindOnceInEvery || 5
   });
-
+  const [isSubscribe, setIsSubscribe] = useState(false);
+  useEffect(() => {
+    fetchSubscription();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const fetchSubscription = async () => {
+    if (isEnableSubscription) {
+      const getIsSubscribe = await checkIsSubscribed();
+      setIsSubscribe(getIsSubscribe);
+    }
+  };
   const handleStrInput = (e) => {
     setFormData({ ...formData, [e.target.name]: e.target.value });
   };
@@ -25,12 +40,26 @@ const EditTemplate = ({ template, onSuccess }) => {
     e.preventDefault();
     e.stopPropagation();
     const isChecked = formData.SendinOrder === "true" ? true : false;
-    const data = { ...formData, SendinOrder: isChecked };
+    const AutoReminder = formData?.AutomaticReminders || false;
+
+    let reminderDate = {};
+    if (AutoReminder) {
+      const RemindOnceInEvery = parseInt(formData?.RemindOnceInEvery);
+      const ReminderDate = new Date(template?.createdAt);
+      ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
+      reminderDate = { NextReminderDate: ReminderDate };
+    }
+    const data = { ...formData, SendinOrder: isChecked, ...reminderDate };
     onSuccess(data);
   };
-
+  const handleAutoReminder = () => {
+    setFormData((prev) => ({
+      ...prev,
+      AutomaticReminders: !formData.AutomaticReminders
+    }));
+  };
   return (
-    <div className="addusercontainer">
+    <div className="max-h-[300px] md:max-h-[400px] overflow-y-scroll p-[10px]">
       <div className="form-wrapper">
         <form onSubmit={handleSubmit}>
           <div>
@@ -128,6 +157,57 @@ const EditTemplate = ({ template, onSuccess }) => {
               <div style={{ fontSize: 12 }}>No</div>
             </div>
           </div>
+          <div className="text-xs mt-2">
+            {!isEnableSubscription && (
+              <PremiumAlertHeader
+                message={
+                  "Disable Auto reminder is free in beta, this feature will incur a fee later."
+                }
+              />
+            )}
+            <span
+              className={
+                isSubscribe || !isEnableSubscription
+                  ? "font-semibold"
+                  : "font-semibold text-gray-300"
+              }
+            >
+              Auto reminder{"  "}
+              {!isSubscribe && isEnableSubscription && <Upgrade />}
+            </span>
+            <label
+              className={`${
+                isSubscribe || !isEnableSubscription
+                  ? "cursor-pointer "
+                  : "pointer-events-none opacity-50"
+              } relative block items-center mb-0`}
+            >
+              <input
+                checked={formData.AutomaticReminders}
+                onChange={handleAutoReminder}
+                type="checkbox"
+                value=""
+                className="sr-only peer"
+              />
+              <div className="w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-1 peer-focus:ring-black rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-black peer-checked:bg-blue-600 mt-2"></div>
+            </label>
+          </div>
+          {isSubscribe && formData?.AutomaticReminders === true && (
+            <div className="text-xs mt-2">
+              <label className="block">
+                Remind once in every (Days)
+                <span className="text-red-500 text-[13px]">*</span>
+              </label>
+              <input
+                type="number"
+                value={formData.RemindOnceInEvery}
+                name="RemindOnceInEvery"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                onChange={handleStrInput}
+                required
+              />
+            </div>
+          )}
           {/* <SelectFolder onSuccess={handleFolder} folderCls={"contracts_Template"} /> */}
           <div className="buttoncontainer">
             <button type="submit" className="submitbutton">

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

@@ -10,7 +10,6 @@ import loader from "../../assets/images/loader2.gif";
 function EmailComponent({
   isEmail,
   pdfUrl,
-  isCeleb,
   setIsEmail,
   setSuccessEmail,
   pdfName,
@@ -22,6 +21,7 @@ function EmailComponent({
   const [emailList, setEmailList] = useState([]);
   const [emailValue, setEmailValue] = useState();
   const [isLoading, setIsLoading] = useState(false);
+  const [isEmailCelebration, setIsEmailCelebration] = useState(false);
   //function for send email
   const sendEmail = async () => {
     setIsLoading(true);
@@ -62,6 +62,10 @@ function EmailComponent({
             " target=_blank>here</a> </p></div></div></body></html>"
         };
         sendMail = await axios.post(url, params, { headers: headers });
+        setIsEmailCelebration(true);
+        setTimeout(() => {
+          setIsEmailCelebration(false);
+        }, 3000);
       } catch (error) {
         console.log("error", error);
         setIsLoading(false);
@@ -245,22 +249,17 @@ function EmailComponent({
               </div>
             </div>
             <div style={{ height: "100%", padding: 20 }}>
-              {isCeleb && (
-                <div
-                  style={{
-                    position: "absolute",
-                    marginLeft: "50px"
-                  }}
-                >
+              {isEmailCelebration && (
+                <div className="absolute w-[100%] flex justify-center items-center">
                   <img
                     alt="print img"
                     width={300}
                     height={250}
-                    // style={styles.gifCeleb}
                     src={celebration}
                   />
                 </div>
               )}
+
               <p
                 style={{
                   fontFamily: "system-ui",

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

@@ -1,15 +1,15 @@
 import React, { useState } from "react";
 import PrevNext from "./PrevNext";
-import printModule from "print-js";
-import { getBase64FromUrl } from "../../constant/Utils";
-import { saveAs } from "file-saver";
+import {
+  handleDownloadCertificate,
+  handleDownloadPdf,
+  handleToPrint
+} from "../../constant/Utils";
 import "../../styles/signature.css";
 import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { useNavigate } from "react-router-dom";
 import { themeColor } from "../../constant/const";
-import axios from "axios";
 import ModalUi from "../../primitives/ModalUi";
-import { appInfo } from "../../constant/appinfo";
 
 function Header({
   isPdfRequestFiles,
@@ -40,7 +40,7 @@ function Header({
     signerPos && signerPos?.filter((data) => data.Role !== "prefill");
   const isMobile = window.innerWidth < 767;
   const navigate = useNavigate();
-  const [isCertificate, setIsCertificate] = useState(false);
+  const [isDownloading, setIsDownloading] = useState("");
   const isGuestSigner = localStorage.getItem("isGuestSigner");
   //for go to previous page
   function previousPage() {
@@ -59,123 +59,6 @@ function Header({
     setIsDecline(currentDecline);
   };
 
-  //function for print digital sign pdf
-  const handleToPrint = async (event) => {
-    event.preventDefault();
-
-    try {
-      // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
-      const axiosRes = await axios.post(
-        `${appInfo.baseUrl}/functions/getsignedurl`,
-        { url: pdfUrl },
-        {
-          headers: {
-            "content-type": "Application/json",
-            "X-Parse-Application-Id": appInfo.appId,
-            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-          }
-        }
-      );
-      const url = axiosRes.data.result;
-      const pdf = await getBase64FromUrl(url);
-      const isAndroidDevice = navigator.userAgent.match(/Android/i);
-      const isAppleDevice =
-        (/iPad|iPhone|iPod/.test(navigator.platform) ||
-          (navigator.platform === "MacIntel" &&
-            navigator.maxTouchPoints > 1)) &&
-        !window.MSStream;
-      if (isAndroidDevice || isAppleDevice) {
-        const byteArray = Uint8Array.from(
-          atob(pdf)
-            .split("")
-            .map((char) => char.charCodeAt(0))
-        );
-        const blob = new Blob([byteArray], { type: "application/pdf" });
-        const blobUrl = URL.createObjectURL(blob);
-        window.open(blobUrl, "_blank");
-      } else {
-        printModule({ printable: pdf, type: "pdf", base64: true });
-      }
-    } catch (err) {
-      console.log("err in getsignedurl", err);
-      alert("something went wrong, please try again later.");
-    }
-  };
-
-  //handle download signed pdf
-  const handleDownloadPdf = async () => {
-    const pdfName = pdfDetails[0] && pdfDetails[0].Name;
-    try {
-      // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
-      const axiosRes = await axios.post(
-        `${appInfo.baseUrl}/functions/getsignedurl`,
-        { url: pdfUrl },
-        {
-          headers: {
-            "content-type": "Application/json",
-            "X-Parse-Application-Id": appInfo.appId,
-            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-          }
-        }
-      );
-      const url = axiosRes.data.result;
-      saveAs(url, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
-    } catch (err) {
-      console.log("err in getsignedurl", err);
-      alert("something went wrong, please try again later.");
-    }
-  };
-
-  const sanitizeFileName = (pdfName) => {
-    // Replace spaces with underscore
-    return pdfName.replace(/ /g, "_");
-  };
-
-  //handle download signed pdf
-  const handleDownloadCertificate = async () => {
-    if (pdfDetails?.length > 0 && pdfDetails[0]?.CertificateUrl) {
-      try {
-        await fetch(pdfDetails[0] && pdfDetails[0]?.CertificateUrl);
-        const certificateUrl = pdfDetails[0] && pdfDetails[0]?.CertificateUrl;
-        saveAs(certificateUrl, `Certificate_signed_by_OpenSign™.pdf`);
-      } catch (err) {
-        console.log("err in download in certificate", err);
-      }
-    } else {
-      setIsCertificate(true);
-      try {
-        const data = {
-          docId: pdfDetails[0]?.objectId
-        };
-        const docDetails = await axios.post(
-          `${localStorage.getItem("baseUrl")}functions/getDocument`,
-          data,
-          {
-            headers: {
-              "Content-Type": "application/json",
-              "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-              sessionToken: localStorage.getItem("accesstoken")
-            }
-          }
-        );
-        if (docDetails.data && docDetails.data.result) {
-          const doc = docDetails.data.result;
-          if (doc?.CertificateUrl) {
-            await fetch(doc?.CertificateUrl);
-            const certificateUrl = doc?.CertificateUrl;
-            saveAs(certificateUrl, `Certificate_signed_by_OpenSign™.pdf`);
-            setIsCertificate(false);
-          } else {
-            setIsCertificate(true);
-          }
-        }
-      } catch (err) {
-        console.log("err in download in certificate", err);
-        alert("something went wrong, please try again later.");
-      }
-    }
-  };
-
   return (
     <div style={{ padding: "5px 0px 5px 0px" }} className="mobileHead">
       {isMobile && isShowHeader ? (
@@ -248,7 +131,9 @@ function Header({
                   >
                     <DropdownMenu.Item
                       className="DropdownMenuItem"
-                      onClick={() => handleDownloadPdf()}
+                      onClick={() =>
+                        handleDownloadPdf(pdfDetails, pdfUrl, setIsDownloading)
+                      }
                     >
                       <div
                         style={{
@@ -267,7 +152,12 @@ function Header({
                     {isCompleted && (
                       <DropdownMenu.Item
                         className="DropdownMenuItem"
-                        onClick={() => handleDownloadCertificate()}
+                        onClick={() =>
+                          handleDownloadCertificate(
+                            pdfDetails,
+                            setIsDownloading
+                          )
+                        }
                       >
                         <div
                           style={{
@@ -306,7 +196,9 @@ function Header({
                     )}
                     <DropdownMenu.Item
                       className="DropdownMenuItem"
-                      onClick={handleToPrint}
+                      onClick={(e) =>
+                        handleToPrint(e, pdfUrl, setIsDownloading)
+                      }
                     >
                       <div
                         style={{
@@ -326,24 +218,16 @@ function Header({
                 </DropdownMenu.Portal>
               </DropdownMenu.Root>
             ) : (
-              <div style={{ display: "flex", justifyContent: "space-around" }}>
+              <div className="flex justify-around items-center">
                 {/* current signer is checking user send request and check status of pdf sign than if current 
                 user exist than show finish button else no
                 */}
                 {currentSigner && (
-                  <>
+                  <div className="flex items-center" data-tut="reactourFifth">
                     {decline && (
                       <div
-                        onClick={() => {
-                          handleDeclinePdfAlert();
-                        }}
-                        style={{
-                          color: "red",
-                          border: "none",
-                          fontWeight: "650",
-                          fontSize: "16px",
-                          marginRight: "10px"
-                        }}
+                        onClick={() => handleDeclinePdfAlert()}
+                        className="text-[red] border-none font-[650] text-[14px] mr-2"
                       >
                         Decline
                       </div>
@@ -355,12 +239,8 @@ function Header({
                             alertSendEmail();
                           }
                         }}
-                        style={{
-                          color: isMailSend ? "gray" : themeColor,
-                          border: "none",
-                          fontWeight: "650",
-                          fontSize: "16px"
-                        }}
+                        className="border-none font-[650] text-[14px]"
+                        style={{ color: isMailSend ? "gray" : themeColor }}
                         data-tut={dataTut4}
                       >
                         {completeBtnTitle ? completeBtnTitle : "Send"}
@@ -375,17 +255,49 @@ function Header({
                             embedWidgetsData();
                           }
                         }}
-                        style={{
-                          color: themeColor,
-                          border: "none",
-                          fontWeight: "650",
-                          fontSize: "16px"
-                        }}
+                        style={{ color: themeColor }}
+                        className="border-none font-[650] text-[14px]"
                       >
                         Finish
                       </div>
                     )}
-                  </>
+                    <DropdownMenu.Root>
+                      <DropdownMenu.Trigger asChild>
+                        <div
+                          className="border-none font-[650] text-[18px] px-2 ml-[4px]"
+                          style={{ color: themeColor }}
+                        >
+                          <i
+                            className="fa fa-ellipsis-v"
+                            aria-hidden="true"
+                          ></i>
+                        </div>
+                      </DropdownMenu.Trigger>
+                      <DropdownMenu.Portal>
+                        <DropdownMenu.Content
+                          className="bg-white shadow-md rounded px-2 py-1"
+                          sideOffset={5}
+                        >
+                          <DropdownMenu.Item
+                            className="flex flex-row justify-center items-center text-[13px] focus:outline-none cursor-pointer"
+                            onClick={() =>
+                              handleDownloadPdf(
+                                pdfDetails,
+                                pdfUrl,
+                                setIsDownloading
+                              )
+                            }
+                          >
+                            <i
+                              className="fa fa-arrow-down mr-[5px]"
+                              aria-hidden="true"
+                            ></i>
+                            <span className="font-[500]">Download</span>
+                          </DropdownMenu.Item>
+                        </DropdownMenu.Content>
+                      </DropdownMenu.Portal>
+                    </DropdownMenu.Root>
+                  </div>
                 )}
               </div>
             )}
@@ -450,18 +362,20 @@ function Header({
                   {completeBtnTitle
                     ? completeBtnTitle
                     : isMailSend
-                    ? "Sent"
-                    : "Send"}
+                      ? "Sent"
+                      : "Send"}
                 </button>
               </div>
             </>
           ) : isPdfRequestFiles ? (
             alreadySign ? (
-              <div style={{ display: "flex", flexDirection: "row" }}>
+              <div className="flex flex-row">
                 {isCompleted && (
                   <button
                     type="button"
-                    onClick={() => handleDownloadCertificate()}
+                    onClick={() =>
+                      handleDownloadCertificate(pdfDetails, setIsDownloading)
+                    }
                     className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#08bc66]"
                   >
                     <i
@@ -473,7 +387,7 @@ function Header({
                 )}
 
                 <button
-                  onClick={handleToPrint}
+                  onClick={(e) => handleToPrint(e, pdfUrl, setIsDownloading)}
                   type="button"
                   className="flex flex-row items-center  shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#188ae2]"
                 >
@@ -484,14 +398,16 @@ function Header({
                 <button
                   type="button"
                   className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#f14343]"
-                  onClick={() => handleDownloadPdf()}
+                  onClick={() =>
+                    handleDownloadPdf(pdfDetails, pdfUrl, setIsDownloading)
+                  }
                 >
                   <i className="fa fa-download py-[3px]" aria-hidden="true"></i>
                   <span className="hidden lg:block ml-1">Download</span>
                 </button>
               </div>
             ) : (
-              <div className="flex">
+              <div className="flex" data-tut="reactourFifth">
                 <button
                   onClick={() => navigate(-1)}
                   type="button"
@@ -502,36 +418,66 @@ function Header({
                 {currentSigner && (
                   <>
                     <button
-                      style={{ background: "#de4337" }}
-                      className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[18px] text-white font-[500] text-[13px] mr-[5px] bg-[#f14343]"
-                      onClick={() => {
-                        handleDeclinePdfAlert();
-                      }}
+                      className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[18px] text-white font-[500] text-[13px] mr-[5px] bg-[#de4337]"
+                      onClick={() => handleDeclinePdfAlert()}
                     >
                       Decline
                     </button>
                     <button
-                      style={{
-                        background: "#188ae2"
-                      }}
                       type="button"
                       className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[18px] text-white font-[500] text-[13px] mr-[5px] bg-[#188ae2]"
-                      onClick={() => {
-                        embedWidgetsData();
-                      }}
+                      onClick={() => embedWidgetsData()}
                     >
                       Finish
                     </button>
+                    <DropdownMenu.Root>
+                      <DropdownMenu.Trigger asChild>
+                        <div
+                          className="border-none font-[650] text-[16px] py-[3px] px-[11px] shadow rounded bg-white"
+                          style={{ color: themeColor }}
+                        >
+                          <i
+                            className="fa fa-ellipsis-v"
+                            aria-hidden="true"
+                          ></i>
+                        </div>
+                      </DropdownMenu.Trigger>
+                      <DropdownMenu.Portal>
+                        <DropdownMenu.Content
+                          className="bg-white shadow-md rounded px-2 py-1"
+                          sideOffset={5}
+                        >
+                          <DropdownMenu.Item
+                            className="flex flex-row justify-center items-center text-[13px] focus:outline-none cursor-pointer"
+                            onClick={() =>
+                              handleDownloadPdf(
+                                pdfDetails,
+                                pdfUrl,
+                                setIsDownloading
+                              )
+                            }
+                          >
+                            <i
+                              className="fa fa-arrow-down mr-[5px]"
+                              aria-hidden="true"
+                            ></i>
+                            <span className="font-[500]">Download</span>
+                          </DropdownMenu.Item>
+                        </DropdownMenu.Content>
+                      </DropdownMenu.Portal>
+                    </DropdownMenu.Root>
                   </>
                 )}
               </div>
             )
           ) : isCompleted ? (
-            <div style={{ display: "flex", flexDirection: "row" }}>
+            <div className="flex flex-row">
               {isCompleted && (
                 <button
                   type="button"
-                  onClick={() => handleDownloadCertificate()}
+                  onClick={() =>
+                    handleDownloadCertificate(pdfDetails, setIsDownloading)
+                  }
                   className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#08bc66]"
                 >
                   <i
@@ -542,7 +488,7 @@ function Header({
                 </button>
               )}
               <button
-                onClick={handleToPrint}
+                onClick={(e) => handleToPrint(e, pdfUrl, setIsDownloading)}
                 type="button"
                 className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#188ae2]"
               >
@@ -552,7 +498,9 @@ function Header({
               <button
                 type="button"
                 className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#f14343]"
-                onClick={() => handleDownloadPdf()}
+                onClick={() =>
+                  handleDownloadPdf(pdfDetails, pdfUrl, setIsDownloading)
+                }
               >
                 <i className="fa fa-download py-[3px]" aria-hidden="true"></i>
                 <span className="hidden lg:block ml-1">Download</span>
@@ -578,9 +526,6 @@ function Header({
                 Back
               </button>
               <button
-                style={{
-                  background: "#188ae2"
-                }}
                 type="button"
                 className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[18px] text-white font-[500] text-[13px] mr-[5px] bg-[#188ae2]"
                 onClick={() => {
@@ -595,12 +540,25 @@ function Header({
           )}
         </div>
       )}
+      {isDownloading === "pdf" && (
+        <div className="fixed z-[200] inset-0 flex justify-center items-center bg-black bg-opacity-30">
+          <div
+            style={{ fontSize: "45px", color: "#3dd3e0" }}
+            className="loader-37"
+          ></div>
+        </div>
+      )}
       <ModalUi
-        isOpen={isCertificate}
-        title={"Generating certificate"}
-        handleClose={() => setIsCertificate(false)}
+        isOpen={isDownloading === "certificate"}
+        title={
+          isDownloading === "certificate"
+            ? "Generating certificate"
+            : "PDF Download"
+        }
+        handleClose={() => setIsDownloading("")}
       >
         <div className="p-3 md:p-5 text-[13px] md:text-base text-center">
+          {isDownloading === "certificate"}{" "}
           <p>
             Your completion certificate is being generated. Please wait
             momentarily.

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import RSC from "react-scrollbars-custom";
 import { Document, Page } from "react-pdf";
 import { themeColor } from "../../constant/const";
@@ -9,13 +9,54 @@ function RenderAllPdfPage({
   setAllPages,
   setPageNumber,
   setSignBtnPosition,
-  pageNumber
+  pageNumber,
+  signerPos,
+  signerObjectId
 }) {
+  const [signPageNumber, setSignPageNumber] = useState([]);
+  const [bookmarkColor, setBookmarkColor] = useState("");
   //set all number of pages after load pdf
   function onDocumentLoad({ numPages }) {
     setAllPages(numPages);
+    //check if signerPos array exist then save page number exist in signerPos array to show bookmark icon
+    if (signerPos) {
+      const checkUser = signerPos.filter(
+        (data) => data.signerObjId === signerObjectId
+      );
+      setBookmarkColor(checkUser[0]?.blockColor);
+      let pageNumberArr = [];
+      if (checkUser?.length > 0) {
+        checkUser[0]?.placeHolder?.map((data) => {
+          pageNumberArr.push(data?.pageNumber);
+        });
+
+        setSignPageNumber(pageNumberArr);
+      }
+    }
   }
 
+  //'function `addSignatureBookmark` is used to display the page where the user's signature is located.
+  const addSignatureBookmark = (index) => {
+    const ispageNumber = signPageNumber.includes(index + 1);
+    return (
+      ispageNumber && (
+        <div
+          style={{
+            position: "absolute",
+            zIndex: 2,
+            top: -12,
+            right: -7,
+            transform: "translate(50% -50%)"
+          }}
+        >
+          <i
+            style={{ color: bookmarkColor || "red" }}
+            className="fa-solid fa-bookmark"
+          ></i>
+        </div>
+      )
+    );
+  };
   return (
     <div className="showPages">
       <div
@@ -66,7 +107,8 @@ function RenderAllPdfPage({
                       display: "flex",
                       justifyContent: "center",
                       alignItems: "center",
-                      contain: "content"
+
+                      position: "relative"
                     }}
                     onClick={() => {
                       setPageNumber(index + 1);
@@ -75,15 +117,25 @@ function RenderAllPdfPage({
                       }
                     }}
                   >
-                    <Page
-                      key={`page_${index + 1}`}
-                      pageNumber={index + 1}
-                      width={100}
-                      height={100}
-                      scale={1}
-                      renderAnnotationLayer={false}
-                      renderTextLayer={false}
-                    />
+                    {signerPos && addSignatureBookmark(index)}
+
+                    <div
+                      style={{
+                        position: "relative",
+                        zIndex: 1,
+                        overflow: "hidden"
+                      }}
+                    >
+                      <Page
+                        key={`page_${index + 1}`}
+                        pageNumber={index + 1}
+                        width={100}
+                        height={100}
+                        scale={1}
+                        renderAnnotationLayer={false}
+                        renderTextLayer={false}
+                      />
+                    </div>
                   </div>
                 ))}
               </Document>

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

@@ -204,34 +204,34 @@ function RenderPdf({
   };
   //function for render placeholder block over pdf document
   const checkSignedSignes = (data) => {
-    const checkSign = signedSigners.filter(
-      (sign) => sign.objectId === data.signerObjId
+    let checkSign = [];
+    //condition to handle quick send flow and using normal request sign flow
+    checkSign = signedSigners.filter(
+      (sign) => sign?.Id === data?.Id || sign?.objectId === data?.signerObjId
     );
     if (data.signerObjId === signerObjectId) {
       setCurrentSigner(true);
     }
     const handleAllUserName = (Id, Role, type) => {
-      return pdfDetails[0].Signers.map((signerData, key) => {
-        return (
-          signerData.objectId === data.signerObjId && (
-            <React.Fragment key={key}>
-              {signerData?.Name && (
-                <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
-                  {signerData.Name}
-                </div>
-              )}
-              {type && (
-                <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
-              )}
-              {Role && (
-                <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
-                  {`(${Role})`}
-                </div>
-              )}
-            </React.Fragment>
-          )
-        );
-      });
+      return (
+        <React.Fragment>
+          <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+            {
+              pdfDetails[0].Signers?.find(
+                (signer) => signer.objectId === data.signerObjId
+              )?.Name
+            }
+          </div>
+          {type && (
+            <div style={{ fontWeight: "700", fontSize: 11 }}>{type}</div>
+          )}
+          {Role && (
+            <div style={{ color: "black", fontSize: 8, fontWeight: "500" }}>
+              {`(${Role})`}
+            </div>
+          )}
+        </React.Fragment>
+      );
     };
 
     return (
@@ -334,6 +334,7 @@ function RenderPdf({
       {successEmail && <Alert type={"success"}>Email sent successfully!</Alert>}
       {isMobile && scale ? (
         <div
+          data-tut="reactourForth"
           style={{
             border: "0.1px solid #ebe8e8",
             marginTop: isGuestSigner && "30px"
@@ -517,6 +518,7 @@ function RenderPdf({
           noScrollX={pdfNewWidth < pdfOriginalWidth ? false : true}
         >
           <div
+            data-tut="reactourForth"
             style={{
               border: "0.1px solid #ebe8e8",
               width: pdfOriginalWidth

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

@@ -6,6 +6,7 @@ import { textInputWidget } from "../../constant/Utils";
 import PremiumAlertHeader from "../../primitives/PremiumAlertHeader";
 import Upgrade from "../../primitives/Upgrade";
 import { isEnableSubscription } from "../../constant/const";
+import Tooltip from "../../primitives/Tooltip";
 
 const WidgetNameModal = (props) => {
   const [formdata, setFormdata] = useState({
@@ -140,16 +141,21 @@ const WidgetNameModal = (props) => {
           props.widgetName === textInputWidget) && (
           <>
             <div className="form-section">
-              <label
-                htmlFor="textvalidate"
-                className={
-                  !props.isSubscribe && isEnableSubscription && "disabled"
-                }
-                style={{ fontSize: 13 }}
-              >
-                Validation
-              </label>
-              {!props.isSubscribe && isEnableSubscription && <Upgrade />}
+              <div className="flex items-center gap-1">
+                <label
+                  htmlFor="textvalidate"
+                  className={
+                    !props.isSubscribe && isEnableSubscription && "disabled"
+                  }
+                  style={{ fontSize: 13 }}
+                >
+                  Validation
+                </label>
+                <Tooltip
+                  url={"https://www.w3schools.com/jsref/jsref_obj_regexp.asp"}
+                />
+                {!props.isSubscribe && isEnableSubscription && <Upgrade />}
+              </div>
               <div
                 className={
                   !props.isSubscribe && isEnableSubscription && "disabled"
@@ -165,7 +171,7 @@ const WidgetNameModal = (props) => {
                   <input
                     className="relative z-20 w-[87%] md:w-[92%] p-2.5 border-[1px] border-[#d1d5db] rounded-l-md outline-none text-xs"
                     name="textvalidate"
-                    placeholder="Enter custom expression"
+                    placeholder="Enter custom regular expression"
                     value={formdata.textvalidate}
                     onChange={(e) => handleChange(e)}
                     // onBlur={() => handleBlurRegex()}

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

@@ -25,9 +25,11 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
       if (parentFolderId) {
         FolderQuery.equalTo("Folder", folderPtr);
         FolderQuery.equalTo("Type", "Folder");
+        FolderQuery.notEqualTo("IsArchive", true);
       } else {
         FolderQuery.doesNotExist("Folder");
         FolderQuery.equalTo("Type", "Folder");
+        FolderQuery.notEqualTo("IsArchive", true);
       }
 
       const res = await FolderQuery.find();
@@ -49,6 +51,7 @@ const CreateFolder = ({ parentFolderId, onSuccess, folderCls }) => {
       const exsitQuery = new Parse.Query(folderCls);
       exsitQuery.equalTo("Name", name);
       exsitQuery.equalTo("Type", "Folder");
+      exsitQuery.notEqualTo("IsArchive", true);
       if (parentFolderId) {
         exsitQuery.equalTo("Folder", folderPtr);
       }

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

@@ -25,9 +25,11 @@ const FolderModal = (props) => {
       if (folderPtr) {
         FolderQuery.equalTo("Folder", folderPtr);
         FolderQuery.equalTo("Type", "Folder");
+        FolderQuery.notEqualTo("IsArchive", true);
       } else {
         FolderQuery.doesNotExist("Folder");
         FolderQuery.equalTo("Type", "Folder");
+        FolderQuery.notEqualTo("IsArchive", true);
       }
 
       const res = await FolderQuery.find();

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

@@ -45,9 +45,11 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
       if (folderPtr) {
         FolderQuery.equalTo("Folder", folderPtr);
         FolderQuery.equalTo("Type", "Folder");
+        FolderQuery.notEqualTo("IsArchive", true);
       } else {
         FolderQuery.doesNotExist("Folder");
         FolderQuery.equalTo("Type", "Folder");
+        FolderQuery.notEqualTo("IsArchive", true);
       }
 
       const res = await FolderQuery.find();
@@ -169,32 +171,40 @@ const SelectFolder = ({ required, onSuccess, folderCls, isReset }) => {
           {required && <span className="text-red-500 text-[13px]">*</span>}
         </label>
       </div>
-      <div className="relative rounded px-[20px] py-[20px] bg-white border border-gray-200 shadow flex max-w-sm gap-8 items-center">
-        <div>
-          <i
-            className="far fa-folder-open text-[40px] text-[#33bbff]"
-            style={{ fontSize: "40px" }}
-            aria-hidden="true"
-          ></i>
-        </div>
-        <div className="font-semibold ">
-          <div className="flex items-center gap-2">
-            <p>
-              {selectFolder && selectFolder.Name
-                ? selectFolder.Name
-                : "OpenSign™ Drive"}
-            </p>
-            <div className="text-black text-sm" onClick={() => SetIsOpen(true)}>
-              <i
-                className="fa fa-pencil"
-                title="Select Folder"
-                aria-hidden="true"
-              ></i>
-            </div>
+      <div className="relative max-w-sm">
+        <div
+          onClick={() => SetIsOpen(true)}
+          className=" cursor-pointer rounded px-[20px] py-[20px] bg-white border border-gray-200 shadow flex max-w-sm gap-8 items-center"
+        >
+          <div>
+            <i
+              className="far fa-folder-open text-[40px] text-[#33bbff]"
+              style={{ fontSize: "40px" }}
+              aria-hidden="true"
+            ></i>
+          </div>
+          <div className="font-semibold ">
+            <div className="flex items-center gap-2">
+              <p>
+                {selectFolder && selectFolder.Name
+                  ? selectFolder.Name
+                  : "OpenSign™ Drive"}
+              </p>
+              <div
+                className="text-black text-sm"
+                // onClick={() => SetIsOpen(true)}
+              >
+                <i
+                  className="fa fa-pencil cursor-pointer"
+                  title="Select Folder"
+                  aria-hidden="true"
+                ></i>
+              </div>
+            </div>
+            <p className="text-[10px] text-gray-400">
+              {selectFolder && selectFolder.Name ? `(${folderPath})` : ""}
+            </p>
           </div>
-          <p className="text-[10px] text-gray-400">
-            {selectFolder && selectFolder.Name ? `(${folderPath})` : ""}
-          </p>
         </div>
         <div className="absolute top-2 right-1 cursor-pointer">
           <Tooltip

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

@@ -0,0 +1,92 @@
+import React, { useState, useEffect, useRef } from "react";
+import { findContact } from "../../../constant/Utils";
+const SuggestionInput = (props) => {
+  const [inputValue, setInputValue] = useState(props?.value || "");
+  const [suggestions, setSuggestions] = useState([]);
+  const [showSuggestions, setShowSuggestions] = useState(false);
+  const ref = useRef(null);
+
+  useEffect(() => {
+    document.addEventListener("mousedown", Clickout);
+    return () => {
+      document.removeEventListener("mousedown", Clickout);
+    };
+  }, []);
+
+  const Clickout = (event) => {
+    if (ref.current && !ref.current.contains(event.target)) {
+      setShowSuggestions(false);
+    }
+  };
+  // create debounce to avoid unnecessay api calls
+  useEffect(() => {
+    let timer;
+    if (inputValue) {
+      if (timer) clearTimeout(timer);
+      timer = setTimeout(() => {
+        (async () => {
+          const res = await findContact(inputValue);
+          if (res?.length > 0) {
+            setSuggestions(res);
+            setShowSuggestions(true);
+          } else {
+            setSuggestions(res);
+            setShowSuggestions(false);
+          }
+        })();
+      }, 1000);
+    }
+    return () => clearTimeout(timer);
+  }, [inputValue]);
+
+  const handleInputChange = async (e) => {
+    const value = e.target.value;
+    setInputValue(value?.toLowerCase());
+    if (props.onChange) {
+      props.onChange(value);
+    }
+
+    if (value.trim() === "") {
+      setSuggestions([]);
+      setShowSuggestions(false);
+      return;
+    }
+  };
+  const handleSuggestionClick = (suggestion) => {
+    setInputValue(suggestion.Email);
+    setSuggestions([]);
+    setShowSuggestions(false);
+    if (props.onChange) {
+      props.onChange(suggestion);
+    }
+  };
+  return (
+    <div className="flex flex-col items-center relative">
+      <input
+        type={props?.type || "text"}
+        value={inputValue}
+        onChange={handleInputChange}
+        placeholder="Enter Email..."
+        className="w-full border-[1px] border-gray-400 p-2 text-black rounded lowercase"
+        required={props.required}
+      />
+      {showSuggestions && (
+        <ul
+          ref={ref}
+          className="absolute z-50 left-0 top-[2.55rem] w-full max-h-[100px] overflow-auto bg-white border border-gray-300 rounded shadow-md"
+        >
+          {suggestions.map((suggestion, index) => (
+            <li
+              key={index}
+              className="py-2 px-2 w-full text-sm cursor-pointer hover:bg-gray-100"
+              onClick={() => handleSuggestionClick(suggestion)}
+            >
+              {suggestion.Email}
+            </li>
+          ))}
+        </ul>
+      )}
+    </div>
+  );
+};
+export default SuggestionInput;

apps/OpenSign/src/components/sidebar/Menu.js

@@ -10,7 +10,11 @@ const Menu = ({ item, isOpen, closeSidebar }) => {
             ? `/${item.pageType}/${item.objectId}`
             : `/${item.objectId}`
         }
-        className="mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 cursor-pointer  focus:text-[#0056b3] focus:bg-[#eef1f5]"
+        className={({ isActive }) =>
+          `${
+            isActive ? "text-[#0056b3] bg-[#eef1f5]" : ""
+          } mx-auto flex items-center hover:bg-[#eef1f5] p-3 lg:p-4 cursor-pointer`
+        }
         onClick={closeSidebar}
         tabIndex={isOpen ? 0 : -1}
         role="menuitem"

apps/OpenSign/src/constant/Utils.js

@@ -4,13 +4,20 @@ import { isEnableSubscription, themeColor } from "./const";
 import React from "react";
 import { rgb } from "pdf-lib";
 import Parse from "parse";
+import { appInfo } from "./appinfo";
+import { saveAs } from "file-saver";
+import printModule from "print-js";
 
 export const isMobile = window.innerWidth < 767;
 export const textInputWidget = "text input";
 export const textWidget = "text";
 export const radioButtonWidget = "radio button";
-export const openInNewTab = (url) => {
-  window.open(url, "_blank", "noopener,noreferrer");
+export const openInNewTab = (url, target) => {
+  if (target) {
+    window.open(url, target, "noopener,noreferrer");
+  } else {
+    window.open(url, "_blank", "noopener,noreferrer");
+  }
 };
 
 export async function fetchSubscription(
@@ -19,11 +26,12 @@ export async function fetchSubscription(
   isGuestSign = false
 ) {
   try {
-    const extClass = localStorage.getItem("Extand_Class");
+    const Extand_Class = localStorage.getItem("Extand_Class");
+    const extClass = Extand_Class && JSON.parse(Extand_Class);
+    // console.log("extClass ", extClass);
     let extUser;
-    if (extClass) {
-      const jsonSender = JSON.parse(extClass);
-      extUser = jsonSender[0].objectId;
+    if (extClass && extClass.length > 0) {
+      extUser = extClass[0].objectId;
     } else {
       extUser = extUserId;
     }
@@ -171,11 +179,10 @@ export const contractUsers = async (email) => {
     .then((Listdata) => {
       const json = Listdata.data;
       let data = [];
-
       if (json && json.result) {
         data.push(json.result);
-        return data;
       }
+      return data;
     })
     .catch((err) => {
       console.log("Err ", err);
@@ -561,18 +568,18 @@ export const signPdfFun = async (
         isCustomCompletionMail = true;
       }
     }
-    
+
     // below for loop is used to get first signature of user to send if to signpdf
     // for adding it in completion certificate
     let getSignature;
     for (let item of xyPosition) {
-      const typeExist = item.pos.some((data) => data?.type);
-      if (typeExist) {
-        getSignature = item.pos.find((data) => data?.type === "signature");
-        break;
-      } else {
-        getSignature = item.pos.find((data) => !data.isStamp);
-        break;
+      if (!getSignature) {
+        const typeExist = item.pos.some((data) => data?.type);
+        if (typeExist) {
+          getSignature = item.pos.find((data) => data?.type === "signature");
+        } else {
+          getSignature = item.pos.find((data) => !data.isStamp);
+        }
       }
     }
 
@@ -662,6 +669,7 @@ export const createDocument = async (template, placeholders, signerData) => {
       Name: Doc.Name,
       URL: Doc.URL,
       SignedUrl: Doc.SignedUrl,
+      SentToOthers: Doc.SentToOthers,
       Description: Doc.Description,
       Note: Doc.Note,
       Placeholders: placeholdersArr,
@@ -676,7 +684,9 @@ export const createDocument = async (template, placeholders, signerData) => {
         objectId: Doc.CreatedBy.objectId
       },
       Signers: signers,
-      SendinOrder: Doc?.SendinOrder || false
+      SendinOrder: Doc?.SendinOrder || false,
+      AutomaticReminders: Doc?.AutomaticReminders || false,
+      RemindOnceInEvery: parseInt(Doc?.RemindOnceInEvery || 5)
     };
 
     try {
@@ -1349,8 +1359,8 @@ export const multiSignEmbed = async (
           position.type === radioButtonWidget
             ? 10
             : position.type === "checkbox"
-            ? 10
-            : newUpdateHeight;
+              ? 10
+              : newUpdateHeight;
         const newHeight = ind ? (ind > 0 ? widgetHeight : 0) : widgetHeight;
 
         if (signyourself) {
@@ -2028,3 +2038,150 @@ export const handleSendOTP = async (email) => {
     alert(error.message);
   }
 };
+//handle download signed pdf
+export const handleDownloadPdf = async (
+  pdfDetails,
+  pdfUrl,
+  setIsDownloading
+) => {
+  const pdfName = pdfDetails[0] && pdfDetails[0].Name;
+  setIsDownloading("pdf");
+  try {
+    // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
+    const axiosRes = await axios.post(
+      `${appInfo.baseUrl}/functions/getsignedurl`,
+      { url: pdfUrl },
+      {
+        headers: {
+          "content-type": "Application/json",
+          "X-Parse-Application-Id": appInfo.appId,
+          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+        }
+      }
+    );
+    const url = axiosRes.data.result;
+    saveAs(url, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.pdf`);
+    setIsDownloading("");
+  } catch (err) {
+    console.log("err in getsignedurl", err);
+    setIsDownloading("");
+    alert("something went wrong, please try again later.");
+  }
+};
+
+export const sanitizeFileName = (pdfName) => {
+  // Replace spaces with underscore
+  return pdfName.replace(/ /g, "_");
+};
+//function for print digital sign pdf
+export const handleToPrint = async (event, pdfUrl, setIsDownloading) => {
+  event.preventDefault();
+  setIsDownloading("pdf");
+  try {
+    // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
+    const axiosRes = await axios.post(
+      `${appInfo.baseUrl}/functions/getsignedurl`,
+      { url: pdfUrl },
+      {
+        headers: {
+          "content-type": "Application/json",
+          "X-Parse-Application-Id": appInfo.appId,
+          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+        }
+      }
+    );
+    const url = axiosRes.data.result;
+    const pdf = await getBase64FromUrl(url);
+    const isAndroidDevice = navigator.userAgent.match(/Android/i);
+    const isAppleDevice =
+      (/iPad|iPhone|iPod/.test(navigator.platform) ||
+        (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)) &&
+      !window.MSStream;
+    if (isAndroidDevice || isAppleDevice) {
+      const byteArray = Uint8Array.from(
+        atob(pdf)
+          .split("")
+          .map((char) => char.charCodeAt(0))
+      );
+      const blob = new Blob([byteArray], { type: "application/pdf" });
+      const blobUrl = URL.createObjectURL(blob);
+      window.open(blobUrl, "_blank");
+      setIsDownloading("");
+    } else {
+      printModule({ printable: pdf, type: "pdf", base64: true });
+      setIsDownloading("");
+    }
+  } catch (err) {
+    setIsDownloading("");
+    console.log("err in getsignedurl", err);
+    alert("something went wrong, please try again later.");
+  }
+};
+
+//handle download signed pdf
+export const handleDownloadCertificate = async (
+  pdfDetails,
+  setIsDownloading
+) => {
+  if (pdfDetails?.length > 0 && pdfDetails[0]?.CertificateUrl) {
+    try {
+      await fetch(pdfDetails[0] && pdfDetails[0]?.CertificateUrl);
+      const certificateUrl = pdfDetails[0] && pdfDetails[0]?.CertificateUrl;
+      saveAs(certificateUrl, `Certificate_signed_by_OpenSign™.pdf`);
+    } catch (err) {
+      console.log("err in download in certificate", err);
+    }
+  } else {
+    setIsDownloading("certificate");
+    try {
+      const data = {
+        docId: pdfDetails[0]?.objectId
+      };
+      const docDetails = await axios.post(
+        `${localStorage.getItem("baseUrl")}functions/getDocument`,
+        data,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            sessionToken: localStorage.getItem("accesstoken")
+          }
+        }
+      );
+      if (docDetails.data && docDetails.data.result) {
+        const doc = docDetails.data.result;
+        if (doc?.CertificateUrl) {
+          await fetch(doc?.CertificateUrl);
+          const certificateUrl = doc?.CertificateUrl;
+          saveAs(certificateUrl, `Certificate_signed_by_OpenSign™.pdf`);
+          setIsDownloading("");
+        } else {
+          setIsDownloading("certificate");
+        }
+      }
+    } catch (err) {
+      console.log("err in download in certificate", err);
+      alert("something went wrong, please try again later.");
+    }
+  }
+};
+export async function findContact(value) {
+  try {
+    const currentUser = Parse.User.current();
+    const contactbook = new Parse.Query("contracts_Contactbook");
+    contactbook.equalTo(
+      "CreatedBy",
+      Parse.User.createWithoutData(currentUser.id)
+    );
+    contactbook.notEqualTo("IsDeleted", true);
+    contactbook.matches("Email", new RegExp(value, "i"));
+
+    const contactRes = await contactbook.find();
+    if (contactRes) {
+      const res = JSON.parse(JSON.stringify(contactRes));
+      return res;
+    }
+  } catch (error) {
+    console.error("Error fetching suggestions:", error);
+  }
+}

apps/OpenSign/src/json/ReportJson.js

@@ -3,7 +3,7 @@ export default function reportJson(id) {
   const head = ["Sr.No", "Title", "Note", "Folder", "File", "Owner", "Signers"];
   const contactbook = ["Sr.No", "Title", "Email", "Phone"];
   const dashboardReportHead = ["Title", "File", "Owner", "Signers"];
-
+  const templateReport = ["Sr.No", "Title", "File", "Owner", "Signers"];
   switch (id) {
     // draft documents report
     case "ByHuevtCFY":
@@ -85,6 +85,14 @@ export default function reportJson(id) {
             btnIcon: "fa-solid fa-ellipsis-vertical fa-lg",
             action: "option",
             subaction: [
+              {
+                btnId: "1630",
+                btnLabel: "Resend",
+                hoverLabel: "Resend",
+                btnIcon: "fa-solid fa-envelope",
+                redirectUrl: "",
+                action: "resend"
+              },
               {
                 btnId: "1688",
                 btnLabel: "Revoke",
@@ -223,6 +231,14 @@ export default function reportJson(id) {
             btnIcon: "fa-solid fa-ellipsis-vertical fa-lg",
             action: "option",
             subaction: [
+              {
+                btnId: "1631",
+                btnLabel: "Resend",
+                hoverLabel: "Resend",
+                btnIcon: "fa-solid fa-envelope",
+                redirectUrl: "",
+                action: "resend"
+              },
               {
                 btnId: "6788",
                 btnLabel: "Revoke",
@@ -310,7 +326,7 @@ export default function reportJson(id) {
     case "6TeaPr321t":
       return {
         reportName: "Templates",
-        heading: head,
+        heading: templateReport,
         actions: [
           {
             btnId: "2234",
@@ -325,6 +341,17 @@ export default function reportJson(id) {
             message:
               "Click the 'Use' button to create a new document from an existing template. "
           },
+          {
+            btnId: "1631",
+            btnLabel: "Quick send",
+            hoverLabel: "Quick send",
+            btnIcon: "fa-solid fa-envelope",
+            redirectUrl: "",
+            action: "bulksend",
+            selector: "tourbulksend",
+            message:
+              "To quickly create and send multiple documents using an existing template, click the 'Quick Send' button."
+          },
           {
             btnId: "2234",
             hoverLabel: "option",

apps/OpenSign/src/json/plansArr.js

@@ -52,7 +52,8 @@ const plans = [
       "API Access",
       "100 API signatures included",
       "DocumentId removal from signed docs",
-      "Custom email templates"
+      "Custom email templates",
+      "Auto reminders"
     ]
   },
   {

apps/OpenSign/src/layout/HomeLayout.js

@@ -28,29 +28,34 @@ const HomeLayout = () => {
   const [tourConfigs, setTourConfigs] = useState([]);
   const [, setCookie] = useCookies(["accesstoken", "main_Domain"]);
 
+  const tenantId = localStorage.getItem("TenantId");
   useEffect(() => {
-    (async () => {
-      try {
-        // Use the session token to validate the user
-        const userQuery = new Parse.Query(Parse.User);
-        const user = await userQuery.get(Parse.User.current().id, {
-          sessionToken: localStorage.getItem("accesstoken")
-        });
-        if (user) {
-          localStorage.setItem("profileImg", user.get("ProfilePic") || "");
-          checkIsSubscribed();
-        } else {
+    if (!tenantId) {
+      setIsUserValid(false);
+    } else {
+      (async () => {
+        try {
+          // Use the session token to validate the user
+          const userQuery = new Parse.Query(Parse.User);
+          const user = await userQuery.get(Parse.User.current().id, {
+            sessionToken: localStorage.getItem("accesstoken")
+          });
+          if (user) {
+            localStorage.setItem("profileImg", user.get("ProfilePic") || "");
+            checkIsSubscribed();
+          } else {
+            setIsUserValid(false);
+          }
+        } catch (error) {
+          // Session token is invalid or there was an error
           setIsUserValid(false);
         }
-      } catch (error) {
-        // Session token is invalid or there was an error
-        setIsUserValid(false);
-      }
-    })();
-    saveCookies();
+      })();
+      saveCookies();
+    }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [tenantId]);
   //function to use save data in cookies storage
   const saveCookies = () => {
     const main_Domain = window.location.origin;

apps/OpenSign/src/pages/Dashboard.js

@@ -24,7 +24,7 @@ const Dashboard = () => {
         getDashboard(localStorage.getItem("PageLanding"));
       }
     } else {
-      navigate("/", { replace: true, state: { from: location } });
+      navigate("/", { replace: true, state: { from: "" } });
     }
     // eslint-disable-next-line
   }, [id]);

apps/OpenSign/src/pages/ForgetPassword.js

@@ -108,7 +108,7 @@ function ForgotPassword() {
                   </button>
                   <NavLink
                     to="/"
-                    className="rounded-sm bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] px-4 py-3 text-xs font-semibold shadow uppercase"
+                    className="rounded-sm bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] px-4 py-3 text-xs font-semibold shadow uppercase cursor-pointer"
                   >
                     Login
                   </NavLink>

apps/OpenSign/src/pages/Form.js

@@ -11,11 +11,14 @@ import SignersInput from "../components/shared/fields/SignersInput";
 import Title from "../components/Title";
 import PageNotFound from "./PageNotFound";
 import { SaveFileSize } from "../constant/saveFileSize";
-import { getFileName, toDataUrl } from "../constant/Utils";
+import { checkIsSubscribed, getFileName, toDataUrl } from "../constant/Utils";
 import { PDFDocument } from "pdf-lib";
 import axios from "axios";
 import { isEnableSubscription, submitBtn } from "../constant/const";
 import ModalUi from "../primitives/ModalUi";
+import { Tooltip } from "react-tooltip";
+import Upgrade from "../primitives/Upgrade";
+import PremiumAlertHeader from "../primitives/PremiumAlertHeader";
 
 // `Form` render all type of Form on this basis of their provided in path
 function Form() {
@@ -47,7 +50,9 @@ const Forms = (props) => {
     TimeToCompleteDays: 15,
     SendinOrder: "false",
     password: "",
-    file: ""
+    file: "",
+    remindOnceInEvery: 5,
+    autoreminder: false
   });
   const [fileupload, setFileUpload] = useState("");
   const [fileload, setfileload] = useState(false);
@@ -59,6 +64,7 @@ const Forms = (props) => {
   const [isPassword, setIsPassword] = useState(false);
   const [isDecrypting, setIsDecrypting] = useState(false);
   const [isCorrectPass, setIsCorrectPass] = useState(true);
+  const [isSubscribe, setIsSubscribe] = useState(false);
   const handleStrInput = (e) => {
     setIsCorrectPass(true);
     setFormData({ ...formData, [e.target.name]: e.target.value });
@@ -69,6 +75,17 @@ const Forms = (props) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.title]);
 
+  useEffect(() => {
+    fetchSubscription();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+  const fetchSubscription = async () => {
+    if (isEnableSubscription) {
+      const getIsSubscribe = await checkIsSubscribed();
+      setIsSubscribe(getIsSubscribe);
+    }
+  };
+
   function getFileAsArrayBuffer(file) {
     return new Promise((resolve, reject) => {
       const reader = new FileReader();
@@ -382,6 +399,8 @@ const Forms = (props) => {
         if (props.title !== "Sign Yourself") {
           const isChecked = formData.SendinOrder === "false" ? false : true;
           object.set("SendinOrder", isChecked);
+          object.set("AutomaticReminders", formData.autoreminder);
+          object.set("RemindOnceInEvery", parseInt(formData.remindOnceInEvery));
         }
         object.set("URL", fileupload);
         object.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
@@ -401,7 +420,6 @@ const Forms = (props) => {
           className: "contracts_Users",
           objectId: ExtCls[0].objectId
         });
-
         const res = await object.save();
         if (res) {
           setSigners([]);
@@ -456,7 +474,11 @@ const Forms = (props) => {
           ? "Note to myself"
           : "Please review and sign this document",
       TimeToCompleteDays: 15,
-      SendinOrder: "true"
+      SendinOrder: "true",
+      password: "",
+      file: "",
+      remindOnceInEvery: 5,
+      autoreminder: false
     });
     setFileUpload("");
     setpercentage(0);
@@ -535,6 +557,9 @@ const Forms = (props) => {
       inputFileRef.current.value = ""; // Set file input value to empty string
     }
   };
+  const handleAutoReminder = () => {
+    setFormData((prev) => ({ ...prev, autoreminder: !formData.autoreminder }));
+  };
   return (
     <div className="shadow-md rounded my-2 p-3 bg-[#ffffff] md:border-[1px] md:border-gray-600/50">
       <Title title={props?.title} />
@@ -707,12 +732,13 @@ const Forms = (props) => {
                 required
               />
             </div>
-            <SelectFolder
-              onSuccess={handleFolder}
-              folderCls={props.Cls}
-              isReset={isReset}
-            />
-
+            {props.title !== "New Template" && (
+              <SelectFolder
+                onSuccess={handleFolder}
+                folderCls={props.Cls}
+                isReset={isReset}
+              />
+            )}
             {props.title === "Request Signatures" && (
               <div className="text-xs mt-2">
                 <label className="block">
@@ -730,30 +756,141 @@ const Forms = (props) => {
               </div>
             )}
             {props.title !== "Sign Yourself" && (
-              <div className="text-xs mt-2">
-                <label className="block">Send In Order</label>
-                <div className="flex items-center gap-2 ml-2 mb-1">
-                  <input
-                    type="radio"
-                    value={"true"}
-                    name="SendinOrder"
-                    checked={formData.SendinOrder === "true"}
-                    className=""
-                    onChange={handleStrInput}
-                  />
-                  <div className="text-center">Yes</div>
+              <>
+                <div className="text-xs mt-2">
+                  <label className="block">
+                    Send In Order
+                    <a data-tooltip-id="sendInOrder-tooltip" className="ml-1">
+                      <sup>
+                        <i
+                          className="fa-solid fa-question rounded-full"
+                          style={{
+                            borderColor: "#33bbff",
+                            color: "#33bbff",
+                            fontSize: 13,
+                            borderWidth: 1.5,
+                            padding: "1.5px 4px"
+                          }}
+                        ></i>
+                      </sup>
+                    </a>
+                    <Tooltip id="sendInOrder-tooltip" className="z-50">
+                      <div className="max-w-[200px] md:max-w-[450px]">
+                        <p className="font-bold">Send in Order</p>
+                        <p>
+                          Choose how you want the signing requests to be sent to
+                          the document signers:
+                        </p>
+                        <p className="p-[5px]">
+                          <ol className="list-disc">
+                            <li>
+                              <span className="font-bold">Yes:</span>
+                              <span>
+                                {" "}
+                                Selecting this option will send the signing
+                                request to the first signer initially. Once the
+                                first signer completes their part, the next
+                                signer in the sequence will receive the request.
+                                This process continues until all signers have
+                                signed the document. This method ensures that
+                                the document is signed in a specific order.
+                              </span>
+                            </li>
+                            <li>
+                              <span className="font-bold">No: </span>
+                              <span>
+                                Selecting this option will send the signing
+                                links to all signers simultaneously. Every
+                                signer can sign the document at their
+                                convenience, regardless of whether other signers
+                                have completed their signatures. This method is
+                                faster but does not enforce any signing order
+                                among the participants.
+                              </span>
+                            </li>
+                          </ol>
+                        </p>
+
+                        <p>
+                          Select the option that best suits the needs of your
+                          document processing.
+                        </p>
+                      </div>
+                    </Tooltip>
+                  </label>
+                  <div className="flex items-center gap-2 ml-2 mb-1">
+                    <input
+                      type="radio"
+                      value={"true"}
+                      name="SendinOrder"
+                      checked={formData.SendinOrder === "true"}
+                      onChange={handleStrInput}
+                    />
+                    <div className="text-center">Yes</div>
+                  </div>
+                  <div className="flex items-center gap-2 ml-2 mb-1">
+                    <input
+                      type="radio"
+                      value={"false"}
+                      name="SendinOrder"
+                      checked={formData.SendinOrder === "false"}
+                      onChange={handleStrInput}
+                    />
+                    <div className="text-center">No</div>
+                  </div>
                 </div>
-                <div className="flex items-center gap-2 ml-2 mb-1">
-                  <input
-                    type="radio"
-                    value={"false"}
-                    name="SendinOrder"
-                    checked={formData.SendinOrder === "false"}
-                    onChange={handleStrInput}
-                  />
-                  <div className="text-center">No</div>
+                <div className="text-xs mt-2">
+                  {!isEnableSubscription && (
+                    <PremiumAlertHeader
+                      message={
+                        "Disable Auto reminder is free in beta, this feature will incur a fee later."
+                      }
+                    />
+                  )}
+                  <span
+                    className={
+                      isSubscribe || !isEnableSubscription
+                        ? "font-semibold"
+                        : "font-semibold text-gray-300"
+                    }
+                  >
+                    Auto reminder{"  "}
+                    {!isSubscribe && isEnableSubscription && <Upgrade />}
+                  </span>
+                  <label
+                    className={`${
+                      isSubscribe || !isEnableSubscription
+                        ? "cursor-pointer "
+                        : "pointer-events-none opacity-50"
+                    } relative block items-center mb-0`}
+                  >
+                    <input
+                      checked={formData.autoreminder}
+                      onChange={handleAutoReminder}
+                      type="checkbox"
+                      value=""
+                      className="sr-only peer"
+                    />
+                    <div className="w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-1 peer-focus:ring-black rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-black peer-checked:bg-blue-600 mt-2"></div>
+                  </label>
                 </div>
-              </div>
+                {formData?.autoreminder === true && (
+                  <div className="text-xs mt-2">
+                    <label className="block">
+                      Remind once in every (Days)
+                      <span className="text-red-500 text-[13px]">*</span>
+                    </label>
+                    <input
+                      type="number"
+                      value={formData.remindOnceInEvery}
+                      name="remindOnceInEvery"
+                      className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                      onChange={handleStrInput}
+                      required
+                    />
+                  </div>
+                )}
+              </>
             )}
             <div className="flex items-center mt-3 gap-2 text-white">
               <button

apps/OpenSign/src/pages/GenerateToken.js

@@ -144,29 +144,32 @@ function GenerateToken() {
                 : "w-full flex flex-col p-2 text-sm opacity-20 pointer-events-none select-none"
             }
           >
-            <li
-              className={`flex flex-col md:flex-row  justify-between items-center border-y-[1px] border-gray-300 break-all py-2`}
-            >
-              <div className="w-[70%] flex-col md:flex-row flex items-center gap-5 ">
+            <li className="flex flex-col md:flex-row justify-between items-center border-y-[1px] border-gray-300 break-all py-2">
+              <div className="w-full md:w-[70%] flex-col md:flex-row text-xs md:text-[15px] flex items-center gap-x-5 ">
                 <span className="">Api Token:</span>{" "}
-                <span
-                  id="token"
-                  className=" md:text-end cursor-pointer"
-                  onClick={() => copytoclipboard(apiToken)}
-                >
-                  {apiToken ? apiToken : "_____"}
+                <span id="token" className="md:text-end py-2 md:py-0">
+                  <span
+                    className="cursor-pointer"
+                    onClick={() => copytoclipboard(apiToken)}
+                  >
+                    {apiToken ? apiToken : "_____"}
+                  </span>
+                  <button
+                    className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-2.5 py-2 focus:outline-none ml-2"
+                    onClick={() => copytoclipboard(apiToken)}
+                  >
+                    <i className="fa-solid fa-copy"></i>
+                  </button>
                 </span>
               </div>
               <button
-                type="button"
                 onClick={apiToken ? handleModal : handleSubmit}
-                className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white px-4 py-2 text-xs md:text-base focus:outline-none"
+                className="rounded hover:bg-[#15b4e9] border-[1px] border-[#15b4e9] text-[#15b4e9] hover:text-white text-xs md:text-sm lg:text-base px-2 py-2 focus:outline-none"
               >
                 {apiToken ? "Regenerate Token" : "Generate Token"}
               </button>
             </li>
           </ul>
-
           <div className="flex   items-center justify-center ">
             <button
               type="button"

apps/OpenSign/src/pages/GuestLogin.js

@@ -1,16 +1,20 @@
 import React, { useState, useEffect } from "react";
 import { useNavigate, useParams } from "react-router-dom";
-import "../styles/loginPage.css";
 import loader from "../assets/images/loader2.gif";
 import axios from "axios";
-import { isEnableSubscription, themeColor } from "../constant/const";
+import {
+  isEnableSubscription,
+  modalSubmitBtnColor,
+  themeColor
+} from "../constant/const";
 import { contractUsers, getAppLogo } from "../constant/Utils";
 import logo from "../assets/images/logo.png";
 import { appInfo } from "../constant/appinfo";
+import Parse from "parse";
 
 function GuestLogin() {
   const { id, userMail, contactBookId, base64url } = useParams();
-  let navigate = useNavigate();
+  const navigate = useNavigate();
   const [email, setEmail] = useState(userMail);
   const [OTP, setOTP] = useState("");
   const [EnterOTP, setEnterOtp] = useState(false);
@@ -19,9 +23,10 @@ function GuestLogin() {
   const [appLogo, setAppLogo] = useState("");
   const [documentId, setDocumentId] = useState(id);
   const [contactId, setContactId] = useState(contactBookId);
+  const [sendmail, setSendmail] = useState();
+  const [contact, setContact] = useState({ name: "", phone: "", email: "" });
   useEffect(() => {
     handleServerUrl();
-
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -52,53 +57,51 @@ function GuestLogin() {
       //split url in array from '/'
       const checkSplit = decodebase64.split("/");
       setDocumentId(checkSplit[0]);
+      setContact((prev) => ({ ...prev, email: checkSplit[1] }));
       setEmail(checkSplit[1]);
-      setContactId(checkSplit[2]);
+      const contactId = checkSplit?.[2];
+      setSendmail(checkSplit[3]);
+      if (!contactId) {
+        const params = { email: checkSplit[1], docId: checkSplit[0] };
+        try {
+          const linkContactRes = await Parse.Cloud.run(
+            "linkcontacttodoc",
+            params
+          );
+          // console.log("linkContactRes ", linkContactRes);
+          setContactId(linkContactRes?.contactId);
+        } catch (err) {
+          console.log("Err in link ext contact", err);
+        }
+      } else {
+        setContactId(checkSplit[2]);
+      }
     }
 
     setIsLoading(false);
   };
 
-  const handleChange = (event) => {
-    const { value } = event.target;
-    setOTP(value);
-  };
-
   //send email OTP function
-  const SendOtp = async (e) => {
-    const serverUrl =
-      localStorage.getItem("baseUrl") && localStorage.getItem("baseUrl");
-    const parseId =
-      localStorage.getItem("parseAppId") && localStorage.getItem("parseAppId");
-    if (serverUrl && localStorage) {
-      setLoading(true);
-      e.preventDefault();
-      setEmail(email);
-
-      try {
-        let url = `${serverUrl}functions/SendOTPMailV1/`;
-        const headers = {
-          "Content-Type": "application/json",
-          "X-Parse-Application-Id": parseId
-        };
-        let body = {
-          email: email.toString(),
-          docId: documentId
-        };
-        let Otp = await axios.post(url, body, { headers: headers });
-
-        if (Otp) {
-          setLoading(false);
-          setEnterOtp(true);
-        }
-      } catch (error) {
-        alert("something went wrong!");
+  const SendOtp = async () => {
+    setLoading(true);
+    setEmail(email);
+    try {
+      const params = { email: email.toString(), docId: documentId };
+      const Otp = await Parse.Cloud.run("SendOTPMailV1", params);
+      if (Otp) {
+        setLoading(false);
+        setEnterOtp(true);
       }
-    } else {
+    } catch (error) {
       alert("something went wrong!");
     }
   };
 
+  const handleSendOTPBtn = async (e) => {
+    e.preventDefault();
+    await SendOtp();
+  };
+
   //verify OTP send on via email
   const VerifyOTP = async (e) => {
     e.preventDefault();
@@ -134,7 +137,8 @@ function GuestLogin() {
             `Parse/${parseId}/currentUser`,
             JSON.stringify(_user)
           );
-          if (contractUserDetails) {
+          // console.log("contractUserDetails ", contractUserDetails);
+          if (contractUserDetails && contractUserDetails.length > 0) {
             localStorage.setItem(
               "Extand_Class",
               JSON.stringify(contractUserDetails)
@@ -146,7 +150,13 @@ function GuestLogin() {
           //save isGuestSigner true in local to handle login flow header in mobile view
           localStorage.setItem("isGuestSigner", true);
           setLoading(false);
-          navigate(`/load/recipientSignPdf/${documentId}/${contactId}`);
+          if (sendmail === "false") {
+            navigate(
+              `/load/recipientSignPdf/${documentId}/${contactId}?sendmail=${sendmail}`
+            );
+          } else {
+            navigate(`/load/recipientSignPdf/${documentId}/${contactId}`);
+          }
         }
       } catch (error) {
         console.log("err ", error);
@@ -155,156 +165,171 @@ function GuestLogin() {
       alert("Please Enter OTP!");
     }
   };
-
+  const handleUserData = async (e) => {
+    e.preventDefault();
+    const params = { ...contact, docId: documentId };
+    try {
+      setLoading(true);
+      const linkContactRes = await Parse.Cloud.run("linkcontacttodoc", params);
+      // console.log("linkContactRes ", linkContactRes);
+      setContactId(linkContactRes.contactId);
+      setEnterOtp(true);
+      await SendOtp();
+    } catch (err) {
+      setLoading(false);
+      alert("something went wron, please try agian later.");
+      console.log("Err in link ext contact", err);
+    }
+  };
+  const handleInputChange = (e) => {
+    setContact((prev) => ({ ...prev, [e.target.name]: e.target.value }));
+  };
   return (
     <div style={{ padding: "2rem", background: "white" }}>
       {isLoading ? (
-        <div
-          style={{
-            display: "flex",
-            justifyContent: "center",
-            alignItems: "center",
-            height: "100vh",
-            flexDirection: "column"
-          }}
-        >
-          <img
-            alt="no img"
-            src={loader}
-            style={{ width: "80px", height: "80px" }}
-          />
+        <div className="flex flex-col justify-center items-center h-[100vh]">
+          <img className="w-[80px] h-[80px]" alt="loader" src={loader} />
           <span style={{ fontSize: "13px", color: "gray" }}>
             {isLoading.message}
           </span>
         </div>
       ) : (
-        <div
-          style={{
-            margin: "10px",
-            border: "0.5px solid #c5c7c9",
-            padding: "30px",
-            boxShadow: "rgba(99, 99, 99, 0.2) 0px 2px 8px 0px"
-          }}
-        >
-          <div className="main_head">
-            <div className="w-[250px] h-[66px] inline-block overflow-hidden">
-              {appLogo && (
-                <img
-                  src={appLogo}
-                  className="object-contain h-full"
-                  alt="logo"
-                />
-              )}
-            </div>
+        <div className="m-1 md:m-2 border-[0.5px] border-[#c5c7c9] p-[30px] shadow-md">
+          <div className="md:w-[250px] md:h-[66px] inline-block overflow-hidden mt-2 mb-11">
+            {appLogo && (
+              <img src={appLogo} className="object-contain h-full" alt="logo" />
+            )}
           </div>
-
-          {!EnterOTP ? (
-            <div className="row">
-              <div className="col-sm-6 KLO">
-                <span className="welcomeText">Welcome Back !</span>
-                <br />
-                <span className="KNLO">
-                  Verification code is sent to your email
-                </span>
-                <div className="card card-box" style={{ borderRadius: "0px" }}>
-                  <div className="card-body">
+          {contactId ? (
+            <>
+              {!EnterOTP ? (
+                <div className="w-full md:w-[50%]">
+                  <h1 className="text-2xl md:text-[30px]">Welcome Back!</h1>
+                  <legend className="text-[12px] text-[#878787] mt-2">
+                    Verification code is sent to your email
+                  </legend>
+                  <div className="p-[20px] outline outline-1 outline-slate-300/50 my-2 rounded shadow-md">
                     <input
                       type="email"
                       name="mobile"
                       value={email}
+                      className="outline-none px-3 py-2 w-full border-[1px] border-gray-300 rounded text-xs disabled:bg-[#e0e5f5]"
                       disabled
-                      className="loginInput"
                     />
-                    <br />
+                  </div>
+                  <div className="mt-4">
+                    <button
+                      className="w-[100px] text-white text-sm font-medium py-1 rounded-sm shadow-md hover:shadow-lg focus:outline-none"
+                      style={{ background: themeColor }}
+                      onClick={(e) => handleSendOTPBtn(e)}
+                      disabled={loading}
+                    >
+                      {loading ? "Loading..." : "Send OTP"}
+                    </button>
                   </div>
                 </div>
-                <div className="btnContainer">
-                  {loading ? (
-                    <button
-                      type="button"
-                      style={{
-                        background: themeColor,
-                        color: "white"
-                      }}
-                      className="verifyBtn"
-                      disabled
-                    >
-                      <span
-                        className="spinner-border spinner-border-sm "
-                        role="status"
-                        aria-hidden="true"
-                      ></span>
-                      Loading...
-                    </button>
-                  ) : (
-                    <button
-                      className="verifyBtn"
-                      style={{
-                        background: themeColor,
-                        color: "white",
-                        marginLeft: "0px !important"
-                      }}
-                      onClick={(e) => SendOtp(e)}
-                    >
-                      Send OTP
-                    </button>
-                  )}
-                </div>
-              </div>
-            </div>
-          ) : (
-            <div className="row">
-              <div className="col-sm-6 KLO">
-                <span className="welcomeText">Welcome Back !</span>
-                <br />
-                <span className="KNLO">You will get a OTP via Email</span>
-                <div className="card card-box">
-                  <div className="card-body">
-                    <label>Enter Verification Code</label>
+              ) : (
+                <form className="w-full md:w-[50%]" onSubmit={VerifyOTP}>
+                  <h1 className="text-2xl md:text-[30px]">Welcome Back!</h1>
+                  <legend className="text-[12px] text-[#878787] mt-2">
+                    You will get a OTP via Email
+                  </legend>
+                  <div className="p-[20px] pt-[15px] outline outline-1 outline-slate-300/50 my-2 rounded shadow-md">
+                    <p>Enter Verification Code</p>
                     <input
                       type="number"
-                      className="loginInput"
+                      className="mt-1 outline-none px-3 py-2 w-full border-[1px] border-gray-300 rounded text-xs bg-[#e0e5f5]"
                       name="OTP"
                       value={OTP}
-                      onChange={handleChange}
+                      onChange={(e) => setOTP(e.target.value)}
                     />
-
-                    <br />
                   </div>
-                </div>
-                <div>
-                  {loading ? (
+                  <div className="mt-4">
                     <button
-                      style={{
-                        background: themeColor,
-                        color: "white"
-                      }}
-                      className="verifyBtn"
-                      type="button"
-                      disabled
+                      style={{ background: themeColor }}
+                      className="w-[100px] text-white text-sm font-medium py-1 rounded-sm shadow-md hover:shadow-lg focus:outline-none"
+                      type="submit"
+                      disabled={loading}
                     >
-                      <span
-                        className="spinner-border spinner-border-sm "
-                        role="status"
-                        aria-hidden="true"
-                      ></span>
-                      Loading...
+                      {loading ? "Loading..." : "Verify"}
                     </button>
-                  ) : (
-                    <button
-                      type="button"
-                      onClick={(e) => VerifyOTP(e)}
-                      style={{
-                        background: themeColor,
-                        color: "white"
-                      }}
-                      className="verifyBtn"
-                    >
-                      Verify
-                    </button>
-                  )}
+                  </div>
+                </form>
+              )}
+            </>
+          ) : (
+            <div className="w-full md:w-[50%]">
+              <h1 className="text-2xl md:text-[30px]">Welcome</h1>
+              <legend className="text-[12px] text-[#878787] mt-2">
+                Provide your details
+              </legend>
+              <form
+                className="p-[20px] pt-[15px] outline outline-1 outline-slate-300/50 my-2 rounded shadow-md"
+                onSubmit={handleUserData}
+              >
+                <div className="mb-3">
+                  <label
+                    htmlFor="name"
+                    className="block text-xs text-gray-700 font-semibold"
+                  >
+                    Name
+                    <span className="text-[red] text-[13px]"> *</span>
+                  </label>
+                  <input
+                    type="text"
+                    name="name"
+                    value={contact.name}
+                    onChange={handleInputChange}
+                    className="px-3 py-2 w-full border-[1px] border-gray-300 rounded disabled:bg-[#e0e5f5] focus:outline-none text-xs"
+                    disabled={loading}
+                    required
+                  />
                 </div>
-              </div>
+                <div className="mb-3">
+                  <label
+                    htmlFor="email"
+                    className="block text-xs text-gray-700 font-semibold"
+                  >
+                    Email
+                    <span className="text-[red] text-[13px]"> *</span>
+                  </label>
+                  <input
+                    type="email"
+                    name="email"
+                    value={contact.email}
+                    onChange={handleInputChange}
+                    className="px-3 py-2 w-full border-[1px] border-gray-300 disabled:bg-[#e0e5f5] rounded focus:outline-none text-xs"
+                    required
+                    disabled
+                  />
+                </div>
+                <div className="mb-3">
+                  <label
+                    htmlFor="phone"
+                    className="block text-xs text-gray-700 font-semibold"
+                  >
+                    Phone
+                  </label>
+                  <input
+                    type="text"
+                    name="phone"
+                    value={contact.phone}
+                    onChange={handleInputChange}
+                    className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                    disabled={loading}
+                  />
+                </div>
+                <div className="mt-4 flex justify-start">
+                  <button
+                    type="submit"
+                    style={{ backgroundColor: modalSubmitBtnColor }}
+                    className="mr-2 px-[20px] py-1.5 text-white rounded shadow-md text-center focus:outline-none "
+                    disabled={loading}
+                  >
+                    {loading ? "Loading..." : "Next"}
+                  </button>
+                </div>
+              </form>
             </div>
           )}
         </div>

apps/OpenSign/src/pages/Login.js

@@ -19,7 +19,7 @@ import Alert from "../primitives/Alert";
 import { appInfo } from "../constant/appinfo";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
 import { showTenant } from "../redux/reducers/ShowTenant";
-import { fetchSubscription, getAppLogo } from "../constant/Utils";
+import { fetchSubscription, getAppLogo, openInNewTab } from "../constant/Utils";
 function Login() {
   const navigate = useNavigate();
   const location = useLocation();
@@ -45,6 +45,7 @@ function Login() {
   });
   const [isModal, setIsModal] = useState(false);
   const [image, setImage] = useState();
+  const [isLoginSSO, setIsLoginSSO] = useState(false);
 
   useEffect(() => {
     if (localStorage.getItem("accesstoken")) {
@@ -263,7 +264,7 @@ function Login() {
                                         const LocalUserDetails = {
                                           name: results[0].get("Name"),
                                           email: results[0].get("Email"),
-                                          phone: results[0].get("Phone"),
+                                          phone: results[0]?.get("Phone") || "",
                                           company: results[0].get("Company")
                                         };
                                         localStorage.setItem(
@@ -317,7 +318,7 @@ function Login() {
                                       const LocalUserDetails = {
                                         name: _user.name,
                                         email: email,
-                                        phone: _user.phone
+                                        phone: _user?.phone || ""
                                         // company: results.get("Company"),
                                       };
                                       localStorage.setItem(
@@ -868,7 +869,7 @@ function Login() {
                               const LocalUserDetails = {
                                 name: results[0].get("Name"),
                                 email: results[0].get("Email"),
-                                phone: results[0].get("Phone"),
+                                phone: results[0]?.get("Phone") || "",
                                 company: results[0].get("Company")
                               };
                               localStorage.setItem(
@@ -905,7 +906,7 @@ function Login() {
                             const LocalUserDetails = {
                               name: results[0].get("Name"),
                               email: results[0].get("Email"),
-                              phone: results[0].get("Phone")
+                              phone: results[0]?.get("Phone") || ""
                               // company: results.get("Company"),
                             };
                             localStorage.setItem(
@@ -982,7 +983,7 @@ function Login() {
           userDetails: {
             name: userInformation.name,
             email: userInformation.email,
-            phone: userInformation.phone,
+            phone: userInformation?.phone || "",
             role: "contracts_User",
             company: userDetails.Company,
             jobTitle: userDetails.Destination
@@ -994,7 +995,7 @@ function Login() {
           const LocalUserDetails = {
             name: userInformation.name,
             email: userInformation.email,
-            phone: userInformation.phone,
+            phone: userInformation?.phone || "",
             company: userDetails.Company,
             jobTitle: userDetails.JobTitle
           };
@@ -1016,8 +1017,9 @@ function Login() {
 
   const handleCloseModal = () => {
     setIsModal(false);
-    Parse.User.logOut();
-
+    if (Parse?.User?.current()) {
+      Parse.User.logOut();
+    }
     let appdata = localStorage.getItem("userSettings");
     let applogo = localStorage.getItem("appLogo");
     let appName = localStorage.getItem("appName");
@@ -1040,6 +1042,26 @@ function Login() {
     localStorage.setItem("baseUrl", baseUrl);
     localStorage.setItem("parseAppId", appid);
   };
+
+  // `handleSignInWithSSO` is trigger when user click sign in with sso and open sso authorize endpoint
+  const handleSignInWithSSO = () => {
+    if (isLoginSSO === false) {
+      if (state?.email) {
+        setIsLoginSSO(true);
+        const encodedEmail = encodeURIComponent(state.email);
+        const clientUrl = window.location.origin;
+        const domain = state.email.split("@")?.pop();
+        const ssoApiUrl =
+          process.env.SSO_API_URL || "https://sso.opensignlabs.com/api";
+        openInNewTab(
+          `${ssoApiUrl}/oauth/authorize?response_type=code&provider=saml&tenant=${domain}&product=OpenSign&redirect_uri=${clientUrl}/sso&state=${encodedEmail}`,
+          "_self"
+        );
+      } else {
+        alert("Please provide email.");
+      }
+    }
+  };
   return (
     <div className="bg-white">
       <Title title={"Login Page"} />
@@ -1087,154 +1109,131 @@ function Login() {
               </div>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-x-2">
                 <div>
-                  <div>
-                    <form onSubmit={handleSubmit} aria-label="Login Form">
-                      <h1 className="text-[30px] mt-6">Welcome Back!</h1>
-                      <fieldset>
-                        <legend className="text-[12px] text-[#878787]">
-                          Login to your account
-                        </legend>
-                        <div className="px-6 py-4 outline outline-1 outline-slate-300/50 my-2 rounded shadow-md">
-                          <label className="block text-xs" htmlFor="email">
-                            Username
-                          </label>
-                          <input
-                            id="email"
-                            type="text"
-                            className="px-3 py-2 w-full border-[1px] border-gray-300 rounded text-xs"
-                            name="email"
-                            value={state.email}
-                            onChange={handleChange}
-                            required
-                          />
-                          <hr className="my-2 border-none" />
-                          <label className="block text-xs" htmlFor="password">
-                            Password
-                          </label>
-                          <div className="relative">
-                            <input
-                              id="password"
-                              type={state.passwordVisible ? "text" : "password"}
-                              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded text-xs"
-                              name="password"
-                              value={state.password}
-                              onChange={handleChange}
-                              required
-                            />
-                            <span
-                              className={`absolute top-[50%] right-[10px] -translate-y-[50%] cursor-pointer ${
-                                state.passwordVisible
-                                  ? "text-[#007bff]"
-                                  : "text-black"
-                              }`}
-                              onClick={togglePasswordVisibility}
-                            >
-                              {state.passwordVisible ? (
-                                <i className="fa fa-eye-slash text-xs pb-1" /> // Close eye icon
-                              ) : (
-                                <i className="fa fa-eye text-xs pb-1 " /> // Open eye icon
-                              )}
-                            </span>
-                          </div>
-                        </div>
-                      </fieldset>
-                      <div className="flex flex-row justify-between items-center ml-4 py-2">
-                        <div>
-                          <label
-                            className="form-check-label inline-block cursor-pointer"
-                            htmlFor="rememberpassword"
-                          >
-                            <input
-                              type="checkbox"
-                              className="form-check-input mr-1"
-                              value=""
-                              id="rememberpassword"
-                            />
-                            <span className="text-[13px]">
-                              Remember Password
-                            </span>
-                          </label>
-                        </div>
-                        <div>
+                  <form onSubmit={handleSubmit} aria-label="Login Form">
+                    <h1 className="text-[30px] mt-6">Welcome Back!</h1>
+                    <fieldset>
+                      <legend className="text-[12px] text-[#878787]">
+                        Login to your account
+                      </legend>
+                      <div className="px-6 py-4 outline outline-1 outline-slate-300/50 my-2 rounded shadow-md">
+                        <label className="block text-xs" htmlFor="email">
+                          Email
+                        </label>
+                        <input
+                          id="email"
+                          type="text"
+                          className="px-3 py-2 w-full border-[1px] border-gray-300 rounded text-xs"
+                          name="email"
+                          value={state.email}
+                          onChange={handleChange}
+                          required
+                        />
+                        <hr className="my-2 border-none" />
+                        {!isLoginSSO && (
+                          <>
+                            <label className="block text-xs" htmlFor="password">
+                              Password
+                            </label>
+                            <div className="relative">
+                              <input
+                                id="password"
+                                type={
+                                  state.passwordVisible ? "text" : "password"
+                                }
+                                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded text-xs"
+                                name="password"
+                                value={state.password}
+                                onChange={handleChange}
+                                required
+                              />
+                              <span
+                                className={`absolute top-[50%] right-[10px] -translate-y-[50%] cursor-pointer ${
+                                  state.passwordVisible
+                                    ? "text-[#007bff]"
+                                    : "text-black"
+                                }`}
+                                onClick={togglePasswordVisibility}
+                              >
+                                {state.passwordVisible ? (
+                                  <i className="fa fa-eye-slash text-xs pb-1" /> // Close eye icon
+                                ) : (
+                                  <i className="fa fa-eye text-xs pb-1 " /> // Open eye icon
+                                )}
+                              </span>
+                            </div>
+                          </>
+                        )}
+                        <div className="relative mt-1">
                           <NavLink
                             to="/forgetpassword"
-                            className="text-[13px] underline focus:outline-none focus:ring-2 focus:ring-blue-600"
+                            className="text-[13px] text-[#002864] hover:underline underline-offset-1 focus:outline-none cursor-pointer ml-1"
                           >
-                            Forgot Password ?
+                            Forgot Password?
                           </NavLink>
                         </div>
                       </div>
-                      <div className="flex flex-col md:flex-row justify-between items-stretch gap-8 text-center text-xs font-bold mt-2">
-                        <button
-                          type="submit"
-                          className="rounded-sm bg-[#3ac9d6] text-white w-full py-3 shadow outline-none uppercase focus:ring-2 focus:ring-blue-600"
-                          disabled={state.loading}
-                        >
-                          {state.loading ? "Loading..." : "Login"}
-                        </button>
-                        <NavLink
-                          className="rounded-sm cursor-pointer bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] w-full py-3 shadow uppercase"
-                          to={
-                            location.search
-                              ? "/signup" + location.search
-                              : "/signup"
-                          }
-                          style={width < 768 ? { textAlign: "center" } : {}}
-                        >
-                          Create Account
-                        </NavLink>
-                      </div>
-                    </form>
-                    <br />
-                    {(appInfo.fbAppId || appInfo.googleClietId) && (
-                      <div className="text-sm flex justify-center items-center">
-                        <hr className="border-[1px] border-gray-300 w-full" />
-                        <span className="px-2 text-gray-500 cursor-default">
-                          OR
-                        </span>
-                        <hr className="border-[1px] border-gray-300 w-full" />
-                      </div>
-                    )}
-                    <br />
-                    <div
-                      style={{
-                        textAlign: "center",
-                        display: "flex",
-                        alignItems: "center",
-                        justifyContent: "center"
-                      }}
-                    >
-                      {/* {appInfo.fbAppId && appInfo.fbAppId !== "" ? (
+                    </fieldset>
+                    <div className="flex flex-col md:flex-row justify-between items-stretch gap-8 text-center text-xs font-bold mt-2">
+                      <button
+                        type="submit"
+                        className="rounded-sm bg-[#3ac9d6] text-white w-full py-3 shadow outline-none uppercase focus:ring-2 focus:ring-blue-600"
+                        disabled={state.loading}
+                      >
+                        {state.loading ? "Loading..." : "Login"}
+                      </button>
+                      <NavLink
+                        className="rounded-sm cursor-pointer bg-white border-[1px] border-[#15b4e9] text-[#15b4e9] w-full py-3 shadow uppercase"
+                        to={
+                          location.search
+                            ? "/signup" + location.search
+                            : "/signup"
+                        }
+                        style={width < 768 ? { textAlign: "center" } : {}}
+                      >
+                        Create Account
+                      </NavLink>
+                    </div>
+                  </form>
+                  <br />
+                  {appInfo.googleClietId && (
+                    <div className="text-sm flex justify-center items-center">
+                      <hr className="border-[1px] border-gray-300 w-full" />
+                      <span className="px-2 text-gray-500 cursor-default">
+                        OR
+                      </span>
+                      <hr className="border-[1px] border-gray-300 w-full" />
+                    </div>
+                  )}
+                  <br />
+                  <div className="flex flex-col justify-center items-center gap-y-3">
+                    {/* {appInfo?.fbAppId && (
                       <LoginFacebook
                         FBCred={appInfo.fbAppId}
                         thirdpartyLoginfn={thirdpartyLoginfn}
                         thirdpartyLoader={state.thirdpartyLoader}
                         setThirdpartyLoader={setThirdpartyLoader}
                       />
-                    ) : null} */}
-                    </div>
-                    <div style={{ margin: "10px 0" }}></div>
-                    <div
-                      style={{
-                        textAlign: "center",
-                        display: "flex",
-                        alignItems: "center",
-                        justifyContent: "center"
-                      }}
-                    >
-                      {appInfo.googleClietId && appInfo.googleClietId !== "" ? (
-                        <GoogleSignInBtn
-                          GoogleCred={appInfo.googleClietId}
-                          thirdpartyLoginfn={thirdpartyLoginfn}
-                          thirdpartyLoader={state.thirdpartyLoader}
-                          setThirdpartyLoader={setThirdpartyLoader}
-                        />
-                      ) : null}
-                    </div>
+                    )} */}
+                    {appInfo?.googleClietId && (
+                      <GoogleSignInBtn
+                        GoogleCred={appInfo.googleClietId}
+                        thirdpartyLoginfn={thirdpartyLoginfn}
+                        thirdpartyLoader={state.thirdpartyLoader}
+                        setThirdpartyLoader={setThirdpartyLoader}
+                      />
+                    )}
+                    {isEnableSubscription && (
+                      <div
+                        className="cursor-pointer border-[1px] border-gray-300 rounded px-[40px] py-2 font-semibold text-sm hover:border-[#d2e3fc] hover:bg-[#ecf3feb7]"
+                        onClick={() => handleSignInWithSSO()}
+                      >
+                        Sign in with SSO
+                      </div>
+                    )}
                   </div>
                 </div>
                 {width >= 768 && (
-                  <div className="self-center">
+                  <div className="place-self-center">
                     <div className="mx-auto md:w-[300px] lg:w-[400px] xl:w-[500px]">
                       <img
                         src={login_img}

apps/OpenSign/src/pages/Opensigndrive.js

@@ -11,8 +11,8 @@ import TourContentWithBtn from "../primitives/TourContentWithBtn";
 import Tour from "reactour";
 import axios from "axios";
 
-const DriveBody = React.lazy(
-  () => import("../components/opensigndrive/DriveBody")
+const DriveBody = React.lazy(() =>
+  import("../components/opensigndrive/DriveBody")
 );
 const Loader = () => {
   return (
@@ -300,6 +300,7 @@ function Opensigndrive() {
         const exsitQuery = new Parse.Query(foldercls);
         exsitQuery.equalTo("Name", newFolderName);
         exsitQuery.equalTo("Type", "Folder");
+        exsitQuery.notEqualTo("IsArchive", true);
         if (parentId) {
           exsitQuery.equalTo("Folder", folderPtr);
         }

apps/OpenSign/src/pages/Pgsignup.js

@@ -127,7 +127,9 @@ const PgSignUp = () => {
       user.set("username", zohoRes.data.result.email);
       user.set("password", obj.password);
       user.set("email", zohoRes.data.result.email);
-      user.set("phone", zohoRes.data.result.phone);
+      if (zohoRes?.data?.result?.phone) {
+        user.set("phone", zohoRes.data.result.phone);
+      }
       user.set("name", zohoRes.data.result.name);
 
       const res = await user.signUp();
@@ -140,7 +142,7 @@ const PgSignUp = () => {
             company: zohoRes.data.result.company,
             name: zohoRes.data.result.name,
             email: zohoRes.data.result.email,
-            phone: zohoRes.data.result.phone,
+            phone: zohoRes?.data?.result?.phone || "",
             role: obj.role
           },
           subscription: zohoRes.data.result.subscription

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -405,11 +405,14 @@ function PlaceHolderSign() {
       };
       setHandleError("Error: Something went wrong!");
       setIsLoading(loadObj);
-    } else if (res[0] && res.length) {
+    } else if (res.length && res[0]?.objectId) {
       setActiveMailAdapter(res[0]?.active_mail_adapter);
       setSignerUserId(res[0].objectId);
       const tourstatus = res[0].TourStatus && res[0].TourStatus;
-      if (tourstatus && tourstatus.length > 0) {
+      const alreadyPlaceholder = documentData[0]?.SignedUrl;
+      if (alreadyPlaceholder) {
+        setCheckTourStatus(true);
+      } else if (tourstatus && tourstatus.length > 0) {
         setTourStatus(tourstatus);
         const checkTourRecipients = tourstatus.filter(
           (data) => data.placeholder
@@ -933,6 +936,7 @@ function PlaceHolderSign() {
           Placeholders: filterPrefill,
           SignedUrl: pdfUrl,
           Signers: signers,
+          SentToOthers: true,
           ExpiryDate: {
             iso: updateExpiryDate,
             __type: "Date"
@@ -942,7 +946,8 @@ function PlaceHolderSign() {
         data = {
           Placeholders: filterPrefill,
           SignedUrl: pdfUrl,
-          Signers: signers
+          Signers: signers,
+          SentToOthers: true
         };
       }
       await axios
@@ -995,9 +1000,10 @@ function PlaceHolderSign() {
     for (let i = 0; i < signerMail.length; i++) {
       const objectId = signerMail[i].objectId;
       const hostUrl = window.location.origin;
+      const sendMail = false;
       //encode this url value `${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}` to base64 using `btoa` function
       const encodeBase64 = btoa(
-        `${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}`
+        `${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}/${sendMail}`
       );
       let signPdf = `${hostUrl}/login/${encodeBase64}`;
       shareLinkList.push({ signerEmail: signerMail[i].Email, url: signPdf });
@@ -1104,10 +1110,10 @@ function PlaceHolderSign() {
             document_title: documentName,
             sender_name: senderName,
             sender_mail: senderEmail,
-            sender_phone: senderPhone,
+            sender_phone: senderPhone || "",
             receiver_name: signerMail[i].Name,
             receiver_email: signerMail[i].Email,
-            receiver_phone: signerMail[i].Phone,
+            receiver_phone: signerMail[i]?.Phone || "",
             expiry_date: localExpireDate,
             company_name: orgName,
             signing_url: `<a href=${signPdf}>Sign here</a>`
@@ -1159,40 +1165,45 @@ function PlaceHolderSign() {
     }
     if (sendMail.data.result.status === "success") {
       setMailStatus("success");
-
-      if (
-        requestBody &&
-        requestSubject &&
-        isCustomize &&
-        (isSubscribe || !isEnableSubscription)
-      ) {
-        try {
-          const data = {
+      try {
+        let data;
+        if (
+          requestBody &&
+          requestSubject &&
+          isCustomize &&
+          (isSubscribe || !isEnableSubscription)
+        ) {
+          data = {
             RequestBody: htmlReqBody,
-            RequestSubject: requestSubject
+            RequestSubject: requestSubject,
+            SendMail: true
+          };
+        } else {
+          data = {
+            SendMail: true
           };
-
-          await axios
-            .put(
-              `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
-                "_appName"
-              )}_Document/${documentId}`,
-              data,
-              {
-                headers: {
-                  "Content-Type": "application/json",
-                  "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-                  "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-                }
-              }
-            )
-            .then(() => {})
-            .catch((err) => {
-              console.log("axois err ", err);
-            });
-        } catch (e) {
-          console.log("error", e);
         }
+
+        await axios
+          .put(
+            `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
+              "_appName"
+            )}_Document/${documentId}`,
+            data,
+            {
+              headers: {
+                "Content-Type": "application/json",
+                "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+                "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+              }
+            }
+          )
+          .then(() => {})
+          .catch((err) => {
+            console.log("axois err ", err);
+          });
+      } catch (e) {
+        console.log("error", e);
       }
 
       setIsSend(true);
@@ -1795,10 +1806,7 @@ function PlaceHolderSign() {
 
                             {!isSubscribe && isEnableSubscription && (
                               <div className="mt-2">
-                                <Upgrade
-                                  message="Upgrade to customize Email"
-                                  newWindow={true}
-                                />
+                                <Upgrade message="Upgrade to customize Email" />
                               </div>
                             )}
                           </div>

apps/OpenSign/src/pages/PlanSubscriptions.js

@@ -16,8 +16,17 @@ const PlanSubscriptions = () => {
   const navigate = useNavigate();
   const [yearlyVisible, setYearlyVisible] = useState(false);
   const [isLoader, setIsLoader] = useState(true);
-
-  const userDetails = JSON.parse(localStorage.getItem("userDetails"));
+  const extUser =
+    localStorage.getItem("Extand_Class") &&
+    JSON.parse(localStorage.getItem("Extand_Class"))?.[0];
+  const user = {
+    name: extUser?.Name,
+    email: extUser?.Email,
+    company: extUser?.Company,
+    phone: extUser?.Phone
+  };
+  const userDetails = JSON.parse(localStorage.getItem("userDetails")) || user;
+  // console.log("userDetails ", userDetails);
   const name =
     userDetails && userDetails.name
       ? "first_name=" + encodeURIComponent(userDetails.name)

apps/OpenSign/src/pages/SSOVerify.js

@@ -0,0 +1,413 @@
+import React, { useEffect, useState } from "react";
+import { useLocation, useNavigate } from "react-router-dom";
+import Parse from "parse";
+import axios from "axios";
+import { appInfo } from "../constant/appinfo";
+import {
+  isEnableSubscription,
+  modalCancelBtnColor,
+  modalSubmitBtnColor
+} from "../constant/const";
+import { fetchSubscription } from "../constant/Utils";
+import { useDispatch } from "react-redux";
+import { showTenant } from "../redux/reducers/ShowTenant";
+import ModalUi from "../primitives/ModalUi";
+import loader from "../assets/images/loader2.gif";
+
+const SSOVerify = () => {
+  const location = useLocation();
+  const navigate = useNavigate();
+  const dispatch = useDispatch();
+  const [isModal, setIsModal] = useState(false);
+  const [message, setMessage] = useState("Verifying SSO...");
+  const [isLoader, setIsLoader] = useState(false);
+  const [userDetails, setUserDetails] = useState({
+    name: "",
+    email: "",
+    phone: "",
+    Destination: "",
+    Company: ""
+  });
+
+  useEffect(() => {
+    linkUserWithSSO();
+    // eslint-disable-next-line
+  }, []);
+
+  // `linkUserWithSSO` is used to sign in or sign up a user using an SSO code and check if the user is present in the extended class
+  const linkUserWithSSO = async () => {
+    const param = new URLSearchParams(location.search);
+    const code = param?.get("code");
+    const state = param?.get("state");
+    try {
+      // The `ssosign` cloud function is used to sign in or sign up a user
+      const ssosign = await Parse.Cloud.run("ssosign", {
+        code: code,
+        email: state
+      });
+      localStorage.setItem("accesstoken", ssosign.sessiontoken);
+      // `checkExtUser` checks if the user is present in the extended class `contracts_Users` and if not, initiates the new user flow
+      await checkExtUser(ssosign);
+    } catch (err) {
+      setMessage("Error: " + err.message);
+      console.log("err", err.message);
+    }
+  };
+  const checkExtUser = async (ssosign) => {
+    const params = { email: ssosign?.email };
+    try {
+      // `isextenduser` checks if the current user is present in the extended class
+      const extRes = await Parse.Cloud.run("isextenduser", params);
+      if (extRes?.isUserExist) {
+        // `getUserDetails` retrieves the current user's details from the extended class
+        const extRes = await Parse.Cloud.run("getUserDetails", params);
+        if (ssosign && ssosign.sessiontoken) {
+          const LocalUserDetails = {
+            name: extRes.Name,
+            email: extRes.email,
+            phone: extRes?.get("Phone") || "",
+            company: extRes.get("Company")
+          };
+          localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));
+          thirdpartyLoginfn(ssosign.sessiontoken);
+        }
+      } else {
+        setIsModal(true);
+        setUserDetails((prev) => ({
+          ...prev,
+          name: ssosign.name,
+          email: ssosign.email,
+          phone: ssosign?.phone || ""
+        }));
+      }
+    } catch (err) {
+      console.log("Err in isextenduser or getuserdetails cloud function", err);
+      setMessage("Error: " + err.message);
+    }
+  };
+  // `handleSubmitbtn` is used to create a user in the extended class
+  const handleSubmitbtn = async (e) => {
+    e.preventDefault();
+    setIsLoader(true);
+    let phone;
+    if (userDetails?.phone) {
+      phone = validateInput(userDetails?.phone);
+    } else {
+      phone = true;
+    }
+    if (userDetails.Destination && userDetails.Company && phone) {
+      const payload = { sessionToken: localStorage.getItem("accesstoken") };
+      if (payload && payload.sessionToken) {
+        const params = {
+          userDetails: {
+            name: userDetails.name,
+            email: userDetails.email,
+            phone: userDetails?.phone || "",
+            role: "contracts_User",
+            company: userDetails.Company,
+            jobTitle: userDetails.Destination
+          }
+        };
+        try {
+          const userSignUp = await Parse.Cloud.run("usersignup", params);
+          if (userSignUp && userSignUp.sessionToken) {
+            const LocalUserDetails = params.userDetails;
+            localStorage.setItem(
+              "userDetails",
+              JSON.stringify(LocalUserDetails)
+            );
+            await thirdpartyLoginfn(userSignUp.sessionToken);
+            setIsLoader(false);
+          } else {
+            alert(userSignUp.message);
+            setIsLoader(false);
+          }
+        } catch (err) {
+          console.log("error in usersignup", err);
+          localStorage.removeItem("accesstoken");
+          alert("Something went wrong.");
+          setIsLoader(false);
+        }
+      } else {
+        localStorage.removeItem("accesstoken");
+        alert("Internal server error.");
+        setIsLoader(false);
+      }
+    } else {
+      alert("Please fill required details correctly.");
+      setIsLoader(false);
+    }
+  };
+  // `thirdpartyLoginfn` is used to save necessary parameters locally for the logged-in user
+  const thirdpartyLoginfn = async (sessionToken) => {
+    const baseUrl = localStorage.getItem("baseUrl");
+    const parseAppId = localStorage.getItem("parseAppId");
+    try {
+      const validUser = await Parse.User.become(sessionToken);
+      if (validUser) {
+        localStorage.setItem("accesstoken", sessionToken);
+        const _user = JSON.parse(JSON.stringify(validUser));
+        localStorage.setItem("UserInformation", JSON.stringify(_user));
+        if (_user.ProfilePic) {
+          localStorage.setItem("profileImg", _user.ProfilePic);
+        } else {
+          localStorage.setItem("profileImg", "");
+        }
+        // Check extended class user role and tenentId
+        try {
+          let userRoles = [];
+          const userSettings = appInfo.settings;
+          //Get Current user roles
+          const url = `${baseUrl}functions/UserGroups`;
+          const headers = {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": parseAppId,
+            sessionToken: _user.sessionToken
+          };
+          const body = { appname: appInfo.appname };
+          const UserGroupsRes = await axios.post(url, JSON.stringify(body), {
+            headers: headers
+          });
+          userRoles = (UserGroupsRes.data && UserGroupsRes.data.result) || [];
+          if (userRoles) {
+            let _currentRole = "";
+            const excludeRoles = ["contracts_Guest", `contracts_appeditor`];
+            const filteredRole = userRoles.filter(
+              (x) => !excludeRoles.includes(x)
+            );
+            if (filteredRole?.length > 1) {
+              console.log("user has two roles");
+              // _currentRole = filteredRole.filter((x) => x === "contracts_User");
+            } else {
+              _currentRole = filteredRole?.[0] || "";
+            }
+            if (_currentRole) {
+              const roleSetting = userSettings?.find(
+                (setting) => setting.role === _currentRole
+              );
+              const redirectUrl =
+                location?.state?.from ||
+                `/${roleSetting.pageType}/${roleSetting.pageId}`;
+              const _role = _currentRole.replace(`${appInfo.appname}_`, "");
+              localStorage.setItem("_user_role", _role);
+              // Get TenentID from Extendend Class
+              localStorage.setItem(
+                "extended_class",
+                roleSetting.extended_class
+              );
+              try {
+                const extUser = await Parse.Cloud.run("getUserDetails", {
+                  email: _user.email
+                });
+                if (extUser) {
+                  const _extUser = JSON.parse(JSON.stringify(extUser));
+                  localStorage.setItem("userEmail", _extUser.Email);
+                  localStorage.setItem("username", _extUser.Name);
+                  localStorage.setItem("scriptId", true);
+                  let tenentInfo = [];
+                  const results = [extUser];
+                  if (results) {
+                    let extendedInfo_stringify = JSON.stringify(results);
+                    localStorage.setItem(
+                      "Extand_Class",
+                      extendedInfo_stringify
+                    );
+                    if (_extUser.TenantId) {
+                      const obj = {
+                        tenentId: _extUser.TenantId.objectId,
+                        tenentName: _extUser.TenantId.TenantName || ""
+                      };
+                      localStorage.setItem("TenantId", obj.tenentId);
+                      tenentInfo.push(obj);
+                      dispatch(showTenant(obj.tenentName || ""));
+                      localStorage.setItem("TenantName", obj.tenentName || "");
+                    }
+                    localStorage.setItem("PageLanding", roleSetting.pageId);
+                    localStorage.setItem("defaultmenuid", roleSetting.menuId);
+                    localStorage.setItem("pageType", roleSetting.pageType);
+                    if (isEnableSubscription) {
+                      const res = await fetchSubscription();
+                      const plan = res.plan;
+                      const billingDate = res.billingDate;
+                      if (plan === "freeplan") {
+                        navigate(redirectUrl);
+                      } else if (billingDate) {
+                        if (new Date(billingDate) > new Date()) {
+                          localStorage.removeItem("userDetails");
+                          navigate(redirectUrl);
+                        } else {
+                          navigate(`/subscription`, {
+                            replace: true
+                          });
+                        }
+                      } else {
+                        navigate(`/subscription`, {
+                          replace: true
+                        });
+                      }
+                    } else {
+                      navigate(redirectUrl);
+                    }
+                  }
+                }
+              } catch (err) {
+                alert("user not exist.");
+                setMessage("Error: User not exist.");
+                console.log("err in get extUser", err);
+              }
+            } else {
+              alert("Role does not exists.");
+              setMessage("Error: Role does not exists.");
+            }
+          } else {
+            alert("Role does not exists.");
+            setMessage("Error: Role does not exists.");
+          }
+        } catch (err) {
+          console.log("err in usergroups", err);
+        }
+      }
+    } catch (err) {
+      console.log("Err in become method", err);
+    }
+  };
+  // `handleCloseModal` is triggered when the user wants to close the new user flow modal
+  const handleCloseModal = () => {
+    setIsModal(false);
+    if (Parse?.User?.current()) {
+      Parse.User.logOut();
+    }
+  };
+
+  // `validateInput` is used to verify the phone pattern
+  function validateInput(input) {
+    if (input) {
+      const pattern = /^(?!.*\+.*\+)[\d+-]*$/;
+      return pattern.test(input);
+    } else {
+      return true;
+    }
+  }
+  return (
+    <div>
+      <div className="w-full h-screen flex flex-col justify-center items-center text-sm md:text-xl ">
+        {message === "Verifying SSO..." && (
+          <img alt="loader" src={loader} className="w-[80px] h-[80px]" />
+        )}
+        <div className="text-[gray]">{message}</div>
+      </div>
+      <ModalUi isOpen={isModal} title="Additional Info" showClose={false}>
+        <div className="relative">
+          {isLoader && (
+            <div className="absolute w-full h-full bg-black bg-opacity-25 flex justify-center items-center">
+              <div
+                style={{
+                  fontSize: "45px",
+                  color: "#3dd3e0"
+                }}
+                className="loader-37"
+              ></div>
+            </div>
+          )}
+          <form className="px-4 py-3" onSubmit={handleSubmitbtn}>
+            <div className="mb-3">
+              <label
+                htmlFor="Company"
+                style={{ display: "flex" }}
+                className="block text-xs text-gray-700 font-semibold"
+              >
+                Phone <span style={{ fontSize: 13, color: "red" }}>*</span>
+              </label>
+              <input
+                type="tel"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                id="Phone"
+                value={userDetails.phone}
+                onChange={(e) =>
+                  setUserDetails({
+                    ...userDetails,
+                    phone: e.target.value
+                  })
+                }
+                disabled={isLoader}
+                required
+              />
+              <p className="text-[10px] text-[red] ml-2">
+                {!validateInput(userDetails.phone) && "Invalid phone value"}
+              </p>
+            </div>
+            <div className="mb-3">
+              <label
+                htmlFor="Company"
+                style={{ display: "flex" }}
+                className="block text-xs text-gray-700 font-semibold"
+              >
+                Company <span style={{ fontSize: 13, color: "red" }}>*</span>
+              </label>
+              <input
+                type="text"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                id="Company"
+                value={userDetails.Company}
+                onChange={(e) =>
+                  setUserDetails({
+                    ...userDetails,
+                    Company: e.target.value
+                  })
+                }
+                disabled={isLoader}
+                required
+              />
+            </div>
+            <div className="mb-3">
+              <label
+                htmlFor="JobTitle"
+                style={{ display: "flex" }}
+                className="block text-xs text-gray-700 font-semibold"
+              >
+                Job Title
+                <span style={{ fontSize: 13, color: "red" }}>*</span>
+              </label>
+              <input
+                type="text"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                id="JobTitle"
+                value={userDetails.Destination}
+                onChange={(e) =>
+                  setUserDetails({
+                    ...userDetails,
+                    Destination: e.target.value
+                  })
+                }
+                disabled={isLoader}
+                required
+              />
+            </div>
+            <div className="mt-4">
+              <button
+                type="submit"
+                className="px-3 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
+                style={{
+                  marginRight: 10,
+                  backgroundColor: modalSubmitBtnColor
+                }}
+              >
+                Login
+              </button>
+              <button
+                type="button"
+                className="py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
+                onClick={handleCloseModal}
+                style={{ width: 75, backgroundColor: modalCancelBtnColor }}
+              >
+                Cancel
+              </button>
+            </div>
+          </form>
+        </div>
+      </ModalUi>
+    </div>
+  );
+};
+
+export default SSOVerify;

apps/OpenSign/src/pages/Signup.js

@@ -11,7 +11,7 @@ import { useDispatch } from "react-redux";
 import { fetchAppInfo } from "../redux/reducers/infoReducer";
 import { showTenant } from "../redux/reducers/ShowTenant";
 import { isEnableSubscription } from "../constant/const";
-import { getAppLogo } from "../constant/Utils";
+import { getAppLogo, openInNewTab } from "../constant/Utils";
 const Signup = () => {
   const { width } = useWindowSize();
   const navigate = useNavigate();
@@ -33,7 +33,7 @@ const Signup = () => {
   const [lengthValid, setLengthValid] = useState(false);
   const [caseDigitValid, setCaseDigitValid] = useState(false);
   const [specialCharValid, setSpecialCharValid] = useState(false);
-
+  const [isAuthorize, setIsAuthorize] = useState(false);
   const togglePasswordVisibility = () => setShowPassword(!showPassword);
 
   const clearStorage = async () => {
@@ -562,9 +562,11 @@ const Signup = () => {
                       <input
                         id="email"
                         type="text"
-                        className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                        className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs lowercase"
                         value={email}
-                        onChange={(e) => setEmail(e.target.value)}
+                        onChange={(e) =>
+                          setEmail(e.target.value?.toLowerCase())
+                        }
                         required
                       />
                       <hr className="my-2 border-none" />
@@ -658,10 +660,34 @@ const Signup = () => {
                             {specialCharValid ? "✓" : "✗"} Password should
                             contain special character
                           </p>
-                          {/* </>
-                          )} */}
                         </div>
                       )}
+                      <div className="mt-2.5 ml-1 flex flex-row items-center">
+                        <input
+                          type="checkbox"
+                          id="termsandcondition"
+                          checked={isAuthorize}
+                          onChange={(e) => setIsAuthorize(e.target.checked)}
+                          required
+                        />
+                        <label
+                          className="text-xs cursor-pointer ml-1 mb-0"
+                          htmlFor="termsandcondition"
+                        >
+                          I agree to the
+                        </label>
+                        <span
+                          className="underline cursor-pointer ml-1"
+                          onClick={() =>
+                            openInNewTab(
+                              "https://www.opensignlabs.com/terms-and-conditions"
+                            )
+                          }
+                        >
+                          Terms of Service
+                        </span>
+                        <span>.</span>
+                      </div>
                     </div>
                   </div>
                   <div className="flex flex-col md:flex-row justify-between items-stretch gap-8 text-center text-xs font-bold mt-2">

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -3,6 +3,7 @@ import { PDFDocument } from "pdf-lib";
 import "../styles/signature.css";
 import Parse from "parse";
 import { isEnableSubscription, themeColor } from "../constant/const";
+import Confetti from "react-confetti";
 import axios from "axios";
 import Loader from "../primitives/LoaderWithMsg";
 import loader from "../assets/images/loader2.gif";
@@ -70,7 +71,6 @@ function SignYourSelf() {
   const [dragKey, setDragKey] = useState();
   const [signKey, setSignKey] = useState();
   const [imgWH, setImgWH] = useState({});
-  const [isCeleb, setIsCeleb] = useState(false);
   const [pdfNewWidth, setPdfNewWidth] = useState();
   const [pdfOriginalWidth, setPdfOriginalWidth] = useState();
   const [successEmail, setSuccessEmail] = useState(false);
@@ -109,6 +109,7 @@ function SignYourSelf() {
   const [isDontShow, setIsDontShow] = useState(false);
   const [extUserId, setExtUserId] = useState("");
   const [isCompleted, setIsCompleted] = useState(false);
+  const [isCelebration, setIsCelebration] = useState(false);
   const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
   const [activeMailAdapter, setActiveMailAdapter] = useState("");
   const [isEmailVerified, setIsEmailVerified] = useState(true);
@@ -229,31 +230,12 @@ function SignYourSelf() {
           setIsUiLoading(false);
           setIsSignPad(false);
           setIsEmail(true);
+          setIsCelebration(true);
           setXyPostion([]);
           setSignBtnPosition([]);
-        }
-      }
-
-      if (!isCompleted) {
-        //check current user email verified or not
-        const currentUser = JSON.parse(JSON.stringify(Parse.User.current()));
-        let isEmailVerified;
-        isEmailVerified = currentUser?.emailVerified;
-        if (isEmailVerified) {
-          setIsEmailVerified(isEmailVerified);
-        } else {
-          try {
-            const userQuery = new Parse.Query(Parse.User);
-            const user = await userQuery.get(currentUser.objectId, {
-              sessionToken: localStorage.getItem("accesstoken")
-            });
-            if (user) {
-              isEmailVerified = user?.get("emailVerified");
-              setIsEmailVerified(isEmailVerified);
-            }
-          } catch (e) {
-            setHandleError("Error: Something went wrong!");
-          }
+          setTimeout(() => {
+            setIsCelebration(false);
+          }, 5000);
         }
       }
     } else if (
@@ -603,104 +585,122 @@ function SignYourSelf() {
   };
   //function for send placeholder's co-ordinate(x,y) position embed signature url or stamp url
   async function embedWidgetsData() {
-    let showAlert = false,
-      isSignatureExist = false;
-    try {
-      for (let i = 0; i < xyPostion?.length; i++) {
-        const requiredWidgets = xyPostion[i].pos.filter(
-          (position) => position.type !== "checkbox"
-        );
-        if (requiredWidgets && requiredWidgets?.length > 0) {
-          let checkSigned;
-          for (let i = 0; i < requiredWidgets?.length; i++) {
-            checkSigned = requiredWidgets[i]?.options?.response;
-            if (!checkSigned) {
-              const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
-              let checkDefaultSigned =
-                requiredWidgets[i]?.options?.defaultValue;
-              if (!checkSignUrl) {
-                if (!checkDefaultSigned) {
-                  if (!showAlert) {
-                    showAlert = true;
+    //check current user email is verified or not
+    const currentUser = JSON.parse(JSON.stringify(Parse.User.current()));
+    let isEmailVerified;
+    isEmailVerified = currentUser?.emailVerified;
+    if (isEmailVerified) {
+      setIsEmailVerified(isEmailVerified);
+    } else {
+      try {
+        const userQuery = new Parse.Query(Parse.User);
+        const user = await userQuery.get(currentUser.objectId, {
+          sessionToken: localStorage.getItem("accesstoken")
+        });
+        if (user) {
+          isEmailVerified = user?.get("emailVerified");
+          setIsEmailVerified(isEmailVerified);
+        }
+      } catch (e) {
+        setHandleError("Error: Something went wrong!");
+      }
+    }
+    if (isEmailVerified) {
+      let showAlert = false,
+        isSignatureExist = false;
+      try {
+        for (let i = 0; i < xyPostion?.length; i++) {
+          const requiredWidgets = xyPostion[i].pos.filter(
+            (position) => position.type !== "checkbox"
+          );
+          if (requiredWidgets && requiredWidgets?.length > 0) {
+            let checkSigned;
+            for (let i = 0; i < requiredWidgets?.length; i++) {
+              checkSigned = requiredWidgets[i]?.options?.response;
+              if (!checkSigned) {
+                const checkSignUrl = requiredWidgets[i]?.pos?.SignUrl;
+                let checkDefaultSigned =
+                  requiredWidgets[i]?.options?.defaultValue;
+                if (!checkSignUrl) {
+                  if (!checkDefaultSigned) {
+                    if (!showAlert) {
+                      showAlert = true;
+                    }
                   }
                 }
               }
             }
           }
-        }
-        //condition to check exist signature widget or not
-        if (!isSignatureExist) {
-          isSignatureExist = xyPostion[i].pos.some(
-            (data) => data?.type === "signature"
-          );
-        }
-      }
-      if (xyPostion.length === 0 || !isSignatureExist) {
-        setIsAlert({
-          header: "Fields required",
-          isShow: true,
-          alertMessage:
-            "Please ensure there's at least one signature widget added"
-        });
-        return;
-      } else if (showAlert) {
-        setIsAlert({
-          isShow: true,
-          alertMessage:
-            "Please ensure all field is accurately filled and meets all requirements."
-        });
-        return;
-      } else {
-        setIsCeleb(true);
-        setTimeout(() => {
-          setIsCeleb(false);
-        }, 3000);
-        setIsUiLoading(true);
-        const existingPdfBytes = pdfArrayBuffer;
-        // Load a PDFDocument from the existing PDF bytes
-        try {
-          const pdfDoc = await PDFDocument.load(existingPdfBytes);
-          const isSignYourSelfFlow = true;
-          const extUserPtr = pdfDetails[0].ExtUserPtr;
-          const HeaderDocId = extUserPtr?.HeaderDocId;
-          //embed document's object id to all pages in pdf document
-          if (!HeaderDocId) {
-            await embedDocId(pdfDoc, documentId, allPages);
-          }
-          //embed multi signature in pdf
-          const pdfBytes = await multiSignEmbed(
-            xyPostion,
-            pdfDoc,
-            pdfOriginalWidth,
-            isSignYourSelfFlow,
-            containerWH
-          );
-          // console.log("pdf", pdfBytes);
-          //function for call to embed signature in pdf and get digital signature pdf
-          await signPdfFun(pdfBytes, documentId);
-        } catch (err) {
-          setIsUiLoading(false);
-          if (err && err.message.includes("is encrypted.")) {
-            setIsAlert({
-              isShow: true,
-              alertMessage: `Currently encrypted pdf files are not supported.`
-            });
-          } else {
-            console.log("err in signing", err);
-            setIsAlert({
-              isShow: true,
-              alertMessage: `Something went wrong.`
-            });
+          //condition to check exist signature widget or not
+          if (!isSignatureExist) {
+            isSignatureExist = xyPostion[i].pos.some(
+              (data) => data?.type === "signature"
+            );
           }
         }
+        if (xyPostion.length === 0 || !isSignatureExist) {
+          setIsAlert({
+            header: "Fields required",
+            isShow: true,
+            alertMessage:
+              "Please ensure there's at least one signature widget added"
+          });
+          return;
+        } else if (showAlert) {
+          setIsAlert({
+            isShow: true,
+            alertMessage:
+              "Please ensure all field is accurately filled and meets all requirements."
+          });
+          return;
+        } else {
+          setIsUiLoading(true);
+          const existingPdfBytes = pdfArrayBuffer;
+          // Load a PDFDocument from the existing PDF bytes
+          try {
+            const pdfDoc = await PDFDocument.load(existingPdfBytes);
+            const isSignYourSelfFlow = true;
+            const extUserPtr = pdfDetails[0].ExtUserPtr;
+            const HeaderDocId = extUserPtr?.HeaderDocId;
+            //embed document's object id to all pages in pdf document
+            if (!HeaderDocId) {
+              await embedDocId(pdfDoc, documentId, allPages);
+            }
+            //embed multi signature in pdf
+            const pdfBytes = await multiSignEmbed(
+              xyPostion,
+              pdfDoc,
+              pdfOriginalWidth,
+              isSignYourSelfFlow,
+              containerWH
+            );
+            // console.log("pdf", pdfBytes);
+            //function for call to embed signature in pdf and get digital signature pdf
+            await signPdfFun(pdfBytes, documentId);
+          } catch (err) {
+            setIsUiLoading(false);
+            if (err && err.message.includes("is encrypted.")) {
+              setIsAlert({
+                isShow: true,
+                alertMessage: `Currently encrypted pdf files are not supported.`
+              });
+            } else {
+              console.log("err in signing", err);
+              setIsAlert({
+                isShow: true,
+                alertMessage: `Something went wrong.`
+              });
+            }
+          }
+        }
+      } catch (err) {
+        console.log("err in embedselfsign ", err);
+        setIsUiLoading(false);
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong, please try again later."
+        });
       }
-    } catch (err) {
-      console.log("err in embedselfsign ", err);
-      setIsUiLoading(false);
-      setIsAlert({
-        isShow: true,
-        alertMessage: "something went wrong, please try again later."
-      });
     }
   }
   //function for get digital signature
@@ -1123,6 +1123,11 @@ function SignYourSelf() {
               </span>
             </div>
           )}
+          {isCelebration && (
+            <div style={{ position: "relative", zIndex: "999" }}>
+              <Confetti width={window.innerWidth} height={window.innerHeight} />
+            </div>
+          )}
 
           <div className="signatureContainer" ref={divRef}>
             {!isEmailVerified && (
@@ -1187,7 +1192,7 @@ function SignYourSelf() {
               {/* this modal is used show this document is already sign */}
               <ModalUi
                 isOpen={showAlreadySignDoc.status}
-                title={"Sign Documents"}
+                title={"Document signed"}
                 handleClose={() => {
                   setShowAlreadySignDoc({ status: false });
                 }}
@@ -1259,7 +1264,6 @@ function SignYourSelf() {
               <EmailComponent
                 isEmail={isEmail}
                 pdfUrl={pdfUrl}
-                isCeleb={isCeleb}
                 setIsEmail={setIsEmail}
                 pdfName={pdfDetails[0] && pdfDetails[0].Name}
                 setSuccessEmail={setSuccessEmail}

apps/OpenSign/src/pages/TemplatePlaceholder.js

@@ -36,6 +36,7 @@ import AddRoleModal from "../components/pdf/AddRoleModal";
 import PlaceholderCopy from "../components/pdf/PlaceholderCopy";
 import TourContentWithBtn from "../primitives/TourContentWithBtn";
 import DropdownWidgetOption from "../components/pdf/DropdownWidgetOption";
+import Parse from "parse";
 const TemplatePlaceholder = () => {
   const navigate = useNavigate();
   const { templateId } = useParams();
@@ -704,35 +705,29 @@ const TemplatePlaceholder = () => {
           Name: pdfDetails[0]?.Name || "",
           Note: pdfDetails[0]?.Note || "",
           Description: pdfDetails[0]?.Description || "",
-          SendinOrder: pdfDetails[0]?.SendinOrder || false
+          SendinOrder: pdfDetails[0]?.SendinOrder || false,
+          AutomaticReminders: pdfDetails[0]?.AutomaticReminders,
+          RemindOnceInEvery: parseInt(pdfDetails[0]?.RemindOnceInEvery),
+          NextReminderDate: pdfDetails[0]?.NextReminderDate
         };
+        const updateTemplate = new Parse.Object("contracts_Template");
+        updateTemplate.id = templateId;
+        for (const key in data) {
+          updateTemplate.set(key, data[key]);
+        }
+        await updateTemplate.save(null, {
+          sessionToken: localStorage.getItem("accesstoken")
+        });
 
-        await axios
-          .put(
-            `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
-              "_appName"
-            )}_Template/${templateId}`,
-            data,
-            {
-              headers: {
-                "Content-Type": "application/json",
-                "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-                "X-Parse-Session-Token": localStorage.getItem("accesstoken")
-              }
-            }
-          )
-          .then(() => {
-            setIsCreateDocModal(true);
-            setIsMailSend(true);
-            const loadObj = {
-              isLoad: false
-            };
-            setIsLoading(loadObj);
-          })
-          .catch((err) => {
-            console.log("axois err ", err);
-          });
+        setIsCreateDocModal(true);
+        setIsMailSend(true);
+        const loadObj = {
+          isLoad: false
+        };
+        setIsLoading(loadObj);
       } catch (e) {
+        setIsLoading(false);
+        alert("Something went wrong, please try again later.");
         console.log("error", e);
       }
     } else {
@@ -1207,7 +1202,6 @@ const TemplatePlaceholder = () => {
     setIsCheckbox(false);
   };
 
-  console.log("signerpos", signerPos);
   return (
     <div>
       <Title title={"Template"} />

apps/OpenSign/src/pages/UserProfile.js

@@ -1,4 +1,8 @@
-import React, { useState, useEffect } from "react";
+import React, {
+  useState,
+  useEffect
+  // useRef
+} from "react";
 import { Navigate, useNavigate } from "react-router-dom";
 import Parse from "parse";
 import { SaveFileSize } from "../constant/saveFileSize";
@@ -27,6 +31,10 @@ function UserProfile() {
   const [percentage, setpercentage] = useState(0);
   const [isDisableDocId, setIsDisableDocId] = useState(false);
   const [isSubscribe, setIsSubscribe] = useState(false);
+  // const [publicUserName, setPublicUserName] = useState(
+  //   extendUser && extendUser?.[0]?.UserName
+  // );
+  // const previousPublicUserName = useRef(publicUserName);
   const [company, setCompany] = useState(
     extendUser && extendUser?.[0]?.Company
   );
@@ -37,6 +45,7 @@ function UserProfile() {
   const [otp, setOtp] = useState("");
   const [otpLoader, setOtpLoader] = useState(false);
   const [isEmailVerified, setIsEmailVerified] = useState(false);
+  // const [userNameError, setUserNameError] = useState("");
   useEffect(() => {
     getUserDetail();
   }, []);
@@ -74,46 +83,72 @@ function UserProfile() {
       }
     }
   };
+  //function to check public username already exist
+  // const handleCheckPublicUserName = async () => {
+  //   try {
+  //     const res = await Parse.Cloud.run("getpublicusername", {
+  //       username: publicUserName
+  //     });
+  //     if (res) {
+  //       setIsLoader(false);
+  //       setUserNameError("user name already exist");
+  //       setTimeout(() => {
+  //         setUserNameError("");
+  //       }, 3000);
+  //       return res;
+  //     }
+  //   } catch (e) {
+  //     console.log("error in getpublicusername cloud function");
+  //   }
+  // };
   const handleSubmit = async (e) => {
     e.preventDefault();
-    setIsLoader(true);
-    let phn = Phone;
-
-    try {
-      const tour = Parse.Object.extend("_User");
-      const query = new Parse.Query(tour);
-
-      await query.get(UserProfile.objectId).then((object) => {
-        object.set("name", name);
-        object.set("ProfilePic", Image);
-        object.set("phone", phn);
-
-        object.save().then(
-          async (response) => {
-            if (response) {
-              let res = response.toJSON();
-              let rr = JSON.stringify(res);
-              localStorage.setItem("UserInformation", rr);
-              SetName(res.name);
-              SetPhone(res.phone);
-              setImage(res.ProfilePic);
-              localStorage.setItem("username", res.name);
-              localStorage.setItem("profileImg", res.ProfilePic);
-              await updateExtUser({ Name: res.name, Phone: res.phone });
-              alert("Profile updated successfully.");
-              setEditMode(false);
-              navigate("/dashboard/35KBoSgoAK");
+    let phn = Phone,
+      res = "";
+    //condition to call cloud function when user change publicUserName
+    // if (previousPublicUserName.current !== publicUserName) {
+    //   res = await handleCheckPublicUserName();
+    // }
+    if (!res) {
+      setIsLoader(true);
+      try {
+        const userQuery = Parse.Object.extend("_User");
+        const query = new Parse.Query(userQuery);
+        await query.get(UserProfile.objectId).then((object) => {
+          object.set("name", name);
+          object.set("ProfilePic", Image);
+          object.set("phone", phn || "");
+          object.save().then(
+            async (response) => {
+              if (response) {
+                let res = response.toJSON();
+                let rr = JSON.stringify(res);
+                localStorage.setItem("UserInformation", rr);
+                SetName(res.name);
+                SetPhone(res?.phone || "");
+                setImage(res.ProfilePic);
+                localStorage.setItem("username", res.name);
+                localStorage.setItem("profileImg", res.ProfilePic);
+                await updateExtUser({
+                  Name: res.name,
+                  Phone: res?.phone || ""
+                });
+                alert("Profile updated successfully.");
+                setEditMode(false);
+                setIsLoader(false);
+                //navigate("/dashboard/35KBoSgoAK");
+              }
+            },
+            (error) => {
+              alert("Something went wrong.");
+              console.error("Error while updating tour", error);
+              setIsLoader(false);
             }
-          },
-          (error) => {
-            alert("Something went wrong.");
-            console.error("Error while updating tour", error);
-            setIsLoader(false);
-          }
-        );
-      });
-    } catch (error) {
-      console.log("err", error);
+          );
+        });
+      } catch (error) {
+        console.log("err", error);
+      }
     }
   };
 
@@ -122,14 +157,15 @@ function UserProfile() {
     const extClass = localStorage.getItem("extended_class");
     const extData = JSON.parse(localStorage.getItem("Extand_Class"));
     const ExtUserId = extData[0].objectId;
-
     const body = {
-      Phone: obj.Phone,
+      Phone: obj?.Phone || "",
       Name: obj.Name,
       HeaderDocId: isDisableDocId,
       JobTitle: jobTitle,
       Company: company
+      // UserName: publicUserName || ""
     };
+
     await axios.put(
       parseBaseUrl + "classes/" + extClass + "/" + ExtUserId,
       body,
@@ -147,7 +183,6 @@ function UserProfile() {
 
     const json = JSON.parse(JSON.stringify([res]));
     const extRes = JSON.stringify(json);
-
     localStorage.setItem("Extand_Class", extRes);
     // console.log("updateRes ", updateRes);
   };
@@ -241,6 +276,27 @@ function UserProfile() {
     setOtpLoader(false);
     alert("OTP sent on you email");
   };
+  //function to handle onchange username and restrict 6-characters username for free users
+  // const handleOnchangeUserName = (e) => {
+  //   const value = e.target.value;
+  //   if (value.length > 6 && !isSubscribe) {
+  //     setUserNameError("Please upgrade to allow more than 6 characters.");
+  //     setTimeout(() => {
+  //       setUserNameError("");
+  //     }, 2000);
+  //   } else {
+  //     setPublicUserName(e.target.value);
+  //   }
+  // };
+  const handleCancel = () => {
+    setEditMode(false);
+    SetName(localStorage.getItem("username"));
+    SetPhone(UserProfile && UserProfile.phone);
+    setImage(localStorage.getItem("profileImg"));
+    // setPublicUserName(extendUser && extendUser?.[0]?.UserName);
+    setCompany(extendUser && extendUser?.[0]?.Company);
+    setJobTitle(extendUser?.[0]?.JobTitle);
+  };
   return (
     <React.Fragment>
       <Title title={"Profile"} />
@@ -262,7 +318,14 @@ function UserProfile() {
           ></div>
         </div>
       ) : (
-        <div className="flex justify-center items-center w-full">
+        <div className="flex justify-center items-center w-full relative">
+          {/* {userNameError && (
+            <div
+              className={`z-[1000] fixed top-[50%]  transform border-[1px] text-sm border-[#f0a8a8] bg-[#f4bebe] text-[#c42121] rounded py-[.75rem] px-[1.25rem]`}
+            >
+              {userNameError}
+            </div>
+          )} */}
           <div className="bg-white flex flex-col justify-center shadow rounded w-[450px]">
             <div className="flex flex-col justify-center items-center my-4">
               <div className="w-[200px] h-[200px] overflow-hidden rounded-full">
@@ -390,6 +453,37 @@ function UserProfile() {
                   )}
                 </span>
               </li>
+              {/* {isEnableSubscription && (
+                <li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
+                  <span className="font-semibold">
+                    Public profile :{" "}
+                    <Tooltip
+                      message={`this is your public URL. Copy or share it
+                   with the signer, and you will be able to see
+                   all your publicly set templates.`}
+                    />
+                  </span>
+                  <div className="flex items-center">
+                    <span>opensign-me.vercel.app/</span>
+                    {editmode ? (
+                      <input
+                        onChange={handleOnchangeUserName}
+                        value={publicUserName}
+                        disabled={!editmode}
+                        placeholder="enter user name"
+                        className="border-[1px] border-gray-200 rounded-[3px]"
+                      />
+                    ) : (
+                      <input
+                        value={extendUser?.[0]?.UserName}
+                        disabled
+                        placeholder="enter user name"
+                        className="border-[1px] border-gray-200 rounded-[3px]"
+                      />
+                    )}
+                  </div>
+                </li>
+              )} */}
               <li className="border-y-[1px] border-gray-300 break-all">
                 <div className="flex justify-between items-center py-2">
                   <span
@@ -404,7 +498,6 @@ function UserProfile() {
                       url={
                         "https://docs.opensignlabs.com/docs/help/Settings/disabledocumentid"
                       }
-                      isSubscribe={isSubscribe}
                     />{" "}
                     {!isSubscribe && isEnableSubscription && <Upgrade />}
                   </span>{" "}
@@ -461,7 +554,7 @@ function UserProfile() {
                 type="button"
                 onClick={() => {
                   if (editmode) {
-                    setEditMode(false);
+                    handleCancel();
                   } else {
                     navigate("/changepassword");
                   }

apps/OpenSign/src/primitives/AddContact.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import Parse from "parse";
 import axios from "axios";
 import "../styles/AddUser.css";
-const AddUser = (props) => {
+const AddContact = (props) => {
   const [name, setName] = useState("");
   const [phone, setPhone] = useState("");
   const [email, setEmail] = useState("");
@@ -21,7 +21,7 @@ const AddUser = (props) => {
     );
     if (savedUserDetails && addYourself) {
       setName(savedUserDetails.name);
-      setPhone(savedUserDetails.phone);
+      setPhone(savedUserDetails?.phone || "");
       setEmail(savedUserDetails.email);
     }
   }, [addYourself]);
@@ -50,7 +50,9 @@ const AddUser = (props) => {
     try {
       const contactQuery = new Parse.Object("contracts_Contactbook");
       contactQuery.set("Name", name);
-      contactQuery.set("Phone", phone);
+      if (phone) {
+        contactQuery.set("Phone", phone);
+      }
       contactQuery.set("Email", email);
       contactQuery.set("UserRole", "contracts_Guest");
 
@@ -68,8 +70,10 @@ const AddUser = (props) => {
         _user.set("name", name);
         _user.set("username", email);
         _user.set("email", email);
-        _user.set("phone", phone);
-        _user.set("password", phone);
+        _user.set("password", email);
+        if (phone) {
+          _user.set("phone", phone);
+        }
 
         const user = await _user.save();
         if (user) {
@@ -245,23 +249,21 @@ const AddUser = (props) => {
               type="email"
               id="email"
               value={email}
-              onChange={(e) => setEmail(e.target.value)}
+              onChange={(e) => setEmail(e.target.value?.toLowerCase())}
               required
               disabled={addYourself}
-              className="addUserInput"
+              className="addUserInput lowercase"
             />
           </div>
           <div className="form-section">
             <label htmlFor="phone" style={{ fontSize: 13 }}>
               Phone
-              <span style={{ color: "red", fontSize: 13 }}> *</span>
             </label>
             <input
               type="text"
               id="phone"
               value={phone}
               onChange={(e) => setPhone(e.target.value)}
-              required
               disabled={addYourself}
               className="addUserInput"
             />
@@ -285,4 +287,4 @@ const AddUser = (props) => {
   );
 };
 
-export default AddUser;
+export default AddContact;

apps/OpenSign/src/primitives/Alert.js

@@ -18,7 +18,7 @@ const Alert = ({ children, type }) => {
     <>
       {children && (
         <div
-          className={`z-40 fixed top-20 left-1/2 transform -translate-x-1/2 border-[1px] text-sm ${textcolor} rounded py-[.75rem] px-[1.25rem] z-50`}
+          className={`z-[1000] fixed top-20 left-1/2 transform -translate-x-1/2 border-[1px] text-sm ${textcolor} rounded py-[.75rem] px-[1.25rem] z-50`}
         >
           {children}
         </div>

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -4,20 +4,35 @@ import { useNavigate } from "react-router-dom";
 import axios from "axios";
 import ModalUi from "./ModalUi";
 import AddSigner from "../components/AddSigner";
-import { modalSubmitBtnColor, modalCancelBtnColor } from "../constant/const";
+import {
+  modalSubmitBtnColor,
+  modalCancelBtnColor
+  // isEnableSubscription
+} from "../constant/const";
 import Alert from "./Alert";
 import Tooltip from "./Tooltip";
 import { RWebShare } from "react-web-share";
 import Tour from "reactour";
 import Parse from "parse";
 import { saveAs } from "file-saver";
+import {
+  // copytoData,
+  replaceMailVaribles
+} from "../constant/Utils";
+// import Confetti from "react-confetti";
+import EditorToolbar, {
+  module1,
+  formats
+} from "../components/pdf/EditorToolbar";
+import ReactQuill from "react-quill";
+import "react-quill/dist/quill.snow.css";
+import BulkSendUi from "../components/BulkSendUi";
 
 const ReportTable = (props) => {
   const navigate = useNavigate();
   const [currentPage, setCurrentPage] = useState(1);
   const [actLoader, setActLoader] = useState({});
   const [isAlert, setIsAlert] = useState(false);
-  const [isDocErr, setIsDocErr] = useState(false);
   const [isContactform, setIsContactform] = useState(false);
   const [isDeleteModal, setIsDeleteModal] = useState({});
   const [isRevoke, setIsRevoke] = useState({});
@@ -28,6 +43,22 @@ const ReportTable = (props) => {
   const [alertMsg, setAlertMsg] = useState({ type: "success", message: "" });
   const [isTour, setIsTour] = useState(false);
   const [tourStatusArr, setTourStatusArr] = useState([]);
+  const [isResendMail, setIsResendMail] = useState({});
+  // const [isMakePublic, setIsMakePublic] = useState({});
+  const [mail, setMail] = useState({ subject: "", body: "" });
+  const [userDetails, setUserDetails] = useState({});
+  const [isNextStep, setIsNextStep] = useState({});
+  const [isBulkSend, setIsBulkSend] = useState({});
+  const [templateDeatils, setTemplateDetails] = useState({});
+  const [placeholders, setPlaceholders] = useState([]);
+  const [isLoader, setIsLoader] = useState({});
+  // const [selectedPublicRole, setSelectedPublicRole] = useState("");
+  // const [isCelebration, setIsCelebration] = useState(false);
+  // const [currentLists, setCurrentLists] = useState([]);
+  // const [isPublic, setIsPublic] = useState({});
+  // const [isPublicProfile, setIsPublicProfile] = useState({});
+  // const [publicUserName, setIsPublicUserName] = useState("");
+  const [isViewShare, setIsViewShare] = useState({});
   const startIndex = (currentPage - 1) * props.docPerPage;
   const { isMoreDocs, setIsNextRecord } = props;
   // For loop is used to calculate page numbers visible below table
@@ -89,8 +120,6 @@ const ReportTable = (props) => {
               }
             }
           );
-
-          // console.log("templateDeatils.data ", templateDeatils.data);
           const templateData =
             templateDeatils.data && templateDeatils.data.result;
           if (!templateData.error) {
@@ -117,6 +146,7 @@ const ReportTable = (props) => {
                 Name: Doc.Name,
                 URL: Doc.URL,
                 SignedUrl: Doc.SignedUrl,
+                SentToOthers: Doc?.SentToOthers || false,
                 Description: Doc.Description,
                 Note: Doc.Note,
                 Placeholders: placeholdersArr,
@@ -130,7 +160,10 @@ const ReportTable = (props) => {
                   className: "_User",
                   objectId: Doc.CreatedBy.objectId
                 },
-                Signers: signers
+                Signers: signers,
+                SendinOrder: Doc?.SendinOrder || false,
+                AutomaticReminders: Doc?.AutomaticReminders || false,
+                RemindOnceInEvery: Doc?.RemindOnceInEvery || 5
               };
               try {
                 const res = await axios.post(
@@ -149,7 +182,6 @@ const ReportTable = (props) => {
                   }
                 );
 
-                // console.log("Res ", res.data);
                 if (res.data && res.data.objectId) {
                   setActLoader({});
                   setIsAlert(true);
@@ -169,7 +201,6 @@ const ReportTable = (props) => {
                 setActLoader({});
               }
             } else {
-              setIsDocErr(true);
               setActLoader({});
             }
           } else {
@@ -210,13 +241,29 @@ const ReportTable = (props) => {
       setIsRevoke({ [item.objectId]: true });
     } else if (act.action === "option") {
       setIsOption({ [item.objectId]: !isOption[item.objectId] });
+    } else if (act.action === "resend") {
+      setIsResendMail({ [item.objectId]: true });
+    } else if (act.action === "bulksend") {
+      handleBulkSend(item);
     }
   };
   // Get current list
   const indexOfLastDoc = currentPage * props.docPerPage;
   const indexOfFirstDoc = indexOfLastDoc - props.docPerPage;
-  // `currentLists` is total record render on current page
-  const currentLists = props.List?.slice(indexOfFirstDoc, indexOfLastDoc);
+  const currentList = props.List?.slice(indexOfFirstDoc, indexOfLastDoc);
+  // useEffect(() => {
+  //   // `currentLists` is total record render on current page
+  //   const currentList = props.List?.slice(indexOfFirstDoc, indexOfLastDoc);
+  //   //check public template and save in a object to show public and private template
+  //   // setIsPublic(
+  //   //   currentList.reduce((acc, item) => {
+  //   //     acc[item.objectId] = item?.IsPublic || false;
+  //   //     return acc;
+  //   //   }, {})
+  //   // );
+  //   setCurrentLists(currentList);
+  //   // eslint-disable-next-line react-hooks/exhaustive-deps
+  // }, [indexOfLastDoc, indexOfFirstDoc]);
 
   // Change page
   const paginateFront = () => setCurrentPage(currentPage + 1);
@@ -254,7 +301,6 @@ const ReportTable = (props) => {
           "X-Parse-Session-Token": localStorage.getItem("accesstoken")
         }
       });
-      // console.log("Res ", res.data);
       if (res.data && res.data.updatedAt) {
         setActLoader({});
         setIsAlert(true);
@@ -282,19 +328,33 @@ const ReportTable = (props) => {
   const handleClose = () => {
     setIsRevoke({});
     setIsDeleteModal({});
+    // setIsMakePublic({});
+    // setSelectedPublicRole("");
+    // setIsPublic((prevStates) => ({
+    //   ...prevStates,
+    //   [item.objectId]: !prevStates[item.objectId]
+    // }));
+    // setIsPublicProfile({});
   };
 
   const handleShare = (item) => {
     setActLoader({ [item.objectId]: true });
     const host = window.location.origin;
+    const sendMail = item?.SendMail || false;
     const getUrl = (x) => {
       //encode this url value `${item.objectId}/${x.Email}/${x.objectId}` to base64 using `btoa` function
-      const encodeBase64 = btoa(`${item.objectId}/${x.Email}/${x.objectId}`);
-      return `${host}/login/${encodeBase64}`;
+      if (x?.signerObjId) {
+        const encodeBase64 = btoa(
+          `${item.objectId}/${x.signerPtr.Email}/${x.signerPtr.objectId}/${sendMail}`
+        );
+        return `${host}/login/${encodeBase64}`;
+      } else {
+        const encodeBase64 = btoa(`${item.objectId}/${x.email}`);
+        return `${host}/login/${encodeBase64}`;
+      }
     };
-
-    const urls = item.Signers.map((x) => ({
-      email: x.Email,
+    const urls = item?.Placeholders?.map((x) => ({
+      email: x.email ? x.email : x.signerPtr.Email,
       url: getUrl(x)
     }));
     setShareUrls(urls);
@@ -315,9 +375,9 @@ const ReportTable = (props) => {
 
     await axios
       .put(
-        `${localStorage.getItem("baseUrl")}classes/${localStorage.getItem(
-          "_appName"
-        )}_Document/${item.objectId}`,
+        `${localStorage.getItem("baseUrl")}classes/contracts_Document/${
+          item.objectId
+        }`,
         data,
         {
           headers: {
@@ -437,6 +497,368 @@ const ReportTable = (props) => {
       }
     }
   };
+
+  // `handleSubjectChange` is used to add or change subject of resend mail
+  const handleSubjectChange = (subject, doc) => {
+    const encodeBase64 = userDetails?.objectId
+      ? btoa(`${doc.objectId}/${userDetails.Email}/${userDetails.objectId}`)
+      : btoa(`${doc.objectId}/${userDetails.Email}`);
+    const expireDate = doc.ExpiryDate.iso;
+    const newDate = new Date(expireDate);
+    const localExpireDate = newDate.toLocaleDateString("en-US", {
+      day: "numeric",
+      month: "long",
+      year: "numeric"
+    });
+    const signPdf = `${window.location.origin}/login/${encodeBase64}`;
+    const variables = {
+      document_title: doc.Name,
+      sender_name: doc.ExtUserPtr.Name,
+      sender_mail: doc.ExtUserPtr.Email,
+      sender_phone: doc.ExtUserPtr?.Phone || "",
+      receiver_name: userDetails?.Name,
+      receiver_email: userDetails?.Email,
+      receiver_phone: userDetails?.Phone || "",
+      expiry_date: localExpireDate,
+      company_name: doc.ExtUserPtr.Company,
+      signing_url: `<a href=${signPdf}>Sign here</a>`
+    };
+    const res = replaceMailVaribles(subject, "", variables);
+
+    setMail((prev) => ({ ...prev, subject: res.subject }));
+  };
+  // `handlebodyChange` is used to add or change body of resend mail
+  const handlebodyChange = (body, doc) => {
+    const encodeBase64 = userDetails?.objectId
+      ? btoa(`${doc.objectId}/${userDetails.Email}/${userDetails.objectId}`)
+      : btoa(`${doc.objectId}/${userDetails.Email}`);
+    const expireDate = doc.ExpiryDate.iso;
+    const newDate = new Date(expireDate);
+    const localExpireDate = newDate.toLocaleDateString("en-US", {
+      day: "numeric",
+      month: "long",
+      year: "numeric"
+    });
+    const signPdf = `${window.location.origin}/login/${encodeBase64}`;
+    const variables = {
+      document_title: doc.Name,
+      sender_name: doc.ExtUserPtr.Name,
+      sender_mail: doc.ExtUserPtr.Email,
+      sender_phone: doc.ExtUserPtr?.Phone || "",
+      receiver_name: userDetails?.Name || "",
+      receiver_email: userDetails?.Email || "",
+      receiver_phone: userDetails?.Phone || "",
+      expiry_date: localExpireDate,
+      company_name: doc.ExtUserPtr.Company,
+      signing_url: `<a href=${signPdf}>Sign here</a>`
+    };
+    const res = replaceMailVaribles("", body, variables);
+
+    if (body) {
+      setMail((prev) => ({ ...prev, body: res.body }));
+    }
+  };
+  // `handleNextBtn` is used to open edit mail template screen in resend mail modal
+  // as well as replace variable with original one
+  const handleNextBtn = (user, doc) => {
+    const userdata = {
+      Name: user?.signerPtr?.Name,
+      Email: user.email ? user?.email : user.signerPtr?.Email,
+      Phone: user?.signerPtr?.Phone,
+      objectId: user?.signerPtr?.objectId
+    };
+    setUserDetails(userdata);
+    const encodeBase64 = user.email
+      ? btoa(`${doc.objectId}/${user.email}`)
+      : btoa(
+          `${doc.objectId}/${user.signerPtr.Email}/${user.signerPtr.objectId}`
+        );
+    const expireDate = doc.ExpiryDate.iso;
+    const newDate = new Date(expireDate);
+    const localExpireDate = newDate.toLocaleDateString("en-US", {
+      day: "numeric",
+      month: "long",
+      year: "numeric"
+    });
+    const signPdf = `${window.location.origin}/login/${encodeBase64}`;
+    const variables = {
+      document_title: doc.Name,
+      sender_name: doc.ExtUserPtr.Name,
+      sender_mail: doc.ExtUserPtr.Email,
+      sender_phone: doc.ExtUserPtr?.Phone || "",
+      receiver_name: user?.signerPtr?.Name || "",
+      receiver_email: user?.email ? user?.email : user?.signerPtr?.Email,
+      receiver_phone: user?.signerPtr?.Phone || "",
+      expiry_date: localExpireDate,
+      company_name: doc?.ExtUserPtr?.Company || "",
+      signing_url: `<a href=${signPdf}>Sign here</a>`
+    };
+
+    const subject =
+      doc?.RequestSubject ||
+      `{{sender_name}} has requested you to sign "{{document_title}}"`;
+    const body =
+      doc?.RequestBody ||
+      `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}} has requested you to review and sign <b>"{{document_title}}"</b>.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p>{{signing_url}}</p><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team OpenSign™</p><br></body> </html>`;
+    const res = replaceMailVaribles(subject, body, variables);
+    setMail((prev) => ({ ...prev, subject: res.subject, body: res.body }));
+    setIsNextStep({ [user.Id]: true });
+  };
+  const handleResendMail = async (e, doc, user) => {
+    e.preventDefault();
+    setActLoader({ [user?.Id]: true });
+    const url = `${localStorage.getItem("baseUrl")}functions/sendmailv3`;
+    const headers = {
+      "Content-Type": "application/json",
+      "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+      sessionToken: localStorage.getItem("accesstoken")
+    };
+    let params = {
+      mailProvider: doc?.ExtUserPtr?.active_mail_adapter,
+      extUserId: doc?.ExtUserPtr?.objectId,
+      recipient: userDetails?.Email,
+      subject: mail.subject,
+      from: doc?.ExtUserPtr?.Email,
+      html: mail.body
+    };
+    try {
+      const res = await axios.post(url, params, { headers: headers });
+      if (res?.data?.result?.status === "success") {
+        setIsAlert(true);
+        setAlertMsg({ type: "success", message: "Mail sent successfully." });
+      } else {
+        setIsAlert(true);
+        setAlertMsg({
+          type: "danger",
+          message: "Something went wrong, please try again later!"
+        });
+      }
+    } catch (err) {
+      console.log("err in sendmail", err);
+      setIsAlert(true);
+      setAlertMsg({
+        type: "danger",
+        message: "Something went wrong, please try again later!"
+      });
+    } finally {
+      setTimeout(() => setIsAlert(false), 1500);
+      setIsNextStep({});
+      setUserDetails({});
+      setActLoader({});
+    }
+  };
+  const fetchUserStatus = (user, doc) => {
+    const email = user.email ? user.email : user.signerPtr.Email;
+    const audit = doc?.AuditTrail?.find((x) => x.UserPtr.Email === email);
+
+    return (
+      <div className="flex flex-row gap-2 justify-center items-center">
+        <div className="flex justify-center items-center bg-gray-200 text-xs text-black shadow rounded-full w-[65px] h-[23px] cursor-default">
+          {audit?.Activity ? audit?.Activity : "Awaited"}
+        </div>
+
+        <button
+          onClick={() => handleNextBtn(user, doc)}
+          className={`${
+            audit?.Activity !== "Signed" ? "bg-[#32a3ac] shadow-md" : ""
+          } flex justify-center items-center text-center text-white  rounded w-[60px] h-[30px]`}
+          disabled={audit?.Activity === "Signed"}
+        >
+          {audit?.Activity !== "Signed" && "Resend"}
+        </button>
+      </div>
+    );
+  };
+  // `handleQuickSendClose` is trigger when bulk send component trigger close event
+  const handleQuickSendClose = (status, count) => {
+    setIsBulkSend({});
+    setIsAlert(true);
+    if (status === "success") {
+      if (count > 1) {
+        setAlertMsg({
+          type: "success",
+          message: count + " Document sent successfully!"
+        });
+        setTimeout(() => setIsAlert(false), 1500);
+      } else {
+        setAlertMsg({
+          type: "success",
+          message: count + " Document sent successfully!"
+        });
+        setTimeout(() => setIsAlert(false), 1500);
+      }
+    } else {
+      setAlertMsg({
+        type: "danger",
+        message: "Something went wrong, Please try again later!"
+      });
+      setTimeout(() => setIsAlert(false), 1500);
+    }
+  };
+
+  // `handleBulkSend` is used to open modal as well as fetch template
+  // and show Ui on the basis template response
+  const handleBulkSend = async (template) => {
+    setIsBulkSend({ [template.objectId]: true });
+    setIsLoader({ [template.objectId]: true });
+    try {
+      const params = {
+        templateId: template.objectId,
+        include: ["Placeholders.signerPtr"]
+      };
+      const axiosRes = await axios.post(
+        `${localStorage.getItem("baseUrl")}functions/getTemplate`,
+        params,
+        {
+          headers: {
+            "Content-Type": "application/json",
+            "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+            sessionToken: localStorage.getItem("accesstoken")
+          }
+        }
+      );
+      const templateRes = axiosRes.data && axiosRes.data.result;
+      setPlaceholders(templateRes?.Placeholders);
+      setTemplateDetails(templateRes);
+      setIsLoader({});
+    } catch (err) {
+      console.log("err in fetch template in bulk modal", err);
+      setIsBulkSend({});
+      setIsAlert(true);
+      setAlertMsg({
+        type: "danger",
+        message: "Something went wrong, Please try again later!"
+      });
+      setTimeout(() => setIsAlert(false), 1500);
+    }
+  };
+
+  //function to make template public and set public role
+  // const handlePublicTemplate = async (item) => {
+  //   if (selectedPublicRole || !isPublic[item.objectId]) {
+  //     setActLoader({ [item.objectId]: true });
+  //     setIsMakePublic(false);
+  //     try {
+  //       const res = await Parse.Cloud.run("createpublictemplate", {
+  //         templateid: item.objectId,
+  //         ispublic: isPublic[item.objectId],
+  //         publicrole: [selectedPublicRole]
+  //       });
+
+  //       if (res.status === "success") {
+  //         setIsAlert(true);
+  //         setTimeout(() => setIsAlert(false), 1500);
+  //         if (isPublic[item.objectId]) {
+  //           setAlertMsg({
+  //             type: "success",
+  //             message: "You have successfully made the template public."
+  //           });
+  //           setIsCelebration(true);
+  //           setTimeout(() => {
+  //             setIsCelebration(false);
+  //           }, 5000);
+  //           setIsPublicProfile({ [item.objectId]: isPublic[item.objectId] });
+  //         } else {
+  //           setAlertMsg({
+  //             type: "success",
+  //             message: "You have successfully made the template private."
+  //           });
+  //           setSelectedPublicRole("");
+  //         }
+  //         const updateList = props.List.map((x) =>
+  //           x.objectId === item.objectId
+  //             ? { ...x, IsPublic: isPublic[item.objectId] }
+  //             : x
+  //         );
+  //         props.setList(updateList);
+  //         setActLoader({});
+  //       }
+  //     } catch (e) {
+  //       console.log("error in createpublictemplate", e);
+  //       setIsAlert(true);
+  //       setAlertMsg({
+  //         type: "danger",
+  //         message: "Something went wrong, Please try again later!"
+  //       });
+  //       setTimeout(() => setIsAlert(false), 1500);
+  //       setIsPublic((prevStates) => ({
+  //         ...prevStates,
+  //         [item.objectId]: !prevStates[item.objectId]
+  //       }));
+  //     }
+  //   } else {
+  //     setIsAlert(true);
+  //     setAlertMsg({
+  //       type: "danger",
+  //       message: "You need to select a role for the public signers."
+  //     });
+  //     setTimeout(() => setIsAlert(false), 1500);
+  //   }
+  // };
+
+  const handleViewSigners = (item) => {
+    setIsViewShare({ [item.objectId]: true });
+  };
+  //function to handle change template status is public or private
+  // const handlePublicChange = async (e, item) => {
+  //   const getPlaceholder = item?.Placeholders;
+  //   //condiiton to check role is exist or not
+  //   if (getPlaceholder && getPlaceholder.length > 0) {
+  //     const checkIsSignatureExistt = getPlaceholder?.every((placeholderObj) =>
+  //       placeholderObj?.placeHolder?.some((holder) =>
+  //         holder?.pos?.some((posItem) => posItem?.type === "signature")
+  //       )
+  //     );
+  //     if (checkIsSignatureExistt) {
+  //       let extendUser = JSON.parse(localStorage.getItem("Extand_Class"));
+  //       const userName = extendUser[0]?.UserName;
+  //       setIsPublicUserName(extendUser[0]?.UserName);
+  //       //condition to check user have public url or not
+  //       if (userName) {
+  //         setIsPublic((prevStates) => ({
+  //           ...prevStates,
+  //           [item.objectId]: e.target.checked
+  //         }));
+  //         const getPlaceholder = item?.Placeholders;
+  //         if (getPlaceholder.length === 1) {
+  //           setSelectedPublicRole(getPlaceholder[0]?.Role);
+  //         }
+
+  //         setIsMakePublic({ [item.objectId]: true });
+  //       } else {
+  //         setIsPublicProfile({ [item.objectId]: true });
+  //       }
+  //     } else {
+  //       setIsAlert(true);
+  //       setAlertMsg({
+  //         type: "danger",
+  //         message:
+  //           " Please ensure there's at least one signature widget added for all recipients."
+  //       });
+  //       setTimeout(() => setIsAlert(false), 5000);
+  //     }
+  //   } else {
+  //     setIsAlert(true);
+  //     setAlertMsg({
+  //       type: "danger",
+  //       message: "Please assign at least one role to make this template public."
+  //     });
+  //     setTimeout(() => setIsAlert(false), 5000);
+  //   }
+  // };
+
+  //function to copy public profile links
+  // const copytoProfileLink = () => {
+  //   const url = `https://opensign-me.vercel.app/${publicUserName}`;
+  //   copytoData(url);
+  //   setIsAlert(true);
+  //   setAlertMsg({
+  //     type: "success",
+  //     message: "Copied."
+  //   });
+  //   setTimeout(() => setIsAlert(false), 1500);
+  // };
+
   return (
     <div className="relative">
       {Object.keys(actLoader)?.length > 0 && (
@@ -448,6 +870,11 @@ const ReportTable = (props) => {
         </div>
       )}
       <div className="p-2 overflow-x-scroll w-full bg-white rounded-md">
+        {/* {isCelebration && (
+          <div style={{ position: "relative", zIndex: "1000" }}>
+            <Confetti width={window.innerWidth} height={window.innerHeight} />
+          </div>
+        )} */}
         {isAlert && <Alert type={alertMsg.type}>{alertMsg.message}</Alert>}
         {props.tourData && props.ReportName === "Templates" && (
           <Tour
@@ -494,12 +921,15 @@ const ReportTable = (props) => {
               {props.actions?.length > 0 && (
                 <th className="px-4 py-2 font-thin">Action</th>
               )}
+              {/* {props.ReportName === "Templates" && isEnableSubscription && (
+                <th className="px-4 py-2 font-thin">Public</th>
+              )} */}
             </tr>
           </thead>
           <tbody className="text-[12px]">
             {props.List?.length > 0 && (
               <>
-                {currentLists.map((item, index) =>
+                {currentList.map((item, index) =>
                   props.ReportName === "Contactbook" ? (
                     <tr className="border-y-[1px]" key={index}>
                       {props.heading.includes("Sr.No") && (
@@ -591,7 +1021,17 @@ const ReportTable = (props) => {
                         {formatRow(item?.ExtUserPtr)}
                       </td>
                       <td className="px-4 py-2">
-                        {item?.Signers ? formatRow(item?.Signers) : "-"}
+                        {/* {item?.Signers ? formatRow(item?.Signers) : "-"} */}
+                        {item?.Placeholders ? (
+                          <button
+                            onClick={() => handleViewSigners(item)}
+                            className="text-[blue] hover:underline focus:outline-none"
+                          >
+                            View
+                          </button>
+                        ) : (
+                          "-"
+                        )}
                       </td>
                       <td className="px-2 py-2 text-white flex flex-row gap-x-2 gap-y-1 justify-center items-center">
                         {props.actions?.length > 0 &&
@@ -621,19 +1061,21 @@ const ReportTable = (props) => {
                               )}
                               {isOption[item.objectId] &&
                                 act.action === "option" && (
-                                  <div className="absolute -right-2 top-5 bg-white rounded shadow z-[20] overflow-hidden">
+                                  <div className="absolute -right-2 top-5 p-1.5 bg-white text-nowrap rounded shadow-md z-[20] overflow-hidden">
                                     {act.subaction?.map((subact) => (
                                       <div
                                         key={subact.btnId}
-                                        className="hover:bg-gray-300 cursor-pointer px-2 py-1.5 flex justify-start items-center text-black"
+                                        className="hover:bg-gray-300 rounded cursor-pointer px-2 py-1.5 flex justify-start items-center text-black"
                                         onClick={() =>
                                           handleActionBtn(subact, item)
                                         }
                                         title={subact.hoverLabel}
                                       >
-                                        <i className={subact.btnIcon}></i>
+                                        <i
+                                          className={`${subact.btnIcon} mr-1.5`}
+                                        ></i>
                                         {subact.btnLabel && (
-                                          <span className="ml-[4px] text-xs capitalize">
+                                          <span className="ml-[4px] text-[13px] capitalize font-medium">
                                             {subact.btnLabel}
                                           </span>
                                         )}
@@ -643,6 +1085,48 @@ const ReportTable = (props) => {
                                 )}
                             </button>
                           ))}
+                        {isViewShare[item.objectId] && (
+                          <div className="fixed z-[999] inset-0 w-full h-full bg-black bg-opacity-[75%]">
+                            <div className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%] md:min-w-[400px] overflow-y-auto max-h-[340px] md:max-h-[400px] hide-scrollbar">
+                              <div
+                                className="cursor-pointer absolute text-white text-[22px] font-medium rounded-full z-50 top-1 right-3"
+                                onClick={() => setIsViewShare({})}
+                              >
+                                &times;
+                              </div>
+
+                              <table className="table-auto w-full">
+                                <thead className="text-white h-[38px] sticky top-0 bg-[#32a3ac]">
+                                  <tr>
+                                    {props.ReportName === "Templates" && (
+                                      <th className="p-2 pl-3">Roles</th>
+                                    )}
+                                    <th className="p-2">Signers</th>
+                                  </tr>
+                                </thead>
+                                <tbody>
+                                  {item.Placeholders.map((x, i) => (
+                                    <tr
+                                      key={i}
+                                      className="text-sm font-normal text-black odd:bg-white even:bg-gray-200"
+                                    >
+                                      {props.ReportName === "Templates" && (
+                                        <td className="text-[12px] p-2 pl-3">
+                                          {x.Role && x.Role}
+                                        </td>
+                                      )}
+                                      <td className="text-[12px] p-2 break-all">
+                                        {x.email
+                                          ? x.email
+                                          : x?.signerPtr?.Email || "-"}
+                                      </td>
+                                    </tr>
+                                  ))}
+                                </tbody>
+                              </table>
+                            </div>
+                          </div>
+                        )}
                         {isDeleteModal[item.objectId] && (
                           <ModalUi
                             isOpen
@@ -677,6 +1161,28 @@ const ReportTable = (props) => {
                             </div>
                           </ModalUi>
                         )}
+                        {isBulkSend[item.objectId] && (
+                          <ModalUi
+                            isOpen
+                            title={"Quick send"}
+                            handleClose={() => setIsBulkSend({})}
+                          >
+                            {isLoader[item.objectId] ? (
+                              <div className="w-full h-[100px] md:h-[100px] rounded-b-md flex justify-center items-center bg-black bg-opacity-30 z-30">
+                                <div
+                                  style={{ fontSize: "45px", color: "#3dd3e0" }}
+                                  className="loader-37"
+                                ></div>
+                              </div>
+                            ) : (
+                              <BulkSendUi
+                                Placeholders={placeholders}
+                                item={templateDeatils}
+                                handleClose={handleQuickSendClose}
+                              />
+                            )}
+                          </ModalUi>
+                        )}
                         {isShare[item.objectId] && (
                           <ModalUi
                             isOpen
@@ -753,7 +1259,279 @@ const ReportTable = (props) => {
                             </div>
                           </ModalUi>
                         )}
+                        {isResendMail[item.objectId] && (
+                          <ModalUi
+                            isOpen
+                            title={"Resend Mail"}
+                            handleClose={() => {
+                              setIsResendMail({});
+                              setIsNextStep({});
+                              setUserDetails({});
+                            }}
+                          >
+                            <div className=" overflow-y-auto max-h-[340px] md:max-h-[400px]">
+                              {item?.Placeholders?.map((user) => (
+                                <React.Fragment key={user.Id}>
+                                  {isNextStep[user.Id] && (
+                                    <div className="relative ">
+                                      {actLoader[user.Id] && (
+                                        <div className="absolute w-full h-full flex justify-center items-center bg-black bg-opacity-30 z-30">
+                                          <div
+                                            style={{
+                                              fontSize: "45px",
+                                              color: "#3dd3e0"
+                                            }}
+                                            className="loader-37"
+                                          ></div>
+                                        </div>
+                                      )}
+
+                                      <form
+                                        onSubmit={(e) =>
+                                          handleResendMail(e, item, user)
+                                        }
+                                        className="w-full flex flex-col gap-2 p-3 text-black relative"
+                                      >
+                                        <div className="absolute right-5 text-xs z-40">
+                                          <Tooltip
+                                            id={`${user.Id}_help`}
+                                            message={
+                                              "You can use following variables which will get replaced with their actual values:- {{document_title}}, {{sender_name}}, {{sender_mail}}, {{sender_phone}}, {{receiver_name}}, {{receiver_email}}, {{receiver_phone}}, {{expiry_date}}, {{company_name}}, {{signing_url}}."
+                                            }
+                                          />
+                                        </div>
+                                        <div>
+                                          <label
+                                            className="text-xs ml-1"
+                                            htmlFor="mailsubject"
+                                          >
+                                            Subject{" "}
+                                          </label>
+                                          <input
+                                            id="mailsubject"
+                                            className="w-full py-1.5 px-2 border-[1px] border-gray-300 rounded"
+                                            value={mail.subject}
+                                            onChange={(e) =>
+                                              handleSubjectChange(
+                                                e.target.value,
+                                                item
+                                              )
+                                            }
+                                            required
+                                          />
+                                        </div>
+                                        <div>
+                                          <label
+                                            className="text-xs ml-1"
+                                            htmlFor="mailbody"
+                                          >
+                                            Body{" "}
+                                          </label>
+                                          <EditorToolbar containerId="toolbar1" />
+                                          <ReactQuill
+                                            id="mailbody"
+                                            theme="snow"
+                                            value={mail.body || ""}
+                                            placeholder="add body of email "
+                                            modules={module1}
+                                            formats={formats}
+                                            onChange={(value) =>
+                                              handlebodyChange(value, item)
+                                            }
+                                          />
+                                        </div>
+                                        <button
+                                          type="submit"
+                                          className="bg-[#32a3ac] w-[70px] font-semibold text-white py-2 rounded"
+                                        >
+                                          Resend
+                                        </button>
+                                      </form>
+                                    </div>
+                                  )}
+                                  {Object?.keys(isNextStep) <= 0 && (
+                                    <div className="flex justify-between items-center gap-2 my-2 px-3">
+                                      <div className="text-black">
+                                        {user?.signerPtr?.Name || "-"}{" "}
+                                        {`<${
+                                          user?.email
+                                            ? user.email
+                                            : user.signerPtr.Email
+                                        }>`}
+                                      </div>
+                                      <>{fetchUserStatus(user, item)}</>
+                                    </div>
+                                  )}
+                                </React.Fragment>
+                              ))}
+                            </div>
+                          </ModalUi>
+                        )}
                       </td>
+                      {/* {isEnableSubscription && (
+                        <td className=" pl-[20px] py-2    ">
+                          {props.ReportName === "Templates" && (
+                            <div className="  flex flex-row-">
+                              <label
+                                className={
+                                  "cursor-pointer relative inline-flex items-center mb-0"
+                                }
+                              >
+                                <input
+                                  checked={isPublic?.[item.objectId]}
+                                  onChange={(e) => handlePublicChange(e, item)}
+                                  type="checkbox"
+                                  value=""
+                                  className="sr-only peer"
+                                />
+                                <div className="w-9 h-5 bg-gray-200 peer-focus:outline-none peer-focus:ring-1 peer-focus:ring-black rounded-full peer dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-[2px] after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-4 after:w-4 after:transition-all dark:border-black peer-checked:bg-blue-600"></div>
+                              </label>
+                            </div>
+                          )}
+                          {isMakePublic[item.objectId] && (
+                            <ModalUi
+                              isOpen
+                              title={
+                                isPublic[item.objectId]
+                                  ? "Make template public"
+                                  : "Make template private"
+                              }
+                              handleClose={() => {
+                                setIsMakePublic({});
+                                setSelectedPublicRole("");
+                                setIsPublic((prevStates) => ({
+                                  ...prevStates,
+                                  [item.objectId]: !prevStates[item.objectId]
+                                }));
+                              }}
+                            >
+                              <div className="m-[20px]">
+                                <div className="font-normal text-black">
+                                  <p className="text-lg">
+                                    {" "}
+                                    {isPublic[item.objectId]
+                                      ? `Are you sure you want tof make this templat public ?`
+                                      : `Are you sure you want to make this template private? This will remove it from your public profile ?`}
+                                  </p>
+                                  {isPublic[item.objectId] && (
+                                    <div className="flex mt-2 gap-2 md:items-center">
+                                      <p className="text-[15px]">
+                                        Public role :{" "}
+                                      </p>
+                                      {item?.Placeholders?.length > 1 ? (
+                                        <select
+                                          className="w-[60%] md:w-[70%] border-[1px] border-gray-200 rounded-sm p-[2px]"
+                                          name="textvalidate"
+                                          value={selectedPublicRole}
+                                          onChange={(e) =>
+                                            setSelectedPublicRole(
+                                              e.target.value
+                                            )
+                                          }
+                                        >
+                                          <option
+                                            disabled
+                                            style={{ fontSize: "13px" }}
+                                            value=""
+                                          >
+                                            Select...
+                                          </option>
+                                          {item?.Placeholders.map(
+                                            (data, ind) => {
+                                              return (
+                                                <option
+                                                  style={{ fontSize: "13px" }}
+                                                  key={ind}
+                                                  value={data?.Role}
+                                                >
+                                                  {data?.Role}
+                                                </option>
+                                              );
+                                            }
+                                          )}
+                                        </select>
+                                      ) : (
+                                        <div className="w-[60%] md:w-[70%] border-[1px] border-gray-200 rounded-sm p-[2px]">
+                                          {item?.Placeholders[0]?.Role}
+                                        </div>
+                                      )}
+                                    </div>
+                                  )}
+                                </div>
+
+                                <hr className="bg-[#ccc] mt-2 " />
+                                <div className="flex items-center mt-3 gap-2 text-white">
+                                  <button
+                                    onClick={() => handlePublicTemplate(item)}
+                                    className="px-4 py-1.5 text-white rounded shadow-md text-center focus:outline-none "
+                                    style={{
+                                      backgroundColor: modalSubmitBtnColor
+                                    }}
+                                  >
+                                    Submit
+                                  </button>
+                                  <button
+                                    onClick={() => handleClose(item)}
+                                    className="px-4 py-1.5 text-black border-[1px] border-[#ccc] shadow-md rounded focus:outline-none"
+                                    style={{
+                                      backgroundColor: modalCancelBtnColor
+                                    }}
+                                  >
+                                    No
+                                  </button>
+                                </div>
+                              </div>
+                            </ModalUi>
+                          )}
+                          {isPublicProfile[item.objectId] && (
+                            <ModalUi
+                              isOpen
+                              title={"Public URL"}
+                              handleClose={() => {
+                                setIsPublicProfile({});
+                              }}
+                              reduceWidth={"md:min-w-[440px] md:max-w-[400px]"}
+                            >
+                              <div className="m-[20px]">
+                                {publicUserName ? (
+                                  <div className="font-normal text-black">
+                                    <p>
+                                      Here’s your public URL. Copy or share it
+                                      with the signer, and you will be able to
+                                      see all your publicly set templates.
+                                    </p>
+                                    <div className=" flex items-center gap-5 mt-2  p-[2px] w-[75%]">
+                                      <span className="font-bold">
+                                        Public URL :{" "}
+                                      </span>
+                                      <span
+                                        onClick={() => copytoProfileLink()}
+                                        className="underline underline-offset-2 cursor-pointer"
+                                      >{`https://opensign.me/${publicUserName}`}</span>
+                                    </div>
+                                  </div>
+                                ) : (
+                                  <div className="font-normal text-black">
+                                    <p>
+                                      Please add your public URL, and you will
+                                      be able to make a public template.
+                                    </p>
+                                    <button
+                                      className="px-4 py-1.5 mt-3 text-white rounded shadow-md text-center focus:outline-none "
+                                      style={{
+                                        backgroundColor: modalSubmitBtnColor
+                                      }}
+                                      onClick={() => navigate("/profile")}
+                                    >
+                                      Add
+                                    </button>
+                                  </div>
+                                )}
+                              </div>
+                            </ModalUi>
+                          )}
+                        </td>
+                      )} */}
                     </tr>
                   )
                 )}
@@ -821,16 +1599,6 @@ const ReportTable = (props) => {
             closePopup={handleContactFormModal}
           />
         </ModalUi>
-        <ModalUi
-          headColor={"#dc3545"}
-          isOpen={isDocErr}
-          title={"Receipent required"}
-          handleClose={() => setIsDocErr(false)}
-        >
-          <div style={{ height: "100%", padding: 20 }}>
-            <p>Please add receipent in template!</p>
-          </div>
-        </ModalUi>
       </div>
     </div>
   );

apps/OpenSign/src/primitives/LinkUserModal.js

@@ -1,6 +1,6 @@
 import React from "react";
 import SelectSigners from "../components/shared/fields/SelectSigners";
-import AddUser from "./AddUser";
+import AddContact from "./AddContact";
 import ModalUi from "./ModalUi";
 
 const LinkUserModal = (props) => {
@@ -43,7 +43,7 @@ const LinkUserModal = (props) => {
           }}
         ></span>
       </div>
-      <AddUser details={props.handleAddUser} closePopup={props.closePopup} />
+      <AddContact details={props.handleAddUser} closePopup={props.closePopup} />
     </ModalUi>
   );
 };

apps/OpenSign/src/primitives/ModalUi.js

@@ -10,19 +10,17 @@ const ModalUi = ({
   handleClose,
   showHeader = true,
   showClose = true,
-  styleClass,
+  reduceWidth,
   showHeaderMessage
 }) => {
   return (
     <>
       {isOpen && (
-        <div className="fixed z-[999] 2   top-0 left-0 w-[100%] h-[100%] bg-black bg-opacity-[75%]">
+        <div className="fixed z-[999] top-0 left-0 w-[100%] h-[100%] bg-black bg-opacity-[75%]">
           <div
-            className={
-              styleClass
-                ? styleClass
-                : "fixed z-[1000] top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%] md:min-w-[500px] overflow-y-auto hide-scrollbar"
-            }
+            className={`${
+              reduceWidth || "md:min-w-[500px]"
+            } fixed z-[1000] top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 text-sm bg-white rounded shadow-md max-h-90 min-w-[90%]  overflow-y-auto hide-scrollbar `}
           >
             {showHeader && (
               <div

apps/OpenSign/src/primitives/Tooltip.js

@@ -1,17 +1,9 @@
 import React from "react";
 import { Tooltip as ReactTooltip } from "react-tooltip";
 import { openInNewTab } from "../constant/Utils";
-import { isEnableSubscription } from "../constant/const";
-const Tooltip = ({ id, message, url, iconColor, isSubscribe }) =>
+const Tooltip = ({ id, message, url, iconColor }) =>
   url ? (
-    <button
-      onClick={() => openInNewTab(url)}
-      className={
-        isSubscribe || !isEnableSubscription
-          ? "text-center"
-          : "text-center opacity-20 pointer-events-none"
-      }
-    >
+    <button onClick={() => openInNewTab(url)} className={"text-center"}>
       <sup>
         <i
           className="fa-solid fa-question rounded-full"

apps/OpenSign/src/primitives/Upgrade.js

@@ -1,20 +1,13 @@
 import React from "react";
-import { useNavigate } from "react-router-dom";
 import { openInNewTab } from "../constant/Utils";
 
-function Upgrade({ message, newWindow }) {
-  const navigation = useNavigate();
-
+function Upgrade({ message }) {
   return (
     <sup>
       <span
         onClick={() => {
-          if (newWindow) {
-            const url = window.location.origin + "/subscription";
-            openInNewTab(url);
-          } else {
-            navigation("/subscription");
-          }
+          const url = window.location.origin + "/subscription";
+          openInNewTab(url);
         }}
         className="text-blue-800 text-sm cursor-pointer underline"
       >

apps/OpenSign/src/styles/loginPage.css

@@ -1,197 +0,0 @@
-.loginInput {
-  padding: 10px;
-  border-radius: 4px;
-  width: 100%;
-  font-size: 0.75rem;
-  border: 1px solid #e2dddd;
-  background-color: #e0e5f5;
-  color: black;
-  padding-left: 1rem !important;
-  padding-right: 1rem !important;
-  padding-top: 0.5rem !important;
-  font-family: inherit;
-  font-feature-settings: inherit;
-  font-variation-settings: inherit;
-  font-weight: inherit;
-  overflow: visible;
-}
-.loginInput:focus {
-  outline: none;
-  border: none;
-}
-.verifyBtn {
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.18);
-  padding: 3px 30px;
-  color: white;
-  font-weight: 500 !important;
-  font-size: 14px !important;
-  border: none;
-}
-.verifyBtn:focus {
-  border: none;
-  outline: none;
-}
-
-.verifyBtn:hover {
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1), 0 2px 4px rgba(0, 0, 0, 0.18);
-  color: white;
-}
-.fakeimg {
-  height: 200px;
-  background: #aaa;
-}
-
-.GTRY {
-  border: 1px solid #dee2e6;
-  margin-top: 75px;
-  padding-bottom: 20px;
-  background-color: #fff;
-}
-
-.main_head {
-  width: 100%;
-  height: 66px;
-  background-color: #fff;
-  margin-bottom: 52px;
-  padding-top: 10px;
-}
-
-.main-logo {
-  width: 250px;
-  height: 66px;
-  display: inline-block;
-}
-
-.card-box {
-  background: #fff;
-  min-height: 50px;
-  box-shadow: 0 20px 20px rgba(0, 0, 0, 0.1);
-  position: relative;
-  margin-bottom: 20px;
-  transition: 0.5s;
-  border: 1px solid #f2f2f2;
-  border-radius: 7px;
-  margin-top: 10px;
-}
-
-.LKJH {
-  display: flex;
-}
-
-.GTR {
-  text-align: left;
-}
-
-.JUI {
-  text-align: right;
-}
-
-.btn-info {
-  color: #fff;
-  background-color: #15b4e9;
-  border-color: #15b4e9;
-}
-
-.btn-info:hover {
-  color: #fff;
-  background-color: #15b4e9;
-  border-color: #15b4e9;
-}
-
-.btn-reg {
-  color: #15b4e9;
-  background-color: #ffffff;
-  border-color: #15b4e9;
-}
-
-.btn-reg:hover {
-  color: #15b4e9;
-  background-color: #ffffff;
-  border-color: #15b4e9;
-}
-
-.SYTU {
-  display: flex;
-}
-
-.MLKI {
-  float: right;
-  margin-bottom: 12px;
-}
-
-.login-btn {
-  width: 100% !important;
-  display: block !important;
-}
-
-@media only screen and (max-width: 667px) {
-  .MLKI {
-    float: inherit;
-  }
-
-  .login-btn {
-    width: 210px !important;
-  }
-}
-
-.MLKI a {
-  color: #212529;
-}
-
-.KNLO {
-  color: #878787;
-  font-size: 13px;
-}
-
-.form-check-label {
-  margin-left: 17px;
-  margin-bottom: 12px;
-}
-.welcomeText {
-  font-size: 30px;
-}
-
-@media only screen and (max-width: 600px) {
-  .KLO1 {
-    display: none;
-  }
-
-  .MLKI a {
-    font-size: 12px;
-  }
-
-  .form-check-label {
-    font-size: 12px;
-    margin-bottom: 14px;
-  }
-
-  .MKUY {
-    text-align: center;
-    padding-top: 10px;
-  }
-
-  .main_head {
-    margin-bottom: 12px;
-    padding-top: 10px;
-    border-bottom: 1px dashed #eeeeee;
-  }
-}
-@media screen and (max-width: 366px) {
-  .main-logo {
-    width: 150px;
-    height: 46px;
-    display: inline-block;
-  }
-  .welcomeText {
-    font-size: 20px;
-  }
-  .KNLO {
-    color: #878787;
-    font-size: 10px;
-  }
-  .btnContainer {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}

apps/OpenSignServer/Utils.js

@@ -247,3 +247,6 @@ export function sanitizeFileName(fileName) {
 }
 
 export const useLocal = process.env.USE_LOCAL ? process.env.USE_LOCAL.toLowerCase() : 'false';
+export const smtpsecure = process.env.SMTP_PORT && process.env.SMTP_PORT !== '465' ? false : true;
+export const smtpenable =
+  process.env.SMTP_ENABLE && process.env.SMTP_ENABLE.toLowerCase() === 'true' ? true : false;

apps/OpenSignServer/auth/authadapter.js

@@ -0,0 +1,28 @@
+import axios from 'axios';
+import dotenv from 'dotenv';
+dotenv.config();
+const ssoApiUrl = process.env.SSO_API_URL || 'https://sso.opensignlabs.com/api'; //'https://osl-jacksonv2.vercel.app/api';
+export const SSOAuth = {
+  // Returns a promise that fulfills if this user mail is valid.
+  validateAuthData: async authData => {
+    try {
+      const response = await axios.get(ssoApiUrl + '/oauth/userinfo', {
+        headers: {
+          Authorization: `Bearer ${authData.access_token}`,
+        },
+      });
+      if (response.data && response.data.id && response.data.email === authData.id) {
+        return;
+      }
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'SSO auth is invalid for this user.');
+    } catch (error) {
+      console.log('error in sso adapter', error?.response);
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'SSO auth is invalid for this user.');
+    }
+  },
+
+  // Returns a promise that fulfills if this app id is valid.
+  validateAppId: () => {
+    return Promise.resolve();
+  },
+};

apps/OpenSignServer/cloud/customRoute/autoReminder.js

@@ -0,0 +1,191 @@
+import axios from 'axios';
+
+// `replaceMailVaribles` is used to replace variables from mail with there actual values
+function replaceMailVaribles(subject, body, variables) {
+  let replacedSubject = subject;
+  let replacedBody = body;
+
+  for (const variable in variables) {
+    const regex = new RegExp(`{{${variable}}}`, 'g');
+    if (subject) {
+      replacedSubject = replacedSubject.replace(regex, variables[variable]);
+    }
+    if (body) {
+      replacedBody = replacedBody.replace(regex, variables[variable]);
+    }
+  }
+
+  const result = {
+    subject: replacedSubject,
+    body: replacedBody,
+  };
+  return result;
+}
+
+// `sendmail` is used to signing reminder mail to signer
+async function sendMail(doc, signer) {
+  const subject = `{{sender_name}} has requested you to sign "{{document_title}}"`;
+  const body = `<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body><p>Hi {{receiver_name}},</p><br><p>We hope this email finds you well. {{sender_name}}&nbsp;has requested you to review and sign&nbsp;<b>"{{document_title}}"</b>.</p><p>Your signature is crucial to proceed with the next steps as it signifies your agreement and authorization.</p><br><p>{{signing_url}}</p><br><p>If you have any questions or need further clarification regarding the document or the signing process,  please contact the sender.</p><br><p>Thanks</p><p> Team OpenSign™</p><br></body> </html>`;
+  const url = `${process.env.SERVER_URL}/functions/sendmailv3`;
+  const headers = {
+    'Content-Type': 'application/json',
+    'X-Parse-Application-Id': process.env.APP_ID,
+  };
+
+  const baseUrl = new URL(process.env.PUBLIC_URL);
+  const encodeBase64 = btoa(`${doc.objectId}/${signer.Email}/${signer.objectId}`);
+  const expireDate = doc?.ExpiryDate?.iso;
+  const newDate = new Date(expireDate);
+  const localExpireDate = newDate.toLocaleDateString('en-US', {
+    day: 'numeric',
+    month: 'long',
+    year: 'numeric',
+  });
+  const signPdf = `${baseUrl.origin}/login/${encodeBase64}`;
+  const variables = {
+    document_title: doc.Name,
+    sender_name: doc.ExtUserPtr.Name,
+    sender_mail: doc.ExtUserPtr.Email,
+    sender_phone: doc.ExtUserPtr?.Phone || '',
+    receiver_name: signer.Name,
+    receiver_email: signer.Email,
+    receiver_phone: signer?.Phone || '',
+    expiry_date: localExpireDate,
+    company_name: doc?.ExtUserPtr?.Company || '',
+    signing_url: `<a href=${signPdf}>Sign here</a>`,
+  };
+  const mail = replaceMailVaribles(subject, body, variables);
+
+  let params = {
+    mailProvider: doc?.ExtUserPtr?.active_mail_adapter,
+    extUserId: doc?.ExtUserPtr?.objectId,
+    recipient: signer.Email,
+    subject: mail.subject,
+    from: doc?.ExtUserPtr?.Email,
+    html: mail.body,
+  };
+  try {
+    // The axios request is used to send a signing reminder email.
+    const res = await axios.post(url, params, { headers: headers });
+    // console.log('res ', res.data.result);
+    if (res.data.result.status === 'success') {
+      return { status: 'success' };
+    }
+  } catch (err) {
+    console.log('err in mail of sendreminder api', err);
+    return { status: 'error' };
+  }
+}
+export default async function autoReminder(request, response) {
+  // The query below is used to find documents where the reminder date is less than or equal to the current date, and which have existing signers and a signed URL.
+  try {
+    const docQuery = new Parse.Query('contracts_Document');
+    docQuery.limit(2000);
+    docQuery.lessThanOrEqualTo('NextReminderDate', new Date());
+    docQuery.equalTo('AutomaticReminders', true);
+    docQuery.exists('NextReminderDate');
+    docQuery.exists('Signers');
+    docQuery.exists('SignedUrl');
+    docQuery.descending('createdAt');
+    docQuery.include('Signers,AuditTrail.UserPtr,ExtUserPtr');
+    docQuery.notEqualTo('IsCompleted', true);
+    docQuery.notEqualTo('IsDeclined', true);
+    docQuery.notEqualTo('IsArchive', true);
+    docQuery.greaterThanOrEqualTo('ExpiryDate', new Date());
+
+    const docsArr = await docQuery.find({ useMasterKey: true });
+
+    if (docsArr && docsArr.length > 0) {
+      const _docsArr = JSON.parse(JSON.stringify(docsArr));
+      let mailCount = 0;
+      let docCount = 0;
+      for (const doc of _docsArr) {
+        // The reminderDate variable is used to calculate the next reminder date.
+        const RemindOnceInEvery = doc?.RemindOnceInEvery || 5;
+        const ReminderDate = new Date();
+        ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
+        // The sendInOrder variable is used to determine whether to send emails in order or not.
+        const SendInOrder = doc?.SendinOrder || false;
+        if (SendInOrder) {
+          // The auditTrail variable is used to get the count of how many users have already signed the document.
+          const auditTrail = doc?.AuditTrail?.filter(x => x.Activity === 'Signed');
+          const count = auditTrail?.length || 0;
+          const signer = doc?.Signers?.[count];
+          if (signer) {
+            docCount += 1;
+            const mailRes = await sendMail(doc, signer);
+            if (mailRes && mailRes.status === 'success') {
+              mailCount += 1;
+            }
+            try {
+              // The code below is used to update the next reminder date of the document based on the "remind once every X days" setting.
+              const updateDoc = new Parse.Object('contracts_Document');
+              updateDoc.id = doc.objectId;
+              updateDoc.set('NextReminderDate', ReminderDate);
+              const updateRes = await updateDoc.save(null, { useMasterKey: true });
+              // console.log('updateRes ', updateRes);
+            } catch (err) {
+              console.log('err in update document', err);
+            }
+          }
+        } else {
+          // The AuditTrail variable is used to check if there is any user who has already signed the document.
+          const auditTrail = doc?.AuditTrail?.filter(x => x.Activity === 'Signed');
+          if (auditTrail?.length > 0) {
+            // The signers variable is used to get the signers who haven't signed the document.
+            const signers = doc?.Signers.filter(signer => {
+              const signedUser = auditTrail?.find(y => y.UserPtr.objectId === signer.objectId);
+              if (!signedUser) {
+                return signer;
+              }
+            });
+            if (signers?.length > 0) {
+              docCount += 1;
+              // The for...of loop below is used to send a signing reminder to every signer who hasn't signed the document yet.
+              for (const signer of signers) {
+                const mailRes = await sendMail(doc, signer);
+                if (mailRes && mailRes.status === 'success') {
+                  mailCount += 1;
+                }
+              }
+            }
+          } else {
+            // The for...of loop below is used to send a signing reminder to every signer who hasn't signed the document yet.
+            const signers = doc?.Signers;
+            if (signers?.length > 0) {
+              docCount += 1;
+              for (const signer of signers) {
+                const mailRes = await sendMail(doc, signer);
+                if (mailRes && mailRes.status === 'success') {
+                  mailCount += 1;
+                }
+              }
+            }
+          }
+          // The code below is used to update the next reminder date of the document based on the "remind once every X days" setting.
+          try {
+            const updateDoc = new Parse.Object('contracts_Document');
+            updateDoc.id = doc.objectId;
+            updateDoc.set('NextReminderDate', ReminderDate);
+            const updateRes = await updateDoc.save(null, { useMasterKey: true });
+            // console.log('updateRes ', updateRes);
+          } catch (err) {
+            console.log('err in sendmail', err);
+          }
+        }
+      }
+      if (docCount > 0) {
+        response.json({ status: 'success', document_count: docCount, mail_count: mailCount });
+      } else {
+        response.json({ status: 'no record found' });
+      }
+    } else {
+      response.json({ status: 'no record found' });
+    }
+  } catch (err) {
+    console.log('err ', err);
+    const code = err?.code || 400;
+    const message = err?.message || 'Somehting went wrong!';
+    response.status(code).json({ error: message });
+  }
+}

apps/OpenSignServer/cloud/customRoute/customApp.js

@@ -7,6 +7,7 @@ import saveSubscription from './saveSubscription.js';
 import saveInvoice from './saveInvoice.js';
 import savePayments from './savePayments.js';
 import gooogleauth from './googleauth.js';
+import autoReminder from './autoReminder.js';
 export const app = express();
 
 dotenv.config();
@@ -16,10 +17,8 @@ app.use(express.urlencoded({ limit: '50mb', extended: true }));
 
 app.post('/file_upload', uploadFile);
 
-app.post('/savesubscription', saveSubscription)
-app.post('/saveinvoice', saveInvoice)
-app.post('/savepayment', savePayments)
-app.post('/googleauth', gooogleauth)
-
-
-
+app.post('/savesubscription', saveSubscription);
+app.post('/saveinvoice', saveInvoice);
+app.post('/savepayment', savePayments);
+app.post('/googleauth', gooogleauth);
+app.post('/sendreminder', autoReminder);

apps/OpenSignServer/cloud/customRoute/v1/apiV1.js

@@ -17,7 +17,6 @@ import getTemplatetList from './routes/getTemplateList.js';
 import updateTemplate from './routes/updateTemplate.js';
 import createContact from './routes/createContact.js';
 import multer from 'multer';
-// import fs from 'node:fs';
 import updateDocument from './routes/updateDocument.js';
 import deleteDocument from './routes/deleteDocument.js';
 import createDocumentWithTemplate from './routes/CreateDocumentWithTemplate.js';
@@ -26,6 +25,12 @@ import deleteWebhook from './routes/deleteWebhook.js';
 import getWebhook from './routes/getWebhook.js';
 import createDocumentwithCoordinate from './routes/createDocumentwithCoordinate.js';
 import createTemplatewithCoordinate from './routes/createTemplatewithCoordinate.js';
+import resendMail from './routes/resendMail.js';
+import getFolder from './routes/getFolder.js';
+import createFolder from './routes/createFolder.js';
+import updateFolder from './routes/updateFolder.js';
+import getFolderList from './routes/getFolderList.js';
+import deleteFolder from './routes/deleteFolder.js';
 dotenv.config();
 const storage = multer.memoryStorage();
 const upload = multer({ storage: storage });
@@ -102,3 +107,21 @@ app.post('/webhook', saveWebhook);
 
 // set and update webhook
 app.delete('/webhook', deleteWebhook);
+
+// resend mail
+app.post('/resendmail', resendMail);
+
+// create folder
+app.post('/createfolder', createFolder);
+
+// update folder
+app.put('/folder/:folder_id', updateFolder);
+
+// get folder list
+app.delete('/folder/:folder_id', deleteFolder);
+
+// get folder
+app.get('/folder/:folder_id', getFolder);
+
+// get folder list
+app.get('/folderlist', getFolderList);

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

@@ -50,11 +50,12 @@ export default async function createDocumentWithTemplate(request, response) {
   const folderId = request.body.folderId;
   const templateId = request.params.template_id;
   const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
   const send_email = request.body.send_email;
   const email_subject = request.body.email_subject;
   const email_body = request.body.email_body;
   const sendInOrder = request.body.sendInOrder || false;
+  const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
 
   try {
     const reqToken = request.headers['x-api-token'];
@@ -178,6 +179,10 @@ export default async function createDocumentWithTemplate(request, response) {
             }
             object.set('URL', template.URL);
             object.set('SignedUrl', template.URL);
+            object.set('SentToOthers', true);
+            if (TimeToCompleteDays) {
+              object.set('TimeToCompleteDays', TimeToCompleteDays);
+            }
             object.set('CreatedBy', template.CreatedBy);
             object.set('ExtUserPtr', {
               __type: 'Pointer',
@@ -204,9 +209,6 @@ export default async function createDocumentWithTemplate(request, response) {
             });
             let sender = template.ExtUserPtr.Email;
             let sendMail;
-            const serverUrl = process.env.SERVER_URL;
-            const newServer = serverUrl.replaceAll('/', '%2F');
-            const serverParams = `${newServer}%2F&${process.env.APP_ID}&contracts`;
             if (send_email === false) {
               console.log("don't send mail");
             } else {
@@ -261,10 +263,10 @@ export default async function createDocumentWithTemplate(request, response) {
                     document_title: template.Name,
                     sender_name: template.ExtUserPtr.Name,
                     sender_mail: template.ExtUserPtr.Email,
-                    sender_phone: template.ExtUserPtr.Phone,
+                    sender_phone: template.ExtUserPtr?.Phone || '',
                     receiver_name: contactMail[i].name,
                     receiver_email: contactMail[i].email,
-                    receiver_phone: contactMail[i].phone,
+                    receiver_phone: contactMail[i]?.phone || '',
                     expiry_date: localExpireDate,
                     company_name: orgName,
                     signing_url: signPdf,
@@ -310,7 +312,11 @@ export default async function createDocumentWithTemplate(request, response) {
                 name: template?.Name,
                 note: template?.Note || '',
                 description: template?.Description || '',
-                signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x.phone })),
+                signers: contact?.map(x => ({
+                  name: x.name,
+                  email: x.email,
+                  phone: x?.phone || '',
+                })),
                 createdAt: res.createdAt,
               };
               if (template.ExtUserPtr && template.ExtUserPtr?.Webhook) {

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

@@ -3,7 +3,7 @@ export default async function createContact(request, response) {
   const serverUrl = process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const name = request.body.name;
-  const phone = request.body.phone;
+  const phone = request.body?.phone;
   const email = request.body.email;
   const reqToken = request.headers['x-api-token'];
   if (!reqToken) {
@@ -49,7 +49,9 @@ export default async function createContact(request, response) {
 
             const contactQuery = new Parse.Object('contracts_Contactbook');
             contactQuery.set('Name', name);
-            contactQuery.set('Phone', phone);
+            if (phone) {
+              contactQuery.set('Phone', phone);
+            }
             contactQuery.set('Email', email);
             contactQuery.set('UserRole', 'contracts_Guest');
             if (tenantRes && tenantRes.id) {
@@ -65,8 +67,10 @@ export default async function createContact(request, response) {
               _user.set('name', name);
               _user.set('username', email);
               _user.set('email', email);
-              _user.set('phone', phone);
-              _user.set('password', phone);
+              _user.set('password', email);
+              if (phone) {
+                _user.set('phone', phone);
+              }
 
               const user = await _user.save();
               if (user) {
@@ -106,7 +110,7 @@ export default async function createContact(request, response) {
                   objectId: parseRes.objectId,
                   name: parseRes.Name,
                   email: parseRes.Email,
-                  phone: parseRes.Phone,
+                  phone: parseRes?.Phone || '',
                   createdAt: parseRes.createdAt,
                   updatedAt: parseRes.updatedAt,
                 });
@@ -128,7 +132,7 @@ export default async function createContact(request, response) {
                   userId: userRes.objectId,
                 };
                 await axios.post(roleurl, body, { headers: headers });
-                contactQuery.set('CreatedBy', userPtr.objectId);
+                contactQuery.set('CreatedBy', userPtr);
                 contactQuery.set('UserId', {
                   __type: 'Pointer',
                   className: '_User',
@@ -155,7 +159,7 @@ export default async function createContact(request, response) {
                     objectId: parseRes.objectId,
                     name: parseRes.Name,
                     email: parseRes.Email,
-                    phone: parseRes.Phone,
+                    phone: parseRes?.Phone || '',
                     createdAt: parseRes.createdAt,
                     updatedAt: parseRes.updatedAt,
                   });

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

@@ -36,7 +36,7 @@ async function sendDoctoWebhook(doc, WebhookUrl, userId) {
         }
       })
       .catch(err => {
-        console.log('Err send data to webhook', err);
+        console.log('Err send data to webhook', err?.message);
         try {
           const webhook = new Parse.Object('contracts_Webhook');
           webhook.set('Log', err?.status);
@@ -47,7 +47,7 @@ async function sendDoctoWebhook(doc, WebhookUrl, userId) {
           });
           webhook.save(null, { useMasterKey: true });
         } catch (err) {
-          console.log('err save in contracts_Webhook', err);
+          console.log('err save in contracts_Webhook', err?.message);
         }
       });
     // console.log('res ', res.data);
@@ -66,9 +66,10 @@ export default async function createDocumentwithCoordinate(request, response) {
   const email_subject = request.body.email_subject;
   const email_body = request.body.email_body;
   const sendInOrder = request.body.sendInOrder || false;
+  const TimeToCompleteDays = request.body.timeToCompleteDays || 15;
   // console.log('fileData ', fileData);
   const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
   const reqToken = request.headers['x-api-token'];
   if (!reqToken) {
     return response.status(400).json({ error: 'Please Provide API Token' });
@@ -140,8 +141,12 @@ export default async function createDocumentwithCoordinate(request, response) {
         }
         object.set('URL', fileUrl);
         object.set('SignedUrl', fileUrl);
+        object.set('SentToOthers', true);
         object.set('CreatedBy', userPtr);
         object.set('ExtUserPtr', extUserPtr);
+        if (TimeToCompleteDays) {
+          object.set('TimeToCompleteDays', TimeToCompleteDays);
+        }
         object.set('IsSendMail', send_email);
         let contact = [];
         if (signers && signers.length > 0) {
@@ -251,7 +256,7 @@ export default async function createDocumentwithCoordinate(request, response) {
           name: name,
           note: note || '',
           description: description || '',
-          signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x.phone })),
+          signers: contact?.map(x => ({ name: x.name, email: x.email, phone: x?.phone || '' })),
           createdAt: res.createdAt,
         };
         if (parseExtUser && parseExtUser.Webhook) {
@@ -265,9 +270,6 @@ export default async function createDocumentwithCoordinate(request, response) {
           year: 'numeric',
         });
         let sender = parseExtUser.Email;
-        const serverUrl = process.env.SERVER_URL;
-        const newServer = serverUrl.replaceAll('/', '%2F');
-        const serverParams = `${newServer}%2F&${process.env.APP_ID}&contracts`;
         if (send_email === false) {
           console.log("don't send mail");
         } else {
@@ -321,10 +323,10 @@ export default async function createDocumentwithCoordinate(request, response) {
                 document_title: name,
                 sender_name: parseExtUser.Name,
                 sender_mail: parseExtUser.Email,
-                sender_phone: parseExtUser.Phone,
+                sender_phone: parseExtUser?.Phone || '',
                 receiver_name: contactMail[i].name,
                 receiver_email: contactMail[i].email,
-                receiver_phone: contactMail[i].phone,
+                receiver_phone: contactMail[i]?.phone || '',
                 expiry_date: localExpireDate,
                 company_name: orgName,
                 signing_url: signPdf,

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

@@ -0,0 +1,73 @@
+export default async function createFolder(request, response) {
+  const apiToken = request.headers['x-api-token'];
+  const folderName = request.body.folderName;
+  const parentFolderId = request.body.parentFolderId;
+  if (!apiToken) {
+    return response.status(400).json({ error: 'Please Provide API Token' });
+  }
+  try {
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', apiToken);
+    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,
+      };
+      const userQuery = new Parse.Query('contracts_Users');
+      userQuery.equalTo('UserId', userPtr);
+      const extUser = await userQuery.first({ useMasterKey: true });
+
+      const folderCls = new Parse.Object('contracts_Document');
+      folderCls.set('Name', folderName);
+      folderCls.set('CreatedBy', userPtr);
+      folderCls.set('Type', 'Folder');
+      folderCls.set('ExtUserPtr', {
+        __type: 'Pointer',
+        className: 'contracts_Users',
+        objectId: extUser.id,
+      });
+      if (parentFolderId) {
+        folderCls.set('Folder', {
+          __type: 'Pointer',
+          className: 'contracts_Document',
+          objectId: parentFolderId,
+        });
+      }
+      const acl = new Parse.ACL();
+      acl.setReadAccess(parseUser.userId.objectId, true); // Allow read access to the userPtr
+      acl.setWriteAccess(parseUser.userId.objectId, true); // Allow write access to the userPtr
+
+      // Set the ACL to the document
+      folderCls.setACL(acl);
+
+      const _resFolder = await folderCls.save(null, { useMasterKey: true });
+      if (_resFolder) {
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_create_folder',
+            properties: { response_code: 200 },
+          });
+        }
+        const parseRes = JSON.parse(JSON.stringify(_resFolder));
+        return response.json({
+          objectId: parseRes.objectId,
+          folderName: parseRes.Name,
+          parentFolderId: parseRes?.Folder?.objectId || '',
+          createdAt: parseRes.createdAt,
+          updatedAt: parseRes.updatedAt,
+        });
+      }
+    } 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!' });
+  }
+}

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

@@ -8,7 +8,7 @@ export default async function createTemplate(request, response) {
   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.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
 
   try {
     const reqToken = request.headers['x-api-token'];

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

@@ -91,7 +91,7 @@ export default async function createTemplatewithCoordinate(request, response) {
           let createContactUrl = protocol + '/v1/createcontact';
 
           for (const [index, element] of parseSigners.entries()) {
-            if (element?.name && element.phone && element?.email) {
+            if (element?.name && element?.email) {
               const body = {
                 name: element?.name || '',
                 email: element?.email || '',

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

@@ -0,0 +1,74 @@
+export default async function deleteFolder(request, response) {
+  const apiToken = request.headers['x-api-token'];
+  const folderId = request.params.folder_id;
+  if (!apiToken) {
+    return response.status(400).json({ error: 'Please Provide API Token' });
+  }
+  try {
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', apiToken);
+    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,
+      };
+
+      const obj = new Parse.Query('contracts_Document');
+      obj.equalTo('objectId', folderId);
+      obj.equalTo('IsArchive', true);
+      obj.equalTo('CreatedBy', userPtr);
+      const isFolderDeleted = await obj.first({ useMasterKey: true });
+      if (!isFolderDeleted) {
+        const folder = new Parse.Query('contracts_Document');
+        folder.equalTo('Folder', {
+          __type: 'Pointer',
+          className: 'contracts_Document',
+          objectId: folderId,
+        });
+
+        folder.notEqualTo('IsArchive', true);
+        folder.equalTo('CreatedBy', userPtr);
+        folder.equalTo('Type', 'Folder');
+        const isSubItems = await folder.first({ useMasterKey: true });
+        // console.log('isSubItems ', isSubItems);
+        if (isSubItems) {
+          return response
+            .status(400)
+            .json({ error: 'folder is not empty, contains document or folder.' });
+        } else {
+          const deleteFolder = new Parse.Object('contracts_Document');
+          deleteFolder.id = folderId;
+          deleteFolder.set('IsArchive', true);
+          const deleteRes = await deleteFolder.save(null, { useMasterKey: true });
+          if (request.posthog) {
+            request.posthog?.capture({
+              distinctId: parseUser.userId.email,
+              event: 'api_delete_folder',
+              properties: { response_code: 200 },
+            });
+          }
+          return response.json({ objectId: deleteRes.id, deletedAt: deleteRes.updatedAt });
+        }
+      } else {
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_delete_folder',
+            properties: { response_code: 404 },
+          });
+        }
+        return response.status(404).json({ error: 'folder not found.' });
+      }
+    } else {
+      return response.status(405).json({ error: 'Invalid API Token!' });
+    }
+  } catch (err) {
+    console.log('err is delete folder API', err);
+    return response.status(400).json({ error: 'Something went wrong, please try again later!' });
+  }
+}

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

@@ -14,7 +14,7 @@ export default async function draftDocument(request, response) {
   const SendinOrder = request.body.sendInOrder || false;
   // console.log('fileData ', fileData);
   const protocol = customAPIurl();
-  const baseUrl = new URL(process.env.SERVER_URL);
+  const baseUrl = new URL(process.env.PUBLIC_URL);
 
   try {
     const reqToken = request.headers['x-api-token'];

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

@@ -37,7 +37,7 @@ export default async function getContact(request, response) {
           objectId: parseRes.objectId,
           name: parseRes.Name,
           email: parseRes.Email,
-          phone: parseRes.Phone,
+          phone: parseRes?.Phone || '',
           createdAt: parseRes.createdAt,
           updatedAt: parseRes.updatedAt,
         });

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

@@ -31,7 +31,7 @@ export default async function getContactList(request, response) {
           objectId: x.objectId,
           name: x.Name,
           email: x.Email,
-          phone: x.Phone,
+          phone: x?.Phone || '',
           createdAt: x.createdAt,
           updatedAt: x.updatedAt,
         }));

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

@@ -40,6 +40,7 @@ export default async function getDocument(request, response) {
           note: document.Note || '',
           folder: { objectId: document?.Folder?.objectId, name: document?.Folder?.Name } || '',
           file: document?.SignedUrl || document.URL,
+          certificate: document?.CertificateUrl || '',
           owner: document?.ExtUserPtr?.Name,
           signers:
             document?.Placeholders?.map(y => ({

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

@@ -77,7 +77,7 @@ export default async function getDocumentList(request, response) {
               title: x.Name,
               note: x.Note || '',
               folder: { objectId: x?.Folder?.objectId, name: x?.Folder?.Name } || '',
-              file: x?.SignedUrl || x.URL,
+              // file: x?.SignedUrl || x.URL,
               owner: x?.ExtUserPtr?.Name,
               signers:
                 x?.Placeholders?.map(y => ({

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

@@ -0,0 +1,64 @@
+export default async function getFolder(request, response) {
+  const apiToken = request.headers['x-api-token'];
+  const folder_id = request.params.folder_id;
+  if (!apiToken) {
+    return response.status(400).json({ error: 'Please Provide API Token' });
+  }
+  try {
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', apiToken);
+    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,
+      };
+
+      const folderCls = new Parse.Query('contracts_Document');
+      folderCls.equalTo('CreatedBy', userPtr);
+      folderCls.equalTo('objectId', folder_id);
+      folderCls.equalTo('Type', 'Folder');
+      folderCls.notEqualTo('IsArchive', true);
+      folderCls.descending('createdAt');
+      folderCls.include('Folder');
+
+      const res = await folderCls.first({ useMasterKey: true });
+      if (res) {
+        const parseRes = JSON.parse(JSON.stringify(res));
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_get_folder',
+            properties: { response_code: 200 },
+          });
+        }
+        return response.json({
+          objectId: parseRes.objectId,
+          folderName: parseRes.Name,
+          parentFolderId: parseRes?.Folder?.objectId || '',
+          parentFolderName: parseRes?.Folder?.Name || '',
+          createdAt: parseRes.createdAt,
+          updatedAt: parseRes.updatedAt,
+        });
+      } else {
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_get_folder',
+            properties: { response_code: 404 },
+          });
+        }
+        return response.status(404).json({ error: 'folder not found.' });
+      }
+    } 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!' });
+  }
+}

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

@@ -0,0 +1,76 @@
+export default async function getFolderList(request, response) {
+  const apiToken = request.headers['x-api-token'];
+  const parentFolderId = request.query?.parentFolderId || '';
+  if (!apiToken) {
+    return response.status(400).json({ error: 'Please Provide API Token' });
+  }
+  try {
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', apiToken);
+    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,
+      };
+      const limit = request?.query?.limit ? parseInt(request.query.limit) : 100;
+      const skip = request?.query?.skip ? parseInt(request.query.skip) : 0;
+      const folderCls = new Parse.Query('contracts_Document');
+      folderCls.equalTo('CreatedBy', userPtr);
+      folderCls.equalTo('Type', 'Folder');
+      folderCls.notEqualTo('IsArchive', true);
+      folderCls.descending('createdAt');
+      folderCls.include('Folder');
+      if (parentFolderId) {
+        folderCls.equalTo('Folder', {
+          __type: 'Pointer',
+          className: 'contracts_Document',
+          objectId: parentFolderId,
+        });
+      } else {
+        folderCls.doesNotExist('Folder');
+      }
+      folderCls.descending('createdAt');
+      folderCls.limit(limit);
+      folderCls.skip(skip);
+      const res = await folderCls.find({ useMasterKey: true });
+      if (res && res.length > 0) {
+        const parseRes = JSON.parse(JSON.stringify(res));
+        const folderlist = parseRes.map(x => ({
+          objectId: x.objectId,
+          folderName: x.Name,
+          parentFolderId: x?.Folder?.objectId || '',
+          parentFolderName: x?.Folder?.Name || '',
+          createdAt: x.createdAt,
+          updatedAt: x.updatedAt,
+        }));
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_get_Folder_list',
+            properties: { response_code: 200 },
+          });
+        }
+        return response.json({ result: folderlist });
+      } else {
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_get_Folder_list',
+            properties: { response_code: 200 },
+          });
+        }
+        return response.json({ result: [] });
+      }
+    } 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!' });
+  }
+}

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

@@ -37,7 +37,7 @@ export default async function getUser(request, response) {
           objectId: parseRes.objectId,
           name: parseRes.Name,
           email: parseRes.Email,
-          phone: parseRes.Phone,
+          phone: parseRes?.Phone || '',
           jobTitle: parseRes.JobTitle,
           company: parseRes.Company,
           createdAt: parseRes.createdAt,

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

@@ -0,0 +1,157 @@
+import axios from 'axios';
+import { replaceMailVaribles } from '../../../../Utils.js';
+
+export default async function resendMail(request, response) {
+  try {
+    const reqToken = request.headers['x-api-token'];
+    const docId = request.body.document_id;
+    const userMail = request.body.email;
+    const email_subject = request.body.email_subject;
+    const email_body = request.body.email_body;
+    const baseUrl = new URL(process.env.SERVER_URL);
+
+    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,
+      };
+
+      const docQuery = new Parse.Query('contracts_Document');
+      docQuery.equalTo('objectId', docId);
+      docQuery.equalTo('CreatedBy', userPtr);
+      docQuery.include('Signers,ExtUserPtr');
+      docQuery.notEqualTo('IsCompleted', true);
+      docQuery.notEqualTo('IsDeclined', true);
+      docQuery.notEqualTo('IsArchive', true);
+      docQuery.greaterThanOrEqualTo('ExpiryDate', new Date());
+      docQuery.exists('SignedUrl');
+
+      const resDoc = await docQuery.first({ useMasterKey: true });
+      // console.log("resDoc ",resDoc)
+      if (resDoc) {
+        const _resDoc = resDoc.toJSON();
+        const contact = _resDoc.Signers.find(x => x.Email === userMail);
+        if (contact) {
+          try {
+            const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
+            let url = `${process.env.SERVER_URL}/functions/sendmailv3/`;
+            const headers = {
+              'Content-Type': 'application/json',
+              'X-Parse-Application-Id': process.env.APP_ID,
+              'X-Parse-Master-Key': process.env.MASTER_KEY,
+            };
+
+            const objectId = contact.objectId;
+            const hostUrl = baseUrl.origin;
+            const title = _resDoc.Name;
+            const receiverMail = contact.Email;
+            //encode this url value `${response.id}/${receiverMail}/${objectId}` to base64 using `btoa` function
+            const encodeBase64 = btoa(`${_resDoc.objectId}/${receiverMail}/${objectId}`);
+            let signPdf = `${hostUrl}/login/${encodeBase64}`;
+            const openSignUrl = 'https://www.opensignlabs.com/contact-us';
+            const orgName = _resDoc.ExtUserPtr.Company ? _resDoc.ExtUserPtr.Company : '';
+            const newDate = new Date(_resDoc.ExpiryDate.iso);
+            newDate.setDate(newDate.getDate() + 15);
+            const sender = _resDoc.ExtUserPtr.Email;
+            const localExpireDate = newDate.toLocaleDateString('en-US', {
+              day: 'numeric',
+              month: 'long',
+              year: 'numeric',
+            });
+
+            const themeBGcolor = '#47a3ad';
+            const email_html =
+              "<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;'> " +
+              _resDoc.ExtUserPtr.Name +
+              ' has requested you to review and sign <strong> ' +
+              title +
+              "</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'>" +
+              sender +
+              "</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 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 " +
+              sender +
+              ' 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>';
+            let replaceVar;
+            const variables = {
+              document_title: title,
+              sender_name: _resDoc.ExtUserPtr.Name,
+              sender_mail: _resDoc.ExtUserPtr.Email,
+              sender_phone: _resDoc.ExtUserPtr?.Phone || '',
+              receiver_name: contact.Name,
+              receiver_email: contact.Email,
+              receiver_phone: contact?.Phone || '',
+              expiry_date: localExpireDate,
+              company_name: orgName,
+              signing_url: signPdf,
+            };
+            if (email_subject && email_body) {
+              replaceVar = replaceMailVaribles(email_subject, email_body, variables);
+            } else if (email_subject) {
+              replaceVar = replaceMailVaribles(email_subject, '', variables);
+              replaceVar = { subject: replaceVar.subject, body: email_html };
+            } else if (email_body) {
+              replaceVar = replaceMailVaribles(
+                `${_resDoc.ExtUserPtr.Name} has requested you to sign "${title}"`,
+                email_body,
+                variables
+              );
+            } else {
+              replaceVar = {
+                subject: `${_resDoc.ExtUserPtr.Name} has requested you to sign "${title}"`,
+                body: email_html,
+              };
+            }
+            const subject = replaceVar.subject;
+            const html = replaceVar.body;
+
+            let params = {
+              recipient: contact.Email,
+              subject: subject,
+              from: sender,
+              html: html,
+              extUserId: _resDoc.ExtUserPtr.objectId,
+            };
+
+            const res = await axios.post(url, params, { headers: headers });
+            if (res.data.result && res.data.result.status === 'success') {
+              return response.json({ result: 'mail sent successfully.' });
+            }
+          } catch (error) {
+            console.log('error', error);
+            return response.status(400).json({ error: error.message });
+          }
+        } else {
+          return response.status(404).json({ error: 'user not found.' });
+        }
+      } else {
+        return response.status(404).json({ error: 'document not found.' });
+      }
+    } else {
+      return response.status(405).json({ error: 'Invalid API Token.' });
+    }
+  } catch (err) {
+    console.log('err in resendmail', err);
+    return response.status(400).json({ error: err.message || 'Something went wrong.' });
+  }
+}

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

@@ -0,0 +1,67 @@
+export default async function updateFolder(request, response) {
+  const apiToken = request.headers['x-api-token'];
+  const folderId = request.params.folder_id;
+  const name = request.body.folderName;
+  const parentFolderId = request.body.parentFolderId;
+  if (!apiToken) {
+    return response.status(400).json({ error: 'Please Provide API Token' });
+  }
+  try {
+    const tokenQuery = new Parse.Query('appToken');
+    tokenQuery.equalTo('token', apiToken);
+    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,
+      };
+
+      const folderCls = new Parse.Query('contracts_Document');
+      folderCls.equalTo('CreatedBy', userPtr);
+      folderCls.equalTo('objectId', folderId);
+      folderCls.equalTo('Type', 'Folder');
+      folderCls.notEqualTo('IsArchive', true);
+
+      const res = await folderCls.first({ useMasterKey: true });
+      if (res) {
+        const updateFolder = new Parse.Object('contracts_Document');
+        updateFolder.id = res.id;
+        updateFolder.set('Name', name);
+        if (parentFolderId) {
+          updateFolder.set('Folder', {
+            __type: 'Pointer',
+            className: 'contracts_Document',
+            objectId: parentFolderId,
+          });
+        }
+        const updateRes = await updateFolder.save(null, { useMasterKey: true });
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_update_folder',
+            properties: { response_code: 200 },
+          });
+        }
+        return response.json({ objectId: updateRes.id, updatedAt: updateRes.updatedAt });
+      } else {
+        if (request.posthog) {
+          request.posthog?.capture({
+            distinctId: parseUser.userId.email,
+            event: 'api_update_folder',
+            properties: { response_code: 404 },
+          });
+        }
+        return response.status(404).json({ error: 'folder not found.' });
+      }
+    } 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!' });
+  }
+}

apps/OpenSignServer/cloud/main.js

@@ -1,4 +1,4 @@
-import PDF from './parsefunction/pdf/PDF.min.js';
+import PDF from './parsefunction/pdf/PDF.js';
 import sendmailv3 from './parsefunction/sendMailv3.js';
 import GoogleSign from './parsefunction/GoogleSign.js';
 import ZohoDetails from './parsefunction/ZohoDetails.js';
@@ -37,7 +37,32 @@ import saveSubscription from './parsefunction/saveSubscription.js';
 import VerifyEmail from './parsefunction/VerifyEmail.js';
 import encryptedpdf from './parsefunction/encryptedPdf.js';
 import { getSignedUrl } from './parsefunction/getSignedUrl.js';
+import createBatchDocs from './parsefunction/createBatchDocs.js';
+import linkContactToDoc from './parsefunction/linkContactToDoc.js';
+import CreatePublicTemplate from './parsefunction/CreatePublicTemplate.js';
+import GetPublicUserName from './parsefunction/GetPublicUserName.js';
+import GetPublicTemplate from './parsefunction/GetPublicTemplate.js';
+import ssoSignin from './parsefunction/ssoSignin.js';
+import isextenduser from './parsefunction/isextenduser.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);
+Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);
+Parse.Cloud.afterSave('contracts_Users', ContractUsersAftersave);
+Parse.Cloud.afterSave('contracts_Template', TemplateAfterSave);
+
+// This beforeSave function triggers before an object is added or updated in the specified class, allowing for validation or modification.
+Parse.Cloud.beforeSave('contracts_Document', DocumentBeforesave);
+Parse.Cloud.beforeSave('contracts_Template', TemplateBeforeSave);
+
+// This afterFind function triggers after a query retrieves objects from the specified class, allowing for post-processing of the results.
+Parse.Cloud.afterFind(Parse.User, UserAfterFind);
+Parse.Cloud.afterFind('contracts_Document', DocumentBeforeFind);
+Parse.Cloud.afterFind('contracts_Template', TemplateAfterFind);
+Parse.Cloud.afterFind('contracts_Signature', SignatureAfterFind);
+Parse.Cloud.afterFind('partners_Tenant', TenantAterFind);
+
+// This define function creates a custom Cloud Function that can be called from the client-side, enabling custom business logic on the server.
 Parse.Cloud.define('AddUserToRole', addUserToGroups);
 Parse.Cloud.define('UserGroups', getUserGroups);
 Parse.Cloud.define('signPdf', PDF);
@@ -62,18 +87,14 @@ Parse.Cloud.define('freesubscription', SubscribeFree);
 Parse.Cloud.define('getinvoices', getInvoices);
 Parse.Cloud.define('getpayments', getPayments);
 Parse.Cloud.define('getsubscriptions', getSubscriptions);
-Parse.Cloud.afterSave('contracts_Document', DocumentAftersave);
-Parse.Cloud.afterSave('contracts_Contactbook', ContactbookAftersave);
-Parse.Cloud.afterSave('contracts_Users', ContractUsersAftersave);
-Parse.Cloud.afterSave('contracts_Template', TemplateAfterSave);
-Parse.Cloud.beforeSave('contracts_Document', DocumentBeforesave);
-Parse.Cloud.beforeSave('contracts_Template', TemplateBeforeSave);
-Parse.Cloud.afterFind(Parse.User, UserAfterFind);
-Parse.Cloud.afterFind('contracts_Document', DocumentBeforeFind);
-Parse.Cloud.afterFind('contracts_Template', TemplateAfterFind);
-Parse.Cloud.afterFind('contracts_Signature', SignatureAfterFind);
-Parse.Cloud.afterFind('partners_Tenant', TenantAterFind);
 Parse.Cloud.define('savesubscription', saveSubscription);
 Parse.Cloud.define('verifyemail', VerifyEmail);
 Parse.Cloud.define('encryptedpdf', encryptedpdf);
 Parse.Cloud.define('getsignedurl', getSignedUrl);
+Parse.Cloud.define('batchdocuments', createBatchDocs);
+Parse.Cloud.define('linkcontacttodoc', linkContactToDoc);
+Parse.Cloud.define('createpublictemplate', CreatePublicTemplate);
+Parse.Cloud.define('getpublicusername', GetPublicUserName);
+Parse.Cloud.define('getpublictemplate', GetPublicTemplate);
+Parse.Cloud.define('ssosign', ssoSignin);
+Parse.Cloud.define('isextenduser', isextenduser);

apps/OpenSignServer/cloud/parsefunction/ContractUsersAftersave.js

@@ -8,7 +8,9 @@ async function ContractUsersAftersave(request) {
     contactbook.set('Name', request.object.get('Name'));
     contactbook.set('Email', request.object.get('Email'));
     contactbook.set('ExtUserPtr', request.object.get('objectId'));
-    contactbook.set('Phone', request.object.get('Phone'));
+    if (request.object?.get('Phone')) {
+      contactbook.set('Phone', request.object.get('Phone'));
+    }
     contactbook.set('ExtUserPtr', {
       __type: 'Pointer',
       className: 'contracts_Users',

apps/OpenSignServer/cloud/parsefunction/CreatePublicTemplate.js

@@ -0,0 +1,41 @@
+export default async function CreatePublicTemplate(request) {
+  const templateid = request.params.templateid;
+  const ispublic = request.params.ispublic;
+  const publicrole = request.params.publicrole;
+  try {
+    if (!request?.user) {
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+    } else {
+      const userId = request?.user && request?.user?.id;
+      if (templateid) {
+        const updateTemplate = new Parse.Object('contracts_Template');
+        updateTemplate.id = templateid;
+        if (ispublic) {
+          updateTemplate.set('PublicRole', publicrole);
+        }
+        updateTemplate.set('IsPublic', ispublic);
+        const Acl = new Parse.ACL();
+        if (ispublic) {
+          Acl.setPublicReadAccess(true);
+        }
+        Acl.setReadAccess(userId, true);
+        Acl.setWriteAccess(userId, true);
+        updateTemplate.setACL(Acl);
+        const savedObject = await updateTemplate.save(null, { useMasterKey: true });
+        const res = savedObject.toJSON();
+        if (res) {
+          return {
+            status: 'success',
+          };
+        }
+      } else {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Please provide required parameters!');
+      }
+    }
+  } catch (err) {
+    const code = err.code || 400;
+    const msg = err.message;
+    const error = new Parse.Error(code, msg);
+    throw error;
+  }
+}

apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js

@@ -14,19 +14,29 @@ async function DocumentAftersave(request) {
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
         updateQuery.set('OriginIp', ip);
+        const AutoReminder = request?.object?.get('AutomaticReminders') || false;
+        if (AutoReminder) {
+          const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
+          const ReminderDate = new Date(createdAt);
+          ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
+          updateQuery.set('NextReminderDate', ReminderDate);
+        }
         await updateQuery.save(null, { useMasterKey: true });
       } else if (createdAt && Folder === 'AIDoc') {
         const TimeToCompleteDays = request.object.get('TimeToCompleteDays');
         const ExpiryDate = new Date(createdAt);
-        // console.log("ExpiryDate")
-        // console.log(ExpiryDate)
         ExpiryDate.setDate(ExpiryDate.getDate() + TimeToCompleteDays);
-        // console.log("ExpiryDate date after update")
-        // console.log(ExpiryDate)
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
         updateQuery.set('OriginIp', ip);
+        const AutoReminder = request?.object?.get('AutomaticReminders') || false;
+        if (AutoReminder) {
+          const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
+          const ReminderDate = new Date(createdAt);
+          ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
+          updateQuery.set('NextReminderDate', ReminderDate);
+        }
         await updateQuery.save(null, { useMasterKey: true });
       }
 

apps/OpenSignServer/cloud/parsefunction/FacebookSign.js

@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios from 'axios';
 
 const serverUrl = process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
@@ -18,23 +18,23 @@ export default async function FacebookSign(request) {
   const userGoogleId = request.params.Id;
   const userAccessToken = request.params.AccessToken;
   const userEmail = request.params.Email;
-  const phone = request.params.Phone;
+  const phone = request.params?.Phone || '';
   const name = request.params.Name;
   const authData = {
     facebook: { id: userGoogleId, access_token: userAccessToken },
   };
   const userQuery = new Parse.Query(Parse.User);
-  userQuery.equalTo("email", userEmail);
+  userQuery.equalTo('email', userEmail);
   const res = await userQuery.first({ useMasterKey: true });
   if (res) {
     try {
       const SignIn = await axios.put(
-        serverUrl + "/users/" + res.id,
+        serverUrl + '/users/' + res.id,
         { authData: authData },
         {
           headers: {
-            "X-Parse-Application-Id": APPID,
-            "X-Parse-Master-key": masterKEY,
+            'X-Parse-Application-Id': APPID,
+            'X-Parse-Master-key': masterKEY,
           },
         }
       );
@@ -42,22 +42,22 @@ export default async function FacebookSign(request) {
       if (SignIn.data) {
         // console.log("google Sign in", SignIn);
         const sessiontoken = SignIn.data.sessionToken;
-        console.log("Google sessiontoken", sessiontoken);
+        console.log('Google sessiontoken', sessiontoken);
         return {
           email: userEmail,
-          message: "User Sign In",
+          message: 'User Sign In',
           sessiontoken: sessiontoken,
         };
       }
     } catch (err) {
-      console.log("err in user google sign in", err);
-      return { message: "Internal server error" };
+      console.log('err in user google sign in', err);
+      return { message: 'Internal server error' };
     }
   } else {
     // console.log("in sign up condition");
     try {
       const SignUp = await axios.post(
-        serverUrl + "/users",
+        serverUrl + '/users',
         {
           authData: authData,
           username: userEmail,
@@ -67,8 +67,8 @@ export default async function FacebookSign(request) {
         },
         {
           headers: {
-            "X-Parse-Application-Id": APPID,
-            "X-Parse-Revocable-Session": "1",
+            'X-Parse-Application-Id': APPID,
+            'X-Parse-Revocable-Session': '1',
           },
         }
       );
@@ -79,14 +79,14 @@ export default async function FacebookSign(request) {
         const sessiontoken = SignUp.data.sessionToken;
         const payload = {
           email: userEmail,
-          message: "User Sign Up",
+          message: 'User Sign Up',
           sessiontoken: sessiontoken,
         };
         return payload;
       }
     } catch (err) {
-      console.log("err in user google sign up", err);
-      return { message: "Internal server err" };
+      console.log('err in user google sign up', err);
+      return { message: 'Internal server err' };
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/GetPublicTemplate.js

@@ -0,0 +1,32 @@
+async function GetPublicTemplate(request) {
+  try {
+    const username = request.params.username;
+    if (username) {
+      const extUserQuery = new Parse.Query('contracts_Users');
+      extUserQuery.equalTo('UserName', username);
+      const res = await extUserQuery.first({ useMasterKey: true });
+      const userId = res.get('UserId').id;
+      if (userId) {
+        const templatQuery = new Parse.Query('contracts_Template');
+        templatQuery.equalTo('CreatedBy', {
+          __type: 'Pointer',
+          className: '_User',
+          objectId: userId,
+        });
+        templatQuery.equalTo('IsPublic', true);
+        const getTemplate = await templatQuery.find({ useMasterKey: true });
+        return getTemplate;
+      } else {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Template not found');
+      }
+    } else {
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Please provide required parameters!');
+    }
+  } catch (err) {
+    const code = err.code || 400;
+    const msg = err.message;
+    const error = new Parse.Error(code, msg);
+    throw error;
+  }
+}
+export default GetPublicTemplate;

apps/OpenSignServer/cloud/parsefunction/GetPublicUserName.js

@@ -0,0 +1,23 @@
+async function GetPublicUserName(request) {
+  try {
+    if (!request?.user) {
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+    } else {
+      const username = request.params.username;
+      if (username) {
+        const userQuery = new Parse.Query('contracts_Users');
+        userQuery.equalTo('UserName', username);
+        const res = await userQuery.first({ useMasterKey: true });
+        return res;
+      } else {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Please provide required parameters!');
+      }
+    }
+  } catch (err) {
+    const code = err.code || 400;
+    const msg = err.message;
+    const error = new Parse.Error(code, msg);
+    throw error;
+  }
+}
+export default GetPublicUserName;

apps/OpenSignServer/cloud/parsefunction/GetTemplate.js

@@ -26,7 +26,7 @@ export default async function GetTemplate(request) {
         if (res) {
           // console.log("res ",res)
           const acl = res.getACL();
-          console.log("acl", acl.getReadAccess(userId))
+          // console.log("acl", acl.getReadAccess(userId))
           if (acl && acl.getReadAccess(userId)) {
             return res;
           } else {

apps/OpenSignServer/cloud/parsefunction/GoogleSign.js

@@ -1,4 +1,4 @@
-import axios from "axios";
+import axios from 'axios';
 
 const serverUrl = process.env.SERVER_URL;
 const APPID = process.env.APP_ID;
@@ -9,8 +9,8 @@ const masterKEY = process.env.MASTER_KEY;
  * @param Id It is google Id
  * @param TokenId It is google token Id
  * @param Gmail It is user's gmail with user sign in/sign up
- * @param Phone It is user's Phone number 
- * @param Name It is user's Name 
+ * @param Phone It is user's Phone number
+ * @param Name It is user's Name
  * @returns if success {email, message, sessiontoken} else on reject {message}
  */
 
@@ -18,21 +18,21 @@ export default async function GoogleSign(request) {
   const userGoogleId = request.params.Id;
   const userTokenId = request.params.TokenId;
   const userEmail = request.params.Gmail;
-  const phone = request.params.Phone;
+  const phone = request.params?.Phone || '';
   const name = request.params.Name;
   const authData = { google: { id: userGoogleId, id_token: userTokenId } };
   const userQuery = new Parse.Query(Parse.User);
-  userQuery.equalTo("email", userEmail);
+  userQuery.equalTo('email', userEmail);
   const res = await userQuery.first({ useMasterKey: true });
   if (res) {
     try {
       const SignIn = await axios.put(
-        serverUrl + "/users/" + res.id,
+        serverUrl + '/users/' + res.id,
         { authData: authData },
         {
           headers: {
-            "X-Parse-Application-Id": APPID,
-            "X-Parse-Master-key": masterKEY,
+            'X-Parse-Application-Id': APPID,
+            'X-Parse-Master-key': masterKEY,
           },
         }
       );
@@ -40,22 +40,22 @@ export default async function GoogleSign(request) {
       if (SignIn.data) {
         // console.log("google Sign in", SignIn);
         const sessiontoken = SignIn.data.sessionToken;
-        console.log("Google sessiontoken", sessiontoken);
+        console.log('Google sessiontoken', sessiontoken);
         return {
           email: userEmail,
-          message: "User Sign In",
+          message: 'User Sign In',
           sessiontoken: sessiontoken,
         };
       }
     } catch (err) {
-      console.log("err in user google sign in", err);
-      return { message: "Internal server error" };
+      console.log('err in user google sign in', err);
+      return { message: 'Internal server error' };
     }
   } else {
     // console.log("in sign up condition");
     try {
       const SignUp = await axios.post(
-        serverUrl + "/users",
+        serverUrl + '/users',
         {
           authData: authData,
           username: userEmail,
@@ -65,8 +65,8 @@ export default async function GoogleSign(request) {
         },
         {
           headers: {
-            "X-Parse-Application-Id": APPID,
-            "X-Parse-Revocable-Session": "1",
+            'X-Parse-Application-Id': APPID,
+            'X-Parse-Revocable-Session': '1',
           },
         }
       );
@@ -77,14 +77,14 @@ export default async function GoogleSign(request) {
         const sessiontoken = SignUp.data.sessionToken;
         const payload = {
           email: userEmail,
-          message: "User Sign Up",
+          message: 'User Sign Up',
           sessiontoken: sessiontoken,
         };
         return payload;
       }
     } catch (err) {
-      console.log("err in user google sign up", err);
-      return { message: "Internal server err" };
+      console.log('err in user google sign up', err);
+      return { message: 'Internal server err' };
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/SendMailOTPv1.js

@@ -1,4 +1,4 @@
-import { updateMailCount } from '../../Utils.js';
+import { smtpenable, updateMailCount } from '../../Utils.js';
 async function getDocument(docId) {
   try {
     const query = new Parse.Query('contracts_Document');
@@ -25,9 +25,7 @@ async function sendMailOTPv1(request) {
 
     if (email) {
       const recipient = request.params.email;
-      const mailsender = process.env.SMTP_ENABLE
-        ? process.env.SMTP_USER_EMAIL
-        : process.env.MAILGUN_SENDER;
+      const mailsender = smtpenable ? process.env.SMTP_USER_EMAIL : process.env.MAILGUN_SENDER;
       try {
         await Parse.Cloud.sendEmail({
           from: 'Opensign™' + ' <' + mailsender + '>',
@@ -39,7 +37,7 @@ async function sendMailOTPv1(request) {
             code +
             '</p></div> </div> </div></body></html>',
         });
-        console.log('OTP sent');
+        console.log('OTP sent', code);
         if (request.params?.docId) {
           const extUserId = await getDocument(request.params?.docId);
           if (extUserId) {

apps/OpenSignServer/cloud/parsefunction/TemplateAfterSave.js

@@ -4,7 +4,14 @@ export default async function TemplateAfterSave(request) {
       console.log('new entry is insert in contracts_Template');
       // update acl of New Document If There are signers present in array
       const signers = request.object.get('Signers');
-
+      const AutoReminder = request?.object?.get('AutomaticReminders') || false;
+      if (AutoReminder) {
+        const RemindOnceInEvery = request?.object?.get('RemindOnceInEvery') || 5;
+        const ReminderDate = new Date(request?.object?.get('createdAt'));
+        ReminderDate.setDate(ReminderDate.getDate() + RemindOnceInEvery);
+        request.object.set('NextReminderDate', ReminderDate);
+        await request.object.save(null, { useMasterKey: true });
+      }
       if (signers && signers.length > 0) {
         await updateAclDoc(request.object.id);
       } else {

apps/OpenSignServer/cloud/parsefunction/UserGroups.js

@@ -2,41 +2,41 @@
 
 //-- Export Modules
 import dotenv from 'dotenv';
-dotenv.config()
-import axios from "axios";
+dotenv.config();
+import axios from 'axios';
 
 export async function getUserGroups(request) {
   try {
     var appname = request.params.appname;
-    if (appname == "") {
-      return Promise.reject("Error:please provide appname");
+    if (appname == '') {
+      return Promise.reject('Error:please provide appname');
     }
     var response = {};
     var rolelist = {};
-    appname = appname + "_";
+    appname = appname + '_';
     //--function to get the userid from session token
     function getuserid(request) {
       return new Promise(function (resolve, reject) {
         const options = {
-          url: process.env.SERVER_URL + "/users/me",
-          method: "get",
+          url: process.env.SERVER_URL + '/users/me',
+          method: 'get',
           headers: {
-            "X-Parse-Application-Id": process.env.APP_ID,
-            "X-Parse-Session-Token": request.headers["sessiontoken"],
+            'X-Parse-Application-Id': process.env.APP_ID,
+            'X-Parse-Session-Token': request.headers['sessiontoken'],
           },
         };
 
         axios(options)
-          .then((x) => {
+          .then(x => {
             const body = x.data;
-            var error = body == "" ? true : false;
+            var error = body == '' ? true : false;
             if (error) {
-              reject("result not found!");
+              reject('result not found!');
             } else {
               resolve(body);
             }
           })
-          .catch((err) => {
+          .catch(err => {
             if (err) {
               console.error(err);
               return;
@@ -46,7 +46,7 @@ export async function getUserGroups(request) {
     }
     var userData = await getuserid(request);
     var userid = userData.objectId;
-    console.log("userid " + userid);
+    // console.log("userid " + userid);
     var url =
       process.env.SERVER_URL +
       '/roles?where={"users":{"__type":"Pointer","className":"_User","objectId":"' +
@@ -60,29 +60,29 @@ export async function getUserGroups(request) {
       return new Promise(function (resolve, reject) {
         const options = {
           url: url,
-          method: "get",
+          method: 'get',
           headers: {
-            "X-Parse-Application-Id": process.env.APP_ID,
+            'X-Parse-Application-Id': process.env.APP_ID,
           },
         };
 
         axios(options)
-          .then((x) => {
+          .then(x => {
             const body = x.data;
             var roleres = [];
-            for (var i = 0; i < body["results"].length; i++) {
-              var rolename = body["results"][i]["name"];
+            for (var i = 0; i < body['results'].length; i++) {
+              var rolename = body['results'][i]['name'];
               //var roleprefix = rolename.split("_")[0];
               roleres.push(rolename);
             }
-            var error = roleres == "" ? true : false;
+            var error = roleres == '' ? true : false;
             if (error) {
-              reject("result not found!");
+              reject('result not found!');
             } else {
               resolve(roleres);
             }
           })
-          .catch((err) => {
+          .catch(err => {
             if (err) {
               console.error(err);
               return;
@@ -92,7 +92,7 @@ export async function getUserGroups(request) {
     }
 
     rolelist = await getRoleList(request);
-    console.log(rolelist);
+    // console.log(rolelist);
     //--check user roles according to appId
     var rolesInapp = [];
     for (let i = 0; i < rolelist.length; i++) {
@@ -102,11 +102,11 @@ export async function getUserGroups(request) {
         rolesInapp.push(rolelist[i]);
       }
     }
-    console.log(rolesInapp);
+    // console.log(rolesInapp);
     return rolesInapp;
   } catch (err) {
-    console.log("err in usergroup");
+    console.log('err in usergroup');
     console.log(err);
-    return Promise.reject("Error:Result not found");
+    return Promise.reject('Error:Result not found');
   }
 }

apps/OpenSignServer/cloud/parsefunction/ZohoDetails.js

@@ -26,12 +26,15 @@ export default async function ZohoDetails(request) {
   //   console.log("Access Token:", res.data);
   if (res.data.access_token) {
     const hostedpages = request.params.hostedpagesId;
-    const userData = await axios.get('https://billing.zoho.in/api/v1/hostedpages/' + hostedpages, {
-      headers: {
-        Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
-        'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
-      },
-    });
+    const userData = await axios.get(
+      'https://www.zohoapis.in/billing/v1/hostedpages/' + hostedpages,
+      {
+        headers: {
+          Authorization: 'Zoho-oauthtoken ' + res.data.access_token,
+          'X-com-zoho-subscriptions-organizationid': process.env.ZOHO_BILLING_ORG_ID,
+        },
+      }
+    );
 
     const first_name = userData.data.data.subscription.contactpersons[0].first_name || '';
     const last_name = userData.data.data.subscription.contactpersons[0].last_name || '';
@@ -44,7 +47,7 @@ export default async function ZohoDetails(request) {
         userData.data.data.subscription.customer.cd_job_title) ||
       '';
     const resData = {
-      phone: userData.data.data.subscription.contactpersons[0].mobile,
+      phone: userData.data.data.subscription.contactpersons[0]?.mobile || '',
       name: first_name + ' ' + last_name,
       email: userData.data.data.subscription.contactpersons[0].email,
       nextBillingDate: userData.data.data.subscription.next_billing_at,

apps/OpenSignServer/cloud/parsefunction/callWebhook.js

@@ -48,8 +48,11 @@ export default async function callWebhook(request) {
         }
       }
     }
+    const docQuery = new Parse.Query('contracts_Document');
+    const resDoc = await docQuery.get(docId, { useMasterKey: true });
     const extendcls = new Parse.Query('contracts_Users');
-    extendcls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
+    extendcls.equalTo('objectId', resDoc.get('ExtUserPtr')?.id);
+    // extendcls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
     const res = await extendcls.first({ useMasterKey: true });
     if (res) {
       const extUser = JSON.parse(JSON.stringify(res));

apps/OpenSignServer/cloud/parsefunction/createBatchDocs.js

@@ -0,0 +1,182 @@
+import axios from 'axios';
+
+const serverUrl = process.env.SERVER_URL;
+const appId = process.env.APP_ID;
+
+async function sendMail(document, sessionToken) {
+  const baseUrl = new URL(process.env.PUBLIC_URL);
+
+  // console.log("pdfDetails", pdfDetails);
+  const timeToCompleteDays = document?.TimeToCompleteDays || 15;
+  const ExpireDate = new Date(document.createdAt);
+  ExpireDate.setDate(ExpireDate.getDate() + timeToCompleteDays);
+  const newDate = ExpireDate;
+  const localExpireDate = newDate.toLocaleDateString('en-US', {
+    day: 'numeric',
+    month: 'long',
+    year: 'numeric',
+  });
+  const sender = document.ExtUserPtr.Email;
+  let signerMail = document.Placeholders;
+
+  if (document.SendinOrder) {
+    signerMail = signerMail.slice();
+    signerMail.splice(1);
+  }
+  for (let i = 0; i < signerMail.length; i++) {
+    try {
+      const imgPng = 'https://qikinnovation.ams3.digitaloceanspaces.com/logo.png';
+      let url = `${serverUrl}/functions/sendmailv3`;
+      const headers = {
+        'Content-Type': 'application/json',
+        'X-Parse-Application-Id': appId,
+        sessionToken: sessionToken,
+      };
+      const objectId = signerMail[i]?.signerObjId;
+      const hostUrl = baseUrl.origin;
+      let encodeBase64;
+      let existSigner = {};
+      if (objectId) {
+        existSigner = document?.Signers?.find(user => user.objectId === objectId);
+        encodeBase64 = btoa(`${document.objectId}/${existSigner?.Email}/${objectId}`);
+      } else {
+        encodeBase64 = btoa(`${document.objectId}/${signerMail[i].email}`);
+      }
+      let signPdf = `${hostUrl}/login/${encodeBase64}`;
+      const openSignUrl = 'https://www.opensignlabs.com/';
+      const orgName = document.ExtUserPtr.Company ? document.ExtUserPtr.Company : '';
+      const themeBGcolor = '#47a3ad';
+      let params = {
+        extUserId: document.ExtUserPtr.objectId,
+        recipient: objectId ? existSigner?.Email : signerMail[i].email,
+        subject: `${document.ExtUserPtr.Name} has requested you to sign "${document.Name}"`,
+        mailProvider: document?.ExtUserPtr?.active_mail_adapter || '',
+        from: sender,
+        html:
+          "<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;'> " +
+          document.ExtUserPtr.Name +
+          ' has requested you to review and sign <strong> ' +
+          document.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'>" +
+          sender +
+          "</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 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 " +
+          sender +
+          ' 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>',
+      };
+      const sendMail = await axios.post(url, params, { headers: headers });
+      // if (sendMail.data.result.status === 'success') {
+      //   console.log('batch login mail sent');
+      // }
+    } catch (error) {
+      console.log('error', error);
+    }
+  }
+}
+export default async function createBatchDocs(request) {
+  const strDocuments = request.params.Documents;
+  const sessionToken = request.headers['sessiontoken'];
+  const Documents = JSON.parse(strDocuments);
+  const Ip = request?.headers?.['x-real-ip'] || '';
+  // console.log('Documents ', Documents);
+  const parseConfig = {
+    baseURL: serverUrl, //localStorage.getItem('baseUrl'),
+    headers: {
+      'X-Parse-Application-Id': appId,
+      'X-Parse-Session-Token': sessionToken,
+      'Content-Type': 'application/json',
+    },
+  };
+  try {
+    const requests = Documents.map(x => {
+      const Signers = x.Signers;
+      const allSigner = x?.Placeholders?.map(
+        item => Signers?.find(e => item?.signerPtr?.objectId === e?.objectId) || item?.signerPtr
+      ).filter(signer => Object.keys(signer).length > 0);
+      const date = new Date();
+      const isoDate = date.toISOString();
+      let Acl = { [x.CreatedBy.objectId]: { read: true, write: true } };
+      if (allSigner && allSigner.length > 0) {
+        allSigner.forEach(x => {
+          const obj = { [x.CreatedBy.objectId]: { read: true, write: true } };
+          Acl = { ...Acl, ...obj };
+        });
+      }
+      return {
+        method: 'POST',
+        path: '/app/classes/contracts_Document',
+        body: {
+          Name: x.Name,
+          URL: x.URL,
+          Note: x.Note,
+          Description: x.Description,
+          CreatedBy: x.CreatedBy,
+          SendinOrder: x.SendinOrder || true,
+          ExtUserPtr: {
+            __type: 'Pointer',
+            className: x.ExtUserPtr.className,
+            objectId: x.ExtUserPtr.objectId,
+          },
+          Placeholders: x.Placeholders.map(y =>
+            y?.signerPtr?.objectId
+              ? {
+                  ...y,
+                  signerPtr: {
+                    __type: 'Pointer',
+                    className: 'contracts_Contactbook',
+                    objectId: y.signerPtr.objectId,
+                  },
+                  signerObjId: y.signerObjId,
+                }
+              : { ...y, signerPtr: {}, signerObjId: '' }
+          ),
+          SignedUrl: x.URL || x.SignedUrl,
+          SentToOthers: true,
+          Signers: allSigner?.map(y => ({
+            __type: 'Pointer',
+            className: 'contracts_Contactbook',
+            objectId: y.objectId,
+          })),
+          ACL: Acl,
+          SentToOthers: true,
+          RemindOnceInEvery: x.RemindOnceInEvery || 5,
+          AutomaticReminders: x.AutomaticReminders || false,
+          TimeToCompleteDays: x.TimeToCompleteDays || 15,
+          OriginIp: Ip,
+          DocSentAt: { __type: 'Date', iso: isoDate },
+        },
+      };
+    });
+    // console.log('requests ', requests);
+
+    const response = await axios.post('batch', { requests: requests }, parseConfig);
+    // // Handle the batch query response
+    // console.log('Batch query response:', response.data);
+    if (response.data && response.data.length > 0) {
+      const updateDocuments = Documents.map((x, i) => ({
+        ...x,
+        objectId: response.data[i]?.success?.objectId,
+        createdAt: response.data[i]?.success?.createdAt,
+      }));
+      for (let i = 0; i < updateDocuments.length; i++) {
+        sendMail(updateDocuments[i], sessionToken);
+      }
+      return 'success';
+    }
+
+    // Handle individual responses within response.data.results
+  } catch (error) {
+    console.error('Error performing batch query:', error);
+  }
+}

apps/OpenSignServer/cloud/parsefunction/getReport.js

@@ -30,7 +30,7 @@ export default async function getReport(request) {
           '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`;
+        const url = `${serverUrl}/classes/${clsName}?where=${strParams}&keys=${strKeys}&order=${orderBy}&skip=${skip}&limit=${limit}&include=AuditTrail.UserPtr,Placeholders.signerPtr`;
         const res = await axios.get(url, { headers: headers });
         if (res.data && res.data.results) {
           return res.data.results;

apps/OpenSignServer/cloud/parsefunction/isextenduser.js

@@ -0,0 +1,30 @@
+/**
+ * Checks if a user exists in the extended class 'contracts_Users' based on the provided email.
+ * @param email - The request contains parameters, such as the user's email.
+ * @returns {Object} - Returns an object indicating whether the user exists.
+ */
+export default async function isextenduser(request) {
+  try {
+    // Query the 'contracts_Users' class in the database based on the provided email
+    const userQuery = new Parse.Query('contracts_Users');
+    userQuery.equalTo('Email', request.params.email);
+
+    // Execute the query
+    const res = await userQuery.first({ useMasterKey: true });
+
+    // Check if a user was found
+    if (res) {
+      // If user exists, return object with 'isUserExist' set to true
+      return { isUserExist: true };
+    } else {
+      // If user does not exist, return object with 'isUserExist' set to false
+      return { isUserExist: false };
+    }
+  } catch (err) {
+    // Handle errors
+    console.log('Error in userexist', err);
+    const code = err?.code || 400;
+    const message = err?.message || 'Something went wrong.';
+    throw new Parse.Error(code, message);
+  }
+}

apps/OpenSignServer/cloud/parsefunction/linkContactToDoc.js

@@ -0,0 +1,293 @@
+// `saveRoleContact` is used to save user in contracts_Guest role and create contact
+const saveRoleContact = async contact => {
+  try {
+    const Role = new Parse.Query(Parse.Role);
+    const guestRole = await Role.equalTo('name', 'contracts_Guest').first();
+    if (guestRole) {
+      // Check if the user is already in the role
+      const relation = guestRole.relation('users');
+      const usersInRoleQuery = relation.query();
+      usersInRoleQuery.equalTo('objectId', contact.UserId.objectId);
+      const usersInRole = await usersInRoleQuery.find();
+      if (usersInRole.length > 0) {
+        console.log('User already added to Guest role.');
+      } else {
+        relation.add({ __type: 'Pointer', className: '_User', id: contact.UserId.objectId });
+        await guestRole.save(null, { useMasterKey: true });
+        // console.log('User added to Guest role successfully.');
+      }
+    }
+  } catch (err) {
+    console.log('err in role save', err);
+  }
+  const contactQuery = new Parse.Object('contracts_Contactbook');
+  contactQuery.set('Name', contact.Name);
+  contactQuery.set('Email', contact.Email);
+  if (contact?.Phone) {
+    contactQuery.set('Phone', contact.Phone);
+  }
+  contactQuery.set('CreatedBy', contact.CreatedBy);
+  contactQuery.set('UserId', contact.UserId);
+  contactQuery.set('UserRole', 'contracts_Guest');
+  contactQuery.set('TenantId', contact.TenantId);
+  contactQuery.set('IsDeleted', false);
+  const acl = new Parse.ACL();
+  acl.setReadAccess(contact.CreatedBy.objectId, true);
+  acl.setWriteAccess(contact.CreatedBy.objectId, true);
+  acl.setReadAccess(contact.UserId.objectId, true);
+  acl.setWriteAccess(contact.UserId.objectId, true);
+  contactQuery.setACL(acl);
+  const contactRes = await contactQuery.save();
+  if (contactRes) {
+    return contactRes;
+  }
+};
+
+// `linkContactToDoc` cloud function is used to create contact, add this contact in contracts_Guest role and
+// save contact pointer in placeholder, signers and ACL of Document
+export default async function linkContactToDoc(req) {
+  const email = req.params.email;
+  const docId = req.params.docId;
+  const name = req.params.name;
+  const phone = req.params.phone;
+  try {
+    if (docId) {
+      // Execute the query to get the document with the specified 'docId'
+      const docQuery = new Parse.Query('contracts_Document');
+      docQuery.include('ExtUserPtr');
+      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) {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found.');
+      }
+      const _docRes = JSON.parse(JSON.stringify(docRes));
+      const Placeholders = _docRes?.Placeholders || [];
+      const index = Placeholders?.findIndex(x => x.email && x.email === email);
+      if (index !== -1) {
+        // `signerObjectId` holds the value of `signerObjId` from the `Placeholders` array at the current index.
+        // This value is used to check if `signerObjId` is present or not.
+        const signerObjectId = Placeholders[index]?.signerObjId;
+        if (signerObjectId) {
+          return { contactId: signerObjectId };
+        }
+        // Execute the query to check if a contact already exists in the 'contracts_Contactbook' class
+        const contactCls = new Parse.Query('contracts_Contactbook');
+        contactCls.equalTo('Email', email);
+        contactCls.equalTo('CreatedBy', _docRes.CreatedBy);
+        contactCls.notEqualTo('IsDeleted', true);
+        const existContact = await contactCls.first({ useMasterKey: true });
+        if (existContact) {
+          //update contact in placeholder, signers and update ACl in provide document
+          const updateDoc = new Parse.Object('contracts_Document');
+          updateDoc.id = docId;
+          const signers = _docRes?.Signers || [];
+          const signerobj = {
+            __type: 'Pointer',
+            className: 'contracts_Contactbook',
+            objectId: existContact.id,
+          };
+          // The splice method is used to add a signer at the desired index
+          // index is the variable where the signer needs to be added
+          // 0 indicates that no elements should be deleted
+          // signerobj is the reference to the signer object
+          signers.splice(index, 0, signerobj);
+          updateDoc.set('Signers', signers);
+
+          Placeholders[index] = {
+            ...Placeholders[index],
+            signerObjId: existContact.id,
+            signerPtr: {
+              __type: 'Pointer',
+              className: 'contracts_Contactbook',
+              objectId: existContact.id,
+            },
+          };
+          updateDoc.set('Placeholders', Placeholders);
+          const Acl = docRes.getACL();
+          Acl.setReadAccess(existContact.get('UserId').id, true);
+          Acl.setWriteAccess(existContact.get('UserId').id, true);
+          updateDoc.setACL(Acl);
+          //   const parseData = JSON.parse(JSON.stringify(res));
+          const resDoc = await updateDoc.save(null, { useMasterKey: true });
+          if (resDoc) {
+            return { contactId: existContact.id };
+          }
+        } else {
+          // Execute the query to check if a user already exists in the 'contracts_Users' class
+          const extUserQuery = new Parse.Query('contracts_Users');
+          extUserQuery.equalTo('Email', email);
+          const extUser = await extUserQuery.first({ useMasterKey: true });
+          if (extUser) {
+            const _extUser = JSON.parse(JSON.stringify(extUser));
+            const contact = {
+              UserId: _extUser.UserId,
+              Name: _extUser.Name,
+              Email: email,
+              Phone: _extUser?.Phone ? _extUser.Phone : '',
+              CreatedBy: _docRes.CreatedBy,
+              TenantId: _docRes.ExtUserPtr.TenantId,
+            };
+            // if user present on platform create contact on the basis of extended user details
+            const contactRes = await saveRoleContact(contact);
+            //update contact in placeholder, signers and update ACl in provide document
+            const updateDoc = new Parse.Object('contracts_Document');
+            updateDoc.id = docId;
+            const signers = _docRes?.Signers || [];
+            const signerobj = {
+              __type: 'Pointer',
+              className: 'contracts_Contactbook',
+              objectId: contactRes.id,
+            };
+            // The splice method is used to add a signer at the desired index
+            // index is the variable where the signer needs to be added
+            // 0 indicates that no elements should be deleted
+            // signerobj is the reference to the signer object
+            signers.splice(index, 0, signerobj);
+            updateDoc.set('Signers', signers);
+
+            Placeholders[index] = {
+              ...Placeholders[index],
+              signerObjId: contactRes.id,
+              signerPtr: {
+                __type: 'Pointer',
+                className: 'contracts_Contactbook',
+                objectId: contactRes.id,
+              },
+            };
+            updateDoc.set('Placeholders', Placeholders);
+            const Acl = docRes.getACL();
+            Acl.setReadAccess(_extUser.UserId.objectId, true);
+            Acl.setWriteAccess(_extUser.UserId.objectId, true);
+            updateDoc.setACL(Acl);
+            //   const parseData = JSON.parse(JSON.stringify(res));
+            const resDoc = await updateDoc.save(null, { useMasterKey: true });
+            if (resDoc) {
+              return { contactId: contactRes.id };
+            }
+          } else if (name) {
+            try {
+              // Execute the query to check if a user already exists in the '_User' class
+              const userQuery = new Parse.Query(Parse.User);
+              userQuery.equalTo('email', email);
+              const userRes = await userQuery.first({ useMasterKey: true });
+              if (userRes) {
+                const contact = {
+                  UserId: { __type: 'Pointer', className: '_User', objectId: userRes.id },
+                  Name: name,
+                  Email: email,
+                  Phone: phone,
+                  CreatedBy: _docRes.CreatedBy,
+                  TenantId: _docRes.ExtUserPtr.TenantId,
+                };
+                // Create new contract on the basis provided contact details by user and userId from _User class
+                const contactRes = await saveRoleContact(contact);
+                //update contact in placeholder, signers and update ACl in provide document
+                const updateDoc = new Parse.Object('contracts_Document');
+                updateDoc.id = docId;
+                const signers = _docRes?.Signers || [];
+                const signerobj = {
+                  __type: 'Pointer',
+                  className: 'contracts_Contactbook',
+                  objectId: contactRes.id,
+                };
+                // The splice method is used to add a signer at the desired index
+                // index is the variable where the signer needs to be added
+                // 0 indicates that no elements should be deleted
+                // signerobj is the reference to the signer object
+                signers.splice(index, 0, signerobj);
+                updateDoc.set('Signers', signers);
+
+                Placeholders[index] = {
+                  ...Placeholders[index],
+                  signerObjId: contactRes.id,
+                  signerPtr: {
+                    __type: 'Pointer',
+                    className: 'contracts_Contactbook',
+                    objectId: contactRes.id,
+                  },
+                };
+                updateDoc.set('Placeholders', Placeholders);
+                const Acl = docRes.getACL();
+                Acl.setReadAccess(userRes.id, true);
+                Acl.setWriteAccess(userRes.id, true);
+                updateDoc.setACL(Acl);
+                //   const parseData = JSON.parse(JSON.stringify(res));
+                const resDoc = await updateDoc.save(null, { useMasterKey: true });
+                if (resDoc) {
+                  return { contactId: contactRes.id };
+                }
+              } else {
+                // create new user in _User class on the basis of details provide by user
+                const _users = Parse.Object.extend('User');
+                const _user = new _users();
+                _user.set('name', name);
+                _user.set('username', email);
+                _user.set('email', email);
+                _user.set('password', email);
+                if (phone) {
+                  _user.set('phone', phone);
+                }
+                const newUserRes = await _user.save();
+                const contact = {
+                  UserId: { __type: 'Pointer', className: '_User', objectId: newUserRes.id },
+                  Name: name,
+                  Email: email,
+                  Phone: phone,
+                  CreatedBy: _docRes.CreatedBy,
+                  TenantId: _docRes.ExtUserPtr.TenantId,
+                };
+                // Create new contract on the basis provided contact details by user and userId from _User class
+                const contactRes = await saveRoleContact(contact);
+                //update contact in placeholder, signers and update ACl in provide document
+                const updateDoc = new Parse.Object('contracts_Document');
+                updateDoc.id = docId;
+                const signers = _docRes?.Signers || [];
+                const signerobj = {
+                  __type: 'Pointer',
+                  className: 'contracts_Contactbook',
+                  objectId: contactRes.id,
+                };
+                // The splice method is used to add a signer at the desired index
+                // index is the variable where the signer needs to be added
+                // 0 indicates that no elements should be deleted
+                // signerobj is the reference to the signer object
+                signers.splice(index, 0, signerobj);
+                updateDoc.set('Signers', signers);
+                Placeholders[index] = {
+                  ...Placeholders[index],
+                  signerObjId: contactRes.id,
+                  signerPtr: {
+                    __type: 'Pointer',
+                    className: 'contracts_Contactbook',
+                    objectId: contactRes.id,
+                  },
+                };
+                updateDoc.set('Placeholders', Placeholders);
+                const Acl = docRes.getACL();
+                Acl.setReadAccess(newUserRes.id, true);
+                Acl.setWriteAccess(newUserRes.id, true);
+                updateDoc.setACL(Acl);
+                //   const parseData = JSON.parse(JSON.stringify(res));
+                const resDoc = await updateDoc.save(null, { useMasterKey: true });
+                if (resDoc) {
+                  return { contactId: contactRes.id };
+                }
+              }
+            } catch (err) {
+              console.log('Err', err);
+            }
+          } else {
+            throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
+          }
+        }
+      } else {
+        throw new Parse.Error(Parse.Error.OPERATION_FORBIDDEN, 'unauthorized');
+      }
+    } else {
+      throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found.');
+    }
+  } catch (err) {
+    console.log('err in linkcontacttodoc', err);
+    throw err;
+  }
+}

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

@@ -0,0 +1,473 @@
+import fs from 'node:fs';
+import axios from 'axios';
+import { SignPdf } from '@signpdf/signpdf';
+import { P12Signer } from '@signpdf/signer-p12';
+import { pdflibAddPlaceholder } from '@signpdf/placeholder-pdf-lib';
+import { PDFDocument } from 'pdf-lib';
+import { replaceMailVaribles, saveFileUsage } from '../../../Utils.js';
+import GenerateCertificate from './GenerateCertificate.js';
+const serverUrl = 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) {
+  try {
+    const filedata = fs.readFileSync(filepath);
+    const file = new Parse.File(pdfName, [...filedata], 'application/pdf');
+    await file.save({ useMasterKey: true });
+    const fileUrl = file.url();
+    return { imageUrl: fileUrl };
+  } catch (err) {
+    console.log('Err ', err);
+    // `fs.unlinkSync` is used to remove exported signed pdf file from exports folder
+    fs.unlinkSync(filepath);
+  }
+}
+
+// `updateDoc` is used to update signedUrl, AuditTrail, Iscompleted in document
+async function updateDoc(docId, url, userId, ipAddress, data, className, sign) {
+  try {
+    const UserPtr = {
+      __type: 'Pointer',
+      className: className,
+      objectId: userId,
+    };
+    const obj = {
+      UserPtr: UserPtr,
+      SignedUrl: url,
+      Activity: 'Signed',
+      ipAddress: ipAddress,
+      SignedOn: new Date(),
+      Signature: sign,
+    };
+    let updateAuditTrail;
+    if (data.AuditTrail && data.AuditTrail.length > 0) {
+      const AuditTrail = JSON.parse(JSON.stringify(data.AuditTrail));
+      const existingIndex = AuditTrail.findIndex(
+        entry => entry.UserPtr.objectId === userId && entry.Activity !== 'Created'
+      );
+      existingIndex !== -1
+        ? (AuditTrail[existingIndex] = { ...AuditTrail[existingIndex], ...obj })
+        : AuditTrail.push(obj);
+
+      updateAuditTrail = AuditTrail;
+    } else {
+      updateAuditTrail = [obj];
+    }
+
+    const auditTrail = updateAuditTrail.filter(x => x.Activity === 'Signed');
+    let isCompleted = false;
+    if (data.Signers && data.Signers.length > 0) {
+      if (auditTrail.length === data.Placeholders.length) {
+        isCompleted = true;
+      }
+    } else {
+      isCompleted = true;
+    }
+    const body = {
+      SignedUrl: url,
+      AuditTrail: updateAuditTrail,
+      IsCompleted: isCompleted,
+    };
+    const signedRes = await axios.put(serverUrl + '/classes/contracts_Document/' + docId, body, {
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Parse-Application-Id': APPID,
+        'X-Parse-Master-Key': masterKEY,
+      },
+    });
+    return { isCompleted: isCompleted, message: 'success', AuditTrail: updateAuditTrail };
+  } catch (err) {
+    console.log('update doc err ', err);
+    return 'err';
+  }
+}
+
+// `sendCompletedMail` is used to send copy of completed document mail
+async function sendCompletedMail(obj) {
+  const url = obj.url;
+  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;
+  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=" +
+    mailLogo +
+    "  height='50' style='padding:20px'/> </div><div style='padding:2px;font-family:system-ui; background-color: #47a3ad;'>    <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',> Document signed successfully</p></div><div><p style='padding:20px;font-family:system-ui;font-size:14px'>All parties have successfully signed the document " +
+    `<b>"${pdfName}"</b>` +
+    '. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender ' +
+    sender.Email +
+    ' directly. If you think this email is inappropriate or spam, you may file a complaint with OpenSign™ <a href=www.opensignlabs.com target=_blank>here</a>.</p></div></div></body></html>';
+
+  if (obj?.isCustomMail) {
+    try {
+      const tenantCreditsQuery = new Parse.Query('partners_Tenant');
+      tenantCreditsQuery.equalTo('UserId', {
+        __type: 'Pointer',
+        className: '_User',
+        objectId: sender.UserId.objectId,
+      });
+      const res = await tenantCreditsQuery.first();
+      if (res) {
+        const _res = JSON.parse(JSON.stringify(res));
+        if (_res?.CompletionSubject) {
+          subject = _res?.CompletionSubject;
+        }
+        if (_res?.CompletionBody) {
+          body = _res?.CompletionBody;
+        }
+        const expireDate = doc.ExpiryDate.iso;
+        const newDate = new Date(expireDate);
+        const localExpireDate = newDate.toLocaleDateString('en-US', {
+          day: 'numeric',
+          month: 'long',
+          year: 'numeric',
+        });
+
+        const variables = {
+          document_title: pdfName,
+          sender_name: sender.Name,
+          sender_mail: sender.Email,
+          sender_phone: sender?.Phone || '',
+          receiver_name: sender.Name,
+          receiver_email: sender.Email,
+          receiver_phone: sender?.Phone || '',
+          expiry_date: localExpireDate,
+          company_name: sender.Company,
+        };
+        const replaceVar = replaceMailVaribles(subject, body, variables);
+        subject = replaceVar.subject;
+        body = replaceVar.body;
+      }
+    } catch (err) {
+      console.log('error in fetch tenant in signpdf', err.message);
+    }
+  }
+  const params = {
+    extUserId: sender.objectId,
+    url: url,
+    from: 'OpenSign™',
+    recipient: recipient,
+    subject: subject,
+    pdfName: pdfName,
+    html: body,
+    mailProvider: obj.mailProvider,
+  };
+  const res = await axios.post(serverUrl + '/functions/sendmailv3', params, {
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Parse-Application-Id': APPID,
+      'X-Parse-Master-Key': masterKEY,
+    },
+  });
+  // console.log('Res ', res);
+}
+
+// `sendDoctoWebhook` is used to send res data of document on webhook
+async function sendDoctoWebhook(doc, Url, event, signUser, certificateUrl) {
+  let signers = [];
+  if (signUser) {
+    signers = {
+      name: signUser?.Name,
+      email: signUser?.Email,
+      phone: signUser?.Phone,
+    };
+  } else {
+    signers = doc?.Signers?.map(x => ({
+      name: x.Name,
+      email: x.Email,
+      phone: x.Phone,
+    })) || [
+      {
+        name: doc?.ExtUserPtr?.Name,
+        email: doc?.ExtUserPtr?.Email,
+        phone: doc?.ExtUserPtr?.Phone,
+      },
+    ];
+  }
+
+  if (doc.ExtUserPtr?.Webhook) {
+    const time =
+      event === 'signed'
+        ? { signer: signers, signedAt: new Date() }
+        : { signers: signers, completedAt: new Date() };
+    const certificate = certificateUrl ? { certificate: certificateUrl } : {};
+    const params = {
+      event: event,
+      objectId: doc?.objectId,
+      file: Url || '',
+      ...certificate,
+      name: doc?.Name,
+      note: doc?.Note || '',
+      description: doc?.Description || '',
+      ...time,
+      createdAt: doc?.createdAt,
+    };
+    axios
+      .post(doc?.ExtUserPtr?.Webhook, params, {
+        headers: { 'Content-Type': 'application/json' },
+      })
+      .then(res => {
+        try {
+          // console.log('res ', res);
+          const webhook = new Parse.Object('contracts_Webhook');
+          webhook.set('Log', res?.status);
+          webhook.set('UserId', {
+            __type: 'Pointer',
+            className: '_User',
+            objectId: doc.ExtUserPtr.UserId.objectId,
+          });
+          webhook.save(null, { useMasterKey: true });
+        } catch (err) {
+          console.log('err save in contracts_Webhook', err.message);
+        }
+      })
+      .catch(err => {
+        console.log('Err send data to webhook', err.message);
+        try {
+          const webhook = new Parse.Object('contracts_Webhook');
+          webhook.set('Log', err?.status);
+          webhook.set('UserId', {
+            __type: 'Pointer',
+            className: '_User',
+            objectId: doc.ExtUserPtr.UserId.objectId,
+          });
+          webhook.save(null, { useMasterKey: true });
+        } catch (err) {
+          console.log('err save in contracts_Webhook', err.message);
+        }
+      });
+    // console.log('res ', res.data);
+  }
+}
+
+// `sendMailsaveCertifcate` is used send completion mail and update complete status of document
+const sendMailsaveCertifcate = async (doc, P12Buffer, url, isCustomMail, mailProvider, userId) => {
+  const certificate = await GenerateCertificate(doc);
+  const certificatePdf = await PDFDocument.load(certificate);
+  const p12 = new P12Signer(P12Buffer, { passphrase: process.env.PASS_PHRASE || null });
+  //  `pdflibAddPlaceholder` is used to add code of only digitial sign in certificate
+  pdflibAddPlaceholder({
+    pdfDoc: certificatePdf,
+    reason: 'Digitally signed by OpenSign.',
+    location: 'n/a',
+    name: eSignName,
+    contactInfo: eSigncontact,
+    signatureLength: 15000,
+  });
+  const pdfWithPlaceholderBytes = await certificatePdf.save();
+  const CertificateBuffer = Buffer.from(pdfWithPlaceholderBytes);
+  //`new signPDF` create new instance of CertificateBuffer and p12Buffer
+  const certificateOBJ = new SignPdf();
+  // `signedCertificate` is used to sign certificate digitally
+  const signedCertificate = await certificateOBJ.sign(CertificateBuffer, p12);
+
+  //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 body = { CertificateUrl: file.imageUrl };
+  await axios.put(serverUrl + '/classes/contracts_Document/' + doc.objectId, body, {
+    headers: {
+      'Content-Type': 'application/json',
+      'X-Parse-Application-Id': APPID,
+      'X-Parse-Master-Key': masterKEY,
+    },
+  });
+  // used in API only
+  if (doc.IsSendMail === false) {
+    console.log("don't send mail");
+  } else {
+    const mailObj = {
+      url: url,
+      isCustomMail: isCustomMail,
+      doc: doc,
+      mailProvider: mailProvider,
+    };
+    sendCompletedMail(mailObj);
+  }
+
+  saveFileUsage(CertificateBuffer.length, file.imageUrl, userId);
+  sendDoctoWebhook(doc, url, 'completed', '', file.imageUrl);
+};
+/**
+ *
+ * @param docId Id of Document in which user is signing
+ * @param pdfFile base64 of pdfFile which you want sign
+ * @returns if success {status, data} else {status, message}
+ */
+async function PDF(req) {
+  try {
+    if (!req?.user) {
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+    } else {
+      const password = '';
+      const authUser = req?.user?.toJSON();
+      const docId = req.params.docId;
+      const reqUserId = req.params.userId;
+      const isCustomMail = req.params.isCustomCompletionMail || false;
+      const mailProvider = req.params.mailProvider || '';
+      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.equalTo('objectId', docId);
+      const resDoc = await docQuery.first({ useMasterKey: true });
+      if (!resDoc) {
+        throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found.');
+      }
+      const _resDoc = resDoc?.toJSON();
+
+      let signUser;
+      let className;
+      // `reqUserId` is send throught pdfrequest signing flow
+      if (reqUserId) {
+        // to get contracts_Contactbook details for currentuser from reqUserId
+        const _contractUser = _resDoc.Signers.find(x => x.objectId === reqUserId);
+        if (_contractUser) {
+          signUser = _contractUser;
+          className = 'contracts_Contactbook';
+        }
+      } else {
+        className = 'contracts_Users';
+        signUser = _resDoc.ExtUserPtr;
+      }
+
+      const username = signUser.Name;
+      const userEmail = signUser.Email;
+      if (req.params.pdfFile) {
+        //  `PdfBuffer` used to create buffer from pdf file
+        let PdfBuffer = Buffer.from(req.params.pdfFile, 'base64');
+        //  `P12Buffer` used to create buffer from p12 certificate
+        const pfxFile = process.env.PFX_BASE64;
+        // const P12Buffer = fs.readFileSync();
+        const P12Buffer = Buffer.from(pfxFile, 'base64');
+        const p12Cert = new P12Signer(P12Buffer, { passphrase: process.env.PASS_PHRASE || null });
+
+        const UserPtr = {
+          __type: 'Pointer',
+          className: className,
+          objectId: signUser.objectId,
+        };
+        const obj = {
+          UserPtr: UserPtr,
+          SignedUrl: '',
+          Activity: 'Signed',
+          ipAddress: req.headers['x-real-ip'],
+        };
+        let updateAuditTrail;
+        if (_resDoc.AuditTrail && _resDoc.AuditTrail.length > 0) {
+          updateAuditTrail = [..._resDoc.AuditTrail, obj];
+        } else {
+          updateAuditTrail = [obj];
+        }
+
+        const auditTrail = updateAuditTrail.filter(x => x.Activity === 'Signed');
+        let isCompleted = false;
+        if (_resDoc.Signers && _resDoc.Signers.length > 0) {
+          if (auditTrail.length === _resDoc.Signers.length) {
+            isCompleted = true;
+          }
+        } else {
+          isCompleted = true;
+        }
+        const randomNumber = Math.floor(Math.random() * 5000);
+        const name = `exported_file_${randomNumber}.pdf`;
+        const pdfName = `./exports/${name}`;
+        let pdfSize = PdfBuffer.length;
+        if (isCompleted) {
+          const signersName = _resDoc.Signers?.map(x => x.Name + ' <' + x.Email + '>');
+          if (signersName && signersName.length > 0) {
+            //  `pdflibAddPlaceholder` is used to add code of only digitial sign without widget
+            const pdfDoc = await PDFDocument.load(PdfBuffer);
+            pdflibAddPlaceholder({
+              pdfDoc: pdfDoc,
+              reason: 'Digitally signed by OpenSign for ' + signersName?.join(', '),
+              location: 'n/a',
+              name: eSignName,
+              contactInfo: eSigncontact,
+              signatureLength: 15000,
+            });
+            const pdfWithPlaceholderBytes = await pdfDoc.save();
+            PdfBuffer = Buffer.from(pdfWithPlaceholderBytes);
+          } else {
+            //  `pdflibAddPlaceholder` is used to add code of only digitial sign without widget (signyourself)
+            const pdfDoc = await PDFDocument.load(PdfBuffer);
+            pdflibAddPlaceholder({
+              pdfDoc: pdfDoc,
+              reason: 'Digitally signed by OpenSign for ' + username + ' <' + userEmail + '>',
+              location: 'n/a',
+              name: eSignName,
+              contactInfo: eSigncontact,
+              signatureLength: 15000,
+            });
+            const pdfWithPlaceholderBytes = await pdfDoc.save();
+            PdfBuffer = Buffer.from(pdfWithPlaceholderBytes);
+          }
+          //`new signPDF` create new instance of pdfBuffer and p12Buffer
+          const OBJ = new SignPdf();
+          // `signedDocs` is used to signpdf digitally
+          const signedDocs = await OBJ.sign(PdfBuffer, p12Cert);
+
+          //`saveUrl` is used to save signed pdf in exports folder
+          const saveUrl = fs.writeFileSync(pdfName, signedDocs);
+          pdfSize = signedDocs.length;
+        } else {
+          //`saveUrl` is used to save signed pdf in exports folder
+          const saveUrl = fs.writeFileSync(pdfName, PdfBuffer);
+          pdfSize = PdfBuffer.length;
+        }
+
+        // `uploadFile` is used to upload pdf to aws s3 and get it's url
+        const data = await uploadFile(name, pdfName);
+
+        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
+            signUser.objectId, // userID
+            req.headers['x-real-ip'], // client ipAddress,
+            _resDoc, // auditTrail, signers, etc data
+            className,
+            sign
+          );
+          sendDoctoWebhook(_resDoc, data.imageUrl, 'signed', signUser);
+          saveFileUsage(pdfSize, data.imageUrl, authUser.objectId);
+          if (updatedDoc && updatedDoc.isCompleted) {
+            const doc = { ..._resDoc, AuditTrail: updatedDoc.AuditTrail };
+            sendMailsaveCertifcate(
+              doc,
+              P12Buffer,
+              data.imageUrl,
+              isCustomMail,
+              mailProvider,
+              authUser.objectId
+            );
+          }
+          // `fs.unlinkSync` is used to remove exported signed pdf file from exports folder
+          fs.unlinkSync(pdfName);
+          console.log(`New Signed PDF created called: ${pdfName}`);
+          if (updatedDoc.message === 'success') {
+            return { status: 'success', data: data.imageUrl };
+          } else {
+            const error = new Error('Please provide required parameters!');
+            error.code = 400; // Set the error code (e.g., 400 for bad request)
+            throw error;
+          }
+        }
+      } else {
+        const error = new Error('Pdf file not present!');
+        error.code = 400; // Set the error code (e.g., 400 for bad request)
+        throw error;
+      }
+    }
+  } catch (err) {
+    console.log('Err in signpdf', err);
+    throw err;
+  }
+}
+export default PDF;

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

@@ -1,325 +0,0 @@
-import SignPDF from './SignPDF.min.cjs';
-import fs from 'node:fs';
-import axios from 'axios';
-import { pdflibAddPlaceholder } from './customSignPdf/pdflibplaceholder.min.js';
-import { PDFDocument } from 'pdf-lib';
-import { replaceMailVaribles, saveFileUsage } from '../../../Utils.js';
-import GenerateCertificate from './GenerateCertificate.js';
-const serverUrl = process.env.SERVER_URL,
-  APPID = process.env.APP_ID,
-  masterKEY = process.env.MASTER_KEY;
-async function uploadFile(e, t) {
-  try {
-    var a = fs.readFileSync(t),
-      r = new Parse.File(e, [...a], 'application/pdf'),
-      i = (await r.save({ useMasterKey: !0 }), r.url());
-    return { imageUrl: i };
-  } catch (e) {
-    console.log('Err ', e), fs.unlinkSync(t);
-  }
-}
-async function updateDoc(a, r, i, s, o, n, l) {
-  try {
-    var c,
-      d,
-      p = {
-        UserPtr: { __type: 'Pointer', className: n, objectId: i },
-        SignedUrl: r,
-        Activity: 'Signed',
-        ipAddress: s,
-        SignedOn: new Date(),
-        Signature: l,
-      };
-    let e;
-    var m = (e =
-      o.AuditTrail && 0 < o.AuditTrail.length
-        ? (-1 !==
-          (d = (c = JSON.parse(JSON.stringify(o.AuditTrail))).findIndex(
-            e => e.UserPtr.objectId === i && 'Created' !== e.Activity
-          ))
-            ? (c[d] = { ...c[d], ...p })
-            : c.push(p),
-          c)
-        : [p]).filter(e => 'Signed' === e.Activity);
-    let t = !1;
-    !((o.Signers && 0 < o.Signers.length && m.length !== o.Signers.length) || !(t = !0));
-    var g = { SignedUrl: r, AuditTrail: e, IsCompleted: t };
-    await axios.put(serverUrl + '/classes/contracts_Document/' + a, g, {
-      headers: {
-        'Content-Type': 'application/json',
-        'X-Parse-Application-Id': APPID,
-        'X-Parse-Master-Key': masterKEY,
-      },
-    });
-    return { isCompleted: t, message: 'success', AuditTrail: e };
-  } catch (e) {
-    return console.log('update doc err ', e), 'err';
-  }
-}
-async function sendCompletedMail(e) {
-  var t = e.url,
-    a = e.doc,
-    r = e.doc.ExtUserPtr,
-    i = a.Name,
-    s = r.Email;
-  let o = `Document "${i}" has been signed by all parties`,
-    n =
-      "<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=https://qikinnovation.ams3.digitaloceanspaces.com/logo.png  height='50' style='padding:20px'/> </div><div style='padding:2px;font-family:system-ui; background-color: #47a3ad;'>    <p style='font-size:20px;font-weight:400;color:white;padding-left:20px',> Document signed successfully</p></div><div><p style='padding:20px;font-family:system-ui;font-size:14px'>All parties have successfully signed the document " +
-      `<b>"${i}"</b>` +
-      '. Kindly download the document from the attachment.</p></div> </div><div><p>This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender ' +
-      r.Email +
-      ' directly. If you think this email is inappropriate or spam, you may file a complaint with OpenSign™ <a href=www.opensignlabs.com target=_blank>here</a>.</p></div></div></body></html>';
-  if (e?.isCustomMail)
-    try {
-      var l,
-        c,
-        d,
-        p,
-        m,
-        g = new Parse.Query('partners_Tenant');
-      g.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: r.UserId.objectId });
-      const f = await g.first();
-      f &&
-        ((l = JSON.parse(JSON.stringify(f)))?.CompletionSubject && (o = l?.CompletionSubject),
-        l?.CompletionBody && (n = l?.CompletionBody),
-        (c = a.ExpiryDate.iso),
-        (d = new Date(c).toLocaleDateString('en-US', {
-          day: 'numeric',
-          month: 'long',
-          year: 'numeric',
-        })),
-        (p = {
-          document_title: i,
-          sender_name: r.Name,
-          sender_mail: r.Email,
-          sender_phone: r.Phone,
-          receiver_name: r.Name,
-          receiver_email: r.Email,
-          receiver_phone: r.Phone,
-          expiry_date: d,
-          company_name: r.Company,
-        }),
-        (m = replaceMailVaribles(o, n, p)),
-        (o = m.subject),
-        (n = m.body));
-    } catch (e) {
-      console.log('error in fetch tenant in signpdf', e.message);
-    }
-  g = {
-    extUserId: r.objectId,
-    url: t,
-    from: 'OpenSign™',
-    recipient: s,
-    subject: o,
-    pdfName: i,
-    html: n,
-    mailProvider: e.mailProvider,
-  };
-  await axios.post(serverUrl + '/functions/sendmailv3', g, {
-    headers: {
-      'Content-Type': 'application/json',
-      'X-Parse-Application-Id': APPID,
-      'X-Parse-Master-Key': masterKEY,
-    },
-  });
-}
-async function sendDoctoWebhook(a, e, t, r) {
-  let i = [];
-  (i = r
-    ? { name: r?.Name, email: r?.Email, phone: r?.Phone }
-    : a?.Signers?.map(e => ({ name: e.Name, email: e.Email, phone: e.Phone })) || [
-        { name: a?.ExtUserPtr?.Name, email: a?.ExtUserPtr?.Email, phone: a?.ExtUserPtr?.Phone },
-      ]),
-    a.ExtUserPtr?.Webhook &&
-      ((r =
-        'signed' === t
-          ? { signer: i, signedAt: new Date() }
-          : { signers: i, completedAt: new Date() }),
-      (t = {
-        event: t,
-        objectId: a?.objectId,
-        file: e || '',
-        name: a?.Name,
-        note: a?.Note || '',
-        description: a?.Description || '',
-        ...r,
-        createdAt: a?.createdAt,
-      }),
-      axios
-        .post(a?.ExtUserPtr?.Webhook, t, { headers: { 'Content-Type': 'application/json' } })
-        .then(e => {
-          try {
-            var t = new Parse.Object('contracts_Webhook');
-            t.set('Log', e?.status),
-              t.set('UserId', {
-                __type: 'Pointer',
-                className: '_User',
-                objectId: a.ExtUserPtr.UserId.objectId,
-              }),
-              t.save(null, { useMasterKey: !0 });
-          } catch (e) {
-            console.log('err save in contracts_Webhook', e.message);
-          }
-        })
-        .catch(e => {
-          console.log('Err send data to webhook', e.message);
-          try {
-            var t = new Parse.Object('contracts_Webhook');
-            t.set('Log', e?.status),
-              t.set('UserId', {
-                __type: 'Pointer',
-                className: '_User',
-                objectId: a.ExtUserPtr.UserId.objectId,
-              }),
-              t.save(null, { useMasterKey: !0 });
-          } catch (e) {
-            console.log('err save in contracts_Webhook', e.message);
-          }
-        }));
-}
-const sendMailsaveCertifcate = async (e, t, a, r, i, s) => {
-  var o = await GenerateCertificate(e),
-    o = await PDFDocument.load(o),
-    o =
-      (pdflibAddPlaceholder({
-        pdfDoc: o,
-        reason: 'Digitally signed by OpenSign.',
-        location: 'n/a',
-        signatureLength: 15e3,
-      }),
-      await o.save()),
-    o = Buffer.from(o),
-    t = await new SignPDF(o, t).signPDF(),
-    t =
-      (fs.writeFileSync('./exports/certificate.pdf', t),
-      await uploadFile('certificate.pdf', './exports/certificate.pdf')),
-    n = { CertificateUrl: t.imageUrl };
-  await axios.put(serverUrl + '/classes/contracts_Document/' + e.objectId, n, {
-    headers: {
-      'Content-Type': 'application/json',
-      'X-Parse-Application-Id': APPID,
-      'X-Parse-Master-Key': masterKEY,
-    },
-  }),
-    e.IsSendMail && !1 === e.IsSendMail
-      ? console.log("don't send mail")
-      : sendCompletedMail({ url: a, isCustomMail: r, doc: e, mailProvider: i }),
-    saveFileUsage(o.length, t.imageUrl, s),
-    sendDoctoWebhook(e, a, 'completed');
-};
-async function PDF(o) {
-  try {
-    if (!o?.user)
-      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
-    {
-      var n = o?.user?.toJSON(),
-        e = o.params.docId;
-      const F = o.params.userId;
-      var l = o.params.isCustomCompletionMail || !1,
-        c = o.params.mailProvider || '',
-        d = o.params.signature || '',
-        t = new Parse.Query('contracts_Document'),
-        a =
-          (t.include('ExtUserPtr,Signers'),
-          t.equalTo('objectId', e),
-          await t.first({ useMasterKey: !0 }));
-      if (!a) throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Document not found.');
-      var r,
-        p = a?.toJSON();
-      let i, s;
-      F
-        ? ((r = p.Signers.find(e => e.objectId === F)),
-          console.log('_contractUser ', r),
-          r && ((i = r), (s = 'contracts_Contactbook')))
-        : ((s = 'contracts_Users'), (i = p.ExtUserPtr));
-      var m,
-        g = i.Name,
-        f = i.Email;
-      if (!o.params.pdfFile) throw (((m = new Error('Pdf file not present!')).code = 400), m);
-      {
-        let e = Buffer.from(o.params.pdfFile, 'base64');
-        var u = process.env.PFX_BASE64,
-          h = Buffer.from(u, 'base64'),
-          y = {
-            UserPtr: { __type: 'Pointer', className: s, objectId: i.objectId },
-            SignedUrl: '',
-            Activity: 'Signed',
-            ipAddress: o.headers['x-real-ip'],
-          };
-        let t;
-        var P = (t = p.AuditTrail && 0 < p.AuditTrail.length ? [...p.AuditTrail, y] : [y]).filter(
-          e => 'Signed' === e.Activity
-        );
-        let a = !1;
-        !((p.Signers && 0 < p.Signers.length && P.length !== p.Signers.length) || !(a = !0));
-        var v,
-          b,
-          S,
-          w,
-          U,
-          D,
-          I = `exported_file_${Math.floor(5e3 * Math.random())}.pdf`,
-          _ = './exports/' + I;
-        let r = e.length;
-        r = (
-          a
-            ? ((v = p.Signers?.map(e => e.Name + ' <' + e.Email + '>')),
-              (e =
-                v && 0 < v.length
-                  ? ((b = await PDFDocument.load(e)),
-                    pdflibAddPlaceholder({
-                      pdfDoc: b,
-                      reason: 'Digitally signed by OpenSign for ' + v?.join(', '),
-                      location: 'n/a',
-                      signatureLength: 15e3,
-                    }),
-                    (S = await b.save()),
-                    Buffer.from(S))
-                  : ((w = await PDFDocument.load(e)),
-                    pdflibAddPlaceholder({
-                      pdfDoc: w,
-                      reason: 'Digitally signed by OpenSign for ' + g + ' <' + f + '>',
-                      location: 'n/a',
-                      signatureLength: 15e3,
-                    }),
-                    (U = await w.save()),
-                    Buffer.from(U))),
-              (D = await new SignPDF(e, h).signPDF()),
-              fs.writeFileSync(_, D),
-              D)
-            : (fs.writeFileSync(_, e), e)
-        ).length;
-        var E = await uploadFile(I, _);
-        if (E && E.imageUrl) {
-          var x,
-            A,
-            j = await updateDoc(
-              o.params.docId,
-              E.imageUrl,
-              i.objectId,
-              o.headers['x-real-ip'],
-              p,
-              s,
-              d
-            );
-          if (
-            (sendDoctoWebhook(p, E.imageUrl, 'signed', i),
-            saveFileUsage(r, E.imageUrl, n.objectId),
-            j &&
-              j.isCompleted &&
-              ((x = { ...p, AuditTrail: j.AuditTrail }),
-              sendMailsaveCertifcate(x, h, E.imageUrl, l, c, n.objectId)),
-            fs.unlinkSync(_),
-            console.log('New Signed PDF created called: ' + _),
-            'success' === j.message)
-          )
-            return { status: 'success', data: E.imageUrl };
-          throw (((A = new Error('Please provide required parameters!')).code = 400), A);
-        }
-      }
-    }
-  } catch (e) {
-    throw (console.log('Err in signpdf', e), e);
-  }
-}
-export default PDF;

apps/OpenSignServer/cloud/parsefunction/pdf/SignPDF.min.cjs

@@ -1 +0,0 @@
-const signer=require("node-signpdf").default;class SignPDF{constructor(e,t){this.pdfDoc=e,this.certificate=t}async signPDF(){return signer.sign(this.pdfDoc,this.certificate, process.env.PASS_PHRASE ? {passphrase : process.env.PASS_PHRASE}:  null)}static unit8ToBuffer(e){var t=Buffer.alloc(e.byteLength),r=new Uint8Array(e);for(let e=0;e<t.length;++e)t[e]=r[e];return t}}module.exports=SignPDF;

apps/OpenSignServer/cloud/parsefunction/pdf/customSignPdf/PDFAbstractReference.min.js

@@ -1 +0,0 @@
-class PDFAbstractReference{toString(){throw new Error("Must be implemented by subclasses")}}export default PDFAbstractReference;

apps/OpenSignServer/cloud/parsefunction/pdf/customSignPdf/PDFKitReferenceMock.min.js

@@ -1 +0,0 @@
-import PDFAbstractReference from"./PDFAbstractReference.min.js";class PDFKitReferenceMock extends PDFAbstractReference{constructor(e,t=void 0){super(),this.index=e,void 0!==t&&Object.assign(this,t)}toString(){return this.index+" 0 R"}}export default PDFKitReferenceMock;

apps/OpenSignServer/cloud/parsefunction/pdf/customSignPdf/SignPdfError.min.js

@@ -1,20 +0,0 @@
-const ERROR_TYPE_UNKNOWN = 1,
-  ERROR_TYPE_INPUT = 2,
-  ERROR_TYPE_PARSE = 3,
-  ERROR_VERIFY_SIGNATURE = 4;
-class SignPdfError extends Error {
-  constructor(R, E = ERROR_TYPE_UNKNOWN) {
-    super(R), (this.type = E);
-  }
-}
-(SignPdfError.TYPE_UNKNOWN = ERROR_TYPE_UNKNOWN),
-  (SignPdfError.TYPE_INPUT = ERROR_TYPE_INPUT),
-  (SignPdfError.TYPE_PARSE = ERROR_TYPE_PARSE),
-  (SignPdfError.VERIFY_SIGNATURE = ERROR_VERIFY_SIGNATURE);
-export {
-  ERROR_TYPE_UNKNOWN,
-  ERROR_TYPE_INPUT,
-  ERROR_TYPE_PARSE,
-  ERROR_VERIFY_SIGNATURE,
-  SignPdfError,
-};

apps/OpenSignServer/cloud/parsefunction/pdf/customSignPdf/const.min.js

@@ -1 +0,0 @@
-const DEFAULT_SIGNATURE_LENGTH=8192,DEFAULT_BYTE_RANGE_PLACEHOLDER="**********",SUBFILTER_ADOBE_PKCS7_DETACHED="adbe.pkcs7.detached",SUBFILTER_ADOBE_PKCS7_SHA1="adbe.pkcs7.sha1",SUBFILTER_ADOBE_X509_SHA1="adbe.x509.rsa.sha1",SUBFILTER_ETSI_CADES_DETACHED="ETSI.CAdES.detached";export{DEFAULT_SIGNATURE_LENGTH,DEFAULT_BYTE_RANGE_PLACEHOLDER,SUBFILTER_ADOBE_PKCS7_DETACHED,SUBFILTER_ADOBE_PKCS7_SHA1,SUBFILTER_ADOBE_X509_SHA1,SUBFILTER_ETSI_CADES_DETACHED};

apps/OpenSignServer/cloud/parsefunction/pdf/customSignPdf/createBufferPageWithAnnotation.min.js

@@ -1,3 +0,0 @@
-import findObject from"./findObject.min.js";import getIndexFromRef from"./getIndexFromRef.min.js";const createBufferPageWithAnnotation=(e,t,n,f)=>{e=findObject(e,t.xref,n).toString();let r,o,i;r=e.indexOf("/Annots"),i=-1<r?(o=e.indexOf("]",r),(i=e.substr(r,o+1-r)).substr(0,i.length-1)):(r=e.length,o=e.length,"/Annots [");t=getIndexFromRef(t.xref,n),n=f.toString(),i+=` ${n}]`,f=e.substr(0,r);let m="";return e.length>o&&(m=e.substr(o+1)),Buffer.concat([Buffer.from(t+` 0 obj
-`),Buffer.from("<<\n"),Buffer.from(f+i+m+`
-`),Buffer.from("\n>>\nendobj\n")])};export default createBufferPageWithAnnotation;

apps/OpenSignServer/cloud/parsefunction/pdf/customSignPdf/createBufferRootWithAcroform.min.js

@@ -1,3 +0,0 @@
-import getIndexFromRef from"./getIndexFromRef.min.js";const createBufferRootWithAcroform=(r,f,o)=>{var e=getIndexFromRef(f.xref,f.rootRef);return Buffer.concat([Buffer.from(e+` 0 obj
-`),Buffer.from("<<\n"),Buffer.from(f.root+`
-`),Buffer.from("/AcroForm "+o),Buffer.from("\n>>\nendobj\n")])};export default createBufferRootWithAcroform;