@movalib/movalib-commons 1.59.8 → 1.59.10

package/devIndex.tsx

@@ -51,12 +51,12 @@ const App = () => {
           Logger.info(response.data);
 
           // Chargement des données du garage
-          GarageService.getAdministratedGarages()
+          GarageService.getAdministratedGarages({garageId: response?.data?.garages?.[0]?.id!})
             .then(response => {
 
                 if (response.success) {
                   Logger.info(response.data);
-                  setGarage(response.data ? response.data[0] : undefined);
+                  setGarage(response.data ? response.data : undefined);
                 } else {
                   Logger.error(response.error);
                 }

package/dist/devIndex.js

@@ -75,14 +75,15 @@ var App = function () {
     var refreshGarageData = function () {
         AuthenticationService_1.default.login(Enums_1.MovaAppType.GARAGE, "cto@movalib.com", "cto@MOVALIB.com")
             .then(function (response) {
+            var _a, _b, _c;
             if (response.success) {
                 Logger_1.default.info(response.data);
                 // Chargement des données du garage
-                GarageService_1.default.getAdministratedGarages()
+                GarageService_1.default.getAdministratedGarages({ garageId: (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.garages) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.id })
                     .then(function (response) {
                     if (response.success) {
                         Logger_1.default.info(response.data);
-                        setGarage(response.data ? response.data[0] : undefined);
+                        setGarage(response.data ? response.data : undefined);
                     }
                     else {
                         Logger_1.default.error(response.error);

package/dist/src/AccountValidation.js

@@ -54,6 +54,7 @@ var AccountValidation = function (_a) {
     var _j = (0, react_1.useState)(false), showPassword = _j[0], setShowPassword = _j[1];
     var _k = (0, react_1.useState)(false), openPhoneNumberInput = _k[0], setOpenPhoneNumberInput = _k[1];
     var isMobile = (0, material_1.useMediaQuery)(theme.breakpoints.down('sm'));
+    var _l = (0, react_1.useState)(false), loadingBtn = _l[0], setLoadingBtn = _l[1];
     (0, react_1.useEffect)(function () {
         var params = location !== undefined ? new URLSearchParams(location.search) : undefined;
         if (params !== undefined) {
@@ -92,6 +93,7 @@ var AccountValidation = function (_a) {
     }, [location]);
     var resetUserPassword = function (req) {
         if (req) {
+            setLoadingBtn(true);
             UserService_1.default.reestPassword(req)
                 .then(function (response) {
                 var _a, _b;
@@ -111,11 +113,14 @@ var AccountValidation = function (_a) {
                 if (onSubmit) {
                     onSubmit(false, error);
                 }
+            }).finally(function () {
+                setLoadingBtn(false);
             });
         }
     };
     var activateUserAccount = function (req) {
         if (req) {
+            setLoadingBtn(true);
             UserService_1.default.validateAccount(req)
                 .then(function (response) {
                 var _a;
@@ -135,6 +140,8 @@ var AccountValidation = function (_a) {
                 if (onSubmit) {
                     onSubmit(false, error);
                 }
+            }).finally(function () {
+                setLoadingBtn(false);
             });
         }
     };
@@ -255,7 +262,7 @@ var AccountValidation = function (_a) {
     return ((0, jsx_runtime_1.jsxs)("div", { children: [(emptyPwd || smsValidation || resetPassword || true) &&
                 (0, jsx_runtime_1.jsx)(MovaDialog_1.default, __assign({ leafImageColor: 'pink', titleStyle: getTitleStyle(), fullScreen: isMobile, open: emptyPwd || smsValidation || resetPassword || true, closable: false, onClose: function () {
                         throw new Error('Function not implemented.');
-                    }, actions: (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ type: "submit", onClick: handleValidateAccount, fullWidth: true, variant: "contained", sx: { mt: 4, mb: 0 } }, { children: resetPassword ? (0, jsx_runtime_1.jsx)("span", { children: "R\u00E9initialiser mon mot de passe" }) : (0, jsx_runtime_1.jsx)("span", { children: "Activer mon compte" }) })) }, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
+                    }, actions: (0, jsx_runtime_1.jsx)(lab_1.LoadingButton, __assign({ loading: loadingBtn, type: "submit", onClick: handleValidateAccount, fullWidth: true, variant: "contained", sx: { mt: 4, mb: 0 } }, { children: resetPassword ? (0, jsx_runtime_1.jsx)("span", { children: "R\u00E9initialiser mon mot de passe" }) : (0, jsx_runtime_1.jsx)("span", { children: "Activer mon compte" }) })) }, { children: (0, jsx_runtime_1.jsxs)(material_1.Grid, __assign({ container: true }, { children: [(0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 12 }, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
                                         display: 'flex',
                                         flexDirection: 'column',
                                         alignItems: 'center',

package/dist/src/MovaSignUp.js

@@ -69,6 +69,7 @@ var InputAdornment_1 = __importDefault(require("@mui/material/InputAdornment"));
 var Visibility_1 = __importDefault(require("@mui/icons-material/Visibility"));
 var VisibilityOff_1 = __importDefault(require("@mui/icons-material/VisibilityOff"));
 var Info_1 = __importDefault(require("@mui/icons-material/Info"));
+var UserService_1 = __importDefault(require("./services/UserService"));
 // ATTENTION : s'assurer de la présence des documents suivants à la racine du composant porteur (dossier 'public')
 var CGUPath = "/Movalib_CGU.pdf";
 // Permet de centrer le contenu de l'application
@@ -100,6 +101,8 @@ var MovaSignUp = function (_a) {
     var _r = (0, react_1.useState)(false), showPassword = _r[0], setShowPassword = _r[1];
     var _s = (0, react_1.useState)(false), openEmailInfo = _s[0], setOpenEmailInfo = _s[1];
     var _t = (0, react_1.useState)(false), openPhoneNumberInfo = _t[0], setOpenPhoneNumberInfo = _t[1];
+    var _u = (0, react_1.useState)(false), userExist = _u[0], setUserExist = _u[1];
+    var _v = (0, react_1.useState)(false), userIsAlreadyActive = _v[0], setUserIsAlreadyActive = _v[1];
     var handleDateChange = function (name, date) {
         var _a;
         if (name && date) {
@@ -121,6 +124,28 @@ var MovaSignUp = function (_a) {
                 if (fieldValue.length > 10) {
                     fieldValue = fieldValue.substring(0, 10);
                 }
+                if (fieldValue.length === 10) {
+                    UserService_1.default.existsByPhoneNumber(fieldValue).then(function (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
             if (fieldName == "firstname") {
@@ -230,8 +255,8 @@ var MovaSignUp = function (_a) {
                                         borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                                     }
                                 } }), usePhoneNumber && (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsx)(material_1.TextField, { type: "tel", margin: "normal", required: true, fullWidth: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", disabled: userToEdit && userToEdit.phoneNumber ? true : false, onChange: function (e) { return handleInputChange(e); }, value: userForm.phoneNumber.value, error: Boolean(userForm.phoneNumber.error), helperText: userForm.phoneNumber.error, InputProps: {
-                                            endAdornment: ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, __assign({ position: "end" }, { children: (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "end", onClick: function () { return setOpenPhoneNumberInfo(!openPhoneNumberInfo); } }, { children: (0, jsx_runtime_1.jsx)(Info_1.default, {}) })) }))),
-                                        } }), openPhoneNumberInfo && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Entrez le num\u00E9ro de t\u00E9l\u00E9phone que vous avez utilis\u00E9 pour r\u00E9server, afin de suivre facilement vos rendez-vous." }))] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", disabled: userToEdit && userToEdit.email ? true : false, onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
+                                            endAdornment: ((0, jsx_runtime_1.jsx)(InputAdornment_1.default, __assign({ position: "end" }, { children: !userExist && (0, jsx_runtime_1.jsx)(material_1.IconButton, __assign({ edge: "end", onClick: function () { return setOpenPhoneNumberInfo(!openPhoneNumberInfo); } }, { children: (0, jsx_runtime_1.jsx)(Info_1.default, {}) })) }))),
+                                        } }), openPhoneNumberInfo && !userExist && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "info", variant: 'standard' }, { children: "Entrez le num\u00E9ro de t\u00E9l\u00E9phone que vous avez utilis\u00E9 pour r\u00E9server, afin de suivre facilement vos rendez-vous." })), userExist && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "success", variant: 'standard' }, { children: "Rendez-vous trouv\u00E9(s) pour ce num\u00E9ro !  Vous pourrez le(s) consulter apr\u00E8s avoir cr\u00E9\u00E9 votre compte." })), userIsAlreadyActive && (0, jsx_runtime_1.jsx)(material_1.Alert, __assign({ severity: "error", sx: { marginTop: '5px' }, variant: 'standard' }, { children: "Il semble qu\u2019un compte existe d\u00E9j\u00E0 avec ce num\u00E9ro. Connectez-vous ou utilisez \"Mot de passe oubli\u00E9\" pour y acc\u00E9der facilement." }))] }), (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", disabled: userToEdit && userToEdit.email ? true : false, onChange: function (e) { return handleInputChange(e); }, value: userForm.email.value, error: !userForm.email.isValid, helperText: userForm.email.error, sx: {
                                     '& .MuiOutlinedInput-notchedOutline': {
                                         borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                                     }

package/dist/src/VehiclePlateField.js

@@ -67,7 +67,7 @@ var VehiclePlateField = function (_a) {
                 break;
             }
             case Enums_1.VehiclePlateFormat.FRENCH_OLD: {
-                setHelperText((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Format d\u00E9tect\u00E9 (ancien) : ", (0, jsx_runtime_1.jsx)("b", { children: "1111 AAAA 1111" })] }));
+                setHelperText((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: ["Format d\u00E9tect\u00E9 (ancien) : ", (0, jsx_runtime_1.jsx)("b", { children: "1111 AAAA 1111" }), (0, jsx_runtime_1.jsx)("br", {}), "Pour lancer la recherche, cliquez sur ", (0, jsx_runtime_1.jsx)(SearchRounded_1.default, {})] }));
                 handleChangeFrenchOld(inputValue);
                 break;
             }

package/dist/src/components/singup/ActivateAccount.js

@@ -44,7 +44,6 @@ var ActivateAccount = function (_a) {
         setUnknowCode(false);
         var params = location !== undefined ? new URLSearchParams(location.search) : undefined;
         var req = {
-            appType: Enums_1.MovaAppType.INDIVIDUAL,
             token: !smsValidation ? params === null || params === void 0 ? void 0 : params.get('token') : null,
             securityCode: smsValidation ? code : null,
             demoGarage: Boolean(params === null || params === void 0 ? void 0 : params.get('demoGarage'))
@@ -58,7 +57,7 @@ var ActivateAccount = function (_a) {
                 if (data === null || data === void 0 ? void 0 : data.expiredCode) {
                     setExpiredCode(true);
                 }
-                if (data === null || data === void 0 ? void 0 : data.unknowCode) {
+                if (data === null || data === void 0 ? void 0 : data.unknownCode) {
                     setUnknowCode(true);
                 }
             }
@@ -86,7 +85,7 @@ var ActivateAccount = function (_a) {
                     //success or Error this is parent component responsability
                     Logger_1.default.info(response);
                     if (response.success) {
-                        onSubmit(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : 'Le compte a été mis à jout et activé avec succès');
+                        onSubmit(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : 'Le compte a été mis à jour et activé avec succès');
                         history.push('/login');
                     }
                     else {
@@ -143,7 +142,7 @@ var ActivateAccount = function (_a) {
             var req = {
                 phoneNumber: (_a = validationForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value
             };
-            UserService_1.default.resendSecurityCode(req)
+            UserService_1.default.resendActivationAccount(req)
                 .then(function (response) {
                 var _a, _b;
                 Logger_1.default.info(response);
@@ -162,18 +161,28 @@ var ActivateAccount = function (_a) {
             });
         }
     };
-    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [currentUser !== null && (0, jsx_runtime_1.jsx)(MovaSignUp_1.default, { movaAppType: movaAppType, onSubmit: updateActivateUseronSubmit, alertMessage: alertMessage, alertSeverity: alertSeverity, userToEdit: currentUser, loading: loading }), expiredCode && ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [(0, jsx_runtime_1.jsxs)(material_1.Typography, { children: [(0, jsx_runtime_1.jsx)("b", { children: "Indiquez nous votre num\u00E9ro de t\u00E9l\u00E9phone" }), (0, jsx_runtime_1.jsx)("br", {})] }), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", fullWidth: true, required: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: validationForm.phoneNumber.value, error: Boolean(validationForm.phoneNumber.error), helperText: validationForm.phoneNumber.error }) })), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ onClick: resendCode, sx: { cursor: 'pointer', textAlign: 'center', width: '100%', mt: 1 } }, { children: "Renvoyer le code" }))] })), unknowCode && ((0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                    justifyContent: 'center',
-                    textAlign: 'center',
-                    padding: 3,
-                    borderRadius: 2,
-                    boxShadow: 3,
-                    maxWidth: 400,
-                    margin: 'auto',
-                    backgroundColor: 'white',
-                } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "h6", color: "error", gutterBottom: true }, { children: "Code de validation invalide" })), (0, jsx_runtime_1.jsxs)(material_1.Typography, __assign({ variant: "body1", color: "textSecondary", gutterBottom: true }, { children: ["Le code de validation fourni ne correspond \u00E0 aucun utilisateur.", (0, jsx_runtime_1.jsx)("br", {}), "Si le probl\u00E8me persiste, veuillez nous contacter \u00E0", ' ', (0, jsx_runtime_1.jsx)("b", { children: "contact@movalib.com" }), "."] })), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ variant: "contained", color: "primary", onClick: function (e) { return history.push('/login'); }, sx: { marginTop: 2 } }, { children: "Retour \u00E0 la connexion" }))] })))] }));
+    return ((0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [currentUser !== null && (0, jsx_runtime_1.jsx)(MovaSignUp_1.default, { movaAppType: movaAppType, onSubmit: updateActivateUseronSubmit, alertMessage: alertMessage, alertSeverity: alertSeverity, userToEdit: currentUser, loading: loading }), expiredCode && ((0, jsx_runtime_1.jsx)(material_1.Box, __assign({ sx: { width: '99vw', height: '99vh', display: 'flex' } }, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ sx: {
+                        display: 'block',
+                        margin: 'auto',
+                        textAlign: 'center',
+                        padding: 3,
+                        borderRadius: 2,
+                        boxShadow: 3,
+                        maxWidth: 400,
+                        backgroundColor: 'white',
+                    } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "h6", color: "error", gutterBottom: true }, { children: "Code de validation expir\u00E9" })), (0, jsx_runtime_1.jsxs)(material_1.Typography, { children: [(0, jsx_runtime_1.jsx)("b", { children: "Indiquez nous votre num\u00E9ro de t\u00E9l\u00E9phone." }), (0, jsx_runtime_1.jsx)("br", {}), "Nous allons renvoyer un SMS d'activation de compte"] }), (0, jsx_runtime_1.jsx)(material_1.Grid, __assign({ item: true, xs: 6 }, { children: (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", fullWidth: true, required: true, id: "phoneNumber", label: "N\u00B0 de t\u00E9l\u00E9phone", name: "phoneNumber", autoComplete: "tel", onChange: function (e) { return handleInputChange(e); }, value: validationForm.phoneNumber.value, error: Boolean(validationForm.phoneNumber.error), helperText: validationForm.phoneNumber.error }) })), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ onClick: resendCode, sx: { cursor: 'pointer', textAlign: 'center', width: '100%', mt: 1 } }, { children: "Renvoyer le code" }))] })) }))), unknowCode && ((0, jsx_runtime_1.jsx)(material_1.Box, __assign({ sx: { width: '99vw', height: '99vh', display: 'flex' } }, { children: (0, jsx_runtime_1.jsxs)(material_1.Box, __assign({ 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',
+                    } }, { children: [(0, jsx_runtime_1.jsx)(material_1.Typography, __assign({ variant: "h6", color: "error", gutterBottom: true }, { children: "Code de validation invalide" })), (0, jsx_runtime_1.jsxs)(material_1.Typography, __assign({ variant: "body1", color: "textSecondary", gutterBottom: true }, { children: ["Le code de validation fourni ne correspond \u00E0 aucun utilisateur (ou votre compte a d\u00E9j\u00E0 \u00E9t\u00E9 activ\u00E9). ", (0, jsx_runtime_1.jsx)("br", {}), "Essayez de vous connecter avec votre num\u00E9ro de t\u00E9l\u00E9phone.", (0, jsx_runtime_1.jsx)("br", {}), "Si le probl\u00E8me persiste, veuillez nous contacter \u00E0", ' ', (0, jsx_runtime_1.jsx)("b", { children: "support@movalib.com" }), "."] })), (0, jsx_runtime_1.jsx)(material_1.Button, __assign({ variant: "contained", color: "primary", onClick: function (e) { return history.push('/login'); }, sx: { marginTop: 2 } }, { children: "Retour \u00E0 la connexion" }))] })) })))] }));
 };
 exports.default = ActivateAccount;

