@oneuptime/common 8.0.5347 → 8.0.5354

package/Server/API/MicrosoftTeamsAPI.ts

@@ -58,7 +58,7 @@ export default class MicrosoftTeamsAPI {
         "https://developer.microsoft.com/json-schemas/teams/v1.23/MicrosoftTeams.schema.json",
       manifestVersion: "1.23",
       version: AppVersion.toLowerCase().includes("unknown")
-        ? "1.1.0"
+        ? "1.3.0"
         : AppVersion,
       id: MicrosoftTeamsAppClientId,
       developer: {
@@ -66,16 +66,22 @@ export default class MicrosoftTeamsAPI {
         websiteUrl: "https://oneuptime.com",
         privacyUrl: "https://oneuptime.com/legal/privacy",
         termsOfUseUrl: "https://oneuptime.com/legal/terms",
-        publisherDocsUrl:
-          "https://oneuptime.com/docs/workspace-connections/microsoft-teams",
       },
+      publisherDocsUrl:
+        "https://oneuptime.com/docs/workspace-connections/microsoft-teams",
       name: {
         short: "OneUptime",
         full: "OneUptime - Complete Observability Platform",
       },
       description: {
-        short: "Monitor your apps, websites, APIs, and more with OneUptime",
-        full: "OneUptime is a complete open-source observability platform that helps you monitor your applications, websites, APIs, and infrastructure. Get alerted when things go wrong and maintain your SLAs.",
+        short: "Complete open-source monitoring and observability platform. ",
+        full: `OneUptime is a comprehensive solution for monitoring and managing your online services. Whether you need to check the availability of your website, dashboard, API, or any other online resource, OneUptime can alert your team when downtime happens and keep your customers informed with a status page. OneUptime also helps you handle incidents, set up on-call rotations, run tests, secure your services, analyze logs, track performance, and debug errors.
+
+In order to use the app, you need to have an active account with OneUptime at https://oneuptime.com. Please send an email to support@oneupitme.com if you need more details. 
+
+Create a new OneUptime Account: If you wish to sign up for a new account, you can do so at https://oneuptime.com and click on Sign up. 
+Help and Support: You can reach out to help and support here: https://oneuptime.com/support or contact support@oneuptime.com
+`,
       },
       // Default to size-specific names; route will adjust if fallbacks are used
       icons: {
@@ -142,8 +148,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadDataException(
-                "Microsoft Teams App Client ID must be a valid GUID. Update the environment variable.",
-              ),
+                "Microsoft Teams App Client ID must be a valid GUID. Update the environment variable."
+              )
             );
           }
 
@@ -155,7 +161,7 @@ export default class MicrosoftTeamsAPI {
           res.setHeader("Content-Type", "application/zip");
           res.setHeader(
             "Content-Disposition",
-            'attachment; filename="oneuptime-teams-app.zip"',
+            'attachment; filename="oneuptime-teams-app.zip"'
           );
 
           // Create archive
@@ -174,11 +180,11 @@ export default class MicrosoftTeamsAPI {
 
           const colorPath: string = path.join(
             __dirname,
-            "../Images/MicrosoftTeams/color.png",
+            "../Images/MicrosoftTeams/color.png"
           );
           const outlinePath: string = path.join(
             __dirname,
-            "../Images/MicrosoftTeams/outline.png",
+            "../Images/MicrosoftTeams/outline.png"
           );
 
           let colorIconBuffer: Buffer | null = null;
@@ -194,7 +200,7 @@ export default class MicrosoftTeamsAPI {
             iconOutlineName = "outline.png";
           } else {
             throw new BadDataException(
-              "Microsoft Teams icons not found. Expected either pre-sized icon-color-192x192.png and icon-outline-32x32.png in Common/Server/Images/MicrosoftTeams, or fallback color.png and outline.png.",
+              "Microsoft Teams icons not found. Expected either pre-sized icon-color-192x192.png and icon-outline-32x32.png in Common/Server/Images/MicrosoftTeams, or fallback color.png and outline.png."
             );
           }
 
@@ -219,10 +225,10 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadDataException("Failed to create Teams app manifest zip"),
+            new BadDataException("Failed to create Teams app manifest zip")
           );
         }
