@oneuptime/common 10.0.36 → 10.0.37

package/Server/API/StatusPageAPI.ts

@@ -718,6 +718,10 @@ export default class StatusPageAPI extends BaseAPI<
         .getCrudApiPath()
         ?.toString()}/.well-known/acme-challenge/:token`,
       async (req: ExpressRequest, res: ExpressResponse) => {
+        logger.debug(
+          `ACME challenge validation request received for token: ${req.params["token"]} from host: ${req.headers["host"]}`,
+        );
+
         const challenge: AcmeChallenge | null =
           await AcmeChallengeService.findOneBy({
             query: {
@@ -732,6 +736,9 @@ export default class StatusPageAPI extends BaseAPI<
           });
 
         if (!challenge) {
+          logger.error(
+            `ACME challenge not found for token: ${req.params["token"]} from host: ${req.headers["host"]}`,
+          );
           return Response.sendErrorResponse(
             req,
             res,

package/Server/API/WorkspaceNotificationSummaryAPI.ts

@@ -0,0 +1,67 @@
+import UserMiddleware from "../Middleware/UserAuthorization";
+import WorkspaceNotificationSummaryService, {
+  Service as WorkspaceNotificationSummaryServiceType,
+} from "../Services/WorkspaceNotificationSummaryService";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../Utils/Express";
+import Response from "../Utils/Response";
+import BaseAPI from "./BaseAPI";
+import CommonAPI from "./CommonAPI";
+import DatabaseCommonInteractionProps from "../../Types/BaseDatabase/DatabaseCommonInteractionProps";
+import WorkspaceNotificationSummary from "../../Models/DatabaseModels/WorkspaceNotificationSummary";
+import ObjectID from "../../Types/ObjectID";
+import BadDataException from "../../Types/Exception/BadDataException";
+
+export default class WorkspaceNotificationSummaryAPI extends BaseAPI<
+  WorkspaceNotificationSummary,
+  WorkspaceNotificationSummaryServiceType
+> {
+  public constructor() {
+    super(WorkspaceNotificationSummary, WorkspaceNotificationSummaryService);
+
+    this.router.post(
+      `${new this.entityType().getCrudApiPath()?.toString()}/test/:workspaceNotificationSummaryId`,
+      UserMiddleware.getUserMiddleware,
+      async (req: ExpressRequest, res: ExpressResponse, next: NextFunction) => {
+        try {
+          const databaseProps: DatabaseCommonInteractionProps =
+            await CommonAPI.getDatabaseCommonInteractionProps(req);
+
+          const summaryId: ObjectID = new ObjectID(
+            req.params["workspaceNotificationSummaryId"] as string,
+          );
+
+          // Verify the summary belongs to the user's project
+          const summary: WorkspaceNotificationSummary | null =
+            await this.service.findOneById({
+              id: summaryId,
+              select: { projectId: true },
+              props: databaseProps,
+            });
+
+          if (!summary) {
+            return Response.sendErrorResponse(
+              req,
+              res,
+              new BadDataException("Summary not found or access denied"),
+            );
+          }
+
+          await this.service.testSummary({
+            summaryId: summaryId,
+            props: databaseProps,
+            projectId: databaseProps.tenantId!,
+            testByUserId: databaseProps.userId!,
+          });
+
+          return Response.sendEmptySuccessResponse(req, res);
+        } catch (e) {
+          next(e);
+        }
+      },
+    );
+  }
+}

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

@@ -0,0 +1,51 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1774355321449 implements MigrationInterface {
+  public name = "MigrationName1774355321449";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `CREATE TABLE "WorkspaceNotificationSummary" ("_id" uuid NOT NULL DEFAULT uuid_generate_v4(), "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updatedAt" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "deletedAt" TIMESTAMP WITH TIME ZONE, "version" integer NOT NULL, "projectId" uuid NOT NULL, "name" character varying(500) NOT NULL, "description" character varying(500), "workspaceType" character varying(500) NOT NULL, "summaryType" character varying NOT NULL, "recurringInterval" jsonb NOT NULL, "numberOfDaysOfData" integer NOT NULL DEFAULT '7', "channelNames" jsonb NOT NULL, "teamName" character varying(500), "summaryItems" jsonb NOT NULL, "filters" jsonb, "filterCondition" character varying, "nextSendAt" TIMESTAMP WITH TIME ZONE, "lastSentAt" TIMESTAMP WITH TIME ZONE, "isEnabled" boolean NOT NULL DEFAULT true, "createdByUserId" uuid, "deletedByUserId" uuid, CONSTRAINT "PK_c5bb0f644c5279e3781177ce819" PRIMARY KEY ("_id"))`,
+    );
+    await queryRunner.query(
+      `CREATE INDEX "IDX_d7f80977bcbac1b82c2beacc27" ON "WorkspaceNotificationSummary" ("projectId") `,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" ADD CONSTRAINT "FK_d7f80977bcbac1b82c2beacc271" FOREIGN KEY ("projectId") REFERENCES "Project"("_id") ON DELETE CASCADE ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" ADD CONSTRAINT "FK_f9c24022445dbea5d8b2d104302" FOREIGN KEY ("createdByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" ADD CONSTRAINT "FK_a9f1c0c0d88abf1795d1c93c138" FOREIGN KEY ("deletedByUserId") REFERENCES "User"("_id") ON DELETE SET NULL ON UPDATE NO ACTION`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" DROP CONSTRAINT "FK_a9f1c0c0d88abf1795d1c93c138"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" DROP CONSTRAINT "FK_f9c24022445dbea5d8b2d104302"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" DROP CONSTRAINT "FK_d7f80977bcbac1b82c2beacc271"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `DROP INDEX "public"."IDX_d7f80977bcbac1b82c2beacc27"`,
+    );
+    await queryRunner.query(`DROP TABLE "WorkspaceNotificationSummary"`);
+  }
+}

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

