From 660c0d31ebea6b5c8ef3b43d00056dcb729eee06 Mon Sep 17 00:00:00 2001 From: Rakov Date: Thu, 5 Oct 2023 13:46:31 +0300 Subject: [PATCH] fix(refresh): refresh token fix --- src/features/AuthStore/hooks/useAuth.tsx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/features/AuthStore/hooks/useAuth.tsx b/src/features/AuthStore/hooks/useAuth.tsx index 965206b9..9df50ad4 100644 --- a/src/features/AuthStore/hooks/useAuth.tsx +++ b/src/features/AuthStore/hooks/useAuth.tsx @@ -14,11 +14,7 @@ import isString from 'lodash/isString' import isBoolean from 'lodash/isBoolean' import includes from 'lodash/includes' -import { - PAGES, - isFacrClient, - isLffClient, -} from 'config' +import { PAGES } from 'config' import { addLanguageUrlParam, @@ -167,17 +163,14 @@ export const useAuth = () => { } } - const signinRedirectCallback = useCallback(async (refreshToken: string | null) => { + const signinRedirectCallback = useCallback((refreshToken: string | null) => { setPage(history.location.pathname) userManager.signinRedirectCallback() .then((loadedUser) => { storeUser(loadedUser) - if ( - refreshToken - && (isLffClient || isFacrClient) - ) writeRefreshToken(refreshToken) + if (refreshToken) writeRefreshToken(refreshToken) queryParamStorage.clear() if (page.includes(PAGES.useraccount)) { @@ -249,6 +242,7 @@ export const useAuth = () => { checkNewDevice, isNewDeviceLogin, setIsNewDeviceLogin, + user, ]) duel.channel('active_page') // поле в LS, определяющее активность вкладки @@ -261,7 +255,7 @@ export const useAuth = () => { // safari ограничивает доступ к куке через крос доменные запросы // передаем рефреш токен через квери параметры userManager.signinSilent({ - extraQueryParams: (isLffClient || isFacrClient) && { + extraQueryParams: { refresh_token: readRefreshToken(), }, }).catch(logout)