thm-p3-configurator 0.0.94 → 0.0.96

package/dist/src/shared/__api__/authenticatedProxyApi.js

@@ -1,11 +1,14 @@
 "use strict";
 
+require("core-js/modules/es.promise.js");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.authenticatedProxyApi = void 0;
+require("core-js/modules/es.promise.js");
 var _axios = _interopRequireDefault(require("axios"));
 var _constants__ = require("../__constants__");
+var _cookieManager = require("../__helpers__/cookieManager");
 var _LocalStorageWorker = require("../__services__/LocalStorageWorker");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
@@ -15,16 +18,36 @@ function _interopRequireDefault(e) {
 const authenticateClient = _axios.default.create({
   baseURL: APP_CONFIG.proxyUrl
 });
+const refreshClient = _axios.default.create({
+  baseURL: APP_CONFIG.proxyUrl
+});
+refreshClient.interceptors.request.use(config => {
+  const refreshToken = (0, _cookieManager.getRefreshToken)();
+  config.headers.Authorization = "Bearer ".concat(refreshToken);
+  return config;
+});
 
 /**
  * @description This interceptor:
  * - Appends the bearer token (For authentication)
  * - Appends the currently active branch Id (For authorization)
  */
-authenticateClient.interceptors.request.use(config => {
+authenticateClient.interceptors.request.use(async config => {
   var _authSession$branch;
   const authSession = _LocalStorageWorker.lsw.getJson(_constants__.AUTH_SESSION_KEY);
-  config.headers.Authorization = "Bearer ".concat(authSession === null || authSession === void 0 ? void 0 : authSession.accessToken);
+  let accessToken = (0, _cookieManager.getAccessToken)();
+  if (!accessToken) {
+    try {
+      const refreshResponse = await refreshClient('api/v1/auth', {
+        method: 'PUT'
+      });
+      accessToken = refreshResponse.data.accessToken;
+      (0, _cookieManager.setAccessToken)(accessToken);
+    } catch (error) {
+      console.log('error', error);
+    }
+  }
+  config.headers.Authorization = "Bearer ".concat(accessToken);
   config.headers['active-branch-id'] = authSession === null || authSession === void 0 || (_authSession$branch = authSession.branch) === null || _authSession$branch === void 0 ? void 0 : _authSession$branch.entityId;
   return config;
 });
@@ -32,6 +55,9 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
   getArticleTypes: () => authenticateClient("api/v1/articles/types", {
     method: 'GET'
   }),
+  putRefreshToken: () => refreshClient('api/v1/auth', {
+    method: 'PUT'
+  }),
   getArticleGroups: articleTypeId => authenticateClient("api/v1/articles/groups/".concat(articleTypeId), {
     method: 'GET'
   }),
@@ -133,5 +159,17 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
         'Content-Type': 'application/json'
       }
     });
+  },
+  getOrder: orderParameters => {
+    const basePath = APP_CONFIG.internal ? 'api/v1' : 'api/public/v1';
+    return authenticateClient("".concat(basePath, "/configurator/order?").concat(orderParameters), {
+      method: 'GET'
+    });
+  },
+  getArticlePrices: partsQueryString => {
+    const basePath = APP_CONFIG.internal ? 'api/v1' : 'api/public/v1';
+    return authenticateClient("".concat(basePath, "/configurator/prices?").concat(partsQueryString), {
+      method: 'GET'
+    });
   }
 };

package/dist/src/shared/__api__/orderApi.js

@@ -30,9 +30,6 @@ orderClient.interceptors.request.use(config => {
   return config;
 });
 const orderApi = exports.orderApi = {
-  getOrder: orderParameters => orderClient("api".concat(APP_CONFIG.internal ? '' : '/public', "/order?").concat(orderParameters) // Remove the `/public` param if the configurator is internal,
-  ),
-  getArticlePrices: partsQueryString => orderClient("api".concat(APP_CONFIG.internal ? '' : '/public', "/prices?").concat(partsQueryString)),
   getArticles: filters => orderClient("api/public/articles?".concat(filters)),
   getBrands: () => orderClient('api/public/makes'),
   getBuildYears: brand => orderClient("api/public/makes/".concat(brand, "/years")),

package/dist/src/shared/__api__/queries.js

@@ -318,7 +318,7 @@ const useSingleOrderCart = () => {
           totals: []
         };
       }
-      const orderResults = await _orderApi.orderApi.getOrder(cartOrderQuery).then(res => res.data);
+      const orderResults = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(cartOrderQuery).then(res => res.data);
       if (!orderResults.data.cart) {
         return {
           cart: []
@@ -364,8 +364,8 @@ const useProductsQuery = orderParameters => {
     enabled: (licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) > 5 || !!(model !== null && model !== void 0 && model.length),
     keepPreviousData: true,
     queryFn: async () => {
-      var _response$data, _JSON$parse, _data$articles, _data$articles2, _data$articles3, _data$articles4, _data$articles5, _data$articles6, _data$articles7, _data$articles8, _data$articles9, _data$articles10, _data$articles11;
-      const response = await _orderApi.orderApi.getOrder(productsSearchParams);
+      var _response$data, _JSON$parse, _data$articles, _data$articles2, _data$articles3, _data$articles4, _data$articles5, _data$articles6;
+      const response = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(productsSearchParams);
       const data = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data;
       if (!data) return data;
       const authSession = _LocalStorageWorker.lsw.get(_constants__.AUTH_SESSION_KEY);
@@ -377,23 +377,30 @@ const useProductsQuery = orderParameters => {
       }
       // Get all products to enrich
       const allProducts = [...(((_data$articles = data.articles) === null || _data$articles === void 0 ? void 0 : _data$articles.towbars) || []), ...(((_data$articles2 = data.articles) === null || _data$articles2 === void 0 ? void 0 : _data$articles2.cablesets) || []), ...(((_data$articles3 = data.articles) === null || _data$articles3 === void 0 ? void 0 : _data$articles3.combisets) || []), ...((_data$articles4 = data.articles) !== null && _data$articles4 !== void 0 && _data$articles4.boardComputerUpdate ? [(_data$articles5 = data.articles) === null || _data$articles5 === void 0 ? void 0 : _data$articles5.boardComputerUpdate] : []), ...(((_data$articles6 = data.articles) === null || _data$articles6 === void 0 ? void 0 : _data$articles6.extras) || [])];
+      // NOTE: the API to enrich the products with extra data is only available when the configurator has an authenticated user, so on in the PP.
+      // If we need this also for the public version than Hyper needs to implement this.
 
-      // Enrich all products with brands and prices
-      const enrichedProducts = await (0, _singleOrderArticles.enrichArticlesWithBrandsAndPrices)(allProducts, branchId, formula);
+      try {
+        var _data$articles7, _data$articles8, _data$articles9, _data$articles10, _data$articles11;
+        // Enrich all products with brands and prices
+        const enrichedProducts = await (0, _singleOrderArticles.enrichArticlesWithBrandsAndPrices)(allProducts, branchId, formula);
 
-      // Create a lookup map for the enriched products
-      const enrichedProductsMap = Object.fromEntries(enrichedProducts.map(product => [product.articleNumber, product]));
+        // Create a lookup map for the enriched products
+        const enrichedProductsMap = Object.fromEntries(enrichedProducts.map(product => [product.articleNumber, product]));
 
-      // Update the products in the response with the enriched data
-      return _objectSpread(_objectSpread({}, data), {}, {
-        articles: _objectSpread(_objectSpread({}, data.articles), {}, {
-          towbars: ((_data$articles7 = data.articles) === null || _data$articles7 === void 0 || (_data$articles7 = _data$articles7.towbars) === null || _data$articles7 === void 0 ? void 0 : _data$articles7.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || [],
-          cablesets: ((_data$articles8 = data.articles) === null || _data$articles8 === void 0 || (_data$articles8 = _data$articles8.cablesets) === null || _data$articles8 === void 0 ? void 0 : _data$articles8.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || [],
-          combisets: ((_data$articles9 = data.articles) === null || _data$articles9 === void 0 || (_data$articles9 = _data$articles9.combisets) === null || _data$articles9 === void 0 ? void 0 : _data$articles9.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || [],
-          boardComputerUpdate: (_data$articles10 = data.articles) !== null && _data$articles10 !== void 0 && _data$articles10.boardComputerUpdate ? _objectSpread(_objectSpread({}, data.articles.boardComputerUpdate), enrichedProductsMap[data.articles.boardComputerUpdate.articleNumber]) : null,
-          extras: ((_data$articles11 = data.articles) === null || _data$articles11 === void 0 || (_data$articles11 = _data$articles11.extras) === null || _data$articles11 === void 0 ? void 0 : _data$articles11.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || []
-        })
-      });
+        // Update the products in the response with the enriched data
+        return _objectSpread(_objectSpread({}, data), {}, {
+          articles: _objectSpread(_objectSpread({}, data.articles), {}, {
+            towbars: ((_data$articles7 = data.articles) === null || _data$articles7 === void 0 || (_data$articles7 = _data$articles7.towbars) === null || _data$articles7 === void 0 ? void 0 : _data$articles7.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || [],
+            cablesets: ((_data$articles8 = data.articles) === null || _data$articles8 === void 0 || (_data$articles8 = _data$articles8.cablesets) === null || _data$articles8 === void 0 ? void 0 : _data$articles8.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || [],
+            combisets: ((_data$articles9 = data.articles) === null || _data$articles9 === void 0 || (_data$articles9 = _data$articles9.combisets) === null || _data$articles9 === void 0 ? void 0 : _data$articles9.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || [],
+            boardComputerUpdate: (_data$articles10 = data.articles) !== null && _data$articles10 !== void 0 && _data$articles10.boardComputerUpdate ? _objectSpread(_objectSpread({}, data.articles.boardComputerUpdate), enrichedProductsMap[data.articles.boardComputerUpdate.articleNumber]) : null,
+            extras: ((_data$articles11 = data.articles) === null || _data$articles11 === void 0 || (_data$articles11 = _data$articles11.extras) === null || _data$articles11 === void 0 ? void 0 : _data$articles11.map(product => _objectSpread(_objectSpread({}, product), enrichedProductsMap[product.articleNumber]))) || []
+          })
+        });
+      } catch (_unused) {
+        return data;
+      }
     }
   });
   return {
@@ -436,7 +443,7 @@ const useQuestionsQuery = questionParams => {
   const questionsParamsString = new URLSearchParams((0, _helpers__.removeNullishProps)(questionParams)).toString();
   const questionsQuery = (0, _reactQuery.useQuery)(['questions', questionsParamsString], {
     enabled: (licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) > 5 || !!(model !== null && model !== void 0 && model.length),
-    queryFn: () => _orderApi.orderApi.getOrder(questionsParamsString).then(res => {
+    queryFn: () => _authenticatedProxyApi.authenticatedProxyApi.getOrder(questionsParamsString).then(res => {
       var _res$data4, _res$data5, _res$data6, _res$data7, _res$data8, _res$data9;
       return {
         execution1Answer: res === null || res === void 0 || (_res$data4 = res.data) === null || _res$data4 === void 0 || (_res$data4 = _res$data4.data) === null || _res$data4 === void 0 || (_res$data4 = _res$data4.answers) === null || _res$data4 === void 0 ? void 0 : _res$data4.execution1,

package/dist/src/shared/__helpers__/cookieManager.js

@@ -0,0 +1,104 @@
+"use strict";
+
+require("core-js/modules/es.string.starts-with.js");
+require("core-js/modules/es.string.trim.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.setRefreshToken = exports.setAuthCookies = exports.setAccessToken = exports.isAuthenticated = exports.getRefreshToken = exports.getCookie = exports.getAccessToken = exports.clearAuthCookies = void 0;
+require("core-js/modules/es.string.starts-with.js");
+require("core-js/modules/es.string.trim.js");
+/**
+ * Sets authentication cookies with security attributes
+ * @param {string} accessToken - JWT access token
+ * @param {string} refreshToken - JWT refresh token
+ */
+const setAuthCookies = (accessToken, refreshToken) => {
+  setAccessToken(accessToken);
+  setRefreshToken(refreshToken);
+};
+exports.setAuthCookies = setAuthCookies;
+const setAccessToken = accessToken => {
+  const accessExpiry = getTokenExpiry(accessToken) || 60 * 60;
+  document.cookie = "access_token=".concat(accessToken, "; max-age=").concat(accessExpiry, "; path=/; SameSite=Strict; Secure;");
+};
+exports.setAccessToken = setAccessToken;
+const setRefreshToken = refreshToken => {
+  const refreshExpiry = getTokenExpiry(refreshToken) || 7 * 24 * 60 * 60;
+  document.cookie = "refresh_token=".concat(refreshToken, "; max-age=").concat(refreshExpiry, "; path=/; SameSite=Strict; Secure;");
+};
+
+/**
+ * Gets a cookie by name
+ * @param {string} name - The name of the cookie to retrieve
+ * @returns {string|null} The cookie value or null if not found
+ */
+exports.setRefreshToken = setRefreshToken;
+const getCookie = name => {
+  const cookies = document.cookie.split(';');
+  for (let i = 0; i < cookies.length; i++) {
+    const cookie = cookies[i].trim();
+    if (cookie.startsWith(name + '=')) {
+      return cookie.substring(name.length + 1);
+    }
+  }
+  return null;
+};
+
+/**
+ * Gets the access token from cookies
+ * @returns {string|null} The access token or null
+ */
+exports.getCookie = getCookie;
+const getAccessToken = () => {
+  return getCookie('access_token');
+};
+
+/**
+ * Gets the refresh token from cookies
+ * @returns {string|null} The refresh token or null
+ */
+exports.getAccessToken = getAccessToken;
+const getRefreshToken = () => {
+  return getCookie('refresh_token');
+};
+
+/**
+ * Clears authentication cookies
+ */
+exports.getRefreshToken = getRefreshToken;
+const clearAuthCookies = () => {
+  document.cookie = 'access_token=; max-age=0; path=/; SameSite=Strict; Secure;';
+  document.cookie = 'refresh_token=; max-age=0; path=/; SameSite=Strict; Secure;';
+};
+
+/**
+ * Checks if the user is authenticated based on cookie presence
+ * @returns {boolean} True if authenticated
+ */
+exports.clearAuthCookies = clearAuthCookies;
+const isAuthenticated = () => {
+  return !!getAccessToken();
+};
+
+/**
+ * Extracts expiration time from a JWT token
+ * @param {string} token - JWT token
+ * @returns {number|null} Expiration time in seconds or null if can't be determined
+ */
+exports.isAuthenticated = isAuthenticated;
+const getTokenExpiry = token => {
+  try {
+    const parts = token.split('.');
+    if (parts.length !== 3) return null;
+    const payload = JSON.parse(atob(parts[1]));
+    if (payload.exp) {
+      const currentTimeInSeconds = Math.floor(Date.now() / 1000);
+      return Math.max(0, payload.exp - currentTimeInSeconds);
+    }
+    return null;
+  } catch (error) {
+    console.error('Error parsing JWT token:', error);
+    return null;
+  }
+};

package/dist/src/shared/__helpers__/singleOrderArticles.js

@@ -127,7 +127,7 @@ const fetchArticlesByLicensePlateAndModel = async (filters, formula, branchId) =
     executionAnswer2: filters.executionAnswer2,
     skipFilters: (_filters$showAllArtic = filters === null || filters === void 0 ? void 0 : filters.showAllArticles) !== null && _filters$showAllArtic !== void 0 ? _filters$showAllArtic : false
   })).toString();
-  const orderData = await _orderApi.orderApi.getOrder(queryString);
+  const orderData = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(queryString);
   if (!(orderData !== null && orderData !== void 0 && (_orderData$data = orderData.data) !== null && _orderData$data !== void 0 && (_orderData$data = _orderData$data.data) !== null && _orderData$data !== void 0 && _orderData$data.articles)) {
     return {
       articles: [],
@@ -193,7 +193,7 @@ const enrichArticlesWithBrandsAndPrices = async (articles, branchId, formula) =>
       brandNumber: (_article$brand = article.brand) !== null && _article$brand !== void 0 ? _article$brand : _index2.DEFAULT_ARTICLE_BRAND
     };
   });
-  const pricesResponse = await _orderApi.orderApi.getArticlePrices(new URLSearchParams({
+  const pricesResponse = await _authenticatedProxyApi.authenticatedProxyApi.getArticlePrices(new URLSearchParams({
     branchId,
     formula,
     parts: JSON.stringify(parts)

package/dist/src/shared/__pages__/internal/InternalSessionEditPage.js

@@ -35,6 +35,7 @@ var _OrderSessionContext = require("../../__context__/OrderSessionContext");
 var _helpers__ = require("../../__helpers__");
 var _dossier = require("../../__helpers__/dossier");
 var _useSearchParam = _interopRequireDefault(require("../../__hooks__/useSearchParam"));
+var _authenticatedProxyApi = require("../../__api__/authenticatedProxyApi");
 function _interopRequireDefault(e) {
   return e && e.__esModule ? e : {
     default: e
@@ -127,7 +128,7 @@ const InternalSessionEditPage = props => {
       var _dossierById$akkoordO, _orderRes$data, _orderRes$data2;
       let session = (0, _dossier.parseDossierToOrderSession)(dossierById);
       session.customerAgreed = (_dossierById$akkoordO = dossierById === null || dossierById === void 0 ? void 0 : dossierById.akkoordOpmerkingen) !== null && _dossierById$akkoordO !== void 0 ? _dossierById$akkoordO : false;
-      const orderRes = await _orderApi.orderApi.getOrder(new URLSearchParams((0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, session), {}, {
+      const orderRes = await _authenticatedProxyApi.authenticatedProxyApi.getOrder(new URLSearchParams((0, _helpers__.removeNullishProps)(_objectSpread(_objectSpread({}, session), {}, {
         formula
       }))).toString());
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thm-p3-configurator",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "author": "EnoRm.",