feat(ott-2113): change redirect after auth

src/features/AuthStore/hooks/useAuth.tsx

@@ -13,7 +13,9 @@ import isString from 'lodash/isString'
 
 import { PAGES } from 'config'
 
-import { addLanguageUrlParam } from 'helpers/languageUrlParam'
+import {
+  addLanguageUrlParam,
+} from 'helpers/languageUrlParam'
 import { writeToken, removeToken } from 'helpers/token'
 import { setCookie, removeCookie } from 'helpers/cookie'
 import { isMatchPage } from 'helpers/isMatchPage'
@@ -21,7 +23,9 @@ import { isMatchPage } from 'helpers/isMatchPage'
 import { useLocalStore, useToggle } from 'hooks'
 
 import { useLexicsStore } from 'features/LexicsStore'
-import { queryParamStorage } from 'features/QueryParamsStorage'
+import {
+  queryParamStorage,
+} from 'features/QueryParamsStorage'
 
 import { getClientSettings } from '../helpers'
 
@@ -72,13 +76,20 @@ export const useAuth = () => {
     markUserLoaded,
   ])
 
-  const [matchPage, setMatchPage] = useLocalStore({
+  const [page, setPage] = useLocalStore({
     clearOnUnmount: true,
     defaultValue: '',
     key: 'matchBackLocation',
     validator: isString,
   })
 
+  const [search, setSearch] = useLocalStore({
+    clearOnUnmount: true,
+    defaultValue: '',
+    key: 'searchBack',
+    validator: isString,
+  })
+
   const signinRedirectCallback = useCallback(() => {
     userManager.signinRedirectCallback()
       .then((loadedUser) => {
@@ -86,19 +97,23 @@ export const useAuth = () => {
         queryParamStorage.clear()
         history.replace(PAGES.home)
         markUserLoaded()
-        if (matchPage) {
+        if (page) {
-          history.push(matchPage)
+          const route = `${page}${page === '/' ? search : ''}`
-          setMatchPage('')
+          history.push(route)
+          setPage('')
+          setSearch('')
         }
       }).catch(login)
   }, [
     userManager,
-    history,
+    login,
-    setMatchPage,
     storeUser,
+    history,
     markUserLoaded,
-    matchPage,
+    page,
-    login,
+    search,
+    setPage,
+    setSearch,
   ])
 
   useEffect(() => {
@@ -109,17 +124,19 @@ export const useAuth = () => {
       checkUser().catch(() => {
         if (!isMatchPage()) {
           login()
-          setMatchPage('')
-        } else {
-          setMatchPage(history.location.pathname)
         }
+        if (history.location.pathname === '/') {
+          setSearch(history.location.search)
+        }
+        setPage(history.location.pathname)
       })
     }
   }, [
     checkUser,
     signinRedirectCallback,
     login,
-    setMatchPage,
+    setPage,
+    setSearch,
     history,
   ])
 
@@ -140,7 +157,8 @@ export const useAuth = () => {
   }, [userManager, logout])
 
   useEffect(() => {
-    // событие срабатывает после получения токена(первый логин и обновление токена)
+    // событие срабатывает после получения токена(первый
+    // логин и обновление токена)
     userManager.events.addUserLoaded(storeUser)
     return () => userManager.events.removeUserLoaded(storeUser)
   }, [userManager, storeUser])