@movalib/movalib-commons 1.59.8 → 1.59.9

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/index.d.ts

@@ -22,7 +22,6 @@ 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 { default as Subscription } from './src/models/Subscription';

package/dist/index.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CategoryPrestation = exports.VehicleTire = exports.Event = exports.Schedule = exports.VehicleGarage = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.Operation = exports.Prestation = exports.Product = exports.Supplier = exports.Employee = exports.Absence = exports.Subscription = exports.PrintSize = exports.PLVComponent = exports.QrCodePLVContainer = exports.ActivateAccount = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.oldRegexPlate = exports.regexPlate = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.AccountValidation = exports.GaragePLV = exports.IbanInput = exports.DialogForgotPassword = exports.UserService = exports.GarageService = exports.AuthenticationService = exports.VehicleService = void 0;
-exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = exports.readCookie = void 0;
+exports.readCookie = exports.CategoryPrestation = exports.VehicleTire = exports.Event = exports.Schedule = exports.VehicleGarage = exports.Garage = exports.Document = exports.Vehicle = exports.Address = exports.Role = exports.User = exports.Customer = exports.Logger = exports.Operation = exports.Prestation = exports.Product = exports.Supplier = exports.Employee = exports.Absence = exports.Subscription = exports.PrintSize = exports.PLVComponent = exports.QrCodePLVContainer = exports.GenderSelector = exports.ConfirmationDialog = exports.MovaVehicleTireField = exports.MovaCopyright = exports.MovaSignUp = exports.MovaLogin = exports.MovaSnackbar = exports.TestButton = exports.oldRegexPlate = exports.regexPlate = exports.VehiclePlateField = exports.QRCode = exports.MovaDialog = exports.Loader = exports.MovaDigitalPassport = exports.VehicleFullCard = exports.ScheduleFields = exports.AddressFields = exports.AccountValidation = exports.GaragePLV = exports.IbanInput = exports.DialogForgotPassword = exports.UserService = exports.GarageService = exports.AuthenticationService = exports.VehicleService = void 0;
+exports.openDialogPrint = exports.APIMethod = exports.SubscriptionType = exports.SubscriptionState = exports.CountryCode = exports.PrestationState = exports.PrestationType = exports.RegistrationState = exports.SubscriptionPaymentInterval = exports.VehiclePlateType = exports.SlotAlgorithm = exports.OrderState = exports.OrderPreference = exports.ProductType = exports.PartsApplicationType = exports.DateFormatTypes = exports.Gender = exports.DocumentState = exports.DigitalPassportIndex = exports.DocumentType = exports.EventType = exports.EventState = exports.DayOfWeek = exports.MovaAppType = exports.RoleType = exports.CustomerType = exports.API_BASE_URL = exports.request = exports.getLongFormattedDateTime = exports.formatDateByCountryCode = exports.validateEmail = exports.validateText = exports.validatePhoneNumber = exports.getApplicationsShortLabels = exports.isSafariOniOS = exports.getDayOfWeekLabel = exports.findScheduleByDayOfWeek = exports.getFormattedIntervals = exports.getFormattedSchedule = exports.formatPhoneNumber = exports.flexLeftRow = exports.capitalizeFirstLetter = exports.getApplicationShortLabel = exports.isEmpty = exports.formatFrenchVehiclePlate = exports.formatVehicleTire = exports.validateField = exports.deleteCookie = void 0;
 // Export des services
 var VehicleService_1 = require("./src/services/VehicleService");
 Object.defineProperty(exports, "VehicleService", { enumerable: true, get: function () { return __importDefault(VehicleService_1).default; } });
@@ -58,8 +58,6 @@ var ConfirmationDialog_1 = require("./src/ConfirmationDialog");
 Object.defineProperty(exports, "ConfirmationDialog", { enumerable: true, get: function () { return __importDefault(ConfirmationDialog_1).default; } });
 var GenderSelector_1 = require("./src/GenderSelector");
 Object.defineProperty(exports, "GenderSelector", { enumerable: true, get: function () { return __importDefault(GenderSelector_1).default; } });
-var ActivateAccount_1 = require("./src/components/singup/ActivateAccount");
-Object.defineProperty(exports, "ActivateAccount", { enumerable: true, get: function () { return __importDefault(ActivateAccount_1).default; } });
 var QrCodePLVContainer_1 = require("./src/components/QrCodePLVContainer/QrCodePLVContainer");
 Object.defineProperty(exports, "QrCodePLVContainer", { enumerable: true, get: function () { return QrCodePLVContainer_1.QrCodePLVContainer; } });
 var PLVComponent_1 = require("./src/components/QrCodePLVContainer/PLVComponent");