package/dist/src/helpers/ApiHelper.js

@@ -25,19 +25,19 @@ function handleResponse(response) {
             var errorMsg = void 0;
             switch (response.status) {
                 case 403:
-                    errorMsg = 'Accès non autorisé (403)';
+                    errorMsg = 'Accès non autorisé';
                     break;
                 case 404:
-                    errorMsg = 'La ressource demandée est introuvable (404)';
+                    errorMsg = (typeof data === 'string') ? data : 'La ressource demandée est introuvable';
                     break;
                 case 500:
-                    errorMsg = 'Une erreur interne du serveur est survenue (500)';
+                    errorMsg = 'Une erreur interne du serveur est survenue';
                     break;
                 default:
-                    errorMsg = (typeof data === 'string') ? data : "Une erreur est survenue (".concat(response.status, ")");
+                    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: data };
     });

package/dist/src/helpers/Enums.d.ts

@@ -248,5 +248,6 @@ export declare enum RoleType {
     /**
      * Super-Administrateur (team Movalib)
      */
-    SUPER_ADMIN = "ROLE_SUPER_ADMIN"
+    SUPER_ADMIN = "ROLE_SUPER_ADMIN",
+    CSM = "ROLE_CSM"
 }

package/dist/src/helpers/Enums.js

@@ -277,4 +277,5 @@ var RoleType;
      * Super-Administrateur (team Movalib)
      */
     RoleType["SUPER_ADMIN"] = "ROLE_SUPER_ADMIN";
