@movalib/movalib-commons 1.59.37 → 1.59.38

package/dist/src/MovaLogin.js

@@ -55,6 +55,7 @@ var react_1 = require("react");
 var lab_1 = require("@mui/lab");
 var logo_large_border_png_1 = __importDefault(require("./assets/images/logo/logo_large_border.png"));
 var logo_pro_large_border_png_1 = __importDefault(require("./assets/images/logo/logo_pro_large_border.png"));
+var logo_admin_large_png_1 = __importDefault(require("./assets/images/logo/logo_admin_large.png"));
 var logo_large_dm_png_1 = __importDefault(require("./assets/images/logo/logo_large_dm.png"));
 var logo_pro_large_dm_png_1 = __importDefault(require("./assets/images/logo/logo_pro_large_dm.png"));
 var leaf_green_large_png_1 = __importDefault(require("./assets/images/leaf_green_large.png"));
@@ -119,7 +120,7 @@ var MovaLogin = function (_a) {
     var validateForm = function () {
         var newForm = __assign({}, form);
         // Validator pour les champs obligatoires
-        if (movaAppType === Enums_1.MovaAppType.GARAGE) {
+        if (movaAppType === Enums_1.MovaAppType.GARAGE || movaAppType === Enums_1.MovaAppType.ADMIN) {
             newForm.email = (0, Tools_1.validateField)(form.email, function (value) { return !!value; }, 'Champ obligatoire');
             // Validator pour l'email
             newForm.email = (0, Tools_1.validateField)(form.email, Validator_1.validateEmail, 'Adresse email invalide');
@@ -131,7 +132,7 @@ var MovaLogin = function (_a) {
         // Validator pour le mot de passe
         newForm.password = (0, Tools_1.validateField)(form.password, function (value) { return value.length >= 10 && /[a-z]/.test(value) && /[A-Z]/.test(value); }, 'Mot de passe invalide');
         setForm(newForm);
-        return newForm.password.isValid && (movaAppType === Enums_1.MovaAppType.GARAGE ? newForm.email.isValid : true)
+        return newForm.password.isValid && ((movaAppType === Enums_1.MovaAppType.GARAGE || movaAppType === Enums_1.MovaAppType.ADMIN) ? newForm.email.isValid : true)
             && (movaAppType === Enums_1.MovaAppType.INDIVIDUAL ? newForm.phoneNumberEmail.isValid : true);
     };
     var getMovaLogo = function () {
@@ -143,7 +144,7 @@ var MovaLogin = function (_a) {
         else {
             return movaAppType === Enums_1.MovaAppType.GARAGE ? logo_pro_large_border_png_1.default :
                 movaAppType === Enums_1.MovaAppType.INDIVIDUAL ? logo_large_border_png_1.default :
-                    movaAppType === Enums_1.MovaAppType.ADMIN ? logo_large_border_png_1.default : logo_large_border_png_1.default;
+                    movaAppType === Enums_1.MovaAppType.ADMIN ? logo_admin_large_png_1.default : logo_large_border_png_1.default;
         }
     };
     var handleOnClickSignUp = function () {
@@ -161,7 +162,7 @@ var MovaLogin = function (_a) {
         setOpenForgotPassword(false);
         // On appel de callback de soumission de la demande de réinitialisation du mot de passe
         if (onSubmitForgotPassword) {
-            onSubmitForgotPassword(movaAppType === Enums_1.MovaAppType.GARAGE ? form.email.value : form.phoneNumberEmail.value);
+            onSubmitForgotPassword((movaAppType === Enums_1.MovaAppType.GARAGE || movaAppType === Enums_1.MovaAppType.ADMIN) ? form.email.value : form.phoneNumberEmail.value);
         }
     };
     var handleClickShowPassword = function () {
@@ -233,7 +234,7 @@ var MovaLogin = function (_a) {
                                         '& .MuiOutlinedInput-notchedOutline': {
                                             borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure
                                         }
-                                    } }), movaAppType === Enums_1.MovaAppType.GARAGE &&
+                                    } }), (movaAppType === Enums_1.MovaAppType.GARAGE || movaAppType === Enums_1.MovaAppType.ADMIN) &&
                                 (0, jsx_runtime_1.jsx)(material_1.TextField, { margin: "normal", required: true, fullWidth: true, id: "email", label: "Adresse email", name: "email", autoComplete: "email", autoFocus: true, onChange: function (e) { return handleInputChange(e); }, value: form.email.value, error: !form.email.isValid, helperText: form.email.error, sx: {
                                         '& .MuiOutlinedInput-notchedOutline': {
                                             borderColor: darkMode ? 'white' : 'default', // Couleur de la bordure

package/dist/src/helpers/ApiHelper.js

@@ -66,6 +66,11 @@ var request = function (options) {
                 headers.append('Authorization', 'Bearer ' + (0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_PRO_TOKEN));
             }
             break;
+        case Enums_1.MovaAppType.ADMIN:
+            if ((0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_ADMIN_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + (0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_ADMIN_TOKEN));
+            }
+            break;
     }
     // On intègre les headers aux options
     var defaults = { headers: headers };

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

@@ -1,5 +1,6 @@
 export declare const COOKIE_PRO_TOKEN: string;
 export declare const COOKIE_INDIVIDUAL_TOKEN: string;
+export declare const COOKIE_ADMIN_TOKEN: string;
 export declare const COOKIE_DEFAULT_EXPIRES: number;
 export declare const createCookie: (name: string, value: string) => void;
 export declare const deleteCookie: (name: string) => void;

package/dist/src/helpers/CookieUtils.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readCookie = exports.deleteCookie = exports.createCookie = exports.COOKIE_DEFAULT_EXPIRES = exports.COOKIE_INDIVIDUAL_TOKEN = exports.COOKIE_PRO_TOKEN = void 0;
+exports.readCookie = exports.deleteCookie = exports.createCookie = exports.COOKIE_DEFAULT_EXPIRES = exports.COOKIE_ADMIN_TOKEN = exports.COOKIE_INDIVIDUAL_TOKEN = exports.COOKIE_PRO_TOKEN = void 0;
 var js_cookie_1 = __importDefault(require("js-cookie"));
 exports.COOKIE_PRO_TOKEN = 'movalibProToken';
 exports.COOKIE_INDIVIDUAL_TOKEN = 'movalibIndividualToken';
+exports.COOKIE_ADMIN_TOKEN = 'movalibAdminToken';
 exports.COOKIE_DEFAULT_EXPIRES = 7;
 var createCookie = function (name, value) {
     console.log('from lib', name, value);

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

@@ -6,5 +6,5 @@ export default class AuthenticationService {
     static login(appType: MovaAppType, phoneEmail: string, password: string): Promise<APIResponse<User>>;
     static ValidateSecurityCode(req: {
         securityCode: string;
-    }): Promise<APIResponse<User>>;
+    }, appType?: MovaAppType): Promise<APIResponse<User>>;
 }

package/dist/src/services/AuthenticationService.js

@@ -86,6 +86,14 @@ var AuthenticationService = /** @class */ (function () {
                                     password: password
                                 };
                                 break;
+                            case Enums_1.MovaAppType.ADMIN:
+                                url = "".concat(ApiHelper_1.API_BASE_URL, "/garage/login");
+                                tokenCookie = CookieUtils_1.COOKIE_ADMIN_TOKEN;
+                                req = {
+                                    email: phoneEmail,
+                                    password: password
+                                };
+                                break;
                         }
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: url,
@@ -97,7 +105,7 @@ var AuthenticationService = /** @class */ (function () {
                         tokenResponse = _a.sent();
                         if (!tokenResponse.success) return [3 /*break*/, 3];
                         // CSM CASE
-                        if (tokenResponse.data.accessToken === null && tokenResponse.data.role.includes('ROLE_CSM')) {
+                        if (tokenResponse.data.accessToken === null && (tokenResponse.data.role.includes('ROLE_CSM') || tokenResponse.data.role.includes('ROLE_SUPER_ADMIN'))) {
                             return [2 /*return*/, { success: true, data: tokenResponse.data }];
                         }
                         Logger_1.default.info(tokenResponse);
@@ -123,13 +131,13 @@ var AuthenticationService = /** @class */ (function () {
             });
         });
     };
-    AuthenticationService.ValidateSecurityCode = function (req) {
+    AuthenticationService.ValidateSecurityCode = function (req, appType) {
         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]);
+                        _a.trys.push([0, 8, , 9]);
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: "".concat(ApiHelper_1.API_BASE_URL, "/check-security-code"),
                                 method: Enums_1.APIMethod.POST,
@@ -138,26 +146,47 @@ var AuthenticationService = /** @class */ (function () {
                     case 1:
                         tokenResponse = _a.sent();
                         tokenCookie = CookieUtils_1.COOKIE_PRO_TOKEN;
-                        if (!tokenResponse.success) return [3 /*break*/, 3];
+                        if (appType) {
+                            switch (appType) {
+                                case Enums_1.MovaAppType.GARAGE:
+                                    tokenCookie = CookieUtils_1.COOKIE_PRO_TOKEN;
+                                    break;
+                                case Enums_1.MovaAppType.INDIVIDUAL:
+                                    tokenCookie = CookieUtils_1.COOKIE_INDIVIDUAL_TOKEN;
+                                    break;
+                                case Enums_1.MovaAppType.ADMIN:
+                                    tokenCookie = CookieUtils_1.COOKIE_ADMIN_TOKEN;
+                                    break;
+                            }
+                        }
+                        if (!tokenResponse.success) return [3 /*break*/, 6];
                         Logger_1.default.info(tokenResponse);
                         (0, CookieUtils_1.createCookie)(tokenCookie, tokenResponse.data.accessToken);
-                        return [4 /*yield*/, UserService_1.default.getCurrentUser(Enums_1.MovaAppType.GARAGE)];
+                        userResponse = void 0;
+                        if (!appType) return [3 /*break*/, 3];
+                        return [4 /*yield*/, UserService_1.default.getCurrentUser(appType)];
                     case 2:
                         userResponse = _a.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, UserService_1.default.getCurrentUser(Enums_1.MovaAppType.GARAGE)];
+                    case 4:
+                        userResponse = _a.sent();
+                        _a.label = 5;
+                    case 5:
                         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:
+                    case 6: return [2 /*return*/, tokenResponse];
+                    case 7: return [3 /*break*/, 9];
+                    case 8:
                         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*/];
+                    case 9: return [2 /*return*/];
                 }
             });
         });

