Merge pull request #735 from OpenSignLabs/signPdf

fix: change  parameter name in updatefolder API

.all-contributorsrc

@@ -205,6 +205,33 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "ugoconsonni",
+      "name": "ugoconsonni",
+      "avatar_url": "https://avatars.githubusercontent.com/u/13661702?v=4",
+      "profile": "https://github.com/ugoconsonni",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "daniel-mutwiri",
+      "name": "Daniel Mutwiri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8936960?v=4",
+      "profile": "https://github.com/daniel-mutwiri",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Zathiel",
+      "name": "Zathiel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26553418?v=4",
+      "profile": "https://github.com/Zathiel",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

README.md

@@ -134,6 +134,9 @@ We would like to thank all our contributors and users for their support and feed
     </tr>
     <tr>
       <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>
     </tr>
   </tbody>
 </table>

apps/OpenSign/package-lock.json

@@ -8,9 +8,9 @@
       "name": "open_sign",
       "version": "0.1.0",
       "dependencies": {
-        "@formkit/auto-animate": "^0.8.1",
+        "@formkit/auto-animate": "^0.8.2",
         "@radix-ui/themes": "^2.0.3",
-        "@react-pdf/renderer": "^3.4.0",
+        "@react-pdf/renderer": "^3.4.4",
         "@reduxjs/toolkit": "^2.2.1",
         "axios": "^1.6.8",
         "file-saver": "^2.0.5",
@@ -33,10 +33,10 @@
         "react-helmet": "^6.1.0",
         "react-konva": "^18.2.10",
         "react-modal": "^3.16.1",
-        "react-pdf": "^7.7.1",
+        "react-pdf": "^7.7.3",
         "react-quill": "^2.0.0",
         "react-redux": "^9.1.0",
-        "react-rnd": "^10.4.1",
+        "react-rnd": "^10.4.10",
         "react-router-dom": "^6.22.3",
         "react-scripts": "5.0.1",
         "react-scrollbars-custom": "^4.1.1",
@@ -44,7 +44,7 @@
         "react-signature-canvas": "^1.0.6",
         "react-tooltip": "^5.26.3",
         "react-web-share": "^2.0.2",
-        "reactour": "^1.19.2",
+        "reactour": "^1.19.3",
         "redux": "^5.0.1",
         "redux-thunk": "^3.1.0",
         "regex-parser": "^2.3.0",
@@ -53,14 +53,14 @@
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
-        "@babel/runtime-corejs2": "^7.24.1",
-        "autoprefixer": "^10.4.18",
+        "@babel/runtime-corejs2": "^7.24.5",
+        "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",
-        "postcss": "^8.4.37",
+        "postcss": "^8.4.38",
         "prettier": "^2.8.8",
         "pretty-quick": "^3.3.1",
         "tailwindcss": "^3.4.1"
@@ -1994,9 +1994,9 @@
       }
     },
     "node_modules/@babel/runtime-corejs2": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.24.1.tgz",
-      "integrity": "sha512-De0q0utpUPiXnc7+B7Ku86mJ0eDItC/v3uFa/lQkq63XnHyZiytDHeCIvechlnVwwpU2ChjGF7c3I+mBrTudwg==",
+      "version": "7.24.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.24.5.tgz",
+      "integrity": "sha512-cC9jiO6s/IN+xwCHYy1AGrcFJ4bwgIwb8HX1KaoEpRsznLlO4x9eBP6AX7RIeMSWlQqEj2WHox637OS8cDq6Ew==",
       "dev": true,
       "dependencies": {
         "core-js": "^2.6.12",
@@ -2989,9 +2989,9 @@
       "integrity": "sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A=="
     },
     "node_modules/@formkit/auto-animate": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@formkit/auto-animate/-/auto-animate-0.8.1.tgz",
-      "integrity": "sha512-0/Z2cuNXWVVIG/l0SpcHAWFhGdvLJ8DRvEfRWvmojtmRWfEy+LWNwgDazbZqY0qQYtkHcoEK3jBLkhiZaB/4Ig=="
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/@formkit/auto-animate/-/auto-animate-0.8.2.tgz",
+      "integrity": "sha512-SwPWfeRa5veb1hOIBMdzI+73te5puUBHmqqaF1Bu7FjvxlYSz/kJcZKSa9Cg60zL0uRNeJL2SbRxV6Jp6Q1nFQ=="
     },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.14",
@@ -5381,41 +5381,41 @@
       }
     },
     "node_modules/@react-pdf/font": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@react-pdf/font/-/font-2.4.4.tgz",
-      "integrity": "sha512-yjK5eSY+LcbxS0m+sOYln8GdgIbUgti4xjwf14kx8OSsOMJQJyHFALHMh2cLcKJR9yZeqVDo1FwCsY6gw1yCkg==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/font/-/font-2.5.1.tgz",
+      "integrity": "sha512-Hyb2zBb92Glc3lvhmJfy4dO2Mj29KB26Uk12Ua9EhKAdiuCTLBqgP8Oe1cGwrvDI7xA4OOcwvBMdYh0vhOUHzA==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@react-pdf/types": "^2.4.1",
+        "@react-pdf/types": "^2.5.0",
         "cross-fetch": "^3.1.5",
         "fontkit": "^2.0.2",
         "is-url": "^1.2.4"
       }
     },
     "node_modules/@react-pdf/image": {
-      "version": "2.3.5",
-      "resolved": "https://registry.npmjs.org/@react-pdf/image/-/image-2.3.5.tgz",
-      "integrity": "sha512-YK8oeD4cYTbX2KwdsY5DEDpvsKQoGbf3kwlxAQwYm8wrEol8V/5oCl8H8ZqdZIYQhx2XPp63cocQfMCZGwf+4w==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/@react-pdf/image/-/image-2.3.6.tgz",
+      "integrity": "sha512-7iZDYZrZlJqNzS6huNl2XdMcLFUo68e6mOdzQeJ63d5eApdthhSHBnkGzHfLhH5t8DCpZNtClmklzuLL63ADfw==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
         "@react-pdf/png-js": "^2.3.1",
         "cross-fetch": "^3.1.5",
-        "jay-peg": "^1.0.1"
+        "jay-peg": "^1.0.2"
       }
     },
     "node_modules/@react-pdf/layout": {
-      "version": "3.11.3",
-      "resolved": "https://registry.npmjs.org/@react-pdf/layout/-/layout-3.11.3.tgz",
-      "integrity": "sha512-SwfIWmZl3yZDgb4Qa9ebjAZTd/FyI5E2curSfra6SuAkrsEF037cmVfxCTgYCkPwpVMv/omOENPI+WjhOKPofA==",
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/@react-pdf/layout/-/layout-3.12.1.tgz",
+      "integrity": "sha512-BxSeykDxvADlpe4OGtQ7NH46QXq3uImAYsTHOPLCwbXMniQ1O3uCBx7H+HthxkCNshgYVPp9qS3KyvQv/oIZwg==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
         "@react-pdf/fns": "2.2.1",
-        "@react-pdf/image": "^2.3.5",
-        "@react-pdf/pdfkit": "^3.1.7",
+        "@react-pdf/image": "^2.3.6",
+        "@react-pdf/pdfkit": "^3.1.10",
         "@react-pdf/primitives": "^3.1.1",
-        "@react-pdf/stylesheet": "^4.2.4",
+        "@react-pdf/stylesheet": "^4.2.5",
         "@react-pdf/textkit": "^4.4.1",
-        "@react-pdf/types": "^2.4.1",
+        "@react-pdf/types": "^2.5.0",
         "cross-fetch": "^3.1.5",
         "emoji-regex": "^10.3.0",
         "queue": "^6.0.1",
@@ -5428,16 +5428,16 @@
       "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw=="
     },
     "node_modules/@react-pdf/pdfkit": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@react-pdf/pdfkit/-/pdfkit-3.1.7.tgz",
-      "integrity": "sha512-iXMmATqW5Aycpzm8nNsZOHV/DX2lpd8l5VkaTy1HjzHgQ3MHoV45BHwRph53soEqoPo7rUfpjuSi7X3hngPWGA==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/@react-pdf/pdfkit/-/pdfkit-3.1.10.tgz",
+      "integrity": "sha512-P/qPBtCFo2HDJD0i6NfbmoBRrsOVO8CIogYsefwG4fklTo50zNgnMM5U1WLckTuX8Qt1ThiQuokmTG5arheblA==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
         "@react-pdf/png-js": "^2.3.1",
         "browserify-zlib": "^0.2.0",
         "crypto-js": "^4.2.0",
         "fontkit": "^2.0.2",
-        "jay-peg": "^1.0.1",
+        "jay-peg": "^1.0.2",
         "vite-compatible-readable-stream": "^3.6.1"
       }
     },
@@ -5455,15 +5455,15 @@
       "integrity": "sha512-miwjxLwTnO3IjoqkTVeTI+9CdyDggwekmSLhVCw+a/7FoQc+gF3J2dSKwsHvAcVFM0gvU8mzCeTofgw0zPDq0w=="
     },
     "node_modules/@react-pdf/render": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/@react-pdf/render/-/render-3.4.3.tgz",
-      "integrity": "sha512-9LL059vfwrK1gA0uIA4utpQ/pUH9EW/yia4bb7pCoARs8IlupY5UP265jgax15ua0p+MdUwShZzQ9rilu7kGsw==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@react-pdf/render/-/render-3.4.4.tgz",
+      "integrity": "sha512-CfGxWmVgrY3JgmB1iMnz2W6Ck+8pisZeFt8vGlxP+JfT+0onr208pQvGSV5KwA9LGhAdABxqc/+y17V3vtKdFA==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
         "@react-pdf/fns": "2.2.1",
         "@react-pdf/primitives": "^3.1.1",
         "@react-pdf/textkit": "^4.4.1",
-        "@react-pdf/types": "^2.4.1",
+        "@react-pdf/types": "^2.5.0",
         "abs-svg-path": "^0.1.1",
         "color-string": "^1.9.1",
         "normalize-svg-path": "^1.1.0",
@@ -5472,17 +5472,17 @@
       }
     },
     "node_modules/@react-pdf/renderer": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@react-pdf/renderer/-/renderer-3.4.0.tgz",
-      "integrity": "sha512-8i/B8xJZ4AwINM/RRBnawBXfNACaehQT/bM19TOTUjHoddYaRKM1g1+qOZx58yfxfr5TFRs4fORxEPU1mGmR1A==",
+      "version": "3.4.4",
+      "resolved": "https://registry.npmjs.org/@react-pdf/renderer/-/renderer-3.4.4.tgz",
+      "integrity": "sha512-j1TWMHHXDeHdoQE3xjhBh0MZ2rn7wHIlP/uglr/EJZXqnPbfg6bfLzRJCM6bs+XJV3d8+zLQjHf6sF/fWcBDfg==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
-        "@react-pdf/font": "^2.4.4",
-        "@react-pdf/layout": "^3.11.3",
-        "@react-pdf/pdfkit": "^3.1.7",
+        "@react-pdf/font": "^2.5.1",
+        "@react-pdf/layout": "^3.12.1",
+        "@react-pdf/pdfkit": "^3.1.10",
         "@react-pdf/primitives": "^3.1.1",
-        "@react-pdf/render": "^3.4.3",
-        "@react-pdf/types": "^2.4.1",
+        "@react-pdf/render": "^3.4.4",
+        "@react-pdf/types": "^2.5.0",
         "events": "^3.3.0",
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
@@ -5503,13 +5503,13 @@
       }
     },
     "node_modules/@react-pdf/stylesheet": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/@react-pdf/stylesheet/-/stylesheet-4.2.4.tgz",
-      "integrity": "sha512-CgRfDzeMtnV0GL7zSn381NubmgwqKhFKcK1YrWX3azl/KWVh52jjFd3HWi6dvcETNT862mjWz5MnExe4WOBJXA==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/@react-pdf/stylesheet/-/stylesheet-4.2.5.tgz",
+      "integrity": "sha512-XnmapeCW+hDuNdVwpuvO04WKv71wAs8aH+saIq29Bo2fp1SxznHTcQArTZtK6Wgr/E9BHXeB2iAPpUZuI6G+xA==",
       "dependencies": {
         "@babel/runtime": "^7.20.13",
         "@react-pdf/fns": "2.2.1",
-        "@react-pdf/types": "^2.4.1",
+        "@react-pdf/types": "^2.5.0",
         "color-string": "^1.9.1",
         "hsl-to-hex": "^1.0.0",
         "media-engine": "^1.0.3",
@@ -5529,9 +5529,9 @@
       }
     },
     "node_modules/@react-pdf/types": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.4.1.tgz",
-      "integrity": "sha512-w8pk7svhjVj5f7d7kjEGXSk26ffCqRSQcgWR4DwcFltNpSM18ZJmzmM6WrNeeP437y48LlykLnmGDA3oATakgw=="
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@react-pdf/types/-/types-2.5.0.tgz",
+      "integrity": "sha512-XsVRkt0hQ60I4e3leAVt+aZR3KJCaJd179BfJHAv4F4x6Vq3yqkry8lcbUWKGKDw1j3/8sW4FsgGR41SFvsG9A=="
     },
     "node_modules/@reduxjs/toolkit": {
       "version": "2.2.1",
@@ -7237,9 +7237,9 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.18",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.18.tgz",
-      "integrity": "sha512-1DKbDfsr6KUElM6wg+0zRNkB/Q7WcKYAaK+pzXn+Xqmszm/5Xa9coeNdtP88Vi+dPzZnMjhge8GIV49ZQkDa+g==",
+      "version": "10.4.19",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
+      "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
       "funding": [
         {
           "type": "opencollective",
@@ -7256,7 +7256,7 @@
       ],
       "dependencies": {
         "browserslist": "^4.23.0",
-        "caniuse-lite": "^1.0.30001591",
+        "caniuse-lite": "^1.0.30001599",
         "fraction.js": "^4.3.7",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -8108,9 +8108,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001593",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001593.tgz",
-      "integrity": "sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==",
+      "version": "1.0.30001616",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001616.tgz",
+      "integrity": "sha512-RHVYKov7IcdNjVHJFNY/78RdG4oGVjbayxv8u5IO74Wv7Hlq4PnJE6mo/OjFijjVFNy5ijnCt6H3IIo4t+wfEw==",
       "funding": [
         {
           "type": "opencollective",
@@ -9883,9 +9883,9 @@
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
     "node_modules/ejs": {
-      "version": "3.1.9",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz",
-      "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==",
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
+      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
       "dependencies": {
         "jake": "^10.8.5"
       },
@@ -11097,11 +11097,6 @@
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="
     },
-    "node_modules/fast-memoize": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz",
-      "integrity": "sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="
-    },
     "node_modules/fast-url-parser": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz",
@@ -13385,9 +13380,9 @@
       }
     },
     "node_modules/jay-peg": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/jay-peg/-/jay-peg-1.0.1.tgz",
-      "integrity": "sha512-zBfjkGbuuNXk8JW+rEePpPEbRRjupS8q+5yPak7kjy3e2GvvNwsLle9okEFvfGyZA6HvtSSiYrVd1/jgnYebaQ==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/jay-peg/-/jay-peg-1.0.2.tgz",
+      "integrity": "sha512-fyV3NVvv6pTys/3BTapBUGAWAuU9rM2gRcgijZHzptd5KKL+s+S7hESFN+wOsbDH1MzFwdlRAXi0aGxS6uiMKg==",
       "dependencies": {
         "restructure": "^3.0.0"
       }
@@ -15942,11 +15937,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/lodash.pick": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz",
-      "integrity": "sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q=="
-    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -17650,9 +17640,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.37",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.37.tgz",
-      "integrity": "sha512-7iB/v/r7Woof0glKLH8b1SPHrsX7uhdO+Geb41QpF/+mWZHU3uxxSlN+UXGVit1PawOYDToO+AbZzhBzWRDwbQ==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "funding": [
         {
           "type": "opencollective",
@@ -19373,12 +19363,9 @@
       }
     },
     "node_modules/re-resizable": {
-      "version": "6.9.6",
-      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.6.tgz",
-      "integrity": "sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ==",
-      "dependencies": {
-        "fast-memoize": "^2.5.1"
-      },
+      "version": "6.9.14",
+      "resolved": "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.14.tgz",
+      "integrity": "sha512-2UbPrpezMr6gkHKNCRA/N6QGGU237SKOZ78yMHId204A/oXWSAREAIuGZNQ9qlrJosewzcsv2CphZH3u7hC6ng==",
       "peerDependencies": {
         "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
         "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
@@ -19834,9 +19821,9 @@
       }
     },
     "node_modules/react-pdf": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.7.1.tgz",
-      "integrity": "sha512-cbbf/PuRtGcPPw+HLhMI1f6NSka8OJgg+j/yPWTe95Owf0fK6gmVY7OXpTxMeh92O3T3K3EzfE0ML0eXPGwR5g==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-7.7.3.tgz",
+      "integrity": "sha512-a2VfDl8hiGjugpqezBTUzJHYLNB7IS7a2t7GD52xMI9xHg8LdVaTMsnM9ZlNmKadnStT/tvX5IfV0yLn+JvYmw==",
       "dependencies": {
         "clsx": "^2.0.0",
         "dequal": "^2.0.3",
@@ -19971,45 +19958,19 @@
       }
     },
     "node_modules/react-rnd": {
-      "version": "10.4.1",
-      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.1.tgz",
-      "integrity": "sha512-0m887AjQZr6p2ADLNnipquqsDq4XJu/uqVqI3zuoGD19tRm6uB83HmZWydtkilNp5EWsOHbLGF4IjWMdd5du8Q==",
+      "version": "10.4.10",
+      "resolved": "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.10.tgz",
+      "integrity": "sha512-YjQAgEeSbNUoOXSD9ZBvIiLVizFb+bNhpDk8DbIRHA557NW02CXbwsAeOTpJQnsdhEL+NP2I+Ssrwejqcodtjg==",
       "dependencies": {
-        "re-resizable": "6.9.6",
-        "react-draggable": "4.4.5",
-        "tslib": "2.3.1"
+        "re-resizable": "6.9.14",
+        "react-draggable": "4.4.6",
+        "tslib": "2.6.2"
       },
       "peerDependencies": {
         "react": ">=16.3.0",
         "react-dom": ">=16.3.0"
       }
     },
-    "node_modules/react-rnd/node_modules/clsx": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz",
-      "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/react-rnd/node_modules/react-draggable": {
-      "version": "4.4.5",
-      "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz",
-      "integrity": "sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==",
-      "dependencies": {
-        "clsx": "^1.1.1",
-        "prop-types": "^15.8.1"
-      },
-      "peerDependencies": {
-        "react": ">= 16.3.0",
-        "react-dom": ">= 16.3.0"
-      }
-    },
-    "node_modules/react-rnd/node_modules/tslib": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
-      "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
-    },
     "node_modules/react-router": {
       "version": "6.22.3",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.22.3.tgz",
@@ -20236,15 +20197,14 @@
       }
     },
     "node_modules/reactour": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/reactour/-/reactour-1.19.2.tgz",
-      "integrity": "sha512-gbbUiLn8LbpbDW6k+QlVySkblvOICBd3AWMGRKPQghhmuMlOHNqgjW32JrT406lZHUvVlA8+umYD/2MmCHkNOQ==",
+      "version": "1.19.3",
+      "resolved": "https://registry.npmjs.org/reactour/-/reactour-1.19.3.tgz",
+      "integrity": "sha512-a2/j+xmbGlPMQhMy/zdpSmJN1STc0PcLUxhJbAC+bOcYdWHStFR02j6dhNuF/+IeqpX/d44PvlrRXSTt4LGk6w==",
       "dependencies": {
         "@rooks/use-mutation-observer": "4.11.2",
         "classnames": "2.3.1",
         "focus-outline-manager": "^1.0.2",
         "lodash.debounce": "4.0.8",
-        "lodash.pick": "4.4.0",
         "prop-types": "15.7.2",
         "react-focus-lock": "2.5.2",
         "scroll-smooth": "1.1.1",
@@ -20702,9 +20662,9 @@
       }
     },
     "node_modules/restructure": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/restructure/-/restructure-3.0.0.tgz",