+    RoleType["CSM"] = "ROLE_CSM";
 })(RoleType = exports.RoleType || (exports.RoleType = {}));

package/dist/src/models/User.d.ts

@@ -1,5 +1,6 @@
 import { Gender } from "../helpers/Enums";
 import Address from './Address';
+import Garage from "./Garage";
 import Role from "./Role";
 import Vehicle from "./Vehicle";
 export default class User {
@@ -18,11 +19,13 @@ export default class User {
     vehicles?: Vehicle[];
     isActive?: Boolean;
     hasPassword?: Boolean;
-    constructor(id: string, roles: Role[], firstname?: string, lastname?: string, avatar?: string, password?: string, created?: Date, email?: string, gender?: Gender, birthDate?: Date, addresses?: Address[], phoneNumber?: string, vehicles?: Vehicle[], isActive?: Boolean, hasPassword?: Boolean);
+    garages?: Garage[];
+    constructor(id: string, roles: Role[], firstname?: string, lastname?: string, avatar?: string, password?: string, created?: Date, email?: string, gender?: Gender, birthDate?: Date, addresses?: Address[], phoneNumber?: string, vehicles?: Vehicle[], isActive?: Boolean, hasPassword?: Boolean, garages?: Garage[]);
     static getFirstLetter: (user: User) => string;
     static isGarageCustomer: (user: User) => boolean;
     static isGarageTechnician: (user: User) => boolean;
     static isGarageAdmin: (user: User) => boolean;
     static isSales: (user: User) => boolean;
+    static isCsM: (user: User) => boolean;
     static isSuperAdmin: (user: User) => boolean;
 }

package/dist/src/models/User.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var Enums_1 = require("../helpers/Enums");
 var User = /** @class */ (function () {
-    function User(id, roles, firstname, lastname, avatar, password, created, email, gender, birthDate, addresses, phoneNumber, vehicles, isActive, hasPassword) {
+    function User(id, roles, firstname, lastname, avatar, password, created, email, gender, birthDate, addresses, phoneNumber, vehicles, isActive, hasPassword, garages) {
         if (firstname === void 0) { firstname = ''; }
         if (lastname === void 0) { lastname = ''; }
         if (avatar === void 0) { avatar = ''; }
@@ -23,6 +23,7 @@ var User = /** @class */ (function () {
         this.vehicles = vehicles;
         this.isActive = isActive;
         this.hasPassword = hasPassword;
+        this.garages = garages;
     }
     User.getFirstLetter = function (user) {
         var firstLetter = user.lastname[0].toUpperCase();
@@ -48,6 +49,11 @@ var User = /** @class */ (function () {
             return false;
         return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.SALES; }));
     };
+    User.isCsM = function (user) {
+        if (!user || !user.roles)
+            return false;
+        return Boolean(user.roles.find(function (r) { return r.name === Enums_1.RoleType.CSM; }));
+    };
     User.isSuperAdmin = function (user) {
         if (!user || !user.roles)
             return false;

package/dist/src/services/AuthenticationService.d.ts

@@ -4,4 +4,7 @@ import User from "../models/User";
 export default class AuthenticationService {
     static forgotPassword(req: any): Promise<APIResponse<string>>;
     static login(appType: MovaAppType, phoneEmail: string, password: string): Promise<APIResponse<User>>;
+    static ValidateSecurityCode(req: {
+        securityCode: string;
+    }): Promise<APIResponse<User>>;
 }

package/dist/src/services/AuthenticationService.js

@@ -96,6 +96,10 @@ var AuthenticationService = /** @class */ (function () {
                     case 1:
                         tokenResponse = _a.sent();
                         if (!tokenResponse.success) return [3 /*break*/, 3];
+                        // CSM CASE
+                        if (tokenResponse.data.accessToken === null && tokenResponse.data.role.includes('ROLE_CSM')) {
+                            return [2 /*return*/, { success: true, data: tokenResponse.data }];
+                        }
                         Logger_1.default.info(tokenResponse);
                         (0, CookieUtils_1.createCookie)(tokenCookie, tokenResponse.data.accessToken);
                         return [4 /*yield*/, UserService_1.default.getCurrentUser(appType)];
@@ -119,6 +123,45 @@ var AuthenticationService = /** @class */ (function () {
             });
         });
     };
+    AuthenticationService.ValidateSecurityCode = function (req) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tokenResponse, tokenCookie, userResponse, errorMsg, error_2, errorMessage;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 5, , 6]);
+                        return [4 /*yield*/, (0, ApiHelper_1.request)({
+                                url: "".concat(ApiHelper_1.API_BASE_URL, "/check-security-code"),
+                                method: Enums_1.APIMethod.POST,
+                                body: JSON.stringify(req)
+                            })];
+                    case 1:
+                        tokenResponse = _a.sent();
+                        tokenCookie = CookieUtils_1.COOKIE_PRO_TOKEN;
+                        if (!tokenResponse.success) return [3 /*break*/, 3];
+                        Logger_1.default.info(tokenResponse);
+                        (0, CookieUtils_1.createCookie)(tokenCookie, tokenResponse.data.accessToken);
+                        return [4 /*yield*/, UserService_1.default.getCurrentUser(Enums_1.MovaAppType.GARAGE)];
+                    case 2:
+                        userResponse = _a.sent();
+                        if (!userResponse || !userResponse.success) {
+                            errorMsg = 'Erreur au chargement de votre profil';
+                            Logger_1.default.error(errorMsg);
+                            return [2 /*return*/, { success: false, error: errorMsg }];
+                        }
+                        return [2 /*return*/, { success: true, data: userResponse.data }];
+                    case 3: return [2 /*return*/, tokenResponse];
+                    case 4: return [3 /*break*/, 6];
+                    case 5:
+                        error_2 = _a.sent();
+                        Logger_1.default.error('Error occurred during login:', error_2);
+                        errorMessage = error_2 instanceof Error ? error_2.message : 'Erreur inconnue';
+                        return [2 /*return*/, { success: false, error: errorMessage }];
+                    case 6: return [2 /*return*/];
+                }
+            });
+        });
+    };
     return AuthenticationService;
 }());
 exports.default = AuthenticationService;