package/package.json

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

package/src/MovaLogin.tsx

@@ -2,6 +2,7 @@ import { CSSProperties, ChangeEvent, FormEvent, FunctionComponent, MouseEvent, R
 import { LoadingButton } from '@mui/lab';
 import LogoLarge from './assets/images/logo/logo_large_border.png';
 import LogoProLarge from './assets/images/logo/logo_pro_large_border.png';
+import LogoAdminLarge from './assets/images/logo/logo_admin_large.png';
 import LogoLargeDarkMode from './assets/images/logo/logo_large_dm.png';
 import LogoProLargeDarkMode from './assets/images/logo/logo_pro_large_dm.png';
 import GreenLeafImage from "./assets/images/leaf_green_large.png";
@@ -93,7 +94,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         let newForm: MovaLoginForm = { ...form };
         
         // Validator pour les champs obligatoires
-        if(movaAppType === MovaAppType.GARAGE){
+        if(movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN){
             newForm.email = validateField(form.email, value => !!value, 'Champ obligatoire');
             // Validator pour l'email
             newForm.email = validateField(form.email, validateEmail, 'Adresse email invalide');
@@ -112,7 +113,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
 
         setForm(newForm);
 
-        return newForm.password.isValid && (movaAppType === MovaAppType.GARAGE ? newForm.email.isValid : true)
+        return newForm.password.isValid && ((movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN) ? newForm.email.isValid : true)
         && (movaAppType === MovaAppType.INDIVIDUAL ? newForm.phoneNumberEmail.isValid : true) ;
     }    
 
@@ -125,7 +126,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         } else {
             return movaAppType === MovaAppType.GARAGE ? LogoProLarge :
             movaAppType === MovaAppType.INDIVIDUAL ? LogoLarge : 
-            movaAppType === MovaAppType.ADMIN ? LogoLarge : LogoLarge;
+            movaAppType === MovaAppType.ADMIN ? LogoAdminLarge : LogoLarge;
         }
     }
 
