@movalib/movalib-commons 1.0.93 → 1.0.95

package/dist/src/helpers/ApiHelper.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = exports.API_BASE_URL = void 0;
 var CookieUtils_1 = require("./CookieUtils");
 var Logger_1 = __importDefault(require("./Logger"));
+var react_router_dom_1 = require("react-router-dom");
 exports.API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
 function handleError(error) {
     var msg = error.message.includes('fetch') ? "Connexion impossible" : error.message;
@@ -17,6 +18,7 @@ function handleError(error) {
 function handleResponse(response) {
     var contentType = response.headers.get("content-type");
     var isJson = contentType && contentType.includes("application/json");
+    var history = (0, react_router_dom_1.useHistory)();
     var dataPromise = isJson ? response.json() : response.text();
     return dataPromise.then(function (data) {
         if (!response.ok) {
@@ -29,6 +31,11 @@ function handleResponse(response) {
                 case 404:
                     errorMsg = 'La ressource demandée est introuvable (404)';
                     break;
+                case 407:
+                    // On redirige l'utilisateur vers la page de login (407 = compte utilisateur introuvable, authentification requise)
+                    errorMsg = (typeof data === 'string') ? data : "Compte introuvable, veuillez vous reconnecter (".concat(response.status, ")");
+                    history.push('/login');
+                    break;
                 case 500:
                     errorMsg = 'Une erreur interne du serveur est survenue (500)';
                     break;

package/dist/src/models/Prestation.d.ts

@@ -18,8 +18,8 @@ export default class Prestation {
      */
     operations?: Operation[];
     /**
-     * La notion d'ordre peut être utile à l'affichage d'une liste de prestation par exemple
+     * La notion de position (ou d'ordre) peut être utile à l'affichage d'une liste de prestation par exemple
      */
-    order: number;
-    constructor(id: number, code: string, name: string, description: string, category: string, downtime: number, appointmentDelay: number, order: number, operations?: Operation[]);
+    position: number;
+    constructor(id: number, code: string, name: string, description: string, category: string, downtime: number, appointmentDelay: number, position: number, operations?: Operation[]);
 }

package/dist/src/models/Prestation.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var Prestation = /** @class */ (function () {
-    function Prestation(id, code, name, description, category, downtime, appointmentDelay, order, operations) {
+    function Prestation(id, code, name, description, category, downtime, appointmentDelay, position, operations) {
         this.id = id;
         this.code = code;
         this.name = name;
@@ -9,7 +9,7 @@ var Prestation = /** @class */ (function () {
         this.category = category;
         this.downtime = downtime;
         this.appointmentDelay = appointmentDelay;
-        this.order = order;
+        this.position = position;
         this.operations = operations;
     }
     return Prestation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.0.93",
+  "version": "1.0.95",
   "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,6 +1,7 @@
 import { APIMethod } from "./Enums";
 import { COOKIE_GARAGE_TOKEN, readCookie } from "./CookieUtils";
 import Logger from "./Logger";
+import { useHistory } from "react-router-dom";
 
 export const API_BASE_URL = process.env.REACT_APP_API_URL || 'https://localhost:8443/api';
 
@@ -28,7 +29,7 @@ function handleResponse(response: Response): Promise<APIResponse<any>> {
 
     const contentType = response.headers.get("content-type");
     const isJson = contentType && contentType.includes("application/json");
-
+    const history = useHistory();
     const dataPromise = isJson ? response.json() : response.text();
 
     return dataPromise.then(data => {
@@ -44,6 +45,11 @@ function handleResponse(response: Response): Promise<APIResponse<any>> {
                     errorMsg = 'Accès non autorisé (403)'; break;
                 case 404:
                     errorMsg = 'La ressource demandée est introuvable (404)'; break;
+                case 407:
+                    // On redirige l'utilisateur vers la page de login (407 = compte utilisateur introuvable, authentification requise)
+                    errorMsg = (typeof data === 'string') ? data : `Compte introuvable, veuillez vous reconnecter (${response.status})`;
+                    history.push('/login'); 
+                    break;
                 case 500:
                     errorMsg = 'Une erreur interne du serveur est survenue (500)'; break;
                 default:

package/src/models/Prestation.ts

@@ -21,12 +21,12 @@ export default class Prestation {
      */
     operations?: Operation[];
     /**
-     * La notion d'ordre peut être utile à l'affichage d'une liste de prestation par exemple
+     * La notion de position (ou d'ordre) peut être utile à l'affichage d'une liste de prestation par exemple
      */
-    order: number;
+    position: number;
     
       constructor(id:number, code: string, name:string, description: string, category:string,
-        downtime:number, appointmentDelay: number, order: number, operations?: Operation[]) {
+        downtime:number, appointmentDelay: number, position: number, operations?: Operation[]) {
         this.id = id;
         this.code = code;
         this.name = name;
@@ -34,7 +34,7 @@ export default class Prestation {
         this.category = category;
         this.downtime = downtime;
         this.appointmentDelay = appointmentDelay;
-        this.order = order;
+        this.position = position;
         this.operations = operations;
       }
 }