From bbb9b6c9228acfdbb579c5f4db54a9ab162fb8bf Mon Sep 17 00:00:00 2001
From: Alberto Defendi <1369-ahl-berto@users.noreply.gitlab.inf.unibz.it>
Date: Sun, 16 May 2021 15:32:15 +0200
Subject: [PATCH] Move back cookie fetch to SignInForm.
This cookie has to be sent only from this page.
---
src/App.tsx | 26 ++------------------------
1 file changed, 2 insertions(+), 24 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index 0fd4963..10c472a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -9,7 +9,6 @@ import { NotFound } from 'components/NonAuthUser/NotFound/NotFound';
import { ProfilePage } from 'components/AuthUser/ProfilePage/ProfilePage';
import { Roles } from 'api/userRoles';
import { Unauthorized } from 'components/NonAuthUser/Unauthorized/Unauthorized';
-import axios from 'axios';
import { ReservationPage } from 'components/AuthUser/ReservationPage/ReservationPage';
import { HomePage } from 'components/AuthUser/HomePage/HomePage';
import { SignInForm } from 'components/AuthUser/SignInForm/SignInForm';
@@ -43,31 +42,10 @@ const theme = createMuiTheme({
},
});
-const configDjangoCookieName = (): void => {
- axios.defaults.xsrfHeaderName = 'X-CSRFTOKEN';
- axios.defaults.xsrfCookieName = 'csrftoken';
- axios.defaults.withCredentials = true;
-};
-
export const App: FC = () => {
- const [isCookieFetched, setisCookieFetched] = useState<string>('');
-
const [role, setRole] = useState('');
const value = { role, setRole };
- configDjangoCookieName();
- useEffect(() => {
- const fetchCookie = async (): Promise<unknown> => {
- const response = await axios('api/web/csrf');
- axios.defaults.headers.common['X-CSRFTOKEN'] = response.data.token;
- sessionStorage.setItem('X-CSRFTOKEN', response.data.token);
- sessionStorage.setItem('ROLE', 'admin');
- setisCookieFetched(response.data.token);
- return null;
- };
- if (!isCookieFetched) fetchCookie();
- }, [isCookieFetched]);
-
return (
<ThemeProvider theme={theme}>
<Router>
@@ -75,9 +53,9 @@ export const App: FC = () => {
<Switch>
<Route exact path={NonAuthRoutes.home} component={LandingPage} />
<AuthContext.Provider value={value}>
- <Route exact path={NonAuthRoutes.auth} component={AuthUser} />
+ <Route path={NonAuthRoutes.auth} component={AuthUser} />
- <Route exact path="/signIn" component={SignInForm} />
+ <Route path="/signIn" component={SignInForm} />
<PrivateRoute
path={AuthRoutes.dashboard}
--
GitLab