package/dist/src/services/GarageService.d.ts

@@ -39,7 +39,9 @@ export default class GarageService {
     static createGarageSupplier(garageId: string, req: any): Promise<APIResponse<string>>;
     static updateGarageSupplier(garageId: string, supplierId: number, req: any): Promise<APIResponse<string>>;
     static updateGarage(garageId: string, req: any): Promise<APIResponse<string>>;
-    static getAdministratedGarages(): Promise<APIResponse<Garage[]>>;
+    static getAdministratedGarages({ garageId }: {
+        garageId: string;
+    }): Promise<APIResponse<Garage>>;
     static sendGarageSupportRequest(garageId: string, req: {
         message: string;
     }): Promise<APIResponse<string>>;
@@ -61,4 +63,6 @@ export default class GarageService {
     static getOneGarageVehicle(garageId: string, vehicleId: number): Promise<APIResponse<any>>;
     static assignGarageVehicleEvent(garageId: string, eventId: string, vehicleId: number): Promise<APIResponse<string>>;
     static deassignGarageVehicleEvent(garageId: string, eventId: string): Promise<APIResponse<string>>;
+    static getGaragesCsm(): Promise<APIResponse<Garage[]>>;
+    static getOneGarageCsm(garageId: string): Promise<APIResponse<Garage[]>>;
 }

package/dist/src/services/GarageService.js

@@ -287,9 +287,10 @@ var GarageService = /** @class */ (function () {
             body: JSON.stringify(req)
         });
     };