@@ -147,7 +148,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
         setOpenForgotPassword(false);
         // On appel de callback de soumission de la demande de réinitialisation du mot de passe
         if(onSubmitForgotPassword){
-            onSubmitForgotPassword(movaAppType === MovaAppType.GARAGE ? form.email.value : form.phoneNumberEmail.value);
+            onSubmitForgotPassword((movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN) ? form.email.value : form.phoneNumberEmail.value);
         }
     }
 
@@ -253,7 +254,7 @@ const MovaLogin: FunctionComponent<MovaLoginProps> = ({ loading, movaAppType, on
                         />
                     }
 
-                    {movaAppType === MovaAppType.GARAGE && 
+                    {(movaAppType === MovaAppType.GARAGE || movaAppType === MovaAppType.ADMIN) && 
                        <TextField
                             margin="normal"
                             required

package/src/helpers/ApiHelper.ts

@@ -1,5 +1,5 @@
 import { APIMethod, MovaAppType } from "./Enums";
-import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, readCookie } from "./CookieUtils";
+import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, COOKIE_ADMIN_TOKEN, readCookie } from "./CookieUtils";
 import Logger from "./Logger";
 
 export const API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
@@ -100,6 +100,11 @@ export const request = (options:APIRequest): Promise<APIResponse<any>> => {
                 headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_PRO_TOKEN))
             }
             break;
