Block API access when 2FA is required on account; closes #2791

This commit is contained in:
Dane Everitt 2020-12-06 13:56:14 -08:00
parent 5d23d894ae
commit d22456d9ca
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 101 additions and 40 deletions

View file

@ -1,7 +1,7 @@
import React, { useEffect } from 'react';
import ReactGA from 'react-ga';
import { hot } from 'react-hot-loader/root';
import { BrowserRouter, Route, Switch, useLocation } from 'react-router-dom';
import { Route, Router, Switch, useLocation } from 'react-router-dom';
import { StoreProvider } from 'easy-peasy';
import { store } from '@/state';
import DashboardRouter from '@/routers/DashboardRouter';
@ -13,6 +13,8 @@ import ProgressBar from '@/components/elements/ProgressBar';
import NotFound from '@/components/screens/NotFound';
import tw from 'twin.macro';
import GlobalStylesheet from '@/assets/css/GlobalStylesheet';
import { createBrowserHistory } from 'history';
import { setupInterceptors } from '@/api/interceptors';
interface ExtendedWindow extends Window {
SiteConfiguration?: SiteSettings;
@ -30,6 +32,10 @@ interface ExtendedWindow extends Window {
};
}
const history = createBrowserHistory({ basename: '/' });
setupInterceptors(history);
const Pageview = () => {
const { pathname } = useLocation();
@ -72,7 +78,7 @@ const App = () => {
<Provider store={store}>
<ProgressBar/>
<div css={tw`mx-auto w-auto`}>
<BrowserRouter basename={'/'} key={'root-router'}>
<Router history={history}>
{SiteConfiguration?.analytics && <Pageview/>}
<Switch>
<Route path="/server/:id" component={ServerRouter}/>
@ -80,7 +86,7 @@ const App = () => {
<Route path="/" component={DashboardRouter}/>
<Route path={'*'} component={NotFound}/>
</Switch>
</BrowserRouter>
</Router>
</div>
</Provider>
</StoreProvider>