@movalib/movalib-commons 1.59.7 → 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/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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@movalib/movalib-commons",
-	"version": "1.59.7",
+	"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
+    });
+  }
+
 }