+        case MovaAppType.ADMIN:
+            if(readCookie(COOKIE_ADMIN_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_ADMIN_TOKEN))
+            }
+            break;
     }
 
     // On intègre les headers aux options

package/src/helpers/CookieUtils.ts

@@ -2,6 +2,7 @@ import Cookies from "js-cookie";
 
 export const COOKIE_PRO_TOKEN: string = 'movalibProToken'; 
 export const COOKIE_INDIVIDUAL_TOKEN: string = 'movalibIndividualToken'; 
+export const COOKIE_ADMIN_TOKEN: string = 'movalibAdminToken';
 export const COOKIE_DEFAULT_EXPIRES: number = 7;
 
 export const createCookie = (name:string, value:string) => {

package/src/services/AuthenticationService.ts

@@ -1,5 +1,5 @@
 import { APIResponse, API_BASE_URL, request } from "../helpers/ApiHelper";
-import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, createCookie } from "../helpers/CookieUtils";
+import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, COOKIE_ADMIN_TOKEN, createCookie } from "../helpers/CookieUtils";
 import { APIMethod, MovaAppType } from "../helpers/Enums";
 import Logger from "../helpers/Logger";
 import User from "../models/User";
@@ -42,6 +42,14 @@ export default class AuthenticationService {
                         password: password
                     }
                     break;
+                case MovaAppType.ADMIN:
+                    url = `${API_BASE_URL}/garage/login`; 
+                    tokenCookie = COOKIE_ADMIN_TOKEN;
+                    req = {
+                        email : phoneEmail,
+                        password: password
+                    }
+                    break;
             }
 
             let tokenResponse = await request({
@@ -53,7 +61,7 @@ export default class AuthenticationService {
         
             if(tokenResponse.success){
                 // CSM CASE
-                if (tokenResponse.data.accessToken === null && tokenResponse.data.role.includes('ROLE_CSM')) {
+                if (tokenResponse.data.accessToken === null && (tokenResponse.data.role.includes('ROLE_CSM') || tokenResponse.data.role.includes('ROLE_SUPER_ADMIN'))) {
                     return { success: true, data: tokenResponse.data };
                 }
                 Logger.info(tokenResponse);
@@ -82,7 +90,7 @@ export default class AuthenticationService {
             return { success: false, error: errorMessage };
       }
     } 
-    static async ValidateSecurityCode(req: { securityCode: string }): Promise<APIResponse<User>> {
+    static async ValidateSecurityCode(req: { securityCode: string}, appType?: MovaAppType ): Promise<APIResponse<User>> {
         try {
             //For now it's only for CSM
         const tokenResponse = await request({
@@ -90,8 +98,21 @@ export default class AuthenticationService {
             method: APIMethod.POST,
             body: JSON.stringify(req)
         });
-        const tokenCookie = COOKIE_PRO_TOKEN;
 
+        let tokenCookie = COOKIE_PRO_TOKEN;
+        if(appType){
+            switch(appType){
+                case MovaAppType.GARAGE:
+                    tokenCookie = COOKIE_PRO_TOKEN;
+                    break;
+                case MovaAppType.INDIVIDUAL:
+                    tokenCookie = COOKIE_INDIVIDUAL_TOKEN;
+                    break;
+                case MovaAppType.ADMIN:
+                    tokenCookie = COOKIE_ADMIN_TOKEN;
+                    break;
+            }
+        }
 
         if (tokenResponse.success) {
 
@@ -100,8 +121,12 @@ export default class AuthenticationService {
             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);
-
+            let userResponse;
+            if(appType){
+                userResponse = await UserService.getCurrentUser(appType);
+            }else{
+                userResponse = await UserService.getCurrentUser(MovaAppType.GARAGE);
+            }
             if (!userResponse || !userResponse.success) {
                 const errorMsg = 'Erreur au chargement de votre profil';
                 Logger.error(errorMsg);