fix(invite accept): fix invite accept route payload

src/DTOs/Auth.tsx

@@ -27,7 +27,7 @@ export interface InviteUserCredentials {
 }
 
 export interface SignUpCredentials {
-  token: string;
+  email: string;
   name: string;
   password: string;
   password_confirmation: string;

src/components/FormUpdate/index.tsx

@@ -1,10 +1,10 @@
 import React from 'react';
+import { useParams } from 'react-router-dom';
 
 import { Form } from '@unform/web';
 
 import InputForm from 'components/InputForm';
 import Button from 'components/Button/Button';
-import Input from 'components/Input/Input';
 
 import { Container } from './styles';
 
@@ -26,13 +26,20 @@ interface FormUpdateProps {
   };
 }
 
+interface ParamsProps {
+  email: string;
+}
 function FormUpdate({
   handleSubmit,
   formRef,
   inviteInfo,
   hasPasswordField,
   user,
 }: FormUpdateProps) {
+  const params = useParams<ParamsProps>();
+
+  const paramsEmail = params.email;
+
   return (
     <Container>
       <Form onSubmit={handleSubmit} ref={formRef} className="Content">
@@ -57,12 +64,11 @@ function FormUpdate({
             title="Empresa"
           />
 
-          <Input
+          <InputForm
             name="email"
             title="E-mail"
-            styleWidth="40rem"
-            defaultValue={inviteInfo?.email || user?.phone || ''}
-            readOnly={!!inviteInfo?.email}
+            defaultValue={paramsEmail || user?.email || ''}
+            readOnly={!!paramsEmail}
           />
 
           <InputForm defaultValue={user?.phone} name="phone" title="Telefone" />

src/pages/Register/index.tsx

@@ -1,5 +1,4 @@
 import React, { useRef, useCallback, useState } from 'react';
-import { useParams } from 'react-router-dom';
 import * as Yup from 'yup';
 
 import { FormHandles } from '@unform/core';
@@ -19,6 +18,7 @@ import StyledRegisterNewUser from './styles';
 
 interface SignUpData {
   name: string;
+  email: string;
   password: string;
   password_confirmation: string;
   office: string;
@@ -27,12 +27,7 @@ interface SignUpData {
   area: string;
 }
 
-interface ParamsProps {
-  token: string;
-}
-
 const RegisterNewUser = () => {
-  const params = useParams<ParamsProps>();
   const formRef = useRef<FormHandles>(null);
   const inviteInfo = getInviteInfo();
 
@@ -49,13 +44,13 @@ const RegisterNewUser = () => {
 
         await schema.validate(data, { abortEarly: false });
         setOpenRegisterModal(true);
-        await signUp({ ...data, token: params.token });
+        await signUp(data);
       } catch (err) {
         const errors = getValidationErrors(err);
         formRef.current?.setErrors(errors);
       }
     },
-    [signUp, params],
+    [signUp],
   );
 
   return (

src/routes.tsx

@@ -34,14 +34,13 @@ export default function Routes() {
         <Route path="/reset" component={ResetPassword} />
         <Route path="/recovery" component={Recovery} />
         <Route path="/login" component={Login} />
-        <Route path="/invite/:token" component={Register} />
+        <Route path="/invite/:email" component={Register} />
         <Route path="/404" component={NotFound} />
 
         {userIsAdmin && (
           <>
             <Route path="/invite" exact isPrivate component={Invite} />
             <Route path="/users" isPrivate component={Users} />
-            <Redirect to="/404" />
           </>
         )}
         <Redirect to="/404" />

src/utils/registerSchemaValidation.ts

@@ -7,6 +7,7 @@ export default {
   phone: Yup.string().required('Telefone obrigatório'),
   password: Yup.string().required('Senha obrigatória'),
   company: Yup.string().required('Empresa obrigatória'),
+  email: Yup.string().email().required('Email obrigatório'),
   passwordConfirmation: Yup.string().oneOf(
     [Yup.ref('password'), null],
     'Senhas devem ser iguais',