Xstate Auth migration (#250)
* auth migrate progress, web only * wrap home in state provider * use consistent logged spelling * use createActorContext * typo * fix wraping problem
This commit is contained in:
33
src/Auth.tsx
33
src/Auth.tsx
@ -1,38 +1,11 @@
|
||||
import useSWR from 'swr'
|
||||
import fetcher from './lib/fetcher'
|
||||
import withBaseUrl from './lib/withBaseURL'
|
||||
import { User, useStore } from './useStore'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { useEffect } from 'react'
|
||||
import { isTauri } from './lib/isTauri'
|
||||
import Loading from './components/Loading'
|
||||
import { paths } from './Router'
|
||||
import { useAuthMachine } from './hooks/useAuthMachine'
|
||||
|
||||
// Wrapper around protected routes, used in src/Router.tsx
|
||||
export const Auth = ({ children }: React.PropsWithChildren) => {
|
||||
const { data: user, isLoading } = useSWR<
|
||||
User | Partial<{ error_code: string }>
|
||||
>(withBaseUrl('/user'), fetcher)
|
||||
const { token, setUser } = useStore((s) => ({
|
||||
token: s.token,
|
||||
setUser: s.setUser,
|
||||
}))
|
||||
const navigate = useNavigate()
|
||||
const [isLoggedIn] = useAuthMachine((s) => s.matches('checkIfLoggedIn'))
|
||||
|
||||
useEffect(() => {
|
||||
if (user && 'id' in user) setUser(user)
|
||||
}, [user, setUser])
|
||||
|
||||
useEffect(() => {
|
||||
if (
|
||||
(isTauri() && !token) ||
|
||||
(!isTauri() && !isLoading && !(user && 'id' in user))
|
||||
) {
|
||||
navigate(paths.SIGN_IN)
|
||||
}
|
||||
}, [user, token, navigate, isLoading])
|
||||
|
||||
return isLoading ? (
|
||||
return isLoggedIn ? (
|
||||
<Loading>Loading KittyCAD Modeling App...</Loading>
|
||||
) : (
|
||||
<>{children}</>
|
||||
|
Reference in New Issue
Block a user