-    GarageService.getAdministratedGarages = function () {
+    GarageService.getAdministratedGarages = function (_a) {
+        var garageId = _a.garageId;
         return (0, ApiHelper_1.request)({
-            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/garages"),
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/garage/").concat(garageId),
             method: Enums_1.APIMethod.GET,
             appType: Enums_1.MovaAppType.GARAGE
         });
@@ -379,6 +380,21 @@ var GarageService = /** @class */ (function () {
             appType: Enums_1.MovaAppType.GARAGE
         });
     };
+    // CSM
+    GarageService.getGaragesCsm = function () {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/csm/garages/list"),
+            method: Enums_1.APIMethod.GET,
+            appType: Enums_1.MovaAppType.GARAGE
+        });
+    };
+    GarageService.getOneGarageCsm = function (garageId) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/csm/garage/").concat(garageId),
+            method: Enums_1.APIMethod.GET,
+            appType: Enums_1.MovaAppType.GARAGE
+        });
+    };
     return GarageService;
 }());
 exports.default = GarageService;

package/dist/src/services/UserService.d.ts

@@ -7,6 +7,7 @@ export default class UserService {
     static existsByPhoneNumber(phoneNumber: string): Promise<APIResponse<User>>;
     static reestPassword(req: any): Promise<APIResponse<string>>;
     static resendSecurityCode(req: any): Promise<APIResponse<string>>;
+    static resendActivationAccount(req: any): Promise<APIResponse<string>>;
     static getSalesGarages(salesId: string): Promise<APIResponse<Garage[]>>;
     static validateAccount(req: any): Promise<APIResponse<User | {
         expiredCode?: boolean;

package/dist/src/services/UserService.js

@@ -73,6 +73,14 @@ var UserService = /** @class */ (function () {
             body: JSON.stringify(req)
         });
     };
+    UserService.resendActivationAccount = function (req) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/resend-activation-link"),
+            method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.INDIVIDUAL,
+            body: JSON.stringify(req)
+        });
+    };
     UserService.getSalesGarages = function (salesId) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/sales/").concat(salesId, "/garages"),
