@northern.tech/store 0.19.0 → 0.19.1

package/dist/storehooks.cjs

@@ -39,7 +39,7 @@ var import_react_redux2 = require("react-redux");
 var import_helpers15 = require("@northern.tech/utils/helpers");
 var import_dayjs4 = __toESM(require("dayjs"), 1);
 var import_duration = __toESM(require("dayjs/plugin/duration.js"), 1);
-var import_universal_cookie6 = __toESM(require("universal-cookie"), 1);
+var import_universal_cookie7 = __toESM(require("universal-cookie"), 1);
 
 // src/appSlice/index.ts
 var import_toolkit = require("@reduxjs/toolkit");
@@ -1713,19 +1713,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;
@@ -2418,12 +2416,18 @@ var getShowSecurityAlert = (0, import_toolkit15.createSelector)(
 
 // src/appSlice/thunks.ts
 var import_helpers7 = require("@northern.tech/utils/helpers");
-var import_universal_cookie2 = __toESM(require("universal-cookie"), 1);
+var import_universal_cookie3 = __toESM(require("universal-cookie"), 1);
 
 // src/api/general-api.ts
 var import_axios = __toESM(require("axios"), 1);
+var import_universal_cookie2 = __toESM(require("universal-cookie"), 1);
+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/");
   }
