From f7d53c9fb8fac5b56c3d402e207e56fb3d93bb7b Mon Sep 17 00:00:00 2001 From: adhamhaddad Date: Fri, 26 May 2023 08:11:43 +0300 Subject: [PATCH] fixed AuthContext init function --- frontend/src/context/AuthContext.jsx | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/frontend/src/context/AuthContext.jsx b/frontend/src/context/AuthContext.jsx index 37ed50c..a402796 100644 --- a/frontend/src/context/AuthContext.jsx +++ b/frontend/src/context/AuthContext.jsx @@ -28,26 +28,26 @@ const AuthProvider = ({ children }) => { useEffect(() => { const initAuth = async () => { - const accessToken = window.localStorage.getItem('accessToken'); - if (accessToken) { - await get('/auth/auth-me') - .then(async (response) => { - const { user: userData, accessToken: AccessToken } = response.data; - if (accessToken) { - window.localStorage.setItem('user', JSON.stringify(userData)); - window.localStorage.setItem('accessToken', AccessToken); - } - setUser(userData); - setAccessToken(AccessToken); - }) - .catch(() => { - localStorage.removeItem('user'); - localStorage.removeItem('refreshToken'); - localStorage.removeItem('accessToken'); - setUser(null); - setAccessToken(null); - setRefreshToken(null); - }); + try { + const accessToken = window.localStorage.getItem('accessToken'); + if (accessToken) { + const response = await get('/auth/auth-me'); + const { user, accessToken } = response.data; + + if (accessToken) { + window.localStorage.setItem('user', JSON.stringify(user)); + window.localStorage.setItem('accessToken', accessToken); + } + setUser(user); + setAccessToken(accessToken); + } + } catch (err) { + localStorage.removeItem('user'); + localStorage.removeItem('refreshToken'); + localStorage.removeItem('accessToken'); + setUser(null); + setAccessToken(null); + setRefreshToken(null); } }; initAuth();