@northern.tech/store 0.18.0 → 0.19.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/actions.js +6 -6
- package/dist/api/general-api.cjs +13 -9
- package/dist/api/general-api.cjs.map +1 -1
- package/dist/api/general-api.js +3 -3
- package/dist/api/users-api.cjs +13 -9
- package/dist/api/users-api.cjs.map +1 -1
- package/dist/api/users-api.js +4 -4
- package/dist/appSlice/index.js +1 -1
- package/dist/appSlice/mocks.js +1 -1
- package/dist/appSlice/thunks.cjs +42 -19
- package/dist/appSlice/thunks.cjs.map +1 -1
- package/dist/appSlice/thunks.js +18 -18
- package/dist/auth.cjs +7 -9
- package/dist/auth.cjs.map +1 -1
- package/dist/auth.js +2 -2
- package/dist/{chunk-6UO33KLN.js → chunk-C3EMLDPU.js} +5 -5
- package/dist/{chunk-EFFRZCDN.js → chunk-FUGCLQ5L.js} +23 -23
- package/dist/{chunk-C5QK6HH6.js → chunk-GBXG2XBY.js} +5 -5
- package/dist/{chunk-5M6EUVNO.js → chunk-IRQRV552.js} +8 -2
- package/dist/chunk-IRQRV552.js.map +1 -0
- package/dist/{chunk-CXBQKY7F.js → chunk-KJHHSYGP.js} +14 -14
- package/dist/{chunk-PFWOM36E.js → chunk-MZ5NRW3K.js} +38 -17
- package/dist/{chunk-PFWOM36E.js.map → chunk-MZ5NRW3K.js.map} +1 -1
- package/dist/{chunk-BX2CTAJO.js → chunk-QFYYTAYD.js} +11 -11
- package/dist/{chunk-FDSMCFV5.js → chunk-UVTLZV34.js} +8 -10
- package/dist/chunk-UVTLZV34.js.map +1 -0
- package/dist/{chunk-Y3DJIMEN.js → chunk-XJLZK4QY.js} +3 -3
- package/dist/commonConstants.js +1 -1
- package/dist/commonSelectors.cjs +31 -0
- package/dist/commonSelectors.cjs.map +1 -1
- package/dist/commonSelectors.d.cts +147 -1
- package/dist/commonSelectors.d.ts +147 -1
- package/dist/commonSelectors.js +8 -6
- package/dist/constants.js +1 -1
- package/dist/deploymentsSlice/constants.js +1 -1
- package/dist/deploymentsSlice/index.js +1 -1
- package/dist/deploymentsSlice/mocks.js +1 -1
- package/dist/deploymentsSlice/selectors.js +1 -1
- package/dist/deploymentsSlice/thunks.cjs +42 -19
- package/dist/deploymentsSlice/thunks.cjs.map +1 -1
- package/dist/deploymentsSlice/thunks.js +18 -18
- package/dist/devicesSlice/constants.js +1 -1
- package/dist/devicesSlice/index.js +1 -1
- package/dist/devicesSlice/mocks.js +1 -1
- package/dist/devicesSlice/selectors.js +1 -1
- package/dist/devicesSlice/thunks.cjs +42 -19
- package/dist/devicesSlice/thunks.cjs.map +1 -1
- package/dist/devicesSlice/thunks.js +18 -18
- package/dist/liststatehook.js +1 -1
- package/dist/locationutils.js +1 -1
- package/dist/monitorSlice/index.js +1 -1
- package/dist/monitorSlice/mocks.js +1 -1
- package/dist/monitorSlice/thunks.cjs +32 -9
- package/dist/monitorSlice/thunks.cjs.map +1 -1
- package/dist/monitorSlice/thunks.js +15 -15
- package/dist/onboardingSlice/thunks.cjs +45 -22
- package/dist/onboardingSlice/thunks.cjs.map +1 -1
- package/dist/onboardingSlice/thunks.js +18 -18
- package/dist/organizationSlice/constants.js +1 -1
- package/dist/organizationSlice/index.js +1 -1
- package/dist/organizationSlice/mocks.js +1 -1
- package/dist/organizationSlice/selectors.js +1 -1
- package/dist/organizationSlice/thunks.cjs +50 -27
- package/dist/organizationSlice/thunks.cjs.map +1 -1
- package/dist/organizationSlice/thunks.js +18 -18
- package/dist/releasesSlice/index.js +1 -1
- package/dist/releasesSlice/mocks.js +1 -1
- package/dist/releasesSlice/selectors.js +1 -1
- package/dist/releasesSlice/thunks.cjs +32 -9
- package/dist/releasesSlice/thunks.cjs.map +1 -1
- package/dist/releasesSlice/thunks.js +15 -15
- package/dist/selectors.cjs +29 -0
- package/dist/selectors.cjs.map +1 -1
- package/dist/selectors.d.cts +1 -1
- package/dist/selectors.d.ts +1 -1
- package/dist/selectors.js +44 -42
- package/dist/sockethook.js +1 -1
- package/dist/store.cjs +7 -9
- package/dist/store.cjs.map +1 -1
- package/dist/store.js +8 -8
- package/dist/storehooks.cjs +60 -37
- package/dist/storehooks.cjs.map +1 -1
- package/dist/storehooks.js +20 -20
- package/dist/thunks.cjs +53 -30
- package/dist/thunks.cjs.map +1 -1
- package/dist/thunks.js +18 -18
- package/dist/useDeploymentDevice.cjs +42 -19
- package/dist/useDeploymentDevice.cjs.map +1 -1
- package/dist/useDeploymentDevice.js +18 -18
- package/dist/usersSlice/constants.js +1 -1
- package/dist/usersSlice/index.js +1 -1
- package/dist/usersSlice/mocks.js +1 -1
- package/dist/usersSlice/selectors.js +1 -1
- package/dist/usersSlice/thunks.cjs +42 -19
- package/dist/usersSlice/thunks.cjs.map +1 -1
- package/dist/usersSlice/thunks.js +18 -18
- package/dist/utils.js +1 -1
- package/package.json +1 -1
- package/dist/chunk-5M6EUVNO.js.map +0 -1
- package/dist/chunk-FDSMCFV5.js.map +0 -1
- /package/dist/{chunk-6UO33KLN.js.map → chunk-C3EMLDPU.js.map} +0 -0
- /package/dist/{chunk-EFFRZCDN.js.map → chunk-FUGCLQ5L.js.map} +0 -0
- /package/dist/{chunk-C5QK6HH6.js.map → chunk-GBXG2XBY.js.map} +0 -0
- /package/dist/{chunk-CXBQKY7F.js.map → chunk-KJHHSYGP.js.map} +0 -0
- /package/dist/{chunk-BX2CTAJO.js.map → chunk-QFYYTAYD.js.map} +0 -0
- /package/dist/{chunk-Y3DJIMEN.js.map → chunk-XJLZK4QY.js.map} +0 -0
|
@@ -5,38 +5,38 @@ import {
|
|
|
5
5
|
setOnboardingCanceled,
|
|
6
6
|
setOnboardingComplete,
|
|
7
7
|
setOnboardingDeviceType
|
|
8
|
-
} from "../chunk-
|
|
9
|
-
import "../chunk-
|
|
10
|
-
import "../chunk-
|
|
11
|
-
import "../chunk-
|
|
12
|
-
import "../chunk-
|
|
13
|
-
import "../chunk-
|
|
14
|
-
import "../chunk-
|
|
15
|
-
import "../chunk-TRKA7XYU.js";
|
|
8
|
+
} from "../chunk-FUGCLQ5L.js";
|
|
9
|
+
import "../chunk-GBXG2XBY.js";
|
|
10
|
+
import "../chunk-C3EMLDPU.js";
|
|
11
|
+
import "../chunk-KJHHSYGP.js";
|
|
12
|
+
import "../chunk-XJLZK4QY.js";
|
|
13
|
+
import "../chunk-IRQRV552.js";
|
|
14
|
+
import "../chunk-QFYYTAYD.js";
|
|
16
15
|
import "../chunk-YR65C62H.js";
|
|
16
|
+
import "../chunk-VODRLEDP.js";
|
|
17
|
+
import "../chunk-TRKA7XYU.js";
|
|
18
|
+
import "../chunk-CQXDAXQF.js";
|
|
17
19
|
import "../chunk-VCEFZTWS.js";
|
|
18
20
|
import "../chunk-PVCHKW35.js";
|
|
19
|
-
import "../chunk-CQXDAXQF.js";
|
|
20
|
-
import "../chunk-OLKM53RL.js";
|
|
21
21
|
import "../chunk-6WJI4MOP.js";
|
|
22
|
-
import "../chunk-
|
|
23
|
-
import "../chunk-
|
|
22
|
+
import "../chunk-OLKM53RL.js";
|
|
23
|
+
import "../chunk-UVTLZV34.js";
|
|
24
24
|
import "../chunk-53W2NRSL.js";
|
|
25
25
|
import "../chunk-NMAXZ3ZY.js";
|
|
26
|
-
import "../chunk-
|
|
27
|
-
import "../chunk-GEQ2QQEE.js";
|
|
26
|
+
import "../chunk-MZ5NRW3K.js";
|
|
28
27
|
import "../chunk-QL6FN2JC.js";
|
|
29
|
-
import "../chunk-3NOV7X4M.js";
|
|
30
|
-
import "../chunk-YO22XLHI.js";
|
|
31
|
-
import "../chunk-JIS4PA3R.js";
|
|
32
28
|
import "../chunk-O7DR57RN.js";
|
|
29
|
+
import "../chunk-GEQ2QQEE.js";
|
|
30
|
+
import "../chunk-JIS4PA3R.js";
|
|
31
|
+
import "../chunk-3NOV7X4M.js";
|
|
33
32
|
import "../chunk-WR6RQKF5.js";
|
|
33
|
+
import "../chunk-YO22XLHI.js";
|
|
34
34
|
import "../chunk-4BHM6WVX.js";
|
|
35
35
|
import "../chunk-U5TPV5X5.js";
|
|
36
36
|
import "../chunk-WWED74SG.js";
|
|
37
37
|
import "../chunk-2DYA3X77.js";
|
|
38
|
-
import "../chunk-FAJ3I2UQ.js";
|
|
39
38
|
import "../chunk-ZKAH3APE.js";
|
|
39
|
+
import "../chunk-FAJ3I2UQ.js";
|
|
40
40
|
import "../chunk-EL672W25.js";
|
|
41
41
|
export {
|
|
42
42
|
advanceOnboarding,
|
|
@@ -10,8 +10,8 @@ import {
|
|
|
10
10
|
getSamlStartUrl
|
|
11
11
|
} from "../chunk-WWED74SG.js";
|
|
12
12
|
import "../chunk-2DYA3X77.js";
|
|
13
|
-
import "../chunk-FAJ3I2UQ.js";
|
|
14
13
|
import "../chunk-ZKAH3APE.js";
|
|
14
|
+
import "../chunk-FAJ3I2UQ.js";
|
|
15
15
|
import "../chunk-EL672W25.js";
|
|
16
16
|
export {
|
|
17
17
|
AUDIT_LOGS_TYPES,
|
|
@@ -7,8 +7,8 @@ import {
|
|
|
7
7
|
} from "../chunk-VCEFZTWS.js";
|
|
8
8
|
import "../chunk-WWED74SG.js";
|
|
9
9
|
import "../chunk-2DYA3X77.js";
|
|
10
|
-
import "../chunk-FAJ3I2UQ.js";
|
|
11
10
|
import "../chunk-ZKAH3APE.js";
|
|
11
|
+
import "../chunk-FAJ3I2UQ.js";
|
|
12
12
|
import "../chunk-EL672W25.js";
|
|
13
13
|
export {
|
|
14
14
|
actions,
|
|
@@ -5,8 +5,8 @@ import {
|
|
|
5
5
|
DEVICE_LIST_DEFAULTS
|
|
6
6
|
} from "../chunk-WWED74SG.js";
|
|
7
7
|
import "../chunk-2DYA3X77.js";
|
|
8
|
-
import "../chunk-FAJ3I2UQ.js";
|
|
9
8
|
import "../chunk-ZKAH3APE.js";
|
|
9
|
+
import "../chunk-FAJ3I2UQ.js";
|
|
10
10
|
import "../chunk-EL672W25.js";
|
|
11
11
|
|
|
12
12
|
// src/organizationSlice/mocks.ts
|
|
@@ -19,8 +19,8 @@ import {
|
|
|
19
19
|
} from "../chunk-3NOV7X4M.js";
|
|
20
20
|
import "../chunk-WWED74SG.js";
|
|
21
21
|
import "../chunk-2DYA3X77.js";
|
|
22
|
-
import "../chunk-FAJ3I2UQ.js";
|
|
23
22
|
import "../chunk-ZKAH3APE.js";
|
|
23
|
+
import "../chunk-FAJ3I2UQ.js";
|
|
24
24
|
import "../chunk-EL672W25.js";
|
|
25
25
|
export {
|
|
26
26
|
getAuditLog,
|
|
@@ -72,11 +72,11 @@ __export(thunks_exports, {
|
|
|
72
72
|
});
|
|
73
73
|
module.exports = __toCommonJS(thunks_exports);
|
|
74
74
|
var import_helpers11 = require("@northern.tech/utils/helpers");
|
|
75
|
-
var
|
|
75
|
+
var import_dayjs3 = __toESM(require("dayjs"), 1);
|
|
76
76
|
var import_utc = __toESM(require("dayjs/plugin/utc.js"), 1);
|
|
77
77
|
var import_jwt_decode = require("jwt-decode");
|
|
78
78
|
var import_md52 = __toESM(require("md5"), 1);
|
|
79
|
-
var
|
|
79
|
+
var import_universal_cookie5 = __toESM(require("universal-cookie"), 1);
|
|
80
80
|
|
|
81
81
|
// src/organizationSlice/index.ts
|
|
82
82
|
var import_toolkit = require("@reduxjs/toolkit");
|
|
@@ -1740,6 +1740,7 @@ var actions_default = {
|
|
|
1740
1740
|
|
|
1741
1741
|
// src/api/general-api.ts
|
|
1742
1742
|
var import_axios = __toESM(require("axios"), 1);
|
|
1743
|
+
var import_universal_cookie2 = __toESM(require("universal-cookie"), 1);
|
|
1743
1744
|
|
|
1744
1745
|
// src/auth.ts
|
|
1745
1746
|
var import_universal_cookie = __toESM(require("universal-cookie"), 1);
|
|
@@ -1752,19 +1753,17 @@ var getSessionInfo = () => {
|
|
|
1752
1753
|
sessionInfo = JSON.parse(window.localStorage.getItem("JWT") ?? "");
|
|
1753
1754
|
} catch {
|
|
1754
1755
|
}
|
|
1756
|
+
const jwtTokenFromCookie = cookies.get("JWT", { doNotParse: true }) ?? "";
|
|
1757
|
+
if (jwtTokenFromCookie) {
|
|
1758
|
+
setSessionInfo({ token: jwtTokenFromCookie });
|
|
1759
|
+
cookies.remove("JWT");
|
|
1760
|
+
cookies.remove("JWT", { path: "/" });
|
|
1761
|
+
return { token: jwtTokenFromCookie, expiresAt: void 0 };
|
|
1762
|
+
}
|
|
1755
1763
|
if (sessionInfo.expiresAt && new Date(sessionInfo.expiresAt) < /* @__PURE__ */ new Date()) {
|
|
1756
1764
|
cleanUp();
|
|
1757
1765
|
return { ...emptySession };
|
|
1758
1766
|
}
|
|
1759
|
-
if (!sessionInfo.token) {
|
|
1760
|
-
const jwtTokenFromCookie = cookies.get("JWT", { doNotParse: true }) ?? "";
|
|
1761
|
-
if (jwtTokenFromCookie) {
|
|
1762
|
-
setSessionInfo({ token: jwtTokenFromCookie });
|
|
1763
|
-
sessionInfo.token = jwtTokenFromCookie;
|
|
1764
|
-
cookies.remove("JWT");
|
|
1765
|
-
cookies.remove("JWT", { path: "/" });
|
|
1766
|
-
}
|
|
1767
|
-
}
|
|
1768
1767
|
sessionInfo.token = sessionInfo.token || "";
|
|
1769
1768
|
tokenCache = sessionInfo.token;
|
|
1770
1769
|
return sessionInfo;
|
|
@@ -1783,8 +1782,13 @@ var cleanUp = () => {
|
|
|
1783
1782
|
};
|
|
1784
1783
|
|
|
1785
1784
|
// src/api/general-api.ts
|
|
1785
|
+
var cookies2 = new import_universal_cookie2.default();
|
|
1786
1786
|
var unauthorizedRedirect = (error) => {
|
|
1787
1787
|
if (!(0, import_axios.isCancel)(error) && error.response?.status === 401 && getToken() && !window.location.pathname.endsWith("/subscription")) {
|
|
1788
|
+
if (cookies2.get("JWT", { doNotParse: true })) {
|
|
1789
|
+
window.location.reload();
|
|
1790
|
+
return Promise.reject(error);
|
|
1791
|
+
}
|
|
1788
1792
|
cleanUp();
|
|
1789
1793
|
window.location.replace("/ui/");
|
|
1790
1794
|
}
|
|
@@ -1837,6 +1841,7 @@ var getIsPreview = (0, import_toolkit9.createSelector)([getFullVersionInformatio
|
|
|
1837
1841
|
// src/commonSelectors.ts
|
|
1838
1842
|
var import_helpers5 = require("@northern.tech/utils/helpers");
|
|
1839
1843
|
var import_toolkit15 = require("@reduxjs/toolkit");
|
|
1844
|
+
var import_dayjs = __toESM(require("dayjs"), 1);
|
|
1840
1845
|
|
|
1841
1846
|
// src/deploymentsSlice/selectors.ts
|
|
1842
1847
|
var import_toolkit10 = require("@reduxjs/toolkit");
|
|
@@ -2209,6 +2214,7 @@ var emptyObject = {};
|
|
|
2209
2214
|
var getRolesById = (state) => state.users.rolesById;
|
|
2210
2215
|
var getTooltipsById = (state) => state.users.tooltips.byId;
|
|
2211
2216
|
var getGlobalSettings = (state) => state.users.globalSettings;
|
|
2217
|
+
var getUserSettingsInitialized = (state) => state.users.userSettingsInitialized;
|
|
2212
2218
|
var getCurrentUserId = (state) => state.users.currentUser;
|
|
2213
2219
|
var getUsersById = (state) => state.users.byId;
|
|
2214
2220
|
var getUsersList = (0, import_toolkit14.createSelector)([getUsersById], (usersById) => Object.values(usersById));
|
|
@@ -2247,6 +2253,7 @@ var getOfflineThresholdSettings = (0, import_toolkit14.createSelector)([getGloba
|
|
|
2247
2253
|
}));
|
|
2248
2254
|
var getRolesList = (0, import_toolkit14.createSelector)([getRolesById], (rolesById2) => Object.entries(rolesById2).map(([value, role]) => ({ value, ...role })));
|
|
2249
2255
|
var getCurrentSession = (state) => state.users.currentSession;
|
|
2256
|
+
var getSecurityAlertDismissedTimestamp = (state) => state.users.userSettings.securityAlertDismissedTimestamp;
|
|
2250
2257
|
|
|
2251
2258
|
// src/commonSelectors.ts
|
|
2252
2259
|
var getIsEnterprise = (0, import_toolkit15.createSelector)(
|
|
@@ -2453,6 +2460,22 @@ var getRelevantRoles = (0, import_toolkit15.createSelector)([getOrganization, ge
|
|
|
2453
2460
|
return accu;
|
|
2454
2461
|
}, roles);
|
|
2455
2462
|
});
|
|
2463
|
+
var getShowSecurityAlert = (0, import_toolkit15.createSelector)(
|
|
2464
|
+
[getCurrentUser, getHas2FA, getFeatures, getIsEnterprise, getUserSettingsInitialized, getSecurityAlertDismissedTimestamp],
|
|
2465
|
+
(currentUser, has2FA, features, isEnterprise, settingsInitialized, dismissedTimestamp) => {
|
|
2466
|
+
const isHosted = features?.isHosted;
|
|
2467
|
+
const canHave2FA = isEnterprise || isHosted;
|
|
2468
|
+
if (!currentUser || !settingsInitialized || has2FA || !canHave2FA) {
|
|
2469
|
+
return false;
|
|
2470
|
+
}
|
|
2471
|
+
if (dismissedTimestamp === null) {
|
|
2472
|
+
return true;
|
|
2473
|
+
}
|
|
2474
|
+
const today = (0, import_dayjs.default)();
|
|
2475
|
+
const dismissedMonthAgo = today.diff(dismissedTimestamp, "months");
|
|
2476
|
+
return dismissedMonthAgo > 0;
|
|
2477
|
+
}
|
|
2478
|
+
);
|
|
2456
2479
|
|
|
2457
2480
|
// src/store.ts
|
|
2458
2481
|
var import_react_redux = require("react-redux");
|
|
@@ -2550,10 +2573,10 @@ var createAppAsyncThunk = import_toolkit16.createAsyncThunk.withTypes();
|
|
|
2550
2573
|
|
|
2551
2574
|
// src/appSlice/thunks.ts
|
|
2552
2575
|
var import_helpers7 = require("@northern.tech/utils/helpers");
|
|
2553
|
-
var
|
|
2554
|
-
var
|
|
2576
|
+
var import_universal_cookie3 = __toESM(require("universal-cookie"), 1);
|
|
2577
|
+
var cookies3 = new import_universal_cookie3.default();
|
|
2555
2578
|
var setFirstLoginAfterSignup = createAppAsyncThunk(`${sliceName2}/setFirstLoginAfterSignup`, (firstLoginAfterSignup, { dispatch }) => {
|
|
2556
|
-
|
|
2579
|
+
cookies3.set("firstLoginAfterSignup", !!firstLoginAfterSignup, { maxAge: 60, path: "/", domain: ".mender.io", sameSite: false });
|
|
2557
2580
|
dispatch(actions2.setFirstLoginAfterSignup(!!firstLoginAfterSignup));
|
|
2558
2581
|
});
|
|
2559
2582
|
var dateFunctionMap = {
|
|
@@ -3974,9 +3997,9 @@ var changeNotificationSetting = createAppAsyncThunk(
|
|
|
3974
3997
|
// src/usersSlice/thunks.ts
|
|
3975
3998
|
var import_helpers10 = require("@northern.tech/utils/helpers");
|
|
3976
3999
|
var import_retrytimer = require("@northern.tech/utils/retrytimer");
|
|
3977
|
-
var
|
|
4000
|
+
var import_dayjs2 = __toESM(require("dayjs"), 1);
|
|
3978
4001
|
var import_md5 = __toESM(require("md5"), 1);
|
|
3979
|
-
var
|
|
4002
|
+
var import_universal_cookie4 = __toESM(require("universal-cookie"), 1);
|
|
3980
4003
|
|
|
3981
4004
|
// src/api/users-api.ts
|
|
3982
4005
|
var import_axios3 = __toESM(require("axios"), 1);
|
|
@@ -3993,7 +4016,7 @@ var Api2 = {
|
|
|
3993
4016
|
var users_api_default = Api2;
|
|
3994
4017
|
|
|
3995
4018
|
// src/usersSlice/thunks.ts
|
|
3996
|
-
var
|
|
4019
|
+
var cookies4 = new import_universal_cookie4.default();
|
|
3997
4020
|
var { setAnnouncement, setSnackbar: setSnackbar4 } = actions_default;
|
|
3998
4021
|
var handleLoginError = (err, { token2fa: has2FA, password }, rejectWithValue) => () => {
|
|
3999
4022
|
const errorText = (0, import_helpers10.extractErrorMessage)(err);
|
|
@@ -4028,7 +4051,7 @@ var loginUser = createAppAsyncThunk(
|
|
|
4028
4051
|
now.setSeconds(now.getSeconds() + import_constants5.maxSessionAge);
|
|
4029
4052
|
const expiresAt = stayLoggedIn ? void 0 : now.toISOString();
|
|
4030
4053
|
setSessionInfo({ token, expiresAt });
|
|
4031
|
-
|
|
4054
|
+
cookies4.remove("JWT", { path: "/" });
|
|
4032
4055
|
return dispatch(getUser(OWN_USER_ID)).unwrap().catch((e) => {
|
|
4033
4056
|
cleanUp();
|
|
4034
4057
|
return Promise.reject(dispatch(setSnackbar4((0, import_helpers10.extractErrorMessage)(e))));
|
|
@@ -4559,7 +4582,7 @@ var saveUserSettings = createAppAsyncThunk(
|
|
|
4559
4582
|
const updatedSettings = {
|
|
4560
4583
|
...userSettings,
|
|
4561
4584
|
...settings,
|
|
4562
|
-
firstLoginTimestamp: userSettings.firstLoginTimestamp ?? (0,
|
|
4585
|
+
firstLoginTimestamp: userSettings.firstLoginTimestamp ?? (0, import_dayjs2.default)().format(),
|
|
4563
4586
|
onboarding: {
|
|
4564
4587
|
...onboardingState,
|
|
4565
4588
|
...settings.onboarding
|
|
@@ -4583,9 +4606,9 @@ var setHideAnnouncement = createAppAsyncThunk(
|
|
|
4583
4606
|
({ shouldHide, userId }, { dispatch, getState }) => {
|
|
4584
4607
|
const currentUserId = userId || getCurrentUser(getState()).id;
|
|
4585
4608
|
const hash = getState().app.hostedAnnouncement ? (0, import_md5.default)(getState().app.hostedAnnouncement) : "";
|
|
4586
|
-
const announceCookie =
|
|
4609
|
+
const announceCookie = cookies4.get(`${currentUserId}${hash}`);
|
|
4587
4610
|
if (shouldHide || hash.length && typeof announceCookie !== "undefined") {
|
|
4588
|
-
|
|
4611
|
+
cookies4.set(`${currentUserId}${hash}`, true, { maxAge: 604800 });
|
|
4589
4612
|
dispatch(setAnnouncement(""));
|
|
4590
4613
|
}
|
|
4591
4614
|
}
|
|
@@ -4638,8 +4661,8 @@ var submitUserFeedback = createAppAsyncThunk(
|
|
|
4638
4661
|
);
|
|
4639
4662
|
|
|
4640
4663
|
// src/organizationSlice/thunks.ts
|
|
4641
|
-
var
|
|
4642
|
-
|
|
4664
|
+
var cookies5 = new import_universal_cookie5.default();
|
|
4665
|
+
import_dayjs3.default.extend(import_utc.default);
|
|
4643
4666
|
var { setAnnouncement: setAnnouncement2, setSnackbar: setSnackbar5 } = actions_default;
|
|
4644
4667
|
var { page: defaultPage4, perPage: defaultPerPage4 } = import_constants5.DEVICE_LIST_DEFAULTS;
|
|
4645
4668
|
var cancelRequest = createAppAsyncThunk(`${sliceName}/cancelRequest`, (reason, { dispatch, getState }) => {
|
|
@@ -4673,9 +4696,9 @@ var createOrganizationTrial = createAppAsyncThunk(`${sliceName}/createOrganizati
|
|
|
4673
4696
|
}
|
|
4674
4697
|
return Promise.reject(err);
|
|
4675
4698
|
}).then(({ headers }) => {
|
|
4676
|
-
|
|
4677
|
-
|
|
4678
|
-
|
|
4699
|
+
cookies5.remove("oauth");
|
|
4700
|
+
cookies5.remove("externalID");
|
|
4701
|
+
cookies5.remove("email");
|
|
4679
4702
|
dispatch(setFirstLoginAfterSignup(true));
|
|
4680
4703
|
return new Promise(
|
|
4681
4704
|
(resolve) => setTimeout(() => {
|
|
@@ -4845,7 +4868,7 @@ var getUserOrganization = createAppAsyncThunk(
|
|
|
4845
4868
|
const jwtData = { addons: jwt["mender.addons"], plan: jwt["mender.plan"], trial: jwt["mender.trial"] };
|
|
4846
4869
|
if (!(0, import_helpers11.deepCompare)({ addons, plan, trial }, jwtData)) {
|
|
4847
4870
|
const hash = (0, import_md52.default)(tenantDataDivergedMessage);
|
|
4848
|
-
|
|
4871
|
+
cookies5.remove(`${jwt.sub}${hash}`);
|
|
4849
4872
|
tasks.push(dispatch(setAnnouncement2(tenantDataDivergedMessage)));
|
|
4850
4873
|
}
|
|
4851
4874
|
return Promise.all(tasks);
|