@oneuptime/common 8.0.5239 → 8.0.5285

package/build/dist/Server/Services/UserWebAuthnService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UserWebAuthnService.js","sourceRoot":"","sources":["../../../../Server/Services/UserWebAuthnService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/WorkspaceNotificationRuleService.js

@@ -108,7 +108,7 @@ export class Service extends DatabaseService {
                 },
             ],
         });
-        let existingChannelNames = [];
+        let existingChannels = [];
         let createdChannels = [];
         if (notificationRule.shouldCreateNewChannel) {
             const generateRandomString = Text.generateRandomText(5);
@@ -139,19 +139,29 @@ export class Service extends DatabaseService {
             }
         }
         if (notificationRule.shouldPostToExistingChannel) {
-            existingChannelNames = this.getExistingChannelNamesFromNotificationRules({
+            existingChannels = this.getExistingChannelNamesFromNotificationRules({
                 notificationRules: [notificationRule],
+                workspaceType: rule.workspaceType,
             });
-            for (const channelName of existingChannelNames) {
+            for (const channel of existingChannels) {
                 try {
                     // check if these channels exist.
-                    const channelExists = await WorkspaceUtil.getWorkspaceTypeUtil(rule.workspaceType).doesChannelExist({
+                    const doesChannelExistData = {
                         authToken: projectAuthToken,
-                        channelName: channelName,
+                        channelName: channel.name,
                         projectId: data.projectId,
-                    });
+                    };
+                    // Add teamId for Microsoft Teams
+                    if (rule.workspaceType === WorkspaceType.MicrosoftTeams) {
+                        const teamId = channel.teamId;
+                        if (!teamId) {
+                            throw new BadDataException("Microsoft Teams integration requires a team to be selected for posting to existing channels. Please edit the notification rule and select a team.");
+                        }
+                        doesChannelExistData.teamId = teamId;
+                    }
+                    const channelExists = await WorkspaceUtil.getWorkspaceTypeUtil(rule.workspaceType).doesChannelExist(doesChannelExistData);
                     if (!channelExists) {
-                        throw new BadDataException(`Channel ${channelName} does not exist. If this channel is private, you need to invite OneUptime bot to the channel and try again.`);
+                        throw new BadDataException(`Channel ${channel.name} does not exist. If this channel is private, you need to invite OneUptime bot to the channel and try again.`);
                     }
                 }
                 catch (err) {
@@ -164,13 +174,15 @@ export class Service extends DatabaseService {
                     const responses = await WorkspaceUtil.postMessageToAllWorkspaceChannelsAsBot({
                         projectId: data.projectId,
                         messagePayloadsByWorkspace: messageBlocksByWorkspaceTypes.map((messageBlocksByWorkspaceType) => {
-                            return {
+                            const payload = {
                                 _type: "WorkspaceMessagePayload",
                                 workspaceType: messageBlocksByWorkspaceType.workspaceType,
                                 messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
                                 channelNames: [],
                                 channelIds: [createdChannel.id],
+                                teamId: notificationRule.existingTeam,
                             };
+                            return payload;
                         }),
                     });
                     // Log results for test sends (created channels)
@@ -194,6 +206,13 @@ export class Service extends DatabaseService {
                     };
                     for (const res of responses) {
                         const messageSummary = getMessageSummary(res.workspaceType);
+                        // Check for errors in the response
+                        if (res.errors && res.errors.length > 0) {
+                            const errorMessages = res.errors.map((error) => {
+                                return `Channel ${error.channel.name}: ${error.error}`;
+                            });
+                            throw new BadDataException(`Failed to send test message to some channels: ${errorMessages.join("; ")}`);
+                        }
                         for (const thread of res.threads) {
                             const log = new WorkspaceNotificationLog();
                             log.projectId = data.projectId;
@@ -217,18 +236,23 @@ export class Service extends DatabaseService {
                     throw new BadDataException("Cannot post message to channel. " + (err === null || err === void 0 ? void 0 : err.message));
                 }
             }
-            for (const existingChannelName of existingChannelNames) {
+            for (const channel of existingChannels) {
                 try {
                     const responses = await WorkspaceUtil.postMessageToAllWorkspaceChannelsAsBot({
                         projectId: data.projectId,
                         messagePayloadsByWorkspace: messageBlocksByWorkspaceTypes.map((messageBlocksByWorkspaceType) => {
-                            return {
+                            const payload = {
                                 _type: "WorkspaceMessagePayload",
                                 workspaceType: messageBlocksByWorkspaceType.workspaceType,
                                 messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
-                                channelNames: [existingChannelName],
+                                channelNames: [channel.name],
                                 channelIds: [],
                             };
+                            if (messageBlocksByWorkspaceType.workspaceType ===
+                                WorkspaceType.MicrosoftTeams) {
+                                payload.teamId = channel.teamId;
+                            }
+                            return payload;
                         }),
                     });
                     // Log results for test sends (existing channels)
@@ -252,6 +276,13 @@ export class Service extends DatabaseService {
                     };
                     for (const res of responses) {
                         const messageSummary = getMessageSummary(res.workspaceType);
+                        // Check for errors in the response
+                        if (res.errors && res.errors.length > 0) {
+                            const errorMessages = res.errors.map((error) => {
+                                return `Channel ${error.channel.name}: ${error.error}`;
+                            });
+                            throw new BadDataException(`Failed to send test message to some channels: ${errorMessages.join("; ")}`);
+                        }
                         for (const thread of res.threads) {
                             const log = new WorkspaceNotificationLog();
                             log.projectId = data.projectId;
@@ -369,16 +400,28 @@ export class Service extends DatabaseService {
                 notificationFor: data.notificationFor,
                 workspaceType: messageBlocksByWorkspaceType.workspaceType,
             });
-            const workspaceMessagePayload = {
-                _type: "WorkspaceMessagePayload",
-                workspaceType: messageBlocksByWorkspaceType.workspaceType,
-                messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
-                channelNames: existingChannels,
-                channelIds: monitorChannels.map((channel) => {
-                    return channel.id;
-                }) || [],
-            };
-            workspaceNotificationPaylaods.push(workspaceMessagePayload);
+            for (const monitorChannel of monitorChannels) {
+                const workspaceMessagePayload = {
+                    _type: "WorkspaceMessagePayload",
+                    workspaceType: messageBlocksByWorkspaceType.workspaceType,
+                    messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
+                    channelNames: [],
+                    channelIds: [monitorChannel.id], // we use channel ids here as channel names can change,
+                    teamId: monitorChannel.teamId,
+                };
+                workspaceNotificationPaylaods.push(workspaceMessagePayload);
+            }
+            for (const existingChannel of existingChannels) {
+                const workspaceMessagePayload = {
+                    _type: "WorkspaceMessagePayload",
+                    workspaceType: messageBlocksByWorkspaceType.workspaceType,
+                    messageBlocks: messageBlocksByWorkspaceType.messageBlocks,
+                    channelNames: [existingChannel.name],
+                    channelIds: [], // we use channel names here as we don't have channel ids.
+                    teamId: existingChannel.teamId,
+                };
+                workspaceNotificationPaylaods.push(workspaceMessagePayload);
+            }
         }
         const responses = await WorkspaceUtil.postMessageToAllWorkspaceChannelsAsBot({
             projectId: data.projectId,
@@ -525,14 +568,15 @@ export class Service extends DatabaseService {
         });
         logger.debug("Notification rules retrieved:");
         logger.debug(notificationRules);
-        const existingChannelNames = this.getExistingChannelNamesFromNotificationRules({
+        const existingChannels = this.getExistingChannelNamesFromNotificationRules({
             notificationRules: notificationRules.map((rule) => {
                 return rule.notificationRule;
             }),
+            workspaceType: data.workspaceType,
         }) || [];
-        logger.debug("Existing channel names:");
-        logger.debug(existingChannelNames);
-        return existingChannelNames;
+        logger.debug("Existing channels:");
+        logger.debug(existingChannels);
+        return existingChannels;
     }
     async createChannelsAndInviteUsersToChannelsBasedOnRules(data) {
         try {
@@ -590,21 +634,25 @@ export class Service extends DatabaseService {
                         notificationChannels: createdWorkspaceChannels,
                     });
                     logger.debug("Getting existing channel names from notification rules");
-                    const existingChannelNames = this.getExistingChannelNamesFromNotificationRules({
+                    const existingChannels = this.getExistingChannelNamesFromNotificationRules({
                         notificationRules: notificationRules.map((rule) => {
                             return rule.notificationRule;
                         }),
+                        workspaceType: workspaceType,
                     }) || [];
-                    logger.debug("Existing channel names:");
-                    logger.debug(existingChannelNames);
+                    logger.debug("Existing channels:");
+                    logger.debug(existingChannels);
                     logger.debug("Adding created channel names to existing channel names");
+                    const allChannelNames = existingChannels.map((c) => {
+                        return c.name;
+                    });
                     for (const channel of createdWorkspaceChannels) {
-                        if (!existingChannelNames.includes(channel.name)) {
-                            existingChannelNames.push(channel.name);
+                        if (!allChannelNames.includes(channel.name)) {
+                            allChannelNames.push(channel.name);
                         }
                     }
                     logger.debug("Final list of channel names to post messages to:");
-                    logger.debug(existingChannelNames);
+                    logger.debug(allChannelNames);
                     logger.debug("Posting messages to workspace channels");
                     logger.debug("Channels created:");
                     logger.debug(createdWorkspaceChannels);
@@ -666,7 +714,7 @@ export class Service extends DatabaseService {
         return result;
     }
     async inviteUsersAndTeamsToChannelsBasedOnRules(data) {
-        var _a, _b;
+        var _a, _b, _c;
         logger.debug("inviteUsersAndTeamsToChannelsBasedOnRules called with data:");
         logger.debug(data);
         const inviteUserPayloads = await this.getUsersIdsToInviteToChannel({
@@ -697,7 +745,7 @@ export class Service extends DatabaseService {
                         })) || [];
                         logger.debug("Channel IDs to send message to:");
                         logger.debug(channelIds);
-                        await WorkspaceUtil.getWorkspaceTypeUtil(data.workspaceType).sendMessage({
+                        const sendMessageData = {
                             userId: data.projectAuth.workspaceProjectId,
                             authToken: data.projectAuth.authToken,
                             workspaceMessagePayload: {
@@ -716,7 +764,13 @@ export class Service extends DatabaseService {
                                 ],
                             },
                             projectId: data.projectId,
-                        });
+                        };
+                        // Add teamId for Microsoft Teams
+                        if (data.workspaceType === WorkspaceType.MicrosoftTeams &&
+                            ((_c = data.projectAuth.miscData) === null || _c === void 0 ? void 0 : _c["teamId"])) {
+                            sendMessageData.teamId = data.projectAuth.miscData["teamId"];
+                        }
+                        await WorkspaceUtil.getWorkspaceTypeUtil(data.workspaceType).sendMessage(sendMessageData);
                     }
                     catch (e) {
                         logger.error("Error in sending message to channel");
@@ -745,6 +799,7 @@ export class Service extends DatabaseService {
         logger.debug("Users invited to channels successfully");
     }
     async inviteUsersBasedOnRulesAndWorkspaceChannels(data) {
+        var _a;
         // if no rules then return.
         if (data.notificationRules.length === 0) {
             logger.debug("No notification rules found. Returning.");
@@ -812,7 +867,7 @@ export class Service extends DatabaseService {
                         });
                         logger.debug("Channel IDs to send message to:");
                         logger.debug(channelIds);
-                        await WorkspaceUtil.getWorkspaceTypeUtil(workspaceType).sendMessage({
+                        const sendMessageData = {
                             userId: projectAuth.workspaceProjectId,
                             authToken: projectAuth.authToken,
                             workspaceMessagePayload: {
@@ -831,7 +886,13 @@ export class Service extends DatabaseService {
                                 ],
                             },
                             projectId: data.projectId,
-                        });
+                        };
+                        // Add teamId for Microsoft Teams
+                        if (workspaceType === WorkspaceType.MicrosoftTeams &&
+                            ((_a = projectAuth.miscData) === null || _a === void 0 ? void 0 : _a["teamId"])) {
+                            sendMessageData.teamId = projectAuth.miscData["teamId"];
+                        }
+                        await WorkspaceUtil.getWorkspaceTypeUtil(workspaceType).sendMessage(sendMessageData);
                     }
                     catch (e) {
                         logger.error("Error in sending message to channel");
@@ -922,7 +983,7 @@ export class Service extends DatabaseService {
         return ((_a = userAuth.workspaceUserId) === null || _a === void 0 ? void 0 : _a.toString()) || null;
     }
     async createChannelsBasedOnRules(data) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         logger.debug("createChannelsBasedOnRules called with data:");
         logger.debug(data);
         const createdWorkspaceChannels = [];
@@ -934,6 +995,14 @@ export class Service extends DatabaseService {
         });
         logger.debug("New channel names to be created:");
         logger.debug(notificationChannels);
+        // Get project auth to access teamId for Microsoft Teams
+        const projectAuth = await WorkspaceProjectAuthTokenService.getProjectAuth({
+            projectId: data.projectId,
+            workspaceType: data.workspaceType,
+        });
+        if (!projectAuth) {
+            throw new BadDataException("Project auth not found for workspace type " + data.workspaceType);
+        }
         if (!notificationChannels || notificationChannels.length === 0) {
             logger.debug("No new channel names found. Returning empty array.");
             return [];
@@ -946,11 +1015,24 @@ export class Service extends DatabaseService {
                 continue;
             }
             logger.debug(`Creating new channel with name: ${notificationChannel.channelName}`);
-            const channel = await WorkspaceUtil.getWorkspaceTypeUtil(data.workspaceType).createChannel({
+            const createChannelData = {
                 authToken: data.projectOrUserAuthTokenForWorkspace,
                 channelName: notificationChannel.channelName,
                 projectId: data.projectId,
-            });
+            };
+            if (notificationChannel.teamId) {
+                createChannelData.teamId = notificationChannel.teamId;
+            }
+            else if (data.workspaceType === WorkspaceType.MicrosoftTeams &&
+                ((_a = projectAuth.miscData) === null || _a === void 0 ? void 0 : _a["teamId"])) {
+                createChannelData.teamId = projectAuth.miscData["teamId"];
+            }
+            // Ensure teamId is set for Microsoft Teams
+            if (data.workspaceType === WorkspaceType.MicrosoftTeams &&
+                !createChannelData.teamId) {
+                throw new BadDataException("teamId is required for Microsoft Teams channels");
+            }
+            const channel = await WorkspaceUtil.getWorkspaceTypeUtil(data.workspaceType).createChannel(createChannelData);
             const notificationWorkspaceChannel = Object.assign(Object.assign({}, channel), { notificationRuleId: notificationChannel.notificationRuleId });
             logger.debug("Channel created:");
             logger.debug(channel);
@@ -963,17 +1045,17 @@ export class Service extends DatabaseService {
                     channelName: channel.name,
                 };
                 // Add resource associations only if they exist
-                if ((_a = data.notificationFor) === null || _a === void 0 ? void 0 : _a.incidentId) {
+                if ((_b = data.notificationFor) === null || _b === void 0 ? void 0 : _b.incidentId) {
                     logData.incidentId = data.notificationFor.incidentId;
                 }
-                if ((_b = data.notificationFor) === null || _b === void 0 ? void 0 : _b.alertId) {
+                if ((_c = data.notificationFor) === null || _c === void 0 ? void 0 : _c.alertId) {
                     logData.alertId = data.notificationFor.alertId;
                 }
-                if ((_c = data.notificationFor) === null || _c === void 0 ? void 0 : _c.scheduledMaintenanceId) {
+                if ((_d = data.notificationFor) === null || _d === void 0 ? void 0 : _d.scheduledMaintenanceId) {
                     logData.scheduledMaintenanceId =
                         data.notificationFor.scheduledMaintenanceId;
                 }
-                if ((_d = data.notificationFor) === null || _d === void 0 ? void 0 : _d.onCallDutyPolicyId) {
+                if ((_e = data.notificationFor) === null || _e === void 0 ? void 0 : _e.onCallDutyPolicyId) {
                     logData.onCallDutyPolicyId = data.notificationFor.onCallDutyPolicyId;
                 }
                 await WorkspaceNotificationLogService.logCreateChannel(logData, {
@@ -1052,7 +1134,7 @@ export class Service extends DatabaseService {
     getExistingChannelNamesFromNotificationRules(data) {
         logger.debug("getExistingChannelNamesFromNotificationRules called with data:");
         logger.debug(data);
-        const channelNames = [];
+        const channels = [];
         for (const notificationRule of data.notificationRules) {
             const workspaceRules = notificationRule;
             if (workspaceRules.shouldPostToExistingChannel) {
@@ -1064,15 +1146,20 @@ export class Service extends DatabaseService {
                         logger.debug("Empty channel name found. Skipping.");
                         continue;
                     }
-                    if (!channelNames.includes(channelName)) {
-                        channelNames.push(channelName);
+                    const channel = Object.assign({ id: channelName, name: channelName, workspaceType: data.workspaceType }, (workspaceRules.existingTeam && {
+                        teamId: workspaceRules.existingTeam,
+                    }));
+                    if (!channels.some((c) => {
+                        return c.name === channelName;
+                    })) {
+                        channels.push(channel);
                     }
                 }
             }
         }
-        logger.debug("Final list of existing channel names:");
-        logger.debug(channelNames);
-        return channelNames;
+        logger.debug("Final list of existing channels:");
+        logger.debug(channels);
+        return channels;
     }
     getnotificationChannelssFromNotificationRules(data) {
         logger.debug("getnotificationChannelssFromNotificationRules called with data:");
@@ -1095,10 +1182,14 @@ export class Service extends DatabaseService {
                     return name.channelName === channelName;
                 }).length === 0) {
                     // if channel name is not already added then add it.
-                    channels.push({
+                    const channelData = {
                         channelName: channelName,
                         notificationRuleId: notificationRule.id.toString() || "",
-                    });
+                    };
+                    if (workspaceRules.teamToCreateChannelIn) {
+                        channelData.teamId = workspaceRules.teamToCreateChannelIn;
+                    }
+                    channels.push(channelData);
                     logger.debug(`Channel name ${channelName} added to the list.`);
                 }
                 else {