@@ -90,7 +98,7 @@ var UserService = /** @class */ (function () {
     };
     UserService.editUser = function (req, userId) {
         return (0, ApiHelper_1.request)({
-            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/").concat(userId),
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/").concat(userId, "/complete"),
             method: Enums_1.APIMethod.PATCH,
             appType: Enums_1.MovaAppType.INDIVIDUAL,
             body: JSON.stringify(req)

package/index.ts

@@ -28,6 +28,7 @@ export { default as MovaCopyright } from './src/MovaCopyright';
 export { default as MovaVehicleTireField } from './src/MovaVehicleTireField';
 export { default as ConfirmationDialog } from './src/ConfirmationDialog';
 export { default as GenderSelector } from './src/GenderSelector';
+export { default as ActivateAccount } from './src/components/singup/ActivateAccount';
 export { QrCodePLVContainer } from './src/components/QrCodePLVContainer/QrCodePLVContainer';
 export { PLVComponent, PrintSize } from './src/components/QrCodePLVContainer/PLVComponent';
 // Export des classes

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@movalib/movalib-commons",
-	"version": "1.59.8",
+	"version": "1.59.10",
 	"description": "Bibliothèque d'objets communs à l'ensemble des projets React de Movalib",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

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/VehiclePlateField.tsx

@@ -63,7 +63,13 @@ const VehiclePlateField: FunctionComponent<VehiclePlateFieldProps> = ({ onValidV
       }
 
       case VehiclePlateFormat.FRENCH_OLD: {
-        setHelperText(<>Format détecté (ancien) : <b>1111 AAAA 1111</b></>);
+        setHelperText(
+          <>
+            Format détecté (ancien) : <b>1111 AAAA 1111</b>
+            <br />
+            Pour lancer la recherche, cliquez sur <SearchIcon />
+          </>
+        );        
         handleChangeFrenchOld(inputValue);
         break;
       }

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/helpers/Enums.ts

@@ -275,4 +275,5 @@ export enum RoleType {
      * Super-Administrateur (team Movalib)
      */
     SUPER_ADMIN = "ROLE_SUPER_ADMIN",
+    CSM = "ROLE_CSM"
 }

package/src/models/User.ts

@@ -1,5 +1,6 @@
 import { Gender, RoleType } from "../helpers/Enums";
 import Address from './Address';
+import Garage from "./Garage";
 import Role from "./Role";
 import Vehicle from "./Vehicle";
 
@@ -21,6 +22,7 @@ export default class User {
     vehicles?: Vehicle[];
     isActive?: Boolean;
     hasPassword?: Boolean;
+    garages?: Garage[];
 
     constructor(
         id: string,
@@ -37,7 +39,8 @@ export default class User {
         phoneNumber?: string ,
         vehicles?: Vehicle[],
         isActive?: Boolean,
-        hasPassword?: Boolean
+        hasPassword?: Boolean,
+        garages?: Garage[]
     ) {
         this.id = id;
         this.roles = roles;
@@ -54,6 +57,7 @@ export default class User {
         this.vehicles = vehicles;
         this.isActive = isActive;
         this.hasPassword = hasPassword;
+        this.garages = garages;
     }
 
     static getFirstLetter = (user: User) : string => {
@@ -86,6 +90,12 @@ export default class User {
         return Boolean(user.roles.find(r => r.name === RoleType.SALES));
     }
 
+    static isCsM = (user: User) : boolean => {
+        if(!user || !user.roles) return false;
+
+        return Boolean(user.roles.find(r => r.name === RoleType.CSM));
+    }
+
     static isSuperAdmin = (user: User) : boolean => {
         if(!user || !user.roles) return false;
 

package/src/services/AuthenticationService.ts

@@ -52,7 +52,10 @@ export default class AuthenticationService {
             });
         
             if(tokenResponse.success){
-
+                // CSM CASE
+                if (tokenResponse.data.accessToken === null && tokenResponse.data.role.includes('ROLE_CSM')) {
+                    return { success: true, data: tokenResponse.data };
+                }
                 Logger.info(tokenResponse);
 
                 createCookie(tokenCookie, tokenResponse.data.accessToken);
@@ -80,4 +83,44 @@ export default class AuthenticationService {
             return { success: false, error: errorMessage };
       }
     } 
+    static async ValidateSecurityCode(req: { securityCode: string }): Promise<APIResponse<User>> {
+        try {
+            //For now it's only for CSM
+        const tokenResponse = await request({
+            url: `${API_BASE_URL}/check-security-code`,
+            method: APIMethod.POST,
+            body: JSON.stringify(req)
+        });
+        const tokenCookie = COOKIE_PRO_TOKEN;
+
+
+        if (tokenResponse.success) {
+
+            Logger.info(tokenResponse);
+
+            createCookie(tokenCookie, tokenResponse.data.accessToken);
+
+            // Si le login est un succès, on renvoie les infos de l'utilisateur connecté
+            let userResponse = await UserService.getCurrentUser(MovaAppType.GARAGE);
+
+            if (!userResponse || !userResponse.success) {
+                const errorMsg = 'Erreur au chargement de votre profil';
+                Logger.error(errorMsg);
+                return { success: false, error: errorMsg };
+            }
+
+            return { success: true, data: userResponse.data };
+
+        } else {
+
+            return tokenResponse;
+
+        } 
+    }catch (error: unknown) {
+            Logger.error('Error occurred during login:', error);
+            let errorMessage = error instanceof Error ? error.message : 'Erreur inconnue';
+
+            return { success: false, error: errorMessage };
+        }
+    }
 }

package/src/services/GarageService.ts

@@ -316,9 +316,9 @@ export default class GarageService {
     });
   }
 
-  static getAdministratedGarages(): Promise<APIResponse<Garage[]>> {
+  static getAdministratedGarages({garageId}: {garageId: string}): Promise<APIResponse<Garage>> {
     return request({
-      url: `${API_BASE_URL}/user/garages`,
+      url: `${API_BASE_URL}/user/garage/${garageId}`,
       method: APIMethod.GET,
       appType: MovaAppType.GARAGE
     });
@@ -415,4 +415,22 @@ export default class GarageService {
       appType: MovaAppType.GARAGE
     })
   }
+
+  // CSM
+  static getGaragesCsm(): Promise<APIResponse<Garage[]>> {
+    return request({
+      url: `${API_BASE_URL}/csm/garages/list`,
+      method: APIMethod.GET,
+      appType: MovaAppType.GARAGE
+    });
+  }
+
+  static getOneGarageCsm(garageId: string): Promise<APIResponse<Garage[]>> {
+    return request({
+      url: `${API_BASE_URL}/csm/garage/${garageId}`,
+      method: APIMethod.GET,
+      appType: MovaAppType.GARAGE
+    });
+  }
+
 }

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