redirecting to login if not authenticated in router
This commit is contained in:
parent
e639e2cdf9
commit
e17896aa35
2 changed files with 21 additions and 3 deletions
|
|
@ -4,7 +4,8 @@ import Header from "../app/Header";
|
||||||
import React, { PropsWithChildren, useState } from "react";
|
import React, { PropsWithChildren, useState } from "react";
|
||||||
// import BottomNavigator from "./BottomNavigator";
|
// import BottomNavigator from "./BottomNavigator";
|
||||||
// import Routes from "./Routes";
|
// import Routes from "./Routes";
|
||||||
// import SideNavigator from "./SideNavigator";
|
import SideNavigator from "./SideNavigator";
|
||||||
|
import Router from "./Router";
|
||||||
// import { Team } from "models";
|
// import { Team } from "models";
|
||||||
// import NotificationBanner from "common/NotificationBanner";
|
// import NotificationBanner from "common/NotificationBanner";
|
||||||
|
|
||||||
|
|
@ -39,8 +40,8 @@ export default function NavigationContainer(props: Props) {
|
||||||
// teams={teams}
|
// teams={teams}
|
||||||
// setTeams={setTeams}
|
// setTeams={setTeams}
|
||||||
/>
|
/>
|
||||||
{/* <SideNavigator open={sideNavigatorOpen} onOpen={openSideNavigator} onClose={closeSideMenu} /> */}
|
<SideNavigator open={sideNavigatorOpen} onOpen={openSideNavigator} onClose={closeSideMenu} />
|
||||||
{/* <Routes /> */}
|
<Router />
|
||||||
{/* {isMobile && <BottomNavigator openSide={openSideNavigator} sideIsOpen={sideNavigatorOpen} />} */}
|
{/* {isMobile && <BottomNavigator openSide={openSideNavigator} sideIsOpen={sideNavigatorOpen} />} */}
|
||||||
{children}
|
{children}
|
||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,13 @@ import { Suspense } from "react";
|
||||||
import LoadingScreen from "../app/LoadingScreen";
|
import LoadingScreen from "../app/LoadingScreen";
|
||||||
import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
|
import { BrowserRouter, Navigate, Route, Routes } from "react-router-dom";
|
||||||
import { Typography } from "@mui/material";
|
import { Typography } from "@mui/material";
|
||||||
|
import { useAuth0 } from "@auth0/auth0-react";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
export default function Router() {
|
export default function Router() {
|
||||||
|
|
||||||
|
const { isAuthenticated, loginWithRedirect, isLoading } = useAuth0()
|
||||||
|
|
||||||
const hello = () => {
|
const hello = () => {
|
||||||
return (
|
return (
|
||||||
|
|
@ -16,6 +18,21 @@ export default function Router() {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// useEffect(() => {
|
||||||
|
// setAuthorized(isAuthenticated || offline);
|
||||||
|
// if (isAuthenticated && !user.empty() && !user.status.finishedIntro) {
|
||||||
|
// history.push("/welcome");
|
||||||
|
// }
|
||||||
|
// }, [history, isAuthenticated, offline, user]);
|
||||||
|
|
||||||
|
if (isLoading) return null;
|
||||||
|
if (!isAuthenticated) {
|
||||||
|
loginWithRedirect()
|
||||||
|
return (
|
||||||
|
null
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Suspense fallback={<LoadingScreen />}>
|
<Suspense fallback={<LoadingScreen />}>
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue