thm-p3-configurator 0.0.339 → 0.0.341

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

@@ -28,6 +28,37 @@ const sessionClient = _axios.default.create({
   withCredentials: true
 });
 let refreshPromise = null;
+const syncRuntimeSession = function syncRuntimeSession() {
+  var _payload$branch$entit, _payload$branch;
+  let payload = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  if (!(payload !== null && payload !== void 0 && payload.authenticated)) {
+    _AuthRuntime.authRuntime.clear();
+    return false;
+  }
+  _AuthRuntime.authRuntime.setCsrfToken(payload.csrfToken || null);
+  _AuthRuntime.authRuntime.setActiveBranchId((_payload$branch$entit = (_payload$branch = payload.branch) === null || _payload$branch === void 0 ? void 0 : _payload$branch.entityId) !== null && _payload$branch$entit !== void 0 ? _payload$branch$entit : null);
+  return true;
+};
+const refreshSession = () => {
+  if (!refreshPromise) {
+    refreshPromise = sessionClient('api/v1/auth', {
+      method: 'PUT'
+    }).then(response => {
+      syncRuntimeSession((response === null || response === void 0 ? void 0 : response.data) || {});
+      return response;
+    }).finally(() => {
+      refreshPromise = null;
+    });
+  }
+  return refreshPromise;
+};
+const resyncSession = async () => {
+  const response = await sessionClient('api/v1/auth/session', {
+    method: 'GET'
+  });
+  syncRuntimeSession((response === null || response === void 0 ? void 0 : response.data) || {});
+  return response;
+};
 const attachSessionHeaders = function attachSessionHeaders() {
   let config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   config.headers = config.headers || {};
@@ -60,18 +91,15 @@ authenticatedClient.interceptors.response.use(response => response, async error
     return Promise.reject(error);
   }
   originalRequest._retry = true;
-  if (!refreshPromise) {
-    refreshPromise = sessionClient('api/v1/auth', {
-      method: 'PUT'
-    }).then(response => {
-      var _response$data;
-      _AuthRuntime.authRuntime.setCsrfToken((response === null || response === void 0 || (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.csrfToken) || null);
-      return response;
-    }).finally(() => {
-      refreshPromise = null;
-    });
+  try {
+    await refreshSession();
+  } catch (refreshError) {
+    var _sessionResponse$data;
+    const sessionResponse = await resyncSession().catch(() => null);
+    if (!(sessionResponse !== null && sessionResponse !== void 0 && (_sessionResponse$data = sessionResponse.data) !== null && _sessionResponse$data !== void 0 && _sessionResponse$data.authenticated)) {
+      return Promise.reject(refreshError);
+    }
   }
-  await refreshPromise;
   return authenticatedClient(originalRequest);
 });
 const authenticatedProxyApi = exports.authenticatedProxyApi = {
@@ -99,9 +127,7 @@ const authenticatedProxyApi = exports.authenticatedProxyApi = {
   getCountries: () => authenticatedClient("api/v1/countries", {
     method: 'GET'
   }),
-  putRefreshToken: () => sessionClient('api/v1/auth', {
-    method: 'PUT'
-  }),
+  putRefreshToken: () => refreshSession(),
   getArticleGroups: articleTypeId => authenticatedClient("api/v1/articles/groups/".concat(articleTypeId), {
     method: 'GET'
   }),

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

@@ -479,8 +479,9 @@ const useOrderDataQuery = exports.useOrderDataQuery = function useOrderDataQuery
   } = (0, _AuthSessionContext.useAuthSession)();
   const orderQueryKey = (0, _queryKeyFactory.getOrderQueryKey)(normalizedOrderParams);
   const serializedOrderParams = (0, _queryKeyFactory.serializeOrderParams)(normalizedOrderParams);
+  const hasOrderInput = (licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) > 5 || !!(model !== null && model !== void 0 && model.length);
   const orderQuery = (0, _reactQuery.useQuery)(orderQueryKey, {
-    enabled: ((licensePlate === null || licensePlate === void 0 ? void 0 : licensePlate.length) > 5 || !!(model !== null && model !== void 0 && model.length)) && (!APP_CONFIG.internal || initialized),
+    enabled: hasOrderInput && (!APP_CONFIG.internal || initialized),
     keepPreviousData: true,
     queryFn: async () => {
       var _response$data;

package/dist/src/shared/__hooks__/useSessionContextReady.js

@@ -0,0 +1,16 @@
+"use strict";
+
+require("core-js/modules/web.dom-collections.iterator.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useSessionContextReady = void 0;
+require("core-js/modules/web.dom-collections.iterator.js");
+var _react = require("react");
+var _AuthRuntime = require("../__services__/AuthRuntime");
+const useSessionContextReady = () => {
+  const [isReady, setIsReady] = (0, _react.useState)(_AuthRuntime.authRuntime.isSessionContextReady());
+  (0, _react.useEffect)(() => _AuthRuntime.authRuntime.subscribeSessionContextReady(setIsReady), []);
+  return isReady;
+};
+exports.useSessionContextReady = useSessionContextReady;

package/package.json

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