@movalib/movalib-commons 1.1.53 → 1.1.54

package/dist/src/helpers/ApiHelper.js

@@ -63,8 +63,8 @@ var request = function (options) {
             }
             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));
+            if ((0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_PRO_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + (0, CookieUtils_1.readCookie)(CookieUtils_1.COOKIE_PRO_TOKEN));
             }
             break;
     }

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

@@ -1,4 +1,4 @@
-export declare const COOKIE_GARAGE_TOKEN: string;
+export declare const COOKIE_PRO_TOKEN: string;
 export declare const COOKIE_INDIVIDUAL_TOKEN: string;
 export declare const COOKIE_DEFAULT_EXPIRES: number;
 export declare const createCookie: (name: string, value: string) => void;

package/dist/src/helpers/CookieUtils.js

@@ -3,9 +3,9 @@ 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_GARAGE_TOKEN = void 0;
+exports.readCookie = exports.deleteCookie = exports.createCookie = exports.COOKIE_DEFAULT_EXPIRES = exports.COOKIE_INDIVIDUAL_TOKEN = exports.COOKIE_PRO_TOKEN = void 0;
 var js_cookie_1 = __importDefault(require("js-cookie"));
-exports.COOKIE_GARAGE_TOKEN = 'movalibGarageToken';
+exports.COOKIE_PRO_TOKEN = 'movalibProToken';
 exports.COOKIE_INDIVIDUAL_TOKEN = 'movalibIndividualToken';
 exports.COOKIE_DEFAULT_EXPIRES = 7;
 var createCookie = function (name, value) {

package/dist/src/services/AuthenticationService.js

@@ -60,7 +60,7 @@ var AuthenticationService = /** @class */ (function () {
                         switch (appType) {
                             case Enums_1.MovaAppType.GARAGE:
                                 url = "".concat(ApiHelper_1.API_BASE_URL, "/garage/login");
-                                tokenCookie = CookieUtils_1.COOKIE_GARAGE_TOKEN;
+                                tokenCookie = CookieUtils_1.COOKIE_PRO_TOKEN;
                                 break;
                             case Enums_1.MovaAppType.INDIVIDUAL:
                                 url = "".concat(ApiHelper_1.API_BASE_URL, "/login");
@@ -81,7 +81,7 @@ var AuthenticationService = /** @class */ (function () {
                         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()];
+                        return [4 /*yield*/, UserService_1.default.getCurrentUser(appType)];
                     case 2:
                         userResponse = _a.sent();
                         if (!userResponse || !userResponse.success) {

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

@@ -1,4 +1,5 @@
 import { APIResponse } from "../helpers/ApiHelper";
+import { MovaAppType } from "../helpers/Enums";
 import User from "../models/User";
 export default class UserService {
     static validateAccount(req: any): Promise<APIResponse<string>>;
@@ -7,5 +8,5 @@ export default class UserService {
      * @param password
      * @returns
      */
-    static getCurrentUser(): Promise<APIResponse<User>>;
+    static getCurrentUser(appType: MovaAppType): Promise<APIResponse<User>>;
 }

package/dist/src/services/UserService.js

@@ -58,7 +58,7 @@ var UserService = /** @class */ (function () {
      * @param password
      * @returns
      */
-    UserService.getCurrentUser = function () {
+    UserService.getCurrentUser = function (appType) {
         return __awaiter(this, void 0, void 0, function () {
             var error_1;
             return __generator(this, function (_a) {
@@ -68,7 +68,7 @@ var UserService = /** @class */ (function () {
                         return [4 /*yield*/, (0, ApiHelper_1.request)({
                                 url: "".concat(ApiHelper_1.API_BASE_URL, "/user/me"),
                                 method: Enums_1.APIMethod.GET,
-                                appType: Enums_1.MovaAppType.INDIVIDUAL
+                                appType: appType
                             })];
                     case 1: return [2 /*return*/, _a.sent()];
                     case 2:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movalib/movalib-commons",
-  "version": "1.1.53",
+  "version": "1.1.54",
   "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, MovaAppType } from "./Enums";
-import { COOKIE_GARAGE_TOKEN, COOKIE_INDIVIDUAL_TOKEN, readCookie } from "./CookieUtils";
+import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, readCookie } from "./CookieUtils";
 import Logger from "./Logger";
 import { useHistory } from "react-router-dom";
 
@@ -84,8 +84,8 @@ export const request = (options:APIRequest): Promise<APIResponse<any>> => {
             break;
 
         case MovaAppType.GARAGE:
-            if(readCookie(COOKIE_GARAGE_TOKEN)) {
-                headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_GARAGE_TOKEN))
+            if(readCookie(COOKIE_PRO_TOKEN)) {
+                headers.append('Authorization', 'Bearer ' + readCookie(COOKIE_PRO_TOKEN))
             }
             break;
     }

package/src/helpers/CookieUtils.ts

@@ -1,6 +1,6 @@
 import Cookies from "js-cookie";
 
-export const COOKIE_GARAGE_TOKEN: string = 'movalibGarageToken'; 
+export const COOKIE_PRO_TOKEN: string = 'movalibProToken'; 
 export const COOKIE_INDIVIDUAL_TOKEN: string = 'movalibIndividualToken'; 
 export const COOKIE_DEFAULT_EXPIRES: number = 7;
 

package/src/services/AuthenticationService.ts

@@ -1,5 +1,5 @@
 import { APIResponse, API_BASE_URL, request } from "../helpers/ApiHelper";
-import { COOKIE_GARAGE_TOKEN, COOKIE_INDIVIDUAL_TOKEN, createCookie } from "../helpers/CookieUtils";
+import { COOKIE_PRO_TOKEN, COOKIE_INDIVIDUAL_TOKEN, createCookie } from "../helpers/CookieUtils";
 import { APIMethod, MovaAppType } from "../helpers/Enums";
 import Logger from "../helpers/Logger";
 import User from "../models/User";
@@ -19,7 +19,7 @@ export default class AuthenticationService {
             switch(appType){
                 case MovaAppType.GARAGE:
                     url = `${API_BASE_URL}/garage/login`; 
-                    tokenCookie = COOKIE_GARAGE_TOKEN;
+                    tokenCookie = COOKIE_PRO_TOKEN;
                     break;
                 case MovaAppType.INDIVIDUAL:
                     url = `${API_BASE_URL}/login`; 
@@ -44,7 +44,7 @@ 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();
+                let userResponse =  await UserService.getCurrentUser(appType);
 
                 if(!userResponse || !userResponse.success) {
                     const errorMsg = 'Erreur au chargement de votre profil';

package/src/services/UserService.ts

@@ -19,12 +19,12 @@ export default class UserService {
      * @param password 
      * @returns 
      */
-    static async getCurrentUser(): Promise<APIResponse<User>> {
+    static async getCurrentUser(appType: MovaAppType): Promise<APIResponse<User>> {
         try {
             return await request({
                 url: `${API_BASE_URL}/user/me`,
                 method: APIMethod.GET,
-                appType: MovaAppType.INDIVIDUAL
+                appType: appType
             });
         } catch (error) {
             Logger.error('Error occurred during getting user:', error);