feat: use create access token api endpoint instead of login mutation

This commit is contained in:
kasia.oczkowska
2024-07-18 13:05:59 +01:00
parent f63cc80383
commit d051275e54
9 changed files with 66 additions and 63 deletions

View File

@@ -1,6 +1,5 @@
import * as React from 'react';
import { useNavigate, Link as RouterLink } from 'react-router-dom';
import { useMutation } from '@apollo/client';
import Paper from '@mui/material/Paper';
import Link from '@mui/material/Link';
import Typography from '@mui/material/Typography';
@@ -8,17 +7,20 @@ import LoadingButton from '@mui/lab/LoadingButton';
import useAuthentication from 'hooks/useAuthentication';
import useCloud from 'hooks/useCloud';
import * as URLS from 'config/urls';
import { LOGIN } from 'graphql/mutations/login';
import Form from 'components/Form';
import TextField from 'components/TextField';
import useFormatMessage from 'hooks/useFormatMessage';
import useCreateAccessToken from 'hooks/useCreateAccessToken';
import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
function LoginForm() {
const isCloud = useCloud();
const navigate = useNavigate();
const formatMessage = useFormatMessage();
const enqueueSnackbar = useEnqueueSnackbar();
const authentication = useAuthentication();
const [login, { loading }] = useMutation(LOGIN);
const { mutateAsync: createAccessToken, isPending: loading } =
useCreateAccessToken();
React.useEffect(() => {
if (authentication.isAuthenticated) {
@@ -27,13 +29,19 @@ function LoginForm() {
}, [authentication.isAuthenticated]);
const handleSubmit = async (values) => {
const { data } = await login({
variables: {
input: values,
},
});
const { token } = data.login;
authentication.updateToken(token);
try {
const { email, password } = values;
const { data } = await createAccessToken({
email,
password,
});
const { token } = data;
authentication.updateToken(token);
} catch (error) {
enqueueSnackbar(error?.message || formatMessage('loginForm.error'), {
variant: 'error',
});
}
};
return (

View File

@@ -11,8 +11,10 @@ import * as URLS from 'config/urls';
import { REGISTER_USER } from 'graphql/mutations/register-user.ee';
import Form from 'components/Form';
import TextField from 'components/TextField';
import { LOGIN } from 'graphql/mutations/login';
import useFormatMessage from 'hooks/useFormatMessage';
import useCreateAccessToken from 'hooks/useCreateAccessToken';
import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
const validationSchema = yup.object().shape({
fullName: yup.string().trim().required('signupForm.mandatoryInput'),
email: yup
@@ -26,39 +28,57 @@ const validationSchema = yup.object().shape({
.required('signupForm.mandatoryInput')
.oneOf([yup.ref('password')], 'signupForm.passwordsMustMatch'),
});
const initialValues = {
fullName: '',
email: '',
password: '',
confirmPassword: '',
};
function SignUpForm() {
const navigate = useNavigate();
const authentication = useAuthentication();
const formatMessage = useFormatMessage();
const enqueueSnackbar = useEnqueueSnackbar();
const [registerUser, { loading: registerUserLoading }] =
useMutation(REGISTER_USER);
const [login, { loading: loginLoading }] = useMutation(LOGIN);
const { mutateAsync: createAccessToken, isPending: loginLoading } =
useCreateAccessToken();
React.useEffect(() => {
if (authentication.isAuthenticated) {
navigate(URLS.DASHBOARD);
}
}, [authentication.isAuthenticated]);
const handleSubmit = async (values) => {
const { fullName, email, password } = values;
await registerUser({
variables: {
input: { fullName, email, password },
input: {
fullName,
email,
password,
},
},
});
const { data } = await login({
variables: {
input: { email, password },
},
});
const { token } = data.login;
authentication.updateToken(token);
try {
const { data } = await createAccessToken({
email,
password,
});
const { token } = data;
authentication.updateToken(token);
} catch (error) {
enqueueSnackbar(error?.message || formatMessage('signupForm.error'), {
variant: 'error',
});
}
};
return (
<Paper sx={{ px: 2, py: 4 }}>
<Typography
@@ -168,4 +188,5 @@ function SignUpForm() {
</Paper>
);
}
export default SignUpForm;