Refactor UserAuthorization and Realtime; update mock implementation a…

…nd add validation for tenantId
OneUptime · Sep 27, 2024 · d48b725 · d48b725
1 parent a0d77ac
commit d48b725
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Common/Tests/Server/Middleware/UserAuthorization.test.ts b/Common/Tests/Server/Middleware/UserAuthorization.test.ts
@@ -34,6 +34,7 @@ import {
 } from "@jest/globals";
 import { getJestSpyOn } from "Common/Tests/Spy";
 import getJestMockFunction from "Common/Tests/MockType";
+import UserPermissionUtil from "../../../Server/Utils/UserPermission/UserPermission";
 
 jest.mock("../../../Server/Utils/Logger");
 jest.mock("../../../Server/Middleware/ProjectAuthorization");
@@ -718,7 +719,7 @@ describe("UserMiddleware", () => {
 
       const spyGetDefaultUserTenantAccessPermission: jest.SpyInstance =
         getJestSpyOn(
-          AccessTokenService,
+          UserPermissionUtil,
           "getDefaultUserTenantAccessPermission",
         ).mockReturnValueOnce(mockedUserTenantAccessPermission);
 

diff --git a/Common/UI/Utils/Realtime.ts b/Common/UI/Utils/Realtime.ts
@@ -11,6 +11,7 @@ import SocketIO, { Socket } from "socket.io-client";
 import ModelEventType from "../../Types/Realtime/ModelEventType";
 import ListenToModelEventJSON from "../../Types/Realtime/ListenToModelEventJSON";
 import EventName from "../../Types/Realtime/EventName";
+import BadDataException from "../../Types/Exception/BadDataException";
 
 export interface ListenToModelEvent<
   Model extends AnalyticsBaseModel | BaseModel,
@@ -42,6 +43,12 @@ export default abstract class Realtime {
       this.init();
     }
 
+    if (!listenToModelEvent.tenantId) {
+      throw new BadDataException(
+        "TenantId is required to listen to model event.",
+      );
+    }
+
     const listenToModelEventJSON: ListenToModelEventJSON = {
       eventType: listenToModelEvent.eventType,
       modelType: DatabaseType.Database,