@oneuptime/common 9.5.7 → 9.5.8

package/Models/DatabaseModels/UserPush.ts

@@ -16,6 +16,7 @@ import TenantColumn from "../../Types/Database/TenantColumn";
 import IconProp from "../../Types/Icon/IconProp";
 import ObjectID from "../../Types/ObjectID";
 import Permission from "../../Types/Permission";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import { Column, Entity, Index, JoinColumn, ManyToOne } from "typeorm";
 
 @TenantColumn("projectId")
@@ -122,7 +123,7 @@ class UserPush extends BaseModel {
     unique: false,
     nullable: false,
   })
-  public deviceType?: "web" = "web" as const; // Only web support for now
+  public deviceType?: PushDeviceType = undefined;
 
   @ColumnAccessControl({
     create: [Permission.CurrentUser],

package/Server/API/UserPushAPI.ts

@@ -14,6 +14,7 @@ import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import UserPush from "../../Models/DatabaseModels/UserPush";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
 
@@ -39,11 +40,17 @@ export default class UserPushAPI extends BaseAPI<
             );
           }
 
-          if (!req.body.deviceType || req.body.deviceType !== "web") {
+          const validDeviceTypes: string[] = Object.values(PushDeviceType);
+          if (
+            !req.body.deviceType ||
+            !validDeviceTypes.includes(req.body.deviceType)
+          ) {
             return Response.sendErrorResponse(
               req,
               res,
-              new BadDataException("Only web device type is supported"),
+              new BadDataException(
+                "Device type must be one of: " + validDeviceTypes.join(", "),
+              ),
             );
           }
 
@@ -86,7 +93,7 @@ export default class UserPushAPI extends BaseAPI<
           userPush.deviceToken = req.body.deviceToken;
           userPush.deviceType = req.body.deviceType;
           userPush.deviceName = req.body.deviceName || "Unknown Device";
-          userPush.isVerified = true; // For web push, we consider it verified immediately
+          userPush.isVerified = true; // Web, iOS, and Android devices are verified immediately
 
           const savedDevice: UserPush = await this.service.create({
             data: userPush,
@@ -105,6 +112,46 @@ export default class UserPushAPI extends BaseAPI<
       },
     );
 
+    this.router.post(
+      `/user-push/unregister`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          req = req as OneUptimeRequest;
+
+          if (!req.body.deviceToken) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Device token is required"),
+            );
+          }
+
+          const userId: ObjectID = (req as OneUptimeRequest).userAuthorization!
+            .userId!;
+
+          await this.service.deleteBy({
+            query: {
+              userId: userId,
+              deviceToken: req.body.deviceToken,
+            },
+            limit: 100,
+            skip: 0,
+            props: {
+              isRoot: true,
+            },
+          });
+
+          return Response.sendJsonObjectResponse(req, res, {
+            success: true,
+            message: "Device unregistered successfully",
+          });
+        } catch (error) {
+          return next(error);
+        }
+      },
+    );
+
     this.router.post(
       `/user-push/:deviceId/test-notification`,
       UserMiddleware.getUserMiddleware,
@@ -186,7 +233,7 @@ export default class UserPushAPI extends BaseAPI<
                   },
                 ],
                 message: testMessage,
