@oneuptime/common 8.0.5239 → 8.0.5285

package/Server/Utils/Workspace/Slack/Actions/Alert.ts

@@ -757,8 +757,10 @@ export default class SlackAlertActions {
     }
 
     if (actionType === SlackActionType.ViewAlert) {
-      // do nothing. This is just a view alert action.
-      // clear response.
+      /*
+       * do nothing. This is just a view alert action.
+       * clear response.
+       */
       return Response.sendJsonObjectResponse(data.req, data.res, {
         response_action: "clear",
       });

package/Server/Utils/Workspace/Slack/Actions/Auth.ts

@@ -42,8 +42,10 @@ export interface SlackRequest {
 
 const slackActionTypesThatDoNotRequireUserSlackAccountToBeConnectedToOneUptime: Array<SlackActionType> =
   [
-    // anyone in the company can create incident.
-    // regardless of whether they are connected to OneUptime or not.
+    /*
+     * anyone in the company can create incident.
+     * regardless of whether they are connected to OneUptime or not.
+     */
     SlackActionType.NewIncident,
     SlackActionType.SubmitNewIncident,
     SlackActionType.ViewIncident,

package/Server/Utils/Workspace/Slack/Actions/Incident.ts

@@ -258,14 +258,16 @@ export default class SlackIncidentActions {
     // send response to clear the action.
     Response.sendTextResponse(data.req, data.res, "");
 
-    // show new incident modal.
-    // new incident modal is :
-    // Incident Title (this can be prefilled with actionValue)
-    // Incident Description
-    // Incident Severity (dropdown) (single select)
-    // Monitors (dropdown) (miltiselect)
-    // Change Monitor Status to (dropdown) (single select)
-    // Labels (dropdown) (multiselect)
+    /*
+     * show new incident modal.
+     * new incident modal is :
+     * Incident Title (this can be prefilled with actionValue)
+     * Incident Description
+     * Incident Severity (dropdown) (single select)
+     * Monitors (dropdown) (miltiselect)
+     * Change Monitor Status to (dropdown) (single select)
+     * Labels (dropdown) (multiselect)
+     */
 
     const incidentTitle: WorkspaceTextBoxBlock = {
       _type: "WorkspaceTextBoxBlock",
@@ -1267,8 +1269,10 @@ export default class SlackIncidentActions {
     }
 
     if (actionType === SlackActionType.ViewIncident) {
-      // do nothing. This is just a view incident action.
-      // clear response.
+      /*
+       * do nothing. This is just a view incident action.
+       * clear response.
+       */
       return Response.sendJsonObjectResponse(data.req, data.res, {
         response_action: "clear",
       });

package/Server/Utils/Workspace/Slack/Actions/Monitor.ts

@@ -31,8 +31,10 @@ export default class SlackMonitorActions {
     const actionType: SlackActionType | undefined = data.action.actionType;
 
     if (actionType === SlackActionType.ViewMonitor) {
-      // do nothing. This is just a view Monitor action.
-      // clear response.
+      /*
+       * do nothing. This is just a view Monitor action.
+       * clear response.
+       */
       return Response.sendJsonObjectResponse(data.req, data.res, {
         response_action: "clear",
       });

package/Server/Utils/Workspace/Slack/Actions/OnCallDutyPolicy.ts

@@ -31,8 +31,10 @@ export default class SlackOnCallDutyActions {
     const actionType: SlackActionType | undefined = data.action.actionType;
 
     if (actionType === SlackActionType.ViewOnCallPolicy) {
-      // do nothing. This is just a view alert action.
-      // clear response.
+      /*
+       * do nothing. This is just a view alert action.
+       * clear response.
+       */
       return Response.sendJsonObjectResponse(data.req, data.res, {
         response_action: "clear",
       });

package/Server/Utils/Workspace/Slack/Actions/ScheduledMaintenance.ts

@@ -313,14 +313,16 @@ export default class SlackScheduledMaintenanceActions {
     // send response to clear the action.
     Response.sendTextResponse(data.req, data.res, "");
 
-    // show new scheduledMaintenance modal.
-    // new scheduledMaintenance modal is :
-    // ScheduledMaintenance Title (this can be prefilled with actionValue)
-    // ScheduledMaintenance Description
-    // Start Date and Time (date picker)
-    // End Date and Time (date picker)
-    // Monitors (dropdown) (miltiselect)
-    // Change Monitor Status to (dropdown) (single select)
+    /*
+     * show new scheduledMaintenance modal.
+     * new scheduledMaintenance modal is :
+     * ScheduledMaintenance Title (this can be prefilled with actionValue)
+     * ScheduledMaintenance Description
+     * Start Date and Time (date picker)
+     * End Date and Time (date picker)
+     * Monitors (dropdown) (miltiselect)
+     * Change Monitor Status to (dropdown) (single select)
+     */
 
     // Labels (dropdown) (multiselect)
 
@@ -1092,8 +1094,10 @@ export default class SlackScheduledMaintenanceActions {
     }
 
     if (actionType === SlackActionType.ViewScheduledMaintenance) {
-      // do nothing. This is just a view scheduledMaintenance action.
-      // clear response.
+      /*
+       * do nothing. This is just a view scheduledMaintenance action.
+       * clear response.
+       */
       return Response.sendJsonObjectResponse(data.req, data.res, {
         response_action: "clear",
       });

package/Server/Utils/Workspace/Slack/Messages/Alert.ts

@@ -32,13 +32,15 @@ export default class SlackAlertMessages {
 
     blockSlack.push(dividerBlock);
 
-    // now add buttons.
-    // View data.
-    // Execute On Call
-    // Acknowledge alert
-    // Resolve data.
-    // Change Alert State.
-    // Add Note.
+    /*
+     * now add buttons.
+     * View data.
+     * Execute On Call
+     * Acknowledge alert
+     * Resolve data.
+     * Change Alert State.
+     * Add Note.
+     */
 
     const buttons: Array<WorkspaceMessagePayloadButton> = [];
 

package/Server/Utils/Workspace/Slack/Messages/Incident.ts

@@ -32,13 +32,15 @@ export default class SlackIncidentMessages {
 
     blockSlack.push(dividerBlock);
 
-    // now add buttons.
-    // View data.
-    // Execute On Call
-    // Acknowledge incident
-    // Resolve data.
-    // Change Incident State.
-    // Add Note.
+    /*
+     * now add buttons.
+     * View data.
+     * Execute On Call
+     * Acknowledge incident
+     * Resolve data.
+     * Change Incident State.
+     * Add Note.
+     */
 
     const buttons: Array<WorkspaceMessagePayloadButton> = [];
 

package/Server/Utils/Workspace/Slack/Messages/Monitor.ts

@@ -31,13 +31,15 @@ export default class SlackMonitorMessages {
 
     blockSlack.push(dividerBlock);
 
-    // now add buttons.
-    // View data.
-    // Execute On Call
-    // Acknowledge Monitor
-    // Resolve data.
-    // Change Monitor State.
-    // Add Note.
+    /*
+     * now add buttons.
+     * View data.
+     * Execute On Call
+     * Acknowledge Monitor
+     * Resolve data.
+     * Change Monitor State.
+     * Add Note.
+     */
 
     const buttons: Array<WorkspaceMessagePayloadButton> = [];
 

package/Server/Utils/Workspace/Slack/Messages/ScheduledMaintenance.ts

@@ -32,13 +32,15 @@ export default class SlackScheduledMaintenanceMessages {
 
     blockSlack.push(dividerBlock);
 
-    // now add buttons.
-    // View data.
-    // Execute On Call
-    // Acknowledge scheduledMaintenance
-    // Resolve data.
-    // Change ScheduledMaintenance State.
-    // Add Note.
+    /*
+     * now add buttons.
+     * View data.
+     * Execute On Call
+     * Acknowledge scheduledMaintenance
+     * Resolve data.
+     * Change ScheduledMaintenance State.
+     * Add Note.
+     */
 
     const buttons: Array<WorkspaceMessagePayloadButton> = [];
 

package/Server/Utils/Workspace/Slack/Slack.ts

@@ -48,6 +48,7 @@ export default class SlackUtil extends WorkspaceBase {
   public static override async getUsernameFromUserId(data: {
     authToken: string;
     userId: string;
+    projectId: ObjectID;
   }): Promise<string | null> {
     logger.debug("Getting username from user ID with data:");
     logger.debug(data);
@@ -1055,6 +1056,7 @@ export default class SlackUtil extends WorkspaceBase {
     const workspaspaceMessageResponse: WorkspaceSendMessageResponse = {
       threads: [],
       workspaceType: WorkspaceType.Slack,
+      errors: [],
     };
 
     for (const channel of workspaceChannelsToPostTo) {
@@ -1088,6 +1090,10 @@ export default class SlackUtil extends WorkspaceBase {
       } catch (e) {
         logger.error(`Error sending message to channel ID ${channel.id}:`);
         logger.error(e);
+        workspaspaceMessageResponse.errors!.push({
+          channel: channel,
+          error: e instanceof Error ? e.message : String(e),
+        });
       }
     }
 

package/Server/Utils/Workspace/Workspace.ts

@@ -1,7 +1,7 @@
 import WorkspaceType from "../../../Types/Workspace/WorkspaceType";
 import WorkspaceBase, { WorkspaceSendMessageResponse } from "./WorkspaceBase";
 import SlackWorkspace from "./Slack/Slack";
-import MicrosoftTeamsWorkspace from "./MicrosoftTeams/MicrosoftTeams";
+import MicrosoftTeamsUtil from "./MicrosoftTeams/MicrosoftTeams";
 import BadDataException from "../../../Types/Exception/BadDataException";
 import ObjectID from "../../../Types/ObjectID";
 import WorkspaceMessagePayload, {
@@ -57,6 +57,7 @@ export default class WorkspaceUtil {
                 userId: workspaceUserToken.workspaceUserId,
                 workspaceType: workspaceType,
                 authToken: projectAuthToken.authToken,
+                projectId: data.projectId,
               });
 
             if (!workspaceUsername) {
@@ -115,7 +116,7 @@ export default class WorkspaceUtil {
     }
 
     if (workspaceType === WorkspaceType.MicrosoftTeams) {
-      return MicrosoftTeamsWorkspace;
+      return MicrosoftTeamsUtil;
     }
 
     throw new BadDataException(
@@ -128,12 +129,14 @@ export default class WorkspaceUtil {
     userId: string;
     workspaceType: WorkspaceType;
     authToken: string;
+    projectId: ObjectID;
   }): Promise<string | null> {
     const userName: string | null = await WorkspaceUtil.getWorkspaceTypeUtil(
       data.workspaceType,
     ).getUsernameFromUserId({
       userId: data.userId,
       authToken: data.authToken,
+      projectId: data.projectId,
     });
 
     return userName;
@@ -172,14 +175,14 @@ export default class WorkspaceUtil {
 
       if (workspaceType === WorkspaceType.Slack) {
         botUserId = (projectAuthToken.miscData as SlackMiscData).botUserId;
-      }
 
-      if (!botUserId) {
-        responses.push({
-          workspaceType: workspaceType,
-          threads: [],
-        });
-        continue;
+        if (!botUserId) {
+          responses.push({
+            workspaceType: workspaceType,
+            threads: [],
+          });
+          continue;
+        }
       }
 
       if (!projectAuthToken.authToken) {
@@ -192,7 +195,7 @@ export default class WorkspaceUtil {
 
       const result: WorkspaceSendMessageResponse =
         await WorkspaceUtil.getWorkspaceTypeUtil(workspaceType).sendMessage({
-          userId: botUserId,
+          userId: botUserId || "",
           authToken: projectAuthToken.authToken,
           projectId: data.projectId,
           workspaceMessagePayload: messagePayloadByWorkspace,

package/Server/Utils/Workspace/WorkspaceBase.ts

@@ -32,12 +32,17 @@ export interface WorkspaceThread {
 export interface WorkspaceSendMessageResponse {
   threads: Array<WorkspaceThread>;
   workspaceType: WorkspaceType;
+  errors?: Array<{
+    channel: WorkspaceChannel;
+    error: string;
+  }>;
 }
 
 export interface WorkspaceChannel {
   id: string;
   name: string;
   workspaceType: WorkspaceType;
+  teamId?: string; // Required for Microsoft Teams
 }
 
 export default class WorkspaceBase {
@@ -55,6 +60,7 @@ export default class WorkspaceBase {
     authToken: string;
     channelName: string;
     projectId: ObjectID;
+    teamId?: string;
   }): Promise<boolean> {
     throw new NotImplementedException();
   }
@@ -74,6 +80,7 @@ export default class WorkspaceBase {
   public static async getUsernameFromUserId(_data: {
     authToken: string;
     userId: string;
+    projectId: ObjectID;
   }): Promise<string | null> {
     throw new NotImplementedException();
   }
@@ -192,6 +199,7 @@ export default class WorkspaceBase {
   public static async getWorkspaceChannelFromChannelId(_data: {
     authToken: string;
     channelId: string;
+    teamId?: string;
   }): Promise<WorkspaceChannel> {
     throw new NotImplementedException();
   }
@@ -202,6 +210,7 @@ export default class WorkspaceBase {
     authToken: string; // which auth token should we use to send.
     userId: string;
     projectId: ObjectID;
+    teamId?: string;
   }): Promise<WorkspaceSendMessageResponse> {
     throw new NotImplementedException();
   }

package/Tests/Server/API/BaseAPI.test.ts

@@ -740,58 +740,70 @@ describe("BaseAPI", () => {
     });
   });
 
-  // describe('createItem', () => {
-  //     let createRequest: OneUptimeRequest;
-  //     let createResponse: ExpressResponse;
-  //     let savedItem: BaseModel;
-
-  //     beforeEach(() => {
-  //         createRequest = {
-  //             body: {
-  //                 data: { version: '1' },
-  //                 miscDataProps: { additional: 'info' },
-  //             },
-  //             headers: {},
-  //         } as unknown as OneUptimeRequest;
-
-  //         createResponse = {
-  //             status: jest.fn().mockReturnThis(),
-  //             json: jest.fn().mockReturnThis(),
-  //             send: jest.fn().mockReturnThis(),
-  //         } as unknown as ExpressResponse;
-
-  //         savedItem = new BaseModel();
-  //     });
-
-  //     it('should call onBeforeCreate lifecycle method', async () => {
-  //         const onBeforeCreateSpy: jest.SpyInstance = jest.spyOn(
-  //             baseApiInstance as any,
-  //             'onBeforeCreate'
-  //         );
-  //         await baseApiInstance.createItem(createRequest, createResponse);
-  //         expect(onBeforeCreateSpy).toHaveBeenCalledWith(
-  //             createRequest,
-  //             createResponse
-  //         );
-  //     });
-
-  //     it('should return EntityResponse with the saved item', async () => {
-  //         jest.spyOn(baseApiInstance.service, 'create').mockResolvedValue(
-  //             savedItem
-  //         );
-  //         await baseApiInstance.createItem(createRequest, createResponse);
-  //         const sendEntityResponseSpy: jest.SpyInstance = jest.spyOn(
-  //             Response as any,
-  //             'sendEntityResponse'
-  //         );
-  //         expect(sendEntityResponseSpy).toHaveBeenCalledWith(
-  //             createRequest,
-  //             createResponse,
-  //             savedItem,
-  //             BaseModel
-  //         );
-  //     });
-  // });
+  /*
+   * describe('createItem', () => {
+   *     let createRequest: OneUptimeRequest;
+   *     let createResponse: ExpressResponse;
+   *     let savedItem: BaseModel;
+   */
+
+  /*
+   *     beforeEach(() => {
+   *         createRequest = {
+   *             body: {
+   *                 data: { version: '1' },
+   *                 miscDataProps: { additional: 'info' },
+   *             },
+   *             headers: {},
+   *         } as unknown as OneUptimeRequest;
+   */
+
+  /*
+   *         createResponse = {
+   *             status: jest.fn().mockReturnThis(),
+   *             json: jest.fn().mockReturnThis(),
+   *             send: jest.fn().mockReturnThis(),
+   *         } as unknown as ExpressResponse;
+   */
+
+  /*
+   *         savedItem = new BaseModel();
+   *     });
+   */
+
+  /*
+   *     it('should call onBeforeCreate lifecycle method', async () => {
+   *         const onBeforeCreateSpy: jest.SpyInstance = jest.spyOn(
+   *             baseApiInstance as any,
+   *             'onBeforeCreate'
+   *         );
+   *         await baseApiInstance.createItem(createRequest, createResponse);
+   *         expect(onBeforeCreateSpy).toHaveBeenCalledWith(
+   *             createRequest,
+   *             createResponse
+   *         );
+   *     });
+   */
+
+  /*
+   *     it('should return EntityResponse with the saved item', async () => {
+   *         jest.spyOn(baseApiInstance.service, 'create').mockResolvedValue(
+   *             savedItem
+   *         );
+   *         await baseApiInstance.createItem(createRequest, createResponse);
+   *         const sendEntityResponseSpy: jest.SpyInstance = jest.spyOn(
+   *             Response as any,
+   *             'sendEntityResponse'
+   *         );
+   *         expect(sendEntityResponseSpy).toHaveBeenCalledWith(
+   *             createRequest,
+   *             createResponse,
+   *             savedItem,
+   *             BaseModel
+   *         );
+   *     });
+   * });
+   */
 
   describe("getRouter", () => {
     it("should return an ExpressRouter instance", () => {

package/Tests/Server/Services/BillingService.test.ts

@@ -856,9 +856,9 @@ describe("BillingService", () => {
 
       it("should successfully retrieve subscription items for a given subscription", async () => {
         mockSubscription.items.data = [
-          // @ts-ignore
+          // @ts-expect-error - Simplified mock object for testing without all required Stripe SubscriptionItem properties
           { id: "item_1", price: { id: "price_123" } },
-          // @ts-ignore
+          // @ts-expect-error - Simplified mock object for testing without all required Stripe SubscriptionItem properties
           { id: "item_2", price: { id: "price_456" } },
         ];
         mockStripe.subscriptions.retrieve =
@@ -1025,14 +1025,14 @@ describe("BillingService", () => {
             {
               id: "pm_123",
               type: "card",
-              // @ts-ignore
+              // @ts-expect-error - Simplified mock card object for testing without all required Stripe card properties
               card: { last4: "4242", brand: "mastercard" },
               isDefault: true,
             },
             {
               id: "pm_456",
               type: "card",
-              // @ts-ignore
+              // @ts-expect-error - Simplified mock card object for testing without all required Stripe card properties
               card: { last4: "4343", brand: "mastercard" },
               isDefault: true,
             },

package/Tests/Server/Services/TeamMemberService.test.ts

@@ -343,10 +343,12 @@ describe("TeamMemberService", () => {
           "refreshTokens",
         );
 
-        // const updateSeatsSpy: jest.SpyInstance = jest.spyOn(
-        //   TeamMemberService,
-        //   "updateSubscriptionSeatsByUniqueTeamMembersInProject",
-        // );
+        /*
+         * const updateSeatsSpy: jest.SpyInstance = jest.spyOn(
+         *   TeamMemberService,
+         *   "updateSubscriptionSeatsByUniqueTeamMembersInProject",
+         * );
+         */
 
         const user: User = await UserService.create({
           data: UserServiceHelper.generateRandomUser(),
@@ -741,8 +743,10 @@ describe("TeamMemberService", () => {
 
   describe("getUniqueTeamMemberCountInProject", () => {
     it("should return the count of unique team members in a project", async () => {
-      // make findBy to return 4 team members: 1 normal, 2 with the same id and 1 without a user ID
-      // total should be 2 unique team members
+      /*
+       * make findBy to return 4 team members: 1 normal, 2 with the same id and 1 without a user ID
+       * total should be 2 unique team members
+       */
 
       const user: User = await UserServiceHelper.genrateAndSaveRandomUser(
         null,
@@ -839,9 +843,11 @@ describe("TeamMemberService", () => {
 
   describe("getUsersInTeam(s)", () => {
     it("should return users in specified team", async () => {
-      // team A members: user1 & user2
-      // team B members: user2 & user3
-      // team C members: user 3
+      /*
+       * team A members: user1 & user2
+       * team B members: user2 & user3
+       * team C members: user 3
+       */
 
       const user: User = await UserServiceHelper.genrateAndSaveRandomUser(
         null,
@@ -966,9 +972,11 @@ describe("TeamMemberService", () => {
     });
 
     it("should return users in multiple teams", async () => {
-      // team A members: user1 & user2
-      // team B members: user2 & user3
-      // team C members: user 3
+      /*
+       * team A members: user1 & user2
+       * team B members: user2 & user3
+       * team C members: user 3
+       */
 
       const user: User = await UserServiceHelper.genrateAndSaveRandomUser(
         null,

package/Tests/Server/TestingUtils/Services/BillingServiceHelper.ts

@@ -68,7 +68,7 @@ const getStripeSubscription: GetStripeSubscriptionFunction =
         data: [
           {
             id: Faker.generateRandomObjectID().toString(),
-            // @ts-ignore
+            // @ts-expect-error - Simplified mock price object for testing without all required Stripe Price properties
             price: {
               id: new BillingService().getMeteredPlanPriceId(
                 ProductType.ActiveMonitoring,
@@ -100,7 +100,7 @@ const getSubscriptionPlanData: GetSubscriptionPlanDataFunction =
 type GetStripeInvoiceFunction = () => Stripe.Invoice;
 
 const getStripeInvoice: GetStripeInvoiceFunction = (): Stripe.Invoice => {
-  // @ts-ignore
+  // @ts-expect-error - Simplified mock invoice object for testing without all required Stripe Invoice properties
   return {
     id: Faker.generateRandomObjectID().toString(),
     amount_due: Faker.getNumberBetweenMinAndMax({ min: 1, max: 100 }),

package/Tests/Types/OnCallDutyPolicy/LayerUtil.test.ts

@@ -220,8 +220,10 @@ describe("LayerUtil getEvents - Daily Restrictions", () => {
       calendarEndDate: calendarEnd,
     });
 
-    // Expect two events: 23:00 -> 23:59:59 (approx) and 00:00 -> 11:00 next day (depending on trimming logic)
-    // We simplify by checking presence of one starting at 23:00 and one ending at 11:00.
+    /*
+     * Expect two events: 23:00 -> 23:59:59 (approx) and 00:00 -> 11:00 next day (depending on trimming logic)
+     * We simplify by checking presence of one starting at 23:00 and one ending at 11:00.
+     */
     expect(events.length).toBeGreaterThanOrEqual(2); // Expect at least two distinct segments across midnight.
     const has23Window: boolean = events.some((e: CalendarEvent) => {
       return OneUptimeDate.getLocalHourAndMinuteFromDate(e.start) === "23:00";
@@ -436,8 +438,10 @@ describe("LayerUtil getEvents - Rotation Handoff", () => {
       return e.title;
     });
 
-    // Titles are user ids (strings we passed) according to implementation.
-    // Check that at least first three rotate u1 -> u2 -> u3
+    /*
+     * Titles are user ids (strings we passed) according to implementation.
+     * Check that at least first three rotate u1 -> u2 -> u3
+     */
     expect(userSequence.slice(0, 3)).toEqual(["u1", "u2", "u3"]);
   });
 });

package/Tests/UI/Components/DictionaryOfStrings.test.tsx

@@ -1,5 +1,7 @@
-// Libraries
-// Custom components
+/*
+ * Libraries
+ * Custom components
+ */
 import DictionaryOfStrings, {
   ComponentProps,
 } from "../../../UI/Components/Dictionary/DictionaryOfStrings";