@oneuptime/common 12.0.17 → 12.0.19

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

@@ -11,8 +11,10 @@ import UserNotificationRuleService, {
 } from "../../../Server/Services/UserNotificationRuleService";
 import UserOnCallLogService from "../../../Server/Services/UserOnCallLogService";
 import UserOnCallLogTimelineService from "../../../Server/Services/UserOnCallLogTimelineService";
+import UserMicrosoftTeamsService from "../../../Server/Services/UserMicrosoftTeamsService";
 import UserPushService from "../../../Server/Services/UserPushService";
 import UserService from "../../../Server/Services/UserService";
+import UserSlackService from "../../../Server/Services/UserSlackService";
 import UserSmsService from "../../../Server/Services/UserSmsService";
 import UserTelegramService from "../../../Server/Services/UserTelegramService";
 import UserWebhookService from "../../../Server/Services/UserWebhookService";
@@ -66,8 +68,8 @@ import { afterEach, beforeEach, describe, expect, test } from "@jest/globals";
  *   R1  a target user id from ANOTHER project, presented by a caller who is a
  *       legitimate administrator of THIS one.
  *   R3  a method FK pointing at somebody else's row — on create, on update, in
- *       the FK slot, in the relation slot, and on all seven channels, because
- *       a guard covering six of seven covers none.
+ *       the FK slot, in the relation slot, and on all nine channels, because
+ *       a guard covering eight of nine covers none.
  *   R3  on update specifically: a body that LIES about the rule's owner, to
  *       check that the owner is re-read from the database rather than believed.
  *   R6  an audit trail and an owner notification keyed on the server-resolved
@@ -111,7 +113,7 @@ const INCIDENT_ID: ObjectID = new ObjectID(
 );
 
 /*
- * The seven channels, each with the FK column a rule carries it in, the
+ * The nine channels, each with the FK column a rule carries it in, the
  * relation slot that is the same write spelled differently, the service the
  * guard must consult, and the word the rejection message has to contain.
  *
@@ -163,6 +165,20 @@ const CHANNELS: Array<ChannelFixture> = [
     service: UserTelegramService as unknown as ChannelFixture["service"],
     relationProperty: "userTelegram",
   },
+  {
+    idColumn: "userSlackId",
+    relationColumn: "userSlack",
+    label: "Slack",
+    service: UserSlackService as unknown as ChannelFixture["service"],
+    relationProperty: "userSlack",
+  },
+  {
+    idColumn: "userMicrosoftTeamsId",
+    relationColumn: "userMicrosoftTeams",
+    label: "Microsoft Teams",
+    service: UserMicrosoftTeamsService as unknown as ChannelFixture["service"],
+    relationProperty: "userMicrosoftTeams",
+  },
   {
     idColumn: "userPushId",
     relationColumn: "userPush",
@@ -644,7 +660,7 @@ describe("UserNotificationRule administrative write guards", () => {
    * R3 on create - the method a rule names must belong to the rule's owner.
    * ---------------------------------------------------------------------
    */
