From 1c802f51085dc7bbe3092028a47eadb470a77e88 Mon Sep 17 00:00:00 2001 From: aelassas Date: Wed, 11 Dec 2024 20:00:42 +0100 Subject: [PATCH] Update localStorage prefix --- backend/src/main.tsx | 4 ++-- backend/src/services/UserService.ts | 18 +++++++++--------- frontend/src/main.tsx | 6 +++--- frontend/src/services/UserService.ts | 24 ++++++++++++------------ 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/backend/src/main.tsx b/backend/src/main.tsx index 8dedac8c7..c56474654 100644 --- a/backend/src/main.tsx +++ b/backend/src/main.tsx @@ -23,12 +23,12 @@ if (import.meta.env.VITE_NODE_ENV === 'production') { } let language = env.DEFAULT_LANGUAGE -const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') +const user = JSON.parse(localStorage.getItem('bc-be-user') ?? 'null') let lang = UserService.getQueryLanguage() if (lang) { if (!env.LANGUAGES.includes(lang)) { - lang = localStorage.getItem('bc-language') + lang = localStorage.getItem('bc-be-language') if (lang && !env.LANGUAGES.includes(lang)) { lang = env.DEFAULT_LANGUAGE diff --git a/backend/src/services/UserService.ts b/backend/src/services/UserService.ts index 0816bd4c9..ff708e00d 100644 --- a/backend/src/services/UserService.ts +++ b/backend/src/services/UserService.ts @@ -117,7 +117,7 @@ export const signin = (data: bookcarsTypes.SignInPayload): Promise<{ status: num { withCredentials: true } ) .then((res) => { - localStorage.setItem('bc-user', JSON.stringify(res.data)) + localStorage.setItem('bc-be-user', JSON.stringify(res.data)) return { status: res.status, data: res.data } }) @@ -138,7 +138,7 @@ export const signout = async (redirect = true) => { } sessionStorage.clear() - localStorage.removeItem('bc-user') + localStorage.removeItem('bc-be-user') deleteAllCookies() await axiosInstance @@ -203,12 +203,12 @@ export const resendLink = (data: bookcarsTypes.ResendLinkPayload): Promise { - const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') + const user = JSON.parse(localStorage.getItem('bc-be-user') ?? 'null') if (user && user.language) { return user.language as string } - const lang = localStorage.getItem('bc-language') + const lang = localStorage.getItem('bc-be-language') if (lang && lang.length === 2) { return lang } @@ -243,9 +243,9 @@ export const updateLanguage = (data: bookcarsTypes.UpdateLanguagePayload) => ) .then((res) => { if (res.status === 200) { - const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') + const user = JSON.parse(localStorage.getItem('bc-be-user') ?? 'null') user.language = data.language - localStorage.setItem('bc-user', JSON.stringify(user)) + localStorage.setItem('bc-be-user', JSON.stringify(user)) } return res.status }) @@ -256,7 +256,7 @@ export const updateLanguage = (data: bookcarsTypes.UpdateLanguagePayload) => * @param {string} lang */ export const setLanguage = (lang: string) => { - localStorage.setItem('bc-language', lang) + localStorage.setItem('bc-be-language', lang) } /** @@ -265,7 +265,7 @@ export const setLanguage = (lang: string) => { * @returns {bookcarsTypes.User|null} */ export const getCurrentUser = (): bookcarsTypes.User | null => { - const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') + const user = JSON.parse(localStorage.getItem('bc-be-user') ?? 'null') return user } @@ -362,7 +362,7 @@ export const updateEmailNotifications = (data: bookcarsTypes.UpdateEmailNotifica const user = getCurrentUser() if (user) { user.enableEmailNotifications = data.enableEmailNotifications - localStorage.setItem('bc-user', JSON.stringify(user)) + localStorage.setItem('bc-be-user', JSON.stringify(user)) } } return res.status diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx index a0dfdc7bf..8b1397395 100644 --- a/frontend/src/main.tsx +++ b/frontend/src/main.tsx @@ -56,12 +56,12 @@ if (env.isProduction) { } let language = env.DEFAULT_LANGUAGE -const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') +const user = JSON.parse(localStorage.getItem('bc-fe-user') ?? 'null') let lang = UserService.getQueryLanguage() if (lang) { if (!env.LANGUAGES.includes(lang)) { - lang = localStorage.getItem('bc-language') + lang = localStorage.getItem('bc-fe-language') if (lang && !env.LANGUAGES.includes(lang)) { lang = env.DEFAULT_LANGUAGE @@ -105,7 +105,7 @@ if (lang) { if (user && user.language) { storedLang = user.language } else { - const slang = localStorage.getItem('bc-language') + const slang = localStorage.getItem('bc-fe-language') if (slang && slang.length === 2) { storedLang = slang } diff --git a/frontend/src/services/UserService.ts b/frontend/src/services/UserService.ts index 47f0fa70b..3b773a140 100644 --- a/frontend/src/services/UserService.ts +++ b/frontend/src/services/UserService.ts @@ -102,7 +102,7 @@ export const signin = (data: bookcarsTypes.SignInPayload): Promise<{ status: num { withCredentials: true } ) .then((res) => { - localStorage.setItem('bc-user', JSON.stringify(res.data)) + localStorage.setItem('bc-fe-user', JSON.stringify(res.data)) return { status: res.status, data: res.data } }) @@ -120,7 +120,7 @@ export const socialSignin = (data: bookcarsTypes.SignInPayload): Promise<{ statu { withCredentials: true } ) .then((res) => { - localStorage.setItem('bc-user', JSON.stringify(res.data)) + localStorage.setItem('bc-fe-user', JSON.stringify(res.data)) return { status: res.status, data: res.data } }) @@ -142,7 +142,7 @@ export const signout = async (redirect = true, redirectSignin = false) => { } sessionStorage.clear() - localStorage.removeItem('bc-user') + localStorage.removeItem('bc-fe-user') deleteAllCookies() await axiosInstance @@ -210,12 +210,12 @@ export const resendLink = (data: bookcarsTypes.ResendLinkPayload): Promise { - const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') + const user = JSON.parse(localStorage.getItem('bc-fe-user') ?? 'null') if (user && user.language) { return user.language } - const lang = localStorage.getItem('bc-language') + const lang = localStorage.getItem('bc-fe-language') if (lang && lang.length === 2) { return lang } @@ -250,9 +250,9 @@ export const updateLanguage = (data: bookcarsTypes.UpdateLanguagePayload) => ) .then((res) => { if (res.status === 200) { - const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') + const user = JSON.parse(localStorage.getItem('bc-fe-user') ?? 'null') user.language = data.language - localStorage.setItem('bc-user', JSON.stringify(user)) + localStorage.setItem('bc-fe-user', JSON.stringify(user)) } return res.status }) @@ -263,7 +263,7 @@ export const updateLanguage = (data: bookcarsTypes.UpdateLanguagePayload) => * @param {string} lang */ export const setLanguage = (lang: string) => { - localStorage.setItem('bc-language', lang) + localStorage.setItem('bc-fe-language', lang) } /** @@ -272,7 +272,7 @@ export const setLanguage = (lang: string) => { * @returns {bookcarsTypes.User | null} */ export const getCurrentUser = (): bookcarsTypes.User | null => { - const user = JSON.parse(localStorage.getItem('bc-user') ?? 'null') as bookcarsTypes.User | null + const user = JSON.parse(localStorage.getItem('bc-fe-user') ?? 'null') as bookcarsTypes.User | null return user } @@ -329,7 +329,7 @@ export const updateEmailNotifications = (data: bookcarsTypes.UpdateEmailNotifica const user = getCurrentUser() if (user) { user.enableEmailNotifications = data.enableEmailNotifications - localStorage.setItem('bc-user', JSON.stringify(user)) + localStorage.setItem('bc-fe-user', JSON.stringify(user)) } } return res.status @@ -3350,7 +3350,7 @@ export const hasPassword = (id: string): Promise => axiosInstance * @returns {void} */ export const setStayConnected = (value: boolean) => { - localStorage.setItem('bc-stay-connected', JSON.stringify(value)) + localStorage.setItem('bc-fe-stay-connected', JSON.stringify(value)) } /** @@ -3360,7 +3360,7 @@ export const setStayConnected = (value: boolean) => { * @returns {boolean} */ export const getStayConnected = () => { - const value = JSON.parse(localStorage.getItem('bc-stay-connected') ?? 'false') + const value = JSON.parse(localStorage.getItem('bc-fe-stay-connected') ?? 'false') return value as boolean }