@northern.tech/store 0.19.0 → 0.19.1

package/dist/onboardingSlice/thunks.js

@@ -5,38 +5,38 @@ import {
   setOnboardingCanceled,
   setOnboardingComplete,
   setOnboardingDeviceType
-} from "../chunk-QFYSFHAF.js";
-import "../chunk-XC7DABLM.js";
-import "../chunk-GAHFKM3N.js";
-import "../chunk-RVAERI6U.js";
-import "../chunk-Y3DJIMEN.js";
-import "../chunk-5M6EUVNO.js";
-import "../chunk-RJRZXDVT.js";
-import "../chunk-TRKA7XYU.js";
+} from "../chunk-FUGCLQ5L.js";
+import "../chunk-GBXG2XBY.js";
+import "../chunk-C3EMLDPU.js";
+import "../chunk-KJHHSYGP.js";
+import "../chunk-XJLZK4QY.js";
+import "../chunk-IRQRV552.js";
+import "../chunk-QFYYTAYD.js";
 import "../chunk-YR65C62H.js";
+import "../chunk-VODRLEDP.js";
+import "../chunk-TRKA7XYU.js";
+import "../chunk-CQXDAXQF.js";
 import "../chunk-VCEFZTWS.js";
 import "../chunk-PVCHKW35.js";
-import "../chunk-CQXDAXQF.js";
-import "../chunk-VODRLEDP.js";
 import "../chunk-6WJI4MOP.js";
 import "../chunk-OLKM53RL.js";
-import "../chunk-FDSMCFV5.js";
+import "../chunk-UVTLZV34.js";
 import "../chunk-53W2NRSL.js";
 import "../chunk-NMAXZ3ZY.js";
-import "../chunk-TJBX7YHM.js";
-import "../chunk-GEQ2QQEE.js";
+import "../chunk-MZ5NRW3K.js";
 import "../chunk-QL6FN2JC.js";
-import "../chunk-3NOV7X4M.js";
-import "../chunk-YO22XLHI.js";
+import "../chunk-O7DR57RN.js";
+import "../chunk-GEQ2QQEE.js";
 import "../chunk-JIS4PA3R.js";
+import "../chunk-3NOV7X4M.js";
 import "../chunk-WR6RQKF5.js";
-import "../chunk-O7DR57RN.js";
+import "../chunk-YO22XLHI.js";
 import "../chunk-4BHM6WVX.js";
 import "../chunk-U5TPV5X5.js";
 import "../chunk-WWED74SG.js";
 import "../chunk-2DYA3X77.js";
-import "../chunk-FAJ3I2UQ.js";
 import "../chunk-ZKAH3APE.js";
