@movalib/movalib-commons 1.59.36 → 1.59.38

package/src/models/Event.ts

@@ -10,6 +10,15 @@ import Supplier from "./Supplier";
 import User from "./User";
 import Vehicle from "./Vehicle";
 
+interface order {
+  id: string;
+  supplier: Supplier;
+  orderPreference: string;
+  orderType: string;
+  orderDate: Date;
+  comment: string;
+  deliveryDate: Date | null;
+}
 export default class Event {
   // Properties
   id: string; //UUID
@@ -25,6 +34,7 @@ export default class Event {
   prestations?: Prestation[];
   operations?: Operation[];
   products?: Product[];
+  orders?: order[];
   /**
    * Un tableau d'invités, dans notre cas d'usage nous n'aurons qu'un invité de type Client
    */
@@ -100,7 +110,8 @@ export default class Event {
     vehicleAvailableNotificationTime?: Date,
     interventionEndTime?: Date,
     quoteLastSendingTime?: Date,
-    invoiceSendingDate?: Date
+    invoiceSendingDate?: Date,
+    orders?: order[]
   ) {
     this.id = id;
     this.notes = notes;
@@ -137,6 +148,7 @@ export default class Event {
     this.invoiceSendingDate = invoiceSendingDate
       ? new Date(invoiceSendingDate)
       : undefined;
+    this.orders = orders;
   }
 
   static getPrestationsList(event: Event): string[] {

package/src/models/Product.ts

@@ -1,31 +1,45 @@
-import { OrderPreference, OrderState, PartsApplicationType, ProductType } from "../helpers/Enums";
+import {
+  OrderPreference,
+  OrderState,
+  PartsApplicationType,
+  ProductType,
+} from "../helpers/Enums";
 import Operation from "./Operation";
 import Supplier from "./Supplier";
 
 export default class Product {
+  // Properties
+  id: string; //UUID
+  name: string;
+  code: string;
+  type: ProductType;
+  order?: String;
+  orderPreference?: OrderPreference;
+  originReferences?: string[];
+  // Eventuelle opération associée au produit
+  operation?: Operation;
+  // Eventuel statut commande associé au produit
+  orderState?: OrderState;
+  // Eventuel fournisseur du produit
+  supplier?: Supplier;
+  // Eventuelle application du produit (avant, arrière)
+  application?: PartsApplicationType;
 
-    // Properties
-    id: string; //UUID
-    name: string;
-    code:string;
-    type: ProductType;
-    orderPreference?: OrderPreference;
-    originReferences?: string[];
-    // Eventuelle opération associée au produit
-    operation?: Operation;
-    // Eventuel statut commande associé au produit    
-    orderState?: OrderState;
-    // Eventuel fournisseur du produit    
-    supplier?: Supplier;
-    // Eventuelle application du produit (avant, arrière)
-    application?: PartsApplicationType;
-
-    constructor(id:string, code: string, name:string, type: ProductType, orderPreference: OrderPreference, originReferences: string[]) {
-      this.id = id;
-      this.name = name;
-      this.code = code;
-      this.type = type;
-      this.orderPreference = orderPreference;
-      this.originReferences = originReferences;
-    }
-}
+  constructor(
+    id: string,
+    code: string,
+    name: string,
+    type: ProductType,
+    orderPreference: OrderPreference,
+    originReferences: string[],
+    order?: string
+  ) {
+    this.id = id;
+    this.name = name;
+    this.code = code;
+    this.type = type;
+    this.orderPreference = orderPreference;
+    this.originReferences = originReferences;
+    this.order = order;
+  }
+}

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);