@@ -2553,9 +2557,9 @@ var store = getConfiguredStore({
 var createAppAsyncThunk = import_toolkit16.createAsyncThunk.withTypes();
 
 // src/appSlice/thunks.ts
-var cookies2 = new import_universal_cookie2.default();
+var cookies3 = new import_universal_cookie3.default();
 var setFirstLoginAfterSignup = createAppAsyncThunk(`${sliceName}/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(actions.setFirstLoginAfterSignup(!!firstLoginAfterSignup));
 });
 var dateFunctionMap = {
@@ -3976,8 +3980,8 @@ var changeNotificationSetting = createAppAsyncThunk(
 // src/onboardingSlice/thunks.ts
 var import_helpers10 = require("@northern.tech/utils/helpers");
 var import_tracking2 = __toESM(require("@northern.tech/utils/tracking"), 1);
-var import_universal_cookie3 = __toESM(require("universal-cookie"), 1);
-var cookies3 = new import_universal_cookie3.default();
+var import_universal_cookie4 = __toESM(require("universal-cookie"), 1);
+var cookies4 = new import_universal_cookie4.default();
 var applyOnboardingFallbacks = (progress2) => {
   const step = orderedOnboardingSteps[progress2];
   if (step && step.fallbackStep) {
@@ -3995,7 +3999,7 @@ var determineProgress = (acceptedDevices, pendingDevices, releases, pastDeployme
 };
 var deductOnboardingState = ({ devicesById, devicesByStatus, onboardingState, pastDeployments, releases, userCapabilities, userId }) => {
   const { canDeploy, canManageDevices, canReadDeployments, canReadDevices, canReadReleases, canUploadReleases } = userCapabilities;
-  const userCookie = cookies3.get(`${userId}-onboarded`);
+  const userCookie = cookies4.get(`${userId}-onboarded`);
   const acceptedDevices = devicesByStatus[import_constants5.DEVICE_STATES.accepted].deviceIds;
   const pendingDevices = devicesByStatus[import_constants5.DEVICE_STATES.pending].deviceIds;
   let deviceType = onboardingState.deviceType ?? [];
@@ -4087,8 +4091,8 @@ var import_dayjs2 = __toESM(require("dayjs"), 1);
 var import_utc = __toESM(require("dayjs/plugin/utc.js"), 1);
 var import_jwt_decode = require("jwt-decode");
 var import_md5 = __toESM(require("md5"), 1);
-var import_universal_cookie4 = __toESM(require("universal-cookie"), 1);
-var cookies4 = new import_universal_cookie4.default();
+var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
+var cookies5 = new import_universal_cookie5.default();
 import_dayjs2.default.extend(import_utc.default);
 var { setAnnouncement, setSnackbar: setSnackbar4 } = actions_default;
 var { page: defaultPage4, perPage: defaultPerPage4 } = import_constants5.DEVICE_LIST_DEFAULTS;
@@ -4123,9 +4127,9 @@ var createOrganizationTrial = createAppAsyncThunk(`${sliceName6}/createOrganizat
     }
     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(() => {
@@ -4295,7 +4299,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_md5.default)(tenantDataDivergedMessage);
-      cookies4.remove(`${jwt.sub}${hash}`);
+      cookies5.remove(`${jwt.sub}${hash}`);
       tasks.push(dispatch(setAnnouncement(tenantDataDivergedMessage)));
     }
     return Promise.all(tasks);
@@ -4829,7 +4833,7 @@ var import_helpers14 = require("@northern.tech/utils/helpers");
 var import_retrytimer = require("@northern.tech/utils/retrytimer");
 var import_dayjs3 = __toESM(require("dayjs"), 1);
 var import_md52 = __toESM(require("md5"), 1);
-var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
+var import_universal_cookie6 = __toESM(require("universal-cookie"), 1);
 
 // src/api/users-api.ts
 var import_axios4 = __toESM(require("axios"), 1);
@@ -4846,7 +4850,7 @@ var Api2 = {
 var users_api_default = Api2;
 
 // src/usersSlice/thunks.ts
-var cookies5 = new import_universal_cookie5.default();
+var cookies6 = new import_universal_cookie6.default();
 var { setAnnouncement: setAnnouncement2, setSnackbar: setSnackbar6 } = actions_default;
 var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => () => {
   const errorText = (0, import_helpers14.extractErrorMessage)(err);
@@ -4881,7 +4885,7 @@ var loginUser = createAppAsyncThunk(
     now.setSeconds(now.getSeconds() + import_constants5.maxSessionAge);
     const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
     setSessionInfo({ token, expiresAt });
-    cookies5.remove("JWT", { path: "/" });
+    cookies6.remove("JWT", { path: "/" });
     return dispatch(getUser(OWN_USER_ID)).unwrap().catch((e) => {
       cleanUp();
       return Promise.reject(dispatch(setSnackbar6((0, import_helpers14.extractErrorMessage)(e))));
@@ -5436,9 +5440,9 @@ var setHideAnnouncement = createAppAsyncThunk(
   ({ shouldHide, userId }, { dispatch, getState }) => {
     const currentUserId = userId || getCurrentUser(getState()).id;
     const hash = getState().app.hostedAnnouncement ? (0, import_md52.default)(getState().app.hostedAnnouncement) : "";
-    const announceCookie = cookies5.get(`${currentUserId}${hash}`);
+    const announceCookie = cookies6.get(`${currentUserId}${hash}`);
     if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
-      cookies5.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
+      cookies6.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
       dispatch(setAnnouncement2(""));
     }
   }
@@ -5491,7 +5495,7 @@ var submitUserFeedback = createAppAsyncThunk(
 );
 
 // src/storehooks.ts
-var cookies6 = new import_universal_cookie6.default();
+var cookies7 = new import_universal_cookie7.default();
 import_dayjs4.default.extend(import_duration.default);
 var { setDeviceListState: setDeviceListState2, setFirstLoginAfterSignup: setFirstLoginAfterSignup2, setTooltipsState, setShowStartupNotification } = actions_default;
 var featureFlags = [
@@ -5582,7 +5586,7 @@ var useAppInit = (userId) => {
       dispatch(parseEnvironmentInfo()),
       dispatch(getUserSettings2()),
       dispatch(getGlobalSettings2()),
-      dispatch(setFirstLoginAfterSignup2(stringToBoolean(cookies6.get("firstLoginAfterSignup"))))
+      dispatch(setFirstLoginAfterSignup2(stringToBoolean(cookies7.get("firstLoginAfterSignup"))))
     ];
     const multitenancy = hasMultitenancy || isHosted || isEnterprise;
     if (multitenancy) {
@@ -5616,7 +5620,7 @@ var useAppInit = (userId) => {
   }, [dispatch, hasMultitenancy, isServiceProvider]);
   const interpretAppData = (0, import_react2.useCallback)(() => {
     const settings = {};
-    if (cookies6.get("_ga") && typeof hasTrackingEnabled === "undefined") {
+    if (cookies7.get("_ga") && typeof hasTrackingEnabled === "undefined") {
       settings.trackingConsentGiven = true;
     }
     let tasks = [