@oneuptime/common 7.0.3939 → 7.0.3942
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/UI/Utils/Project.ts +53 -10
- package/UI/Utils/SessionStorage.ts +45 -0
- package/UI/Utils/User.ts +2 -0
- package/build/dist/UI/Utils/Project.js +36 -10
- package/build/dist/UI/Utils/Project.js.map +1 -1
- package/build/dist/UI/Utils/SessionStorage.js +33 -0
- package/build/dist/UI/Utils/SessionStorage.js.map +1 -0
- package/build/dist/UI/Utils/User.js +2 -0
- package/build/dist/UI/Utils/User.js.map +1 -1
- package/package.json +2 -2
package/UI/Utils/Project.ts
CHANGED
|
@@ -10,12 +10,40 @@ import Project from "Common/Models/DatabaseModels/Project";
|
|
|
10
10
|
import SubscriptionStatus, {
|
|
11
11
|
SubscriptionStatusUtil,
|
|
12
12
|
} from "../../Types/Billing/SubscriptionStatus";
|
|
13
|
+
import Navigation from "./Navigation";
|
|
14
|
+
import SessionStorage from "./SessionStorage";
|
|
13
15
|
|
|
14
16
|
export default class ProjectUtil {
|
|
17
|
+
public static getCurrentProjectId(): ObjectID | null {
|
|
18
|
+
// if this is not available in the url, check the session storage
|
|
19
|
+
const currentProjectId: string | undefined = SessionStorage.getItem(
|
|
20
|
+
`current_project_id`,
|
|
21
|
+
) as string;
|
|
22
|
+
|
|
23
|
+
if (currentProjectId) {
|
|
24
|
+
return new ObjectID(currentProjectId);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
let projectId: string | undefined = Navigation.getFirstParam(2);
|
|
28
|
+
|
|
29
|
+
if (projectId && projectId.includes(":projectId")) {
|
|
30
|
+
projectId = undefined;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
if (projectId) {
|
|
34
|
+
return new ObjectID(projectId);
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
return null;
|
|
38
|
+
}
|
|
39
|
+
|
|
15
40
|
public static setIsSubscriptionInactive(data: {
|
|
16
41
|
paymentProviderMeteredSubscriptionStatus: SubscriptionStatus;
|
|
17
42
|
paymentProviderSubscriptionStatus: SubscriptionStatus;
|
|
18
43
|
}): boolean {
|
|
44
|
+
const currentProjectId: string | undefined =
|
|
45
|
+
this.getCurrentProjectId()?.toString();
|
|
46
|
+
|
|
19
47
|
const isSubscriptionInactive: boolean =
|
|
20
48
|
SubscriptionStatusUtil.isSubscriptionInactive(
|
|
21
49
|
data.paymentProviderMeteredSubscriptionStatus,
|
|
@@ -25,38 +53,53 @@ export default class ProjectUtil {
|
|
|
25
53
|
);
|
|
26
54
|
|
|
27
55
|
// save this to local storage
|
|
28
|
-
LocalStorage.setItem(
|
|
56
|
+
LocalStorage.setItem(
|
|
57
|
+
currentProjectId?.toString() + "_isSubscriptionInactive",
|
|
58
|
+
isSubscriptionInactive,
|
|
59
|
+
);
|
|
29
60
|
|
|
30
61
|
return isSubscriptionInactive;
|
|
31
62
|
}
|
|
32
63
|
|
|
33
64
|
public static isSubscriptionInactive(): boolean {
|
|
34
|
-
|
|
65
|
+
const currentProjectId: string | undefined =
|
|
66
|
+
this.getCurrentProjectId()?.toString();
|
|
67
|
+
return (
|
|
68
|
+
Boolean(
|
|
69
|
+
LocalStorage.getItem(
|
|
70
|
+
currentProjectId?.toString() + "_isSubscriptionInactive",
|
|
71
|
+
),
|
|
72
|
+
) || false
|
|
73
|
+
);
|
|
35
74
|
}
|
|
36
75
|
|
|
37
76
|
public static getCurrentProject(): Project | null {
|
|
38
|
-
|
|
77
|
+
const currentProjectId: string | undefined =
|
|
78
|
+
this.getCurrentProjectId()?.toString();
|
|
79
|
+
if (!LocalStorage.getItem(`project_${currentProjectId}`)) {
|
|
39
80
|
return null;
|
|
40
81
|
}
|
|
41
82
|
const projectJson: JSONObject = LocalStorage.getItem(
|
|
42
|
-
|
|
83
|
+
`project_${currentProjectId}`,
|
|
43
84
|
) as JSONObject;
|
|
44
85
|
return BaseModel.fromJSON(projectJson, Project) as Project;
|
|
45
86
|
}
|
|
46
87
|
|
|
47
|
-
public static getCurrentProjectId(): ObjectID | null {
|
|
48
|
-
return this.getCurrentProject()?.id || null;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
88
|
public static setCurrentProject(project: JSONObject | Project): void {
|
|
89
|
+
const currentProjectId: string | undefined =
|
|
90
|
+
project._id?.toString() || this.getCurrentProjectId()?.toString();
|
|
52
91
|
if (project instanceof Project) {
|
|
53
92
|
project = BaseModel.toJSON(project, Project);
|
|
54
93
|
}
|
|
55
|
-
LocalStorage.setItem(
|
|
94
|
+
LocalStorage.setItem(`project_${currentProjectId}`, project);
|
|
95
|
+
SessionStorage.setItem(`current_project_id`, currentProjectId);
|
|
56
96
|
}
|
|
57
97
|
|
|
58
98
|
public static clearCurrentProject(): void {
|
|
59
|
-
|
|
99
|
+
const currentProjectId: string | undefined =
|
|
100
|
+
this.getCurrentProjectId()?.toString();
|
|
101
|
+
LocalStorage.setItem(`project_${currentProjectId}`, null);
|
|
102
|
+
SessionStorage.setItem(`current_project_id`, null);
|
|
60
103
|
}
|
|
61
104
|
|
|
62
105
|
public static getCurrentPlan(): PlanType | null {
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import URL from "Common/Types/API/URL";
|
|
2
|
+
import Dictionary from "Common/Types/Dictionary";
|
|
3
|
+
import Email from "Common/Types/Email";
|
|
4
|
+
import { JSONObject, JSONValue } from "Common/Types/JSON";
|
|
5
|
+
import JSONFunctions from "Common/Types/JSONFunctions";
|
|
6
|
+
import Typeof from "Common/Types/Typeof";
|
|
7
|
+
|
|
8
|
+
export default class SessionStorage {
|
|
9
|
+
public static setItem(key: string, value: JSONValue | Email | URL): void {
|
|
10
|
+
if (typeof value === Typeof.Object) {
|
|
11
|
+
// if of type jsonobject.
|
|
12
|
+
value = JSON.stringify(
|
|
13
|
+
JSONFunctions.serializeValue(value as JSONValue) as JSONObject,
|
|
14
|
+
);
|
|
15
|
+
}
|
|
16
|
+
sessionStorage.setItem(key, value as string);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
public static getItem(key: string): JSONValue {
|
|
20
|
+
const value: JSONValue = sessionStorage.getItem(key) as JSONValue;
|
|
21
|
+
|
|
22
|
+
try {
|
|
23
|
+
if (value) {
|
|
24
|
+
return JSONFunctions.deserializeValue(
|
|
25
|
+
JSONFunctions.parse(value?.toString()),
|
|
26
|
+
);
|
|
27
|
+
}
|
|
28
|
+
return value;
|
|
29
|
+
} catch (err) {
|
|
30
|
+
return value;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
public static removeItem(key: string): void {
|
|
35
|
+
return sessionStorage.removeItem(key);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
public static clear(): void {
|
|
39
|
+
sessionStorage.clear();
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
public static getAllItems(): Dictionary<string> {
|
|
43
|
+
return { ...sessionStorage };
|
|
44
|
+
}
|
|
45
|
+
}
|
package/UI/Utils/User.ts
CHANGED
|
@@ -11,6 +11,7 @@ import Timezone from "Common/Types/Timezone";
|
|
|
11
11
|
import API from "Common/Utils/API";
|
|
12
12
|
import Cookie from "./Cookie";
|
|
13
13
|
import CookieName from "Common/Types/CookieName";
|
|
14
|
+
import SessionStorage from "./SessionStorage";
|
|
14
15
|
|
|
15
16
|
export default class UserUtil {
|
|
16
17
|
public static setProfilePicId(id: ObjectID | null): void {
|
|
@@ -172,6 +173,7 @@ export default class UserUtil {
|
|
|
172
173
|
public static async logout(): Promise<void> {
|
|
173
174
|
await API.post(URL.fromString(IDENTITY_URL.toString()).addRoute("/logout"));
|
|
174
175
|
LocalStorage.clear();
|
|
176
|
+
SessionStorage.clear();
|
|
175
177
|
}
|
|
176
178
|
|
|
177
179
|
public static getUtmParams(): Dictionary<string> {
|
|
@@ -2,38 +2,64 @@ import { BILLING_ENABLED, getAllEnvVars } from "../Config";
|
|
|
2
2
|
import LocalStorage from "./LocalStorage";
|
|
3
3
|
import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
|
|
4
4
|
import SubscriptionPlan from "Common/Types/Billing/SubscriptionPlan";
|
|
5
|
+
import ObjectID from "Common/Types/ObjectID";
|
|
5
6
|
import Project from "Common/Models/DatabaseModels/Project";
|
|
6
7
|
import { SubscriptionStatusUtil, } from "../../Types/Billing/SubscriptionStatus";
|
|
8
|
+
import Navigation from "./Navigation";
|
|
9
|
+
import SessionStorage from "./SessionStorage";
|
|
7
10
|
export default class ProjectUtil {
|
|
11
|
+
static getCurrentProjectId() {
|
|
12
|
+
// if this is not available in the url, check the session storage
|
|
13
|
+
const currentProjectId = SessionStorage.getItem(`current_project_id`);
|
|
14
|
+
if (currentProjectId) {
|
|
15
|
+
return new ObjectID(currentProjectId);
|
|
16
|
+
}
|
|
17
|
+
let projectId = Navigation.getFirstParam(2);
|
|
18
|
+
if (projectId && projectId.includes(":projectId")) {
|
|
19
|
+
projectId = undefined;
|
|
20
|
+
}
|
|
21
|
+
if (projectId) {
|
|
22
|
+
return new ObjectID(projectId);
|
|
23
|
+
}
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
8
26
|
static setIsSubscriptionInactive(data) {
|
|
27
|
+
var _a;
|
|
28
|
+
const currentProjectId = (_a = this.getCurrentProjectId()) === null || _a === void 0 ? void 0 : _a.toString();
|
|
9
29
|
const isSubscriptionInactive = SubscriptionStatusUtil.isSubscriptionInactive(data.paymentProviderMeteredSubscriptionStatus) ||
|
|
10
30
|
SubscriptionStatusUtil.isSubscriptionInactive(data.paymentProviderSubscriptionStatus);
|
|
11
31
|
// save this to local storage
|
|
12
|
-
LocalStorage.setItem("
|
|
32
|
+
LocalStorage.setItem((currentProjectId === null || currentProjectId === void 0 ? void 0 : currentProjectId.toString()) + "_isSubscriptionInactive", isSubscriptionInactive);
|
|
13
33
|
return isSubscriptionInactive;
|
|
14
34
|
}
|
|
15
35
|
static isSubscriptionInactive() {
|
|
16
|
-
|
|
36
|
+
var _a;
|
|
37
|
+
const currentProjectId = (_a = this.getCurrentProjectId()) === null || _a === void 0 ? void 0 : _a.toString();
|
|
38
|
+
return (Boolean(LocalStorage.getItem((currentProjectId === null || currentProjectId === void 0 ? void 0 : currentProjectId.toString()) + "_isSubscriptionInactive")) || false);
|
|
17
39
|
}
|
|
18
40
|
static getCurrentProject() {
|
|
19
|
-
|
|
41
|
+
var _a;
|
|
42
|
+
const currentProjectId = (_a = this.getCurrentProjectId()) === null || _a === void 0 ? void 0 : _a.toString();
|
|
43
|
+
if (!LocalStorage.getItem(`project_${currentProjectId}`)) {
|
|
20
44
|
return null;
|
|
21
45
|
}
|
|
22
|
-
const projectJson = LocalStorage.getItem(
|
|
46
|
+
const projectJson = LocalStorage.getItem(`project_${currentProjectId}`);
|
|
23
47
|
return BaseModel.fromJSON(projectJson, Project);
|
|
24
48
|
}
|
|
25
|
-
static getCurrentProjectId() {
|
|
26
|
-
var _a;
|
|
27
|
-
return ((_a = this.getCurrentProject()) === null || _a === void 0 ? void 0 : _a.id) || null;
|
|
28
|
-
}
|
|
29
49
|
static setCurrentProject(project) {
|
|
50
|
+
var _a, _b;
|
|
51
|
+
const currentProjectId = ((_a = project._id) === null || _a === void 0 ? void 0 : _a.toString()) || ((_b = this.getCurrentProjectId()) === null || _b === void 0 ? void 0 : _b.toString());
|
|
30
52
|
if (project instanceof Project) {
|
|
31
53
|
project = BaseModel.toJSON(project, Project);
|
|
32
54
|
}
|
|
33
|
-
LocalStorage.setItem(
|
|
55
|
+
LocalStorage.setItem(`project_${currentProjectId}`, project);
|
|
56
|
+
SessionStorage.setItem(`current_project_id`, currentProjectId);
|
|
34
57
|
}
|
|
35
58
|
static clearCurrentProject() {
|
|
36
|
-
|
|
59
|
+
var _a;
|
|
60
|
+
const currentProjectId = (_a = this.getCurrentProjectId()) === null || _a === void 0 ? void 0 : _a.toString();
|
|
61
|
+
LocalStorage.setItem(`project_${currentProjectId}`, null);
|
|
62
|
+
SessionStorage.setItem(`current_project_id`, null);
|
|
37
63
|
}
|
|
38
64
|
static getCurrentPlan() {
|
|
39
65
|
if (!BILLING_ENABLED) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../../../UI/Utils/Project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,SAAS,MAAM,kEAAkE,CAAC;AACzF,OAAO,gBAEN,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"Project.js","sourceRoot":"","sources":["../../../../UI/Utils/Project.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import JSONFunctions from "Common/Types/JSONFunctions";
|
|
2
|
+
import Typeof from "Common/Types/Typeof";
|
|
3
|
+
export default class SessionStorage {
|
|
4
|
+
static setItem(key, value) {
|
|
5
|
+
if (typeof value === Typeof.Object) {
|
|
6
|
+
// if of type jsonobject.
|
|
7
|
+
value = JSON.stringify(JSONFunctions.serializeValue(value));
|
|
8
|
+
}
|
|
9
|
+
sessionStorage.setItem(key, value);
|
|
10
|
+
}
|
|
11
|
+
static getItem(key) {
|
|
12
|
+
const value = sessionStorage.getItem(key);
|
|
13
|
+
try {
|
|
14
|
+
if (value) {
|
|
15
|
+
return JSONFunctions.deserializeValue(JSONFunctions.parse(value === null || value === void 0 ? void 0 : value.toString()));
|
|
16
|
+
}
|
|
17
|
+
return value;
|
|
18
|
+
}
|
|
19
|
+
catch (err) {
|
|
20
|
+
return value;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
static removeItem(key) {
|
|
24
|
+
return sessionStorage.removeItem(key);
|
|
25
|
+
}
|
|
26
|
+
static clear() {
|
|
27
|
+
sessionStorage.clear();
|
|
28
|
+
}
|
|
29
|
+
static getAllItems() {
|
|
30
|
+
return Object.assign({}, sessionStorage);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
//# sourceMappingURL=SessionStorage.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SessionStorage.js","sourceRoot":"","sources":["../../../../UI/Utils/SessionStorage.ts"],"names":[],"mappings":"AAIA,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,MAAM,MAAM,qBAAqB,CAAC;AAEzC,MAAM,CAAC,OAAO,OAAO,cAAc;IAC1B,MAAM,CAAC,OAAO,CAAC,GAAW,EAAE,KAA8B;QAC/D,IAAI,OAAO,KAAK,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC;YACnC,yBAAyB;YACzB,KAAK,GAAG,IAAI,CAAC,SAAS,CACpB,aAAa,CAAC,cAAc,CAAC,KAAkB,CAAe,CAC/D,CAAC;QACJ,CAAC;QACD,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,KAAe,CAAC,CAAC;IAC/C,CAAC;IAEM,MAAM,CAAC,OAAO,CAAC,GAAW;QAC/B,MAAM,KAAK,GAAc,cAAc,CAAC,OAAO,CAAC,GAAG,CAAc,CAAC;QAElE,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,aAAa,CAAC,gBAAgB,CACnC,aAAa,CAAC,KAAK,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAC,CACvC,CAAC;YACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,UAAU,CAAC,GAAW;QAClC,OAAO,cAAc,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,KAAK;QACjB,cAAc,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,WAAW;QACvB,yBAAY,cAAc,EAAG;IAC/B,CAAC;CACF"}
|
|
@@ -8,6 +8,7 @@ import ObjectID from "Common/Types/ObjectID";
|
|
|
8
8
|
import API from "Common/Utils/API";
|
|
9
9
|
import Cookie from "./Cookie";
|
|
10
10
|
import CookieName from "Common/Types/CookieName";
|
|
11
|
+
import SessionStorage from "./SessionStorage";
|
|
11
12
|
export default class UserUtil {
|
|
12
13
|
static setProfilePicId(id) {
|
|
13
14
|
if (!id) {
|
|
@@ -120,6 +121,7 @@ export default class UserUtil {
|
|
|
120
121
|
static async logout() {
|
|
121
122
|
await API.post(URL.fromString(IDENTITY_URL.toString()).addRoute("/logout"));
|
|
122
123
|
LocalStorage.clear();
|
|
124
|
+
SessionStorage.clear();
|
|
123
125
|
}
|
|
124
126
|
static getUtmParams() {
|
|
125
127
|
const localStorageItems = LocalStorage.getAllItems();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../UI/Utils/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,GAAG,MAAM,sBAAsB,CAAC;AAEvC,OAAO,KAAK,MAAM,oBAAoB,CAAC;AACvC,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AAEvE,OAAO,IAAI,MAAM,mBAAmB,CAAC;AACrC,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAE7C,OAAO,GAAG,MAAM,kBAAkB,CAAC;AACnC,OAAO,MAAM,MAAM,UAAU,CAAC;AAC9B,OAAO,UAAU,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../../../UI/Utils/User.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/common",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3942",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"airtable": "^0.12.2",
|
|
78
78
|
"axios": "^1.7.2",
|
|
79
79
|
"bullmq": "^5.3.3",
|
|
80
|
-
"Common": "npm:@oneuptime/common@7.0.
|
|
80
|
+
"Common": "npm:@oneuptime/common@7.0.3942",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|