issue-38 #62
13
src/App.tsx
13
src/App.tsx
@ -35,7 +35,9 @@ const App = () => {
|
|||||||
|
|
||||||
const handleRootRedirect = () => {
|
const handleRootRedirect = () => {
|
||||||
if (authState.loggedIn) return appPrivateRoutes.homePage
|
if (authState.loggedIn) return appPrivateRoutes.homePage
|
||||||
const callbackPathEncoded = btoa(window.location.href.split(`${window.location.origin}/#`)[1])
|
const callbackPathEncoded = btoa(
|
||||||
|
window.location.href.split(`${window.location.origin}/#`)[1]
|
||||||
|
)
|
||||||
return `${appPublicRoutes.login}?callbackPath=${callbackPathEncoded}`
|
return `${appPublicRoutes.login}?callbackPath=${callbackPathEncoded}`
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -72,14 +74,7 @@ const App = () => {
|
|||||||
}
|
}
|
||||||
})}
|
})}
|
||||||
|
|
||||||
<Route
|
<Route path="*" element={<Navigate to={handleRootRedirect()} />} />
|
||||||
path="*"
|
|
||||||
element={
|
|
||||||
<Navigate
|
|
||||||
to={handleRootRedirect()}
|
|
||||||
/>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</Route>
|
</Route>
|
||||||
</Routes>
|
</Routes>
|
||||||
)
|
)
|
||||||
|
@ -57,7 +57,7 @@ export const Login = () => {
|
|||||||
|
|
||||||
const navigateAfterLogin = (path: string) => {
|
const navigateAfterLogin = (path: string) => {
|
||||||
const callbackPath = searchParams.get('callbackPath')
|
const callbackPath = searchParams.get('callbackPath')
|
||||||
|
|
||||||
if (callbackPath) {
|
if (callbackPath) {
|
||||||
// base64 decoded path
|
// base64 decoded path
|
||||||
const path = atob(callbackPath)
|
const path = atob(callbackPath)
|
||||||
|
Loading…
Reference in New Issue
Block a user