@movalib/movalib-commons 1.1.49 → 1.1.51

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

@@ -1,4 +1,4 @@
-import { APIMethod } from "./Enums";
+import { APIMethod, MovaAppType } from "./Enums";
 export declare const API_BASE_URL: string;
 export type APIResponse<T> = {
     success: boolean;
@@ -8,6 +8,7 @@ export type APIResponse<T> = {
 export type APIRequest = {
     url: string;
     method: APIMethod;
+    appType: MovaAppType;
     body?: string | FormData;
 };
 /**

package/dist/src/helpers/ApiHelper.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = exports.API_BASE_URL = void 0;
+var Enums_1 = require("./Enums");
 var CookieUtils_1 = require("./CookieUtils");
 var Logger_1 = __importDefault(require("./Logger"));
 exports.API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
@@ -55,8 +56,17 @@ var request = function (options) {
         headers.append('Content-Type', 'application/json');
     }
     // Récupération du TOKEN depuis les cookies et intégration au header
-    if ((0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_GARAGE_TOKEN)) {
-        headers.append('Authorization', 'Bearer ' + (0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_GARAGE_TOKEN));
+    switch (options.appType) {
+        case Enums_1.MovaAppType.INDIVIDUAL:
+            if ((0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_INDIVIDUAL_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + (0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_INDIVIDUAL_TOKEN));
+            }
+            break;
+        case Enums_1.MovaAppType.GARAGE:
+            if ((0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_GARAGE_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + (0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_GARAGE_TOKEN));
+            }
+            break;
     }
     // On intègre les headers aux options
     var defaults = { headers: headers };

package/dist/src/services/AuthenticationService.js

@@ -70,6 +70,7 @@ var AuthenticationService = /** @class */ (function () {
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: url,
                                 method: Enums_1.APIMethod.POST,
+                                appType: appType,
                                 body: JSON.stringify({
                                     email: email,
                                     password: password

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

@@ -1,6 +1,7 @@
 import { APIResponse } from "../helpers/ApiHelper";
 import Garage from "../models/Garage";
 export default class GarageService {
+    static salesSignUp(req: any): Promise<APIResponse<string>>;
     static sendNewEventQuote(garageId: string, eventId: string, formData: FormData): Promise<APIResponse<string>>;
     static sendCustomerReminder(garageId: string, eventId: string, message: string): Promise<APIResponse<string>>;
     static updateGarageEvent(garageId: string, eventId: string, req: any): Promise<APIResponse<string>>;

package/dist/src/services/GarageService.js

@@ -5,10 +5,19 @@ var Enums_1 = require("../helpers/Enums");
 var GarageService = /** @class */ (function () {
     function GarageService() {
     }
+    GarageService.salesSignUp = function (req) {
+        return (0, ApiHelper_1.request)({
+            url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/sales-signup"),
+            method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.INDIVIDUAL,
+            body: JSON.stringify(req)
+        });
+    };
     GarageService.sendNewEventQuote = function (garageId, eventId, formData) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/quote"),
             method: Enums_1.APIMethod.PATCH,
+            appType: Enums_1.MovaAppType.GARAGE,
             body: formData
         });
     };
@@ -16,6 +25,7 @@ var GarageService = /** @class */ (function () {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId, "/customer-reminder"),
             method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.GARAGE,
             body: message
         });
     };
@@ -23,6 +33,7 @@ var GarageService = /** @class */ (function () {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/event/").concat(eventId),
             method: Enums_1.APIMethod.PATCH,
+            appType: Enums_1.MovaAppType.GARAGE,
             body: JSON.stringify(req)
         });
     };
@@ -30,19 +41,22 @@ var GarageService = /** @class */ (function () {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/events/").concat(eventId, "/supplierRequest"),
             method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.GARAGE,
             body: JSON.stringify(req)
         });
     };
     GarageService.deleteGarageSupplier = function (garageId, supplierId) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/suppliers/").concat(supplierId),
-            method: Enums_1.APIMethod.DELETE
+            method: Enums_1.APIMethod.DELETE,
+            appType: Enums_1.MovaAppType.GARAGE
         });
     };
     GarageService.createGarageSupplier = function (garageId, req) {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId, "/suppliers"),
             method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.GARAGE,
             body: JSON.stringify(req)
         });
     };
@@ -50,6 +64,7 @@ var GarageService = /** @class */ (function () {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/garage/").concat(garageId),
             method: Enums_1.APIMethod.PATCH,
+            appType: Enums_1.MovaAppType.GARAGE,
             body: JSON.stringify(req)
         });
     };
@@ -57,6 +72,7 @@ var GarageService = /** @class */ (function () {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/user/garages"),
             method: Enums_1.APIMethod.GET,
+            appType: Enums_1.MovaAppType.GARAGE
         });
     };
     return GarageService;

package/dist/src/services/UserService.js

@@ -49,6 +49,7 @@ var UserService = /** @class */ (function () {
         return (0, ApiHelper_1.request)({
             url: "".concat(ApiHelper_1.API_BASE_URL, "/user/validate-account"),
             method: Enums_1.APIMethod.POST,
+            appType: Enums_1.MovaAppType.INDIVIDUAL,
             body: JSON.stringify(req)
         });
     };
@@ -66,7 +67,8 @@ var UserService = /** @class */ (function () {
                         _a.trys.push([0, 2, , 3]);
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: "".concat(ApiHelper_1.API_BASE_URL, "/user/me"),
-                                method: Enums_1.APIMethod.GET
+                                method: Enums_1.APIMethod.GET,
+                                appType: Enums_1.MovaAppType.INDIVIDUAL
                             })];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:

package/package.json

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

package/src/helpers/ApiHelper.ts

@@ -1,5 +1,5 @@
-import { APIMethod } from "./Enums";
-import { COOKIE_GARAGE_TOKEN, readCookie } from "./CookieUtils";
+import { APIMethod, MovaAppType } from "./Enums";
+import { COOKIE_GARAGE_TOKEN, COOKIE_INDIVIDUAL_TOKEN, readCookie } from "./CookieUtils";
 import Logger from "./Logger";
 import { useHistory } from "react-router-dom";
 
@@ -14,6 +14,7 @@ export type APIResponse<T> = {
 export type APIRequest = {
     url: string,
     method: APIMethod,
+    appType: MovaAppType,
     body?: string | FormData
 }
 
@@ -75,8 +76,18 @@ export const request = (options:APIRequest): Promise<APIResponse<any>> => {
     }
 
     // Récupération du TOKEN depuis les cookies et intégration au header
-    if(readCookie(COOKIE_GARAGE_TOKEN)) {
-        headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_GARAGE_TOKEN))
+    switch(options.appType){
+        case MovaAppType.INDIVIDUAL:
+            if(readCookie(COOKIE_INDIVIDUAL_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_INDIVIDUAL_TOKEN))
+            }
+            break;
+
+        case MovaAppType.GARAGE:
+            if(readCookie(COOKIE_GARAGE_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_GARAGE_TOKEN))
+            }
+            break;
     }
 
     // On intègre les headers aux options

package/src/services/AuthenticationService.ts

@@ -30,6 +30,7 @@ export default class AuthenticationService {
             let tokenResponse = await request({
                 url: url,
                 method: APIMethod.POST,
+                appType: appType,
                 body: JSON.stringify({
                     email : email,
                     password: password

package/src/services/GarageService.ts

@@ -1,13 +1,23 @@
 import { APIResponse, API_BASE_URL, request } from "../helpers/ApiHelper";
-import { APIMethod } from "../helpers/Enums";
+import { APIMethod, MovaAppType } from "../helpers/Enums";
 import Garage from "../models/Garage";
 
 export default class GarageService {
 
+  static salesSignUp(req: any): Promise<APIResponse<string>> {
+    return request({
+      url: `${API_BASE_URL}/garage/sales-signup`,
+      method: APIMethod.POST,
+      appType: MovaAppType.INDIVIDUAL,
+      body: JSON.stringify(req)
+    });
+  }
+
   static sendNewEventQuote(garageId: string, eventId: string, formData: FormData): Promise<APIResponse<string>> {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}/event/${eventId}/quote`,
       method: APIMethod.PATCH,
+      appType: MovaAppType.GARAGE,
       body: formData
     });
   }
@@ -17,6 +27,7 @@ export default class GarageService {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}/event/${eventId}/customer-reminder`,
       method: APIMethod.POST,
+      appType: MovaAppType.GARAGE,
       body: message
     });
   }
@@ -26,6 +37,7 @@ export default class GarageService {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}/event/${eventId}`,
       method: APIMethod.PATCH,
+      appType: MovaAppType.GARAGE,
       body: JSON.stringify(req)
     });
   }
@@ -34,6 +46,7 @@ export default class GarageService {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}/events/${eventId}/supplierRequest`,
       method: APIMethod.POST,
+      appType: MovaAppType.GARAGE,
       body: JSON.stringify(req)
     });
   }
@@ -41,7 +54,8 @@ export default class GarageService {
   static deleteGarageSupplier(garageId: string, supplierId: string): Promise<APIResponse<string>> {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}/suppliers/${supplierId}`,
-      method: APIMethod.DELETE
+      method: APIMethod.DELETE,
+      appType: MovaAppType.GARAGE
     });
   }
 
@@ -49,6 +63,7 @@ export default class GarageService {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}/suppliers`,
       method: APIMethod.POST,
+      appType: MovaAppType.GARAGE,
       body: JSON.stringify(req)
     });
   }
@@ -57,6 +72,7 @@ export default class GarageService {
     return request({
       url: `${API_BASE_URL}/garage/${garageId}`,
       method: APIMethod.PATCH,
+      appType: MovaAppType.GARAGE,
       body: JSON.stringify(req)
     });
   }
@@ -65,6 +81,7 @@ export default class GarageService {
     return request({
       url: `${API_BASE_URL}/user/garages`,
       method: APIMethod.GET,
+      appType: MovaAppType.GARAGE
     });
   }
 

package/src/services/UserService.ts

@@ -1,5 +1,5 @@
 import { APIResponse, API_BASE_URL, request } from "../helpers/ApiHelper";
-import { APIMethod } from "../helpers/Enums";
+import { APIMethod, MovaAppType } from "../helpers/Enums";
 import Logger from "../helpers/Logger";
 import User from "../models/User";
 
@@ -9,6 +9,7 @@ export default class UserService {
         return request({
             url: `${API_BASE_URL}/user/validate-account`,
             method: APIMethod.POST,
+            appType: MovaAppType.INDIVIDUAL,
             body: JSON.stringify(req)
         });
     }
@@ -22,7 +23,8 @@ export default class UserService {
         try {
             return await request({
                 url: `${API_BASE_URL}/user/me`,
-                method: APIMethod.GET
+                method: APIMethod.GET,
+                appType: MovaAppType.INDIVIDUAL
             });
         } catch (error) {
             Logger.error('Error occurred during getting user:', error);