From 68a030145f9e8d769f3606e0db4837e1aad3bbe4 Mon Sep 17 00:00:00 2001 From: prafull-opensignlabs Date: Mon, 9 Sep 2024 15:44:01 +0530 Subject: [PATCH] fix: handle invalid session token error while logging out --- apps/OpenSign/src/components/Header.js | 12 +++++------- apps/OpenSign/src/components/LoginGoogle.js | 13 +++++++++---- apps/OpenSign/src/pages/AddAdmin.js | 4 +++- apps/OpenSign/src/pages/ForgetPassword.js | 11 ++++++----- apps/OpenSign/src/pages/Login.js | 8 +++++--- apps/OpenSign/src/pages/SSOVerify.js | 8 +++++--- apps/OpenSign/src/pages/Signup.js | 4 +++- apps/OpenSign/src/primitives/Validate.js | 4 ++-- 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/apps/OpenSign/src/components/Header.js b/apps/OpenSign/src/components/Header.js index 8eae47c0c..5a7758c23 100644 --- a/apps/OpenSign/src/components/Header.js +++ b/apps/OpenSign/src/components/Header.js @@ -61,14 +61,12 @@ const Header = ({ showSidebar }) => { } } - const closeDropdown = () => { + const closeDropdown = async () => { setIsOpen(false); - if (Parse?.User?.current()) { - try { - Parse.User.logOut(); - } catch (err) { - console.log("Err", err); - } + try { + await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); } let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); diff --git a/apps/OpenSign/src/components/LoginGoogle.js b/apps/OpenSign/src/components/LoginGoogle.js index dbdcaaa3a..498ee60e9 100644 --- a/apps/OpenSign/src/components/LoginGoogle.js +++ b/apps/OpenSign/src/components/LoginGoogle.js @@ -47,8 +47,10 @@ const GoogleSignInBtn = ({ }); }); const clearStorage = async () => { - if (Parse.User.current()) { + try { await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); } let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); @@ -160,10 +162,13 @@ const GoogleSignInBtn = ({ alert(t("fill-required-details!")); } }; - const handleCloseModal = () => { + const handleCloseModal = async () => { setIsModal(false); - Parse.User.logOut(); - + try { + await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); + } let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); let defaultmenuid = localStorage.getItem("defaultmenuid"); diff --git a/apps/OpenSign/src/pages/AddAdmin.js b/apps/OpenSign/src/pages/AddAdmin.js index fb60376ef..75d428d35 100644 --- a/apps/OpenSign/src/pages/AddAdmin.js +++ b/apps/OpenSign/src/pages/AddAdmin.js @@ -56,8 +56,10 @@ const AddAdmin = () => { } }; const clearStorage = async () => { - if (Parse.User.current()) { + try { await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); } const baseUrl = localStorage.getItem("baseUrl"); const appid = localStorage.getItem("parseAppId"); diff --git a/apps/OpenSign/src/pages/ForgetPassword.js b/apps/OpenSign/src/pages/ForgetPassword.js index 5591df965..91260c5d6 100644 --- a/apps/OpenSign/src/pages/ForgetPassword.js +++ b/apps/OpenSign/src/pages/ForgetPassword.js @@ -15,11 +15,7 @@ function ForgotPassword() { const { t } = useTranslation(); const dispatch = useDispatch(); const navigate = useNavigate(); - const [state, setState] = useState({ - email: "", - password: "", - hideNav: "" - }); + const [state, setState] = useState({ email: "", password: "", hideNav: "" }); const [sentStatus, setSentStatus] = useState(""); const [image, setImage] = useState(); @@ -65,6 +61,11 @@ function ForgotPassword() { // eslint-disable-next-line }, []); const saveLogo = async () => { + try { + await Parse.User.logOut(); + } catch (err) { + console.log("err while logging out ", err); + } if (isEnableSubscription) { const app = await getAppLogo(); if (app?.logo) { diff --git a/apps/OpenSign/src/pages/Login.js b/apps/OpenSign/src/pages/Login.js index 9159c5678..8b0adfc43 100644 --- a/apps/OpenSign/src/pages/Login.js +++ b/apps/OpenSign/src/pages/Login.js @@ -575,10 +575,12 @@ function Login() { } }; - const logOutUser = () => { + const logOutUser = async () => { setIsModal(false); - if (Parse?.User?.current()) { - Parse.User.logOut(); + try { + await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); } let appdata = localStorage.getItem("userSettings"); let applogo = localStorage.getItem("appLogo"); diff --git a/apps/OpenSign/src/pages/SSOVerify.js b/apps/OpenSign/src/pages/SSOVerify.js index d695e07b1..7a7712e02 100644 --- a/apps/OpenSign/src/pages/SSOVerify.js +++ b/apps/OpenSign/src/pages/SSOVerify.js @@ -228,10 +228,12 @@ const SSOVerify = () => { } }; // `handleCloseModal` is triggered when the user wants to close the new user flow modal - const handleCloseModal = () => { + const handleCloseModal = async () => { setIsModal(false); - if (Parse?.User?.current()) { - Parse.User.logOut(); + try { + await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); } }; diff --git a/apps/OpenSign/src/pages/Signup.js b/apps/OpenSign/src/pages/Signup.js index ce59b885f..b3040d42a 100644 --- a/apps/OpenSign/src/pages/Signup.js +++ b/apps/OpenSign/src/pages/Signup.js @@ -45,8 +45,10 @@ const Signup = () => { const togglePasswordVisibility = () => setShowPassword(!showPassword); const clearStorage = async () => { - if (Parse.User.current()) { + try { await Parse.User.logOut(); + } catch (err) { + console.log("Err while logging out", err); } let baseUrl = localStorage.getItem("baseUrl"); let appid = localStorage.getItem("parseAppId"); diff --git a/apps/OpenSign/src/primitives/Validate.js b/apps/OpenSign/src/primitives/Validate.js index b13102928..c7fe6de9b 100644 --- a/apps/OpenSign/src/primitives/Validate.js +++ b/apps/OpenSign/src/primitives/Validate.js @@ -37,9 +37,9 @@ const Validate = () => { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const handleLoginBtn = () => { + const handleLoginBtn = async () => { try { - Parse.User.logOut(); + await Parse.User.logOut(); } catch (err) { console.log("err ", err); } finally {