@oneuptime/common 9.5.12 → 10.0.0

package/Models/DatabaseModels/GlobalConfig.ts

@@ -58,6 +58,25 @@ export default class GlobalConfig extends GlobalConfigModel {
   })
   public disableSignup?: boolean = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.Boolean,
+    title: "Disable User Project Creation",
+    description: "Only master admins can create projects when enabled.",
+    defaultValue: false,
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: true,
+    default: false,
+    unique: true,
+  })
+  public disableUserProjectCreation?: boolean = undefined;
+
   // SMTP Settings.
 
   @ColumnAccessControl({

package/Server/API/UserCallAPI.ts

@@ -2,6 +2,7 @@ import UserMiddleware from "../Middleware/UserAuthorization";
 import UserCallService, {
   Service as UserCallServiceType,
 } from "../Services/UserCallService";
+import UserNotificationRuleService from "../Services/UserNotificationRuleService";
 import {
   ExpressRequest,
   ExpressResponse,
@@ -9,8 +10,10 @@ import {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
+import logger from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
 import UserCall from "../../Models/DatabaseModels/UserCall";
 import UserSMS from "../../Models/DatabaseModels/UserSMS";
 
@@ -52,6 +55,7 @@ export default class UserCallAPI extends BaseAPI<
             },
             select: {
               userId: true,
+              projectId: true,
               verificationCode: true,
             },
           });
@@ -95,6 +99,21 @@ export default class UserCallAPI extends BaseAPI<
             },
           });
 
+          // Create default notification rules for this verified call number
+          try {
+            await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod(
+              {
+                projectId: new ObjectID(item.projectId!.toString()),
+                userId: new ObjectID(item.userId!.toString()),
+                notificationMethod: {
+                  userCallId: item.id!,
+                },
+              },
+            );
+          } catch (e) {
+            logger.error(e);
+          }
+
           return Response.sendEmptySuccessResponse(req, res);
         } catch (err) {
           return next(err);

package/Server/API/UserEmailAPI.ts

@@ -2,6 +2,7 @@ import UserMiddleware from "../Middleware/UserAuthorization";
 import UserEmailService, {
   Service as UserEmailServiceType,
 } from "../Services/UserEmailService";
+import UserNotificationRuleService from "../Services/UserNotificationRuleService";
 import {
   ExpressRequest,
   ExpressResponse,
@@ -9,8 +10,10 @@ import {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
+import logger from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
 import UserEmail from "../../Models/DatabaseModels/UserEmail";
 
 export default class UserEmailAPI extends BaseAPI<
@@ -51,6 +54,7 @@ export default class UserEmailAPI extends BaseAPI<
             },
             select: {
               userId: true,
+              projectId: true,
               verificationCode: true,
             },
           });
@@ -94,6 +98,21 @@ export default class UserEmailAPI extends BaseAPI<
             },
           });
 
