fixed redirect when auth is enabled

This commit is contained in:
2023-12-03 11:53:15 +01:00
parent 0ab9f15184
commit 70a8d27d22
3 changed files with 13 additions and 2 deletions

View File

@@ -1,5 +1,6 @@
import * as O from 'fp-ts/Option' import * as O from 'fp-ts/Option'
import { useEffect, useMemo } from 'react' import { useEffect, useMemo } from 'react'
import { useNavigate } from 'react-router-dom'
import { useRecoilState, useRecoilValue } from 'recoil' import { useRecoilState, useRecoilValue } from 'recoil'
import { take, timer } from 'rxjs' import { take, timer } from 'rxjs'
import { downloadsState } from '../atoms/downloads' import { downloadsState } from '../atoms/downloads'
@@ -23,6 +24,8 @@ const SocketSubscriber: React.FC<Props> = () => {
const { client } = useRPC() const { client } = useRPC()
const { pushMessage } = useToast() const { pushMessage } = useToast()
const navigate = useNavigate()
const socketOnce$ = useMemo(() => client.socket$.pipe(take(1)), []) const socketOnce$ = useMemo(() => client.socket$.pipe(take(1)), [])
useEffect(() => { useEffect(() => {
@@ -60,7 +63,8 @@ const SocketSubscriber: React.FC<Props> = () => {
pushMessage( pushMessage(
`${i18n.t('rpcConnErr')} (${serverAddressAndPort})`, `${i18n.t('rpcConnErr')} (${serverAddressAndPort})`,
"error" "error"
) ),
navigate(`/error`)
} }
) )

View File

@@ -57,6 +57,14 @@ export const router = createHashRouter([
</Suspense > </Suspense >
) )
}, },
{
path: '/error',
element: (
<Suspense fallback={<CircularProgress />}>
<ErrorBoundary />
</Suspense >
)
},
] ]
}, },
]) ])

View File

@@ -63,7 +63,6 @@ export default function Login() {
username, username,
password, password,
}), }),
redirect: 'follow'
}) })
pipe( pipe(