Skip to content

Commit 68a0301

Browse files
fix: handle invalid session token error while logging out
1 parent 79b05b4 commit 68a0301

File tree

8 files changed

+38
-26
lines changed

8 files changed

+38
-26
lines changed

apps/OpenSign/src/components/Header.js

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,12 @@ const Header = ({ showSidebar }) => {
6161
}
6262
}
6363

64-
const closeDropdown = () => {
64+
const closeDropdown = async () => {
6565
setIsOpen(false);
66-
if (Parse?.User?.current()) {
67-
try {
68-
Parse.User.logOut();
69-
} catch (err) {
70-
console.log("Err", err);
71-
}
66+
try {
67+
await Parse.User.logOut();
68+
} catch (err) {
69+
console.log("Err while logging out", err);
7270
}
7371
let appdata = localStorage.getItem("userSettings");
7472
let applogo = localStorage.getItem("appLogo");

apps/OpenSign/src/components/LoginGoogle.js

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@ const GoogleSignInBtn = ({
4747
});
4848
});
4949
const clearStorage = async () => {
50-
if (Parse.User.current()) {
50+
try {
5151
await Parse.User.logOut();
52+
} catch (err) {
53+
console.log("Err while logging out", err);
5254
}
5355
let baseUrl = localStorage.getItem("baseUrl");
5456
let appid = localStorage.getItem("parseAppId");
@@ -160,10 +162,13 @@ const GoogleSignInBtn = ({
160162
alert(t("fill-required-details!"));
161163
}
162164
};
163-
const handleCloseModal = () => {
165+
const handleCloseModal = async () => {
164166
setIsModal(false);
165-
Parse.User.logOut();
166-
167+
try {
168+
await Parse.User.logOut();
169+
} catch (err) {
170+
console.log("Err while logging out", err);
171+
}
167172
let appdata = localStorage.getItem("userSettings");
168173
let applogo = localStorage.getItem("appLogo");
169174
let defaultmenuid = localStorage.getItem("defaultmenuid");

apps/OpenSign/src/pages/AddAdmin.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ const AddAdmin = () => {
5656
}
5757
};
5858
const clearStorage = async () => {
59-
if (Parse.User.current()) {
59+
try {
6060
await Parse.User.logOut();
61+
} catch (err) {
62+
console.log("Err while logging out", err);
6163
}
6264
const baseUrl = localStorage.getItem("baseUrl");
6365
const appid = localStorage.getItem("parseAppId");

apps/OpenSign/src/pages/ForgetPassword.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@ function ForgotPassword() {
1515
const { t } = useTranslation();
1616
const dispatch = useDispatch();
1717
const navigate = useNavigate();
18-
const [state, setState] = useState({
19-
email: "",
20-
password: "",
21-
hideNav: ""
22-
});
18+
const [state, setState] = useState({ email: "", password: "", hideNav: "" });
2319
const [sentStatus, setSentStatus] = useState("");
2420
const [image, setImage] = useState();
2521

@@ -65,6 +61,11 @@ function ForgotPassword() {
6561
// eslint-disable-next-line
6662
}, []);
6763
const saveLogo = async () => {
64+
try {
65+
await Parse.User.logOut();
66+
} catch (err) {
67+
console.log("err while logging out ", err);
68+
}
6869
if (isEnableSubscription) {
6970
const app = await getAppLogo();
7071
if (app?.logo) {

apps/OpenSign/src/pages/Login.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -575,10 +575,12 @@ function Login() {
575575
}
576576
};
577577

578-
const logOutUser = () => {
578+
const logOutUser = async () => {
579579
setIsModal(false);
580-
if (Parse?.User?.current()) {
581-
Parse.User.logOut();
580+
try {
581+
await Parse.User.logOut();
582+
} catch (err) {
583+
console.log("Err while logging out", err);
582584
}
583585
let appdata = localStorage.getItem("userSettings");
584586
let applogo = localStorage.getItem("appLogo");

apps/OpenSign/src/pages/SSOVerify.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ const SSOVerify = () => {
228228
}
229229
};
230230
// `handleCloseModal` is triggered when the user wants to close the new user flow modal
231-
const handleCloseModal = () => {
231+
const handleCloseModal = async () => {
232232
setIsModal(false);
233-
if (Parse?.User?.current()) {
234-
Parse.User.logOut();
233+
try {
234+
await Parse.User.logOut();
235+
} catch (err) {
236+
console.log("Err while logging out", err);
235237
}
236238
};
237239

apps/OpenSign/src/pages/Signup.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ const Signup = () => {
4545
const togglePasswordVisibility = () => setShowPassword(!showPassword);
4646

4747
const clearStorage = async () => {
48-
if (Parse.User.current()) {
48+
try {
4949
await Parse.User.logOut();
50+
} catch (err) {
51+
console.log("Err while logging out", err);
5052
}
5153
let baseUrl = localStorage.getItem("baseUrl");
5254
let appid = localStorage.getItem("parseAppId");

apps/OpenSign/src/primitives/Validate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ const Validate = () => {
3737
// eslint-disable-next-line react-hooks/exhaustive-deps
3838
}, []);
3939

40-
const handleLoginBtn = () => {
40+
const handleLoginBtn = async () => {
4141
try {
42-
Parse.User.logOut();
42+
await Parse.User.logOut();
4343
} catch (err) {
4444
console.log("err ", err);
4545
} finally {

0 commit comments

Comments
 (0)