@@ -0,0 +1,29 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1774357353502 implements MigrationInterface {
+  public name: string = "MigrationName1774357353502";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" ADD "sendFirstReportAt" TIMESTAMP WITH TIME ZONE`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type":"Recurring","value":{"intervalType":"Day","intervalCount":{"_type":"PositiveNumber","value":1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type":"RestrictionTimes","value":{"restictionType":"None","dayRestrictionTimes":null,"weeklyRestrictionTimes":[]}}'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "restrictionTimes" SET DEFAULT '{"_type": "RestrictionTimes", "value": {"restictionType": "None", "dayRestrictionTimes": null, "weeklyRestrictionTimes": []}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "OnCallDutyPolicyScheduleLayer" ALTER COLUMN "rotation" SET DEFAULT '{"_type": "Recurring", "value": {"intervalType": "Day", "intervalCount": {"_type": "PositiveNumber", "value": 1}}}'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "WorkspaceNotificationSummary" DROP COLUMN "sendFirstReportAt"`,
+    );
+  }
+}

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

@@ -268,6 +268,8 @@ import { MigrationName1773402621107 } from "./1773402621107-MigrationName";
 import { MigrationName1773676206197 } from "./1773676206197-MigrationName";
 import { MigrationName1774000000000 } from "./1774000000000-MigrationName";
 import { MigrationName1774000000001 } from "./1774000000001-MigrationName";
+import { MigrationName1774355321449 } from "./1774355321449-MigrationName";
+import { MigrationName1774357353502 } from "./1774357353502-MigrationName";
 
 export default [
   InitialMigration,
@@ -540,4 +542,6 @@ export default [
   MigrationName1773676206197,
   MigrationName1774000000000,
   MigrationName1774000000001,
+  MigrationName1774355321449,
+  MigrationName1774357353502,
 ];

package/Server/Middleware/MasterAdminAuthorization.ts

@@ -0,0 +1,55 @@
+import UserMiddleware from "./UserAuthorization";
+import JSONWebToken from "../Utils/JsonWebToken";
+import Response from "../Utils/Response";
+import {
+  ExpressRequest,
+  ExpressResponse,
+  NextFunction,
+} from "../Utils/Express";
+import NotAuthorizedException from "../../Types/Exception/NotAuthorizedException";
+import JSONWebTokenData from "../../Types/JsonWebTokenData";
+
+export default class MasterAdminAuthorization {
+  public static async isAuthorizedMasterAdminMiddleware(
+    req: ExpressRequest,
+    res: ExpressResponse,
+    next: NextFunction,
+  ): Promise<void> {
+    try {
+      const accessToken: string | undefined =
+        UserMiddleware.getAccessTokenFromExpressRequest(req);
+
+      if (!accessToken) {
+        Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthorizedException("Unauthorized: Access token is required."),
+        );
+        return;
+      }
+
+      const authData: JSONWebTokenData = JSONWebToken.decode(accessToken);
+
+      if (!authData.isMasterAdmin) {
+        Response.sendErrorResponse(
+          req,
+          res,
+          new NotAuthorizedException(
+            "Unauthorized: Only master admins can perform this action.",
+          ),
+        );
+        return;
+      }
+
+      next();
+    } catch {
+      Response.sendErrorResponse(
+        req,
+        res,
+        new NotAuthorizedException(
+          "Unauthorized: Invalid or expired access token.",
+        ),
+      );
+    }
+  }
+}

package/Server/Services/Index.ts

@@ -198,6 +198,7 @@ import WorkspaceUserAuthTokenService from "./WorkspaceUserAuthTokenService";
 import WorkspaceSettingService from "./WorkspaceSettingService";
 import WorkspaceNotificationRuleService from "./WorkspaceNotificationRuleService";
 import WorkspaceNotificationLogService from "./WorkspaceNotificationLogService";
+import WorkspaceNotificationSummaryService from "./WorkspaceNotificationSummaryService";
 import OnCallDutyPolicyUserOverrideService from "./OnCallDutyPolicyUserOverrideService";
 
 import MonitorLogService from "./MonitorLogService";
@@ -416,6 +417,7 @@ const services: Array<BaseService> = [
   WorkspaceSettingService,
   WorkspaceNotificationRuleService,
   WorkspaceNotificationLogService,
+  WorkspaceNotificationSummaryService,
 
   ProjectSCIMLogService,
   StatusPageSCIMLogService,