Merge pull request #716 from OpenSignLabs/fix_guestlogin

Revert "fix: owner's subsciption expired issue in guest login"

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

@@ -9,7 +9,7 @@ import { useNavigate } from "react-router-dom";
 import { themeColor } from "../../constant/const";
 import axios from "axios";
 import ModalUi from "../../primitives/ModalUi";
-import Parse from "parse";
+import { appInfo } from "../../constant/appinfo";
 
 function Header({
   isPdfRequestFiles,
@@ -64,7 +64,19 @@ function Header({
     event.preventDefault();
 
     try {
-      const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
+      // const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
+      const axiosRes = await axios.post(
+        `${appInfo.baseUrl}/functions/getsignedurl`,
+        { url: pdfUrl },
+        {
+          headers: {
+            "content-type": "Application/json",
+            "X-Parse-Application-Id": appInfo.appId,
+            "X-Parse-Session-Token": localStorage.getItem("accesstoken")
+          }
+        }
+      );
+      const url = axiosRes.data.result;
       const pdf = await getBase64FromUrl(url);
       const isAndroidDevice = navigator.userAgent.match(/Android/i);
       const isAppleDevice =
@@ -94,7 +106,19 @@ function Header({
   const handleDownloadPdf = async () => {
     const pdfName = pdfDetails[0] && pdfDetails[0].Name;
     try {
-      const url = await Parse.Cloud.run("getsignedurl", { url: pdfUrl });
+      // 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);
@@ -577,8 +601,13 @@ function Header({
         handleClose={() => setIsCertificate(false)}
       >
         <div className="p-3 md:p-5 text-[13px] md:text-base text-center">
-          <p>Completion certificate is generating,</p>
-          <p>please wait for some time if not download try again later</p>
+          <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/constant/Utils.js

@@ -566,13 +566,13 @@ export const signPdfFun = async (
     // for adding it in completion certificate
     let getSignature;
     for (let item of xyPosition) {
-      const typeExist = item.pos.some((data) => data?.type);
-      if (typeExist) {
-        getSignature = item.pos.find((data) => data?.type === "signature");
-        break;
-      } else {
-        getSignature = item.pos.find((data) => !data.isStamp);
-        break;
+      if (!getSignature) {
+        const typeExist = item.pos.some((data) => data?.type);
+        if (typeExist) {
+          getSignature = item.pos.find((data) => data?.type === "signature");
+        } else {
+          getSignature = item.pos.find((data) => !data.isStamp);
+        }
       }
     }
 

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

@@ -104,7 +104,6 @@ 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("");
@@ -225,16 +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);
-      }
-
       setExtUserId(documentData[0]?.ExtUserPtr?.objectId);
       const isCompleted =
         documentData[0].IsCompleted && documentData[0].IsCompleted;
@@ -642,9 +631,32 @@ function PdfRequestFiles() {
           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;
+            }
+          } else if (
+            documentData === "Error: Something went wrong!" ||
+            (documentData.result && documentData.result.error)
+          ) {
+            setHandleError("Error: Something went wrong!");
+          } else {
+            setHandleError("Document not Found!");
+          }
+
           // Load a PDFDocument from the existing PDF bytes
-          const existingPdfBytes = pdfArrayBuffer;
+          const existingPdfBytes = pdfArrBuffer;
           try {
             const pdfDoc = await PDFDocument.load(existingPdfBytes);
             const isSignYourSelfFlow = false;

apps/OpenSign/src/pages/PlaceHolderSign.js

@@ -830,11 +830,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) {
@@ -845,6 +845,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 = {
@@ -852,23 +875,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);
@@ -1687,8 +1713,8 @@ function PlaceHolderSign() {
                 >
                   {isSendAlert.mssg === "sure" ? (
                     <span>
-                      Please add at least one signature field for all
-                      recipients.
+                      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

@@ -480,13 +480,13 @@ function SignYourSelf() {
         Width: widgetTypeExist
           ? calculateInitialWidthHeight(dragTypeValue, widgetValue).getWidth
           : dragTypeValue === "initials"
-          ? defaultWidthHeight(dragTypeValue).width
-          : "",
+            ? defaultWidthHeight(dragTypeValue).width
+            : "",
         Height: widgetTypeExist
           ? calculateInitialWidthHeight(dragTypeValue, widgetValue).getHeight
           : dragTypeValue === "initials"
-          ? defaultWidthHeight(dragTypeValue).height
-          : "",
+            ? defaultWidthHeight(dragTypeValue).height
+            : "",
         options: addWidgetOptions(dragTypeValue)
       };
 
@@ -603,7 +603,8 @@ function SignYourSelf() {
   };
   //function for send placeholder's co-ordinate(x,y) position embed signature url or stamp url
   async function embedWidgetsData() {
-    let showAlert = false;
+    let showAlert = false,
+      isSignatureExist = false;
     try {
       for (let i = 0; i < xyPostion?.length; i++) {
         const requiredWidgets = xyPostion[i].pos.filter(
@@ -627,17 +628,26 @@ function SignYourSelf() {
             }
           }
         }
+        //condition to check exist signature widget or not
+        if (!isSignatureExist) {
+          isSignatureExist = xyPostion[i].pos.some(
+            (data) => data?.type === "signature"
+          );
+        }
       }
-      if (xyPostion.length === 0) {
+      if (xyPostion.length === 0 || !isSignatureExist) {
         setIsAlert({
+          header: "Fields required",
           isShow: true,
-          alertMessage: "Please complete your signature!"
+          alertMessage:
+            "Please ensure there's at least one signature widget added"
         });
         return;
       } else if (showAlert) {
         setIsAlert({
           isShow: true,
-          alertMessage: "Please complete your signature!"
+          alertMessage:
+            "Please ensure all field is accurately filled and meets all requirements."
         });
         return;
       } else {
@@ -713,13 +723,13 @@ function SignYourSelf() {
     // for adding it in completion certificate
     let getSignature;
     for (let item of xyPostion) {
-      const typeExist = item.pos.some((data) => data?.type);
-      if (typeExist) {
-        getSignature = item.pos.find((data) => data?.type === "signature");
-        break;
-      } else {
-        getSignature = item.pos.find((data) => !data.isStamp);
-        break;
+      if (!getSignature) {
+        const typeExist = item.pos.some((data) => data?.type);
+        if (typeExist) {
+          getSignature = item.pos.find((data) => data?.type === "signature");
+        } else {
+          getSignature = item.pos.find((data) => !data.isStamp);
+        }
       }
     }
     let base64Sign = getSignature.SignUrl;
@@ -1161,7 +1171,7 @@ function SignYourSelf() {
               <ModalUi
                 headerColor={"#dc3545"}
                 isOpen={isAlert.isShow}
-                title={"Alert"}
+                title={isAlert?.header || "Alert"}
                 handleClose={() => {
                   setIsAlert({
                     isShow: false,
@@ -1171,28 +1181,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>
 

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

@@ -88,12 +88,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 +177,7 @@ export default async function createDocumentWithTemplate(request, response) {
               object.set('Signers', templateSigner);
             }
             object.set('URL', template.URL);
+            object.set('SignedUrl', template.URL);
             object.set('CreatedBy', template.CreatedBy);
             object.set('ExtUserPtr', {
               __type: 'Pointer',

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

@@ -88,6 +88,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,6 +139,7 @@ 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);
         object.set('IsSendMail', send_email);
@@ -279,7 +289,7 @@ export default async function createDocumentwithCoordinate(request, response) {
               const objectId = contactMail[i].contactPtr.objectId;
               const hostUrl = baseUrl.origin;
               //encode this url value `${response.id}/${contactMail[i].email}/${objectId}` to base64 using `btoa` function
-              const encodeBase64 = btoa(`${response.id}/${contactMail[i].email}/${objectId}`);
+              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 : '';
@@ -332,7 +342,7 @@ export default async function createDocumentwithCoordinate(request, response) {
                 );
               } else {
                 replaceVar = {
-                  subject: `${parseExtUser.Name} has requested you to sign "${parseExtUser.Name}"`,
+                  subject: `${parseExtUser.Name} has requested you to sign "${name}"`,
                   body: email_html,
                 };
               }

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

@@ -28,7 +28,7 @@ export default async function GenerateCertificate(docDetails) {
   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 {
@@ -281,7 +281,7 @@ export default async function GenerateCertificate(docDetails) {
     });
 
     page.drawText('Viewed on :', {
-      x: half +55,
+      x: half + 55,
       y: yPosition2,
       size: timeText,
       font: timesRomanFont,