add redirect to login and signup

Author: jackblanc

src/api/test/protectedApiClient.test.ts

@@ -38,4 +38,4 @@ describe('Protected API Client Tests', () => {
       expect(result).toEqual(response);
     });
   });
-});
+});

src/containers/login/index.tsx

@@ -1,24 +1,36 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
 import { Button, Form, Input, Typography } from 'antd';
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import { login } from '../../auth/ducks/thunks';
 import { connect, useDispatch } from 'react-redux';
 import { AsyncRequestKinds } from '../../utils/asyncRequest';
 import { C4CState } from '../../store';
-import { UserAuthenticationReducerState } from '../../auth/ducks/types';
+import {
+  LoginRequest,
+  PrivilegeLevel,
+  UserAuthenticationReducerState,
+} from '../../auth/ducks/types';
 import { ContentContainer } from '../../components';
 import { Routes } from '../../App';
+import { getPrivilegeLevel } from '../../auth/ducks/selectors';
 
 const { Title, Paragraph } = Typography;
 
 type LoginProps = UserAuthenticationReducerState;
 
 const Login: React.FC<LoginProps> = ({ tokens }) => {
   const dispatch = useDispatch();
-  const onFinish = (values: any) => {
-    dispatch(login({ email: values.email, password: values.password }));
+  const history = useHistory();
+
+  const onFinish = (values: LoginRequest): void => {
+    dispatch(login(values));
   };
+
+  if (getPrivilegeLevel(tokens) !== PrivilegeLevel.NONE) {
+    history.push(Routes.HOME);
+  }
+
   return (
     <>
       <Helmet>

src/containers/signup/index.tsx

@@ -1,35 +1,36 @@
 import React from 'react';
 import { Helmet } from 'react-helmet';
 import { Button, Form, Input, Typography } from 'antd';
-import { Link } from 'react-router-dom';
+import { Link, useHistory } from 'react-router-dom';
 import { signup } from '../../auth/ducks/thunks';
 import { connect, useDispatch } from 'react-redux';
 import { C4CState } from '../../store';
 import {
+  PrivilegeLevel,
   SignupRequest,
   UserAuthenticationReducerState,
 } from '../../auth/ducks/types';
 import { AsyncRequestKinds } from '../../utils/asyncRequest';
 import { ContentContainer } from '../../components';
+import { getPrivilegeLevel } from '../../auth/ducks/selectors';
+import { Routes } from '../../App';
 
 const { Title, Paragraph } = Typography;
 
 type SignupProps = UserAuthenticationReducerState;
 
 const Signup: React.FC<SignupProps> = ({ tokens }) => {
   const dispatch = useDispatch();
+  const history = useHistory();
 
   const onFinish = (values: SignupRequest) => {
-    dispatch(
-      signup({
-        email: values.email,
-        password: values.password,
-        firstName: values.firstName,
-        lastName: values.lastName,
-      }),
-    );
+    dispatch(signup(values));
   };
 
+  if (getPrivilegeLevel(tokens) !== PrivilegeLevel.NONE) {
+    history.push(Routes.HOME);
+  }
+
   return (
     <>
       <Helmet>
@@ -82,7 +83,19 @@ const Signup: React.FC<SignupProps> = ({ tokens }) => {
           <Form.Item
             label="Confirm Password"
             name="confirmPassword"
-            rules={[{ required: true, message: 'Required' }]}
+            rules={[
+              { required: true, message: 'Required' },
+              ({ getFieldValue }) => ({
+                validator(_, value) {
+                  if (!value || getFieldValue('password') === value) {
+                    return Promise.resolve();
+                  }
+                  return Promise.reject(
+                    'The two passwords that you entered do not match!',
+                  );
+                },
+              }),
+            ]}
           >
             <Input.Password />
           </Form.Item>