-      },
+      }
     );
 
     /*
@@ -237,7 +243,7 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadDataException("Microsoft Teams App Client ID is not set"),
+            new BadDataException("Microsoft Teams App Client ID is not set")
           );
         }
 
@@ -245,9 +251,7 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadDataException(
-              "Microsoft Teams App Client Secret is not set",
-            ),
+            new BadDataException("Microsoft Teams App Client Secret is not set")
           );
         }
 
@@ -258,9 +262,7 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadRequestException(
-              "Invalid request - state param not present",
-            ),
+            new BadRequestException("Invalid request - state param not present")
           );
         }
 
@@ -270,7 +272,7 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadRequestException("Invalid state param"),
+            new BadRequestException("Invalid state param")
           );
         }
 
@@ -279,14 +281,14 @@ export default class MicrosoftTeamsAPI {
 
         const teamsIntegrationPageUrl: URL = URL.fromString(
           DashboardClientUrl.toString() +
-            `/${projectId.toString()}/settings/microsoft-teams-integration`,
+            `/${projectId.toString()}/settings/microsoft-teams-integration`
         );
 
         if (error) {
           return Response.redirect(
             req,
             res,
-            teamsIntegrationPageUrl.addQueryParam("error", error),
+            teamsIntegrationPageUrl.addQueryParam("error", error)
           );
         }
 
@@ -296,14 +298,14 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadRequestException("Invalid request - no authorization code"),
+            new BadRequestException("Invalid request - no authorization code")
           );
         }
 
         try {
           // Exchange code for access token
           const redirectUri: URL = URL.fromString(
-            `${AppApiClientUrl.toString()}/microsoft-teams/auth`,
+            `${AppApiClientUrl.toString()}/microsoft-teams/auth`
           );
 
           const tokenRequestBody: JSONObject = {
@@ -317,14 +319,14 @@ export default class MicrosoftTeamsAPI {
           };
 
           logger.debug(
-            "Microsoft Teams Token Request Body (static redirect): ",
+            "Microsoft Teams Token Request Body (static redirect): "
           );
           logger.debug(tokenRequestBody);
 
           const tokenResponse: HTTPErrorResponse | HTTPResponse<JSONObject> =
             await API.post<JSONObject>({
               url: URL.fromString(
-                "https://login.microsoftonline.com/common/oauth2/v2.0/token",
+                "https://login.microsoftonline.com/common/oauth2/v2.0/token"
               ),
               data: tokenRequestBody,
               headers: {
@@ -347,8 +349,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadRequestException(
-                "Failed to get access token from Microsoft Teams",
-              ),
+                "Failed to get access token from Microsoft Teams"
+              )
             );
           }
 
@@ -411,7 +413,7 @@ export default class MicrosoftTeamsAPI {
           return Response.redirect(
             req,
             res,
-            teamsIntegrationPageUrl.addQueryParam("needAdminConsent", "true"),
+            teamsIntegrationPageUrl.addQueryParam("needAdminConsent", "true")
           );
         } catch (err) {
           logger.error("Error in static Microsoft Teams auth callback: ");
@@ -419,10 +421,10 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadDataException("Failed to authenticate with Microsoft Teams"),
+            new BadDataException("Failed to authenticate with Microsoft Teams")
           );
         }
-      },
+      }
     );
 
     // Endpoint to finalize team selection when multiple teams are available.
@@ -439,8 +441,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadRequestException(
-                "projectId, userId and teamId are required",
-              ),
+                "projectId, userId and teamId are required"
+              )
             );
           }
 
@@ -460,8 +462,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadRequestException(
-                "User Microsoft Teams auth not found. Please re-authenticate.",
-              ),
+                "User Microsoft Teams auth not found. Please re-authenticate."
+              )
             );
           }
 
@@ -472,7 +474,7 @@ export default class MicrosoftTeamsAPI {
               projectId: projectId,
             });
           const matchedTeam: MicrosoftTeamsTeam | undefined = Object.values(
-            availableTeams,
+            availableTeams
           ).find((t: MicrosoftTeamsTeam) => {
             return t.id === teamId;
           });
@@ -482,8 +484,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadRequestException(
-                "Selected teamId is not in availableTeams list",
-              ),
+                "Selected teamId is not in availableTeams list"
+              )
             );
           }
 
@@ -493,11 +495,11 @@ export default class MicrosoftTeamsAPI {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadRequestException("Invalid JWT token"),
+              new BadRequestException("Invalid JWT token")
             );
           }
           const payload: JSONObject = JSON.parse(
-            Buffer.from(tokenParts[1]!, "base64").toString("utf-8"),
+            Buffer.from(tokenParts[1]!, "base64").toString("utf-8")
           );
           const tenantId: string = payload["tid"] as string;
 
@@ -505,7 +507,7 @@ export default class MicrosoftTeamsAPI {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadRequestException("Tenant ID not found in token"),
+              new BadRequestException("Tenant ID not found in token")
             );
           }
 
@@ -565,10 +567,10 @@ export default class MicrosoftTeamsAPI {
           return Response.sendErrorResponse(
             req,
             res,
-            new BadDataException("Failed to select Microsoft Teams team"),
+            new BadDataException("Failed to select Microsoft Teams team")
           );
         }
-      },
+      }
     );
 
     /*
@@ -583,7 +585,7 @@ export default class MicrosoftTeamsAPI {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadDataException("Microsoft Teams App Client ID is not set"),
+              new BadDataException("Microsoft Teams App Client ID is not set")
             );
           }
 
@@ -593,8 +595,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadRequestException(
-                "Invalid request - state param not present",
-              ),
+                "Invalid request - state param not present"
+              )
             );
           }
 
@@ -603,7 +605,7 @@ export default class MicrosoftTeamsAPI {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadRequestException("Invalid state param"),
+              new BadRequestException("Invalid state param")
             );
           }
 
@@ -627,17 +629,17 @@ export default class MicrosoftTeamsAPI {
           }
 
           const redirectUri: URL = URL.fromString(
-            `${AppApiClientUrl.toString()}/microsoft-teams/admin-consent/callback`,
+            `${AppApiClientUrl.toString()}/microsoft-teams/admin-consent/callback`
           );
 
           const adminConsentUrl: string = `https://login.microsoftonline.com/${encodeURIComponent(
-            tenantForConsent,
+            tenantForConsent
           )}/v2.0/adminconsent?client_id=${encodeURIComponent(
-            MicrosoftTeamsAppClientId,
+            MicrosoftTeamsAppClientId
           )}&scope=${encodeURIComponent(
-            "https://graph.microsoft.com/.default",
+            "https://graph.microsoft.com/.default"
           )}&redirect_uri=${encodeURIComponent(redirectUri.toString())}&state=${encodeURIComponent(
-            stateParam,
+            stateParam
           )}`;
 
           return Response.redirect(req, res, URL.fromString(adminConsentUrl));
@@ -648,11 +650,11 @@ export default class MicrosoftTeamsAPI {
             req,
             res,
             new BadDataException(
-              "Failed to start Microsoft Teams admin consent",
-            ),
+              "Failed to start Microsoft Teams admin consent"
+            )
           );
         }
-      },
+      }
     );
 
     /*
@@ -674,8 +676,8 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               new BadRequestException(
-                "Invalid request - state param not present",
-              ),
+                "Invalid request - state param not present"
+              )
             );
           }
 
@@ -684,7 +686,7 @@ export default class MicrosoftTeamsAPI {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadRequestException("Invalid state param"),
+              new BadRequestException("Invalid state param")
             );
           }
 
@@ -692,7 +694,7 @@ export default class MicrosoftTeamsAPI {
 
           const teamsIntegrationPageUrl: URL = URL.fromString(
             DashboardClientUrl.toString() +
-              `/${projectId.toString()}/settings/microsoft-teams-integration`,
+              `/${projectId.toString()}/settings/microsoft-teams-integration`
           );
 
           if (error) {
@@ -701,8 +703,8 @@ export default class MicrosoftTeamsAPI {
               res,
               teamsIntegrationPageUrl.addQueryParam(
                 "error",
-                `${error}${errorDescription ? ": " + errorDescription : ""}`,
-              ),
+                `${error}${errorDescription ? ": " + errorDescription : ""}`
+              )
             );
           }
 
@@ -712,8 +714,8 @@ export default class MicrosoftTeamsAPI {
               res,
               teamsIntegrationPageUrl.addQueryParam(
                 "error",
-                "Missing tenant information from admin consent callback",
-              ),
+                "Missing tenant information from admin consent callback"
+              )
             );
           }
 
@@ -723,8 +725,8 @@ export default class MicrosoftTeamsAPI {
               res,
               teamsIntegrationPageUrl.addQueryParam(
                 "error",
-                "Microsoft Teams App credentials are not configured",
-              ),
+                "Microsoft Teams App credentials are not configured"
+              )
             );
           }
 
@@ -739,7 +741,7 @@ export default class MicrosoftTeamsAPI {
           const tokenResp: HTTPErrorResponse | HTTPResponse<JSONObject> =
             await API.post<JSONObject>({
               url: URL.fromString(
-                `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`,
+                `https://login.microsoftonline.com/${tenantId}/oauth2/v2.0/token`
               ),
               data: {
                 client_id: MicrosoftTeamsAppClientId,
@@ -758,8 +760,8 @@ export default class MicrosoftTeamsAPI {
               res,
               teamsIntegrationPageUrl.addQueryParam(
                 "error",
-                "Failed to get Graph app token after admin consent",
-              ),
+                "Failed to get Graph app token after admin consent"
+              )
             );
           }
 
@@ -768,7 +770,7 @@ export default class MicrosoftTeamsAPI {
             (tokenData["access_token"] as string) || "";
           const expiresInSec: number = Number(tokenData["expires_in"] || 0);
           const expiresAtIso: string = new Date(
-            Date.now() + Math.max(0, (expiresInSec - 60) * 1000),
+            Date.now() + Math.max(0, (expiresInSec - 60) * 1000)
           ).toISOString();
 
           logger.debug("App Access Token acquired via admin consent: ");
@@ -795,7 +797,7 @@ export default class MicrosoftTeamsAPI {
                 | HTTPErrorResponse
                 | HTTPResponse<JSONObject> = await API.get<JSONObject>({
                 url: URL.fromString(
-                  "https://graph.microsoft.com/v1.0/teams?$select=id,displayName",
+                  "https://graph.microsoft.com/v1.0/teams?$select=id,displayName"
                 ),
                 headers: {
                   Authorization: `Bearer ${appAccessToken}`,
@@ -810,8 +812,8 @@ export default class MicrosoftTeamsAPI {
                   res,
                   teamsIntegrationPageUrl.addQueryParam(
                     "error",
-                    "Failed to retrieve teams from Microsoft Graph API after admin consent",
-                  ),
+                    "Failed to retrieve teams from Microsoft Graph API after admin consent"
+                  )
                 );
               }
 
@@ -825,8 +827,8 @@ export default class MicrosoftTeamsAPI {
                   res,
                   teamsIntegrationPageUrl.addQueryParam(
                     "error",
-                    "No teams available in your Microsoft 365 tenant. Please create a team first.",
-                  ),
+                    "No teams available in your Microsoft 365 tenant. Please create a team first."
+                  )
                 );
               }
 
@@ -839,7 +841,7 @@ export default class MicrosoftTeamsAPI {
                   acc[team.name] = team;
                   return acc;
                 },
-                {} as Record<string, MicrosoftTeamsTeam>,
+                {} as Record<string, MicrosoftTeamsTeam>
               );
             } catch (error) {
               logger.error("Error getting teams:");
@@ -849,8 +851,8 @@ export default class MicrosoftTeamsAPI {
                 res,
                 teamsIntegrationPageUrl.addQueryParam(
                   "error",
-                  "Failed to retrieve teams from Microsoft Graph API",
-                ),
+                  "Failed to retrieve teams from Microsoft Graph API"
+                )
               );
             }
           }
@@ -880,7 +882,7 @@ export default class MicrosoftTeamsAPI {
             res,
             teamsIntegrationPageUrl
               .addQueryParam("adminConsent", "success")
-              .addQueryParam("tenantId", tenantId),
+              .addQueryParam("tenantId", tenantId)
           );
         } catch (err) {
           logger.error("Error in Microsoft Teams admin consent callback: ");
@@ -893,15 +895,15 @@ export default class MicrosoftTeamsAPI {
             if (projectId) {
               const teamsIntegrationPageUrl: URL = URL.fromString(
                 DashboardClientUrl.toString() +
-                  `/${projectId.toString()}/settings/microsoft-teams-integration`,
+                  `/${projectId.toString()}/settings/microsoft-teams-integration`
               );
               return Response.redirect(
                 req,
                 res,
                 teamsIntegrationPageUrl.addQueryParam(
                   "error",
-                  "Failed to finalize Microsoft Teams admin consent",
-                ),
+                  "Failed to finalize Microsoft Teams admin consent"
+                )
               );
             }
           } catch {
@@ -911,11 +913,11 @@ export default class MicrosoftTeamsAPI {
             req,
             res,
             new BadDataException(
-              "Failed to finalize Microsoft Teams admin consent",
-            ),
+              "Failed to finalize Microsoft Teams admin consent"
+            )
           );
         }
-      },
+      }
     );
 
     /*
@@ -936,7 +938,7 @@ export default class MicrosoftTeamsAPI {
             });
           }
         }
-      },
+      }
     );
 
     // Microsoft Teams webhook endpoint for interactive messages (legacy)
@@ -969,7 +971,7 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               authResult,
-              activity,
+              activity
             );
           } else if (activityType === "invoke") {
             // Handle adaptive card actions
@@ -977,7 +979,7 @@ export default class MicrosoftTeamsAPI {
               req,
               res,
               authResult,
-              activity,
+              activity
             );
           }
 
@@ -987,7 +989,7 @@ export default class MicrosoftTeamsAPI {
           logger.error(error);
           return Response.sendTextResponse(req, res, "");
         }
-      },
+      }
     );
 
     // Test endpoint to verify Bot Framework setup
@@ -1011,7 +1013,7 @@ export default class MicrosoftTeamsAPI {
           clientId: MicrosoftTeamsAppClientId,
           messagingEndpoint: `${AppApiClientUrl.toString()}/microsoft-bot/messages`,
         });
-      },
+      }
     );
 
     // Connector configuration endpoint
@@ -1053,7 +1055,7 @@ export default class MicrosoftTeamsAPI {
 
         res.setHeader("Content-Type", "text/html");
         return res.send(html);
-      },
+      }
     );
 
     // Get available teams for a project
@@ -1080,13 +1082,13 @@ export default class MicrosoftTeamsAPI {
                   id: team.id,
                   name: team.name,
                 };
-              },
+              }
             ),
           });
         } catch (err) {
           return Response.sendErrorResponse(req, res, err as Exception);
         }
-      },
+      }
     );
 
     // Endpoint to refresh teams list
@@ -1113,13 +1115,13 @@ export default class MicrosoftTeamsAPI {
                   id: team.id,
                   name: team.name,
                 };
-              },
+              }
             ),
           });
         } catch (err) {
           return Response.sendErrorResponse(req, res, err as Exception);
         }
-      },
+      }
     );
 
     return router;
@@ -1129,7 +1131,7 @@ export default class MicrosoftTeamsAPI {
     _req: ExpressRequest,
     res: ExpressResponse,
     authResult: MicrosoftTeamsRequest,
-    activity: JSONObject,
+    activity: JSONObject
   ): Promise<void> {
     // Handle direct messages to bot or @mentions
     const messageText: string = (activity["text"] as string) || "";
@@ -1156,7 +1158,7 @@ export default class MicrosoftTeamsAPI {
     req: ExpressRequest,
     res: ExpressResponse,
     authResult: MicrosoftTeamsRequest,
-    _activity: JSONObject,
+    _activity: JSONObject
   ): Promise<void> {
     /*
      * Handle adaptive card button clicks
@@ -1206,7 +1208,7 @@ export default class MicrosoftTeamsAPI {
             action: action,
             req: req,
             res: res,
-          },
+          }
         );
       }
 

package/Server/Services/UserNotificationRuleService.ts

@@ -1058,7 +1058,7 @@ export class Service extends DatabaseService<Model> {
         host,
         new Route(AppApiRoute.toString())
           .addRoute(new UserOnCallLogTimeline().crudApiPath!)
-          .addRoute("/acknowledge/" + userOnCallLogTimelineId.toString()),
+          .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString()),
       ),
     );
     const url: URL = await ShortLinkService.getShortenedUrl(shortUrl);
@@ -1091,7 +1091,7 @@ export class Service extends DatabaseService<Model> {
         host,
         new Route(AppApiRoute.toString())
           .addRoute(new UserOnCallLogTimeline().crudApiPath!)
-          .addRoute("/acknowledge/" + userOnCallLogTimelineId.toString()),
+          .addRoute("/acknowledge-page/" + userOnCallLogTimelineId.toString()),
       ),
     );
     const url: URL = await ShortLinkService.getShortenedUrl(shortUrl);
@@ -1125,7 +1125,9 @@ export class Service extends DatabaseService<Model> {
           host,
           new Route(AppApiRoute.toString())
             .addRoute(new UserOnCallLogTimeline().crudApiPath!)
-            .addRoute("/acknowledge/" + userOnCallLogTimelineId.toString()),
+            .addRoute(
+              "/acknowledge-page/" + userOnCallLogTimelineId.toString(),
+            ),
         ),
       );
 
@@ -1179,7 +1181,9 @@ export class Service extends DatabaseService<Model> {
           host,
           new Route(AppApiRoute.toString())
             .addRoute(new UserOnCallLogTimeline().crudApiPath!)
-            .addRoute("/acknowledge/" + userOnCallLogTimelineId.toString()),
+            .addRoute(
+              "/acknowledge-page/" + userOnCallLogTimelineId.toString(),
+            ),
         ),
       );