-  describe("R3 on create - method ownership, all seven channels", () => {
+  describe("R3 on create - method ownership, all nine channels", () => {
     test.each(
       CHANNELS.map((channel: ChannelFixture): [string, ChannelFixture] => {
         return [channel.label, channel];
@@ -720,9 +736,9 @@ describe("UserNotificationRule administrative write guards", () => {
       },
     );
 
-    test("the guard covers exactly the seven notification method columns the model has", () => {
+    test("the guard covers exactly the nine notification method columns the model has", () => {
       /*
-       * The count is the assertion. An eighth channel added to the model
+       * The count is the assertion. A tenth channel added to the model
        * without an entry in the guard's table is a channel with no ownership
        * check at all, and the attacker only needs one.
        */

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

@@ -19,9 +19,11 @@ import { afterEach, beforeEach, describe, expect, test } from "@jest/globals";
  * The defaults a brand-new responder is given.
  *
  * Everything about "will this person actually be paged?" starts here. When a
- * user joins a project (TeamMemberService), or verifies a phone / push / e-mail
+ * user joins a project (TeamMemberService), verifies a phone / push / e-mail
  * / Telegram / WhatsApp / webhook identity (the UserXxxAPI verify endpoints),
- * UserNotificationRuleService seeds a set of notification rules for them. If the
+ * or links a Slack / Microsoft Teams account (born verified from the OAuth
+ * workspace link), UserNotificationRuleService seeds a set of notification
+ * rules for them. If the
  * seeding is wrong — a severity skipped, a rule type missed, a delay that is not
  * zero, or the method id written onto the wrong foreign key — the user is on an
  * on-call policy that pages nobody, and nothing tells them so.
@@ -93,13 +95,15 @@ const CREATED_EMAIL_ID: ObjectID = new ObjectID(
 
 const USER_EMAIL: Email = new Email("responder@company.com");
 
-/* The seven FK columns a NotificationMethodDescriptor can drive. */
+/* The nine FK columns a NotificationMethodDescriptor can drive. */
 type ChannelColumn =
   | "userEmailId"
   | "userSmsId"
   | "userCallId"
   | "userWhatsAppId"
   | "userTelegramId"
+  | "userSlackId"
+  | "userMicrosoftTeamsId"
   | "userWebhookId"
   | "userPushId";
 
@@ -109,6 +113,8 @@ const ALL_CHANNELS: Array<ChannelColumn> = [
   "userCallId",
   "userWhatsAppId",
   "userTelegramId",
+  "userSlackId",
+  "userMicrosoftTeamsId",
   "userWebhookId",
   "userPushId",
 ];
@@ -587,9 +593,9 @@ describe("addDefaultNotificationRulesForVerifiedMethod - the method lands on the
      * KNOWN DEFECT, pinned as-is. With no id on the descriptor the duplicate
      * check degenerates to (projectId, userId, ruleType) and the created rows
      * carry no notification method at all - onBeforeCreate would reject them
-     * with "Call, SMS, WhatsApp, Telegram, Webhook, Email, or Push notification
-     * is required" against a real database. Nothing in this method guards
-     * against being handed an empty descriptor.
+     * with "Call, SMS, WhatsApp, Telegram, Slack, Microsoft Teams, Webhook,
+     * Email, or Push notification is required" against a real database. Nothing
+     * in this method guards against being handed an empty descriptor.
      */
     await runForDescriptor({});
 

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

@@ -14,6 +14,7 @@ import TelegramService from "../../../Server/Services/TelegramService";
 import WebhookService from "../../../Server/Services/WebhookService";
 import PushNotificationService from "../../../Server/Services/PushNotificationService";
 import WorkspaceNotificationRuleService from "../../../Server/Services/WorkspaceNotificationRuleService";
+import WorkspaceUserNotificationService from "../../../Server/Services/WorkspaceUserNotificationService";
 import logger from "../../../Server/Utils/Logger";
 import Incident from "../../../Models/DatabaseModels/Incident";
 import Alert from "../../../Models/DatabaseModels/Alert";
@@ -212,6 +213,7 @@ interface DeliverySpies {
   call: jest.SpyInstance;
   whatsApp: jest.SpyInstance;
   telegram: jest.SpyInstance;
+  workspaceMessage: jest.SpyInstance;
   webhook: jest.SpyInstance;
   push: jest.SpyInstance;
   emailTemplateForIncident: jest.SpyInstance;
@@ -294,6 +296,10 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
       telegram: jest
         .spyOn(TelegramService, "sendTelegramMessage")
         .mockResolvedValue(undefined as never),
+      // Slack and Microsoft Teams both deliver through this one service.
+      workspaceMessage: jest
+        .spyOn(WorkspaceUserNotificationService, "sendDirectMessageToUser")
+        .mockResolvedValue(undefined as never),
       webhook: jest
         .spyOn(WebhookService, "sendWebhook")
         .mockResolvedValue(undefined as never),
@@ -320,6 +326,7 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
       spies.call,
       spies.whatsApp,
       spies.telegram,
+      spies.workspaceMessage,
       spies.webhook,
       spies.push,
     ];
@@ -572,7 +579,7 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
        * the loaded relation's userId against the rule's, and it can only report
        * a mismatch it can SEE - an unselected column arrives as `undefined` and
        * is deliberately read as "no evidence", so dropping any one of these
-       * seven silently disables the backstop for that channel.
+       * nine silently disables the backstop for that channel.
        *
        * Kept as an exact-shape assertion on purpose. This test caught the
        * column being added, which is the whole argument for not relaxing it
@@ -603,6 +610,18 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
           isVerified: true,
           userId: true,
         },
+        userSlack: {
+          slackUserId: true,
+          slackUserName: true,
+          isVerified: true,
+          userId: true,
+        },
+        userMicrosoftTeams: {
+          microsoftTeamsUserId: true,
+          microsoftTeamsUserName: true,
+          isVerified: true,
+          userId: true,
+        },
         userWebhook: {
           webhookUrl: true,
           name: true,
@@ -629,6 +648,8 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
       ["userSms"],
       ["userWhatsApp"],
       ["userTelegram"],
+      ["userSlack"],
+      ["userMicrosoftTeams"],
       ["userEmail"],
       ["userPush"],
     ])(
@@ -647,6 +668,8 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
       ["userSms", "phone"],
       ["userWhatsApp", "phone"],
       ["userTelegram", "telegramChatId"],
+      ["userSlack", "slackUserId"],
+      ["userMicrosoftTeams", "microsoftTeamsUserId"],
       ["userEmail", "email"],
       ["userPush", "deviceToken"],
     ])(
@@ -777,6 +800,16 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
             telegramChatId: "123456",
             isVerified: false,
           },
+          userSlack: {
+            id: METHOD_ID,
+            slackUserId: "U0123456789",
+            isVerified: false,
+          },
+          userMicrosoftTeams: {
+            id: METHOD_ID,
+            microsoftTeamsUserId: "teams-user-1",
+            isVerified: false,
+          },
           userCall: {
             id: METHOD_ID,
             phone: new Phone("+11234567892"),
@@ -801,10 +834,11 @@ describe("UserNotificationRuleService.executeNotificationRuleItem", () => {
       expect(spies.call).not.toHaveBeenCalled();
       expect(spies.whatsApp).not.toHaveBeenCalled();
       expect(spies.telegram).not.toHaveBeenCalled();
+      expect(spies.workspaceMessage).not.toHaveBeenCalled();
       expect(spies.push).not.toHaveBeenCalled();
 
-      // One "not verified" Error row per unverified channel: 6 in total.
-      expect(timelineRows).toHaveLength(6);
+      // One "not verified" Error row per unverified channel: 8 in total.
+      expect(timelineRows).toHaveLength(8);
       for (const row of timelineRows) {
         expect(row.status).toBe(UserNotificationStatus.Error);
         expect(row.statusMessage).toContain("not verified");