Merge pull request #348 from OpenSignLabs/mismatch_attach

fix: mismatch attachment send to mail

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

@@ -74,25 +74,22 @@ const changeDateToMomentFormat = (format) => {
       return "L";
   }
 };
-
-//function to get default date
-const getDefaultdate = (selectedDate, format = "dd-MM-yyyy") => {
-  let date;
-  if (format && format === "dd-MM-yyyy") {
-    const newdate = selectedDate
-      ? selectedDate
-      : moment(new Date()).format(changeDateToMomentFormat(format));
-    const [day, month, year] = newdate.split("-");
-    date = new Date(`${year}-${month}-${day}`);
-  } else {
-    date = new Date(selectedDate);
-  }
-  const value = date;
-  return value;
-};
 //function to get default format
 const getDefaultFormat = (dateFormat) => dateFormat || "MM/dd/yyyy";
-
+//function to convert formated date to new Date() format
+const getDefaultDate = (dateStr, format) => {
+  //get valid date format for moment to convert formated date to new Date() format
+  const formats = changeDateToMomentFormat(format);
+  const parsedDate = moment(dateStr, formats);
+  let date;
+  if (parsedDate.isValid()) {
+    date = new Date(parsedDate.toISOString());
+    return date;
+  } else {
+    date = new Date();
+    return date;
+  }
+};
 function Placeholder(props) {
   //'isTouchDevice' is used to detect whether a device has a touchscreen or is mouse-based
   const isTouchDevice = navigator.maxTouchPoints > 0;
@@ -104,28 +101,16 @@ function Placeholder(props) {
   const holdTimeout = useRef(null);
   const startTime = useRef(null); // Track when the user starts holdings
   const [isDisableDragging, setIsDisableDragging] = useState(true);
-  const [selectDate, setSelectDate] = useState({
-    date:
-      props.pos.type === "date"
-        ? moment(
-            getDefaultdate(
-              props?.pos?.options?.response,
-              props.pos?.options?.validation?.format
-            ).getTime()
-          ).format(
-            changeDateToMomentFormat(props.pos?.options?.validation?.format)
-          )
-        : "",
-    format:
-      props.pos.type === "date"
-        ? getDefaultFormat(props.pos?.options?.validation?.format)
-        : ""
-  });
+  const [selectDate, setSelectDate] = useState({});
   const [dateFormat, setDateFormat] = useState([]);
   const [clickonWidget, setClickonWidget] = useState({});
   const [startDate, setStartDate] = useState(
-    props.pos.type === "date" &&
-      getDefaultdate(new Date(), props.pos?.options?.validation?.format)
+    props?.pos?.options?.response
+      ? getDefaultDate(
+          props?.pos?.options?.response,
+          props.pos?.options?.validation?.format
+        )
+      : new Date()
   );
   const [getCheckboxRenderWidth, setGetCheckboxRenderWidth] = useState({
     width: null,
@@ -164,7 +149,6 @@ function Placeholder(props) {
 
     return () => clearTimeout(timer);
   }, [props.pos]);
-
   useEffect(() => {
     const onOutsideClick = () => {
       if (!isDraggingEnabled) {
@@ -476,7 +460,7 @@ function Placeholder(props) {
       const isDateChange = true;
       const dateObj = {
         date: startDate,
-        format: selectDate.format
+        format: getDefaultFormat(props.pos?.options?.validation?.format)
       };
       handleSaveDate(dateObj, isDateChange); //function to save date and format in local array
     }
@@ -485,19 +469,18 @@ function Placeholder(props) {
   //function to save date and format on local array onchange date and onclick format
   const handleSaveDate = (data, isDateChange) => {
     let updateDate = data.date;
-    //check if date change by user
-    if (isDateChange) {
-      //`changeDateToMomentFormat` is used to convert date as per required to moment package
-      updateDate = moment(data.date).format(
-        changeDateToMomentFormat(data.format)
+    let date;
+    if (data?.format === "dd-MM-yyyy") {
+      date = isDateChange
+        ? moment(updateDate).format(changeDateToMomentFormat(data.format))
+        : updateDate;
+    } else {
+      //using moment package is used to change date as per the format provided in selectDate obj e.g. - MM/dd/yyyy -> 03/12/2024
+      const newDate = new Date(updateDate);
+      date = moment(newDate.getTime()).format(
+        changeDateToMomentFormat(data?.format)
       );
     }
-    //using moment package is used to change date as per the format provided in selectDate obj e.g. - MM/dd/yyyy -> 03/12/2024
-    //`getDefaultdate` is used to convert update date in new Date() format
-    const date = moment(
-      getDefaultdate(updateDate, data?.format).getTime()
-    ).format(changeDateToMomentFormat(data?.format));
-
     //`onChangeInput` is used to save data related to date in a placeholder field
     onChangeInput(
       date,

apps/OpenSign/src/pages/GuestLogin.js

@@ -65,7 +65,11 @@ function GuestLogin() {
   const handleServerUrl = async () => {
       setAppLogo(logo);
 
-    localStorage.clear();
+    localStorage.clear(); // Clears everything
+    localStorage.setItem(
+      "appname",
+        "OpenSign™"
+    );
     //save isGuestSigner true in local to handle login flow header in mobile view
     localStorage.setItem("isGuestSigner", true);
     saveLanguageInLocal(i18n);
@@ -220,11 +224,15 @@ function GuestLogin() {
       {isLoading.isLoad ? (
         <LoaderWithMsg isLoading={isLoading} />
       ) : (
-        <div className="p-14 h">
-          <div className="m-1 md:m-2 p-[30px] text-base-content bg-base-100 op-card shadow-md">
-            <div className="md:w-[250px] md:h-[66px] inline-block overflow-hidden mt-2 mb-11">
+        <div className="pb-1 md:pb-4 pt-10 md:px-10 lg:px-16">
+          <div className="md:p-4 lg:p-10 p-4 text-base-content bg-base-100 op-card shadow-md">
+            <div className="w-[250px] h-[66px] inline-block overflow-hidden mb-6">
               {appLogo && (
-                <img src={appLogo} className="object-contain" alt="logo" />
+                <img
+                  src={appLogo}
+                  className="object-contain h-full"
+                  alt="logo"
+                />
               )}
             </div>
             {contactId ? (

apps/OpenSign/src/primitives/DownloadPdfZip.js

@@ -65,19 +65,18 @@ function DownloadPdfZip(props) {
           throw new Error(`Failed to fetch certificate PDF: ${certificateUrl}`);
         }
         const pdf2Blob = await pdf2Response.blob();
-        // Add files to ZIP
-        zip.file(
-          `${sanitizeFileName(pdfName)}_signed_by_${appName}.pdf`,
-          pdf1Blob
-        );
-        zip.file(`Certificate_signed_by_${appName}.pdf`, pdf2Blob);
-
-        // Generate the ZIP and trigger download
-        const zipBlob = await zip.generateAsync({ type: "blob" });
-        saveAs(
-          zipBlob,
-          `${sanitizeFileName(pdfName)}_signed_by_${appName}.zip`
-        );
+          // Add files to ZIP
+          zip.file(
+            `${sanitizeFileName(pdfName)}_signed_by_${appName}.pdf`,
+            pdf1Blob
+          );
+          zip.file(`Certificate_signed_by_${appName}.pdf`, pdf2Blob);
+          // Generate the ZIP and trigger download
+          const zipBlob = await zip.generateAsync({ type: "blob" });
+          saveAs(
+            zipBlob,
+            `${sanitizeFileName(pdfName)}_signed_by_${appName}.zip`
+          );
         setSelectType(1);
         props.setIsDownloadModal(false);
         setIsDownloading("");

apps/OpenSignServer/Utils.js

@@ -5,7 +5,8 @@ import { PDFDocument } from 'pdf-lib';
 dotenv.config();
 
 export const cloudServerUrl = 'http://localhost:8080/app';
-export const appName = process.env.APP_NAME || 'OpenSign™';
+export const appName =
+  'OpenSign™';
 export function customAPIurl() {
   const url = new URL(cloudServerUrl);
   return url.pathname === '/api/app' ? url.origin + '/api' : url.origin;

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

@@ -1,7 +1,9 @@
-import { PDFDocument, StandardFonts, rgb } from 'pdf-lib';
+import { PDFDocument, rgb } from 'pdf-lib';
 import fs from 'node:fs';
 import fontkit from '@pdf-lib/fontkit';
-import { formatTimeInTimezone } from '../../../Utils.js';
+import {
+  formatTimeInTimezone,
+} from '../../../Utils.js';
 
 export default async function GenerateCertificate(docDetails) {
   const timezone = docDetails?.ExtUserPtr?.Timezone || '';
@@ -73,12 +75,12 @@ export default async function GenerateCertificate(docDetails) {
     borderColor: borderColor,
     borderWidth: 1,
   });
-  page.drawImage(pngImage, {
-    x: 30,
-    y: 790,
-    width: 100,
-    height: 25,
-  });
+    page.drawImage(pngImage, {
+      x: 30,
+      y: 790,
+      width: 100,
+      height: 25,
+    });
 
   page.drawText(generatedOn, {
     x: 320,

apps/OpenSignServer/cloud/parsefunction/sendMailGmailProvider.js

@@ -35,7 +35,8 @@ const makeEmail = async (
   bcc,
   filename,
   certificatePath,
-  replyto
+  replyto,
+  testPdf
 ) => {
   const publicUrl = new URL(process.env.SERVER_URL);
   const htmlContent = html;
@@ -46,7 +47,7 @@ const makeEmail = async (
   let str;
   if (url) {
     let attachments;
-    let Pdf = fs.createWriteStream('test.pdf');
+    let Pdf = fs.createWriteStream(testPdf);
     const writeToLocalDisk = () => {
       return new Promise((resolve, reject) => {
         const isSecure =
@@ -161,6 +162,8 @@ export default async function sendMailGmailProvider(_extRes, template) {
       // Construct email message
       const from = sender || _extRes.Email || 'me';
       const to = receiver;
+      const randomNumber = Math.floor(Math.random() * 5000);
+      const testPdf = `test_${randomNumber}.pdf`;
       const email = await makeEmail(
         to,
         from,
@@ -171,7 +174,8 @@ export default async function sendMailGmailProvider(_extRes, template) {
         bcc,
         filename,
         certificatePath,
-        replyto
+        replyto,
+        testPdf
       );
       // Update Gmail client with new access token
       const newGmail = createGmailClient(access_token);
@@ -189,6 +193,13 @@ export default async function sendMailGmailProvider(_extRes, template) {
           console.log('Err in unlink certificate sendmailgmail provider');
         }
       }
+      if (fs.existsSync(testPdf)) {
+        try {
+          fs.unlinkSync(testPdf);
+        } catch (err) {
+          console.log('Err in unlink pdf sendmailv3');
+        }
+      }
       return { code: 200, message: 'Email sent successfully' };
     } catch (error) {
       console.error('Error sending email:', error);

apps/OpenSignServer/cloud/parsefunction/sendMailv3.js

@@ -29,7 +29,9 @@ async function sendMailProvider(req, plan, monthchange) {
       }
     }
     if (req.params.url) {
-      let Pdf = fs.createWriteStream('test.pdf');
+      const randomNumber = Math.floor(Math.random() * 5000);
+      const testPdf = `test_${randomNumber}.pdf`;
+      let Pdf = fs.createWriteStream(testPdf);
       const writeToLocalDisk = () => {
         return new Promise((resolve, reject) => {
           const isSecure =
@@ -129,6 +131,13 @@ async function sendMailProvider(req, plan, monthchange) {
                 console.log('Err in unlink certificate sendmailv3');
               }
             }
+            if (fs.existsSync(testPdf)) {
+              try {
+                fs.unlinkSync(testPdf);
+              } catch (err) {
+                console.log('Err in unlink pdf sendmailv3');
+              }
+            }
             return { status: 'success' };
           }
         } else {
@@ -146,6 +155,13 @@ async function sendMailProvider(req, plan, monthchange) {
                   console.log('Err in unlink certificate sendmailv3');
                 }
               }
+              if (fs.existsSync(testPdf)) {
+                try {
+                  fs.unlinkSync(testPdf);
+                } catch (err) {
+                  console.log('Err in unlink pdf sendmailv3');
+                }
+              }
               return { status: 'success' };
             }
           } else {
@@ -156,6 +172,13 @@ async function sendMailProvider(req, plan, monthchange) {
                 console.log('Err in unlink certificate sendmailv3');
               }
             }
+            if (fs.existsSync(testPdf)) {
+              try {
+                fs.unlinkSync(testPdf);
+              } catch (err) {
+                console.log('Err in unlink pdf sendmailv3');
+              }
+            }
             return { status: 'error' };
           }
         }