From bdb7d9be8f10381e5bf5ccd0965dd9b2b9b210d8 Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 4 Apr 2024 12:02:08 +0530 Subject: [PATCH 1/2] fix: remove unnecessary session value to save in cookies session --- apps/OpenSign/src/layout/HomeLayout.js | 50 ++++++-------------------- 1 file changed, 11 insertions(+), 39 deletions(-) diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index 913f43e7d..3554bcb9a 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -25,21 +25,7 @@ const HomeLayout = () => { const [isTour, setIsTour] = useState(false); const [tourStatusArr, setTourStatusArr] = useState([]); const [tourConfigs, setTourConfigs] = useState([]); - const [, setCookie] = useCookies([ - "TenantId", - "userDetails", - "userEmail", - "profileImg", - "fev_Icon", - "accesstoken", - `Parse/${localStorage.getItem("parseAppId")}/currentUser`, - "appLogo", - "baseUrl", - "domain", - "parseAppId", - "username", - "main_Domain" - ]); + const [, setCookie] = useCookies(["accesstoken", "main_Domain"]); useEffect(() => { (async () => { @@ -65,33 +51,19 @@ const HomeLayout = () => { }, []); //function to use save data in cookies storage const saveCookies = () => { - setCookie("TenantId", localStorage.getItem("TenantId"), { secure: true }); - setCookie("userDetails", localStorage.getItem("userDetails"), { - secure: true - }); - setCookie("userEmail", localStorage.getItem("userEmail"), { secure: true }); - setCookie("profileImg", localStorage.getItem("profileImg"), { - secure: true - }); - setCookie("fev_Icon", localStorage.getItem("fev_Icon"), { secure: true }); + const domainName = window.location.hostname; //app.opensignlabs.com + // Find the index of the first dot in the string + const indexOfFirstDot = domainName.indexOf("."); + // Remove the first dot and get the substring starting from the next character + const updateDomain = domainName.substring(indexOfFirstDot); //.opensignlabs.com setCookie("accesstoken", localStorage.getItem("accesstoken"), { - secure: true + secure: true, + domain: updateDomain }); - setCookie( - `Parse/${localStorage.getItem("parseAppId")}/currentUser`, - localStorage.getItem( - `Parse/${localStorage.getItem("parseAppId")}/currentUser` - ), - { secure: true } - ); - setCookie("appLogo", localStorage.getItem("appLogo"), { secure: true }); - setCookie("baseUrl", localStorage.getItem("baseUrl"), { secure: true }); - setCookie("domain", localStorage.getItem("domain"), { secure: true }); - setCookie("parseAppId", localStorage.getItem("parseAppId"), { - secure: true + setCookie("main_Domain", domainName, { + secure: true, + domain: updateDomain }); - setCookie("username", localStorage.getItem("username"), { secure: true }); - setCookie("main_Domain", window.location.host, { secure: true }); }; async function checkIsSubscribed() { From f0149f6fd8bd4f3dbe16b921e8bba04ae6f0d94c Mon Sep 17 00:00:00 2001 From: RaktimaNXG Date: Thu, 4 Apr 2024 12:06:21 +0530 Subject: [PATCH 2/2] fix: redirect console user domain name --- apps/OpenSign/src/layout/HomeLayout.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/OpenSign/src/layout/HomeLayout.js b/apps/OpenSign/src/layout/HomeLayout.js index 3554bcb9a..aa1dc0593 100644 --- a/apps/OpenSign/src/layout/HomeLayout.js +++ b/apps/OpenSign/src/layout/HomeLayout.js @@ -51,7 +51,8 @@ const HomeLayout = () => { }, []); //function to use save data in cookies storage const saveCookies = () => { - const domainName = window.location.hostname; //app.opensignlabs.com + const main_Domain = window.location.origin; + const domainName = window.location.hostname; //app.opensignlabs.com // Find the index of the first dot in the string const indexOfFirstDot = domainName.indexOf("."); // Remove the first dot and get the substring starting from the next character @@ -60,7 +61,7 @@ const HomeLayout = () => { secure: true, domain: updateDomain }); - setCookie("main_Domain", domainName, { + setCookie("main_Domain", main_Domain, { secure: true, domain: updateDomain });