+          // Create default notification rules for this verified email
+          try {
+            await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod(
+              {
+                projectId: new ObjectID(item.projectId!.toString()),
+                userId: new ObjectID(item.userId!.toString()),
+                notificationMethod: {
+                  userEmailId: item.id!,
+                },
+              },
+            );
+          } catch (e) {
+            logger.error(e);
+          }
+
           return Response.sendEmptySuccessResponse(req, res);
         } catch (err) {
           return next(err);

package/Server/API/UserPushAPI.ts

@@ -2,8 +2,10 @@ import UserMiddleware from "../Middleware/UserAuthorization";
 import UserPushService, {
   Service as UserPushServiceType,
 } from "../Services/UserPushService";
+import UserNotificationRuleService from "../Services/UserNotificationRuleService";
 import PushNotificationService from "../Services/PushNotificationService";
 import PushNotificationUtil from "../Utils/PushNotificationUtil";
+import logger from "../Utils/Logger";
 import {
   ExpressRequest,
   ExpressResponse,
@@ -13,11 +15,23 @@ import {
 import Response from "../Utils/Response";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
+import NotAuthenticatedException from "../../Types/Exception/NotAuthenticatedException";
 import ObjectID from "../../Types/ObjectID";
 import PushDeviceType from "../../Types/PushNotification/PushDeviceType";
 import UserPush from "../../Models/DatabaseModels/UserPush";
 import PushNotificationMessage from "../../Types/PushNotification/PushNotificationMessage";
 
+function getAuthenticatedUserId(req: ExpressRequest): ObjectID {
+  const userId: ObjectID | undefined = (req as OneUptimeRequest)
+    .userAuthorization?.userId;
+  if (!userId) {
+    throw new NotAuthenticatedException(
+      "You must be logged in to perform this action.",
+    );
+  }
+  return userId;
+}
+
 export default class UserPushAPI extends BaseAPI<
   UserPush,
   UserPushServiceType
@@ -32,6 +46,8 @@ export default class UserPushAPI extends BaseAPI<
         try {
           req = req as OneUptimeRequest;
 
+          const userId: ObjectID = getAuthenticatedUserId(req);
+
           if (!req.body.deviceToken) {
             return Response.sendErrorResponse(
               req,
@@ -65,7 +81,7 @@ export default class UserPushAPI extends BaseAPI<
           // Check if device is already registered
           const existingDevice: UserPush | null = await this.service.findOneBy({
             query: {
-              userId: (req as OneUptimeRequest).userAuthorization!.userId!,
+              userId: userId,
               projectId: new ObjectID(req.body.projectId),
               deviceToken: req.body.deviceToken,
             },
@@ -78,17 +94,18 @@ export default class UserPushAPI extends BaseAPI<
           });
 
           if (existingDevice) {
-            // Mark as used and return a specific response indicating device was already registered
-            throw new BadDataException(
-              "This device is already registered for push notifications",
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException(
+                "This device is already registered for push notifications",
+              ),
             );
           }
 
           // Create new device registration
           const userPush: UserPush = new UserPush();
-          userPush.userId = (
-            req as OneUptimeRequest
-          ).userAuthorization!.userId!;
+          userPush.userId = userId;
           userPush.projectId = new ObjectID(req.body.projectId);
           userPush.deviceToken = req.body.deviceToken;
           userPush.deviceType = req.body.deviceType;
@@ -102,6 +119,21 @@ export default class UserPushAPI extends BaseAPI<
             },
           });
 
+          // Create default notification rules for this registered push device
+          try {
+            await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod(
+              {
+                projectId: new ObjectID(req.body.projectId),
+                userId,
+                notificationMethod: {
+                  userPushId: savedDevice.id!,
+                },
+              },
+            );
+          } catch (e) {
+            logger.error(e);
+          }
+
           return Response.sendJsonObjectResponse(req, res, {
             success: true,
             deviceId: savedDevice._id!.toString(),
@@ -119,6 +151,8 @@ export default class UserPushAPI extends BaseAPI<
         try {
           req = req as OneUptimeRequest;
 
+          const userId: ObjectID = getAuthenticatedUserId(req);
+
           if (!req.body.deviceToken) {
             return Response.sendErrorResponse(
               req,
@@ -127,9 +161,6 @@ export default class UserPushAPI extends BaseAPI<
             );
           }
 
-          const userId: ObjectID = (req as OneUptimeRequest).userAuthorization!
-            .userId!;
-
           await this.service.deleteBy({
             query: {
               userId: userId,
@@ -159,6 +190,8 @@ export default class UserPushAPI extends BaseAPI<
         try {
           req = req as OneUptimeRequest;
 
+          const userId: ObjectID = getAuthenticatedUserId(req);
+
           if (!req.params["deviceId"]) {
             return Response.sendErrorResponse(
               req,
@@ -192,10 +225,7 @@ export default class UserPushAPI extends BaseAPI<
           }
 
           // Check if the device belongs to the current user
-          if (
-            device.userId?.toString() !==
-            (req as OneUptimeRequest).userAuthorization!.userId!.toString()
-          ) {
+          if (device.userId?.toString() !== userId.toString()) {
             return Response.sendErrorResponse(
               req,
               res,
@@ -264,6 +294,8 @@ export default class UserPushAPI extends BaseAPI<
         try {
           req = req as OneUptimeRequest;
 
+          const userId: ObjectID = getAuthenticatedUserId(req);
+
           if (!req.params["deviceId"]) {
             return Response.sendErrorResponse(
               req,
@@ -279,6 +311,7 @@ export default class UserPushAPI extends BaseAPI<
             },
             select: {
               userId: true,
+              projectId: true,
             },
           });
 
@@ -291,10 +324,7 @@ export default class UserPushAPI extends BaseAPI<
           }
 
           // Check if the device belongs to the current user
-          if (
-            device.userId?.toString() !==
-            (req as OneUptimeRequest).userAuthorization!.userId!.toString()
-          ) {
+          if (device.userId?.toString() !== userId.toString()) {
             return Response.sendErrorResponse(
               req,
               res,
@@ -304,6 +334,21 @@ export default class UserPushAPI extends BaseAPI<
 
           await this.service.verifyDevice(device._id!.toString());
 
+          // Create default notification rules for this verified push device
+          try {
+            await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod(
+              {
+                projectId: new ObjectID(device.projectId!.toString()),
+                userId,
+                notificationMethod: {
+                  userPushId: device.id!,
+                },
+              },
+            );
+          } catch (e) {
+            logger.error(e);
+          }
+
           return Response.sendEmptySuccessResponse(req, res);
         } catch (error) {
           return next(error);
@@ -318,6 +363,8 @@ export default class UserPushAPI extends BaseAPI<
         try {
           req = req as OneUptimeRequest;
 
+          const userId: ObjectID = getAuthenticatedUserId(req);
+
           if (!req.params["deviceId"]) {
             return Response.sendErrorResponse(
               req,
@@ -345,10 +392,7 @@ export default class UserPushAPI extends BaseAPI<
           }
 
           // Check if the device belongs to the current user
-          if (
-            device.userId?.toString() !==
-            (req as OneUptimeRequest).userAuthorization!.userId!.toString()
-          ) {
+          if (device.userId?.toString() !== userId.toString()) {
             return Response.sendErrorResponse(
               req,
               res,

package/Server/API/UserSmsAPI.ts

@@ -2,6 +2,7 @@ import UserMiddleware from "../Middleware/UserAuthorization";
 import UserSMSService, {
   Service as UserSMSServiceType,
 } from "../Services/UserSmsService";
+import UserNotificationRuleService from "../Services/UserNotificationRuleService";
 import {
   ExpressRequest,
   ExpressResponse,
@@ -9,8 +10,10 @@ import {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
+import logger from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
 import UserSMS from "../../Models/DatabaseModels/UserSMS";
 
 export default class UserSMSAPI extends BaseAPI<UserSMS, UserSMSServiceType> {
@@ -48,6 +51,7 @@ export default class UserSMSAPI extends BaseAPI<UserSMS, UserSMSServiceType> {
             },
             select: {
               userId: true,
+              projectId: true,
               verificationCode: true,
             },
           });
@@ -91,6 +95,21 @@ export default class UserSMSAPI extends BaseAPI<UserSMS, UserSMSServiceType> {
             },
           });
 
+          // Create default notification rules for this verified SMS
+          try {
+            await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod(
+              {
+                projectId: new ObjectID(item.projectId!.toString()),
+                userId: new ObjectID(item.userId!.toString()),
+                notificationMethod: {
+                  userSmsId: item.id!,
+                },
+              },
+            );
+          } catch (e) {
+            logger.error(e);
+          }
+
           return Response.sendEmptySuccessResponse(req, res);
         } catch (err) {
           return next(err);

package/Server/API/UserWhatsAppAPI.ts

@@ -2,6 +2,7 @@ import UserMiddleware from "../Middleware/UserAuthorization";
 import UserWhatsAppService, {
   Service as UserWhatsAppServiceType,
 } from "../Services/UserWhatsAppService";
+import UserNotificationRuleService from "../Services/UserNotificationRuleService";
 import {
   ExpressRequest,
   ExpressResponse,
@@ -9,8 +10,10 @@ import {
   OneUptimeRequest,
 } from "../Utils/Express";
 import Response from "../Utils/Response";
+import logger from "../Utils/Logger";
 import BaseAPI from "./BaseAPI";
 import BadDataException from "../../Types/Exception/BadDataException";
+import ObjectID from "../../Types/ObjectID";
 import UserWhatsApp from "../../Models/DatabaseModels/UserWhatsApp";
 
 export default class UserWhatsAppAPI extends BaseAPI<
@@ -50,6 +53,7 @@ export default class UserWhatsAppAPI extends BaseAPI<
             },
             select: {
               userId: true,
+              projectId: true,
               verificationCode: true,
               isVerified: true,
             },
@@ -100,6 +104,21 @@ export default class UserWhatsAppAPI extends BaseAPI<
             },
           });
 
+          // Create default notification rules for this verified WhatsApp number
+          try {
+            await UserNotificationRuleService.addDefaultNotificationRulesForVerifiedMethod(
+              {
+                projectId: new ObjectID(item.projectId!.toString()),
+                userId: new ObjectID(item.userId!.toString()),
+                notificationMethod: {
+                  userWhatsAppId: item.id!,
+                },
+              },
+            );
+          } catch (e) {
+            logger.error(e);
+          }
+
           return Response.sendEmptySuccessResponse(req, res);
         } catch (err) {
           return next(err);

package/Server/DatabaseConfig.ts

@@ -80,4 +80,11 @@ export default class DatabaseConfig {
       "disableSignup",
     )) as boolean;
   }
+
+  @CaptureSpan()
+  public static async shouldDisableUserProjectCreation(): Promise<boolean> {
+    return (await DatabaseConfig.getFromGlobalConfig(
+      "disableUserProjectCreation",
+    )) as boolean;
+  }
 }

package/Server/EnvironmentConfig.ts

@@ -161,6 +161,14 @@ export const ClusterKey: ObjectID = new ObjectID(
 
 export const HasClusterKey: boolean = Boolean(process.env["ONEUPTIME_SECRET"]);
 
+export const RegisterProbeKey: ObjectID = new ObjectID(
+  process.env["REGISTER_PROBE_KEY"] || "secret",
+);
+
+export const HasRegisterProbeKey: boolean = Boolean(
+  process.env["REGISTER_PROBE_KEY"],
+);
+
 export const AppApiHostname: Hostname = Hostname.fromString(
   `${process.env["SERVER_APP_HOSTNAME"] || "localhost"}:${
     process.env["APP_PORT"] || 80
@@ -529,6 +537,13 @@ export const VapidPrivateKey: string | undefined =
 export const VapidSubject: string =
   process.env["VAPID_SUBJECT"] || "mailto:support@oneuptime.com";
 
+export const ExpoAccessToken: string | undefined =
+  process.env["EXPO_ACCESS_TOKEN"] || undefined;
+
+export const PushNotificationRelayUrl: string =
+  process.env["PUSH_NOTIFICATION_RELAY_URL"] ||
+  "https://oneuptime.com/api/notification/push-relay/send";
+
 export const EnterpriseLicenseValidationUrl: URL = URL.fromString(
   "https://oneuptime.com/api/enterprise-license/validate",
 );

package/Server/Infrastructure/Postgres/SchemaMigrations/1770834237091-MigrationName.ts

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1770834237091 implements MigrationInterface {
+  public name = "MigrationName1770834237091";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "disableUserProjectCreation" boolean DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD CONSTRAINT "UQ_disableUserProjectCreation" UNIQUE ("disableUserProjectCreation")`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP CONSTRAINT "UQ_disableUserProjectCreation"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "disableUserProjectCreation"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/Index.ts

@@ -258,6 +258,7 @@ import { MigrationName1770728946893 } from "./1770728946893-MigrationName";
 import { MigrationName1770732721195 } from "./1770732721195-MigrationName";
 import { MigrationName1770833704656 } from "./1770833704656-MigrationName";
 import { MigrationName1770834237090 } from "./1770834237090-MigrationName";
+import { MigrationName1770834237091 } from "./1770834237091-MigrationName";
 
 export default [
   InitialMigration,
@@ -520,4 +521,5 @@ export default [
   MigrationName1770732721195,
   MigrationName1770833704656,
   MigrationName1770834237090,
+  MigrationName1770834237091,
 ];

package/Server/Services/ProjectService.ts

@@ -124,6 +124,7 @@ export class ProjectService extends DatabaseService<Model> {
       select: {
         name: true,
         email: true,
+        isMasterAdmin: true,
         companyPhoneNumber: true,
         companyName: true,
         utmCampaign: true,
@@ -142,6 +143,15 @@ export class ProjectService extends DatabaseService<Model> {
       throw new BadDataException("User not found.");
     }
 
+    // Check if project creation is restricted to admins only
+    const shouldDisableProjectCreation: boolean =
+      await DatabaseConfig.shouldDisableUserProjectCreation();
+    if (shouldDisableProjectCreation && !user.isMasterAdmin) {
+      throw new NotAuthorizedException(
+        "Project creation is restricted to admin users only on this OneUptime Server. Please contact your server admin.",
+      );
+    }
+
     if (IsBillingEnabled) {
       if (!data.data.paymentProviderPlanId) {
         throw new BadDataException("Plan required to create the project.");
@@ -1313,6 +1323,8 @@ export class ProjectService extends DatabaseService<Model> {
         paymentProviderSubscriptionId: true,
         paymentProviderMeteredSubscriptionId: true,
         name: true,
+        createdAt: true,
+        planName: true,
         createdByUser: {
           name: true,
           email: true,
@@ -1341,6 +1353,8 @@ export class ProjectService extends DatabaseService<Model> {
         let slackMessage: string = `*Project Deleted:*
 *Project Name:* ${project.name?.toString() || "N/A"}
 *Project ID:* ${project._id?.toString() || "N/A"}
+*Project Created Date:* ${project.createdAt ? new Date(project.createdAt).toUTCString() : "N/A"}
+*Project Plan Name:* ${project.planName?.toString() || "N/A"}
 `;
 
         if (subscriptionStatus) {