Compare commits

..

3 Commits

Author SHA1 Message Date
Rakov 8896df9f1f fix(refresh): refresh token fix 2 years ago
Rakov 10bca448dc fix(refresh): resfresh token fix 2 years ago
Rakov 7a2423568a fix(refresh): save refresh lff facr 2 years ago
  1. 16
      src/features/AuthStore/hooks/useAuth.tsx
  2. 5
      src/features/SystemSettings/hooks.tsx

@ -14,11 +14,7 @@ import isString from 'lodash/isString'
import isBoolean from 'lodash/isBoolean' import isBoolean from 'lodash/isBoolean'
import includes from 'lodash/includes' import includes from 'lodash/includes'
import { import { PAGES } from 'config'
PAGES,
isFacrClient,
isLffClient,
} from 'config'
import { import {
addLanguageUrlParam, 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) setPage(history.location.pathname)
userManager.signinRedirectCallback() userManager.signinRedirectCallback()
.then((loadedUser) => { .then((loadedUser) => {
storeUser(loadedUser) storeUser(loadedUser)
if ( if (refreshToken) writeRefreshToken(refreshToken)
refreshToken
&& (isLffClient || isFacrClient)
) writeRefreshToken(refreshToken)
queryParamStorage.clear() queryParamStorage.clear()
if (page.includes(PAGES.useraccount)) { if (page.includes(PAGES.useraccount)) {
@ -249,6 +242,7 @@ export const useAuth = () => {
checkNewDevice, checkNewDevice,
isNewDeviceLogin, isNewDeviceLogin,
setIsNewDeviceLogin, setIsNewDeviceLogin,
user,
]) ])
duel.channel('active_page') // поле в LS, определяющее активность вкладки duel.channel('active_page') // поле в LS, определяющее активность вкладки
@ -261,7 +255,7 @@ export const useAuth = () => {
// safari ограничивает доступ к куке через крос доменные запросы // safari ограничивает доступ к куке через крос доменные запросы
// передаем рефреш токен через квери параметры // передаем рефреш токен через квери параметры
userManager.signinSilent({ userManager.signinSilent({
extraQueryParams: (isLffClient || isFacrClient) && { extraQueryParams: {
refresh_token: readRefreshToken(), refresh_token: readRefreshToken(),
}, },
}).catch(logout) }).catch(logout)

@ -9,8 +9,8 @@ import { SELECTED_API_KEY } from 'helpers/selectedApi'
import { useToggle } from 'hooks/useToggle' import { useToggle } from 'hooks/useToggle'
import { useLocalStore } from 'hooks/useStorage' import { useLocalStore } from 'hooks/useStorage'
import { removeToken } from '../../helpers' import { removeRefreshToken, removeToken } from 'helpers'
import { removeCookie } from '../../helpers/cookie' import { removeCookie } from 'helpers/cookie'
type FormElement = HTMLFormElement & { type FormElement = HTMLFormElement & {
api: HTMLInputElement & { api: HTMLInputElement & {
@ -37,6 +37,7 @@ export const useSystemSettings = () => {
const { api } = e.currentTarget const { api } = e.currentTarget
setSelectedApi(api.value) setSelectedApi(api.value)
removeToken() removeToken()
removeRefreshToken()
removeCookie('access_token') removeCookie('access_token')
window.location.reload() window.location.reload()
} }

Loading…
Cancel
Save