-                deviceType: device.deviceType!,
+                deviceType: device.deviceType! as PushDeviceType,
               },
               {
                 isSensitive: false,

package/Server/Middleware/UserAuthorization.ts

@@ -64,18 +64,23 @@ export default class UserMiddleware {
   public static getAccessTokenFromExpressRequest(
     req: ExpressRequest,
   ): string | undefined {
-    let accessToken: string | undefined = undefined;
+    // 1. Try cookie (existing web dashboard flow)
+    const cookieToken: string | undefined =
+      CookieUtil.getCookieFromExpressRequest(req, CookieUtil.getUserTokenKey());
 
-    if (
-      CookieUtil.getCookieFromExpressRequest(req, CookieUtil.getUserTokenKey())
-    ) {
-      accessToken = CookieUtil.getCookieFromExpressRequest(
-        req,
-        CookieUtil.getUserTokenKey(),
-      );
+    if (cookieToken) {
+      return cookieToken;
     }
 
-    return accessToken;
+    // 2. Fallback: Check Authorization: Bearer <token> header (mobile app flow)
+    const authHeader: string | undefined = req.headers["authorization"] as
+      | string
+      | undefined;
+    if (authHeader && authHeader.startsWith("Bearer ")) {
+      return authHeader.substring(7);
+    }
+
+    return undefined;
   }
 
   @CaptureSpan()

package/Server/Services/PushNotificationService.ts

@@ -1,5 +1,6 @@
 import PushNotificationRequest from "../../Types/PushNotification/PushNotificationRequest";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import ObjectID from "../../Types/ObjectID";
 import logger from "../Utils/Logger";
 import UserPushService from "./UserPushService";
@@ -11,6 +12,7 @@ import {
   VapidSubject,
 } from "../EnvironmentConfig";
 import webpush from "web-push";
+import { Expo, ExpoPushMessage, ExpoPushTicket } from "expo-server-sdk";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
 import { LIMIT_PER_PROJECT } from "../../Types/Database/LimitMax";
 import UserPush from "../../Models/DatabaseModels/UserPush";
@@ -41,6 +43,7 @@ export interface PushNotificationOptions {
 
 export default class PushNotificationService {
   public static isWebPushInitialized = false;
+  private static expoClient: Expo = new Expo();
 
   public static initializeWebPush(): void {
     if (this.isWebPushInitialized) {
@@ -76,13 +79,8 @@ export default class PushNotificationService {
       throw new Error("No devices provided");
     }
 
-    if (request.deviceType !== "web") {
-      logger.error(`Unsupported device type: ${request.deviceType}`);
-      throw new Error("Only web push notifications are supported");
-    }
-
     logger.info(
-      `Sending web push notifications to ${request.devices.length} devices`,
+      `Sending ${request.deviceType} push notifications to ${request.devices.length} devices`,
     );
     logger.info(`Notification message: ${JSON.stringify(request.message)}`);
 
@@ -98,9 +96,25 @@ export default class PushNotificationService {
     const promises: Promise<void>[] = [];
 
     for (const device of request.devices) {
-      promises.push(
-        this.sendWebPushNotification(device.token, request.message, options),
-      );
+      if (request.deviceType === PushDeviceType.Web) {
+        promises.push(
+          this.sendWebPushNotification(device.token, request.message, options),
+        );
+      } else if (
+        request.deviceType === PushDeviceType.iOS ||
+        request.deviceType === PushDeviceType.Android
+      ) {
+        promises.push(
+          this.sendExpoPushNotification(
+            device.token,
+            request.message,
+            request.deviceType,
+            options,
+          ),
+        );
+      } else {
+        logger.error(`Unsupported device type: ${request.deviceType}`);
+      }
     }
 
     const results: Array<any> = await Promise.allSettled(promises);
@@ -314,6 +328,81 @@ export default class PushNotificationService {
     }
   }
 
+  private static async sendExpoPushNotification(
+    expoPushToken: string,
+    message: PushNotificationMessage,
+    deviceType: PushDeviceType,
+    _options: PushNotificationOptions,
+  ): Promise<void> {
+    if (!Expo.isExpoPushToken(expoPushToken)) {
+      throw new Error(
+        `Invalid Expo push token for ${deviceType} device: ${expoPushToken}`,
+      );
+    }
+
+    try {
+      const dataPayload: { [key: string]: string } = {};
+      if (message.data) {
+        for (const key of Object.keys(message.data)) {
+          dataPayload[key] = String(message.data[key]);
+        }
+      }
+      if (message.url || message.clickAction) {
+        dataPayload["url"] = message.url || message.clickAction || "";
+      }
+
+      const channelId: string =
+        deviceType === PushDeviceType.Android ? "oncall_high" : "default";
+
+      const expoPushMessage: ExpoPushMessage = {
+        to: expoPushToken,
+        title: message.title,
+        body: message.body,
+        data: dataPayload,
+        sound: "default",
+        priority: "high",
+        channelId: channelId,
+      };
+
+      const tickets: ExpoPushTicket[] =
+        await this.expoClient.sendPushNotificationsAsync([expoPushMessage]);
+
+      const ticket: ExpoPushTicket | undefined = tickets[0];
+
+      if (ticket && ticket.status === "error") {
+        const errorTicket: ExpoPushTicket & {
+          message?: string;
+          details?: { error?: string };
+        } = ticket as ExpoPushTicket & {
+          message?: string;
+          details?: { error?: string };
+        };
+        logger.error(
+          `Expo push notification error for ${deviceType} device: ${errorTicket.message}`,
+        );
+
+        if (errorTicket.details?.error === "DeviceNotRegistered") {
+          logger.info(
+            "Expo push token is no longer valid (DeviceNotRegistered)",
+          );
+        }
+
+        throw new Error(
+          `Expo push notification failed: ${errorTicket.message}`,
+        );
+      }
+
+      logger.info(
+        `Expo push notification sent successfully to ${deviceType} device`,
+      );
+    } catch (error: any) {
+      logger.error(
+        `Failed to send Expo push notification to ${deviceType} device: ${error.message}`,
+      );
+      throw error;
+    }
+  }
+
   public static async sendPushNotificationToUser(
     userId: ObjectID,
     projectId: ObjectID,
@@ -342,33 +431,46 @@ export default class PushNotificationService {
 
     if (userPushDevices.length === 0) {
       logger.info(
-        `No verified web push devices found for user ${userId.toString()}`,
+        `No verified push devices found for user ${userId.toString()}`,
       );
       return;
     }
 
-    // Get web devices with tokens and names
-    const webDevices: Array<{ token: string; name?: string }> = [];
+    // Group devices by type
+    const devicesByType: Map<
+      string,
+      Array<{ token: string; name?: string }>
+    > = new Map();
 
     for (const device of userPushDevices) {
-      if (device.deviceType === "web") {
-        webDevices.push({
-          token: device.deviceToken!,
-          name: device.deviceName || "Unknown Device",
-        });
+      const type: string = device.deviceType || PushDeviceType.Web;
+      if (!devicesByType.has(type)) {
+        devicesByType.set(type, []);
       }
+      devicesByType.get(type)!.push({
+        token: device.deviceToken!,
+        name: device.deviceName || "Unknown Device",
+      });
     }
 
-    // Send notifications to web devices
-    if (webDevices.length > 0) {
-      await this.sendPushNotification(
-        {
-          devices: webDevices,
-          message: message,
-          deviceType: "web",
-        },
-        options,
-      );
+    // Send notifications to each device type group
+    const sendPromises: Promise<void>[] = [];
+
+    for (const [deviceType, devices] of devicesByType.entries()) {
+      if (devices.length > 0) {
+        sendPromises.push(
+          this.sendPushNotification(
+            {
+              devices: devices,
+              message: message,
+              deviceType: deviceType as PushDeviceType,
+            },
+            options,
+          ),
+        );
+      }
     }
+
+    await Promise.allSettled(sendPromises);
   }
 }

package/Server/Services/UserNotificationRuleService.ts

@@ -29,6 +29,7 @@ import EmailTemplateType from "../../Types/Email/EmailTemplateType";
 import BadDataException from "../../Types/Exception/BadDataException";
 import NotificationRuleType from "../../Types/NotificationRule/NotificationRuleType";
 import ObjectID from "../../Types/ObjectID";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import Phone from "../../Types/Phone";
 import SMS from "../../Types/SMS/SMS";
 import WhatsAppMessage from "../../Types/WhatsApp/WhatsAppMessage";
@@ -1101,6 +1102,8 @@ export class Service extends DatabaseService<Model> {
             ...(alert.alertNumber !== undefined && {
               alertNumber: alert.alertNumber,
             }),
+            alertId: alert.id!.toString(),
+            projectId: alert.projectId!.toString(),
           });
 
         // send push notification.
@@ -1115,7 +1118,8 @@ export class Service extends DatabaseService<Model> {
               },
             ],
             message: pushMessage,
-            deviceType: notificationRuleItem.userPush.deviceType!,
+            deviceType: notificationRuleItem.userPush
+              .deviceType! as PushDeviceType,
           },
           {
             projectId: options.projectId,
@@ -1175,6 +1179,8 @@ export class Service extends DatabaseService<Model> {
             ...(incident.incidentNumber !== undefined && {
               incidentNumber: incident.incidentNumber,
             }),
+            incidentId: incident.id!.toString(),
+            projectId: incident.projectId!.toString(),
           });
 
         // send push notification.
@@ -1189,7 +1195,8 @@ export class Service extends DatabaseService<Model> {
               },
             ],
             message: pushMessage,
-            deviceType: notificationRuleItem.userPush.deviceType!,
+            deviceType: notificationRuleItem.userPush
+              .deviceType! as PushDeviceType,
           },
           {
             projectId: options.projectId,
@@ -1251,6 +1258,8 @@ export class Service extends DatabaseService<Model> {
             ...(alertEpisode.episodeNumberWithPrefix && {
               episodeNumberWithPrefix: alertEpisode.episodeNumberWithPrefix,
             }),
+            alertEpisodeId: alertEpisode.id!.toString(),
+            projectId: alertEpisode.projectId!.toString(),
           });
 
         PushNotificationService.sendPushNotification(
@@ -1264,7 +1273,8 @@ export class Service extends DatabaseService<Model> {
               },
             ],
             message: pushMessage,
-            deviceType: notificationRuleItem.userPush.deviceType!,
+            deviceType: notificationRuleItem.userPush
+              .deviceType! as PushDeviceType,
           },
           {
             projectId: options.projectId,

package/Server/Services/UserPushService.ts

@@ -4,6 +4,7 @@ import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import BadDataException from "../../Types/Exception/BadDataException";
 import PositiveNumber from "../../Types/PositiveNumber";
+import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import UserPush from "../../Models/DatabaseModels/UserPush";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 
@@ -25,7 +26,7 @@ export class Service extends DatabaseService<UserPush> {
     }
 
     // Validate device type
-    const validDeviceTypes: string[] = ["web", "android", "ios"];
+    const validDeviceTypes: string[] = Object.values(PushDeviceType);
     if (!validDeviceTypes.includes(createBy.data.deviceType)) {
       throw new BadDataException(
         "Device type must be one of: " + validDeviceTypes.join(", "),

package/Server/Utils/PushNotificationUtil.ts

@@ -21,6 +21,8 @@ export default class PushNotificationUtil {
     incidentViewLink: string;
     incidentNumber?: number;
     incidentNumberWithPrefix?: string;
+    incidentId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       incidentTitle,
@@ -28,6 +30,8 @@ export default class PushNotificationUtil {
       incidentViewLink,
       incidentNumber,
       incidentNumberWithPrefix,
+      incidentId,
+      projectId,
     } = params;
     const displayNumber: string =
       incidentNumberWithPrefix || (incidentNumber ? `#${incidentNumber}` : "");
@@ -43,6 +47,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "incident-created",
+        entityType: "incident",
+        entityId: incidentId,
+        projectId: projectId,
         incidentTitle: incidentTitle,
         projectName: projectName,
         url: incidentViewLink,
@@ -58,6 +65,8 @@ export default class PushNotificationUtil {
     incidentViewLink: string;
     incidentNumber?: number;
     incidentNumberWithPrefix?: string;
+    incidentId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       incidentTitle,
@@ -67,6 +76,8 @@ export default class PushNotificationUtil {
       incidentViewLink,
       incidentNumber,
       incidentNumberWithPrefix,
+      incidentId,
+      projectId,
     } = params;
     const displayNumber: string =
       incidentNumberWithPrefix || (incidentNumber ? `#${incidentNumber}` : "");
@@ -85,6 +96,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "incident-state-changed",
+        entityType: "incident",
+        entityId: incidentId,
+        projectId: projectId,
         incidentTitle: incidentTitle,
         projectName: projectName,
         newState: newState,
@@ -101,6 +115,8 @@ export default class PushNotificationUtil {
     incidentViewLink: string;
     incidentNumber?: number;
     incidentNumberWithPrefix?: string;
+    incidentId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       incidentTitle,
@@ -109,6 +125,8 @@ export default class PushNotificationUtil {
       incidentViewLink,
       incidentNumber,
       incidentNumberWithPrefix,
+      incidentId,
+      projectId,
     } = params;
     const noteType: string = isPrivateNote ? "Private" : "Public";
     const displayNumber: string =
@@ -125,6 +143,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "incident-note-posted",
+        entityType: "incident",
+        entityId: incidentId,
+        projectId: projectId,
         incidentTitle: incidentTitle,
         projectName: projectName,
         isPrivateNote: isPrivateNote,
@@ -139,6 +160,8 @@ export default class PushNotificationUtil {
     alertViewLink: string;
     alertNumber?: number;
     alertNumberWithPrefix?: string;
+    alertId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       alertTitle,
@@ -146,6 +169,8 @@ export default class PushNotificationUtil {
       alertViewLink,
       alertNumber,
       alertNumberWithPrefix,
+      alertId,
+      projectId,
     } = params;
     const displayNumber: string =
       alertNumberWithPrefix || (alertNumber ? `#${alertNumber}` : "");
@@ -161,6 +186,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "alert-created",
+        entityType: "alert",
+        entityId: alertId,
+        projectId: projectId,
         alertTitle: alertTitle,
         projectName: projectName,
         url: alertViewLink,
@@ -174,6 +202,8 @@ export default class PushNotificationUtil {
     alertEpisodeViewLink: string;
     episodeNumber?: number;
     episodeNumberWithPrefix?: string;
+    alertEpisodeId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       alertEpisodeTitle,
@@ -181,6 +211,8 @@ export default class PushNotificationUtil {
       alertEpisodeViewLink,
       episodeNumber,
       episodeNumberWithPrefix,
+      alertEpisodeId,
+      projectId,
     } = params;
     const displayNumber: string =
       episodeNumberWithPrefix || (episodeNumber ? `#${episodeNumber}` : "");
@@ -196,6 +228,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "alert-episode-created",
+        entityType: "alert-episode",
+        entityId: alertEpisodeId,
+        projectId: projectId,
         alertEpisodeTitle: alertEpisodeTitle,
         projectName: projectName,
         url: alertEpisodeViewLink,
@@ -209,6 +244,8 @@ export default class PushNotificationUtil {
     incidentEpisodeViewLink: string;
     episodeNumber?: number;
     episodeNumberWithPrefix?: string;
+    incidentEpisodeId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       incidentEpisodeTitle,
@@ -216,6 +253,8 @@ export default class PushNotificationUtil {
       incidentEpisodeViewLink,
       episodeNumber,
       episodeNumberWithPrefix,
+      incidentEpisodeId,
+      projectId,
     } = params;
     const displayNumber: string =
       episodeNumberWithPrefix || (episodeNumber ? `#${episodeNumber}` : "");
@@ -231,6 +270,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "incident-episode-created",
+        entityType: "incident-episode",
+        entityId: incidentEpisodeId,
+        projectId: projectId,
         incidentEpisodeTitle: incidentEpisodeTitle,
         projectName: projectName,
         url: incidentEpisodeViewLink,
@@ -244,6 +286,8 @@ export default class PushNotificationUtil {
     newStatus: string;
     previousStatus?: string;
     monitorViewLink: string;
+    monitorId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       monitorName,
@@ -251,6 +295,8 @@ export default class PushNotificationUtil {
       newStatus,
       previousStatus,
       monitorViewLink,
+      monitorId,
+      projectId,
     } = params;
     const statusChangeText: string = previousStatus
       ? `Monitor status changed from ${previousStatus} to ${newStatus}`
@@ -264,6 +310,9 @@ export default class PushNotificationUtil {
       requireInteraction: true,
       data: {
         type: "monitor-status-changed",
+        entityType: "monitor",
+        entityId: monitorId,
+        projectId: projectId,
         monitorName: monitorName,
         projectName: projectName,
         newStatus: newStatus,
@@ -280,6 +329,8 @@ export default class PushNotificationUtil {
     viewLink: string;
     scheduledMaintenanceNumber?: number;
     scheduledMaintenanceNumberWithPrefix?: string;
+    scheduledMaintenanceId?: string;
+    projectId?: string;
   }): PushNotificationMessage {
     const {
       title,
@@ -288,6 +339,8 @@ export default class PushNotificationUtil {
       viewLink,
       scheduledMaintenanceNumber,
       scheduledMaintenanceNumberWithPrefix,
+      scheduledMaintenanceId,
+      projectId,
     } = params;
     const displayNumber: string =
       scheduledMaintenanceNumberWithPrefix ||
@@ -304,6 +357,9 @@ export default class PushNotificationUtil {
       requireInteraction: false,
       data: {
         type: "scheduled-maintenance",
+        entityType: "scheduled-maintenance",
+        entityId: scheduledMaintenanceId,
+        projectId: projectId,
         title: title,
         projectName: projectName,
         state: state,

package/Types/PushNotification/PushDeviceType.ts

@@ -0,0 +1,7 @@
+enum PushDeviceType {
+  Web = "web",
+  iOS = "ios",
+  Android = "android",
+}
+
+export default PushDeviceType;

package/Types/PushNotification/PushNotificationRequest.ts

@@ -1,3 +1,5 @@
+import PushDeviceType from "./PushDeviceType";
+
 interface PushNotificationRequest {
   devices: Array<{
     token: string;
@@ -19,7 +21,7 @@ interface PushNotificationRequest {
     clickAction?: string;
     url?: string;
   };
-  deviceType: "web";
+  deviceType: PushDeviceType;
 }
 
 export default PushNotificationRequest;