diff --git a/src/components/Auth/SignInForm/SignInForm.tsx b/src/components/Auth/SignInForm/SignInForm.tsx index 014067d7c675df9ccb60e8982fa18e44f5e04dcd..71825c73f8be5d3b9a8d57840477ec79686a4c07 100644 --- a/src/components/Auth/SignInForm/SignInForm.tsx +++ b/src/components/Auth/SignInForm/SignInForm.tsx @@ -1,10 +1,10 @@ -import React, { FC, useCallback, useContext, useState } from 'react'; +import React, { FC, useContext } from 'react'; import axios from 'axios'; +import { useCookie } from 'hooks/useCookie'; +import { AuthRoutes, NonAuthRoutes } from 'api/routes'; import { SubmitHandler, useForm } from 'react-hook-form'; import { Button } from '@material-ui/core'; import { useHistory } from 'react-router-dom'; -import { AuthRoutes, NonAuthRoutes } from 'api/routes'; -import { fetchCookie } from 'api/fetchCookie'; import { AuthContext } from 'components/Auth/AuthContext'; import { InputField } from 'components/Auth/InputField/InputField'; import { useStyles } from './useStyles'; @@ -18,17 +18,8 @@ const defaultValues = { export const SignInForm: FC = () => { const history = useHistory(); const { setRole, setIsAuth } = useContext(AuthContext); - const [cookie, setCookie] = useState<string>(''); - - useCallback(() => { - let isMounted = true; - if (isMounted) - fetchCookie().then((cookieResponse) => setCookie(cookieResponse)); - return () => { - isMounted = false; - }; - }, [cookie]); + const cookie = useCookie(); const { control, errors, setError, handleSubmit } = useForm<CredentialsType>({ defaultValues, @@ -64,6 +55,8 @@ export const SignInForm: FC = () => { } else if (response.data.status === 'role-choice-needed') { history.replace(`${NonAuthRoutes.auth}${AuthRoutes.choseRole}`); } else if (response.data.status === 'success') { + setRole(response.data.role); + setIsAuth(true); history.replace(`${AuthRoutes.dashboard}${AuthRoutes.home}`); } });