-      "integrity": "sha512-Xj8/MEIhhfj9X2rmD9iJ4Gga9EFqVlpMj3vfLnV2r/Mh5jRMryNV+6lWh9GdJtDBcBSPIqzRdfBQ3wDtNFv/uw=="
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/restructure/-/restructure-3.0.1.tgz",
+      "integrity": "sha512-6neDpI/yE9eogQo22qmWwKIA9wFPRyYjQleDEh6zaNAf2ZPqLJYUvNBJBWEWNoBlCeQMQkvIOe2YI/K2GOag+g=="
     },
     "node_modules/retry": {
       "version": "0.13.1",
@@ -22208,9 +22168,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "optional": true,
       "dependencies": {
         "chownr": "^2.0.0",
@@ -23228,9 +23188,9 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
       "dependencies": {
         "colorette": "^2.0.10",
         "memfs": "^3.4.3",

apps/OpenSign/package.json

@@ -3,9 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@formkit/auto-animate": "^0.8.1",
+    "@formkit/auto-animate": "^0.8.2",
     "@radix-ui/themes": "^2.0.3",
-    "@react-pdf/renderer": "^3.4.0",
+    "@react-pdf/renderer": "^3.4.4",
     "@reduxjs/toolkit": "^2.2.1",
     "axios": "^1.6.8",
     "file-saver": "^2.0.5",
@@ -28,10 +28,10 @@
     "react-helmet": "^6.1.0",
     "react-konva": "^18.2.10",
     "react-modal": "^3.16.1",
-    "react-pdf": "^7.7.1",
+    "react-pdf": "^7.7.3",
     "react-quill": "^2.0.0",
     "react-redux": "^9.1.0",
-    "react-rnd": "^10.4.1",
+    "react-rnd": "^10.4.10",
     "react-router-dom": "^6.22.3",
     "react-scripts": "5.0.1",
     "react-scrollbars-custom": "^4.1.1",
@@ -39,7 +39,7 @@
     "react-signature-canvas": "^1.0.6",
     "react-tooltip": "^5.26.3",
     "react-web-share": "^2.0.2",
-    "reactour": "^1.19.2",
+    "reactour": "^1.19.3",
     "redux": "^5.0.1",
     "redux-thunk": "^3.1.0",
     "regex-parser": "^2.3.0",
@@ -83,14 +83,14 @@
     }
   },
   "devDependencies": {
-    "@babel/runtime-corejs2": "^7.24.1",
-    "autoprefixer": "^10.4.18",
+    "@babel/runtime-corejs2": "^7.24.5",
+    "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",
-    "postcss": "^8.4.37",
+    "postcss": "^8.4.38",
     "prettier": "^2.8.8",
     "pretty-quick": "^3.3.1",
     "tailwindcss": "^3.4.1"

apps/OpenSign/src/App.js

@@ -109,6 +109,10 @@ function App() {
               path="/login/:id/:userMail/:contactBookId/:serverUrl"
               element={<LazyPage Page={GuestLogin} />}
             />
+            <Route
+              path="/login/:base64url"
+              element={<LazyPage Page={GuestLogin} />}
+            />
             <Route path="/debugpdf" element={<LazyPage Page={DebugPdf} />} />
             <Route
               path="/forgetpassword"

apps/OpenSign/src/components/AddSigner.js

@@ -49,6 +49,7 @@ const AddSigner = (props) => {
     e.preventDefault();
     e.stopPropagation();
     setIsLoader(true);
+    if (localStorage.getItem("TenantId")) {
     try {
       const contactQuery = new Parse.Object("contracts_Contactbook");
       contactQuery.set("Name", name);
@@ -56,13 +57,11 @@ const AddSigner = (props) => {
       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")
         });
-      }
 
       try {
         const _users = Parse.Object.extend("User");
@@ -188,6 +187,9 @@ const AddSigner = (props) => {
       setIsLoader(false);
       alert("something went wrong!");
     }
+    }else{
+      alert('something went wrong, please try again later')
+    }
   };
 
   // Define a function to handle the "add yourself" checkbox

apps/OpenSign/src/components/LoginGoogle.js

@@ -115,8 +115,8 @@ const GoogleSignInBtn = ({
       // console.log("payload ", payload);
       if (payload && payload.sessiontoken) {
         // setThirdpartyLoader(true);
-        const billingDate =
-          extRes.get("Next_billing_date") && extRes.get("Next_billing_date");
+        // const billingDate =
+        //   extRes.get("Next_billing_date") && extRes.get("Next_billing_date");
         // console.log("billingDate expired", billingDate > new Date());
         const LocalUserDetails = {
           name: details.Name,
@@ -125,7 +125,7 @@ const GoogleSignInBtn = ({
           company: extRes.get("Company")
         };
         localStorage.setItem("userDetails", JSON.stringify(LocalUserDetails));
-        thirdpartyLoginfn(payload.sessiontoken, billingDate);
+        thirdpartyLoginfn(payload.sessiontoken);
       }
       return { msg: "exist" };
     } else {

apps/OpenSign/src/components/RenderDebugPdf.js

@@ -22,7 +22,8 @@ const RenderDebugPdf = (props) => {
           flex: 1,
           position: "relative",
           border: "1px solid grey",
-          overflow: "auto"
+          overflow: "auto",
+          cursor: "crosshair"
         }}
         onMouseMove={props.handleMouseMoveDiv}
       >

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

@@ -20,7 +20,7 @@ export function EmailBody(props) {
                   required
                   value={props.requestSubject}
                   onChange={(e) => props.setRequestSubject(e.target.value)}
-                  placeholder="${senderName} has requested you to sign ${documentName}"
+                  placeholder='${senderName} has requested you to sign "${documentName}"'
                   className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
                 />
                 <label className="text-sm ml-2 mt-3">

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

@@ -16,7 +16,8 @@ function EmailComponent({
   pdfName,
   sender,
   setIsAlert,
-  extUserId
+  extUserId,
+  activeMailAdapter
 }) {
   const [emailList, setEmailList] = useState([]);
   const [emailValue, setEmailValue] = useState();
@@ -24,6 +25,7 @@ function EmailComponent({
   //function for send email
   const sendEmail = async () => {
     setIsLoading(true);
+
     let sendMail;
     for (let i = 0; i < emailList.length; i++) {
       try {
@@ -39,6 +41,7 @@ function EmailComponent({
         const openSignUrl = "https://www.opensignlabs.com/contact-us";
         const themeBGcolor = themeColor;
         let params = {
+          mailProvider: activeMailAdapter,
           extUserId: extUserId,
           pdfName: pdfName,
           url: pdfUrl,

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

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import PrevNext from "./PrevNext";
 import printModule from "print-js";
 import { getBase64FromUrl } from "../../constant/Utils";
@@ -7,8 +7,9 @@ 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 Certificate from "./Certificate";
-import { PDFDownloadLink } from "@react-pdf/renderer";
+import axios from "axios";
+import ModalUi from "../../primitives/ModalUi";
+import { appInfo } from "../../constant/appinfo";
 
 function Header({
   isPdfRequestFiles,
@@ -39,6 +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 isGuestSigner = localStorage.getItem("isGuestSigner");
   //for go to previous page
   function previousPage() {
@@ -61,30 +63,67 @@ function Header({
   const handleToPrint = async (event) => {
     event.preventDefault();
 
-    const pdf = await getBase64FromUrl(pdfUrl);
-    const isAndroidDevice = navigator.userAgent.match(/Android/i);
-    const isAppleDevice =
-      (/iPad|iPhone|iPod/.test(navigator.platform) ||
-        (navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1)) &&
-      !window.MSStream;
-    if (isAndroidDevice || isAppleDevice) {
-      const byteArray = Uint8Array.from(
-        atob(pdf)
-          .split("")
-          .map((char) => char.charCodeAt(0))
+    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 blob = new Blob([byteArray], { type: "application/pdf" });
-      const blobUrl = URL.createObjectURL(blob);
-      window.open(blobUrl, "_blank");
-    } else {
-      printModule({ printable: pdf, type: "pdf", base64: true });
+      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 = () => {
+  const handleDownloadPdf = async () => {
     const pdfName = pdfDetails[0] && pdfDetails[0].Name;
-    saveAs(pdfUrl, `${sanitizeFileName(pdfName)}_signed_by_OpenSign™.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`);
+    } catch (err) {
+      console.log("err in getsignedurl", err);
+      alert("something went wrong, please try again later.");
+    }
   };
 
   const sanitizeFileName = (pdfName) => {
@@ -102,55 +141,41 @@ function Header({
       } 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.");
+      }
     }
   };
 
-  const GenerateCertificate = () => {
-    //after generate download certifcate pdf
-    const handleDownload = (pdfBlob, fileName) => {
-      if (pdfBlob) {
-        const url = window.URL.createObjectURL(pdfBlob);
-        // Create a temporary anchor element
-        const link = document.createElement("a");
-        link.href = url;
-        link.download = fileName;
-        // Append the anchor to the body
-        document.body.appendChild(link);
-        // Programmatically click the anchor to trigger the download
-        link.click();
-        // Remove the anchor from the body
-        document.body.removeChild(link);
-        // Release the object URL to free up resources
-        window.URL.revokeObjectURL(url);
-      }
-    };
-
-    return (
-      <PDFDownloadLink
-        onClick={(e) => e.preventDefault()}
-        style={{ textDecoration: "none", zIndex: "35" }}
-        document={<Certificate pdfData={pdfDetails} />}
-      >
-        {({ blob, loading }) => (
-          <button
-            onClick={() =>
-              handleDownload(
-                blob,
-                `completion certificate-${
-                  pdfDetails[0] && pdfDetails[0].Name
-                }.pdf`
-              )
-            }
-            disabled={loading}
-            className=" md:bg-[#08bc66] border-none focus:outline-none flex flex-row items-center md:shadow md:rounded-[3px] py-[3px] md:px-[11px] md:text-white text-black md:font-[500] text-[13px] mr-[5px]"
-          >
-            <i className="fa-solid fa-award py-[3px]" aria-hidden="true"></i>
-            <span className="md:hidden lg:block ml-1">Certificate</span>
-          </button>
-        )}
-      </PDFDownloadLink>
-    );
-  };
   return (
     <div style={{ padding: "5px 0px 5px 0px" }} className="mobileHead">
       {isMobile && isShowHeader ? (
@@ -240,32 +265,24 @@ function Header({
                       </div>
                     </DropdownMenu.Item>
                     {isCompleted && (
-                      <>
-                        {pdfDetails[0] && pdfDetails[0]?.CertificateUrl ? (
-                          <DropdownMenu.Item
-                            className="DropdownMenuItem"
-                            onClick={() => handleDownloadCertificate()}
-                          >
-                            <div
-                              style={{
-                                border: "none",
-                                backgroundColor: "#fff"
-                              }}
-                            >
-                              <i
-                                className="fa-solid fa-award"
-                                style={{ marginRight: "2px" }}
-                                aria-hidden="true"
-                              ></i>
-                              Certificate
-                            </div>
-                          </DropdownMenu.Item>
-                        ) : (
-                          <DropdownMenu.Item className="DropdownMenuItem">
-                            <GenerateCertificate />
-                          </DropdownMenu.Item>
-                        )}
-                      </>
+                      <DropdownMenu.Item
+                        className="DropdownMenuItem"
+                        onClick={() => handleDownloadCertificate()}
+                      >
+                        <div
+                          style={{
+                            border: "none",
+                            backgroundColor: "#fff"
+                          }}
+                        >
+                          <i
+                            className="fa-solid fa-award"
+                            style={{ marginRight: "2px" }}
+                            aria-hidden="true"
+                          ></i>
+                          Certificate
+                        </div>
+                      </DropdownMenu.Item>
                     )}
                     {isSignYourself && (
                       <DropdownMenu.Item
@@ -442,25 +459,17 @@ function Header({
             alreadySign ? (
               <div style={{ display: "flex", flexDirection: "row" }}>
                 {isCompleted && (
-                  <>
-                    {pdfDetails[0] && pdfDetails[0]?.CertificateUrl ? (
-                      <button
-                        type="button"
-                        onClick={() => handleDownloadCertificate()}
-                        className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#08bc66]"
-                      >
-                        <i
-                          className="fa-solid fa-award py-[3px]"
-                          aria-hidden="true"
-                        ></i>
-                        <span className="hidden lg:block ml-1">
-                          Certificate
-                        </span>
-                      </button>
-                    ) : (
-                      <GenerateCertificate />
-                    )}
-                  </>
+                  <button
+                    type="button"
+                    onClick={() => handleDownloadCertificate()}
+                    className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#08bc66]"
+                  >
+                    <i
+                      className="fa-solid fa-award py-[3px]"
+                      aria-hidden="true"
+                    ></i>
+                    <span className="hidden lg:block ml-1">Certificate</span>
+                  </button>
                 )}
 
                 <button
@@ -520,23 +529,17 @@ function Header({
           ) : isCompleted ? (
             <div style={{ display: "flex", flexDirection: "row" }}>
               {isCompleted && (
-                <>
-                  {pdfDetails[0] && pdfDetails[0]?.CertificateUrl ? (
-                    <button
-                      type="button"
-                      onClick={() => handleDownloadCertificate()}
-                      className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#08bc66]"
-                    >
-                      <i
-                        className="fa-solid fa-award py-[3px]"
-                        aria-hidden="true"
-                      ></i>
-                      <span className="hidden lg:block ml-1">Certificate</span>
-                    </button>
-                  ) : (
-                    <GenerateCertificate />
-                  )}
-                </>
+                <button
+                  type="button"
+                  onClick={() => handleDownloadCertificate()}
+                  className="flex flex-row items-center shadow rounded-[3px] py-[3px] px-[11px] text-white font-[500] text-[13px] mr-[5px] bg-[#08bc66]"
+                >
+                  <i
+                    className="fa-solid fa-award py-[3px]"
+                    aria-hidden="true"
+                  ></i>
+                  <span className="hidden lg:block ml-1">Certificate</span>
+                </button>
               )}
               <button
                 onClick={handleToPrint}
@@ -592,6 +595,21 @@ function Header({
           )}
         </div>
       )}
+      <ModalUi
+        isOpen={isCertificate}
+        title={"Generating certificate"}
+        handleClose={() => setIsCertificate(false)}
+      >
+        <div className="p-3 md:p-5 text-[13px] md:text-base text-center">
+          <p>
+            Your completion certificate is being generated. Please wait
+            momentarily.
+          </p>
+          <p>
+            If the download doesn&apos;t start shortly, click the button again.
+          </p>
+        </div>
+      </ModalUi>
     </div>
   );
 }

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

@@ -38,9 +38,9 @@ function PlaceholderType(props) {
     "December"
   ];
   const validateExpression = (regexValidation) => {
-    if (textValue) {
+    if (textValue && regexValidation) {
       let regexObject = regexValidation;
-      if (props.pos?.options.validation.type === "regex") {
+      if (props.pos?.options?.validation?.type === "regex") {
         regexObject = RegexParser(regexValidation);
       }
       // new RegExp(regexValidation);
@@ -56,7 +56,7 @@ function PlaceholderType(props) {
     props.setDraggingEnabled(true);
     const validateType = props.pos?.options?.validation?.type;
     let regexValidation;
-    if (validateType) {
+    if (validateType && validateType !== "text") {
       switch (validateType) {
         case "email":
           regexValidation = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
@@ -66,12 +66,8 @@ function PlaceholderType(props) {
           regexValidation = /^[0-9\s]*$/;
           validateExpression(regexValidation);
           break;
-        case "text":
-          regexValidation = /^[a-zA-Z\s]+$/;
-          validateExpression(regexValidation);
-          break;
         default:
-          regexValidation = props.pos?.options.validation.pattern;
+          regexValidation = props.pos?.options?.validation?.pattern || "";
           validateExpression(regexValidation);
       }
     }
@@ -89,11 +85,11 @@ function PlaceholderType(props) {
       case "number":
         setValidatePlaceholder("12345");
         break;
-      case textInputWidget:
-        setValidatePlaceholder("enter text");
+      case "text":
+        setValidatePlaceholder("please enter text");
         break;
       default:
-        setValidatePlaceholder("enter text");
+        setValidatePlaceholder("please enter value");
     }
   }
 
@@ -407,7 +403,7 @@ function PlaceholderType(props) {
         (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
         <textarea
           ref={inputRef}
-          placeholder={validatePlaceholder}
+          placeholder={validatePlaceholder || "please enter value"}
           rows={1}
           onKeyDown={handleEnterPress}
           value={textValue}
@@ -710,7 +706,7 @@ function PlaceholderType(props) {
         (props.isNeedSign && props.data?.signerObjId === props.signerObjId) ? (
         <textarea
           ref={inputRef}
-          placeholder={"email"}
+          placeholder={"enter email"}
           rows={1}
           onKeyDown={handleEnterPress}
           value={textValue}
@@ -782,7 +778,7 @@ function PlaceholderType(props) {
     case textWidget:
       return (
         <textarea
-          placeholder="Enter label"
+          placeholder="Enter text"
           rows={1}
           onKeyDown={handleEnterPress}
           value={textValue}

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

@@ -214,8 +214,8 @@ function SignPad({
     const fontfamily = fontStyle
       ? fontStyle
       : fontSelect
-        ? fontSelect
-        : "Fasthand";
+      ? fontSelect
+      : "Fasthand";
 
     //creating span for getting text content width
     const span = document.createElement("span");
@@ -267,10 +267,10 @@ function SignPad({
                   key === 0 && penColor === "blue"
                     ? "2px solid blue"
                     : key === 1 && penColor === "red"
-                      ? "2px solid red"
-                      : key === 2 && penColor === "black"
-                        ? "2px solid black"
-                        : "2px solid white"
+                    ? "2px solid red"
+                    : key === 2 && penColor === "black"
+                    ? "2px solid black"
+                    : "2px solid white"
               }}
               onClick={() => {
                 props?.convertToImg &&
@@ -536,7 +536,6 @@ function SignPad({
                       style={{
                         border: "1.3px solid #007bff",
                         borderRadius: "2px",
-
                         display: "flex",
                         flexDirection: "column",
                         justifyContent: "center",
@@ -553,7 +552,7 @@ function SignPad({
                         type="file"
                         onChange={onImageChange}
                         className="filetype"
-                        accept="image/*"
+                        accept="image/png,image/jpeg"
                         ref={imageRef}
                         hidden
                       />

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

@@ -0,0 +1,85 @@
+import React from "react";
+import { rejectBtn, submitBtn, themeColor } from "../../constant/const";
+
+function VerifyEmail(props) {
+  return (
+    <div className="bg-black bg-opacity-[75%] absolute z-[999] flex flex-col items-center justify-center w-full h-full rounded">
+      <div className="bg-white rounded outline-none md:w-[40%] w-[80%]">
+        <div
+          style={{ backgroundColor: themeColor }}
+          className=" text-white p-[10px] rounded-t"
+        >
+          OTP verification
+        </div>
+        {props.isVerifyModal ? (
+          <form
+            onSubmit={(e) => {
+              props.setIsVerifyModal(false);
+              props.handleVerifyEmail(e);
+            }}
+          >
+            <div className="px-6 py-3">
+              <label className="mb-2">Enter OTP</label>
+              <input
+                required
+                type="tel"
+                pattern="[0-9]{4}"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                placeholder="Enter OTP received over email"
+                value={props.otp}
+                onChange={(e) => props.setOtp(e.target.value)}
+              />
+            </div>
+            <hr />
+            <div className="px-6 my-3">
+              <button type="submit" className={submitBtn}>
+                Verify
+              </button>
+              <button
+                className={`${rejectBtn} ml-2`}
+                onClick={(e) => props.handleResend(e)}
+              >
+                Resend
+              </button>
+            </div>
+          </form>
+        ) : props.otpLoader ? (
+          <div
+            style={{
+              height: "150px",
+              display: "flex",
+              alignItems: "center",
+              justifyContent: "center"
+            }}
+          >
+            <div
+              style={{
+                fontSize: "45px",
+                color: "#3dd3e0"
+              }}
+              className="loader-37"
+            ></div>
+          </div>
+        ) : (
+          <div className="px-6 py-3">
+            <p className="mb-2">Please verify your email !</p>
+            <hr />
+            <div className="px-0 mt-3">
+              <button
+                className={submitBtn}
+                type="submit"
+                onClick={() => {
+                  props.handleVerifyBtn();
+                }}
+              >
+                Send OTP
+              </button>
+            </div>
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default VerifyEmail;

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

@@ -13,7 +13,7 @@ const WidgetNameModal = (props) => {
     defaultValue: "",
     status: "required",
     hint: "",
-    textvalidate: "text"
+    textvalidate: ""
   });
   const [isValid, setIsValid] = useState(true);
   const statusArr = ["Required", "Optional"];
@@ -48,12 +48,16 @@ const WidgetNameModal = (props) => {
         defaultValue: "",
         status: "required",
         hint: "",
-        textvalidate: "text"
+        textvalidate: ""
       });
     }
   };
   const handleChange = (e) => {
-    setFormdata({ ...formdata, [e.target.name]: e.target.value });
+    if (e) {
+      setFormdata({ ...formdata, [e.target.name]: e.target.value });
+    } else {
+      setFormdata({ ...formdata, textvalidate: "" });
+    }
   };
 
   const handledefaultChange = (e) => {
@@ -82,7 +86,7 @@ const WidgetNameModal = (props) => {
 
   function handleBlurRegex() {
     if (!formdata.textvalidate) {
-      setFormdata({ ...formdata, textvalidate: "text" });
+      setFormdata({ ...formdata, textvalidate: "" });
     } else {
       if (formdata.defaultValue) {
         const regexObject = RegexParser(
@@ -173,7 +177,10 @@ const WidgetNameModal = (props) => {
                     onChange={(e) => handleChange(e)}
                     onBlur={() => handleBlurRegex()}
                   >
-                    <option disabled style={{ fontSize: "13px" }}>
+                    <option
+                      disabled={formdata?.textvalidate}
+                      style={{ fontSize: "13px" }}
+                    >
                       Select...
                     </option>
                     {inputOpt.map((data, ind) => {

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

@@ -169,32 +169,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/constant/Utils.js

@@ -13,7 +13,11 @@ export const openInNewTab = (url) => {
   window.open(url, "_blank", "noopener,noreferrer");
 };
 
-export async function fetchSubscription(extUserId) {
+export async function fetchSubscription(
+  extUserId,
+  contactObjId,
+  isGuestSign = false
+) {
   try {
     const extClass = localStorage.getItem("Extand_Class");
     let extUser;
@@ -30,11 +34,19 @@ export async function fetchSubscription(extUserId) {
       "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
       sessionToken: localStorage.getItem("accesstoken")
     };
-    const params = { extUserId: extUser };
+    const params = isGuestSign
+      ? { contactId: contactObjId }
+      : { extUserId: extUser };
     const tenatRes = await axios.post(url, params, { headers: headers });
-    const plan = tenatRes.data?.result?.result?.PlanCode;
-    const billingDate = tenatRes.data?.result?.result?.Next_billing_date?.iso;
-    return { plan, billingDate };
+    let plan, status, billingDate;
+    if (isGuestSign) {
+      plan = tenatRes.data?.result?.result?.plan;
+      status = tenatRes.data?.result?.result?.isSubscribed;
+    } else {
+      plan = tenatRes.data?.result?.result?.PlanCode;
+      billingDate = tenatRes.data?.result?.result?.Next_billing_date?.iso;
+    }
+    return { plan, billingDate, status };
   } catch (err) {
     console.log("Err in fetch subscription", err);
     return { plan: "", billingDate: "" };
@@ -323,15 +335,15 @@ export const addWidgetOptions = (type) => {
         options: { isReadOnly: false, isHideLabel: false }
       };
     case textInputWidget:
-      return { ...defaultOpt, validation: { type: "text", pattern: "" } };
+      return { ...defaultOpt };
     case "initials":
       return defaultOpt;
     case "name":
-      return { ...defaultOpt, validation: { type: "text", pattern: "" } };
+      return { ...defaultOpt };
     case "company":
-      return { ...defaultOpt, validation: { type: "text", pattern: "" } };
+      return { ...defaultOpt };
     case "job title":
-      return { ...defaultOpt, validation: { type: "text", pattern: "" } };
+      return { ...defaultOpt };
     case "date":
       return {
         ...defaultOpt,
@@ -528,53 +540,94 @@ export const signPdfFun = async (
   signerObjectId,
   setIsAlert,
   objectId,
-  isSubscribed
+  isSubscribed,
+  activeMailAdapter,
+  xyPosition
 ) => {
   let singleSign,
     isCustomCompletionMail = false;
 
-  //get tenant details
-  const tenantDetails = await getTenantDetails(objectId);
-  if (tenantDetails && tenantDetails === "user does not exist!") {
-    alert("User does not exist");
-  } else {
-    if (
-      tenantDetails?.CompletionBody &&
-      tenantDetails?.CompletionSubject &&
-      (!isEnableSubscription || isSubscribed)
-    ) {
-      isCustomCompletionMail = true;
-    }
-  }
-
-  singleSign = {
-    pdfFile: base64Url,
-    docId: documentId,
-    userId: signerObjectId,
-    isCustomCompletionMail: isCustomCompletionMail
-  };
-  const response = await axios
-    .post(`${localStorage.getItem("baseUrl")}functions/signPdf`, singleSign, {
-      headers: {
-        "Content-Type": "application/json",
-        "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-        sessionToken: localStorage.getItem("accesstoken")
+  try {
+    //get tenant details
+    const tenantDetails = await getTenantDetails(objectId);
+    if (tenantDetails && tenantDetails === "user does not exist!") {
+      alert("User does not exist");
+    } else {
+      if (
+        tenantDetails?.CompletionBody &&
+        tenantDetails?.CompletionSubject &&
+        (!isEnableSubscription || isSubscribed)
+      ) {
+        isCustomCompletionMail = true;
       }
-    })
-    .then((Listdata) => {
-      const json = Listdata.data;
-      const res = json.result;
-      return res;
-    })
-    .catch((err) => {
-      console.log("Err ", err);
-      setIsAlert({
-        isShow: true,
-        alertMessage: "something went wrong"
-      });
-    });
+    }
+    
+    // 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) {
+      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);
+        }
+      }
+    }
 
-  return response;
+    let base64Sign = getSignature.SignUrl;
+    //check https type signature (default signature exist) then convert in base64
+    const isUrl = base64Sign.includes("https");
+    if (isUrl) {
+      try {
+        base64Sign = await fetchImageBase64(base64Sign);
+      } catch (e) {
+        console.log("error", e);
+      }
+    }
+    //change image width and height to 104/44 in png base64
+    const getNewse64 = await changeImageWH(base64Sign);
+    //remove suffiix of base64
+    const suffixbase64 = getNewse64 && getNewse64.split(",").pop();
+
+    singleSign = {
+      mailProvider: activeMailAdapter,
+      pdfFile: base64Url,
+      docId: documentId,
+      userId: signerObjectId,
+      isCustomCompletionMail: isCustomCompletionMail,
+      signature: suffixbase64
+    };
+    const response = await axios
+      .post(`${localStorage.getItem("baseUrl")}functions/signPdf`, singleSign, {
+        headers: {
+          "Content-Type": "application/json",
+          "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
+          //  sessionToken: localStorage.getItem("accesstoken")
+          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+        }
+      })
+      .then((Listdata) => {
+        const json = Listdata.data;
+        const res = json.result;
+        return res;
+      })
+      .catch((err) => {
+        console.log("Err ", err);
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong"
+        });
+      });
+
+    return response;
+  } catch (e) {
+    setIsAlert({
+      isShow: true,
+      alertMessage: "something went wrong"
+    });
+  }
 };
 
 export const randomId = () => {
@@ -1111,7 +1164,6 @@ export const onImageSelect = (event, setImgWH, setImage) => {
   const imageType = event.target.files[0].type;
   const reader = new FileReader();
   reader.readAsDataURL(event.target.files[0]);
-
   reader.onloadend = function (e) {
     let width, height;
     const image = new Image();
@@ -1139,6 +1191,50 @@ export const onImageSelect = (event, setImgWH, setImage) => {
   };
 };
 
+//convert https url to base64
+export const fetchImageBase64 = async (imageUrl) => {
+  try {
+    const response = await fetch(imageUrl);
+    const blob = await response.blob();
+
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.readAsDataURL(blob);
+      reader.onloadend = () => {
+        const base64data = reader.result;
+        resolve(base64data);
+      };
+      reader.onerror = (error) => {
+        reject(error);
+      };
+    });
+  } catch (error) {
+    throw new Error("Error converting URL to base64:", error);
+  }
+};
+//function for select image and upload image
+export const changeImageWH = async (base64Image) => {
+  const newWidth = 100;
+  const newHeight = 40;
+  return new Promise((resolve, reject) => {
+    const img = new Image();
+    img.src = base64Image;
+    img.onload = async () => {
+      const canvas = document.createElement("canvas");
+      const ctx = canvas.getContext("2d");
+      canvas.width = newWidth;
+      canvas.height = newHeight;
+      ctx.imageSmoothingEnabled = false;
+      ctx.drawImage(img, 0, 0, newWidth, newHeight);
+      const resizedBase64 = canvas.toDataURL("image/png", 1);
+      resolve(resizedBase64);
+    };
+    img.onerror = (error) => {
+      reject(error);
+    };
+  });
+};
+
 //function for embed multiple signature using pdf-lib
 export const multiSignEmbed = async (
   pngUrl,
@@ -1253,8 +1349,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) {
@@ -1917,3 +2013,18 @@ export const convertPdfArrayBuffer = async (url) => {
     return "Error";
   }
 };
+
+//`handleSendOTP` function is used to send otp on user's email using `SendOTPMailV1` cloud function
+export const handleSendOTP = async (email) => {
+  try {
+    let url = `${localStorage.getItem("baseUrl")}functions/SendOTPMailV1`;
+    const headers = {
+      "Content-Type": "application/json",
+      "X-Parse-Application-Id": localStorage.getItem("parseAppId")
+    };
+    const body = { email: email };
+    await axios.post(url, body, { headers: headers });
+  } catch (error) {
+    alert(error.message);
+  }
+};

apps/OpenSign/src/constant/saveFileSize.js

@@ -1,6 +1,10 @@
 import axios from "axios";
-const parseAppId = localStorage.getItem("parseAppId");
-const serverUrl = localStorage.getItem("baseUrl");
+const parseAppId = process.env.REACT_APP_APPID
+  ? process.env.REACT_APP_APPID
+  : "opensign";
+const serverUrl = process.env.REACT_APP_SERVERURL
+  ? process.env.REACT_APP_SERVERURL
+  : window.location.origin + "/api/app";
 
 export const SaveFileSize = async (size, imageUrl, tenantId) => {
   //checking server url and save file's size
@@ -12,7 +16,7 @@ export const SaveFileSize = async (size, imageUrl, tenantId) => {
   const _tenantPtr = JSON.stringify(tenantPtr);
   try {
     const res = await axios.get(
-      `${serverUrl}classes/partners_TenantCredits?where={"PartnersTenant":${_tenantPtr}}`,
+      `${serverUrl}/classes/partners_TenantCredits?where={"PartnersTenant":${_tenantPtr}}`,
       {
         headers: {
           "Content-Type": "application/json",
@@ -30,7 +34,7 @@ export const SaveFileSize = async (size, imageUrl, tenantId) => {
           : size
       };
       await axios.put(
-        `${serverUrl}classes/partners_TenantCredits/${response[0].objectId}`,
+        `${serverUrl}/classes/partners_TenantCredits/${response[0].objectId}`,
         data,
         {
           headers: {
@@ -41,7 +45,7 @@ export const SaveFileSize = async (size, imageUrl, tenantId) => {
       );
     } else {
       data = { usedStorage: size, PartnersTenant: tenantPtr };
-      await axios.post(`${serverUrl}classes/partners_TenantCredits`, data, {
+      await axios.post(`${serverUrl}/classes/partners_TenantCredits`, data, {
         headers: {
           "Content-Type": "application/json",
           "X-Parse-Application-Id": parseAppId
@@ -64,7 +68,7 @@ const saveDataFile = async (size, imageUrl, tenantPtr) => {
 
   // console.log("data save",file, data)
   try {
-    await axios.post(`${serverUrl}classes/partners_DataFiles`, data, {
+    await axios.post(`${serverUrl}/classes/partners_DataFiles`, data, {
       headers: {
         "Content-Type": "application/json",
         "X-Parse-Application-Id": parseAppId
@@ -74,4 +78,3 @@ const saveDataFile = async (size, imageUrl, tenantPtr) => {
     console.log("err in save usage ", err);
   }
 };
-  

apps/OpenSign/src/json/plansArr.js

@@ -43,7 +43,7 @@ const plans = [
         : "https://billing.opensignlabs.com/subscribe/ef798486e6a0a11ea65f2bae8f2af901d8ad1135190dff951330360e47585a71/professional-yearly",
     target: "_self",
     benefits: [
-      "Everything in OpenSign™ professional",
+      "Everything in OpenSign™ free",
       "Field validations",
       "Regular expression validations",
       "Organize docs in OpenSign™ Drive",
@@ -52,7 +52,7 @@ const plans = [
       "API Access",
       "100 API signatures included",
       "DocumentId removal from signed docs",
-      "Custom email templates(coming soon)"
+      "Custom email templates"
     ]
   },
   {

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { useNavigate, useParams } from "react-router-dom";
 import { formJson } from "../json/FormJson";
 import AddUser from "../components/AddUser";
@@ -11,7 +11,12 @@ import SignersInput from "../components/shared/fields/SignersInput";
 import Title from "../components/Title";
 import PageNotFound from "./PageNotFound";
 import { SaveFileSize } from "../constant/saveFileSize";
-import { getFileName } from "../constant/Utils";
+import { 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";
 
 // `Form` render all type of Form on this basis of their provided in path
 function Form() {
@@ -31,6 +36,8 @@ function Form() {
 
 const Forms = (props) => {
   const maxFileSize = 20;
+  const abortController = new AbortController();
+  const inputFileRef = useRef(null);
   const navigate = useNavigate();
   const [signers, setSigners] = useState([]);
   const [folder, setFolder] = useState({ ObjectId: "", Name: "" });
@@ -39,37 +46,234 @@ const Forms = (props) => {
     Description: "",
     Note: "",
     TimeToCompleteDays: 15,
-    SendinOrder: "false"
+    SendinOrder: "false",
+    password: "",
+    file: ""
   });
-  const [fileupload, setFileUpload] = useState([]);
+  const [fileupload, setFileUpload] = useState("");
   const [fileload, setfileload] = useState(false);
   const [percentage, setpercentage] = useState(0);
   const [isReset, setIsReset] = useState(false);
   const [isAlert, setIsAlert] = useState(false);
   const [isSubmit, setIsSubmit] = useState(false);
   const [isErr, setIsErr] = useState("");
+  const [isPassword, setIsPassword] = useState(false);
+  const [isDecrypting, setIsDecrypting] = useState(false);
+  const [isCorrectPass, setIsCorrectPass] = useState(true);
   const handleStrInput = (e) => {
+    setIsCorrectPass(true);
     setFormData({ ...formData, [e.target.name]: e.target.value });
   };
   useEffect(() => {
     handleReset();
+    return () => abortController.abort();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [props.title]);
-  const handleFileInput = (e) => {
+
+  function getFileAsArrayBuffer(file) {
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+
+      reader.onload = (e) => {
+        resolve(e.target.result);
+      };
+
+      reader.onerror = (e) => {
+        reject(e.target.error);
+      };
+
+      reader.readAsArrayBuffer(file);
+    });
+  }
+  const handleFileInput = async (e) => {
     setpercentage(0);
     try {
       let files = e.target.files;
+      setFormData((prev) => ({ ...prev, file: e.target.files[0] }));
       if (typeof files[0] !== "undefined") {
         const mb = Math.round(files[0].size / Math.pow(1024, 2));
         if (mb > maxFileSize) {
           alert(
             `The selected file size is too large. Please select a file less than ${maxFileSize} MB`
           );
-          setFileUpload([]);
+          setFileUpload("");
           e.target.value = "";
           return;
         } else {
-          handleFileUpload(files[0]);
+          if (files?.[0]?.type === "application/pdf") {
+            try {
+              const res = await getFileAsArrayBuffer(files[0]);
+              await PDFDocument.load(res);
+              handleFileUpload(files[0]);
+            } catch (err) {
+              if (err?.message?.includes("is encrypted")) {
+                try {
+                  await Parse.Cloud.run("encryptedpdf", {
+                    email: Parse.User.current().getEmail()
+                  });
+                } catch (err) {
+                  console.log("err in sending posthog encryptedpdf", err);
+                }
+                // console.log("err ", err);
+                try {
+                  setIsDecrypting(true);
+                  const fileName = files?.[0].name;
+                  const size = files?.[0].size;
+                  const name = sanitizeFileName(fileName);
+                  const url = "https://ai.nxglabs.in/decryptpdf"; //"https://ai.nxglabs.in/decryptpdf"; //
+                  let formData = new FormData();
+                  formData.append("file", files[0]);
+                  formData.append("password", "");
+                  const config = {
+                    headers: {
+                      "content-type": "multipart/form-data"
+                      // sessiontoken: Parse.User.current().getSessionToken()
+                    },
+                    responseType: "blob"
+                  };
+                  const response = await axios.post(url, formData, config);
+                  const pdfBlob = new Blob([response.data], {
+                    type: "application/pdf"
+                  });
+                  const pdfFile = new File([pdfBlob], name, {
+                    type: "application/pdf"
+                  });
+                  setIsDecrypting(false);
+                  setfileload(true);
+
+                  // Upload the file to Parse Server
+                  const parseFile = new Parse.File(
+                    name,
+                    pdfFile,
+                    "application/pdf"
+                  );
+
+                  await parseFile.save({
+                    progress: (progressValue, loaded, total, { type }) => {
+                      if (type === "upload" && progressValue !== null) {
+                        const percentCompleted = Math.round(
+                          (loaded * 100) / total
+                        );
+                        setpercentage(percentCompleted);
+                      }
+                    }
+                  });
+
+                  // Retrieve the URL of the uploaded file
+                  if (parseFile.url()) {
+                    setFileUpload(parseFile.url());
+                    setfileload(false);
+                    const tenantId = localStorage.getItem("TenantId");
+                    SaveFileSize(size, parseFile.url(), tenantId);
+                    return parseFile.url();
+                  }
+                } catch (err) {
+                  setfileload(false);
+                  setpercentage(0);
+                  if (err?.response?.status === 401) {
+                    setIsPassword(true);
+                  } else {
+                    console.log("Error uploading file: ", err?.response);
+                    setIsDecrypting(false);
+                    e.target.value = "";
+                  }
+                }
+              } else {
+                console.log("err ", err);
+                setFileUpload("");
+                e.target.value = "";
+              }
+            }
+          } else {
+            const isImage = files?.[0]?.type.includes("image/");
+            if (isImage) {
+              const image = await toDataUrl(files[0]);
+              const pdfDoc = await PDFDocument.create();
+              let embedImg;
+              if (files?.[0]?.type === "image/png") {
+                embedImg = await pdfDoc.embedPng(image);
+              } else {
+                embedImg = await pdfDoc.embedJpg(image);
+              }
+
+              // Get image dimensions
+              const imageWidth = embedImg.width;
+              const imageHeight = embedImg.height;
+              const page = pdfDoc.addPage([imageWidth, imageHeight]);
+              page.drawImage(embedImg, {
+                x: 0,
+                y: 0,
+                width: imageWidth,
+                height: imageHeight
+              });
+              const getFile = await pdfDoc.save({
+                useObjectStreams: false
+              });
+              setfileload(true);
+              const fileName = files[0].name;
+              const size = files[0].size;
+              const name = sanitizeFileName(fileName);
+              const pdfName = `${name?.split(".")[0]}.pdf`;
+              const parseFile = new Parse.File(
+                pdfName,
+                [...getFile],
+                "application/pdf"
+              );
+
+              try {
+                const response = await parseFile.save({
+                  progress: (progressValue, loaded, total, { type }) => {
+                    if (type === "upload" && progressValue !== null) {
+                      const percentCompleted = Math.round(
+                        (loaded * 100) / total
+                      );
+                      setpercentage(percentCompleted);
+                    }
+                  }
+                });
+                // The response object will contain information about the uploaded file
+                // You can access the URL of the uploaded file using response.url()
+                setFileUpload(response.url());
+                setfileload(false);
+                if (response.url()) {
+                  const tenantId = localStorage.getItem("TenantId");
+                  SaveFileSize(size, response.url(), tenantId);
+                  return response.url();
+                }
+              } catch (error) {
+                e.target.value = "";
+                setfileload(false);
+                setpercentage(0);
+                console.error("Error uploading file:", error);
+              }
+            } else {
+              if (isEnableSubscription) {
+                try {
+                  setfileload(true);
+                  const url = "https://ai.nxglabs.in/docxtopdf";
+                  let formData = new FormData();
+                  formData.append("file", files[0]);
+                  const config = {
+                    headers: {
+                      "content-type": "multipart/form-data",
+                      sessiontoken: Parse.User.current().getSessionToken()
+                    },
+                    signal: abortController.signal
+                  };
+                  const res = await axios.post(url, formData, config);
+                  if (res.data) {
+                    setFileUpload(res.data.url);
+                    setfileload(false);
+                  }
+                } catch (err) {
+                  e.target.value = "";
+                  setfileload(false);
+                  setpercentage(0);
+                  console.log("err in libreconverter ", err);
+                }
+              }
+            }
+          }
         }
       } else {
         alert("Please select file.");
@@ -162,64 +366,68 @@ const Forms = (props) => {
   const handleSubmit = async (e) => {
     e.preventDefault();
     e.stopPropagation();
-    setIsSubmit(true);
-    try {
-      const currentUser = Parse.User.current();
-      const object = new Parse.Object(props.Cls);
-      object.set("Name", formData?.Name);
-      object.set("Description", formData?.Description);
-      object.set("Note", formData?.Note);
-      if (props.title === "Request Signatures") {
-        object.set(
-          "TimeToCompleteDays",
-          parseInt(formData?.TimeToCompleteDays)
-        );
-      }
-      if (props.title !== "Sign Yourself") {
-        const isChecked = formData.SendinOrder === "false" ? false : true;
-        object.set("SendinOrder", isChecked);
-      }
-      object.set("URL", fileupload);
-      object.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
-      if (folder && folder.ObjectId) {
-        object.set("Folder", {
+    if (fileupload) {
+      setIsSubmit(true);
+      try {
+        const currentUser = Parse.User.current();
+        const object = new Parse.Object(props.Cls);
+        object.set("Name", formData?.Name);
+        object.set("Description", formData?.Description);
+        object.set("Note", formData?.Note);
+        if (props.title === "Request Signatures") {
+          object.set(
+            "TimeToCompleteDays",
+            parseInt(formData?.TimeToCompleteDays)
+          );
+        }
+        if (props.title !== "Sign Yourself") {
+          const isChecked = formData.SendinOrder === "false" ? false : true;
+          object.set("SendinOrder", isChecked);
+        }
+        object.set("URL", fileupload);
+        object.set("CreatedBy", Parse.User.createWithoutData(currentUser.id));
+        if (folder && folder.ObjectId) {
+          object.set("Folder", {
+            __type: "Pointer",
+            className: props.Cls,
+            objectId: folder.ObjectId
+          });
+        }
+        if (signers && signers.length > 0) {
+          object.set("Signers", signers);
+        }
+        const ExtCls = JSON.parse(localStorage.getItem("Extand_Class"));
+        object.set("ExtUserPtr", {
           __type: "Pointer",
-          className: props.Cls,
-          objectId: folder.ObjectId
+          className: "contracts_Users",
+          objectId: ExtCls[0].objectId
         });
-      }
-      if (signers && signers.length > 0) {
-        object.set("Signers", signers);
-      }
-      const ExtCls = JSON.parse(localStorage.getItem("Extand_Class"));
-      object.set("ExtUserPtr", {
-        __type: "Pointer",
-        className: "contracts_Users",
-        objectId: ExtCls[0].objectId
-      });
 
-      const res = await object.save();
-      if (res) {
-        setSigners([]);
-        setFolder({ ObjectId: "", Name: "" });
-        setFormData({
-          Name: "",
-          Description: "",
-          Note: ""
-        });
-        setFileUpload([]);
-        setpercentage(0);
-        navigate(`/${props?.redirectRoute}/${res.id}`);
+        const res = await object.save();
+        if (res) {
+          setSigners([]);
+          setFolder({ ObjectId: "", Name: "" });
+          setFormData({
+            Name: "",
+            Description: "",
+            Note: ""
+          });
+          setFileUpload("");
+          setpercentage(0);
+          navigate(`/${props?.redirectRoute}/${res.id}`);
+        }
+      } catch (err) {
+        console.log("err ", err);
+        setIsErr(true);
+      } finally {
+        setIsAlert(true);
+        setTimeout(() => {
+          setIsAlert(false);
+        }, 1000);
+        setIsSubmit(false);
       }
-    } catch (err) {
-      console.log("err ", err);
-      setIsErr(true);
-    } finally {
-      setIsAlert(true);
-      setTimeout(() => {
-        setIsAlert(false);
-      }, 1000);
-      setIsSubmit(false);
+    } else {
+      alert("Please wait until the PDF has been uploading.");
     }
   };
 
@@ -251,11 +459,83 @@ const Forms = (props) => {
       TimeToCompleteDays: 15,
       SendinOrder: "true"
     });
-    setFileUpload([]);
+    setFileUpload("");
     setpercentage(0);
     setTimeout(() => setIsReset(false), 50);
   };
- 
+  const handlePasswordSubmit = async (e) => {
+    e.preventDefault();
+    setIsPassword(false);
+    setfileload(true);
+    try {
+      const fileName = formData?.file?.name;
+      const size = formData?.file?.size;
+      const name = sanitizeFileName(fileName);
+      const url = "https://ai.nxglabs.in/decryptpdf"; //
+      let Data = new FormData();
+      Data.append("file", formData?.file);
+      Data.append("password", formData.password);
+      const config = {
+        headers: {
+          "content-type": "multipart/form-data"
+          // sessiontoken: Parse.User.current().getSessionToken()
+        },
+        responseType: "blob"
+      };
+      const response = await axios.post(url, Data, config);
+      const pdfBlob = new Blob([response.data], {
+        type: "application/pdf"
+      });
+      const pdfFile = new File([pdfBlob], name, {
+        type: "application/pdf"
+      });
+      setIsDecrypting(false);
+      // Upload the file to Parse Server
+      const parseFile = new Parse.File(name, pdfFile, "application/pdf");
+
+      await parseFile.save({
+        progress: (progressValue, loaded, total, { type }) => {
+          if (type === "upload" && progressValue !== null) {
+            const percentCompleted = Math.round((loaded * 100) / total);
+            setpercentage(percentCompleted);
+          }
+        }
+      });
+
+      // Retrieve the URL of the uploaded file
+      if (parseFile.url()) {
+        setFormData((prev) => ({ ...prev, password: "" }));
+        setFileUpload(parseFile.url());
+        setfileload(false);
+        const tenantId = localStorage.getItem("TenantId");
+        SaveFileSize(size, parseFile.url(), tenantId);
+        return parseFile.url();
+      }
+    } catch (err) {
+      setfileload(false);
+      setpercentage(0);
+      if (err?.response?.status === 401) {
+        setIsPassword(true);
+        setIsCorrectPass(false);
+      } else {
+        console.log("Error uploading file: ", err?.response);
+        setFormData((prev) => ({ ...prev, password: "" }));
+        setIsDecrypting(false);
+        if (inputFileRef.current) {
+          inputFileRef.current.value = ""; // Set file input value to empty string
+        }
+      }
+    }
+  };
+  const handeCloseModal = () => {
+    setIsPassword(false);
+    setFormData((prev) => ({ ...prev, file: "", password: "" }));
+    setIsDecrypting(false);
+    setfileload(false);
+    if (inputFileRef.current) {
+      inputFileRef.current.value = ""; // Set file input value to empty string
+    }
+  };
   return (
     <div className="shadow-md rounded my-2 p-3 bg-[#ffffff] md:border-[1px] md:border-gray-600/50">
       <Title title={props?.title} />
@@ -279,166 +559,282 @@ const Forms = (props) => {
           ></div>
         </div>
       ) : (
-        <form onSubmit={handleSubmit}>
-          <h1 className="text-[20px] font-semibold mb-4">{props?.title}</h1>
-          {fileload && (
-            <div className="flex items-center gap-x-2">
-              <div className="h-2 rounded-full w-[200px] md:w-[400px] bg-gray-200">
-                <div
-                  className="h-2 rounded-full bg-blue-500"
-                  style={{ width: `${percentage}%` }}
-                ></div>
-              </div>
-              <span className="text-black text-sm">{percentage}%</span>
-            </div>
-          )}
-          <div className="text-xs">
-            <label className="block">
-              File<span className="text-red-500 text-[13px]">*</span>
-            </label>
-            {fileupload.length > 0 ? (
-              <div className="flex gap-2 justify-center items-center">
-                <div className="flex justify-between items-center px-2 py-2 w-full font-bold rounded border-[1px] border-[#ccc] text-gray-500 bg-white text-[13px]">
-                  <div className="break-all">
-                    file selected : {getFileName(fileupload)}
-                  </div>
-                  <div
-                    onClick={() => setFileUpload([])}
-                    className="cursor-pointer px-[10px] text-[20px] font-bold bg-white text-red-500"
-                  >
-                    <i className="fa-solid fa-xmark"></i>
-                  </div>
-                </div>
-                {process.env.REACT_APP_DROPBOX_API_KEY && (
-                  <DropboxChooser
-                    onSuccess={dropboxSuccess}
-                    onCancel={dropboxCancel}
-                  />
-                )}
-              </div>
-            ) : (
-              <div className="flex gap-2 justify-center items-center">
+        <>
+          <ModalUi
+            isOpen={isPassword}
+            handleClose={() => handeCloseModal()}
+            title={"Enter Pdf Password"}
+          >
+            <form onSubmit={handlePasswordSubmit}>
+              <div className="px-6 pt-3 pb-2">
+                <label className="mb-2 text-xs">Password</label>
                 <input
-                  type="file"
-                  className="bg-white px-2 py-1.5 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-                  onChange={(e) => handleFileInput(e)}
-                  accept="application/pdf"
+                  type="text"
+                  name="password"
+                  value={formData.password}
+                  onChange={(e) => handleStrInput(e)}
+                  className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                  placeholder="Enter pdf password"
                   required
                 />
-                {process.env.REACT_APP_DROPBOX_API_KEY && (
-                  <DropboxChooser
-                    onSuccess={dropboxSuccess}
-                    onCancel={dropboxCancel}
-                  />
+                {!isCorrectPass ? (
+                  <p className="ml-2 text-[11px] text-red-600">
+                    Please provide correct password
+                  </p>
+                ) : (
+                  <p className="ml-2 text-[11px] text-transparent text-red-600">
+                    .
+                  </p>
                 )}
               </div>
+              <hr />
+              <div className="px-6 my-3">
+                <button type="submit" className={submitBtn}>
+                  Submit
+                </button>
+              </div>
+            </form>
+          </ModalUi>
+          <form onSubmit={handleSubmit}>
+            <h1 className="text-[20px] font-semibold mb-4">{props?.title}</h1>
+            {fileload && (
+              <div className="flex items-center gap-x-2">
+                <div className="h-2 rounded-full w-[200px] md:w-[400px] bg-gray-200">
+                  <div
+                    className="h-2 rounded-full bg-blue-500"
+                    style={{ width: `${percentage}%` }}
+                  ></div>
+                </div>
+                <span className="text-black text-sm">{percentage}%</span>
+              </div>
             )}
-          </div>
-          <div className="text-xs mt-2">
-            <label className="block">
-              {props.title === "New Template"
-                ? "Template Title"
-                : "Document Title"}
-              <span className="text-red-500 text-[13px]">*</span>
-            </label>
-            <input
-              name="Name"
-              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-              value={formData.Name}
-              onChange={(e) => handleStrInput(e)}
-              required
-            />
-          </div>
-          <div className="text-xs mt-2">
-            <label className="block">Description</label>
-            <input
-              name="Description"
-              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-              value={formData.Description}
-              onChange={(e) => handleStrInput(e)}
-            />
-          </div>
-          {props.signers && (
-            <SignersInput onChange={handleSigners} isReset={isReset} required />
-          )}
-          <div className="text-xs mt-2">
-            <label className="block">
-              Note<span className="text-red-500 text-[13px]">*</span>
-            </label>
-            <input
-              name="Note"
-              className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-              value={formData.Note}
-              onChange={(e) => handleStrInput(e)}
-              required
-            />
-          </div>
-          <SelectFolder
-            onSuccess={handleFolder}
-            folderCls={props.Cls}
-            isReset={isReset}
-          />
-
-          {props.title === "Request Signatures" && (
+            {isDecrypting && (
+              <div className="flex items-center gap-x-2">
+                <span className="text-black text-sm">
+                  Decrypting pdf please wait...
+                </span>
+              </div>
+            )}
+            <div className="text-xs">
+              <label className="block">
+                {`File (pdf, png, jpg, jpeg${
+                  isEnableSubscription ? ", docx)" : ")"
+                }`}
+                <span className="text-red-500 text-[13px]">*</span>
+              </label>
+              {fileupload.length > 0 ? (
+                <div className="flex gap-2 justify-center items-center">
+                  <div className="flex justify-between items-center px-2 py-2 w-full font-bold rounded border-[1px] border-[#ccc] text-gray-500 bg-white text-[13px]">
+                    <div className="break-all">
+                      file selected : {getFileName(fileupload)}
+                    </div>
+                    <div
+                      onClick={() => setFileUpload("")}
+                      className="cursor-pointer px-[10px] text-[20px] font-bold bg-white text-red-500"
+                    >
+                      <i className="fa-solid fa-xmark"></i>
+                    </div>
+                  </div>
+                  {process.env.REACT_APP_DROPBOX_API_KEY && (
+                    <DropboxChooser
+                      onSuccess={dropboxSuccess}
+                      onCancel={dropboxCancel}
+                    />
+                  )}
+                </div>
+              ) : (
+                <div className="flex gap-2 justify-center items-center">
+                  <input
+                    type="file"
+                    className="bg-white px-2 py-1.5 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                    onChange={(e) => handleFileInput(e)}
+                    ref={inputFileRef}
+                    accept={
+                      isEnableSubscription
+                        ? "application/pdf,application/vnd.openxmlformats-officedocument.wordprocessingml.document,image/png,image/jpeg"
+                        : "application/pdf,image/png,image/jpeg"
+                    }
+                    required
+                  />
+                  {process.env.REACT_APP_DROPBOX_API_KEY && (
+                    <DropboxChooser
+                      onSuccess={dropboxSuccess}
+                      onCancel={dropboxCancel}
+                    />
+                  )}
+                </div>
+              )}
+            </div>
             <div className="text-xs mt-2">
               <label className="block">
-                Time To Complete (Days)
+                {props.title === "New Template"
+                  ? "Template Title"
+                  : "Document Title"}
                 <span className="text-red-500 text-[13px]">*</span>
               </label>
               <input
-                type="number"
-                name="TimeToCompleteDays"
+                name="Name"
                 className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
-                value={formData.TimeToCompleteDays}
+                value={formData.Name}
                 onChange={(e) => handleStrInput(e)}
                 required
               />
             </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">
+              <label className="block">Description</label>
+              <input
+                name="Description"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                value={formData.Description}
+                onChange={(e) => handleStrInput(e)}
+              />
+            </div>
+            {props.signers && (
+              <SignersInput
+                onChange={handleSigners}
+                isReset={isReset}
+                required
+              />
+            )}
+            <div className="text-xs mt-2">
+              <label className="block">
+                Note<span className="text-red-500 text-[13px]">*</span>
+              </label>
+              <input
+                name="Note"
+                className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                value={formData.Note}
+                onChange={(e) => handleStrInput(e)}
+                required
+              />
+            </div>
+            {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">
+                  Time To Complete (Days)
+                  <span className="text-red-500 text-[13px]">*</span>
+                </label>
                 <input
-                  type="radio"
-                  value={"true"}
-                  name="SendinOrder"
-                  checked={formData.SendinOrder === "true"}
-                  className=""
-                  onChange={handleStrInput}
+                  type="number"
+                  name="TimeToCompleteDays"
+                  className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                  value={formData.TimeToCompleteDays}
+                  onChange={(e) => handleStrInput(e)}
+                  required
                 />
-                <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>
+            )}
+            {props.title !== "Sign Yourself" && (
+              <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"}
+                    className=""
+                    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 mt-3 gap-2 text-white">
+              <button
+                className={`${
+                  isSubmit && "cursor-progress"
+                } bg-[#1ab6ce] rounded-sm shadow-md text-[13px] font-semibold uppercase text-white py-1.5 px-2.5 focus:outline-none`}
+                type="submit"
+                disabled={isSubmit}
+              >
+                Next
+              </button>
+              <div
+                className="cursor-pointer bg-[#188ae2] rounded-sm shadow-md text-[13px] font-semibold uppercase text-white py-1.5 px-2.5 text-center ml-[2px] focus:outline-none"
+                onClick={() => handleReset()}
+              >
+                Reset
               </div>
             </div>
-          )}
-          <div className="flex items-center mt-3 gap-2 text-white">
-            <button
-              className={`${
-                isSubmit && "cursor-progress"
-              } bg-[#1ab6ce] rounded-sm shadow-md text-[13px] font-semibold uppercase text-white py-1.5 px-2.5 focus:outline-none`}
-              type="submit"
-              disabled={isSubmit}
-            >
-              Next
-            </button>
-            <div
-              className="cursor-pointer bg-[#188ae2] rounded-sm shadow-md text-[13px] font-semibold uppercase text-white py-1.5 px-2.5 text-center ml-[2px] focus:outline-none"
-              onClick={() => handleReset()}
-            >
-              Reset
-            </div>
-          </div>
-        </form>
+          </form>
+        </>
       )}
     </div>
   );

apps/OpenSign/src/pages/GuestLogin.js

@@ -6,9 +6,10 @@ import axios from "axios";
 import { isEnableSubscription, themeColor } from "../constant/const";
 import { contractUsers, getAppLogo } from "../constant/Utils";
 import logo from "../assets/images/logo.png";
+import { appInfo } from "../constant/appinfo";
 
 function GuestLogin() {
-  const { id, userMail, contactBookId, serverUrl } = useParams();
+  const { id, userMail, contactBookId, base64url } = useParams();
   let navigate = useNavigate();
   const [email, setEmail] = useState(userMail);
   const [OTP, setOTP] = useState("");
@@ -16,7 +17,8 @@ function GuestLogin() {
   const [loading, setLoading] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
   const [appLogo, setAppLogo] = useState("");
-
+  const [documentId, setDocumentId] = useState(id);
+  const [contactId, setContactId] = useState(contactBookId);
   useEffect(() => {
     handleServerUrl();
 
@@ -36,17 +38,24 @@ function GuestLogin() {
       setAppLogo(logo);
     }
 
-    //split url in array from '&'
     localStorage.clear();
-    const checkSplit = serverUrl.split("&");
-    const server = checkSplit[0];
-    const parseId = checkSplit[1];
-    const appName = checkSplit[2];
-
-    const newServer = server.replaceAll("%2F", "/");
+    const parseId = appInfo.appId;
+    const newServer = `${appInfo.baseUrl}/`;
+    const appName = appInfo.appname;
     localStorage.setItem("baseUrl", newServer);
     localStorage.setItem("parseAppId", parseId);
     localStorage.setItem("_appName", appName);
+    //this condition is used decode base64 to string and get userEmail,documentId, contactBoookId data.
+    if (!id) {
+      //`atob` function is used to decode base64
+      const decodebase64 = atob(base64url);
+      //split url in array from '/'
+      const checkSplit = decodebase64.split("/");
+      setDocumentId(checkSplit[0]);
+      setEmail(checkSplit[1]);
+      setContactId(checkSplit[2]);
+    }
+
     setIsLoading(false);
   };
 
@@ -74,7 +83,7 @@ function GuestLogin() {
         };
         let body = {
           email: email.toString(),
-          docId: id
+          docId: documentId
         };
         let Otp = await axios.post(url, body, { headers: headers });
 
@@ -137,7 +146,7 @@ function GuestLogin() {
           //save isGuestSigner true in local to handle login flow header in mobile view
           localStorage.setItem("isGuestSigner", true);
           setLoading(false);
-          navigate(`/load/recipientSignPdf/${id}/${contactBookId}`);
+          navigate(`/load/recipientSignPdf/${documentId}/${contactId}`);
         }
       } catch (error) {
         console.log("err ", error);

apps/OpenSign/src/pages/Login.js

@@ -422,7 +422,7 @@ function Login() {
       alert("Somenthing went wrong, please try again later!");
     }
   };
-  const thirdpartyLoginfn = async (sessionToken, billingDate) => {
+  const thirdpartyLoginfn = async (sessionToken) => {
     const baseUrl = localStorage.getItem("baseUrl");
     const parseAppId = localStorage.getItem("parseAppId");
     const res = await axios.get(baseUrl + "users/me", {
@@ -521,7 +521,7 @@ function Login() {
                       await Parse.Cloud.run("getUserDetails", {
                         email: currentUser.get("email")
                       }).then(
-                        (result) => {
+                        async (result) => {
                           let tenentInfo = [];
                           const results = [result];
                           if (results) {
@@ -571,7 +571,7 @@ function Login() {
                               setState({ ...state, loading: false });
                               navigate("/");
                             } else {
-                              extendedInfo.forEach((x) => {
+                              extendedInfo.forEach(async (x) => {
                                 if (x.TenantId) {
                                   let obj = {
                                     tenentId: x.TenantId.objectId,
@@ -608,8 +608,13 @@ function Login() {
                               setThirdpartyLoader(false);
                               setState({ ...state, loading: false });
                               if (isEnableSubscription) {
-                                if (billingDate) {
-                                  if (billingDate > new Date()) {
+                                const res = await fetchSubscription();
+                                const freeplan = res.plan;
+                                const billingDate = res.billingDate;
+                                if (freeplan === "freeplan") {
+                                  navigate(redirectUrl);
+                                } else if (billingDate) {
+                                  if (new Date(billingDate) > new Date()) {
                                     localStorage.removeItem("userDetails");
                                     navigate(redirectUrl);
                                   } else {
@@ -644,8 +649,13 @@ function Login() {
                             setState({ ...state, loading: false });
                             setThirdpartyLoader(false);
                             if (isEnableSubscription) {
-                              if (billingDate) {
-                                if (billingDate > new Date()) {
+                              const res = await fetchSubscription();
+                              const freeplan = res.plan;
+                              const billingDate = res.billingDate;
+                              if (freeplan === "freeplan") {
+                                navigate(redirectUrl);
+                              } else if (billingDate) {
+                                if (new Date(billingDate) > new Date()) {
                                   localStorage.removeItem("userDetails");
                                   // Redirect to the appropriate URL after successful login
                                   navigate(redirectUrl);

apps/OpenSign/src/pages/Opensigndrive.js

@@ -64,6 +64,7 @@ function Opensigndrive() {
   const sortingValue = ["Name", "Date"];
   const [isDontShow, setIsDontShow] = useState(false);
   const [tourData, setTourData] = useState();
+  const [showTourFirstTIme, setShowTourFirstTime] = useState(true);
   const orderName = {
     Ascending: "Ascending",
     Descending: "Descending",
@@ -134,7 +135,9 @@ function Opensigndrive() {
   //function for get all pdf document list
   const getPdfDocumentList = async (disbaleLoading) => {
     setLoading(true);
-    checkTourStatus();
+    if (showTourFirstTIme) {
+      checkTourStatus();
+    }
     if (!disbaleLoading) {
       setIsLoading({ isLoad: true, message: "This might take some time" });
     }
@@ -250,17 +253,23 @@ function Opensigndrive() {
   }, [loading, sortingOrder, selectedSort]); // Add/remove scroll event listener when loading changes
 
   //function for handle folder name path
-  const handleRoute = (index) => {
-    setPdfData([]);
+  const handleRoute = (index, folderData) => {
     setSkip(0);
+    // after onclick on route filter route from that index
     const updateFolderName = folderName.filter((x, i) => {
       if (i <= index) {
         return x;
       }
     });
     setFolderName(updateFolderName);
+    //get route details after onclick path of folder name
+    const getCurrentId = folderData[index];
     const getLastId = updateFolderName[updateFolderName.length - 1];
-    setDocId(getLastId.objectId);
+    //below condition is used to check if user click on same route which already open then don't change any thing
+    if (docId !== getCurrentId.objectId) {
+      setPdfData([]);
+      setDocId(getLastId.objectId);
+    }
   };
 
   //function for add new folder name
@@ -439,7 +448,7 @@ function Opensigndrive() {
       return (
         <React.Fragment key={id}>
           <span
-            onClick={() => handleRoute(id)}
+            onClick={() => handleRoute(id, folderData)}
             style={{
               color: "#a64b4e",
               fontWeight: "400",
@@ -474,6 +483,7 @@ function Opensigndrive() {
 
   const closeTour = async () => {
     setIsTour(false);
+    setShowTourFirstTime(false);
     if (isDontShow) {
       const serverUrl = localStorage.getItem("baseUrl");
       const appId = localStorage.getItem("parseAppId");

apps/OpenSign/src/pages/PdfRequestFiles.js

@@ -2,6 +2,7 @@ import React, { useState, useRef, useEffect } from "react";
 import { isEnableSubscription, themeColor } from "../constant/const";
 import { PDFDocument } from "pdf-lib";
 import "../styles/signature.css";
+import Parse from "parse";
 import axios from "axios";
 import loader from "../assets/images/loader2.gif";
 import { DndProvider } from "react-dnd";
@@ -24,7 +25,9 @@ import {
   radioButtonWidget,
   replaceMailVaribles,
   fetchSubscription,
-  convertPdfArrayBuffer
+  convertPdfArrayBuffer,
+  contractUsers,
+  handleSendOTP
 } from "../constant/Utils";
 import Loader from "../primitives/LoaderWithMsg";
 import HandleError from "../primitives/HandleError";
@@ -34,6 +37,7 @@ import PdfDeclineModal from "../primitives/PdfDeclineModal";
 import Title from "../components/Title";
 import DefaultSignature from "../components/pdf/DefaultSignature";
 import ModalUi from "../primitives/ModalUi";
+import VerifyEmail from "../components/pdf/VerifyEmail";
 
 function PdfRequestFiles() {
   const { docId } = useParams();
@@ -56,10 +60,12 @@ function PdfRequestFiles() {
   const imageRef = useRef(null);
   const [handleError, setHandleError] = useState();
   const [selectWidgetId, setSelectWidgetId] = useState("");
+  const [otpLoader, setOtpLoader] = useState(false);
   const [isLoading, setIsLoading] = useState({
     isLoad: true,
     message: "This might take some time"
   });
+
   const [defaultSignImg, setDefaultSignImg] = useState();
   const [isDocId, setIsDocId] = useState(false);
   const [pdfNewWidth, setPdfNewWidth] = useState();
@@ -98,7 +104,9 @@ function PdfRequestFiles() {
   const [currWidgetsDetails, setCurrWidgetsDetails] = useState({});
   const [isSubscriptionExpired, setIsSubscriptionExpired] = useState(false);
   const [extUserId, setExtUserId] = useState("");
-  const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
+  const [isEmailVerified, setIsEmailVerified] = useState(true);
+  const [isVerifyModal, setIsVerifyModal] = useState(false);
+  const [otp, setOtp] = useState("");
   const divRef = useRef(null);
   const isMobile = window.innerWidth < 767;
   const rowLevel =
@@ -138,10 +146,50 @@ function PdfRequestFiles() {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [divRef.current]);
 
-  async function checkIsSubscribed(extUserId) {
-    const res = await fetchSubscription(extUserId);
+  //function to use resend otp for email verification
+  const handleResend = async (e) => {
+    e.preventDefault();
+    setOtpLoader(true);
+    await handleSendOTP(Parse.User.current().getEmail());
+    setOtpLoader(false);
+    alert("OTP sent on you email");
+  };
+  //`handleVerifyEmail` function is used to verify email with otp
+  const handleVerifyEmail = async (e) => {
+    e.preventDefault();
+    setOtpLoader(true);
+    try {
+      const resEmail = await Parse.Cloud.run("verifyemail", {
+        otp: otp,
+        email: Parse.User.current().getEmail()
+      });
+      if (resEmail?.message === "Email is verified.") {
+        setIsEmailVerified(true);
+      } else if (resEmail?.message === "Email is already verified.") {
+        setIsEmailVerified(true);
+      }
+      setOtp("");
+      alert(resEmail.message);
+      setIsVerifyModal(false);
+      // handleRecipientSign();
+    } catch (error) {
+      alert(error.message);
+    } finally {
+      setOtpLoader(false);
+    }
+  };
+
+  //`handleVerifyBtn` function is used to send otp on user mail
+  const handleVerifyBtn = async () => {
+    setIsVerifyModal(true);
+    await handleSendOTP(Parse.User.current().getEmail());
+  };
+  async function checkIsSubscribed(extUserId, contactId) {
+    const isGuestSign = location.pathname.includes("/load/") || false;
+    const res = await fetchSubscription(extUserId, contactId, isGuestSign);
     const plan = res.plan;
-    const billingDate = res.billingDate;
+    const billingDate = res?.billingDate;
+    const status = res?.status;
     if (plan === "freeplan") {
       return true;
     } else if (billingDate) {
@@ -155,8 +203,15 @@ function PdfRequestFiles() {
           navigate(`/subscription`);
         }
       }
+    } else if (isGuestSign) {
+      if (status) {
+        setIsSubscribed(true);
+        return true;
+      } else {
+        setIsSubscriptionExpired(true);
+      }
     } else {
-      if (location.pathname.includes("/load/")) {
+      if (isGuestSign) {
         setIsSubscriptionExpired(true);
       } else {
         navigate(`/subscription`);
@@ -169,18 +224,6 @@ function PdfRequestFiles() {
     //getting document details
     const documentData = await contractDocument(documentId);
     if (documentData && documentData.length > 0) {
-      const url =
-        documentData[0] && (documentData[0]?.SignedUrl || documentData[0]?.URL);
-      //convert document url in array buffer format to use embed widgets in pdf using pdf-lib
-      const arrayBuffer = await convertPdfArrayBuffer(url);
-      if (arrayBuffer === "Error") {
-        setHandleError("Error: Something went wrong!");
-      } else {
-        setPdfArrayBuffer(arrayBuffer);
-      }
-      if (isEnableSubscription) {
-        await checkIsSubscribed(documentData[0]?.ExtUserPtr?.objectId);
-      }
       setExtUserId(documentData[0]?.ExtUserPtr?.objectId);
       const isCompleted =
         documentData[0].IsCompleted && documentData[0].IsCompleted;
@@ -196,6 +239,12 @@ function PdfRequestFiles() {
         );
 
       currUserId = getCurrentSigner[0] ? getCurrentSigner[0].objectId : "";
+      if (isEnableSubscription) {
+        await checkIsSubscribed(
+          documentData[0]?.ExtUserPtr?.objectId,
+          currUserId
+        );
+      }
       setSignerObjectId(currUserId);
       if (documentData[0].SignedUrl) {
         setPdfUrl(documentData[0].SignedUrl);
@@ -224,6 +273,33 @@ function PdfRequestFiles() {
         setExpiredDate(expireDateFormat);
       }
 
+      const isGuestSign = location.pathname.includes("/load/");
+      if (
+        !isGuestSign &&
+        !isCompleted &&
+        !declined &&
+        currDate < expireUpdateDate
+      ) {
+        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 (documentData.length > 0) {
         const checkDocIdExist =
           documentData[0].AuditTrail &&
@@ -257,6 +333,7 @@ function PdfRequestFiles() {
           ) {
             const params = {
               event: "viewed",
+              contactId: currUserId,
               body: {
                 objectId: documentData?.[0].objectId,
                 file: documentData?.[0]?.SignedUrl || documentData?.[0]?.URL,
@@ -395,141 +472,130 @@ function PdfRequestFiles() {
       });
   };
 
-  // const checkSendInOrder = () => {
-  //   if (sendInOrder) {
-  //     const index = pdfDetails?.[0].Signers.findIndex(
-  //       (x) => x.Email === jsonSender.email
-  //     );
-  //     const newIndex = index - 1;
-  //     if (newIndex !== -1) {
-  //       const user = pdfDetails?.[0].Signers[newIndex];
-  //       const isPrevUserSigned =
-  //         pdfDetails?.[0].AuditTrail &&
-  //         pdfDetails?.[0].AuditTrail.some(
-  //           (x) =>
-  //             x.UserPtr.objectId === user.objectId && x.Activity === "Signed"
-  //         );
-  //       if (isPrevUserSigned) {
-  //         return true;
-  //       } else {
-  //         return false;
-  //       }
-  //     } else {
-  //       return true;
-  //     }
-  //   } else {
-  //     return true;
-  //   }
-  // };
   //function for embed signature or image url in pdf
   async function embedWidgetsData() {
-    // const validateSigning = checkSendInOrder();
-    // if (validateSigning) {
-    const checkUser = signerPos.filter(
-      (data) => data.signerObjId === signerObjectId
-    );
-    if (checkUser && checkUser.length > 0) {
-      let checkboxExist,
-        requiredRadio,
-        showAlert = false,
-        widgetKey,
-        radioExist,
-        requiredCheckbox;
+    try {
+      const checkUser = signerPos.filter(
+        (data) => data.signerObjId === signerObjectId
+      );
+      if (checkUser && checkUser.length > 0) {
+        let checkboxExist,
+          requiredRadio,
+          showAlert = false,
+          widgetKey,
+          radioExist,
+          requiredCheckbox,
+          pageNumber; // `pageNumber` is used to check on which page user did not fill widget's data then change current pageNumber and show tour message on that page
 
-      for (let i = 0; i < checkUser[0].placeHolder.length; i++) {
-        for (let j = 0; j < checkUser[0].placeHolder[i].pos.length; j++) {
-          checkboxExist =
-            checkUser[0].placeHolder[i].pos[j].type === "checkbox";
-          radioExist =
-            checkUser[0].placeHolder[i].pos[j].type === radioButtonWidget;
-          if (checkboxExist) {
-            requiredCheckbox = checkUser[0].placeHolder[i].pos.filter(
-              (position) =>
-                !position.options?.isReadOnly && position.type === "checkbox"
-            );
-
-            if (requiredCheckbox && requiredCheckbox.length > 0) {
-              for (let i = 0; i < requiredCheckbox.length; i++) {
-                const minCount =
-                  requiredCheckbox[i].options?.validation?.minRequiredCount;
-                const parseMin = minCount && parseInt(minCount);
-                const maxCount =
-                  requiredCheckbox[i].options?.validation?.maxRequiredCount;
-                const parseMax = maxCount && parseInt(maxCount);
-                const response = requiredCheckbox[i].options?.response?.length;
-                const defaultValue =
-                  requiredCheckbox[i].options?.defaultValue?.length;
-                if (parseMin === 0 && parseMax === 0) {
-                  if (!showAlert) {
-                    showAlert = false;
-                    setminRequiredCount(null);
+        for (let i = 0; i < checkUser[0].placeHolder.length; i++) {
+          for (let j = 0; j < checkUser[0].placeHolder[i].pos.length; j++) {
+            //get current page
+            const updatePage = checkUser[0].placeHolder[i]?.pageNumber;
+            //checking checbox type widget
+            checkboxExist =
+              checkUser[0].placeHolder[i].pos[j].type === "checkbox";
+            //checking radio button type widget
+            radioExist =
+              checkUser[0].placeHolder[i].pos[j].type === radioButtonWidget;
+            //condition to check checkbox widget exist or not
+            if (checkboxExist) {
+              //get all required type checkbox
+              requiredCheckbox = checkUser[0].placeHolder[i].pos.filter(
+                (position) =>
+                  !position.options?.isReadOnly && position.type === "checkbox"
+              );
+              //if required type checkbox data exit then check user checked all checkbox or some checkbox remain to check
+              //also validate to minimum and maximum required checkbox
+              if (requiredCheckbox && requiredCheckbox.length > 0) {
+                for (let i = 0; i < requiredCheckbox.length; i++) {
+                  //get minimum required count if  exit
+                  const minCount =
+                    requiredCheckbox[i].options?.validation?.minRequiredCount;
+                  const parseMin = minCount && parseInt(minCount);
+                  //get maximum required count if  exit
+                  const maxCount =
+                    requiredCheckbox[i].options?.validation?.maxRequiredCount;
+                  const parseMax = maxCount && parseInt(maxCount);
+                  //in `response` variable is used to get how many checkbox checked by user
+                  const response =
+                    requiredCheckbox[i].options?.response?.length;
+                  //in `defaultValue` variable is used to get how many checkbox checked by default
+                  const defaultValue =
+                    requiredCheckbox[i].options?.defaultValue?.length;
+                  //condition to check  parseMin  and parseMax greater than 0  then consider it as a required check box
+                  if (
+                    parseMin > 0 &&
+                    parseMax > 0 &&
+                    !response &&
+                    !defaultValue &&
+                    !showAlert
+                  ) {
+                    showAlert = true;
+                    widgetKey = requiredCheckbox[i].key;
+                    pageNumber = updatePage;
+                    setminRequiredCount(parseMin);
                   }
-                } else if (parseMin === 0 && parseMax > 0) {
-                  if (!showAlert) {
-                    showAlert = false;
-                    setminRequiredCount(null);
-                  }
-                } else if (!response) {
-                  if (!defaultValue) {
+                  //else condition to validate minimum required checkbox
+                  else if (parseMin > 0 && (parseMin > response || !response)) {
                     if (!showAlert) {
                       showAlert = true;
                       widgetKey = requiredCheckbox[i].key;
+                      pageNumber = updatePage;
+
                       setminRequiredCount(parseMin);
                     }
                   }
-                } else if (parseMin > 0 && parseMin > response) {
-                  if (!showAlert) {
-                    showAlert = true;
-                    widgetKey = requiredCheckbox[i].key;
-                    setminRequiredCount(parseMin);
-                  }
                 }
               }
             }
-          } else if (radioExist) {
-            requiredRadio = checkUser[0].placeHolder[i].pos.filter(
-              (position) =>
-                !position.options?.isReadOnly &&
-                position.type === radioButtonWidget
-            );
-            if (requiredRadio && requiredRadio?.length > 0) {
-              let checkSigned;
-              for (let i = 0; i < requiredRadio?.length; i++) {
-                checkSigned = requiredRadio[i]?.options.response;
-                if (!checkSigned) {
-                  let checkDefaultSigned =
-                    requiredRadio[i]?.options.defaultValue;
-                  if (!checkDefaultSigned) {
-                    if (!showAlert) {
+            //condition to check radio widget exist or not
+            else if (radioExist) {
+              //get all required type radio button
+              requiredRadio = checkUser[0].placeHolder[i].pos.filter(
+                (position) =>
+                  !position.options?.isReadOnly &&
+                  position.type === radioButtonWidget
+              );
+              //if required type radio data exit then check user checked all radio button or some radio remain to check
+              if (requiredRadio && requiredRadio?.length > 0) {
+                let checkSigned;
+                for (let i = 0; i < requiredRadio?.length; i++) {
+                  checkSigned = requiredRadio[i]?.options?.response;
+                  if (!checkSigned) {
+                    let checkDefaultSigned =
+                      requiredRadio[i]?.options?.defaultValue;
+                    if (!checkDefaultSigned && !showAlert) {
                       showAlert = true;
                       widgetKey = requiredRadio[i].key;
+                      pageNumber = updatePage;
                       setminRequiredCount(null);
                     }
                   }
                 }
               }
             }
-          } else {
-            const requiredWidgets = checkUser[0].placeHolder[i].pos.filter(
-              (position) =>
-                position.options?.status === "required" &&
-                position.type !== radioButtonWidget &&
-                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) {
+            //else condition to check all type widget data fill or not except checkbox and radio button
+            else {
+              //get all required type widgets except checkbox and radio
+              const requiredWidgets = checkUser[0].placeHolder[i].pos.filter(
+                (position) =>
+                  position.options?.status === "required" &&
+                  position.type !== radioButtonWidget &&
+                  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;
+                    if (!checkSignUrl) {
+                      let checkDefaultSigned =
+                        requiredWidgets[i]?.options?.defaultValue;
+                      if (!checkDefaultSigned && !showAlert) {
                         showAlert = true;
                         widgetKey = requiredWidgets[i].key;
+                        pageNumber = updatePage;
                         setminRequiredCount(null);
                       }
                     }
@@ -538,212 +604,276 @@ function PdfRequestFiles() {
               }
             }
           }
-        }
-      }
-
-      if (checkboxExist && requiredCheckbox && showAlert) {
-        setUnSignedWidgetId(widgetKey);
-        setWidgetsTour(true);
-      } else if (radioExist && showAlert) {
-        setUnSignedWidgetId(widgetKey);
-        setWidgetsTour(true);
-      } else if (showAlert) {
-        setUnSignedWidgetId(widgetKey);
-        setWidgetsTour(true);
-      } else {
-        setIsUiLoading(true);
-        const pngUrl = checkUser[0].placeHolder;
-        // Load a PDFDocument from the existing PDF bytes
-        const existingPdfBytes = pdfArrayBuffer;
-        const pdfDoc = await PDFDocument.load(existingPdfBytes, {
-          ignoreEncryption: true
-        });
-        const isSignYourSelfFlow = false;
-        const extUserPtr = pdfDetails[0].ExtUserPtr;
-        const HeaderDocId = extUserPtr?.HeaderDocId;
-        //embed document's object id to all pages in pdf document
-        if (!HeaderDocId) {
-          if (!isDocId) {
-            await embedDocId(pdfDoc, documentId, allPages);
+          //when showAlert is true then break the loop and show alert to fill required data in widgets
+          if (showAlert) {
+            break;
           }
         }
-        //embed multi signature in pdf
-        const pdfBytes = await multiSignEmbed(
-          pngUrl,
-          pdfDoc,
-          pdfOriginalWidth,
-          isSignYourSelfFlow,
-          containerWH
-        );
-        //get ExistUserPtr object id of user class to get tenantDetails
-        const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
-        //function for call to embed signature in pdf and get digital signature pdf
-        try {
-          const res = await signPdfFun(
-            pdfBytes,
-            documentId,
-            signerObjectId,
-            setIsAlert,
-            objectId,
-            isSubscribed
-          );
-          if (res && res.status === "success") {
-            setPdfUrl(res.data);
-            setIsSigned(true);
-            setSignedSigners([]);
-            setUnSignedSigners([]);
-            getDocumentDetails();
-            const index = pdfDetails?.[0].Signers.findIndex(
-              (x) => x.Email === jsonSender.email
-            );
-            const newIndex = index + 1;
-            const user = pdfDetails?.[0].Signers[newIndex];
-            if (user) {
-              setIsCompleted({
-                isModal: true,
-                message:
-                  "You have successfully signed the document. You can download or print a copy of the partially signed document. A copy of the digitally signed document will be sent to the owner over email once it is signed by all signers."
-              });
+        if (checkboxExist && requiredCheckbox && showAlert) {
+          setUnSignedWidgetId(widgetKey);
+          setPageNumber(pageNumber);
+          setWidgetsTour(true);
+        } else if (radioExist && showAlert) {
+          setUnSignedWidgetId(widgetKey);
+          setPageNumber(pageNumber);
+          setWidgetsTour(true);
+        } else if (showAlert) {
+          setUnSignedWidgetId(widgetKey);
+          setPageNumber(pageNumber);
+          setWidgetsTour(true);
+        } else {
+          setIsUiLoading(true);
+
+          const pngUrl = checkUser[0].placeHolder;
+          let pdfArrBuffer;
+          //`contractDocument` function used to get updated SignedUrl
+          //resolved issue of sign document by multiple signers simultaneously
+          const documentData = await contractDocument(documentId);
+          if (documentData && documentData.length > 0) {
+            const url = documentData[0]?.SignedUrl || documentData[0]?.URL;
+            //convert document url in array buffer format to use embed widgets in pdf using pdf-lib
+            const arrayBuffer = await convertPdfArrayBuffer(url);
+            if (arrayBuffer === "Error") {
+              setHandleError("Error: invalid document!");
+            } else {
+              pdfArrBuffer = arrayBuffer;
             }
-            if (sendInOrder) {
-              const requestBody = pdfDetails?.[0]?.RequestBody;
-              const requestSubject = pdfDetails?.[0]?.RequestSubject;
-              if (user) {
-                const expireDate = pdfDetails?.[0].ExpiryDate.iso;
-                const newDate = new Date(expireDate);
-                const localExpireDate = newDate.toLocaleDateString("en-US", {
-                  day: "numeric",
-                  month: "long",
-                  year: "numeric"
-                });
-                let senderEmail = pdfDetails?.[0].ExtUserPtr.Email;
-                let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
-                const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`;
+          } else if (
+            documentData === "Error: Something went wrong!" ||
+            (documentData.result && documentData.result.error)
+          ) {
+            setHandleError("Error: Something went wrong!");
+          } else {
+            setHandleError("Document not Found!");
+          }
 
-                try {
-                  const imgPng =
-                    "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
-                  let url = `${localStorage.getItem(
-                    "baseUrl"
-                  )}functions/sendmailv3/`;
-                  const headers = {
-                    "Content-Type": "application/json",
-                    "X-Parse-Application-Id":
-                      localStorage.getItem("parseAppId"),
-                    sessionToken: localStorage.getItem("accesstoken")
-                  };
-                  const serverUrl = localStorage.getItem("baseUrl");
-                  const newServer = serverUrl.replaceAll("/", "%2F");
-                  const objectId = user.objectId;
-                  const serverParams = `${newServer}&${localStorage.getItem(
-                    "parseAppId"
-                  )}&${localStorage.getItem("_appName")}`;
-                  const hostUrl = window.location.origin;
-                  let signPdf = `${hostUrl}/login/${pdfDetails?.[0].objectId}/${user.Email}/${objectId}/${serverParams}`;
-                  const openSignUrl = "https://www.opensignlabs.com/contact-us";
-                  const orgName = pdfDetails[0]?.ExtUserPtr.Company
-                    ? pdfDetails[0].ExtUserPtr.Company
-                    : "";
-                  const themeBGcolor = themeColor;
-                  let replaceVar;
-                  if (
-                    requestBody &&
-                    requestSubject &&
-                    (!isEnableSubscription || isSubscribed)
-                  ) {
-                    const replacedRequestBody = requestBody.replace(/"/g, "'");
-                    const htmlReqBody =
-                      "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
-                      replacedRequestBody +
-                      "</body> </html>";
-
-                    const variables = {
-                      document_title: pdfDetails?.[0].Name,
-                      sender_name: senderName,
-                      sender_mail: senderEmail,
-                      sender_phone: senderPhone,
-                      receiver_name: user.Name,
-                      receiver_email: user.Email,
-                      receiver_phone: user.Phone,
-                      expiry_date: localExpireDate,
-                      company_name: orgName,
-                      signing_url: `<a href=${signPdf}>Sign here</a>`
-                    };
-                    replaceVar = replaceMailVaribles(
-                      requestSubject,
-                      htmlReqBody,
-                      variables
-                    );
-                  }
-
-                  let params = {
-                    extUserId: extUserId,
-                    recipient: user.Email,
-                    subject: requestSubject
-                      ? replaceVar?.subject
-                      : `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign ${pdfDetails?.[0].Name}`,
-                    from: senderEmail,
-                    html: requestBody
-                      ? replaceVar?.body
-                      : "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /> </head>   <body> <div style='background-color: #f5f5f5; padding: 20px'=> <div   style=' box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><img src=" +
-                        imgPng +
-                        " height='50' style='padding: 20px,width:170px,height:40px' /></div>  <div  style=' padding: 2px;font-family: system-ui;background-color:" +
-                        themeBGcolor +
-                        ";'><p style='font-size: 20px;font-weight: 400;color: white;padding-left: 20px;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px;   margin-bottom: 10px;'> " +
-                        pdfDetails?.[0].ExtUserPtr.Name +
-                        " has requested you to review and sign <strong> " +
-                        pdfDetails?.[0].Name +
-                        "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
-                        senderEmail +
-                        "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
-                        orgName +
-                        "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
-                        localExpireDate +
-                        "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
-                        signPdf +
-                        "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
-                        senderEmail +
-                        " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™   <a href= " +
-                        openSignUrl +
-                        " target=_blank>here</a>.</p> </div></div></body> </html>"
-                  };
-                  await axios.post(url, params, {
-                    headers: headers
-                  });
-                } catch (error) {
-                  console.log("error", error);
-                }
+          // Load a PDFDocument from the existing PDF bytes
+          const existingPdfBytes = pdfArrBuffer;
+          try {
+            const pdfDoc = await PDFDocument.load(existingPdfBytes);
+            const isSignYourSelfFlow = false;
+            const extUserPtr = pdfDetails[0].ExtUserPtr;
+            const HeaderDocId = extUserPtr?.HeaderDocId;
+            //embed document's object id to all pages in pdf document
+            if (!HeaderDocId) {
+              if (!isDocId) {
+                await embedDocId(pdfDoc, documentId, allPages);
               }
             }
-          } else {
-            setIsAlert({
-              isShow: true,
-              alertMessage: "something went wrong"
-            });
+            //embed multi signature in pdf
+            const pdfBytes = await multiSignEmbed(
+              pngUrl,
+              pdfDoc,
+              pdfOriginalWidth,
+              isSignYourSelfFlow,
+              containerWH
+            );
+            //get ExistUserPtr object id of user class to get tenantDetails
+            const objectId = pdfDetails?.[0]?.ExtUserPtr?.UserId?.objectId;
+            //get ExistUserPtr email to get userDetails
+            const currentUserEmail = pdfDetails?.[0]?.ExtUserPtr?.Email;
+            const res = await contractUsers(currentUserEmail);
+            let activeMailAdapter = "";
+            if (res === "Error: Something went wrong!") {
+              setHandleError("Error: Something went wrong!");
+              setIsLoading({
+                isLoad: false
+              });
+            } else if (!res || res?.length === 0) {
+              activeMailAdapter = "";
+            } else if (res[0] && res.length) {
+              activeMailAdapter = res[0]?.active_mail_adapter;
+            }
+            //function for call to embed signature in pdf and get digital signature pdf
+            try {
+              const res = await signPdfFun(
+                pdfBytes,
+                documentId,
+                signerObjectId,
+                setIsAlert,
+                objectId,
+                isSubscribed,
+                activeMailAdapter,
+                pngUrl
+              );
+              if (res && res.status === "success") {
+                setPdfUrl(res.data);
+                setIsSigned(true);
+                setSignedSigners([]);
+                setUnSignedSigners([]);
+                getDocumentDetails();
+                const index = pdfDetails?.[0].Signers.findIndex(
+                  (x) => x.Email === jsonSender.email
+                );
+                const newIndex = index + 1;
+                const user = pdfDetails?.[0].Signers[newIndex];
+                if (user) {
+                  setIsCompleted({
+                    isModal: true,
+                    message:
+                      "You have successfully signed the document. You can download or print a copy of the partially signed document. A copy of the digitally signed document will be sent to the owner over email once it is signed by all signers."
+                  });
+                }
+                if (sendInOrder) {
+                  const requestBody = pdfDetails?.[0]?.RequestBody;
+                  const requestSubject = pdfDetails?.[0]?.RequestSubject;
+                  if (user) {
+                    const expireDate = pdfDetails?.[0].ExpiryDate.iso;
+                    const newDate = new Date(expireDate);
+                    const localExpireDate = newDate.toLocaleDateString(
+                      "en-US",
+                      {
+                        day: "numeric",
+                        month: "long",
+                        year: "numeric"
+                      }
+                    );
+                    let senderEmail = pdfDetails?.[0].ExtUserPtr.Email;
+                    let senderPhone = pdfDetails?.[0]?.ExtUserPtr?.Phone;
+                    const senderName = `${pdfDetails?.[0].ExtUserPtr.Name}`;
+
+                    try {
+                      const imgPng =
+                        "https://qikinnovation.ams3.digitaloceanspaces.com/logo.png";
+                      let url = `${localStorage.getItem(
+                        "baseUrl"
+                      )}functions/sendmailv3/`;
+                      const headers = {
+                        "Content-Type": "application/json",
+                        "X-Parse-Application-Id":
+                          localStorage.getItem("parseAppId"),
+                        sessionToken: localStorage.getItem("accesstoken")
+                      };
+                      const objectId = user.objectId;
+                      const hostUrl = window.location.origin;
+                      //encode this url value `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}` to base64 using `btoa` function
+                      const encodeBase64 = btoa(
+                        `${pdfDetails?.[0].objectId}/${user.Email}/${objectId}`
+                      );
+                      let signPdf = `${hostUrl}/login/${encodeBase64}`;
+                      const openSignUrl =
+                        "https://www.opensignlabs.com/contact-us";
+                      const orgName = pdfDetails[0]?.ExtUserPtr.Company
+                        ? pdfDetails[0].ExtUserPtr.Company
+                        : "";
+                      const themeBGcolor = themeColor;
+                      let replaceVar;
+                      if (
+                        requestBody &&
+                        requestSubject &&
+                        (!isEnableSubscription || isSubscribed)
+                      ) {
+                        const replacedRequestBody = requestBody.replace(
+                          /"/g,
+                          "'"
+                        );
+                        const htmlReqBody =
+                          "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /></head><body>" +
+                          replacedRequestBody +
+                          "</body> </html>";
+
+                        const variables = {
+                          document_title: pdfDetails?.[0].Name,
+                          sender_name: senderName,
+                          sender_mail: senderEmail,
+                          sender_phone: senderPhone,
+                          receiver_name: user.Name,
+                          receiver_email: user.Email,
+                          receiver_phone: user.Phone,
+                          expiry_date: localExpireDate,
+                          company_name: orgName,
+                          signing_url: `<a href=${signPdf}>Sign here</a>`
+                        };
+                        replaceVar = replaceMailVaribles(
+                          requestSubject,
+                          htmlReqBody,
+                          variables
+                        );
+                      }
+
+                      let params = {
+                        mailProvider: activeMailAdapter,
+                        extUserId: extUserId,
+                        recipient: user.Email,
+                        subject: requestSubject
+                          ? replaceVar?.subject
+                          : `${pdfDetails?.[0].ExtUserPtr.Name} has requested you to sign "${pdfDetails?.[0].Name}"`,
+                        from: senderEmail,
+                        html: requestBody
+                          ? replaceVar?.body
+                          : "<html><head><meta http-equiv='Content-Type' content='text/html; charset=UTF-8' /> </head>   <body> <div style='background-color: #f5f5f5; padding: 20px'=> <div   style=' box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 12px;background: white;padding-bottom: 20px;'> <div style='padding:10px 10px 0 10px'><img src=" +
+                            imgPng +
+                            " height='50' style='padding: 20px,width:170px,height:40px' /></div>  <div  style=' padding: 2px;font-family: system-ui;background-color:" +
+                            themeBGcolor +
+                            ";'><p style='font-size: 20px;font-weight: 400;color: white;padding-left: 20px;' > Digital Signature Request</p></div><div><p style='padding: 20px;font-family: system-ui;font-size: 14px;   margin-bottom: 10px;'> " +
+                            pdfDetails?.[0].ExtUserPtr.Name +
+                            " has requested you to review and sign <strong> " +
+                            pdfDetails?.[0].Name +
+                            "</strong>.</p><div style='padding: 5px 0px 5px 25px;display: flex;flex-direction: row;justify-content: space-around;'><table> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Sender</td> <td> </td> <td  style='color:#626363;font-weight:bold'>" +
+                            senderEmail +
+                            "</td></tr><tr><td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Organization</td> <td> </td><td style='color:#626363;font-weight:bold'> " +
+                            orgName +
+                            "</td></tr> <tr> <td style='font-weight:bold;font-family:sans-serif;font-size:15px'>Expires on</td><td> </td> <td style='color:#626363;font-weight:bold'>" +
+                            localExpireDate +
+                            "</td></tr><tr> <td></td> <td> </td></tr></table> </div> <div style='margin-left:70px'><a href=" +
+                            signPdf +
+                            "> <button style='padding: 12px 12px 12px 12px;background-color: #d46b0f;color: white;  border: 0px;box-shadow: rgba(0, 0, 0, 0.05) 0px 6px 24px 0px,rgba(0, 0, 0, 0.08) 0px 0px 0px 1px;font-weight:bold;margin-top:30px'>Sign here</button></a> </div> <div style='display: flex; justify-content: center;margin-top: 10px;'> </div></div></div><div><p> This is an automated email from OpenSign™. For any queries regarding this email, please contact the sender " +
+                            senderEmail +
+                            " directly.If you think this email is inappropriate or spam, you may file a complaint with OpenSign™   <a href= " +
+                            openSignUrl +
+                            " target=_blank>here</a>.</p> </div></div></body> </html>"
+                      };
+                      await axios.post(url, params, {
+                        headers: headers
+                      });
+                    } catch (error) {
+                      console.log("error", error);
+                    }
+                  }
+                }
+              } else {
+                setIsAlert({
+                  isShow: true,
+                  alertMessage: "something went wrong"
+                });
+              }
+            } catch (err) {
+              setIsAlert({
+                isShow: true,
+                alertMessage: "something went wrong"
+              });
+            }
+          } 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 request signing", err);
+              setIsAlert({
+                isShow: true,
+                alertMessage: `Something went wrong.`
+              });
+            }
           }
-        } catch (err) {
-          setIsAlert({
-            isShow: true,
-            alertMessage: "something went wrong"
-          });
         }
+        setIsSignPad(false);
+      } else {
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong"
+        });
       }
-      setIsSignPad(false);
-    } else {
+    } catch (err) {
+      console.log("err in embedsign", err);
+      setIsUiLoading(false);
       setIsAlert({
         isShow: true,
-        alertMessage: "something went wrong"
+        alertMessage: "something went wrong, please try again later."
       });
     }
-
-    // }
-    // else {
-    //   setIsAlert({
-    //     isShow: true,
-    //     alertMessage:
-    //       "Please wait for your turn to sign this document, as it has been set up by the creator to be signed in a specific order; you'll be notified when it's your turn."
-    //   });
-    // }
   }
 
   //function for update TourStatus
@@ -1123,6 +1253,18 @@ function PdfRequestFiles() {
                   headMsg="Document Expired!"
                   bodyMssg={`This document expired on ${expiredDate} and is no longer available to sign.`}
                 />
+                {!isEmailVerified && (
+                  <VerifyEmail
+                    isVerifyModal={isVerifyModal}
+                    setIsVerifyModal={setIsVerifyModal}
+                    handleVerifyEmail={handleVerifyEmail}
+                    setOtp={setOtp}
+                    otp={otp}
+                    otpLoader={otpLoader}
+                    handleVerifyBtn={handleVerifyBtn}
+                    handleResend={handleResend}
+                  />
+                )}
 
                 <ModalUi
                   headerColor={defaultSignImg ? themeColor : "#dc3545"}
@@ -1190,7 +1332,12 @@ function PdfRequestFiles() {
                 </ModalUi>
                 {/* this component used to render all pdf pages in left side */}
                 <RenderAllPdfPage
-                  signPdfUrl={pdfDetails[0] && pdfDetails[0].SignedUrl}
+                  signerPos={signerPos}
+                  signerObjectId={signerObjectId}
+                  signPdfUrl={
+                    pdfDetails[0] &&
+                    (pdfDetails[0]?.SignedUrl || pdfDetails[0]?.URL)
+                  }
                   allPages={allPages}
                   setAllPages={setAllPages}
                   setPageNumber={setPageNumber}

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -123,6 +123,7 @@ function PlaceHolderSign() {
   const [requestSubject, setRequestSubject] = useState("");
   const [requestBody, setRequestBody] = useState("");
   const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
+  const [activeMailAdapter, setActiveMailAdapter] = useState("");
   const [isAlreadyPlace, setIsAlreadyPlace] = useState({
     status: false,
     message: ""
@@ -172,15 +173,6 @@ function PlaceHolderSign() {
       : rowLevel?.objectId && rowLevel.objectId;
 
   const documentId = docId ? docId : objectId && objectId;
-  const senderUser =
-    localStorage.getItem(
-      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-    ) &&
-    localStorage.getItem(
-      `Parse/${localStorage.getItem("parseAppId")}/currentUser`
-    );
-  const jsonSender = JSON.parse(senderUser);
-
   useEffect(() => {
     if (documentId) {
       getDocumentDetails();
@@ -209,16 +201,16 @@ function PlaceHolderSign() {
 
             setDefaultBody(defaultRequestBody);
             setDefaultSubject(
-              `{{sender_name}} has requested you to sign {{document_title}}`
+              `{{sender_name}} has requested you to sign "{{document_title}}"`
             );
           } else {
             setRequestBody(defaultRequestBody);
             setRequestSubject(
-              `{{sender_name}} has requested you to sign {{document_title}}`
+              `{{sender_name}} has requested you to sign "{{document_title}}"`
             );
             setDefaultBody(defaultRequestBody);
             setDefaultSubject(
-              `{{sender_name}}has requested you to sign {{document_title}}`
+              `{{sender_name}}has requested you to sign "{{document_title}}"`
             );
           }
         }
@@ -405,11 +397,22 @@ function PlaceHolderSign() {
       };
       setIsLoading(loadObj);
     }
-    const res = await contractUsers(jsonSender.email);
-    if (res[0] && res.length) {
+    const currentUserEmail = documentData[0]?.ExtUserPtr?.Email;
+    const res = await contractUsers(currentUserEmail);
+    if (res === "Error: Something went wrong!") {
+      const loadObj = {
+        isLoad: false
+      };
+      setHandleError("Error: Something went wrong!");
+      setIsLoading(loadObj);
+    } else if (res[0] && res.length) {
+      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
@@ -422,12 +425,6 @@ function PlaceHolderSign() {
         isLoad: false
       };
       setIsLoading(loadObj);
-    } else if (res === "Error: Something went wrong!") {
-      const loadObj = {
-        isLoad: false
-      };
-      setHandleError("Error: Something went wrong!");
-      setIsLoading(loadObj);
     } else if (res.length === 0) {
       setHandleError("No Data Found!");
       const loadObj = {
@@ -836,11 +833,11 @@ function PlaceHolderSign() {
       return pdfDetails[0].URL;
     }
   };
-
   const alertSendEmail = async () => {
     const filterPrefill = signerPos?.filter((data) => data.Role !== "prefill");
     const getPrefill = signerPos?.filter((data) => data.Role === "prefill");
     let isLabel = false;
+    //condition is used to check text widget data is empty or have response
     if (getPrefill && getPrefill.length > 0) {
       const prefillPlaceholder = getPrefill[0].placeHolder;
       if (prefillPlaceholder) {
@@ -851,6 +848,29 @@ function PlaceHolderSign() {
         });
       }
     }
+    let isSignatureExist = true; // variable is used to check a signature widget exit or not then execute other code
+    //for loop is used to check signature widget exist or not
+    for (let item of filterPrefill) {
+      let signatureExist = false; // Reset for each iteration
+      for (let x of item.placeHolder) {
+        if (!signatureExist) {
+          const typeExist = x.pos.some((data) => data?.type);
+          if (typeExist) {
+            signatureExist = x.pos.some((data) => data?.type === "signature");
+          } else {
+            signatureExist = x.pos.some((data) => !data.isStamp);
+          }
+        }
+      }
+      if (!signatureExist) {
+        isSignatureExist = false;
+        const alert = {
+          mssg: "sure",
+          alert: true
+        };
+        setIsSendAlert(alert);
+      }
+    }
 
     if (getPrefill && isLabel) {
       const alert = {
@@ -858,23 +878,26 @@ function PlaceHolderSign() {
         alert: true
       };
       setIsSendAlert(alert);
-    } else if (filterPrefill.length === signersdata.length) {
-      const IsSignerNotExist = filterPrefill?.filter((x) => !x.signerObjId);
-      if (IsSignerNotExist && IsSignerNotExist?.length > 0) {
-        setSignerExistModal(true);
-        setSelectWidgetId(IsSignerNotExist[0]?.placeHolder?.[0]?.pos?.[0]?.key);
+    } else if (isSignatureExist) {
+      if (filterPrefill.length === signersdata.length) {
+        const IsSignerNotExist = filterPrefill?.filter((x) => !x.signerObjId);
+        if (IsSignerNotExist && IsSignerNotExist?.length > 0) {
+          setSignerExistModal(true);
+          setSelectWidgetId(
+            IsSignerNotExist[0]?.placeHolder?.[0]?.pos?.[0]?.key
+          );
+        } else {
+          saveDocumentDetails();
+        }
       } else {
-        saveDocumentDetails();
+        const alert = {
+          mssg: "sure",
+          alert: true
+        };
+        setIsSendAlert(alert);
       }
-    } else {
-      const alert = {
-        mssg: "sure",
-        alert: true
-      };
-      setIsSendAlert(alert);
     }
   };
-
   //function to use save placeholder details in contracts_document
   const saveDocumentDetails = async () => {
     setIsUiLoading(true);
@@ -973,15 +996,13 @@ function PlaceHolderSign() {
     const shareLinkList = [];
     let signerMail = signersdata;
     for (let i = 0; i < signerMail.length; i++) {
-      const serverUrl = localStorage.getItem("baseUrl");
-      const newServer = serverUrl.replaceAll("/", "%2F");
       const objectId = signerMail[i].objectId;
-      const serverParams = `${newServer}&${localStorage.getItem(
-        "parseAppId"
-      )}&${localStorage.getItem("_appName")}`;
-
       const hostUrl = window.location.origin;
-      let signPdf = `${hostUrl}/login/${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}/${serverParams}`;
+      //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}`
+      );
+      let signPdf = `${hostUrl}/login/${encodeBase64}`;
       shareLinkList.push({ signerEmail: signerMail[i].Email, url: signPdf });
     }
     return shareLinkList.map((data, ind) => {
@@ -1055,15 +1076,13 @@ function PlaceHolderSign() {
           "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
           sessionToken: localStorage.getItem("accesstoken")
         };
-        const serverUrl = localStorage.getItem("baseUrl");
-        const newServer = serverUrl.replaceAll("/", "%2F");
         const objectId = signerMail[i].objectId;
-        const serverParams = `${newServer}&${localStorage.getItem(
-          "parseAppId"
-        )}&${localStorage.getItem("_appName")}`;
-
         const hostUrl = window.location.origin;
-        let signPdf = `${hostUrl}/login/${pdfDetails?.[0].objectId}/${signerMail[i].Email}/${objectId}/${serverParams}`;
+        //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}`
+        );
+        let signPdf = `${hostUrl}/login/${encodeBase64}`;
         const openSignUrl = "https://www.opensignlabs.com/";
         const orgName = pdfDetails[0]?.ExtUserPtr.Company
           ? pdfDetails[0].ExtUserPtr.Company
@@ -1104,11 +1123,12 @@ function PlaceHolderSign() {
         }
 
         let params = {
+          mailProvider: activeMailAdapter,
           extUserId: extUserId,
           recipient: signerMail[i].Email,
           subject: isCustomize
             ? replaceVar?.subject
-            : `${senderName} has requested you to sign ${documentName}`,
+            : `${senderName} has requested you to sign "${documentName}"`,
           from: senderEmail,
           html: isCustomize
             ? replaceVar?.body
@@ -1375,10 +1395,7 @@ function PlaceHolderSign() {
       inputype = options.includes(defaultdata.textvalidate)
         ? defaultdata.textvalidate
         : "regex";
-    } else {
-      inputype = "text";
     }
-
     const filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
     if (filterSignerPos.length > 0) {
       const getPlaceHolder = filterSignerPos[0].placeHolder;
@@ -1401,11 +1418,14 @@ function PlaceHolderSign() {
                   status: defaultdata?.status || "required",
                   hint: defaultdata?.hint || "",
                   defaultValue: defaultdata?.defaultValue || "",
-                  validation: {
-                    type: inputype,
-                    pattern:
-                      inputype === "regex" ? defaultdata.textvalidate : ""
-                  }
+                  validation:
+                    (isSubscribe || !isEnableSubscription) && inputype
+                      ? {
+                          type: inputype,
+                          pattern:
+                            inputype === "regex" ? defaultdata.textvalidate : ""
+                        }
+                      : {}
                 }
               };
             } else {
@@ -1695,7 +1715,10 @@ function PlaceHolderSign() {
                   style={{ padding: 20 }}
                 >
                   {isSendAlert.mssg === "sure" ? (
-                    <span>Please add at least one signature field for all recipients.</span>
+                    <span>
+                      Please ensure there&apos;s at least one signature widget
+                      added for all recipients.
+                    </span>
                   ) : isSendAlert.mssg === textWidget ? (
                     <p>Please confirm that you have filled the text field.</p>
                   ) : (

apps/OpenSign/src/pages/SignyourselfPdf.js

@@ -1,6 +1,7 @@
 import React, { useState, useRef, useEffect } from "react";
 import { PDFDocument } from "pdf-lib";
 import "../styles/signature.css";
+import Parse from "parse";
 import { isEnableSubscription, themeColor } from "../constant/const";
 import axios from "axios";
 import Loader from "../primitives/LoaderWithMsg";
@@ -29,7 +30,10 @@ import {
   textWidget,
   getTenantDetails,
   checkIsSubscribed,
-  convertPdfArrayBuffer
+  convertPdfArrayBuffer,
+  fetchImageBase64,
+  changeImageWH,
+  handleSendOTP
 } from "../constant/Utils";
 import { useParams } from "react-router-dom";
 import Tour from "reactour";
@@ -42,6 +46,7 @@ import TourContentWithBtn from "../primitives/TourContentWithBtn";
 import Title from "../components/Title";
 import ModalUi from "../primitives/ModalUi";
 import DropdownWidgetOption from "../components/pdf/DropdownWidgetOption";
+import VerifyEmail from "../components/pdf/VerifyEmail";
 
 //For signYourself inProgress section signer can add sign and complete doc sign.
 function SignYourSelf() {
@@ -89,6 +94,7 @@ function SignYourSelf() {
   const [containerWH, setContainerWH] = useState({});
   const [isPageCopy, setIsPageCopy] = useState(false);
   const [selectWidgetId, setSelectWidgetId] = useState("");
+  const [otpLoader, setOtpLoader] = useState(false);
   const [showAlreadySignDoc, setShowAlreadySignDoc] = useState({
     status: false
   });
@@ -104,6 +110,10 @@ function SignYourSelf() {
   const [extUserId, setExtUserId] = useState("");
   const [isCompleted, setIsCompleted] = useState(false);
   const [pdfArrayBuffer, setPdfArrayBuffer] = useState("");
+  const [activeMailAdapter, setActiveMailAdapter] = useState("");
+  const [isEmailVerified, setIsEmailVerified] = useState(true);
+  const [isVerifyModal, setIsVerifyModal] = useState(false);
+  const [otp, setOtp] = useState("");
   const divRef = useRef(null);
   const nodeRef = useRef(null);
   const [, drop] = useDrop({
@@ -193,13 +203,18 @@ function SignYourSelf() {
       setPdfDetails(documentData);
       setExtUserId(documentData[0]?.ExtUserPtr?.objectId);
       const url = documentData[0] && documentData[0]?.URL;
-      //convert document url in array buffer format to use embed widgets in pdf using pdf-lib
-      const arrayBuffer = await convertPdfArrayBuffer(url);
-      if (arrayBuffer === "Error") {
-        setHandleError("Error: Something went wrong!");
+      if (url) {
+        //convert document url in array buffer format to use embed widgets in pdf using pdf-lib
+        const arrayBuffer = await convertPdfArrayBuffer(url);
+        if (arrayBuffer === "Error") {
+          setHandleError("Error: Something went wrong!");
+        } else {
+          setPdfArrayBuffer(arrayBuffer);
+        }
       } else {
-        setPdfArrayBuffer(arrayBuffer);
+        setHandleError("Error: Something went wrong!");
       }
+
       isCompleted = documentData[0].IsCompleted && documentData[0].IsCompleted;
       if (isCompleted) {
         setIsCompleted(true);
@@ -266,7 +281,14 @@ function SignYourSelf() {
         setIsLoading(loadObj);
       });
     const contractUsersRes = await contractUsers(jsonSender.email);
-    if (contractUsersRes[0] && contractUsersRes.length > 0) {
+    if (contractUsersRes === "Error: Something went wrong!") {
+      const loadObj = {
+        isLoad: false
+      };
+      setHandleError("Error: Something went wrong!");
+      setIsLoading(loadObj);
+    } else if (contractUsersRes[0] && contractUsersRes.length > 0) {
+      setActiveMailAdapter(contractUsersRes[0]?.active_mail_adapter);
       setContractName("_Users");
       setSignerUserId(contractUsersRes[0].objectId);
       const tourstatuss =
@@ -286,12 +308,6 @@ function SignYourSelf() {
         isLoad: false
       };
       setIsLoading(loadObj);
-    } else if (contractUsersRes === "Error: Something went wrong!") {
-      const loadObj = {
-        isLoad: false
-      };
-      setHandleError("Error: Something went wrong!");
-      setIsLoading(loadObj);
     } else if (contractUsersRes.length === 0) {
       const contractContactBook = await contactBook(jsonSender.objectId);
       if (contractContactBook && contractContactBook.length > 0) {
@@ -525,76 +541,167 @@ function SignYourSelf() {
     setSignKey(key);
   };
 
+  //`handleResend` function is used to resend otp for email verification
+  const handleResend = async (e) => {
+    e.preventDefault();
+    setOtpLoader(true);
+    await handleSendOTP(Parse.User.current().getEmail());
+    setOtpLoader(false);
+    alert("OTP sent on you email");
+  };
+  //`handleVerifyEmail` function is used to verify email with otp
+  const handleVerifyEmail = async (e) => {
+    e.preventDefault();
+    setOtpLoader(true);
+    try {
+      const resEmail = await Parse.Cloud.run("verifyemail", {
+        otp: otp,
+        email: Parse.User.current().getEmail()
+      });
+      if (resEmail?.message === "Email is verified.") {
+        setIsEmailVerified(true);
+      } else if (resEmail?.message === "Email is already verified.") {
+        setIsEmailVerified(true);
+      }
+      setOtp("");
+      alert(resEmail.message);
+      setIsVerifyModal(false);
+      // handleRecipientSign();
+    } catch (error) {
+      alert(error.message);
+    } finally {
+      setOtpLoader(false);
+    }
+  };
+  //`handleVerifyBtn` function is used to send otp on user mail
+  const handleVerifyBtn = async () => {
+    setIsVerifyModal(true);
+    await handleSendOTP(Parse.User.current().getEmail());
+  };
   //function for send placeholder's co-ordinate(x,y) position embed signature url or stamp url
   async function embedWidgetsData() {
-    let showAlert = false;
-
-    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.`
+              });
+            }
+          }
+        }
+      } catch (err) {
+        console.log("err in embedselfsign ", err);
+        setIsUiLoading(false);
+        setIsAlert({
+          isShow: true,
+          alertMessage: "something went wrong, please try again later."
+        });
       }
     }
-    if (xyPostion.length === 0) {
-      setIsAlert({
-        isShow: true,
-        alertMessage: "Please complete your signature!"
-      });
-      return;
-    } else if (showAlert) {
-      setIsAlert({
-        isShow: true,
-        alertMessage: "Please complete your signature!"
-      });
-      return;
-    } else {
-      setIsCeleb(true);
-      setTimeout(() => {
-        setIsCeleb(false);
-      }, 3000);
-      setIsUiLoading(true);
-      const existingPdfBytes = pdfArrayBuffer;
-      // Load a PDFDocument from the existing PDF bytes
-      const pdfDoc = await PDFDocument.load(existingPdfBytes, {
-        ignoreEncryption: true
-      });
-      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);
-    }
   }
-  // console.log("signyourself", xyPostion);
   //function for get digital signature
   const signPdfFun = async (base64Url, documentId) => {
     let isCustomCompletionMail = false;
@@ -611,11 +718,40 @@ function SignYourSelf() {
         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 xyPostion) {
+      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);
+        }
+      }
+    }
+    let base64Sign = getSignature.SignUrl;
+    //check https type signature (default signature exist) then convert in base64
+    const isUrl = base64Sign.includes("https");
+    if (isUrl) {
+      try {
+        base64Sign = await fetchImageBase64(base64Sign);
+      } catch (e) {
+        console.log("error", e);
+      }
+    }
+    //change image width and height to 104/44 in png base64
+    const getNewse64 = await changeImageWH(base64Sign);
+    //remove suffiix of base64
+    const suffixbase64 = getNewse64 && getNewse64.split(",").pop();
 
     let singleSign = {
       pdfFile: base64Url,
       docId: documentId,
-      isCustomCompletionMail: isCustomCompletionMail
+      isCustomCompletionMail: isCustomCompletionMail,
+      mailProvider: activeMailAdapter,
+      signature: suffixbase64
     };
 
     await axios
@@ -623,7 +759,8 @@ function SignYourSelf() {
         headers: {
           "Content-Type": "application/json",
           "X-Parse-Application-Id": localStorage.getItem("parseAppId"),
-          sessionToken: localStorage.getItem("accesstoken")
+          // sessionToken: localStorage.getItem("accesstoken")
+          "X-Parse-Session-Token": localStorage.getItem("accesstoken")
         }
       })
       .then((Listdata) => {
@@ -987,6 +1124,18 @@ function SignYourSelf() {
           )}
 
           <div className="signatureContainer" ref={divRef}>
+            {!isEmailVerified && (
+              <VerifyEmail
+                isVerifyModal={isVerifyModal}
+                setIsVerifyModal={setIsVerifyModal}
+                handleVerifyEmail={handleVerifyEmail}
+                setOtp={setOtp}
+                otp={otp}
+                otpLoader={otpLoader}
+                handleVerifyBtn={handleVerifyBtn}
+                handleResend={handleResend}
+              />
+            )}
             {/* this component used for UI interaction and show their functionality */}
             {pdfLoadFail && !checkTourStatus && (
               <Tour
@@ -1021,7 +1170,7 @@ function SignYourSelf() {
               <ModalUi
                 headerColor={"#dc3545"}
                 isOpen={isAlert.isShow}
-                title={"Alert"}
+                title={isAlert?.header || "Alert"}
                 handleClose={() => {
                   setIsAlert({
                     isShow: false,
@@ -1031,28 +1180,6 @@ function SignYourSelf() {
               >
                 <div style={{ height: "100%", padding: 20 }}>
                   <p>{isAlert.alertMessage}</p>
-
-                  <div
-                    style={{
-                      height: "1px",
-                      backgroundColor: "#9f9f9f",
-                      width: "100%",
-                      marginTop: "15px",
-                      marginBottom: "15px"
-                    }}
-                  ></div>
-                  <button
-                    onClick={() => {
-                      setIsAlert({
-                        isShow: false,
-                        alertMessage: ""
-                      });
-                    }}
-                    type="button"
-                    className="finishBtn cancelBtn"
-                  >
-                    Ok
-                  </button>
                 </div>
               </ModalUi>
 
@@ -1138,6 +1265,7 @@ function SignYourSelf() {
                 sender={jsonSender}
                 setIsAlert={setIsAlert}
                 extUserId={extUserId}
+                activeMailAdapter={activeMailAdapter}
               />
               {/* pdf header which contain funish back button */}
               <Header

apps/OpenSign/src/pages/TemplatePlaceholder.js

@@ -1132,8 +1132,6 @@ const TemplatePlaceholder = () => {
       inputype = options.includes(defaultdata.textvalidate)
         ? defaultdata.textvalidate
         : "regex";
-    } else {
-      inputype = "text";
     }
 
     const filterSignerPos = signerPos.filter((data) => data.Id === uniqueId);
@@ -1158,11 +1156,14 @@ const TemplatePlaceholder = () => {
                   status: defaultdata?.status || "required",
                   hint: defaultdata?.hint || "",
                   defaultValue: defaultdata?.defaultValue || "",
-                  validation: {
-                    type: inputype,
-                    pattern:
-                      inputype === "regex" ? defaultdata.textvalidate : ""
-                  }
+                  validation:
+                    (isSubscribe || !isEnableSubscription) && inputype
+                      ? {
+                          type: inputype,
+                          pattern:
+                            inputype === "regex" ? defaultdata.textvalidate : ""
+                        }
+                      : {}
                 }
               };
             } else {
@@ -1206,6 +1207,7 @@ const TemplatePlaceholder = () => {
     setIsCheckbox(false);
   };
 
+  console.log("signerpos", signerPos);
   return (
     <div>
       <Title title={"Template"} />

apps/OpenSign/src/pages/UserProfile.js

@@ -8,9 +8,10 @@ import sanitizeFileName from "../primitives/sanitizeFileName";
 import axios from "axios";
 import PremiumAlertHeader from "../primitives/PremiumAlertHeader";
 import Tooltip from "../primitives/Tooltip";
-import { isEnableSubscription } from "../constant/const";
-import { checkIsSubscribed } from "../constant/Utils";
+import { isEnableSubscription, rejectBtn, submitBtn } from "../constant/const";
+import { checkIsSubscribed, handleSendOTP } from "../constant/Utils";
 import Upgrade from "../primitives/Upgrade";
+import ModalUi from "../primitives/ModalUi";
 
 function UserProfile() {
   const navigate = useNavigate();
@@ -32,12 +33,16 @@ function UserProfile() {
   const [jobTitle, setJobTitle] = useState(
     extendUser && extendUser?.[0]?.JobTitle
   );
-
+  const [isVerifyModal, setIsVerifyModal] = useState(false);
+  const [otp, setOtp] = useState("");
+  const [otpLoader, setOtpLoader] = useState(false);
+  const [isEmailVerified, setIsEmailVerified] = useState(false);
   useEffect(() => {
     getUserDetail();
   }, []);
 
   const getUserDetail = async () => {
+    setIsLoader(true);
     const extClass = localStorage.getItem("Extand_Class");
     const jsonSender = JSON.parse(extClass);
     const HeaderDocId = jsonSender[0]?.HeaderDocId;
@@ -48,6 +53,26 @@ function UserProfile() {
     if (HeaderDocId) {
       setIsDisableDocId(HeaderDocId);
     }
+    const currentUser = JSON.parse(JSON.stringify(Parse.User.current()));
+    let isEmailVerified = currentUser?.emailVerified || false;
+    if (isEmailVerified) {
+      setIsEmailVerified(isEmailVerified);
+      setIsLoader(false);
+    } 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);
+          setIsLoader(false);
+        }
+      } catch (e) {
+        alert("something went wrong!");
+      }
+    }
   };
   const handleSubmit = async (e) => {
     e.preventDefault();
@@ -177,6 +202,45 @@ function UserProfile() {
   const handleDisableDocId = () => {
     setIsDisableDocId((prevChecked) => !prevChecked);
   };
+  //`handleVerifyBtn` function is used to send otp on user mail
+  const handleVerifyBtn = async () => {
+    setIsVerifyModal(true);
+    await handleSendOTP(Parse.User.current().getEmail());
+  };
+  const handleCloseVerifyModal = async () => {
+    setIsVerifyModal(false);
+  };
+  //`handleVerifyEmail` function is used to verify email with otp
+  const handleVerifyEmail = async (e) => {
+    e.preventDefault();
+    setOtpLoader(true);
+    try {
+      const resEmail = await Parse.Cloud.run("verifyemail", {
+        otp: otp,
+        email: Parse.User.current().getEmail()
+      });
+      if (resEmail?.message === "Email is verified.") {
+        setIsEmailVerified(true);
+      } else if (resEmail?.message === "Email is already verified.") {
+        setIsEmailVerified(true);
+      }
+      setOtp("");
+      alert(resEmail.message);
+      setIsVerifyModal(false);
+    } catch (error) {
+      alert(error.message);
+    } finally {
+      setOtpLoader(false);
+    }
+  };
+  //function to use resend otp for email verification
+  const handleResend = async (e) => {
+    e.preventDefault();
+    setOtpLoader(true);
+    await handleSendOTP();
+    setOtpLoader(false);
+    alert("OTP sent on you email");
+  };
   return (
     <React.Fragment>
       <Title title={"Profile"} />
@@ -310,9 +374,20 @@ function UserProfile() {
               <li className="flex justify-between items-center border-t-[1px] border-gray-300 py-2 break-all">
                 <span className="font-semibold">Is Email verified:</span>{" "}
                 <span>
-                  {UserProfile && UserProfile.emailVerified
-                    ? "Verified"
-                    : "Not verified"}
+                  {isEmailVerified ? (
+                    "Verified"
+                  ) : (
+                    <span>
+                      Not verified(
+                      <span
+                        onClick={() => handleVerifyBtn()}
+                        className="hover:underline text-blue-600 cursor-pointer"
+                      >
+                        verify
+                      </span>
+                      )
+                    </span>
+                  )}
                 </span>
               </li>
               <li className="border-y-[1px] border-gray-300 break-all">
@@ -329,7 +404,6 @@ function UserProfile() {
                       url={
                         "https://docs.opensignlabs.com/docs/help/Settings/disabledocumentid"
                       }
-                      isSubscribe={isSubscribe}
                     />{" "}
                     {!isSubscribe && isEnableSubscription && <Upgrade />}
                   </span>{" "}
@@ -399,6 +473,60 @@ function UserProfile() {
               </button>
             </div>
           </div>
+
+          {isVerifyModal && (
+            <ModalUi
+              isOpen
+              title={"OTP verification"}
+              handleClose={handleCloseVerifyModal}
+            >
+              {otpLoader ? (
+                <div
+                  style={{
+                    height: "150px",
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center"
+                  }}
+                >
+                  <div
+                    style={{
+                      fontSize: "45px",
+                      color: "#3dd3e0"
+                    }}
+                    className="loader-37"
+                  ></div>
+                </div>
+              ) : (
+                <form onSubmit={(e) => handleVerifyEmail(e)}>
+                  <div className="px-6 py-3">
+                    <label className="mb-2">Enter OTP</label>
+                    <input
+                      required
+                      type="tel"
+                      pattern="[0-9]{4}"
+                      className="px-3 py-2 w-full border-[1px] border-gray-300 rounded focus:outline-none text-xs"
+                      placeholder="Enter OTP received over email"
+                      value={otp}
+                      onChange={(e) => setOtp(e.target.value)}
+                    />
+                  </div>
+                  <hr />
+                  <div className="px-6 my-3">
+                    <button type="submit" className={submitBtn}>
+                      Verify
+                    </button>
+                    <button
+                      className={`${rejectBtn} ml-2`}
+                      onClick={(e) => handleResend(e)}
+                    >
+                      Resend
+                    </button>
+                  </div>
+                </form>
+              )}
+            </ModalUi>
+          )}
         </div>
       )}
     </React.Fragment>

apps/OpenSign/src/primitives/GetReportDisplay.js

@@ -10,6 +10,7 @@ import Tooltip from "./Tooltip";
 import { RWebShare } from "react-web-share";
 import Tour from "reactour";
 import Parse from "parse";
+import { saveAs } from "file-saver";
 
 const ReportTable = (props) => {
   const navigate = useNavigate();
@@ -286,13 +287,15 @@ const ReportTable = (props) => {
   const handleShare = (item) => {
     setActLoader({ [item.objectId]: true });
     const host = window.location.origin;
-    const serverUrl = process.env.REACT_APP_SERVERURL
-      ? process.env.REACT_APP_SERVERURL
-      : window.location.origin + "/api/app";
-    const baseURL = serverUrl.replace(/\//g, "%2F");
+    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}`;
+    };
+
     const urls = item.Signers.map((x) => ({
       email: x.Email,
-      url: `${host}/login/${item.objectId}/${x.Email}/${x.objectId}/${baseURL}%2F&opensign&contracts`
+      url: getUrl(x)
     }));
     setShareUrls(urls);
     setIsShare({ [item.objectId]: true });
@@ -420,6 +423,20 @@ const ReportTable = (props) => {
       );
     }
   };
+
+  // `handleDownload` is used to get valid doc url available in completed report
+  const handleDownload = async (item) => {
+    const url = item?.SignedUrl || item?.URL || "";
+    if (url) {
+      try {
+        const signedUrl = await Parse.Cloud.run("getsignedurl", { url: url });
+        saveAs(signedUrl);
+      } catch (err) {
+        console.log("err in getsignedurl", err);
+        alert("something went wrong, please try again later.");
+      }
+    }
+  };
   return (
     <div className="relative">
       {Object.keys(actLoader)?.length > 0 && (
@@ -562,18 +579,14 @@ const ReportTable = (props) => {
                         </td>
                       )}
                       <td className="px-4 py-2">
-                        <a
-                          target="_blank"
-                          rel="noopener noreferrer"
-                          title={item?.URL}
-                          href={item?.URL}
-                          download={item?.URL}
-                          className="text-[blue] hover:text-[blue] hover:underline"
+                        <button
+                          onClick={() => handleDownload(item)}
+                          className="text-[blue] hover:text-[blue] hover:underline focus:outline-none"
+                          title={"Download"}
                         >
                           {item?.URL ? "Download" : "-"}
-                        </a>
+                        </button>
                       </td>
-
                       <td className="px-4 py-2">
                         {formatRow(item?.ExtUserPtr)}
                       </td>

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/OpenSignServer/Utils.js

@@ -1,4 +1,6 @@
 import axios from 'axios';
+import dotenv from 'dotenv';
+dotenv.config();
 
 const appId = process.env.APP_ID;
 const serverUrl = process.env.SERVER_URL;
@@ -243,3 +245,5 @@ export function sanitizeFileName(fileName) {
   const removedot = file.replace(/\.(?=.*\.)/g, '');
   return removedot.replace(/[^a-zA-Z0-9._-]/g, '');
 }
+
+export const useLocal = process.env.USE_LOCAL ? process.env.USE_LOCAL.toLowerCase() : 'false';

apps/OpenSignServer/cloud/customRoute/customApp.js

@@ -6,6 +6,7 @@ import uploadFile from './uploadFile.js';
 import saveSubscription from './saveSubscription.js';
 import saveInvoice from './saveInvoice.js';
 import savePayments from './savePayments.js';
+import gooogleauth from './googleauth.js';
 export const app = express();
 
 dotenv.config();
@@ -18,5 +19,7 @@ app.post('/file_upload', uploadFile);
 app.post('/savesubscription', saveSubscription)
 app.post('/saveinvoice', saveInvoice)
 app.post('/savepayment', savePayments)
+app.post('/googleauth', gooogleauth)
+
 
 

apps/OpenSignServer/cloud/customRoute/googleauth.js

@@ -0,0 +1,59 @@
+import axios from 'axios';
+const appId = process.env.APP_ID;
+const serverUrl = process.env.SERVER_URL;
+export default async function gooogleauth(request, response) {
+  const code = request.body.code;
+  const baseUrl = new URL(process.env.SERVER_URL);
+
+  try {
+    const userRes = await axios.get(serverUrl + '/users/me', {
+      headers: {
+        'X-Parse-Application-Id': appId,
+        'X-Parse-Session-Token': request.headers['sessiontoken'],
+      },
+    });
+    const userId = userRes.data && userRes.data.objectId;
+    if (userId) {
+      const clientId = process.env.GOOGLE_CLIENT_ID;
+      const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
+      const redirectUri =
+        baseUrl?.hostname === 'localhost'
+          ? 'http://localhost:3000'
+          : 'https://console.opensignlabs.com'; // Should match the redirect URI used in the authorization request
+      const tokenEndpoint = 'https://oauth2.googleapis.com/token';
+
+      const params = new URLSearchParams();
+      params.append('code', code);
+      params.append('client_id', clientId);
+      params.append('client_secret', clientSecret);
+      params.append('redirect_uri', redirectUri);
+      params.append('grant_type', 'authorization_code');
+
+      const res = await axios.post(tokenEndpoint, params);
+      //   console.log('oauthres ', res.data);
+      const refresh_token = res.data.refresh_token;
+      const extUserCls = new Parse.Query('contracts_Users');
+      extUserCls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
+      const extUser = await extUserCls.first({ useMasterKey: true });
+
+      if (extUser) {
+        const extUserCls = new Parse.Object('contracts_Users');
+        extUserCls.id = extUser.id;
+        extUserCls.set('google_refresh_token', refresh_token);
+        extUserCls.set('active_mail_adapter', 'google');
+        const updateExtUser = await extUserCls.save(null, { useMasterKey: true });
+        // console.log('updateExtUser ', updateExtUser);
+      }
+      return response.status(200).json({ status: 'success' });
+    } else {
+      return response.status(404).json({ message: 'user not found!' });
+    }
+  } catch (err) {
+    console.log('err in google auth', err);
+    if (err?.response?.data?.error) {
+      return response.status(404).json({ message: err.response.data.error });
+    } else {
+      return response.status(404).json({ message: err.message });
+    }
+  }
+}

apps/OpenSignServer/cloud/customRoute/uploadFile.js

@@ -3,6 +3,7 @@ import multer from 'multer';
 import multerS3 from 'multer-s3';
 import aws from 'aws-sdk';
 import dotenv from 'dotenv';
+import { useLocal } from '../../Utils.js';
 dotenv.config();
 
 function sanitizeFileName(fileName) {
@@ -51,7 +52,7 @@ async function uploadFile(req, res) {
     const parseBaseUrl = process.env.SERVER_URL;
     const parseAppId = process.env.APP_ID;
     let fileStorage;
-    if (process.env.USE_LOCAL == 'TRUE') {
+    if (useLocal === 'true') {
       fileStorage = multer.diskStorage({
         destination: function (req, file, cb) {
           cb(null, 'files/files');
@@ -147,7 +148,7 @@ async function uploadFile(req, res) {
       const status = 'Success';
       //res.header("Access-Control-Allow-Headers", "Content-Type");
       //res.setHeader("Access-Control-Allow-Origin", "*");
-      if (process.env.USE_LOCAL == 'TRUE') {
+      if (useLocal === 'true') {
         console.log(req.file);
         var fileUrl = `${parseBaseUrl}/files/${parseAppId}/${req.file.filename}`;
       } else {

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,11 @@ 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';
 dotenv.config();
 const storage = multer.memoryStorage();
 const upload = multer({ storage: storage });
@@ -102,3 +106,18 @@ 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
+app.get('/folder/:folder_id', getFolder);
+
+// get folder list
+app.get('/folderlist', getFolderList);

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

@@ -55,6 +55,7 @@ export default async function createDocumentWithTemplate(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;
 
   try {
     const reqToken = request.headers['x-api-token'];
@@ -88,12 +89,20 @@ export default async function createDocumentWithTemplate(request, response) {
           const updateSigners = placeholder.every(y => signers?.some(x => x.role === y.Role));
           // console.log('isValid ', isValid);
           if (isValid && updateSigners) {
+            //Check if every item's placeholders contain at least one placeholder with type 'signature'.
+            let isSignature = template?.Placeholders?.every(item =>
+              item?.placeHolder.some(x => x?.pos.some(data => data?.type === 'signature'))
+            );
+            if (!isSignature) {
+              return response
+                .status(400)
+                .json({ error: 'Please add at least one signature widget for all signers' });
+            }
             const folderPtr = {
               __type: 'Pointer',
               className: 'contracts_Document',
               objectId: folderId,
             };
-            const template = JSON.parse(JSON.stringify(templateRes));
             const object = new Parse.Object('contracts_Document');
             object.set('Name', template.Name);
             if (template?.Note) {
@@ -169,6 +178,10 @@ export default async function createDocumentWithTemplate(request, response) {
               object.set('Signers', templateSigner);
             }
             object.set('URL', template.URL);
+            object.set('SignedUrl', template.URL);
+            if (TimeToCompleteDays) {
+              object.set('TimeToCompleteDays', TimeToCompleteDays);
+            }
             object.set('CreatedBy', template.CreatedBy);
             object.set('ExtUserPtr', {
               __type: 'Pointer',
@@ -217,9 +230,10 @@ export default async function createDocumentWithTemplate(request, response) {
                   };
 
                   const objectId = contactMail[i].contactPtr.objectId;
-
                   const hostUrl = baseUrl.origin;
-                  let signPdf = `${hostUrl}/login/${res.id}/${contactMail[i].email}/${objectId}/${serverParams}`;
+                  //encode this url value `${res.id}/${contactMail[i].email}/${objectId}` to base64 using `btoa` function
+                  const encodeBase64 = btoa(`${res.id}/${contactMail[i].email}/${objectId}`);
+                  let signPdf = `${hostUrl}/login/${encodeBase64}`;
                   const openSignUrl = 'https://www.opensignlabs.com/contact-us';
                   const orgName = template.ExtUserPtr.Company ? template.ExtUserPtr.Company : '';
                   const themeBGcolor = '#47a3ad';
@@ -266,13 +280,13 @@ export default async function createDocumentWithTemplate(request, response) {
                     replaceVar = { subject: replaceVar.subject, body: email_html };
                   } else if (email_body) {
                     replaceVar = replaceMailVaribles(
-                      `${template.ExtUserPtr.Name} has requested you to sign ${template.Name}`,
+                      `${template.ExtUserPtr.Name} has requested you to sign "${template.Name}"`,
                       email_body,
                       variables
                     );
                   } else {
                     replaceVar = {
-                      subject: `${template.ExtUserPtr.Name} has requested you to sign ${template.Name}`,
+                      subject: `${template.ExtUserPtr.Name} has requested you to sign "${template.Name}"`,
                       body: email_html,
                     };
                   }
@@ -320,7 +334,9 @@ export default async function createDocumentWithTemplate(request, response) {
               objectId: res.id,
               signurl: contact.map(x => ({
                 email: x.email,
-                url: `${baseUrl.origin}/login/${res.id}/${x.email}/${x.contactPtr.objectId}/${serverParams}`,
+                url: `${baseUrl.origin}/login/${btoa(
+                  `${res.id}/${x.email}/${x.contactPtr.objectId}`
+                )}`,
               })),
               message: 'Document sent successfully!',
             });

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

@@ -66,6 +66,7 @@ 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);
@@ -88,6 +89,15 @@ export default async function createDocumentwithCoordinate(request, response) {
         objectId: parseUser.userId.objectId,
       };
       if (signers && signers.length > 0) {
+        // Check if at least one signature exists among all items in the signers array
+        let isSignExist = signers.every(item =>
+          item.widgets.some(data => data?.type === 'signature')
+        );
+        if (!isSignExist) {
+          return response
+            .status(400)
+            .json({ error: 'Please add at least one signature widget for all signers' });
+        }
         let fileUrl;
         if (request.files?.[0]) {
           const base64 = fileData?.toString('base64');
@@ -130,8 +140,12 @@ export default async function createDocumentwithCoordinate(request, response) {
           object.set('SendinOrder', sendInOrder);
         }
         object.set('URL', fileUrl);
+        object.set('SignedUrl', fileUrl);
         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) {
@@ -278,7 +292,9 @@ export default async function createDocumentwithCoordinate(request, response) {
 
               const objectId = contactMail[i].contactPtr.objectId;
               const hostUrl = baseUrl.origin;
-              let signPdf = `${hostUrl}/login/${res.id}/${contactMail[i].email}/${objectId}/${serverParams}`;
+              //encode this url value `${response.id}/${contactMail[i].email}/${objectId}` to base64 using `btoa` function
+              const encodeBase64 = btoa(`${res.id}/${contactMail[i].email}/${objectId}`);
+              let signPdf = `${hostUrl}/login/${encodeBase64}`;
               const openSignUrl = 'https://www.opensignlabs.com/contact-us';
               const orgName = parseExtUser.Company ? parseExtUser.Company : '';
               const themeBGcolor = '#47a3ad';
@@ -324,13 +340,13 @@ export default async function createDocumentwithCoordinate(request, response) {
                 replaceVar = { subject: replaceVar.subject, body: email_html };
               } else if (email_body) {
                 replaceVar = replaceMailVaribles(
-                  `${parseExtUser.Name} has requested you to sign ${name}`,
+                  `${parseExtUser.Name} has requested you to sign "${name}"`,
                   email_body,
                   variables
                 );
               } else {
                 replaceVar = {
-                  subject: `${parseExtUser.Name} has requested you to sign ${parseExtUser.Name}`,
+                  subject: `${parseExtUser.Name} has requested you to sign "${name}"`,
                   body: email_html,
                 };
               }
@@ -363,7 +379,7 @@ export default async function createDocumentwithCoordinate(request, response) {
           objectId: res.id,
           signurl: contact.map(x => ({
             email: x.email,
-            url: `${baseUrl.origin}/login/${res.id}/${x.email}/${x.contactPtr.objectId}/${serverParams}`,
+            url: `${baseUrl.origin}/login/${btoa(`${res.id}/${x.email}/${x.contactPtr.objectId}`)}`,
           })),
           message: 'Document sent successfully!',
         });

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

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { customAPIurl } from '../../../../Utils.js';
+import { customAPIurl, saveFileUsage } from '../../../../Utils.js';
 
 // const randomId = () => Math.floor(1000 + Math.random() * 9000);
 export default async function draftDocument(request, response) {

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

@@ -0,0 +1,156 @@
+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.lessThanOrEqualTo('ExpiryDate', new Date());
+      docQuery.exists('SignedUrl');
+
+      const resDoc = await docQuery.first({ useMasterKey: true });
+      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

@@ -33,7 +33,10 @@ import getInvoices from './parsefunction/getInvoices.js';
 import getPayments from './parsefunction/getPayments.js';
 import getSubscriptions from './parsefunction/getSubscriptions.js';
 import TenantAterFind from './parsefunction/TenantAfterFind.js';
-import saveSubscriptio from './parsefunction/saveSubscription.js';
+import saveSubscription from './parsefunction/saveSubscription.js';
+import VerifyEmail from './parsefunction/VerifyEmail.js';
+import encryptedpdf from './parsefunction/encryptedPdf.js';
+import { getSignedUrl } from './parsefunction/getSignedUrl.js';
 
 Parse.Cloud.define('AddUserToRole', addUserToGroups);
 Parse.Cloud.define('UserGroups', getUserGroups);
@@ -70,4 +73,7 @@ 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', saveSubscriptio);
+Parse.Cloud.define('savesubscription', saveSubscription);
+Parse.Cloud.define('verifyemail', VerifyEmail);
+Parse.Cloud.define('encryptedpdf', encryptedpdf);
+Parse.Cloud.define('getsignedurl', getSignedUrl);

apps/OpenSignServer/cloud/parsefunction/DocumentAfterFind.js

@@ -1,23 +1,25 @@
+import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function DocumentAfterFind(request) {
-  if (request.objects.length === 1) {
-    if (request.objects) {
-      const obj = request.objects[0];
-      const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
-      const Url = obj?.get('URL') && obj?.get('URL');
-      const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
-      if (SignedUrl) {
-        obj.set('SignedUrl', getPresignedUrl(SignedUrl));
+  if (useLocal !== 'true') {
+    if (request.objects.length === 1) {
+      if (request.objects) {
+        const obj = request.objects[0];
+        const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
+        const Url = obj?.get('URL') && obj?.get('URL');
+        const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
+        if (SignedUrl) {
+          obj.set('SignedUrl', getPresignedUrl(SignedUrl));
+        }
+        if (Url) {
+          obj.set('URL', getPresignedUrl(Url));
+        }
+        if (certificateUrl) {
+          obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
+        }
+        return [obj];
       }
-      if (Url) {
-        obj.set('URL', getPresignedUrl(Url));
-      }
-      if (certificateUrl) {
-        obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
-      }
-
-      return [obj];
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/DocumentAftersave.js

@@ -4,6 +4,7 @@ async function DocumentAftersave(request) {
       console.log('new entry is insert in contracts_Document');
       const createdAt = request.object.get('createdAt');
       const Folder = request.object.get('Type');
+      const ip = request?.headers?.['x-real-ip'] || '';
       if (createdAt && Folder === undefined) {
         // console.log("IN If condition")
         const TimeToCompleteDays = request.object.get('TimeToCompleteDays');
@@ -12,6 +13,7 @@ async function DocumentAftersave(request) {
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
+        updateQuery.set('OriginIp', ip);
         await updateQuery.save(null, { useMasterKey: true });
       } else if (createdAt && Folder === 'AIDoc') {
         const TimeToCompleteDays = request.object.get('TimeToCompleteDays');
@@ -24,6 +26,7 @@ async function DocumentAftersave(request) {
         const documentQuery = new Parse.Query('contracts_Document');
         const updateQuery = await documentQuery.get(request.object.id, { useMasterKey: true });
         updateQuery.set('ExpiryDate', ExpiryDate);
+        updateQuery.set('OriginIp', ip);
         await updateQuery.save(null, { useMasterKey: true });
       }
 

apps/OpenSignServer/cloud/parsefunction/DocumentBeforesave.js

@@ -25,6 +25,10 @@ async function DocumentBeforesave(request) {
       } catch (error) {
         console.log('Error updating document count in contracts_users: ' + error.message);
       }
+      if (document?.get('Signers') && document.get('Signers').length > 0) {
+        document.set('DocSentAt', new Date());
+        document.save(null, { useMasterKey: true });
+      }
     }
   } catch (err) {
     console.log('err in document beforesave', err.message);

apps/OpenSignServer/cloud/parsefunction/SignatureAfterFind.js

@@ -1,21 +1,21 @@
+import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function SignatureAfterFind(request) {
-  if (request.objects.length === 1) {
-    if (request.objects) {
-      const obj = request.objects[0];
-      const ImageURL = obj?.get('ImageURL') && obj?.get('ImageURL');
-      const Initials = obj?.get('Initials') && obj?.get('Initials');
-
-      if (ImageURL) {
-        obj.set('ImageURL', getPresignedUrl(ImageURL));
+  if (useLocal !== 'true') {
+    if (request.objects.length === 1) {
+      if (request.objects) {
+        const obj = request.objects[0];
+        const ImageURL = obj?.get('ImageURL') && obj?.get('ImageURL');
+        const Initials = obj?.get('Initials') && obj?.get('Initials');
+        if (ImageURL) {
+          obj.set('ImageURL', getPresignedUrl(ImageURL));
+        }
+        if (Initials) {
+          obj.set('Initials', getPresignedUrl(Initials));
+        }
+        return [obj];
       }
-
-      if (Initials) {
-        obj.set('Initials', getPresignedUrl(Initials));
-      }
-
-      return [obj];
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/TemplateAfterFind.js

@@ -1,23 +1,26 @@
+import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function TemplateAfterFind(request) {
-  if (request.objects.length === 1) {
-    if (request.objects) {
-      const obj = request.objects[0];
-      const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
-      const Url = obj?.get('URL') && obj?.get('URL');
-      const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
-      if (SignedUrl) {
-        obj.set('SignedUrl', getPresignedUrl(SignedUrl));
-      }
-      if (Url) {
-        obj.set('URL', getPresignedUrl(Url));
-      }
-      if (certificateUrl) {
-        obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
-      }
+  if (useLocal !== 'true') {
+    if (request.objects.length === 1) {
+      if (request.objects) {
+        const obj = request.objects[0];
+        const SignedUrl = obj?.get('SignedUrl') && obj?.get('SignedUrl');
+        const Url = obj?.get('URL') && obj?.get('URL');
+        const certificateUrl = obj.get('CertificateUrl') && obj.get('CertificateUrl');
+        if (SignedUrl) {
+          obj.set('SignedUrl', getPresignedUrl(SignedUrl));
+        }
+        if (Url) {
+          obj.set('URL', getPresignedUrl(Url));
+        }
+        if (certificateUrl) {
+          obj.set('CertificateUrl', getPresignedUrl(certificateUrl));
+        }
 
-      return [obj];
+        return [obj];
+      }
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/TenantAfterFind.js

@@ -1,14 +1,17 @@
+import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function TenantAterFind(request) {
-  if (request.objects.length === 1) {
-    if (request.objects) {
-      const obj = request.objects[0];
-      const Logo = obj?.get('Logo') && obj?.get('Logo');
-      if (Logo) {
-        obj.set('Logo', getPresignedUrl(Logo));
+  if (useLocal !== 'true') {
+    if (request.objects.length === 1) {
+      if (request.objects) {
+        const obj = request.objects[0];
+        const Logo = obj?.get('Logo') && obj?.get('Logo');
+        if (Logo) {
+          obj.set('Logo', getPresignedUrl(Logo));
+        }
+        return [obj];
       }
-      return [obj];
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/UserAfterFInd.js

@@ -1,16 +1,17 @@
+import { useLocal } from '../../Utils.js';
 import getPresignedUrl from './getSignedUrl.js';
 
 async function UserAfterFind(request) {
-  if (request.objects.length === 1) {
-    if (request.objects) {
-      const obj = request.objects[0];
-      const ProfilePic = obj?.get('ProfilePic') && obj?.get('ProfilePic');
-
-      if (ProfilePic) {
-        obj.set('ProfilePic', getPresignedUrl(ProfilePic));
+  if (useLocal !== 'true') {
+    if (request.objects.length === 1) {
+      if (request.objects) {
+        const obj = request.objects[0];
+        const ProfilePic = obj?.get('ProfilePic') && obj?.get('ProfilePic');
+        if (ProfilePic) {
+          obj.set('ProfilePic', getPresignedUrl(ProfilePic));
+        }
+        return [obj];
       }
-
-      return [obj];
     }
   }
 }

apps/OpenSignServer/cloud/parsefunction/VerifyEmail.js

@@ -0,0 +1,49 @@
+export default async function VerifyEmail(request) {
+  try {
+    if (!request?.user) {
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+    } else {
+      let otpN = request.params.otp;
+      let otp = parseInt(otpN);
+      let email = request.params.email;
+
+      //checking otp is correct or not which already save in defaultdata_Otp class
+      const checkOtp = new Parse.Query('defaultdata_Otp');
+      checkOtp.equalTo('Email', email);
+      checkOtp.equalTo('OTP', otp);
+
+      const res = await checkOtp.first({ useMasterKey: true });
+      if (res) {
+        // Fetch the user by their objectId
+        const isEmailVerified = request?.user?.get('emailVerified');
+        if (isEmailVerified) {
+          return { message: 'Email is already verified.' };
+        } else {
+          const userQuery = new Parse.Query(Parse.User);
+          const user = await userQuery.get(request?.user.id, {
+            sessionToken: request?.user.getSessionToken(),
+          });
+
+          // Update the emailVerified field to true
+          user.set('emailVerified', true);
+          // Save the user object
+          const res = await user.save(null, { useMasterKey: true });
+          if (res) {
+            return { message: 'Email is verified.' };
+          } else {
+            const error = new Error('Something went wrong, please try again later!');
+            error.code = 400; // Set the error code (e.g., 400 for bad request)
+            throw error;
+          }
+        }
+      } else {
+        const error = new Error('OTP is invalid.');
+        error.code = 400; // Set the error code (e.g., 400 for bad request)
+        throw error;
+      }
+    }
+  } catch (err) {
+    console.log('err ', err.code + ' ' + err.message);
+    throw err;
+  }
+}

apps/OpenSignServer/cloud/parsefunction/callWebhook.js

@@ -2,6 +2,8 @@ import axios from 'axios';
 export default async function callWebhook(request) {
   const event = request.params.event;
   const body = request.params.body;
+  const docId = body.objectId;
+  const contactId = request.params.contactId;
   const serverUrl = process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const userRes = await axios.get(serverUrl + '/users/me', {
@@ -13,6 +15,39 @@ export default async function callWebhook(request) {
 
   const userId = userRes.data && userRes.data.objectId;
   if (userId) {
+    if (event === 'viewed' && contactId) {
+      const docQuery = new Parse.Query('contracts_Document');
+      const res = await docQuery.get(docId, { useMasterKey: true });
+      if (res) {
+        const _res = res.toJSON();
+        const userPtr = {
+          __type: 'Pointer',
+          className: 'contracts_Contactbook',
+          objectId: contactId,
+        };
+        const date = new Date().toISOString();
+        const obj = {
+          UserPtr: userPtr,
+          SignedUrl: _res.SignedUrl,
+          Activity: 'Viewed',
+          ipAddress: request.headers['x-real-ip'],
+          ViewedOn: date,
+        };
+        const isUserExist = _res?.AuditTrail?.some(
+          x => x.UserPtr.objectId === contactId && x?.ViewedOn
+        );
+        if (!isUserExist) {
+          const updateDoc = new Parse.Object('contracts_Document');
+          updateDoc.id = res.id;
+          if (_res?.AuditTrail && _res?.AuditTrail?.length > 0) {
+            updateDoc.set('AuditTrail', [..._res?.AuditTrail, obj]);
+          } else {
+            updateDoc.set('AuditTrail', [obj]);
+          }
+          await updateDoc.save(null, { useMasterKey: true });
+        }
+      }
+    }
     const extendcls = new Parse.Query('contracts_Users');
     extendcls.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: userId });
     const res = await extendcls.first({ useMasterKey: true });
@@ -39,11 +74,11 @@ export default async function callWebhook(request) {
               });
               webhook.save(null, { useMasterKey: true });
             } catch (err) {
-              console.log('err save in contracts_Webhook', err);
+              console.log('err save in contracts_Webhook', err.message);
             }
           })
           .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);
@@ -54,7 +89,7 @@ export default async function callWebhook(request) {
               });
               webhook.save(null, { useMasterKey: true });
             } catch (err) {
-              console.log('err save in contracts_Webhook', err);
+              console.log('err save in contracts_Webhook', err.message);
             }
           });
       }

apps/OpenSignServer/cloud/parsefunction/encryptedPdf.js

@@ -0,0 +1,14 @@
+import { PostHog } from 'posthog-node';
+const ph_project_api_key = process.env.PH_PROJECT_API_KEY;
+const client = ph_project_api_key ? new PostHog(ph_project_api_key) : '';
+export default async function encryptedpdf(request) {
+  const email = request.params.email;
+  if (client) {
+    client?.capture({
+      distinctId: email,
+      event: 'encrypted_pdf_error',
+      properties: { response_code: 200 },
+    });
+  }
+  return { message: 'success' };
+}

apps/OpenSignServer/cloud/parsefunction/getSignedUrl.js

@@ -1,4 +1,5 @@
 import AWS from 'aws-sdk';
+import { useLocal } from '../../Utils.js';
 const credentials = {
   accessKeyId: process.env.DO_ACCESS_KEY_ID,
   secretAccessKey: process.env.DO_SECRET_ACCESS_KEY,
@@ -24,3 +25,25 @@ export default function getPresignedUrl(url) {
   });
   return presignedGETURL;
 }
+
+export async function getSignedUrl(request) {
+  try {
+    const url = request.params.url;
+    if (!request?.user) {
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
+    } else {
+      if (useLocal !== 'true') {
+        const presignedUrl = getPresignedUrl(url);
+        return presignedUrl;
+      } else {
+        return url;
+      }
+    }
+  } catch (err) {
+    console.log('error in getsignedurl', err);
+    const code = err.code || 400;
+    const msg = err.message;
+    const error = new Parse.Error(code, msg);
+    throw error;
+  }
+}

apps/OpenSignServer/cloud/parsefunction/getSubscriptions.js

@@ -2,41 +2,96 @@ import axios from 'axios';
 const serverUrl = process.env.SERVER_URL;
 const appId = process.env.APP_ID;
 export default async function getSubscription(request) {
-  const extUserId = request.params.extUserId;
-  try {
-    const userRes = await axios.get(serverUrl + '/users/me', {
-      headers: {
-        'X-Parse-Application-Id': appId,
-        'X-Parse-Session-Token': request.headers['sessiontoken'],
-      },
-    });
-    const userId = userRes.data && userRes.data.objectId;
-    if (userId) {
-      const subcriptionCls = new Parse.Query('contracts_Users');
-      const exUser = await subcriptionCls.get(extUserId, { useMasterKey: true });
-      if (exUser) {
-        const subscriptionCls = new Parse.Query('contracts_Subscriptions');
-        subscriptionCls.equalTo('TenantId', {
-          __type: 'Pointer',
-          className: 'partners_Tenant',
-          objectId: exUser.get('TenantId').id,
-        });
-        subscriptionCls.descending('createdAt');
-        const subcripitions = await subscriptionCls.first({ useMasterKey: true });
-        if (subcripitions) {
-          const _subcripitions = JSON.parse(JSON.stringify(subcripitions));
-          return { status: 'success', result: _subcripitions };
+  const extUserId = request.params.extUserId || '';
+  const contactId = request.params.contactId || '';
+
+  if (extUserId) {
+    try {
+      const userRes = await axios.get(serverUrl + '/users/me', {
+        headers: {
+          'X-Parse-Application-Id': appId,
+          'X-Parse-Session-Token': request.headers['sessiontoken'],
+        },
+      });
+      const userId = userRes.data && userRes.data.objectId;
+      if (userId) {
+        const extCls = new Parse.Query('contracts_Users');
+        const exUser = await extCls.get(extUserId, { useMasterKey: true });
+        if (exUser) {
+          const subscriptionCls = new Parse.Query('contracts_Subscriptions');
+          subscriptionCls.equalTo('TenantId', {
+            __type: 'Pointer',
+            className: 'partners_Tenant',
+            objectId: exUser.get('TenantId').id,
+          });
+          subscriptionCls.descending('createdAt');
+          const subcripitions = await subscriptionCls.first({ useMasterKey: true });
+          if (subcripitions) {
+            const _subcripitions = JSON.parse(JSON.stringify(subcripitions));
+            return { status: 'success', result: _subcripitions };
+          } else {
+            return { status: 'success', result: {} };
+          }
         } else {
-          return { status: 'success', result: {} };
+          return { status: 'error', result: 'User not found!' };
         }
       } else {
-        return { status: 'error', result: 'User not found!' };
+        return { status: 'error', result: 'Invalid session token!' };
       }
-    } else {
-      return { status: 'error', result: 'Invalid session token!' };
+    } catch (err) {
+      console.log('Err in get subscription', err.message);
+      return { status: 'error', result: err.message };
     }
-  } catch (err) {
-    console.log('Err in get subscription', err.message);
-    return { status: 'error', result: err.message };
+  } else if (contactId) {
+    try {
+      const userRes = await axios.get(serverUrl + '/users/me', {
+        headers: {
+          'X-Parse-Application-Id': appId,
+          'X-Parse-Session-Token': request.headers['sessiontoken'],
+        },
+      });
+
+      const userId = userRes.data && userRes.data.objectId;
+      if (userId) {
+        const contactCls = new Parse.Query('contracts_Contactbook');
+        const contactUser = await contactCls.get(contactId, { useMasterKey: true });
+        if (contactUser) {
+          const subscriptionCls = new Parse.Query('contracts_Subscriptions');
+          subscriptionCls.equalTo('TenantId', {
+            __type: 'Pointer',
+            className: 'partners_Tenant',
+            objectId: contactUser.get('TenantId').id,
+          });
+          subscriptionCls.descending('createdAt');
+          const subcripitions = await subscriptionCls.first({ useMasterKey: true });
+
+          if (subcripitions) {
+            const _subcripitions = JSON.parse(JSON.stringify(subcripitions));
+            if (_subcripitions.PlanCode === 'freeplan') {
+              return { status: 'success', result: { isSubscribed: false, plan: 'freeplan' } };
+            } else if (_subcripitions?.Next_billing_date?.iso) {
+              if (new Date(_subcripitions.Next_billing_date.iso) > new Date()) {
+                return { status: 'success', result: { isSubscribed: true } };
+              } else {
+                return { status: 'success', result: { isSubscribed: false } };
+              }
+            } else {
+              return { status: 'success', result: { isSubscribed: false } };
+            }
+          } else {
+            return { status: 'success', result: { isSubscribed: false } };
+          }
+        } else {
+          return { status: 'error', result: 'User not found!' };
+        }
+      } else {
+        return { status: 'error', result: 'Invalid session token!' };
+      }
+    } catch (err) {
+      console.log('Err in get subscription2', err.message);
+      return { status: 'error', result: err.message };
+    }
+  } else {
+    return { status: 'error', result: 'Invalid session token!' };
   }
 }

apps/OpenSignServer/cloud/parsefunction/getUserDetails.js

@@ -5,6 +5,7 @@ async function getUserDetails(request) {
     userQuery.equalTo('Email', request.params.email);
     userQuery.include('TenantId');
     userQuery.include('UserId');
+    userQuery.exclude('google_refresh_token')
     if (userId) {
       userQuery.equalTo('CreatedBy', { __type: 'Pointer', className: '_User', objectId: userId });
     }

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

@@ -15,23 +15,44 @@ export default async function GenerateCertificate(docDetails) {
   const title = 25;
   const subtitle = 20;
   const text = 14;
+  const timeText = 11;
   const textKeyColor = rgb(0.12, 0.12, 0.12);
   const textValueColor = rgb(0.3, 0.3, 0.3);
-  const completedAt = new Date(docDetails.updatedAt);
+  const completedAt = new Date();
   const completedUTCtime = completedAt.toUTCString();
   const signersCount = docDetails?.Signers?.length || 1;
-  const createdAt = new Date();
-  const createdUTCTime = createdAt.toUTCString();
-  const createDate = 'Generated On ' + createdUTCTime;
+  const generateAt = new Date();
+  const generatedUTCTime = generateAt.toUTCString();
+  const generatedOn = 'Generated On ' + generatedUTCTime;
+  const OriginIp = docDetails?.OriginIp || '';
   const company = docDetails?.ExtUserPtr?.Company || '';
+  const createdAt = docDetails?.DocSentAt?.iso || docDetails.createdAt;
   const auditTrail =
-    docDetails.AuditTrail?.length > 1
+    docDetails?.Signers?.length > 0
       ? docDetails.AuditTrail.map(x => {
           const data = docDetails.Signers.find(y => y.objectId === x.UserPtr.objectId);
-          return { ...data, ipAddress: x.ipAddress };
+          return {
+            ...data,
+            ipAddress: x.ipAddress,
+            SignedOn: x?.SignedOn || generatedUTCTime,
+            ViewedOn: x?.ViewedOn || x?.SignedOn || generatedUTCTime,
+            Signature: x?.Signature || '',
+          };
         })
-      : [{ ...docDetails.ExtUserPtr, ipAddress: docDetails?.AuditTrail[0].ipAddress }];
+      : [
+          {
+            ...docDetails.ExtUserPtr,
+            ipAddress: docDetails?.AuditTrail[0].ipAddress,
+            SignedOn: docDetails?.AuditTrail[0]?.SignedOn || generatedUTCTime,
+            ViewedOn:
+              docDetails?.AuditTrail[0]?.ViewedOn ||
+              docDetails?.AuditTrail[0]?.SignedOn ||
+              generatedUTCTime,
+            Signature: docDetails?.AuditTrail[0]?.Signature || '',
+          },
+        ];
 
+  const half = width / 2;
   // Draw a border
   page.drawRectangle({
     x: startX,
@@ -48,7 +69,7 @@ export default async function GenerateCertificate(docDetails) {
     height: 25,
   });
 
-  page.drawText(createDate, {
+  page.drawText(generatedOn, {
     x: 320,
     y: 810,
     size: 12,
@@ -127,8 +148,7 @@ export default async function GenerateCertificate(docDetails) {
     font: timesRomanFont,
     color: textValueColor,
   });
-
-  page.drawText('Completed on :', {
+  page.drawText('Created on :', {
     x: 30,
     y: 625,
     size: text,
@@ -136,15 +156,14 @@ export default async function GenerateCertificate(docDetails) {
     color: textKeyColor,
   });
 
-  page.drawText(`${completedUTCtime}`, {
-    x: 120,
+  page.drawText(`${new Date(createdAt).toUTCString()}`, {
+    x: 105,
     y: 625,
     size: text,
     font: timesRomanFont,
     color: textValueColor,
   });
-
-  page.drawText('Signers :', {
+  page.drawText('Completed on :', {
     x: 30,
     y: 605,
     size: text,
@@ -152,35 +171,102 @@ export default async function GenerateCertificate(docDetails) {
     color: textKeyColor,
   });
 
+  page.drawText(`${completedUTCtime}`, {
+    x: 125,
+    y: 605,
+    size: text,
+    font: timesRomanFont,
+    color: textValueColor,
+  });
+  page.drawText('Signers :', {
+    x: 30,
+    y: 585,
+    size: text,
+    font: timesRomanFont,
+    color: textKeyColor,
+  });
+
   page.drawText(`${signersCount}`, {
     x: 80,
-    y: 605,
+    y: 585,
+    size: text,
+    font: timesRomanFont,
+    color: textValueColor,
+  });
+  page.drawText('Document originator', {
+    x: 30,
+    y: 565,
+    size: 17,
+    font: timesRomanFont,
+    color: titleColor,
+  });
+  page.drawText('Name :', {
+    x: 60,
+    y: 545,
+    size: text,
+    font: timesRomanFont,
+    color: textKeyColor,
+  });
+  page.drawText(`${docDetails.ExtUserPtr.Name}`, {
+    x: 105,
+    y: 545,
+    size: text,
+    font: timesRomanFont,
+    color: textValueColor,
+  });
+  page.drawText('Email :', {
+    x: 60,
+    y: 525,
+    size: text,
+    font: timesRomanFont,
+    color: textKeyColor,
+  });
+  page.drawText(`${docDetails.ExtUserPtr.Email}`, {
+    x: 105,
+    y: 525,
+    size: text,
+    font: timesRomanFont,
+    color: textValueColor,
+  });
+  page.drawText('IP address :', {
+    x: 60,
+    y: 505,
+    size: text,
+    font: timesRomanFont,
+    color: textKeyColor,
+  });
+  page.drawText(`${OriginIp}`, {
+    x: 130,
+    y: 505,
     size: text,
     font: timesRomanFont,
     color: textValueColor,
   });
 
   page.drawLine({
-    start: { x: 30, y: 565 },
-    end: { x: width - 30, y: 565 },
+    start: { x: 30, y: 495 },
+    end: { x: width - 30, y: 495 },
     color: rgb(0.12, 0.12, 0.12),
     thickness: 0.5,
   });
-  page.drawText('Recipients', {
-    x: 30,
-    y: 575,
-    size: subtitle,
-    font: timesRomanFont,
-    color: titleColor,
-  });
-  let yPosition1 = 550;
-  let yPosition2 = 530;
-  let yPosition3 = 510;
-  let yPosition4 = 500;
-  auditTrail.forEach(x => {
-    page.drawText('Name :', {
+  let yPosition1 = 475;
+  let yPosition2 = 455;
+  let yPosition3 = 435;
+  let yPosition4 = 415;
+  let yPosition5 = 395;
+  let yPosition6 = 360;
+  auditTrail.slice(0, 3).forEach(async (x, i) => {
+    const embedPng = x.Signature ? await pdfDoc.embedPng(x.Signature) : '';
+    page.drawText(`Signer ${i + 1}`, {
       x: 30,
       y: yPosition1,
+      size: subtitle,
+      font: timesRomanFont,
+      color: titleColor,
+    });
+    page.drawText('Name :', {
+      x: 30,
+      y: yPosition2,
       size: text,
       font: timesRomanFont,
       color: textKeyColor,
@@ -188,15 +274,31 @@ export default async function GenerateCertificate(docDetails) {
 
     page.drawText(x?.Name, {
       x: 75,
-      y: yPosition1,
+      y: yPosition2,
       size: text,
       font: timesRomanFont,
       color: textValueColor,
     });
 
+    page.drawText('Viewed on :', {
+      x: half + 55,
+      y: yPosition2,
+      size: timeText,
+      font: timesRomanFont,
+      color: textKeyColor,
+    });
+
+    page.drawText(`${new Date(x.ViewedOn).toUTCString()}`, {
+      x: half + 112,
+      y: yPosition2,
+      size: timeText,
+      font: timesRomanFont,
+      color: textValueColor,
+    });
+
     page.drawText('Email :', {
       x: 30,
-      y: yPosition2,
+      y: yPosition3,
       size: text,
       font: timesRomanFont,
       color: textKeyColor,
@@ -204,41 +306,271 @@ export default async function GenerateCertificate(docDetails) {
 
     page.drawText(x?.Email, {
       x: 75,
-      y: yPosition2,
+      y: yPosition3,
       size: text,
       font: timesRomanFont,
       color: textValueColor,
     });
 
-    page.drawText('Accessed from :', {
+    page.drawText('Signed on :', {
+      x: half + 55,
+      y: yPosition3 + 5,
+      size: timeText,
+      font: timesRomanFont,
+      color: textKeyColor,
+    });
+
+    page.drawText(`${new Date(x.SignedOn).toUTCString()}`, {
+      x: half + 108,
+      y: yPosition3 + 5,
+      size: timeText,
+      font: timesRomanFont,
+      color: textValueColor,
+    });
+
+    page.drawText('IP address :', {
       x: 30,
-      y: yPosition3,
+      y: yPosition4,
       size: text,
       font: timesRomanFont,
       color: textKeyColor,
     });
 
     page.drawText(x?.ipAddress, {
-      x: 125,
-      y: yPosition3,
-      size: text,
+      x: 100,
+      y: yPosition4,
+      size: 13,
+      font: timesRomanFont,
+      color: textValueColor,
+    });
+    page.drawText('Security level :', {
+      x: half + 55,
+      y: yPosition4 + 10,
+      size: timeText,
+      font: timesRomanFont,
+      color: textKeyColor,
+    });
+
+    page.drawText(`Email, OTP Auth`, {
+      x: half + 125,
+      y: yPosition4 + 10,
+      size: timeText,
       font: timesRomanFont,
       color: textValueColor,
     });
 
+    page.drawText('Signature :', {
+      x: 30,
+      y: yPosition5,
+      size: text,
+      font: timesRomanFont,
+      color: textKeyColor,
+    });
+
+    page.drawRectangle({
+      x: 98,
+      y: yPosition5 - 30,
+      width: 104,
+      height: 44,
+      borderColor: rgb(0.22, 0.18, 0.47),
+      borderWidth: 1,
+    });
+    if (embedPng) {
+      page.drawImage(embedPng, {
+        x: 100,
+        y: yPosition5 - 27,
+        width: 100,
+        height: 40,
+      });
+    }
     page.drawLine({
-      start: { x: 30, y: yPosition4 },
-      end: { x: width - 30, y: yPosition4 },
+      start: { x: 30, y: yPosition6 },
+      end: { x: width - 30, y: yPosition6 },
       color: rgb(0.12, 0.12, 0.12),
       thickness: 0.5,
     });
 
-    yPosition1 = yPosition4 - 20;
+    yPosition1 = yPosition6 - 20;
     yPosition2 = yPosition1 - 20;
     yPosition3 = yPosition2 - 20;
-    yPosition4 = yPosition4 - 70;
+    yPosition4 = yPosition3 - 20;
+    yPosition5 = yPosition4 - 20;
+    yPosition6 = yPosition6 - 140;
   });
 
+  if (auditTrail.length > 3) {
+    let currentPageIndex = 1;
+    let currentPage = page;
+    auditTrail.slice(3).forEach(async (x, i) => {
+      const embedPng = x.Signature ? await pdfDoc.embedPng(x.Signature) : '';
+
+      // Calculate remaining space on current page
+      const remainingSpace = yPosition6;
+
+      // If there's not enough space for the next entry, create a new page
+      if (remainingSpace < 90) {
+        // Adjust the value as needed
+        currentPageIndex++;
+        currentPage = pdfDoc.addPage();
+        currentPage.drawRectangle({
+          x: startX,
+          y: startY,
+          width: width - 2 * startX,
+          height: height - 2 * startY,
+          borderColor: borderColor,
+          borderWidth: 1,
+        });
+        yPosition1 = currentPage.getHeight() - 40;
+        yPosition2 = yPosition1 - 20;
+        yPosition3 = yPosition2 - 20;
+        yPosition4 = yPosition3 - 20;
+        yPosition5 = yPosition4 - 20;
+        yPosition6 = currentPage.getHeight() - 160;
+      }
+
+      currentPage.drawText(`Signer ${4 + i}`, {
+        x: 30,
+        y: yPosition1,
+        size: subtitle,
+        font: timesRomanFont,
+        color: titleColor,
+      });
+      currentPage.drawText('Name :', {
+        x: 30,
+        y: yPosition2,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      currentPage.drawText(x?.Name, {
+        x: 75,
+        y: yPosition2,
+        size: text,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+
+      currentPage.drawText('Viewed on :', {
+        x: half,
+        y: yPosition2,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      currentPage.drawText(`${new Date(x.ViewedOn).toUTCString()}`, {
+        x: half + 75,
+        y: yPosition2,
+        size: text,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+
+      currentPage.drawText('Email :', {
+        x: 30,
+        y: yPosition3,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      currentPage.drawText(x?.Email, {
+        x: 75,
+        y: yPosition3,
+        size: text,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+
+      currentPage.drawText('Signed on :', {
+        x: half,
+        y: yPosition3,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      currentPage.drawText(`${new Date(x.SignedOn).toUTCString()}`, {
+        x: half + 70,
+        y: yPosition3,
+        size: text,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+
+      currentPage.drawText('IP address :', {
+        x: 30,
+        y: yPosition4,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      currentPage.drawText(x?.ipAddress, {
+        x: 100,
+        y: yPosition4,
+        size: text,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+      currentPage.drawText('Security level :', {
+        x: half,
+        y: yPosition4,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+
+      currentPage.drawText(`Email, OTP Auth`, {
+        x: half + 90,
+        y: yPosition4,
+        size: text,
+        font: timesRomanFont,
+        color: textValueColor,
+      });
+
+      currentPage.drawText('Signature :', {
+        x: 30,
+        y: yPosition5,
+        size: text,
+        font: timesRomanFont,
+        color: textKeyColor,
+      });
+      currentPage.drawRectangle({
+        x: 98,
+        y: yPosition5 - 27,
+        width: 104,
+        height: 44,
+        borderColor: rgb(0.22, 0.18, 0.47),
+        borderWidth: 1,
+      });
+      if (embedPng) {
+        currentPage.drawImage(embedPng, {
+          x: 100,
+          y: yPosition5 - 25,
+          width: 100,
+          height: 40,
+        });
+      }
+
+      currentPage.drawLine({
+        start: { x: 30, y: yPosition6 },
+        end: { x: width - 30, y: yPosition6 },
+        color: rgb(0.12, 0.12, 0.12),
+        thickness: 0.5,
+      });
+
+      // Update y positions for the next entry
+      yPosition1 = yPosition6 - 20;
+      yPosition2 = yPosition1 - 20;
+      yPosition3 = yPosition2 - 20;
+      yPosition4 = yPosition3 - 20;
+      yPosition5 = yPosition4 - 20;
+      yPosition6 = yPosition6 - 140;
+    });
+  }
+
   const pdfBytes = await pdfDoc.save();
   return pdfBytes;
 }

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

@@ -8,85 +8,96 @@ 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, a) {
+async function uploadFile(e, t) {
   try {
-    var t = fs.readFileSync(a),
-      s = new Parse.File(e, [...t], 'application/pdf'),
-      r = (await s.save({ useMasterKey: !0 }), s.url());
-    return { imageUrl: r };
+    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(a);
+    console.log('Err ', e), fs.unlinkSync(t);
   }
 }
-async function updateDoc(t, s, r, i, o, n) {
+async function updateDoc(a, r, i, s, o, n, l) {
   try {
-    var l = {
-      UserPtr: { __type: 'Pointer', className: n, objectId: r },
-      SignedUrl: s,
-      Activity: 'Signed',
-      ipAddress: i,
-    };
+    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 d = (e = o.AuditTrail && 0 < o.AuditTrail.length ? [...o.AuditTrail, l] : [l]).filter(
-      e => 'Signed' === e.Activity
-    );
-    let a = !1;
-    !((o.Signers && 0 < o.Signers.length && d.length !== o.Signers.length) || !(a = !0));
-    var c = { SignedUrl: s, AuditTrail: e, IsCompleted: a };
-    await axios.put(serverUrl + '/classes/contracts_Document/' + t, c, {
+    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: a, message: 'success', AuditTrail: e };
+    return { isCompleted: t, message: 'success', AuditTrail: e };
   } catch (e) {
     return console.log('update doc err ', e), 'err';
   }
 }
 async function sendCompletedMail(e) {
-  var a = e.url,
-    t = e.doc,
-    s = e.doc.ExtUserPtr,
-    r = t.Name,
-    i = s.Email;
-  let o = `Document "${r}" has been signed by all parties`,
+  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>"${r}"</b>` +
+      `<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 ' +
-      s.Email +
+      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,
-        d,
         c,
+        d,
         p,
         m,
         g = new Parse.Query('partners_Tenant');
-      g.equalTo('UserId', { __type: 'Pointer', className: '_User', objectId: s.UserId.objectId });
-      const u = await g.first();
-      u &&
-        ((l = JSON.parse(JSON.stringify(u)))?.CompletionSubject && (o = l?.CompletionSubject),
+      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),
-        (d = t.ExpiryDate.iso),
-        (c = new Date(d).toLocaleDateString('en-US', {
+        (c = a.ExpiryDate.iso),
+        (d = new Date(c).toLocaleDateString('en-US', {
           day: 'numeric',
           month: 'long',
           year: 'numeric',
         })),
         (p = {
-          document_title: r,
-          sender_name: s.Name,
-          sender_mail: s.Email,
-          sender_phone: s.Phone,
-          receiver_name: s.Name,
-          receiver_email: s.Email,
-          receiver_phone: s.Phone,
-          expiry_date: c,
-          company_name: s.Company,
+          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),
@@ -94,16 +105,17 @@ async function sendCompletedMail(e) {
     } catch (e) {
       console.log('error in fetch tenant in signpdf', e.message);
     }
-  e = {
-    extUserId: s.objectId,
-    url: a,
+  g = {
+    extUserId: r.objectId,
+    url: t,
     from: 'OpenSign™',
-    recipient: i,
+    recipient: s,
     subject: o,
-    pdfName: r,
+    pdfName: i,
     html: n,
+    mailProvider: e.mailProvider,
   };
-  await axios.post(serverUrl + '/functions/sendmailv3', e, {
+  await axios.post(serverUrl + '/functions/sendmailv3', g, {
     headers: {
       'Content-Type': 'application/json',
       'X-Parse-Application-Id': APPID,
@@ -111,44 +123,40 @@ async function sendCompletedMail(e) {
     },
   });
 }
-async function sendDoctoWebhook(t, e, a, s) {
-  let r = [];
-  (r = s
-    ? { name: s?.Name, email: s?.Email, phone: s?.Phone }
-    : t?.data?.Signers?.map(e => ({ name: e.Name, email: e.Email, phone: e.Phone })) || [
-        {
-          name: t?.data?.ExtUserPtr?.Name,
-          email: t?.data?.ExtUserPtr?.Email,
-          phone: t?.data?.ExtUserPtr?.Phone,
-        },
+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 },
       ]),
-    t.data.ExtUserPtr?.Webhook &&
-      ((s =
-        'signed' === a
-          ? { signer: r, signedAt: new Date() }
-          : { signers: r, completedAt: new Date() }),
-      (a = {
-        event: a,
-        objectId: t?.data?.objectId,
+    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: t?.data?.Name,
-        note: t?.data?.Note || '',
-        description: t?.data?.Description || '',
-        ...s,
-        createdAt: t?.data?.createdAt,
+        name: a?.Name,
+        note: a?.Note || '',
+        description: a?.Description || '',
+        ...r,
+        createdAt: a?.createdAt,
       }),
-      await axios
-        .post(t?.data?.ExtUserPtr?.Webhook, a, { headers: { 'Content-Type': 'application/json' } })
+      axios
+        .post(a?.ExtUserPtr?.Webhook, t, { headers: { 'Content-Type': 'application/json' } })
         .then(e => {
           try {
-            var a = new Parse.Object('contracts_Webhook');
-            a.set('Log', e?.status),
-              a.set('UserId', {
+            var t = new Parse.Object('contracts_Webhook');
+            t.set('Log', e?.status),
+              t.set('UserId', {
                 __type: 'Pointer',
                 className: '_User',
-                objectId: t.data.ExtUserPtr.UserId.objectId,
+                objectId: a.ExtUserPtr.UserId.objectId,
               }),
-              a.save(null, { useMasterKey: !0 });
+              t.save(null, { useMasterKey: !0 });
           } catch (e) {
             console.log('err save in contracts_Webhook', e.message);
           }
@@ -156,203 +164,162 @@ async function sendDoctoWebhook(t, e, a, s) {
         .catch(e => {
           console.log('Err send data to webhook', e.message);
           try {
-            var a = new Parse.Object('contracts_Webhook');
-            a.set('Log', e?.status),
-              a.set('UserId', {
+            var t = new Parse.Object('contracts_Webhook');
+            t.set('Log', e?.status),
+              t.set('UserId', {
                 __type: 'Pointer',
                 className: '_User',
-                objectId: t.data.ExtUserPtr.UserId.objectId,
+                objectId: a.ExtUserPtr.UserId.objectId,
               }),
-              a.save(null, { useMasterKey: !0 });
+              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 {
-    var n = o.params.docId,
-      e = o.params.userId,
-      l = o.params.isCustomCompletionMail,
-      d = await axios.get(
-        serverUrl + '/classes/contracts_Document/' + n + '?include=ExtUserPtr,Signers',
-        {
-          headers: {
-            'Content-Type': 'application/json',
-            'X-Parse-Application-Id': APPID,
-            'X-Parse-Master-Key': masterKEY,
-          },
-        }
-      ),
-      c = await axios.get(serverUrl + '/users/me', {
-        headers: {
-          'X-Parse-Application-Id': APPID,
-          'X-Parse-Session-Token': o.headers.sessiontoken,
-        },
-      });
-    if (!c.data || !c.data.objectId) return { status: 'error', message: 'This user not allowed!' };
+    if (!o?.user)
+      throw new Parse.Error(Parse.Error.INVALID_SESSION_TOKEN, 'User is not authenticated.');
     {
-      var a,
-        t,
-        s,
-        p = JSON.stringify({ objectId: e });
-      let r, i;
-      i = e
-        ? (a = await axios.get(serverUrl + '/classes/contracts_Contactbook?where=' + p, {
-            headers: {
-              'X-Parse-Application-Id': APPID,
-              'X-Parse-Session-Token': o.headers.sessiontoken,
-            },
-          })).data && 0 < a.data.results.length
-          ? ((r = a), 'contracts_Contactbook')
-          : ((r = await axios.get(serverUrl + '/classes/contracts_Users?where=' + p, {
-              headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
-            })),
-            'contracts_Users')
-        : ((t = JSON.stringify({
-            UserId: { __type: 'Pointer', className: '_User', objectId: c.data.objectId },
-          })),
-          (s = await axios.get(serverUrl + '/classes/contracts_Users?where=' + t, {
-            headers: { 'X-Parse-Application-Id': APPID, 'X-Parse-Master-Key': masterKEY },
-          })).data && 0 < s.data.results.length
-            ? ((r = s), 'contracts_Users')
-            : ((r = await axios.get(serverUrl + '/classes/contracts_Contactbook?where=' + t, {
-                headers: {
-                  'X-Parse-Application-Id': APPID,
-                  'X-Parse-Session-Token': o.headers.sessiontoken,
-                },
-              })),
-              'contracts_Contactbook'));
-      var m = r.data.results[0].Name,
-        g = r.data.results[0].Email;
-      if (!o.params.pdfFile) return { status: 'error', message: 'Pdf file not present!' };
+      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'),
-          f = {
-            UserPtr: { __type: 'Pointer', className: i, objectId: r.data.results[0].objectId },
+          y = {
+            UserPtr: { __type: 'Pointer', className: s, objectId: i.objectId },
             SignedUrl: '',
             Activity: 'Signed',
             ipAddress: o.headers['x-real-ip'],
           };
-        let a;
-        var P = (a =
-          d.data.AuditTrail && 0 < d.data.AuditTrail.length
-            ? [...d.data.AuditTrail, f]
-            : [f]).filter(e => 'Signed' === e.Activity);
-        let t = !1;
-        !(
-          (d.data.Signers && 0 < d.data.Signers.length && P.length !== d.data.Signers.length) ||
-          !(t = !0)
+        let t;
+        var P = (t = p.AuditTrail && 0 < p.AuditTrail.length ? [...p.AuditTrail, y] : [y]).filter(
+          e => 'Signed' === e.Activity
         );
-        var y,
+        let a = !1;
+        !((p.Signers && 0 < p.Signers.length && P.length !== p.Signers.length) || !(a = !0));
+        var v,
           b,
-          v,
-          U,
-          I,
+          S,
           w,
-          D = `exported_file_${Math.floor(5e3 * Math.random())}.pdf`,
-          S = './exports/' + D;
-        let s = e.length;
-        s = (
-          t
-            ? ((y = d.data.Signers?.map(e => e.Name + ' <' + e.Email + '>')),
+          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 =
-                y && 0 < y.length
+                v && 0 < v.length
                   ? ((b = await PDFDocument.load(e)),
                     pdflibAddPlaceholder({
                       pdfDoc: b,
-                      reason: 'Digitally signed by OpenSign for ' + y?.join(', '),
+                      reason: 'Digitally signed by OpenSign for ' + v?.join(', '),
                       location: 'n/a',
                       signatureLength: 15e3,
                     }),
-                    (v = await b.save()),
-                    Buffer.from(v))
-                  : ((U = await PDFDocument.load(e)),
+                    (S = await b.save()),
+                    Buffer.from(S))
+                  : ((w = await PDFDocument.load(e)),
                     pdflibAddPlaceholder({
-                      pdfDoc: U,
-                      reason: 'Digitally signed by OpenSign for ' + m + ' <' + g + '>',
+                      pdfDoc: w,
+                      reason: 'Digitally signed by OpenSign for ' + g + ' <' + f + '>',
                       location: 'n/a',
                       signatureLength: 15e3,
                     }),
-                    (I = await U.save()),
-                    Buffer.from(I))),
-              (w = await new SignPDF(e, h).signPDF()),
-              fs.writeFileSync(S, w),
-              w)
-            : (fs.writeFileSync(S, e), e)
+                    (U = await w.save()),
+                    Buffer.from(U))),
+              (D = await new SignPDF(e, h).signPDF()),
+              fs.writeFileSync(_, D),
+              D)
+            : (fs.writeFileSync(_, e), e)
         ).length;
-        var _,
-          A,
-          x,
-          E,
-          j,
-          k,
-          F,
-          C,
-          T,
-          N = await uploadFile(D, S);
-        if (N && N.imageUrl)
-          return (
-            (_ = await updateDoc(
+        var E = await uploadFile(I, _);
+        if (E && E.imageUrl) {
+          var x,
+            A,
+            j = await updateDoc(
               o.params.docId,
-              N.imageUrl,
-              r.data.results[0].objectId,
+              E.imageUrl,
+              i.objectId,
               o.headers['x-real-ip'],
-              d.data,
-              i
-            )),
-            sendDoctoWebhook(d, N.imageUrl, 'signed', r?.data.results?.[0]),
-            saveFileUsage(s, N.imageUrl, c.data.objectId),
-            _ &&
-              _.isCompleted &&
-              ((A = { ...d.data, AuditTrail: _.AuditTrail }),
-              (x = await GenerateCertificate(A)),
-              (E = await PDFDocument.load(x)),
-              pdflibAddPlaceholder({
-                pdfDoc: E,
-                reason: 'Digitally signed by OpenSign.',
-                location: 'n/a',
-                signatureLength: 15e3,
-              }),
-              (j = await E.save()),
-              (k = Buffer.from(j)),
-              (F = await new SignPDF(k, h).signPDF()),
-              fs.writeFileSync('./exports/certificate.pdf', F),
-              (T = {
-                CertificateUrl: (C = await uploadFile(
-                  'certificate.pdf',
-                  './exports/certificate.pdf'
-                )).imageUrl,
-              }),
-              await axios.put(serverUrl + '/classes/contracts_Document/' + n, T, {
-                headers: {
-                  'Content-Type': 'application/json',
-                  'X-Parse-Application-Id': APPID,
-                  'X-Parse-Master-Key': masterKEY,
-                },
-              }),
-              d.data.IsSendMail && !1 === d.data.IsSendMail
-                ? console.log("don't send mail")
-                : sendCompletedMail({ url: N.imageUrl, isCustomMail: l, doc: d.data }),
-              saveFileUsage(k.length, C.imageUrl, c.data.objectId),
-              sendDoctoWebhook(d, N.imageUrl, 'completed')),
-            fs.unlinkSync(S),
-            console.log('New Signed PDF created called: ' + S),
-            'success' === _.message
-              ? { status: 'success', data: N.imageUrl }
-              : { status: 'error', message: 'Please provide required parameters!' }
-          );
+              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) {
-    return (
-      console.log('Err ', e),
-      'ERR_BAD_REQUEST' === e.code
-        ? { status: 'error', message: 'Invalid session token!' }
-        : { status: 'error', message: 'Encrypted files are currently not supported!' }
-    );
+    throw (console.log('Err in signpdf', e), e);
   }
 }
 export default PDF;

apps/OpenSignServer/cloud/parsefunction/saveSubscription.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-export default async function saveSubscriptio(request) {
+export default async function saveSubscription(request) {
   const serverUrl = process.env.SERVER_URL;
   const appId = process.env.APP_ID;
   const subscription = request.params.subscription;

apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js

@@ -0,0 +1,141 @@
+import axios from 'axios';
+import { google } from 'googleapis';
+import fs from 'node:fs';
+import https from 'https';
+const clientId = process.env.GOOGLE_CLIENT_ID;
+const clientSecret = process.env.GOOGLE_CLIENT_SECRET;
+// Function to create a Gmail client
+const createGmailClient = accessToken => {
+  const oauth2Client = new google.auth.OAuth2();
+  oauth2Client.setCredentials({ access_token: accessToken });
+  return google.gmail({ version: 'v1', auth: oauth2Client });
+};
+
+// Function to exchange refresh token for new access token
+const refreshAccessToken = async refreshToken => {
+  const tokenEndpoint = 'https://oauth2.googleapis.com/token';
+  const params = new URLSearchParams();
+  params.append('refresh_token', refreshToken);
+  params.append('client_id', clientId);
+  params.append('client_secret', clientSecret);
+  params.append('grant_type', 'refresh_token');
+
+  const response = await axios.post(tokenEndpoint, params);
+  return response.data.access_token;
+};
+
+// Function to create a raw email message
+const makeEmail = async (to, from, subject, html, url, pdfName) => {
+  const htmlContent = html;
+  const boundary = 'boundary_' + Date.now().toString(16);
+  let str;
+  if (url) {
+    let attachments;
+    let Pdf = fs.createWriteStream('test.pdf');
+    const writeToLocalDisk = () => {
+      return new Promise((resolve, reject) => {
+        https.get(url, async function (response) {
+          response.pipe(Pdf);
+          response.on('end', () => resolve('success'));
+        });
+      });
+    };
+    // `writeToLocalDisk` is used to create pdf file from doc url
+    const ress = await writeToLocalDisk();
+    if (ress) {
+      const file = {
+        filename: `${pdfName}.pdf` || 'exported.pdf',
+        type: 'application/pdf',
+        path: Pdf.path,
+      };
+
+      //  `certificateBuffer` used to create buffer from pdf file
+      try {
+        const certificate = {
+          filename: 'certificate.pdf',
+          type: 'application/pdf',
+          path: './exports/certificate.pdf',
+        };
+        attachments = [file, certificate];
+      } catch (err) {
+        attachments = [file];
+        console.log('Err in read certificate sendmailv3', err);
+      }
+    }
+    const attachmentParts = attachments.map(attachment => {
+      const content = fs.readFileSync(attachment.path);
+      const encodedContent = content.toString('base64');
+      return [
+        `Content-Type: ${attachment.type}\n`,
+        'MIME-Version: 1.0\n',
+        `Content-Disposition: attachment; filename="${attachment.filename}"\n`,
+        `Content-Transfer-Encoding: base64\n\n`,
+        `${encodedContent}\n`,
+      ].join('');
+    });
+
+    const attachmentBody = attachmentParts.join(`\n--${boundary}\n`);
+
+    str = [
+      'Content-Type: multipart/mixed; boundary="' + boundary + '"\n',
+      'MIME-Version: 1.0\n',
+      `To: ${to}\n`,
+      `From: ${from}\n`,
+      `Subject: ${subject}\n\n`,
+      '--' + boundary + '\n',
+      'Content-Type: text/html; charset="UTF-8"\n',
+      'MIME-Version: 1.0\n\n',
+      `${htmlContent}\n\n`,
+      `\n--${boundary}\n`,
+      attachmentBody,
+      '--' + boundary + '--',
+    ].join('');
+  } else {
+    str = [
+      'Content-Type: multipart/mixed; boundary="' + boundary + '"\n',
+      'MIME-Version: 1.0\n',
+      `To: ${to}\n`,
+      `From: ${from}\n`,
+      `Subject: ${subject}\n\n`,
+      '--' + boundary + '\n',
+      'Content-Type: text/html; charset="UTF-8"\n',
+      'MIME-Version: 1.0\n\n',
+      `${htmlContent}\n\n`,
+      '--' + boundary + '--',
+    ].join('');
+  }
+
+  const encodedMail = Buffer.from(str).toString('base64').replace(/\+/g, '-').replace(/\//g, '_');
+  return encodedMail;
+};
+export default async function sendMailGmailProvider(_extRes, template) {
+  const { sender, receiver, subject, html, url, pdfName } = template;
+
+  if (_extRes) {
+    const refresh_token = _extRes.google_refresh_token;
+    // generate access token
+    const access_token = await refreshAccessToken(refresh_token);
+
+    try {
+      // Construct email message
+      const from = sender || _extRes.Email || 'me';
+      const to = receiver;
+      const email = await makeEmail(to, from, subject, html, url, pdfName);
+      // Update Gmail client with new access token
+      const newGmail = createGmailClient(access_token);
+      // sending email with new client
+      const response = await newGmail.users.messages.send({
+        userId: 'me',
+        requestBody: {
+          raw: email,
+        },
+      });
+    //   console.log('response ', response);
+
+      return { code: 200, message: 'Email sent successfully' };
+    } catch (error) {
+      console.error('Error sending email:', error);
+      return { code: 500, message: 'Failed to send email ' + error };
+    }
+  }
+}

apps/OpenSignServer/cloud/parsefunction/sendMailv3.js

@@ -2,10 +2,10 @@ import fs from 'node:fs';
 import https from 'https';
 import formData from 'form-data';
 import Mailgun from 'mailgun.js';
-import { createTransport } from 'nodemailer';
 import { updateMailCount } from '../../Utils.js';
-
-async function sendmailv3(req) {
+import sendMailGmailProvider from './sendMailGmailProvider.js';
+import { createTransport } from 'nodemailer';
+async function sendMailProvider(req) {
   try {
     let transporterSMTP;
     let mailgunClient;
@@ -98,9 +98,7 @@ async function sendmailv3(req) {
             } catch (err) {
               console.log('Err in unlink certificate sendmailv3');
             }
-            return {
-              status: 'success',
-            };
+            return { status: 'success' };
           }
         } else {
           const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
@@ -141,9 +139,7 @@ async function sendmailv3(req) {
           if (req.params?.extUserId) {
             await updateMailCount(req.params.extUserId);
           }
-          return {
-            status: 'success',
-          };
+          return { status: 'success' };
         }
       } else {
         const res = await mailgunClient.messages.create(mailgunDomain, messageParams);
@@ -152,9 +148,7 @@ async function sendmailv3(req) {
           if (req.params?.extUserId) {
             await updateMailCount(req.params.extUserId);
           }
-          return {
-            status: 'success',
-          };
+          return { status: 'success' };
         }
       }
     }
@@ -165,5 +159,45 @@ async function sendmailv3(req) {
     }
   }
 }
+async function sendmailv3(req) {
+  const mailProvider = req.params.mailProvider || 'default';
+  if (mailProvider) {
+    try {
+      const extUserId = req.params.extUserId || '';
+      const pdfName = req.params.pdfName || '';
+      const template = {
+        sender: req.params.from || '',
+        receiver: req.params.recipient,
+        subject: req.params.subject,
+        html: req.params.html || '',
+        url: req.params.url ? req.params.url : '',
+        pdfName: pdfName,
+      };
+      const extUserQuery = new Parse.Query('contracts_Users');
+      const extRes = await extUserQuery.get(extUserId, { useMasterKey: true });
+      if (extRes) {
+        const _extRes = JSON.parse(JSON.stringify(extRes));
+        if (_extRes.google_refresh_token && mailProvider === 'google') {
+          const res = await sendMailGmailProvider(_extRes, template);
+          if (res.code === 200) {
+            await updateMailCount(req.params.extUserId);
+            return { status: 'success' };
+          } else {
+            return { status: 'error' };
+          }
+        } else {
+          const nonCustomMail = await sendMailProvider(req);
+          return nonCustomMail;
+        }
+      }
+    } catch (err) {
+      console.log('err in send custom mail', err);
+      return { status: 'error' };
+    }
+  } else {
+    const nonCustomMail = await sendMailProvider(req);
+    return nonCustomMail;
+  }
+}
 
 export default sendmailv3;

apps/OpenSignServer/index.js

@@ -1,9 +1,5 @@
-// Example express application adding the parse-server module to expose Parse
-// compatible API routes.
-
 import dotenv from 'dotenv';
 dotenv.config();
-
 import express from 'express';
 import cors from 'cors';
 import { ParseServer } from 'parse-server';
@@ -21,9 +17,10 @@ import { exec } from 'child_process';
 import { createTransport } from 'nodemailer';
 import { app as v1 } from './cloud/customRoute/v1/apiV1.js';
 import { PostHog } from 'posthog-node';
-// console.log("configuration ", configuration);
+import { useLocal } from './Utils.js';
+
 let fsAdapter;
-if (process.env.USE_LOCAL !== 'TRUE') {
+if (useLocal !== 'true') {
   try {
     const spacesEndpoint = new AWS.Endpoint(process.env.DO_ENDPOINT);
     const s3Options = {
@@ -98,6 +95,7 @@ export const config = {
     import('./cloud/main.js');
   },
   appId: process.env.APP_ID || 'myAppId',
+  logLevel: ['error'],
   maxLimit: 500,
   maxUploadSize: '30mb',
   masterKey: process.env.MASTER_KEY, //Add your master key here. Keep it secret!
@@ -168,11 +166,6 @@ app.use(cors());
 app.use(express.json({ limit: '50mb' }));
 app.use(express.urlencoded({ limit: '50mb', extended: true }));
 app.use(function (req, res, next) {
-  // console.log("req ", req.headers);
-  // console.log("x-forwarded-for", req.headers["x-forwarded-for"]);
-  // console.log("req.ip", req.ip);
-  // console.log("req.socket.remoteAddress; ", req.socket.remoteAddress);
-  // console.log("ip", ip.address());
   req.headers['x-real-ip'] = getUserIP(req);
   next();
 });
@@ -232,7 +225,7 @@ if (!process.env.TESTING) {
   // Set the Keep-Alive and headers timeout to 100 seconds
   httpServer.keepAliveTimeout = 100000; // in milliseconds
   httpServer.headersTimeout = 100000; // in milliseconds
-  httpServer.listen(port, function () {
+  httpServer.listen(port, '0.0.0.0', function () {
     console.log('parse-server-example running on port ' + port + '.');
     const isWindows = process.platform === 'win32';
     // console.log('isWindows', isWindows);

apps/OpenSignServer/package-lock.json

@@ -14,18 +14,19 @@
         "axios": "^1.6.8",
         "cors": "^2.8.5",
         "dotenv": "^16.4.5",
-        "express": "^4.18.3",
+        "express": "^4.19.2",
         "express-sse": "^0.5.3",
         "form-data": "^4.0.0",
         "generate-api-key": "^1.0.2",
+        "googleapis": "^134.0.0",
         "jsonschema": "^1.4.1",
         "mailgun.js": "^10.2.1",
-        "mongoose": "^8.2.2",
+        "mongoose": "^8.3.3",
         "multer": "^1.4.5-lts.1",
         "multer-s3": "^3.0.1",
         "node-forge": "^1.3.1",
         "node-signpdf": "^1.5.1",
-        "nodemailer": "^6.9.12",
+        "nodemailer": "^6.9.13",
         "parse": "^5.0.0",
         "parse-dbtool": "^1.2.0",
         "parse-server": "^6.5.5",
@@ -43,7 +44,8 @@
         "mongodb-runner": "^5.5.4",
         "nodemon": "^3.1.0",
         "nyc": "15.1.0",
-        "prettier": "^3.2.5"
+        "prettier": "^3.2.5",
+        "uglify-js": "^3.17.4"
       },
       "engines": {
         "node": ">=12.22.10 <21"
@@ -3678,7 +3680,6 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
       "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==",
-      "optional": true,
       "dependencies": {
         "debug": "^4.3.4"
       },
@@ -4001,7 +4002,6 @@
       "version": "9.1.2",
       "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
       "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
-      "optional": true,
       "engines": {
         "node": "*"
       }
@@ -4123,9 +4123,9 @@
       }
     },
     "node_modules/bson": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-6.3.0.tgz",
-      "integrity": "sha512-balJfqwwTBddxfnidJZagCBPP/f48zj9Sdp3OJswREOgsJzHiQSaOIAtApSgDQFYgHqAvFkp53AFSqjMDZoTFw==",
+      "version": "6.7.0",
+      "resolved": "https://registry.npmjs.org/bson/-/bson-6.7.0.tgz",
+      "integrity": "sha512-w2IquM5mYzYZv6rs3uN2DZTOBe2a0zXLj53TGDqwF4l6Sz/XsISrisXOJihArF9+BZ6Cq/GjVht7Sjfmri7ytQ==",
       "engines": {
         "node": ">=16.20.1"
       }
@@ -5455,16 +5455,16 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
-      "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dependencies": {
         "accepts": "~1.3.8",
         "array-flatten": "1.1.1",
         "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",
@@ -5511,6 +5511,14 @@
       "resolved": "https://registry.npmjs.org/express-sse/-/express-sse-0.5.3.tgz",
       "integrity": "sha512-DJF0nofFGq0IXJLGq95hfrryP3ZprVAVpyZUnmAk6QhHnm7zCzsHBNFP0i4FKFo2XjOf+JiYUKjT7jQhIeljpg=="
     },
+    "node_modules/express/node_modules/cookie": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -6058,7 +6066,6 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.3.0.tgz",
       "integrity": "sha512-p+ggrQw3fBwH2F5N/PAI4k/G/y1art5OxKpb2J2chwNNHM4hHuAOtivjPuirMF4KNKwTTUal/lPfL2+7h2mEcg==",
-      "optional": true,
       "dependencies": {
         "extend": "^3.0.2",
         "https-proxy-agent": "^7.0.1",
@@ -6073,7 +6080,6 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "optional": true,
       "engines": {
         "node": ">=8"
       },
@@ -6272,10 +6278,9 @@
       }
     },
     "node_modules/google-auth-library": {
-      "version": "9.7.0",
-      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.7.0.tgz",
-      "integrity": "sha512-I/AvzBiUXDzLOy4iIZ2W+Zq33W4lcukQv1nl7C8WUA6SQwyQwUwu3waNmWNAvzds//FG8SZ+DnKnW/2k6mQS8A==",
-      "optional": true,
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.8.0.tgz",
+      "integrity": "sha512-TJJXFzMlVGRlIH27gYZ6XXyPf5Y3OItsKFfefsDAafNNywYRTkei83nEO29IrYj8GtdHWU78YnW+YZdaZaXIJA==",
       "dependencies": {
         "base64-js": "^1.3.0",
         "ecdsa-sig-formatter": "^1.0.11",
@@ -6292,7 +6297,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
       "integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
-      "optional": true,
       "dependencies": {
         "gaxios": "^6.0.0",
         "json-bigint": "^1.0.0"
@@ -6337,6 +6341,46 @@
         "uuid": "dist/bin/uuid"
       }
     },
+    "node_modules/googleapis": {
+      "version": "134.0.0",
+      "resolved": "https://registry.npmjs.org/googleapis/-/googleapis-134.0.0.tgz",
+      "integrity": "sha512-o8LhD1754W6MHWtpwAPeP1WUHgNxuMxCnLMDFlMKAA5kCMTNqX9/eaTXnkkAIv6YRfoKMQ6D1vyR6/biXuhE9g==",
+      "dependencies": {
+        "google-auth-library": "^9.0.0",
+        "googleapis-common": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/googleapis-common": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/googleapis-common/-/googleapis-common-7.1.0.tgz",
+      "integrity": "sha512-p3KHiWDBBWJEXk6SYauBEvxw5+UmRy7k2scxGtsNv9eHsTbpopJ3/7If4OrNnzJ9XMLg3IlyQXpVp8YPQsStiw==",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "gaxios": "^6.0.3",
+        "google-auth-library": "^9.7.0",
+        "qs": "^6.7.0",
+        "url-template": "^2.0.8",
+        "uuid": "^9.0.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/googleapis-common/node_modules/uuid": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
+      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "funding": [
+        "https://github.com/sponsors/broofa",
+        "https://github.com/sponsors/ctavan"
+      ],
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
     "node_modules/gopd": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
@@ -6401,7 +6445,6 @@
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
       "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
-      "optional": true,
       "dependencies": {
         "gaxios": "^6.0.0",
         "jws": "^4.0.0"
@@ -6613,7 +6656,6 @@
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
       "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
-      "optional": true,
       "dependencies": {
         "agent-base": "^7.0.2",
         "debug": "4"
@@ -7370,7 +7412,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
       "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
-      "optional": true,
       "dependencies": {
         "bignumber.js": "^9.0.0"
       }
@@ -7522,7 +7563,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
       "integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
-      "optional": true,
       "dependencies": {
         "buffer-equal-constant-time": "1.0.1",
         "ecdsa-sig-formatter": "1.0.11",
@@ -7549,16 +7589,15 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
       "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
-      "optional": true,
       "dependencies": {
         "jwa": "^2.0.0",
         "safe-buffer": "^5.0.1"
       }
     },
     "node_modules/kareem": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.5.1.tgz",
-      "integrity": "sha512-7jFxRVm+jD+rkq3kY0iZDJfsO2/t4BBPeEb2qKn2lR/9KhuksYk5hxzfRYWMPV8P/x2d0kHD306YyWLzjjH+uA==",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/kareem/-/kareem-2.6.3.tgz",
+      "integrity": "sha512-C3iHfuGUXK2u8/ipq9LfjFfXFxAZMQJJq7vLS45r3D9Y2xQ/m4S8zaR4zMLFWh9AsNPXmcFfUDhTEO8UIC/V6Q==",
       "engines": {
         "node": ">=12.0.0"
       }
@@ -7922,12 +7961,12 @@
       }
     },
     "node_modules/mongodb": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.3.0.tgz",
-      "integrity": "sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.5.0.tgz",
+      "integrity": "sha512-Fozq68InT+JKABGLqctgtb8P56pRrJFkbhW0ux+x1mdHeyinor8oNzJqwLjV/t5X5nJGfTlluxfyMnOXNggIUA==",
       "dependencies": {
-        "@mongodb-js/saslprep": "^1.1.0",
-        "bson": "^6.2.0",
+        "@mongodb-js/saslprep": "^1.1.5",
+        "bson": "^6.4.0",
         "mongodb-connection-string-url": "^3.0.0"
       },
       "engines": {
@@ -8273,13 +8312,13 @@
       }
     },
     "node_modules/mongoose": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.2.2.tgz",
-      "integrity": "sha512-6sMxe1d3k/dBjiOX4ExNTNOP0g1x0iq8eXyg+ttgIXM3HLnQ0IUyXRwVVAPFFY6O4/8uYN5dB0Ec72FrexbPpw==",
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.3.3.tgz",
+      "integrity": "sha512-3kSk0db9DM2tLttCdS6WNRqewPleamFEa4Vz/Qldc0dB4Zow/FiZxb9GExHTJjBZQ9T2xiGleQ3GzRrES3hhsA==",
       "dependencies": {
-        "bson": "^6.2.0",
-        "kareem": "2.5.1",
-        "mongodb": "6.3.0",
+        "bson": "^6.5.0",
+        "kareem": "2.6.3",
+        "mongodb": "6.5.0",
         "mpath": "0.9.0",
         "mquery": "5.0.0",
         "ms": "2.1.3",
@@ -8464,9 +8503,9 @@
       }
     },
     "node_modules/nodemailer": {
-      "version": "6.9.12",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.12.tgz",
-      "integrity": "sha512-pnLo7g37Br3jXbF0bl5DekBJihm2q+3bB3l2o/B060sWmb5l+VqeScAQCBqaQ+5ezRZFzW5SciZNGdRDEbq89w==",
+      "version": "6.9.13",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.13.tgz",
+      "integrity": "sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -11039,9 +11078,9 @@
       }
     },
     "node_modules/tar": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz",
-      "integrity": "sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
       "dev": true,
       "dependencies": {
         "chownr": "^2.0.0",
@@ -11365,6 +11404,18 @@
         "is-typedarray": "^1.0.0"
       }
     },
+    "node_modules/uglify-js": {
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.4.tgz",
+      "integrity": "sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==",
+      "dev": true,
+      "bin": {
+        "uglifyjs": "bin/uglifyjs"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/unbzip2-stream": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz",
@@ -11476,6 +11527,11 @@
       "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.1.tgz",
       "integrity": "sha512-jk1+QP6ZJqyOiuEI9AEWQfju/nB2Pw466kbA0LEZljHwKeMgd9WrAEgEGxjPDD2+TNbbb37rTyhEfrCXfuKXnA=="
     },
+    "node_modules/url-template": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
+      "integrity": "sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw=="
+    },
     "node_modules/url/node_modules/punycode": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",

apps/OpenSignServer/package.json

@@ -23,18 +23,19 @@
     "axios": "^1.6.8",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
-    "express": "^4.18.3",
+    "express": "^4.19.2",
     "express-sse": "^0.5.3",
     "form-data": "^4.0.0",
     "generate-api-key": "^1.0.2",
+    "googleapis": "^134.0.0",
     "jsonschema": "^1.4.1",
     "mailgun.js": "^10.2.1",
-    "mongoose": "^8.2.2",
+    "mongoose": "^8.3.3",
     "multer": "^1.4.5-lts.1",
     "multer-s3": "^3.0.1",
     "node-forge": "^1.3.1",
     "node-signpdf": "^1.5.1",
-    "nodemailer": "^6.9.12",
+    "nodemailer": "^6.9.13",
     "parse": "^5.0.0",
     "parse-dbtool": "^1.2.0",
     "parse-server": "^6.5.5",
@@ -53,7 +54,8 @@
     "mongodb-runner": "^5.5.4",
     "nodemon": "^3.1.0",
     "nyc": "15.1.0",
-    "prettier": "^3.2.5"
+    "prettier": "^3.2.5",
+    "uglify-js": "^3.17.4"
   },
   "engines": {
     "node": ">=12.22.10 <21"