@oneuptime/common 7.0.3129 → 7.0.3140
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/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.ts +1 -1
- package/Models/AnalyticsModels/Index.ts +28 -1
- package/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.ts +4 -0
- package/Models/DatabaseModels/Incident.ts +5 -0
- package/Models/DatabaseModels/Index.ts +35 -1
- package/Server/Middleware/ProjectAuthorization.ts +5 -3
- package/Server/Middleware/UserAuthorization.ts +32 -5
- package/Server/Services/AccessTokenService.ts +10 -154
- package/Server/Services/AnalyticsDatabaseService.ts +2 -2
- package/Server/Services/DatabaseService.ts +77 -4
- package/Server/Services/StatusPageService.ts +1 -1
- package/Server/Types/Permission/PermissionNamespace.ts +6 -0
- package/Server/Utils/APIKey/AccessPermission.ts +111 -0
- package/Server/Utils/Cookie.ts +15 -1
- package/Server/Utils/Monitor/MonitorResource.ts +57 -23
- package/Server/Utils/Realtime.ts +288 -79
- package/Server/Utils/UserPermission/UserPermission.ts +81 -0
- package/Tests/Server/Middleware/ProjectAuthorization.test.ts +3 -3
- package/Tests/Server/Middleware/UserAuthorization.test.ts +14 -10
- package/Tests/Server/Services/ScheduledMaintenanceService.test.ts +4 -2
- package/Tests/Server/Utils/Cookie.test.ts +1 -1
- package/Types/Database/TableMetadata.ts +5 -0
- package/Types/Realtime/EnableRealtimeEventsOn.ts +5 -0
- package/Types/Realtime/EventName.ts +5 -0
- package/Types/Realtime/ListenToModelEventJSON.ts +10 -0
- package/Types/Realtime/ModelEventType.ts +7 -0
- package/UI/Components/HeaderAlert/HeaderModelAlert.tsx +1 -1
- package/UI/Components/ModelList/ModelList.tsx +1 -1
- package/UI/Components/ModelTable/BaseModelTable.tsx +1 -1
- package/UI/Utils/Realtime.ts +28 -19
- package/Utils/Realtime.ts +10 -29
- package/build/dist/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel.js.map +1 -1
- package/build/dist/Models/AnalyticsModels/Index.js +14 -0
- package/build/dist/Models/AnalyticsModels/Index.js.map +1 -1
- package/build/dist/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel.js.map +1 -1
- package/build/dist/Models/DatabaseModels/Incident.js +5 -0
- package/build/dist/Models/DatabaseModels/Incident.js.map +1 -1
- package/build/dist/Models/DatabaseModels/Index.js +16 -1
- package/build/dist/Models/DatabaseModels/Index.js.map +1 -1
- package/build/dist/Server/Middleware/ProjectAuthorization.js +3 -3
- package/build/dist/Server/Middleware/ProjectAuthorization.js.map +1 -1
- package/build/dist/Server/Middleware/UserAuthorization.js +13 -5
- package/build/dist/Server/Middleware/UserAuthorization.js.map +1 -1
- package/build/dist/Server/Services/AccessTokenService.js +6 -108
- package/build/dist/Server/Services/AccessTokenService.js.map +1 -1
- package/build/dist/Server/Services/AnalyticsDatabaseService.js +2 -2
- package/build/dist/Server/Services/AnalyticsDatabaseService.js.map +1 -1
- package/build/dist/Server/Services/DatabaseService.js +43 -4
- package/build/dist/Server/Services/DatabaseService.js.map +1 -1
- package/build/dist/Server/Services/StatusPageService.js +1 -1
- package/build/dist/Server/Services/StatusPageService.js.map +1 -1
- package/build/dist/Server/Types/Permission/PermissionNamespace.js +7 -0
- package/build/dist/Server/Types/Permission/PermissionNamespace.js.map +1 -0
- package/build/dist/Server/Utils/APIKey/AccessPermission.js +78 -0
- package/build/dist/Server/Utils/APIKey/AccessPermission.js.map +1 -0
- package/build/dist/Server/Utils/Cookie.js +11 -1
- package/build/dist/Server/Utils/Cookie.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/MonitorResource.js +58 -32
- package/build/dist/Server/Utils/Monitor/MonitorResource.js.map +1 -1
- package/build/dist/Server/Utils/Realtime.js +181 -51
- package/build/dist/Server/Utils/Realtime.js.map +1 -1
- package/build/dist/Server/Utils/UserPermission/UserPermission.js +47 -0
- package/build/dist/Server/Utils/UserPermission/UserPermission.js.map +1 -0
- package/build/dist/Tests/Server/Middleware/ProjectAuthorization.test.js +3 -3
- package/build/dist/Tests/Server/Middleware/ProjectAuthorization.test.js.map +1 -1
- package/build/dist/Tests/Server/Middleware/UserAuthorization.test.js +9 -8
- package/build/dist/Tests/Server/Middleware/UserAuthorization.test.js.map +1 -1
- package/build/dist/Tests/Server/Services/ScheduledMaintenanceService.test.js +2 -2
- package/build/dist/Tests/Server/Services/ScheduledMaintenanceService.test.js.map +1 -1
- package/build/dist/Tests/Server/Utils/Cookie.test.js +1 -1
- package/build/dist/Tests/Server/Utils/Cookie.test.js.map +1 -1
- package/build/dist/Types/Database/TableMetadata.js +3 -0
- package/build/dist/Types/Database/TableMetadata.js.map +1 -1
- package/build/dist/Types/Realtime/EnableRealtimeEventsOn.js +2 -0
- package/build/dist/Types/Realtime/EnableRealtimeEventsOn.js.map +1 -0
- package/build/dist/Types/Realtime/EventName.js +6 -0
- package/build/dist/Types/Realtime/EventName.js.map +1 -0
- package/build/dist/Types/Realtime/ListenToModelEventJSON.js +2 -0
- package/build/dist/Types/Realtime/ListenToModelEventJSON.js.map +1 -0
- package/build/dist/Types/Realtime/ModelEventType.js +8 -0
- package/build/dist/Types/Realtime/ModelEventType.js.map +1 -0
- package/build/dist/UI/Utils/Realtime.js +17 -11
- package/build/dist/UI/Utils/Realtime.js.map +1 -1
- package/build/dist/Utils/Realtime.js +6 -12
- package/build/dist/Utils/Realtime.js.map +1 -1
- package/package.json +2 -2
- package/Models/Permissions/Permission.ts +0 -0
- package/build/dist/Models/Permissions/Permission.js +0 -2
- package/build/dist/Models/Permissions/Permission.js.map +0 -1
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import Permission from "../../../Types/Permission";
|
|
2
|
+
import GlobalCache from "../../Infrastructure/GlobalCache";
|
|
3
|
+
import PermissionNamespace from "../../Types/Permission/PermissionNamespace";
|
|
4
|
+
export default class UserPermissionUtil {
|
|
5
|
+
static async getUserTenantAccessPermissionFromCache(userId, projectId) {
|
|
6
|
+
const json = (await GlobalCache.getJSONObject(PermissionNamespace.ProjectPermission, userId.toString() + projectId.toString()));
|
|
7
|
+
if (json) {
|
|
8
|
+
json._type = "UserTenantAccessPermission";
|
|
9
|
+
}
|
|
10
|
+
if (!json) {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
return json;
|
|
14
|
+
}
|
|
15
|
+
static async getUserGlobalAccessPermissionFromCache(userId) {
|
|
16
|
+
const json = await GlobalCache.getJSONObject("user", userId.toString());
|
|
17
|
+
if (!json) {
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
const accessPermission = json;
|
|
21
|
+
accessPermission._type = "UserGlobalAccessPermission";
|
|
22
|
+
return accessPermission;
|
|
23
|
+
}
|
|
24
|
+
static getDefaultUserTenantAccessPermission(projectId) {
|
|
25
|
+
const userPermissions = [];
|
|
26
|
+
userPermissions.push({
|
|
27
|
+
permission: Permission.CurrentUser,
|
|
28
|
+
labelIds: [],
|
|
29
|
+
isBlockPermission: false,
|
|
30
|
+
_type: "UserPermission",
|
|
31
|
+
});
|
|
32
|
+
userPermissions.push({
|
|
33
|
+
permission: Permission.UnAuthorizedSsoUser,
|
|
34
|
+
labelIds: [],
|
|
35
|
+
isBlockPermission: false,
|
|
36
|
+
_type: "UserPermission",
|
|
37
|
+
});
|
|
38
|
+
const permission = {
|
|
39
|
+
projectId,
|
|
40
|
+
permissions: userPermissions,
|
|
41
|
+
isBlockPermission: false,
|
|
42
|
+
_type: "UserTenantAccessPermission",
|
|
43
|
+
};
|
|
44
|
+
return permission;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=UserPermission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UserPermission.js","sourceRoot":"","sources":["../../../../../Server/Utils/UserPermission/UserPermission.ts"],"names":[],"mappings":"AAEA,OAAO,UAIN,MAAM,2BAA2B,CAAC;AACnC,OAAO,WAAW,MAAM,kCAAkC,CAAC;AAC3D,OAAO,mBAAmB,MAAM,4CAA4C,CAAC;AAE7E,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAC9B,MAAM,CAAC,KAAK,CAAC,sCAAsC,CACxD,MAAgB,EAChB,SAAmB;QAEnB,MAAM,IAAI,GACR,CAAC,MAAM,WAAW,CAAC,aAAa,CAC9B,mBAAmB,CAAC,iBAAiB,EACrC,MAAM,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC,QAAQ,EAAE,CACzC,CAA+B,CAAC;QAEnC,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,CAAC,KAAK,GAAG,4BAA4B,CAAC;QAC5C,CAAC;QAED,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,sCAAsC,CACxD,MAAgB;QAEhB,MAAM,IAAI,GAAsB,MAAM,WAAW,CAAC,aAAa,CAC7D,MAAM,EACN,MAAM,CAAC,QAAQ,EAAE,CAClB,CAAC;QAEF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,gBAAgB,GACpB,IAAkC,CAAC;QAErC,gBAAgB,CAAC,KAAK,GAAG,4BAA4B,CAAC;QAEtD,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAEM,MAAM,CAAC,oCAAoC,CAChD,SAAmB;QAEnB,MAAM,eAAe,GAA0B,EAAE,CAAC;QAElD,eAAe,CAAC,IAAI,CAAC;YACnB,UAAU,EAAE,UAAU,CAAC,WAAW;YAClC,QAAQ,EAAE,EAAE;YACZ,iBAAiB,EAAE,KAAK;YACxB,KAAK,EAAE,gBAAgB;SACxB,CAAC,CAAC;QAEH,eAAe,CAAC,IAAI,CAAC;YACnB,UAAU,EAAE,UAAU,CAAC,mBAAmB;YAC1C,QAAQ,EAAE,EAAE;YACZ,iBAAiB,EAAE,KAAK;YACxB,KAAK,EAAE,gBAAgB;SACxB,CAAC,CAAC;QAEH,MAAM,UAAU,GAA+B;YAC7C,SAAS;YACT,WAAW,EAAE,eAAe;YAC5B,iBAAiB,EAAE,KAAK;YACxB,KAAK,EAAE,4BAA4B;SACpC,CAAC;QAEF,OAAO,UAAU,CAAC;IACpB,CAAC;CACF"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import ProjectMiddleware from "../../../Server/Middleware/ProjectAuthorization";
|
|
2
|
-
import AccessTokenService from "../../../Server/Services/AccessTokenService";
|
|
3
2
|
import ApiKeyService from "../../../Server/Services/ApiKeyService";
|
|
4
3
|
import GlobalConfigService from "../../../Server/Services/GlobalConfigService";
|
|
5
4
|
import QueryHelper from "../../../Server/Types/Database/QueryHelper";
|
|
@@ -11,6 +10,7 @@ import { describe, expect, afterEach, jest } from "@jest/globals";
|
|
|
11
10
|
import getJestMockFunction from "Common/Tests/MockType";
|
|
12
11
|
import { getJestSpyOn } from "Common/Tests/Spy";
|
|
13
12
|
import { TestDatabaseMock } from "../TestingUtils/__mocks__/TestDatabase.mock";
|
|
13
|
+
import APIKeyAccessPermission from "../../../Server/Utils/APIKey/AccessPermission";
|
|
14
14
|
jest.mock("../../../Server/Services/ApiKeyService");
|
|
15
15
|
jest.mock("../../../Server/Services/AccessTokenService");
|
|
16
16
|
describe("ProjectMiddleware", () => {
|
|
@@ -150,7 +150,7 @@ describe("ProjectMiddleware", () => {
|
|
|
150
150
|
});
|
|
151
151
|
test("should call Response.sendErrorResponse when apiKeyModel is not null but getApiTenantAccessPermission returned null", async () => {
|
|
152
152
|
jest.spyOn(ApiKeyService, "findOneBy").mockResolvedValue(mockedApiModel);
|
|
153
|
-
const spyGetApiTenantAccessPermission = getJestSpyOn(
|
|
153
|
+
const spyGetApiTenantAccessPermission = getJestSpyOn(APIKeyAccessPermission, "getApiTenantAccessPermission").mockImplementationOnce(getJestMockFunction().mockResolvedValue(null));
|
|
154
154
|
await ProjectMiddleware.isValidProjectIdAndApiKeyMiddleware(req, res, next);
|
|
155
155
|
expect(spyGetApiTenantAccessPermission).toHaveBeenCalled();
|
|
156
156
|
// check first param of next
|
|
@@ -159,7 +159,7 @@ describe("ProjectMiddleware", () => {
|
|
|
159
159
|
test("should call function 'next' when apiKeyModel is not null and getApiTenantAccessPermission returned userTenantAccessPermission", async () => {
|
|
160
160
|
const mockedUserTenantAccessPermission = {};
|
|
161
161
|
jest.spyOn(ApiKeyService, "findOneBy").mockResolvedValue(mockedApiModel);
|
|
162
|
-
const spyGetApiTenantAccessPermission = getJestSpyOn(
|
|
162
|
+
const spyGetApiTenantAccessPermission = getJestSpyOn(APIKeyAccessPermission, "getApiTenantAccessPermission").mockResolvedValue(mockedUserTenantAccessPermission);
|
|
163
163
|
await ProjectMiddleware.isValidProjectIdAndApiKeyMiddleware(req, res, next);
|
|
164
164
|
expect(spyGetApiTenantAccessPermission).toHaveBeenCalled();
|
|
165
165
|
expect(next).toHaveBeenCalled();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectAuthorization.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Middleware/ProjectAuthorization.test.ts"],"names":[],"mappings":"AAAA,OAAO,iBAAiB,MAAM,iDAAiD,CAAC;AAChF,OAAO,
|
|
1
|
+
{"version":3,"file":"ProjectAuthorization.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Middleware/ProjectAuthorization.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ import ObjectID from "Common/Types/ObjectID";
|
|
|
15
15
|
import { describe, expect, beforeEach, test, afterEach, jest, } from "@jest/globals";
|
|
16
16
|
import { getJestSpyOn } from "Common/Tests/Spy";
|
|
17
17
|
import getJestMockFunction from "Common/Tests/MockType";
|
|
18
|
+
import UserPermissionUtil from "../../../Server/Utils/UserPermission/UserPermission";
|
|
18
19
|
jest.mock("../../../Server/Utils/Logger");
|
|
19
20
|
jest.mock("../../../Server/Middleware/ProjectAuthorization");
|
|
20
21
|
jest.mock("../../../Server/Utils/JsonWebToken");
|
|
@@ -32,13 +33,13 @@ describe("UserMiddleware", () => {
|
|
|
32
33
|
beforeEach(() => {
|
|
33
34
|
jest.clearAllMocks();
|
|
34
35
|
});
|
|
35
|
-
describe("
|
|
36
|
+
describe("getAccessTokenFromExpressRequest", () => {
|
|
36
37
|
test("should return access token when authorization token is passed in the cookie", () => {
|
|
37
38
|
const req = {
|
|
38
39
|
cookies: { "user-token": mockedAccessToken },
|
|
39
40
|
query: {},
|
|
40
41
|
};
|
|
41
|
-
const result = UserMiddleware.
|
|
42
|
+
const result = UserMiddleware.getAccessTokenFromExpressRequest(req);
|
|
42
43
|
expect(result).toEqual(mockedAccessToken);
|
|
43
44
|
});
|
|
44
45
|
test("should return null when authorization nor accessToken is passed", () => {
|
|
@@ -47,7 +48,7 @@ describe("UserMiddleware", () => {
|
|
|
47
48
|
headers: {},
|
|
48
49
|
query: {},
|
|
49
50
|
};
|
|
50
|
-
const result = UserMiddleware.
|
|
51
|
+
const result = UserMiddleware.getAccessTokenFromExpressRequest(req);
|
|
51
52
|
expect(result).toBeUndefined();
|
|
52
53
|
});
|
|
53
54
|
});
|
|
@@ -161,7 +162,7 @@ describe("UserMiddleware", () => {
|
|
|
161
162
|
beforeAll(() => {
|
|
162
163
|
getJestSpyOn(ProjectMiddleware, "getProjectId").mockReturnValue(projectId);
|
|
163
164
|
getJestSpyOn(ProjectMiddleware, "hasApiKey").mockReturnValue(false);
|
|
164
|
-
getJestSpyOn(UserMiddleware, "
|
|
165
|
+
getJestSpyOn(UserMiddleware, "getAccessTokenFromExpressRequest").mockReturnValue(mockedAccessToken);
|
|
165
166
|
getJestSpyOn(JSONWebToken, "decode").mockReturnValue(jwtTokenData);
|
|
166
167
|
getJestSpyOn(HashedString, "hashValue").mockResolvedValue(hashValue);
|
|
167
168
|
});
|
|
@@ -175,13 +176,13 @@ describe("UserMiddleware", () => {
|
|
|
175
176
|
});
|
|
176
177
|
test("should call isValidProjectIdAndApiKeyMiddleware and return when hasApiKey returns true", async () => {
|
|
177
178
|
getJestSpyOn(ProjectMiddleware, "hasApiKey").mockReturnValueOnce(true);
|
|
178
|
-
const spyGetAccessToken = getJestSpyOn(UserMiddleware, "
|
|
179
|
+
const spyGetAccessToken = getJestSpyOn(UserMiddleware, "getAccessTokenFromExpressRequest");
|
|
179
180
|
await UserMiddleware.getUserMiddleware(req, res, next);
|
|
180
181
|
expect(ProjectMiddleware.isValidProjectIdAndApiKeyMiddleware).toHaveBeenCalledWith(req, res, next);
|
|
181
182
|
expect(spyGetAccessToken).not.toHaveBeenCalled();
|
|
182
183
|
});
|
|
183
|
-
test("should call function 'next' and return, when
|
|
184
|
-
const spyGetAccessToken = getJestSpyOn(UserMiddleware, "
|
|
184
|
+
test("should call function 'next' and return, when getAccessTokenFromExpressRequest returns a null value", async () => {
|
|
185
|
+
const spyGetAccessToken = getJestSpyOn(UserMiddleware, "getAccessTokenFromExpressRequest").mockReturnValueOnce(undefined);
|
|
185
186
|
await UserMiddleware.getUserMiddleware(req, res, next);
|
|
186
187
|
expect(next).toHaveBeenCalled();
|
|
187
188
|
expect(spyGetAccessToken).toHaveBeenCalledWith(req);
|
|
@@ -372,7 +373,7 @@ describe("UserMiddleware", () => {
|
|
|
372
373
|
spyFindBy.mockResolvedValueOnce([
|
|
373
374
|
Object.assign(Object.assign({}, mockedProject), { requireSsoForLogin: true }),
|
|
374
375
|
]);
|
|
375
|
-
const spyGetDefaultUserTenantAccessPermission = getJestSpyOn(
|
|
376
|
+
const spyGetDefaultUserTenantAccessPermission = getJestSpyOn(UserPermissionUtil, "getDefaultUserTenantAccessPermission").mockReturnValueOnce(mockedUserTenantAccessPermission);
|
|
376
377
|
const result = await UserMiddleware.getUserTenantAccessPermissionForMultiTenant(req, userId, [projectId]);
|
|
377
378
|
expect(result).toEqual({
|
|
378
379
|
[projectId.toString()]: mockedUserTenantAccessPermission,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserAuthorization.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Middleware/UserAuthorization.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"UserAuthorization.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Middleware/UserAuthorization.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ describe("ScheduledMaintenanceService", () => {
|
|
|
74
74
|
},
|
|
75
75
|
});
|
|
76
76
|
expect(ongoingState).not.toBeNull();
|
|
77
|
-
jest.spyOn(ScheduledMaintenanceService, "
|
|
77
|
+
jest.spyOn(ScheduledMaintenanceService, "onTriggerWorkflow");
|
|
78
78
|
await ScheduledMaintenanceService.changeScheduledMaintenanceState({
|
|
79
79
|
projectId: project.id,
|
|
80
80
|
scheduledMaintenanceId: maintenance.id,
|
|
@@ -88,7 +88,7 @@ describe("ScheduledMaintenanceService", () => {
|
|
|
88
88
|
},
|
|
89
89
|
});
|
|
90
90
|
// Assert triggering workflows only once
|
|
91
|
-
expect(ScheduledMaintenanceService.
|
|
91
|
+
expect(ScheduledMaintenanceService.onTriggerWorkflow).toHaveBeenCalledTimes(1);
|
|
92
92
|
});
|
|
93
93
|
});
|
|
94
94
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ScheduledMaintenanceService.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Services/ScheduledMaintenanceService.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ScheduledMaintenanceService.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Services/ScheduledMaintenanceService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ describe("CookieUtils", () => {
|
|
|
26
26
|
const cookieName = "testName";
|
|
27
27
|
const cookieValue = "testValue";
|
|
28
28
|
mockRequest.cookies[cookieName] = cookieValue;
|
|
29
|
-
const value = CookieUtil.
|
|
29
|
+
const value = CookieUtil.getCookieFromExpressRequest(mockRequest, cookieName);
|
|
30
30
|
expect(value).toBe(value);
|
|
31
31
|
});
|
|
32
32
|
test("Should remove a cookie", () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cookie.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Utils/Cookie.test.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,8BAA8B,CAAC;AAItD,OAAO,QAAQ,MAAM,uBAAuB,CAAC;AAE7C,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,WAA2B,CAAC;IAChC,IAAI,YAA6B,CAAC;IAElC,UAAU,CAAC,GAAG,EAAE;QACd,WAAW,GAAG;YACZ,OAAO,EAAE,EAAE;SACM,CAAC;QAEpB,YAAY,GAAG,EAAqB,CAAC;IACvC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAC/B,MAAM,MAAM,GAAe;YACzB,IAAI,EAAE,UAAU;YAChB,KAAK,EAAE,WAAW;YAClB,OAAO,EAAE,EAAE;SACZ,CAAC;QAEF,YAAY,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAChC,UAAU,CAAC,SAAS,CAClB,YAAY,EACZ,MAAM,CAAC,MAAM,CAAW,EACxB,MAAM,CAAC,OAAO,CAAW,EACzB,MAAM,CAAC,SAAS,CAAe,CAChC,CAAC;QAEF,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAC9C,MAAM,CAAC,MAAM,CAAW,EACxB,MAAM,CAAC,OAAO,CAAW,EACzB,MAAM,CAAC,SAAS,CAAe,CAChC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAClC,MAAM,UAAU,GAAW,UAAU,CAAC;QACtC,MAAM,WAAW,GAAW,WAAW,CAAC;QAExC,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,WAAW,CAAC;QAC9C,MAAM,KAAK,GAAuB,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"Cookie.test.js","sourceRoot":"","sources":["../../../../../Tests/Server/Utils/Cookie.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,9 @@ export default (props) => {
|
|
|
5
5
|
ctr.prototype.icon = props.icon;
|
|
6
6
|
ctr.prototype.tableDescription = props.tableDescription;
|
|
7
7
|
ctr.prototype.pluralName = props.pluralName;
|
|
8
|
+
if (props.enableRealtimeEventsOn) {
|
|
9
|
+
ctr.prototype.enableRealtimeEventsOn = props.enableRealtimeEventsOn;
|
|
10
|
+
}
|
|
8
11
|
};
|
|
9
12
|
};
|
|
10
13
|
//# sourceMappingURL=TableMetadata.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TableMetadata.js","sourceRoot":"","sources":["../../../../Types/Database/TableMetadata.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TableMetadata.js","sourceRoot":"","sources":["../../../../Types/Database/TableMetadata.ts"],"names":[],"mappings":"AAIA,eAAe,CAAC,KAOf,EAAE,EAAE;IACH,OAAO,CAAC,GAAoB,EAAE,EAAE;QAC9B,GAAG,CAAC,SAAS,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC;QAChD,GAAG,CAAC,SAAS,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;QAC1C,GAAG,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;QAChC,GAAG,CAAC,SAAS,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC;QACxD,GAAG,CAAC,SAAS,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,CAAC;QAC5C,IAAI,KAAK,CAAC,sBAAsB,EAAE,CAAC;YACjC,GAAG,CAAC,SAAS,CAAC,sBAAsB,GAAG,KAAK,CAAC,sBAAsB,CAAC;QACtE,CAAC;IACH,CAAC,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EnableRealtimeEventsOn.js","sourceRoot":"","sources":["../../../../Types/Realtime/EnableRealtimeEventsOn.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"EventName.js","sourceRoot":"","sources":["../../../../Types/Realtime/EventName.ts"],"names":[],"mappings":"AAAA,IAAK,SAEJ;AAFD,WAAK,SAAS;IACZ,sDAAyC,CAAA;AAC3C,CAAC,EAFI,SAAS,KAAT,SAAS,QAEb;AAED,eAAe,SAAS,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ListenToModelEventJSON.js","sourceRoot":"","sources":["../../../../Types/Realtime/ListenToModelEventJSON.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
var ModelEventType;
|
|
2
|
+
(function (ModelEventType) {
|
|
3
|
+
ModelEventType["Create"] = "Create";
|
|
4
|
+
ModelEventType["Update"] = "Update";
|
|
5
|
+
ModelEventType["Delete"] = "Delete";
|
|
6
|
+
})(ModelEventType || (ModelEventType = {}));
|
|
7
|
+
export default ModelEventType;
|
|
8
|
+
//# sourceMappingURL=ModelEventType.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ModelEventType.js","sourceRoot":"","sources":["../../../../Types/Realtime/ModelEventType.ts"],"names":[],"mappings":"AAAA,IAAK,cAIJ;AAJD,WAAK,cAAc;IACjB,mCAAiB,CAAA;IACjB,mCAAiB,CAAA;IACjB,mCAAiB,CAAA;AACnB,CAAC,EAJI,cAAc,KAAd,cAAc,QAIlB;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { HOST, HTTP_PROTOCOL } from "../Config";
|
|
2
2
|
import AnalyticsBaseModel from "Common/Models/AnalyticsModels/AnalyticsBaseModel/AnalyticsBaseModel";
|
|
3
|
-
import BaseModel from "Common/Models/DatabaseModels/DatabaseBaseModel/DatabaseBaseModel";
|
|
4
3
|
import { RealtimeRoute } from "Common/ServiceRoute";
|
|
5
4
|
import URL from "Common/Types/API/URL";
|
|
6
5
|
import DatabaseType from "Common/Types/BaseDatabase/DatabaseType";
|
|
7
|
-
import
|
|
8
|
-
import RealtimeUtil
|
|
6
|
+
import ObjectID from "Common/Types/ObjectID";
|
|
7
|
+
import RealtimeUtil from "Common/Utils/Realtime";
|
|
9
8
|
import SocketIO from "socket.io-client";
|
|
10
|
-
|
|
9
|
+
import EventName from "../../Types/Realtime/EventName";
|
|
10
|
+
export default class Realtime {
|
|
11
11
|
static init() {
|
|
12
12
|
const socket = SocketIO(new URL(HTTP_PROTOCOL, HOST).toString(), {
|
|
13
13
|
path: RealtimeRoute.toString(),
|
|
@@ -19,18 +19,23 @@ export default class Reatime {
|
|
|
19
19
|
if (!this.socket) {
|
|
20
20
|
this.init();
|
|
21
21
|
}
|
|
22
|
+
if (!listenToModelEvent.tenantId) {
|
|
23
|
+
return () => {
|
|
24
|
+
// Do nothing.
|
|
25
|
+
};
|
|
26
|
+
}
|
|
22
27
|
const listenToModelEventJSON = {
|
|
23
28
|
eventType: listenToModelEvent.eventType,
|
|
24
29
|
modelType: DatabaseType.Database,
|
|
25
30
|
modelName: listenToModelEvent.modelType.name,
|
|
26
|
-
query: JSONFunctions.serialize(listenToModelEvent.query),
|
|
27
31
|
tenantId: listenToModelEvent.tenantId.toString(),
|
|
28
|
-
select: JSONFunctions.serialize(listenToModelEvent.select),
|
|
29
32
|
};
|
|
30
33
|
this.emit(EventName.ListenToModalEvent, listenToModelEventJSON);
|
|
31
34
|
const roomId = RealtimeUtil.getRoomId(listenToModelEvent.tenantId, listenToModelEvent.modelType.name, listenToModelEvent.eventType);
|
|
32
|
-
this.socket.on(roomId, (
|
|
33
|
-
|
|
35
|
+
this.socket.on(roomId, (data) => {
|
|
36
|
+
var _a;
|
|
37
|
+
const id = ObjectID.fromString((_a = data["modelId"]) === null || _a === void 0 ? void 0 : _a.toString());
|
|
38
|
+
onEvent(id);
|
|
34
39
|
});
|
|
35
40
|
// Stop listening to the event.
|
|
36
41
|
const stopListening = () => {
|
|
@@ -46,12 +51,13 @@ export default class Reatime {
|
|
|
46
51
|
eventType: listenToModelEvent.eventType,
|
|
47
52
|
modelType: DatabaseType.AnalyticsDatabase,
|
|
48
53
|
modelName: listenToModelEvent.modelType.name,
|
|
49
|
-
query: JSONFunctions.serialize(listenToModelEvent.query),
|
|
50
54
|
tenantId: listenToModelEvent.tenantId.toString(),
|
|
51
|
-
select: JSONFunctions.serialize(listenToModelEvent.select),
|
|
52
55
|
};
|
|
53
56
|
this.emit(EventName.ListenToModalEvent, listenToModelEventJSON);
|
|
54
|
-
|
|
57
|
+
let roomId = RealtimeUtil.getRoomId(listenToModelEvent.tenantId, listenToModelEvent.modelType.name, listenToModelEvent.eventType);
|
|
58
|
+
if (listenToModelEvent.modelId) {
|
|
59
|
+
roomId = RealtimeUtil.getRoomId(listenToModelEvent.tenantId, listenToModelEvent.modelType.name, listenToModelEvent.eventType, listenToModelEvent.modelId);
|
|
60
|
+
}
|
|
55
61
|
this.socket.on(roomId, (model) => {
|
|
56
62
|
onEvent(AnalyticsBaseModel.fromJSON(model, listenToModelEvent.modelType));
|
|
57
63
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Realtime.js","sourceRoot":"","sources":["../../../../UI/Utils/Realtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"Realtime.js","sourceRoot":"","sources":["../../../../UI/Utils/Realtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
export var EventName;
|
|
2
|
-
(function (EventName) {
|
|
3
|
-
EventName["ListenToModalEvent"] = "ListenToModelEvent";
|
|
4
|
-
})(EventName || (EventName = {}));
|
|
5
|
-
export var ModelEventType;
|
|
6
|
-
(function (ModelEventType) {
|
|
7
|
-
ModelEventType["Create"] = "Create";
|
|
8
|
-
ModelEventType["Update"] = "Update";
|
|
9
|
-
ModelEventType["Delete"] = "Delete";
|
|
10
|
-
})(ModelEventType || (ModelEventType = {}));
|
|
11
1
|
export default class RealtimeUtil {
|
|
12
|
-
static getRoomId(tenantId, modelName, eventType) {
|
|
13
|
-
|
|
2
|
+
static getRoomId(tenantId, modelName, eventType, modelId) {
|
|
3
|
+
const roomId = tenantId.toString() + "-" + modelName + "-" + eventType;
|
|
4
|
+
if (modelId) {
|
|
5
|
+
return roomId + "-" + modelId;
|
|
6
|
+
}
|
|
7
|
+
return roomId;
|
|
14
8
|
}
|
|
15
9
|
}
|
|
16
10
|
//# sourceMappingURL=Realtime.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Realtime.js","sourceRoot":"","sources":["../../../Utils/Realtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Realtime.js","sourceRoot":"","sources":["../../../Utils/Realtime.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,OAAO,OAAO,YAAY;IACxB,MAAM,CAAC,SAAS,CACrB,QAA2B,EAC3B,SAAiB,EACjB,SAAyB,EACzB,OAA2B;QAE3B,MAAM,MAAM,GACV,QAAQ,CAAC,QAAQ,EAAE,GAAG,GAAG,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAAC;QAE1D,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,MAAM,GAAG,GAAG,GAAG,OAAO,CAAC;QAChC,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/common",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3140",
|
|
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.3140",
|
|
81
81
|
"cookie-parser": "^1.4.6",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Permission.js","sourceRoot":"","sources":["../../../../Models/Permissions/Permission.ts"],"names":[],"mappings":""}
|