From 1d3cd02f9d4aa3ca957f94e5db94b51c1e08e011 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 9 May 2024 20:32:33 +0530 Subject: [PATCH 1/3] fix: owner's subsciption expired issue in guest login --- apps/OpenSign/src/layout/HomeLayout.js | 42 ++++++++++++++------------ 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index 4a40ee111..92d3e461b 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -27,30 +27,34 @@ const HomeLayout = () => { const [tourStatusArr, setTourStatusArr] = useState([]); 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; From d086e60ae51a4e5c184a58a496307ba76bb1a072 Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs <93375423+prafull-opensignlabs@users.noreply.github.com> Date: Thu, 9 May 2024 20:55:30 +0530 Subject: [PATCH 2/3] Revert "fix: owner's subsciption expired issue in guest login" --- apps/OpenSign/src/layout/HomeLayout.js | 42 ++++++++++++-------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index 92d3e461b..4a40ee111 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -27,34 +27,30 @@ const HomeLayout = () => { const [tourStatusArr, setTourStatusArr] = useState([]); const [tourConfigs, setTourConfigs] = useState([]); const [, setCookie] = useCookies(["accesstoken", "main_Domain"]); - const tenantId = localStorage.getItem("TenantId"); + useEffect(() => { - 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 + (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); } - })(); - saveCookies(); - } + } catch (error) { + // Session token is invalid or there was an error + setIsUserValid(false); + } + })(); + 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; From df38d15611419a2ce37337e53c45c3d0d86637ea Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs <93375423+prafull-opensignlabs@users.noreply.github.com> Date: Fri, 10 May 2024 11:12:29 +0530 Subject: [PATCH 3/3] fix: error something went wrong while signing document in request sign --- apps/OpenSign/src/constant/Utils.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/OpenSign/src/constant/Utils.js b/apps/OpenSign/src/constant/Utils.js index f342dff8d..5cf2bcf29 100644 --- a/apps/OpenSign/src/constant/Utils.js +++ b/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); + } } }