generated from nimblehq/git-template
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix private routes with outlet and OutletContext wip
- Loading branch information
1 parent
ad66389
commit caf1305
Showing
6 changed files
with
58 additions
and
32 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,45 @@ | ||
import { Navigate, Outlet } from 'react-router-dom'; | ||
import { useState, useEffect } from 'react'; | ||
import { Navigate, Outlet, useOutletContext } from 'react-router-dom'; | ||
|
||
import useUser from 'hooks/useUser'; | ||
import AuthAdapter from 'adapters/authAdapter'; | ||
import { getToken } from 'helpers/userToken'; | ||
import type { User } from 'types/User'; | ||
|
||
type ContextType = User; | ||
|
||
import { LOGIN_URL } from '../../constants'; | ||
|
||
function PrivateRoutes() { | ||
const { currentUser } = useUser(); | ||
const [user, setUser] = useState<User | null>(null); | ||
const [loading, setLoading] = useState(true); | ||
|
||
useEffect(() => { | ||
const fetchCurrentUser = async () => { | ||
const token = getToken().access_token; | ||
|
||
if (!token) { | ||
setLoading(false); | ||
} else { | ||
const response = await AuthAdapter.getUser(); | ||
|
||
const data = await response.data; | ||
|
||
return currentUser ? <Outlet context={{ currentUser }} /> : <Navigate to="/login" />; | ||
setUser(data.attributes); | ||
setLoading(false); | ||
} | ||
}; | ||
fetchCurrentUser(); | ||
}, []); | ||
|
||
if (loading) { | ||
return null; | ||
} | ||
|
||
return user ? <Outlet context={user} /> : <Navigate to={LOGIN_URL} />; | ||
} | ||
|
||
export default PrivateRoutes; | ||
|
||
export function useUser() { | ||
return useOutletContext<ContextType>(); | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
import React from 'react'; | ||
import { useUser } from 'components/PrivateRoutes'; | ||
|
||
const HomeScreen = (): JSX.Element => { | ||
return <div data-test-id="app-main-heading">Home Screen</div>; | ||
const user = useUser(); | ||
|
||
return ( | ||
<> | ||
<div className="my-8 text-white opacity-50" data-test-id="app-main-heading"> | ||
Home Screen | ||
</div> | ||
<div className="my-8 text-white opacity-50">{user && user.email}</div> | ||
</> | ||
); | ||
}; | ||
|
||
export default HomeScreen; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
export type User = { | ||
email: string; | ||
name: string; | ||
avatarUrl: string; | ||
}; |