+import "../chunk-FAJ3I2UQ.js";
 import "../chunk-EL672W25.js";
 export {
   advanceOnboarding,

package/dist/organizationSlice/constants.js

@@ -10,8 +10,8 @@ import {
   getSamlStartUrl
 } from "../chunk-WWED74SG.js";
 import "../chunk-2DYA3X77.js";
-import "../chunk-FAJ3I2UQ.js";
 import "../chunk-ZKAH3APE.js";
+import "../chunk-FAJ3I2UQ.js";
 import "../chunk-EL672W25.js";
 export {
   AUDIT_LOGS_TYPES,

package/dist/organizationSlice/index.js

@@ -7,8 +7,8 @@ import {
 } from "../chunk-VCEFZTWS.js";
 import "../chunk-WWED74SG.js";
 import "../chunk-2DYA3X77.js";
-import "../chunk-FAJ3I2UQ.js";
 import "../chunk-ZKAH3APE.js";
+import "../chunk-FAJ3I2UQ.js";
 import "../chunk-EL672W25.js";
 export {
   actions,

package/dist/organizationSlice/mocks.js

@@ -5,8 +5,8 @@ import {
   DEVICE_LIST_DEFAULTS
 } from "../chunk-WWED74SG.js";
 import "../chunk-2DYA3X77.js";
-import "../chunk-FAJ3I2UQ.js";
 import "../chunk-ZKAH3APE.js";
+import "../chunk-FAJ3I2UQ.js";
 import "../chunk-EL672W25.js";
 
 // src/organizationSlice/mocks.ts

package/dist/organizationSlice/selectors.js

@@ -19,8 +19,8 @@ import {
 } from "../chunk-3NOV7X4M.js";
 import "../chunk-WWED74SG.js";
 import "../chunk-2DYA3X77.js";
-import "../chunk-FAJ3I2UQ.js";
 import "../chunk-ZKAH3APE.js";
+import "../chunk-FAJ3I2UQ.js";
 import "../chunk-EL672W25.js";
 export {
   getAuditLog,

package/dist/organizationSlice/thunks.cjs

@@ -76,7 +76,7 @@ var import_dayjs3 = __toESM(require("dayjs"), 1);
 var import_utc = __toESM(require("dayjs/plugin/utc.js"), 1);
 var import_jwt_decode = require("jwt-decode");
 var import_md52 = __toESM(require("md5"), 1);
-var import_universal_cookie4 = __toESM(require("universal-cookie"), 1);
+var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
 
 // src/organizationSlice/index.ts
 var import_toolkit = require("@reduxjs/toolkit");
@@ -1740,6 +1740,7 @@ var actions_default = {
 
 // src/api/general-api.ts
 var import_axios = __toESM(require("axios"), 1);
+var import_universal_cookie2 = __toESM(require("universal-cookie"), 1);
 
 // src/auth.ts
 var import_universal_cookie = __toESM(require("universal-cookie"), 1);
@@ -1752,19 +1753,17 @@ var getSessionInfo = () => {
     sessionInfo = JSON.parse(window.localStorage.getItem("JWT") ?? "");
   } catch {
   }
+  const jwtTokenFromCookie = cookies.get("JWT", { doNotParse: true }) ?? "";
+  if (jwtTokenFromCookie) {
+    setSessionInfo({ token: jwtTokenFromCookie });
+    cookies.remove("JWT");
+    cookies.remove("JWT", { path: "/" });
+    return { token: jwtTokenFromCookie, expiresAt: void 0 };
+  }
   if (sessionInfo.expiresAt && new Date(sessionInfo.expiresAt) < /* @__PURE__ */ new Date()) {
     cleanUp();
     return { ...emptySession };
   }
-  if (!sessionInfo.token) {
-    const jwtTokenFromCookie = cookies.get("JWT", { doNotParse: true }) ?? "";
-    if (jwtTokenFromCookie) {
-      setSessionInfo({ token: jwtTokenFromCookie });
-      sessionInfo.token = jwtTokenFromCookie;
-      cookies.remove("JWT");
-      cookies.remove("JWT", { path: "/" });
-    }
-  }
   sessionInfo.token = sessionInfo.token || "";
   tokenCache = sessionInfo.token;
   return sessionInfo;
@@ -1783,8 +1782,13 @@ var cleanUp = () => {
 };
 
 // src/api/general-api.ts
+var cookies2 = new import_universal_cookie2.default();
 var unauthorizedRedirect = (error) => {
   if (!(0, import_axios.isCancel)(error) && error.response?.status === 401 && getToken() && !window.location.pathname.endsWith("/subscription")) {
+    if (cookies2.get("JWT", { doNotParse: true })) {
+      window.location.reload();
+      return Promise.reject(error);
+    }
     cleanUp();
     window.location.replace("/ui/");
   }
@@ -2569,10 +2573,10 @@ var createAppAsyncThunk = import_toolkit16.createAsyncThunk.withTypes();
 
 // src/appSlice/thunks.ts
 var import_helpers7 = require("@northern.tech/utils/helpers");
-var import_universal_cookie2 = __toESM(require("universal-cookie"), 1);
-var cookies2 = new import_universal_cookie2.default();
+var import_universal_cookie3 = __toESM(require("universal-cookie"), 1);
+var cookies3 = new import_universal_cookie3.default();
 var setFirstLoginAfterSignup = createAppAsyncThunk(`${sliceName2}/setFirstLoginAfterSignup`, (firstLoginAfterSignup, { dispatch }) => {
-  cookies2.set("firstLoginAfterSignup", !!firstLoginAfterSignup, { maxAge: 60, path: "/", domain: ".mender.io", sameSite: false });
+  cookies3.set("firstLoginAfterSignup", !!firstLoginAfterSignup, { maxAge: 60, path: "/", domain: ".mender.io", sameSite: false });
   dispatch(actions2.setFirstLoginAfterSignup(!!firstLoginAfterSignup));
 });
 var dateFunctionMap = {
@@ -3995,7 +3999,7 @@ var import_helpers10 = require("@northern.tech/utils/helpers");
 var import_retrytimer = require("@northern.tech/utils/retrytimer");
 var import_dayjs2 = __toESM(require("dayjs"), 1);
 var import_md5 = __toESM(require("md5"), 1);
-var import_universal_cookie3 = __toESM(require("universal-cookie"), 1);
+var import_universal_cookie4 = __toESM(require("universal-cookie"), 1);
 
 // src/api/users-api.ts
 var import_axios3 = __toESM(require("axios"), 1);
@@ -4012,7 +4016,7 @@ var Api2 = {
 var users_api_default = Api2;
 
 // src/usersSlice/thunks.ts
-var cookies3 = new import_universal_cookie3.default();
+var cookies4 = new import_universal_cookie4.default();
 var { setAnnouncement, setSnackbar: setSnackbar4 } = actions_default;
 var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => () => {
   const errorText = (0, import_helpers10.extractErrorMessage)(err);
@@ -4047,7 +4051,7 @@ var loginUser = createAppAsyncThunk(
     now.setSeconds(now.getSeconds() + import_constants5.maxSessionAge);
     const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
     setSessionInfo({ token, expiresAt });
-    cookies3.remove("JWT", { path: "/" });
+    cookies4.remove("JWT", { path: "/" });
     return dispatch(getUser(OWN_USER_ID)).unwrap().catch((e) => {
       cleanUp();
       return Promise.reject(dispatch(setSnackbar4((0, import_helpers10.extractErrorMessage)(e))));
@@ -4602,9 +4606,9 @@ var setHideAnnouncement = createAppAsyncThunk(
   ({ shouldHide, userId }, { dispatch, getState }) => {
     const currentUserId = userId || getCurrentUser(getState()).id;
     const hash = getState().app.hostedAnnouncement ? (0, import_md5.default)(getState().app.hostedAnnouncement) : "";
-    const announceCookie = cookies3.get(`${currentUserId}${hash}`);
+    const announceCookie = cookies4.get(`${currentUserId}${hash}`);
     if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
-      cookies3.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
+      cookies4.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
       dispatch(setAnnouncement(""));
     }
   }
@@ -4657,7 +4661,7 @@ var submitUserFeedback = createAppAsyncThunk(
 );
 
 // src/organizationSlice/thunks.ts
-var cookies4 = new import_universal_cookie4.default();
+var cookies5 = new import_universal_cookie5.default();
 import_dayjs3.default.extend(import_utc.default);
 var { setAnnouncement: setAnnouncement2, setSnackbar: setSnackbar5 } = actions_default;
 var { page: defaultPage4, perPage: defaultPerPage4 } = import_constants5.DEVICE_LIST_DEFAULTS;
@@ -4692,9 +4696,9 @@ var createOrganizationTrial = createAppAsyncThunk(`${sliceName}/createOrganizati
     }
     return Promise.reject(err);
   }).then(({ headers }) => {
-    cookies4.remove("oauth");
-    cookies4.remove("externalID");
-    cookies4.remove("email");
+    cookies5.remove("oauth");
+    cookies5.remove("externalID");
+    cookies5.remove("email");
     dispatch(setFirstLoginAfterSignup(true));
     return new Promise(
       (resolve) => setTimeout(() => {
@@ -4864,7 +4868,7 @@ var getUserOrganization = createAppAsyncThunk(
     const jwtData = { addons: jwt["mender.addons"], plan: jwt["mender.plan"], trial: jwt["mender.trial"] };
     if (!(0, import_helpers11.deepCompare)({ addons, plan, trial }, jwtData)) {
       const hash = (0, import_md52.default)(tenantDataDivergedMessage);
-      cookies4.remove(`${jwt.sub}${hash}`);
+      cookies5.remove(`${jwt.sub}${hash}`);
       tasks.push(dispatch(setAnnouncement2(tenantDataDivergedMessage)));
     }
     return Promise.all(tasks);