|
|
|
|
@ -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) |
|
|
|
|
|