diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js index 6ab64c962..311548308 100644 --- a/apps/OpenSign/src/constant/Utils.js +++ b/apps/OpenSign/src/constant/Utils.js @@ -2039,11 +2039,20 @@ export const fetchUrl = async (url, pdfName) => { } }; export const getSignedUrl = async (pdfUrl, docId) => { - const signedUrl = await Parse.Cloud.run("getsignedurl", { - url: pdfUrl, - docId: docId || "" - }); - return signedUrl; + //use only axios here due to public template sign + const axiosRes = await axios.post( + `${localStorage.getItem("baseUrl")}/functions/getsignedurl`, + { url: pdfUrl, docId: docId || "" }, + { + headers: { + "content-type": "Application/json", + "X-Parse-Application-Id": localStorage.getItem("parseAppId"), + "X-Parse-Session-Token": localStorage.getItem("accesstoken") + } + } + ); + const url = axiosRes.data.result; + return url; }; //handle download signed pdf export const handleDownloadPdf = async (pdfDetails, setIsDownloading) => { diff --git a/apps/OpenSign/src/pages/PdfRequestFiles.js b/apps/OpenSign/src/pages/PdfRequestFiles.js index 2e9e4a5c7..2d318c177 100644 --- a/apps/OpenSign/src/pages/PdfRequestFiles.js +++ b/apps/OpenSign/src/pages/PdfRequestFiles.js @@ -44,15 +44,13 @@ import SignerListComponent from "../components/pdf/SignerListComponent"; import VerifyEmail from "../components/pdf/VerifyEmail"; import PdfZoom from "../components/pdf/PdfZoom"; import { useTranslation } from "react-i18next"; -import { - DownloadPdfZip, - Loader, - TourContentWithBtn, - ModalUi, - PdfDeclineModal, - HandleError, - LoaderWithMsg -} from "../primitives"; +import ModalUi from "../primitives/ModalUi"; +import TourContentWithBtn from "../primitives/TourContentWithBtn"; +import HandleError from "../primitives/HandleError"; +import LoaderWithMsg from "../primitives/LoaderWithMsg"; +import DownloadPdfZip from "../primitives/DownloadPdfZip"; +import Loader from "../primitives/Loader"; +import PdfDeclineModal from "../primitives/PdfDeclineModal"; function PdfRequestFiles(props) { const { t } = useTranslation(); diff --git a/apps/OpenSign/src/pages/PlaceHolderSign.js b/apps/OpenSign/src/pages/PlaceHolderSign.js index 4cd427955..904505b23 100644 --- a/apps/OpenSign/src/pages/PlaceHolderSign.js +++ b/apps/OpenSign/src/pages/PlaceHolderSign.js @@ -52,18 +52,16 @@ import { useSelector } from "react-redux"; import PdfZoom from "../components/pdf/PdfZoom"; import { useTranslation } from "react-i18next"; import RotateAlert from "../components/RotateAlert"; -import { - TourContentWithBtn, - ModalUi, - HandleError, - LoaderWithMsg, - LinkUserModal, - QuotaCard, - LottieWithLoader, - Alert, - Upgrade, - Loader -} from "../primitives"; +import Loader from "../primitives/Loader"; +import ModalUi from "../primitives/ModalUi"; +import TourContentWithBtn from "../primitives/TourContentWithBtn"; +import HandleError from "../primitives/HandleError"; +import LoaderWithMsg from "../primitives/LoaderWithMsg"; +import LinkUserModal from "../primitives/LinkUserModal"; +import QuotaCard from "../primitives/QuotaCard"; +import LottieWithLoader from "../primitives/DotLottieReact"; +import Alert from "../primitives/Alert"; +import Upgrade from "../primitives/Upgrade"; function PlaceHolderSign() { const { t } = useTranslation(); diff --git a/apps/OpenSign/src/pages/SignyourselfPdf.js b/apps/OpenSign/src/pages/SignyourselfPdf.js index 2f63563ef..6648efeb8 100644 --- a/apps/OpenSign/src/pages/SignyourselfPdf.js +++ b/apps/OpenSign/src/pages/SignyourselfPdf.js @@ -52,14 +52,12 @@ import VerifyEmail from "../components/pdf/VerifyEmail"; import PdfZoom from "../components/pdf/PdfZoom"; import { useTranslation } from "react-i18next"; import RotateAlert from "../components/RotateAlert"; -import { - DownloadPdfZip, - Loader, - ModalUi, - TourContentWithBtn, - HandleError, - LoaderWithMsg -} from "../primitives"; +import DownloadPdfZip from "../primitives/DownloadPdfZip"; +import Loader from "../primitives/Loader"; +import ModalUi from "../primitives/ModalUi"; +import TourContentWithBtn from "../primitives/TourContentWithBtn"; +import HandleError from "../primitives/HandleError"; +import LoaderWithMsg from "../primitives/LoaderWithMsg"; //For signYourself inProgress section signer can add sign and complete doc sign. function SignYourSelf() { const { t } = useTranslation(); diff --git a/apps/OpenSign/src/pages/TemplatePlaceholder.js b/apps/OpenSign/src/pages/TemplatePlaceholder.js index be11b4ca0..42d0fbd9c 100644 --- a/apps/OpenSign/src/pages/TemplatePlaceholder.js +++ b/apps/OpenSign/src/pages/TemplatePlaceholder.js @@ -43,13 +43,12 @@ import { useSelector } from "react-redux"; import PdfZoom from "../components/pdf/PdfZoom"; import { useTranslation } from "react-i18next"; import RotateAlert from "../components/RotateAlert"; -import { - TourContentWithBtn, - ModalUi, - HandleError, - LoaderWithMsg, - LinkUserModal -} from "../primitives"; +import ModalUi from "../primitives/ModalUi"; +import TourContentWithBtn from "../primitives/TourContentWithBtn"; +import HandleError from "../primitives/HandleError"; +import LoaderWithMsg from "../primitives/LoaderWithMsg"; +import LinkUserModal from "../primitives/LinkUserModal"; + const TemplatePlaceholder = () => { const { t } = useTranslation(); const navigate = useNavigate(); diff --git a/apps/OpenSign/src/primitives/DownloadPdfZip.js b/apps/OpenSign/src/primitives/DownloadPdfZip.js index 3e07bb77b..17c9cd8c3 100644 --- a/apps/OpenSign/src/primitives/DownloadPdfZip.js +++ b/apps/OpenSign/src/primitives/DownloadPdfZip.js @@ -44,12 +44,12 @@ function DownloadPdfZip(props) { throw new Error(`Failed to fetch PDF: ${signedUrl}`); } const pdf1Blob = await pdf1Response.blob(); - + const isZip = true; // Fetch the Certificate (or generate its URL dynamically) const certificateUrl = await handleDownloadCertificate( pdfDetails, setIsDownloading, - true + isZip ); const pdf2Response = await fetch(certificateUrl); if (!pdf2Response.ok) { diff --git a/apps/OpenSign/src/primitives/index.js b/apps/OpenSign/src/primitives/index.js deleted file mode 100644 index 3d1ecadc3..000000000 --- a/apps/OpenSign/src/primitives/index.js +++ /dev/null @@ -1,12 +0,0 @@ -export { default as DownloadPdfZip } from "./DownloadPdfZip"; -export { default as ModalUi } from "./ModalUi"; -export { default as Loader } from "./Loader"; -export { default as TourContentWithBtn } from "./TourContentWithBtn"; -export { default as HandleError } from "./HandleError"; -export { default as LoaderWithMsg } from "./LoaderWithMsg"; -export { default as PdfDeclineModal } from "./PdfDeclineModal"; -export { default as LinkUserModal } from "./LinkUserModal"; -export { default as QuotaCard } from "./QuotaCard"; -export { default as LottieWithLoader } from "./DotLottieReact"; -export { default as Alert } from "./Alert"; -export { default as Upgrade } from "./Upgrade";