@movalib/movalib-commons 1.59.9 → 1.59.11

package/src/AccountValidation.tsx

@@ -48,6 +48,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
     const [showPassword, setShowPassword] = useState(false);
     const [openPhoneNumberInput, setOpenPhoneNumberInput] = useState<boolean>(false);
     const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
+    const [loadingBtn, setLoadingBtn] = useState<boolean>(false);
 
      useEffect(() => {
         
@@ -99,6 +100,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
 
     const resetUserPassword = (req: any) => {
         if(req){
+            setLoadingBtn(true);
 
             UserService.reestPassword(req)
             .then(response => {
@@ -120,13 +122,15 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                 if(onSubmit){
                     onSubmit(false, error);
                 }
+            }).finally(() => {
+                setLoadingBtn(false);
             });
         }
     }
 
     const activateUserAccount = (req: any) => {
         if(req){
-
+            setLoadingBtn(true);
             UserService.validateAccount(req)
             .then(response => {
 
@@ -134,7 +138,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
 
                 if(response.success){
                     if(onSubmit){
-                        onSubmit(response.success, response.data ?? '');
+                        onSubmit(response.success, 'Le compte a été activé avec succès.');
                     }
                 }else{
                     if(onSubmit){
@@ -147,6 +151,8 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                 if(onSubmit){
                     onSubmit(false, error);
                 }
+            }).finally(() => {
+                setLoadingBtn(false);
             });
         }
     }
@@ -311,6 +317,7 @@ const AccountValidation: FunctionComponent<AccountValidationProps> = ({ movaAppT
                     }}
                     actions={
                         <LoadingButton
+                        loading={loadingBtn}
                             type="submit"
                             onClick={handleValidateAccount}
                             fullWidth

package/src/MovaSignUp.tsx

@@ -22,6 +22,8 @@ import VisibilityOff from '@mui/icons-material/VisibilityOff';
 import InfoIcon from '@mui/icons-material/Info';
 import isValid from 'date-fns/isValid';
 import Logger from "./helpers/Logger";
+import User from "./models/User";
+import UserService from "./services/UserService";
 
 // ATTENTION : s'assurer de la présence des documents suivants à la racine du composant porteur (dossier 'public')
 const CGUPath:string = "/Movalib_CGU.pdf";
@@ -33,17 +35,6 @@ const styles: CSSProperties = {
     alignItems: 'center'
 };
 
-const initialUserFormState = {
-    firstname: { value: '', isValid: true },
-    lastname: { value: '', isValid: true },
-    email: { value: '', isValid: true },
-    phoneNumber: { value: '', isValid: true },
-    password: { value: '', isValid: true },
-    gender:  { value: '', isValid: true },
-    birthDate:  { value: null, isValid: true },
-    acceptsTerms:  { value: false, isValid: true },
-};
-
 /**
  * Propriétés du composant
  * movaAppType : type d'application Movalib au sein de laquelle le composant est injectée
@@ -66,6 +57,7 @@ interface MovaSignUpProps {
     showLoginButton?: boolean,
     disableGutters?: boolean,
     usePhoneNumber?: boolean
+    userToEdit?: User,
 }
 
 /**
@@ -73,16 +65,28 @@ interface MovaSignUpProps {
  * ATTENTION : le lien de consultation des CGU doit pointer vers "/terms-and-conditions"
  */
 const MovaSignUp: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType, onSubmit, darkMode = false, alertMessage, alertSeverity, headerText,
-    showHeaderLogo = true, showLeafs= true, showCopyright = true, showLoginButton = true, disableGutters = false, usePhoneNumber = true}) => {
-
-    const [userForm, setUserForm] = useState<MovaUserSignUpForm>(initialUserFormState);
+    showHeaderLogo = true, showLeafs= true, showCopyright = true, showLoginButton = true, disableGutters = false, usePhoneNumber = true, userToEdit = null}) => {
+
+    const [userForm, setUserForm] = useState<MovaUserSignUpForm>(
+        {
+            firstname: { value: userToEdit?.firstname ?? '', isValid: true },
+            lastname: { value: userToEdit?.lastname ?? '', isValid: true },
+            email: { value: userToEdit?.email ?? '', isValid: true },
+            phoneNumber: { value: userToEdit?.phoneNumber ?? '', isValid: true },
+            password: { value: '', isValid: true },
+            gender:  { value: '', isValid: true },
+            birthDate:  { value: null, isValid: true },
+            acceptsTerms:  { value: false, isValid: true },
+        }
+    );
     const history = useHistory();
     const [message, setMessage] = useState<string>("");
     const theme = useTheme();
     const [showPassword, setShowPassword] = useState(false);
     const [openEmailInfo, setOpenEmailInfo] = useState(false);
     const [openPhoneNumberInfo, setOpenPhoneNumberInfo] = useState(false);
-
+    const [userExist, setUserExist] = useState<boolean>(false);
+    const [userIsAlreadyActive, setUserIsAlreadyActive] = useState<boolean>(false);
     const handleDateChange = (name: string, date: Date | null) => {
  
         if(name && date){
@@ -106,6 +110,25 @@ const MovaSignUp: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType,
                 if (fieldValue.length > 10) {
                     fieldValue = fieldValue.substring(0, 10);
                 }
+                if (fieldValue.length === 10){
+                    UserService.existsByPhoneNumber(fieldValue).then((response) => {
+                        if(response && response.data){
+                            if(response.data.isActive === false){
+                            setUserExist(true);
+                            setUserIsAlreadyActive(false);
+                            } else if (response.data.isActive === true){ 
+                                setUserIsAlreadyActive(true);
+                                setUserExist(false);
+                            } else {
+                                setUserExist(false);
+                                setUserIsAlreadyActive(false);
+                            }
+                        }
+                    })
+                } else {
+                    setUserExist(false);
+                    setUserIsAlreadyActive(false);
+                }
             }
 
             // Capitalisation automatique du prénom
@@ -285,24 +308,28 @@ const MovaSignUp: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType,
                         id="phoneNumber"
                         label="N° de téléphone"
                         name="phoneNumber"
-                        autoComplete="tel"                      
+                        autoComplete="tel" 
+                        disabled={userToEdit && userToEdit.phoneNumber ? true : false}                     
                         onChange={e => handleInputChange(e)}
                         value={userForm.phoneNumber.value}
                         error={Boolean(userForm.phoneNumber.error)}
                         helperText={userForm.phoneNumber.error}
                         InputProps={{
                             endAdornment: (
-                              <InputAdornment position="end">
-                                <IconButton
+                             <InputAdornment position="end">
+                                 {!userExist && <IconButton
                                   edge="end"
                                   onClick={() => setOpenPhoneNumberInfo(!openPhoneNumberInfo)}
                                   ><InfoIcon /> 
-                                </IconButton>
+                                </IconButton>}
                               </InputAdornment>
                             ),
                           }}   
                       />
-                      {openPhoneNumberInfo && <Alert severity="info" variant='standard'>Entrez le numéro de téléphone que vous avez utilisé pour réserver, afin de suivre facilement vos rendez-vous.</Alert>}
+                      {openPhoneNumberInfo && !userExist && <Alert severity="info" variant='standard'>Entrez le numéro de téléphone que vous avez utilisé pour réserver, afin de suivre facilement vos rendez-vous.</Alert>}
+                      {userExist && <Alert severity="success" variant='standard'>Rendez-vous trouvé(s) pour ce numéro !  Vous pourrez le(s) consulter après avoir créé votre compte.</Alert>}
+                      {userIsAlreadyActive && <Alert severity="error" sx={{marginTop: '5px'}} variant='standard'>Il semble qu’un compte existe déjà avec ce numéro. Connectez-vous ou utilisez "Mot de passe oublié" pour y accéder facilement.</Alert>}
+
                       </>
                     }
                     <TextField
@@ -313,6 +340,7 @@ const MovaSignUp: FunctionComponent<MovaSignUpProps> = ({ loading, movaAppType,
                         label="Adresse email"
                         name="email"
                         autoComplete="email"
+                        disabled={userToEdit && userToEdit.email ? true : false}                     
                         onChange={e => handleInputChange(e)}
                         value={userForm.email.value}
                         error={!userForm.email.isValid}

package/src/components/singup/ActivateAccount.tsx

@@ -0,0 +1,273 @@
+import { CSSProperties, FunctionComponent, useEffect, useState } from 'react';
+import { useHistory, useLocation, useParams } from 'react-router-dom';
+import UserService from '../../services/UserService';
+import { AlertColor, Box, Button, Checkbox, CircularProgress, FormControl, FormControlLabel, FormHelperText, Grid, IconButton, Link, SelectChangeEvent, TextField, Typography, colors, darken, useMediaQuery, useTheme } from '@mui/material';
+import Logger from '../../helpers/Logger';
+import { MovaAppType } from '../../helpers/Enums';
+import { MovaFormField, MovaUserSignUpForm, MovaValidationForm } from '../../helpers/Types';
+import { flexStart, validateField } from '../../helpers/Tools';
+import User from '../../models/User';
+import { set } from 'date-fns';
+import MovaSignUp from '../../MovaSignUp';
+import { validatePhoneNumber } from '../../helpers/Validator';
+
+interface RouteParams {
+    code: string;  // Définissez ici les paramètres de route attendus
+}
+interface ActivateAccountProps {
+    movaAppType: MovaAppType,
+    smsValidation: boolean,
+    onSubmit: (success: boolean, message: string) => void,
+    onResendSecurityCode?: (success: boolean, message: string) => void,
+}
+
+
+const ActivateAccount: FunctionComponent<ActivateAccountProps> = ({ movaAppType, smsValidation, onSubmit, onResendSecurityCode }) => {
+    const { code } = useParams<RouteParams>();
+    const location = useLocation();
+    const theme = useTheme();
+    const [alertMessage, setAlertMessage] = useState<string>("");
+    // La sévérité est initialiée à "error" par défaut
+    const [alertSeverity, setAlertSeverity] = useState<AlertColor>('error');
+    const [loading, setLoading] = useState(false);
+    const [currentUser, setCurrentUser] = useState<User | null>(null);
+    const [expiredCode, setExpiredCode] = useState(false);
+    const [unknowCode, setUnknowCode] = useState(false);
+    const [validationForm, setValidationForm] = useState<any>({ phoneNumber: { value: '', isValid: true } });
+
+    const history = useHistory();
+    // ajout d'un load pour le chargement de la page
+    const getUserByTokenOrCode = () => {
+        setExpiredCode(false);
+        setUnknowCode(false);
+        const params = location !== undefined ? new URLSearchParams(location.search) : undefined;
+        let req = {
+            token: !smsValidation ? params?.get('token') : null,
+            securityCode: smsValidation ? code : null,
+            demoGarage: Boolean(params?.get('demoGarage'))
+        }
+        UserService.validateAccount(req).then(response => {
+            if (response.success) {
+                setCurrentUser(response.data as User);
+            } else {
+                const data = response.data as { expiredCode?: boolean, unknownCode?: boolean };
+                if (data?.expiredCode) {
+                    setExpiredCode(true);
+                }
+                if (data?.unknownCode) {
+                    setUnknowCode(true);
+                }
+            }
+        })
+    };
+
+    useEffect(() => {
+        getUserByTokenOrCode();
+    }, []);
+
+    const updateActivateUseronSubmit = (form: MovaUserSignUpForm) => {
+        // appelle api pour mettre a jour l'utilisateur + auto activate en fonction du movaAPPType
+        if (movaAppType === MovaAppType.INDIVIDUAL && currentUser) {
+            setLoading(true);
+            try {
+
+                // On prépare la query
+                let query = {
+                    code: code,
+                    email: form.email.value,
+                    password: form.password.value,
+                    firstname: form.firstname.value,
+                    lastname: form.lastname.value,
+                }
+
+                UserService.editUser(query, currentUser.id)
+                    .then(response => {
+                        //success or Error this is parent component responsability
+                        Logger.info(response);
+                        if (response.success) {
+                            onSubmit(response.success, response.data ?? 'Le compte a été mis à jour et activé avec succès');
+                            history.push('/login');
+                        } else {
+                            onSubmit(response.success, response.error ?? 'Erreur lors de la mise à jour du compte');
+                        }
+
+                    }).catch(error => {
+                        onSubmit(false, 'Erreur lors de la mise à jour du compte');
+                        Logger.error(error);
+                        setAlertMessage(error);
+                    });
+
+            } catch (error) {
+                console.error('Error occurred during submission:', error);
+            } finally {
+                setLoading(false);
+            }
+        }
+
+
+    }
+    const controlPhoneNumber = (): boolean => {
+
+        let newForm: MovaValidationForm = validationForm;
+        let newField: MovaFormField;
+
+        newForm.phoneNumber = validateField(validationForm.phoneNumber, value => !!value, 'Champ obligatoire');
+
+        // Validator 'phoneNumber'
+        if (newForm.phoneNumber?.value) {
+            if (newForm.phoneNumber?.value.length < 10) {
+                newField = { value: validationForm.phoneNumber?.value, error: "Le n° de téléphone est invalide." };
+            } else {
+                newField = { value: validationForm.phoneNumber?.value, error: '' };
+            }
+            newForm = { ...newForm, ...{ phoneNumber: newField } };
+        }
+
+        setValidationForm(newForm);
+
+        return !Boolean(newForm.phoneNumber?.error);
+    }
+
+
+    const handleInputChange = (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement> | null): void => {
+        if (e) {
+            const fieldName: string = e.target.name;
+            const fieldValue: string = e.target.value;
+            const newField: MovaFormField = { [fieldName]: { value: fieldValue, isValid: true } };
+
+            if (fieldName == "phoneNumber") {
+                if (!validatePhoneNumber(fieldValue))
+                    return;
+            }
+
+            setValidationForm({ ...validationForm, ...newField });
+        }
+    }
+
+    const resendCode = () => {
+
+        if (controlPhoneNumber() && onResendSecurityCode) {
+
+            let req = {
+                phoneNumber: validationForm.phoneNumber?.value
+            }
+
+            UserService.resendActivationAccount(req)
+                .then(response => {
+
+                    Logger.info(response);
+
+                    if (response.success) {
+                        onResendSecurityCode(response.success, response.data ?? '');
+                    } else {
+                        onResendSecurityCode(response.success, response.error ?? '');
+                    }
+                    history.push('/login');
+
+                }).catch(error => {
+                    Logger.error(error);
+                    if (onSubmit) {
+                        onSubmit(false, error);
+                    }
+                });
+        }
+    }
+
+    return (
+        <>
+            {currentUser !== null && <MovaSignUp
+                movaAppType={movaAppType}
+                onSubmit={updateActivateUseronSubmit}
+                alertMessage={alertMessage}
+                alertSeverity={alertSeverity}
+                userToEdit={currentUser}
+                loading={loading} />}
+            {expiredCode && (
+                <Box sx={{ width: '99vw', height: '99vh', display: 'flex' }}>
+                    <Box
+                        sx={{
+                            display: 'block',
+                            margin: 'auto',
+                            textAlign: 'center',
+                            padding: 3,
+                            borderRadius: 2,
+                            boxShadow: 3,
+                            maxWidth: 400,
+                            backgroundColor: 'white',
+                        }}
+                    >
+                        <Typography variant="h6" color="error" gutterBottom>
+                            Code de validation expiré
+                        </Typography>
+                        <Typography><b>Indiquez nous votre numéro de téléphone.</b><br />Nous allons renvoyer un SMS d'activation de compte</Typography>
+                        <Grid item xs={6}>
+                            <TextField
+                                margin="normal"
+                                fullWidth
+                                required
+                                id="phoneNumber"
+                                label="N° de téléphone"
+                                name="phoneNumber"
+                                autoComplete="tel"
+                                onChange={e => handleInputChange(e)}
+                                value={validationForm.phoneNumber.value}
+                                error={Boolean(validationForm.phoneNumber.error)}
+                                helperText={validationForm.phoneNumber.error}
+                            />
+                        </Grid>
+                        <Button
+                            onClick={resendCode}
+                            sx={{ cursor: 'pointer', textAlign: 'center', width: '100%', mt: 1 }}
+                        >
+                            Renvoyer le code
+                        </Button>
+                    </Box>
+                </Box>
+            )}
+            {unknowCode && (
+                <Box sx={{ width: '99vw', height: '99vh', display: 'flex' }}>
+                    <Box
+                        sx={{
+                            display: 'flex',
+                            flexDirection: 'column',
+                            alignItems: 'center',
+                            justifyContent: 'center',
+                            height: '100%',
+                            width: '100%',
+                            margin: 'auto',
+                            textAlign: 'center',
+                            padding: 3,
+                            borderRadius: 2,
+                            boxShadow: 3,
+                            backgroundColor: 'white',
+                        }}
+                    >
+                        <Typography variant="h6" color="error" gutterBottom>
+                            Code de validation invalide
+                        </Typography>
+                        <Typography variant="body1" color="textSecondary" gutterBottom>
+                        Le code de validation fourni ne correspond à aucun utilisateur (ou votre compte a déjà été activé). <br />
+                         Essayez de vous connecter avec votre numéro de téléphone.
+                            <br />
+                            Si le problème persiste, veuillez nous contacter à{' '}
+                            <b>support@movalib.com</b>.
+                        </Typography>
+                        <Button
+                            variant="contained"
+                            color="primary"
+                            onClick={(e) => history.push('/login')}
+                            sx={{ marginTop: 2 }}
+                        >
+                            Retour à la connexion
+                        </Button>
+                    </Box>
+                </Box>
+            )}
+
+        </>
+    );
+};
+
+export default ActivateAccount;
+
+

package/src/helpers/ApiHelper.ts

@@ -55,16 +55,16 @@ function handleResponse(response: Response): Promise<APIResponse<any>> {
 
             switch(response.status){
                 case 403:
-                    errorMsg = 'Accès non autorisé (403)'; break;
+                    errorMsg = 'Accès non autorisé'; break;
                 case 404:
-                    errorMsg = 'La ressource demandée est introuvable (404)'; break;
+                    errorMsg = (typeof data === 'string') ? data : 'La ressource demandée est introuvable'; break;
                 case 500:
-                    errorMsg = 'Une erreur interne du serveur est survenue (500)'; break;
+                    errorMsg = 'Une erreur interne du serveur est survenue'; break;
                 default:
-                    errorMsg = (typeof data === 'string') ? data : `Une erreur est survenue (${response.status})`; break;
+                    errorMsg = (typeof data === 'string') ? data : `Une erreur est survenue`; break;
             }
 
-            return { success: false, error: errorMsg };
+            return { success: false, error: errorMsg, data: data };
         }
 
         return { success: true, data };

package/src/models/Garage.ts

@@ -17,6 +17,7 @@ export default class Garage {
     name:string;
     address:Address;
     workforce: number;
+    partialWorkforce?: number;
     contactPhone: string;
     prestationCategories: CategoryPrestation[];
     prestations: Prestation[];
@@ -43,6 +44,7 @@ export default class Garage {
     teamManagementActive?: boolean;
     documents?: Document[];
     subscriptions?: Subscription[];
+    subscription?: Subscription;
     supportPhoneNumber?: string;
     operatorsActive?: boolean;
     employees?: Employee[];
@@ -67,7 +69,9 @@ export default class Garage {
         documents?: Document[],
         subscriptions?: Subscription[],
         loanerVehicleActive?: boolean,
-        loanerVehicleRequestActive?: boolean
+        loanerVehicleRequestActive?: boolean,
+        subscription?: Subscription,
+        partialWorkforce?: number
     ) {
         this.id = id;
         this.adminId = adminId;
@@ -86,5 +90,7 @@ export default class Garage {
         this.vehicles = vehicles;
         this.loanerVehicleActive = loanerVehicleActive;
         this.loanerVehicleRequestActive = loanerVehicleRequestActive;
+        this.subscription = subscription;
+        this.partialWorkforce = partialWorkforce;
     }
 }

package/src/models/Subscription.ts

@@ -1,40 +1,77 @@
 import { SubscriptionPaymentInterval, SubscriptionState, SubscriptionType } from "../helpers/Enums";
-
+interface roiInterface {
+  period: string,
+  turnover: number,
+  nbInvoice: number,
+  nbQuote: number,
+  nbNoShow: number,
+  nbLostQuote: number,
+  moRateOne: number,
+  moRateTwo: number,
+  moRateThree: number,
+  moOne: number,
+  moTwo: number,
+  moThree: number,
+  comment: string
+}
 export default class Subscription {
 
-    // Properties
-    id: string;
-    garageId: string;
-    type: SubscriptionType;
-    state: SubscriptionState;
-    companyName: string;
-    companyEmail: string;
-    companySiren: string;
-    companyLegalForm: string;
-    trialDays: number;
-    startDate: Date;
-    activationDate: Date;
-    cancellationDate: Date;
-    paymentInterval: SubscriptionPaymentInterval;
-    paymentIban: string;
-    
-    constructor(id: string, garageId: string, type: SubscriptionType, state: SubscriptionState, companyName: string,
-      companyEmail: string, companySiren: string, companyLegalForm: string, trialDays: number, startDate: Date, activationDate: Date, 
-      cancellationDate: Date, paymentInterval: SubscriptionPaymentInterval, paymentIban : string) {
 
-        this.id = id;
-        this.garageId = garageId;
-        this.type = type;
-        this.state = state;
-        this.companyName = companyName;
-        this.companyEmail = companyEmail;
-        this.companySiren = companySiren;
-        this.companyLegalForm = companyLegalForm;
-        this.trialDays = trialDays;
-        this.startDate = startDate;
-        this.activationDate = activationDate;
-        this.cancellationDate = cancellationDate;
-        this.paymentInterval = paymentInterval;
-        this.paymentIban = paymentIban;
-      }
+  // Properties
+  id: string;
+  garageId: string;
+  type: SubscriptionType;
+  state: SubscriptionState;
+  companyName: string;
+  companyEmail: string;
+  companySiren: string;
+  companyLegalForm: string;
+  trialDays: number;
+  startDate: Date;
+  activationDate: Date;
+  cancellationDate: Date;
+  paymentInterval: SubscriptionPaymentInterval;
+  paymentIban: string;
+  roi: roiInterface;
+  additionalFormationQuantity: number;
+  additionalFormationFree: boolean;
+  webPage: boolean;
+  plvQuantity: number;
+  plvFree: boolean;
+  trainingOptionalOne: Date;
+  trainingOptionalTwo: Date;
+
+  constructor(id: string, garageId: string, type: SubscriptionType, state: SubscriptionState, companyName: string,
+    companyEmail: string, companySiren: string, companyLegalForm: string, trialDays: number, startDate: Date, activationDate: Date,
+    cancellationDate: Date, paymentInterval: SubscriptionPaymentInterval, paymentIban: string, roi: roiInterface, additionalFormationQuantity: number,
+    additionalFormationFree: boolean,
+    webPage: boolean,
+    plvQuantity: number,
+    plvFree: boolean,
+    trainingOptionalOne: Date,
+    trainingOptionalTwo: Date
+  ) {
+    this.id = id;
+    this.garageId = garageId;
+    this.type = type;
+    this.state = state;
+    this.companyName = companyName;
+    this.companyEmail = companyEmail;
+    this.companySiren = companySiren;
+    this.companyLegalForm = companyLegalForm;
+    this.trialDays = trialDays;
+    this.startDate = startDate;
+    this.activationDate = activationDate;
+    this.cancellationDate = cancellationDate;
+    this.paymentInterval = paymentInterval;
+    this.paymentIban = paymentIban;
+    this.roi = roi;
+    this.webPage = webPage;
+    this.additionalFormationQuantity = additionalFormationQuantity;
+    this.additionalFormationFree = additionalFormationFree;
+    this.plvQuantity = plvQuantity;
+    this.plvFree = plvFree;
+    this.trainingOptionalOne = trainingOptionalOne;
+    this.trainingOptionalTwo = trainingOptionalTwo;
+  }
 }

package/src/services/UserService.ts

@@ -38,6 +38,15 @@ export default class UserService {
         });
     }
 
+    static resendActivationAccount(req: any): Promise<APIResponse<string>> {
+        return request({
+            url: `${API_BASE_URL}/user/resend-activation-link`,
+            method: APIMethod.POST,
+            appType: MovaAppType.INDIVIDUAL,
+            body: JSON.stringify(req)
+        });
+    }
+
     static getSalesGarages(salesId: string,): Promise<APIResponse<Garage[]>> {
         return request({
             url: `${API_BASE_URL}/sales/${salesId}/garages`,
@@ -46,7 +55,7 @@ export default class UserService {
         });
     }
 
-    static validateAccount(req: any): Promise<APIResponse<string>> {
+    static validateAccount(req: any): Promise<APIResponse<User | {expiredCode?:boolean, unknowCode?: boolean}>> {
         return request({
             url: `${API_BASE_URL}/user/validate-account`,
             method: APIMethod.POST,
@@ -55,6 +64,15 @@ export default class UserService {
         });
     }
 
+    static editUser(req: any, userId: string): Promise<APIResponse<string>> {
+        return request({
+            url: `${API_BASE_URL}/user/${userId}/complete`,
+            method: APIMethod.PATCH,
+            appType: MovaAppType.INDIVIDUAL,
+            body: JSON.stringify(req)
+        });
+    }
+
     /**
      * @param email 
      * @param password