Skip to content

Commit 51150d4

Browse files
Merge pull request #712 from OpenSignLabs/raktima-opensignlabs-path-3
fix: owner's subsciption expired issue in guest login
2 parents d03515e + 1d3cd02 commit 51150d4

File tree

1 file changed

+23
-19
lines changed

1 file changed

+23
-19
lines changed

apps/OpenSign/src/layout/HomeLayout.js

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,34 @@ const HomeLayout = () => {
2727
const [tourStatusArr, setTourStatusArr] = useState([]);
2828
const [tourConfigs, setTourConfigs] = useState([]);
2929
const [, setCookie] = useCookies(["accesstoken", "main_Domain"]);
30-
30+
const tenantId = localStorage.getItem("TenantId");
3131
useEffect(() => {
32-
(async () => {
33-
try {
34-
// Use the session token to validate the user
35-
const userQuery = new Parse.Query(Parse.User);
36-
const user = await userQuery.get(Parse.User.current().id, {
37-
sessionToken: localStorage.getItem("accesstoken")
38-
});
39-
if (user) {
40-
localStorage.setItem("profileImg", user.get("ProfilePic") || "");
41-
checkIsSubscribed();
42-
} else {
32+
if (!tenantId) {
33+
setIsUserValid(false);
34+
} else {
35+
(async () => {
36+
try {
37+
// Use the session token to validate the user
38+
const userQuery = new Parse.Query(Parse.User);
39+
const user = await userQuery.get(Parse.User.current().id, {
40+
sessionToken: localStorage.getItem("accesstoken")
41+
});
42+
if (user) {
43+
localStorage.setItem("profileImg", user.get("ProfilePic") || "");
44+
checkIsSubscribed();
45+
} else {
46+
setIsUserValid(false);
47+
}
48+
} catch (error) {
49+
// Session token is invalid or there was an error
4350
setIsUserValid(false);
4451
}
45-
} catch (error) {
46-
// Session token is invalid or there was an error
47-
setIsUserValid(false);
48-
}
49-
})();
50-
saveCookies();
52+
})();
53+
saveCookies();
54+
}
5155

5256
// eslint-disable-next-line react-hooks/exhaustive-deps
53-
}, []);
57+
}, [tenantId]);
5458
//function to use save data in cookies storage
5559
const saveCookies = () => {
5660
const main_Domain = window.location.origin;

0 commit comments

Comments
 (0)