package/dist/src/AccountValidation.js

@@ -118,16 +118,16 @@ var AccountValidation = function (_a) {
         if (req) {
             UserService_1.default.validateAccount(req)
                 .then(function (response) {
-                var _a;
+                var _a, _b;
                 Logger_1.default.info(response);
                 if (response.success) {
                     if (onSubmit) {
-                        onSubmit(response.success, 'Le compte a été activé avec succès.');
+                        onSubmit(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : '');
                     }
                 }
                 else {
                     if (onSubmit) {
-                        onSubmit(response.success, (_a = response.error) !== null && _a !== void 0 ? _a : '');
+                        onSubmit(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : '');
                     }
                 }
             }).catch(function (error) {

package/dist/src/MovaSignUp.d.ts

@@ -2,7 +2,6 @@ import { FunctionComponent, ReactNode } from "react";
 import { AlertColor } from "@mui/material";
 import { MovaUserSignUpForm } from "./helpers/Types";
 import { MovaAppType } from "./helpers/Enums";
-import User from "./models/User";
 /**
  * Propriétés du composant
  * movaAppType : type d'application Movalib au sein de laquelle le composant est injectée
@@ -25,7 +24,6 @@ interface MovaSignUpProps {
     showLoginButton?: boolean;
     disableGutters?: boolean;
     usePhoneNumber?: boolean;
-    userToEdit?: User;
 }
 /**
  * Formulaire de création d'un compte Movalib (Garage / Utilisateur)

package/dist/src/MovaSignUp.js

@@ -77,29 +77,29 @@ var styles = {
     justifyContent: 'center',
     alignItems: 'center'
 };
+var 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 },
+};
 /**
  * Formulaire de création d'un compte Movalib (Garage / Utilisateur)
  * ATTENTION : le lien de consultation des CGU doit pointer vers "/terms-and-conditions"
  */
 var MovaSignUp = function (_a) {
-    var _b, _c, _d, _e;
-    var loading = _a.loading, movaAppType = _a.movaAppType, onSubmit = _a.onSubmit, _f = _a.darkMode, darkMode = _f === void 0 ? false : _f, alertMessage = _a.alertMessage, alertSeverity = _a.alertSeverity, headerText = _a.headerText, _g = _a.showHeaderLogo, showHeaderLogo = _g === void 0 ? true : _g, _h = _a.showLeafs, showLeafs = _h === void 0 ? true : _h, _j = _a.showCopyright, showCopyright = _j === void 0 ? true : _j, _k = _a.showLoginButton, showLoginButton = _k === void 0 ? true : _k, _l = _a.disableGutters, disableGutters = _l === void 0 ? false : _l, _m = _a.usePhoneNumber, usePhoneNumber = _m === void 0 ? true : _m, _o = _a.userToEdit, userToEdit = _o === void 0 ? null : _o;
-    var _p = (0, react_1.useState)({
-        firstname: { value: (_b = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.firstname) !== null && _b !== void 0 ? _b : '', isValid: true },
-        lastname: { value: (_c = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.lastname) !== null && _c !== void 0 ? _c : '', isValid: true },
-        email: { value: (_d = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.email) !== null && _d !== void 0 ? _d : '', isValid: true },
-        phoneNumber: { value: (_e = userToEdit === null || userToEdit === void 0 ? void 0 : userToEdit.phoneNumber) !== null && _e !== void 0 ? _e : '', isValid: true },
-        password: { value: '', isValid: true },
-        gender: { value: '', isValid: true },
-        birthDate: { value: null, isValid: true },
-        acceptsTerms: { value: false, isValid: true },
-    }), userForm = _p[0], setUserForm = _p[1];
+    var loading = _a.loading, movaAppType = _a.movaAppType, onSubmit = _a.onSubmit, _b = _a.darkMode, darkMode = _b === void 0 ? false : _b, alertMessage = _a.alertMessage, alertSeverity = _a.alertSeverity, headerText = _a.headerText, _c = _a.showHeaderLogo, showHeaderLogo = _c === void 0 ? true : _c, _d = _a.showLeafs, showLeafs = _d === void 0 ? true : _d, _e = _a.showCopyright, showCopyright = _e === void 0 ? true : _e, _f = _a.showLoginButton, showLoginButton = _f === void 0 ? true : _f, _g = _a.disableGutters, disableGutters = _g === void 0 ? false : _g, _h = _a.usePhoneNumber, usePhoneNumber = _h === void 0 ? true : _h;
+    var _j = (0, react_1.useState)(initialUserFormState), userForm = _j[0], setUserForm = _j[1];
     var history = (0, react_router_dom_1.useHistory)();
-    var _q = (0, react_1.useState)(""), message = _q[0], setMessage = _q[1];
+    var _k = (0, react_1.useState)(""), message = _k[0], setMessage = _k[1];
     var theme = (0, material_1.useTheme)();
-    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 _l = (0, react_1.useState)(false), showPassword = _l[0], setShowPassword = _l[1];
+    var _m = (0, react_1.useState)(false), openEmailInfo = _m[0], setOpenEmailInfo = _m[1];
+    var _o = (0, react_1.useState)(false), openPhoneNumberInfo = _o[0], setOpenPhoneNumberInfo = _o[1];
     var handleDateChange = function (name, date) {
         var _a;
         if (name && date) {
@@ -229,9 +229,9 @@ var MovaSignUp = function (_a) {
                                     '& .MuiOutlinedInput-notchedOutline': {
                                         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: {
+                                } }), 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", 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: {
+                                        } }), 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", 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/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

@@ -8,11 +8,7 @@ export default class UserService {
     static reestPassword(req: any): Promise<APIResponse<string>>;
     static resendSecurityCode(req: any): Promise<APIResponse<string>>;
     static getSalesGarages(salesId: string): Promise<APIResponse<Garage[]>>;
-    static validateAccount(req: any): Promise<APIResponse<User | {
-        expiredCode?: boolean;
-        unknowCode?: boolean;
-    }>>;
-    static editUser(req: any, userId: string): Promise<APIResponse<string>>;
+    static validateAccount(req: any): Promise<APIResponse<string>>;
     /**
      * @param email
      * @param password

package/dist/src/services/UserService.js

@@ -88,14 +88,6 @@ var UserService = /** @class */ (function () {
             body: JSON.stringify(req)
         });
     };
-    UserService.editUser = function (req, userId) {
-        return (0, ApiHelper_1.request)({
-            url: "".concat(ApiHelper_1.API_BASE_URL, "/user/").concat(userId),
-            method: Enums_1.APIMethod.PATCH,
-            appType: Enums_1.MovaAppType.INDIVIDUAL,
-            body: JSON.stringify(req)
-        });
-    };
     /**
      * @param email
      * @param password

package/package.json

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

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/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/dist/src/components/singup/ActivateAccount.d.ts

@@ -1,10 +0,0 @@
-import { FunctionComponent } from 'react';
-import { MovaAppType } from '../../helpers/Enums';
-interface ActivateAccountProps {
-    movaAppType: MovaAppType;
-    smsValidation: boolean;
-    onSubmit: (success: boolean, message: string) => void;
-    onResendSecurityCode?: (success: boolean, message: string) => void;
-}
-declare const ActivateAccount: FunctionComponent<ActivateAccountProps>;
-export default ActivateAccount;

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

@@ -1,179 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var jsx_runtime_1 = require("react/jsx-runtime");
-var react_1 = require("react");
-var react_router_dom_1 = require("react-router-dom");
-var UserService_1 = __importDefault(require("../../services/UserService"));
-var material_1 = require("@mui/material");
-var Logger_1 = __importDefault(require("../../helpers/Logger"));
-var Enums_1 = require("../../helpers/Enums");
-var Tools_1 = require("../../helpers/Tools");
-var MovaSignUp_1 = __importDefault(require("../../MovaSignUp"));
-var Validator_1 = require("../../helpers/Validator");
-var ActivateAccount = function (_a) {
-    var movaAppType = _a.movaAppType, smsValidation = _a.smsValidation, onSubmit = _a.onSubmit, onResendSecurityCode = _a.onResendSecurityCode;
-    var code = (0, react_router_dom_1.useParams)().code;
-    var location = (0, react_router_dom_1.useLocation)();
-    var theme = (0, material_1.useTheme)();
-    var _b = (0, react_1.useState)(""), alertMessage = _b[0], setAlertMessage = _b[1];
-    // La sévérité est initialiée à "error" par défaut
-    var _c = (0, react_1.useState)('error'), alertSeverity = _c[0], setAlertSeverity = _c[1];
-    var _d = (0, react_1.useState)(false), loading = _d[0], setLoading = _d[1];
-    var _e = (0, react_1.useState)(null), currentUser = _e[0], setCurrentUser = _e[1];
-    var _f = (0, react_1.useState)(false), expiredCode = _f[0], setExpiredCode = _f[1];
-    var _g = (0, react_1.useState)(false), unknowCode = _g[0], setUnknowCode = _g[1];
-    var _h = (0, react_1.useState)({ phoneNumber: { value: '', isValid: true } }), validationForm = _h[0], setValidationForm = _h[1];
-    var history = (0, react_router_dom_1.useHistory)();
-    // ajout d'un load pour le chargement de la page
-    var getUserByTokenOrCode = function () {
-        setExpiredCode(false);
-        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'))
-        };
-        UserService_1.default.validateAccount(req).then(function (response) {
-            if (response.success) {
-                setCurrentUser(response.data);
-            }
-            else {
-                var data = response.data;
-                if (data === null || data === void 0 ? void 0 : data.expiredCode) {
-                    setExpiredCode(true);
-                }
-                if (data === null || data === void 0 ? void 0 : data.unknowCode) {
-                    setUnknowCode(true);
-                }
-            }
-        });
-    };
-    (0, react_1.useEffect)(function () {
-        getUserByTokenOrCode();
-    }, []);
-    var updateActivateUseronSubmit = function (form) {
-        // appelle api pour mettre a jour l'utilisateur + auto activate en fonction du movaAPPType
-        if (movaAppType === Enums_1.MovaAppType.INDIVIDUAL && currentUser) {
-            setLoading(true);
-            try {
-                // On prépare la query
-                var query = {
-                    code: code,
-                    email: form.email.value,
-                    password: form.password.value,
-                    firstname: form.firstname.value,
-                    lastname: form.lastname.value,
-                };
-                UserService_1.default.editUser(query, currentUser.id)
-                    .then(function (response) {
-                    var _a, _b;
-                    //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');
-                        history.push('/login');
-                    }
-                    else {
-                        onSubmit(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : 'Erreur lors de la mise à jour du compte');
-                    }
-                }).catch(function (error) {
-                    onSubmit(false, 'Erreur lors de la mise à jour du compte');
-                    Logger_1.default.error(error);
-                    setAlertMessage(error);
-                });
-            }
-            catch (error) {
-                console.error('Error occurred during submission:', error);
-            }
-            finally {
-                setLoading(false);
-            }
-        }
-    };
-    var controlPhoneNumber = function () {
-        var _a, _b, _c, _d, _e;
-        var newForm = validationForm;
-        var newField;
-        newForm.phoneNumber = (0, Tools_1.validateField)(validationForm.phoneNumber, function (value) { return !!value; }, 'Champ obligatoire');
-        // Validator 'phoneNumber'
-        if ((_a = newForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value) {
-            if (((_b = newForm.phoneNumber) === null || _b === void 0 ? void 0 : _b.value.length) < 10) {
-                newField = { value: (_c = validationForm.phoneNumber) === null || _c === void 0 ? void 0 : _c.value, error: "Le n° de téléphone est invalide." };
-            }
-            else {
-                newField = { value: (_d = validationForm.phoneNumber) === null || _d === void 0 ? void 0 : _d.value, error: '' };
-            }
-            newForm = __assign(__assign({}, newForm), { phoneNumber: newField });
-        }
-        setValidationForm(newForm);
-        return !Boolean((_e = newForm.phoneNumber) === null || _e === void 0 ? void 0 : _e.error);
-    };
-    var handleInputChange = function (e) {
-        var _a;
-        if (e) {
-            var fieldName = e.target.name;
-            var fieldValue = e.target.value;
-            var newField = (_a = {}, _a[fieldName] = { value: fieldValue, isValid: true }, _a);
-            if (fieldName == "phoneNumber") {
-                if (!(0, Validator_1.validatePhoneNumber)(fieldValue))
-                    return;
-            }
-            setValidationForm(__assign(__assign({}, validationForm), newField));
-        }
-    };
-    var resendCode = function () {
-        var _a;
-        if (controlPhoneNumber() && onResendSecurityCode) {
-            var req = {
-                phoneNumber: (_a = validationForm.phoneNumber) === null || _a === void 0 ? void 0 : _a.value
-            };
-            UserService_1.default.resendSecurityCode(req)
-                .then(function (response) {
-                var _a, _b;
-                Logger_1.default.info(response);
-                if (response.success) {
-                    onResendSecurityCode(response.success, (_a = response.data) !== null && _a !== void 0 ? _a : '');
-                }
-                else {
-                    onResendSecurityCode(response.success, (_b = response.error) !== null && _b !== void 0 ? _b : '');
-                }
-                history.push('/login');
-            }).catch(function (error) {
-                Logger_1.default.error(error);
-                if (onSubmit) {
-                    onSubmit(false, error);
-                }
-            });
-        }
-    };
-    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" }))] })))] }));
-};
-exports.default = ActivateAccount;