@oneuptime/common 10.5.4 → 10.5.6

package/Models/DatabaseModels/AlertEpisodeMember.ts

@@ -626,6 +626,35 @@ export default class AlertEpisodeMember extends BaseModel {
   })
   public createdByUserId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.AlertAdmin,
+      Permission.AlertMember,
+      Permission.AlertViewer,
+      Permission.ReadAlertEpisodeMember,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    required: true,
+    type: TableColumnType.Boolean,
+    title: "Is Owner Notified of Alert Added to Episode",
+    description:
+      "Has the owner been notified that this alert was added to the episode?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotifiedOfAlertAdded?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/GlobalConfig.ts

@@ -10,6 +10,7 @@ import TableColumn from "../../Types/Database/TableColumn";
 import TableColumnType from "../../Types/Database/TableColumnType";
 import TableMetadata from "../../Types/Database/TableMetadata";
 import Email from "../../Types/Email";
+import MailTransportType from "../../Types/Email/MailTransportType";
 import OAuthProviderType from "../../Types/Email/OAuthProviderType";
 import SMTPAuthenticationType from "../../Types/Email/SMTPAuthenticationType";
 import IconProp from "../../Types/Icon/IconProp";
@@ -208,6 +209,33 @@ export default class GlobalConfig extends GlobalConfigModel {
   })
   public smtpFromName?: string = undefined;
 
+  /*
+   * Transport selection for the global SMTP. Defaults to SMTP for backwards
+   * compatibility. 'Microsoft Graph' bypasses SMTP entirely and posts to
+   * https://graph.microsoft.com/v1.0/users/{from}/sendMail — useful for tenants
+   * that have SMTP AUTH disabled.
+   */
+
+  @ColumnAccessControl({
+    create: [],
+    read: [],
+    update: [],
+  })
+  @TableColumn({
+    type: TableColumnType.ShortText,
+    title: "SMTP Transport",
+    description:
+      "How OneUptime delivers mail using the global SMTP config. 'SMTP' uses the host/port. 'Microsoft Graph' sends via the Microsoft Graph REST API.",
+    defaultValue: MailTransportType.SMTP,
+  })
+  @Column({
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    nullable: true,
+    default: MailTransportType.SMTP,
+  })
+  public smtpTransportType?: MailTransportType = undefined;
+
   // SMTP OAuth 2.0 Settings.
 
   @ColumnAccessControl({

package/Models/DatabaseModels/IncidentEpisodeMember.ts

@@ -627,6 +627,35 @@ export default class IncidentEpisodeMember extends BaseModel {
   })
   public createdByUserId?: ObjectID = undefined;
 
+  @ColumnAccessControl({
+    create: [],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.IncidentAdmin,
+      Permission.IncidentMember,
+      Permission.IncidentViewer,
+      Permission.ReadIncidentEpisodeMember,
+    ],
+    update: [],
+  })
+  @TableColumn({
+    isDefaultValueColumn: true,
+    required: true,
+    type: TableColumnType.Boolean,
+    title: "Is Owner Notified of Incident Added to Episode",
+    description:
+      "Has the owner been notified that this incident was added to the episode?",
+  })
+  @Column({
+    type: ColumnType.Boolean,
+    nullable: false,
+    default: false,
+  })
+  public isOwnerNotifiedOfIncidentAdded?: boolean = undefined;
+
   @ColumnAccessControl({
     create: [],
     read: [

package/Models/DatabaseModels/ProjectSmtpConfig.ts

@@ -17,6 +17,7 @@ import TableMetadata from "../../Types/Database/TableMetadata";
 import TenantColumn from "../../Types/Database/TenantColumn";
 import UniqueColumnBy from "../../Types/Database/UniqueColumnBy";
 import Email from "../../Types/Email";
+import MailTransportType from "../../Types/Email/MailTransportType";
 import OAuthProviderType from "../../Types/Email/OAuthProviderType";
 import SMTPAuthenticationType from "../../Types/Email/SMTPAuthenticationType";
 import IconProp from "../../Types/Icon/IconProp";
@@ -478,12 +479,15 @@ export default class ProjectSmtpConfig extends BaseModel {
     ],
   })
   @TableColumn({
-    required: true,
+    required: false,
     type: TableColumnType.ShortText,
+    title: "Hostname",
+    description:
+      "SMTP server hostname. Required when Transport is SMTP. Not used by HTTP-API transports like Microsoft Graph.",
     example: "smtp.gmail.com",
   })
   @Column({
-    nullable: false,
+    nullable: true,
     type: ColumnType.ShortText,
     length: ColumnLength.ShortText,
     transformer: Hostname.getDatabaseTransformer(),
@@ -513,12 +517,15 @@ export default class ProjectSmtpConfig extends BaseModel {
     ],
   })
   @TableColumn({
-    required: true,
+    required: false,
     type: TableColumnType.Number,
+    title: "Port",
+    description:
+      "SMTP server port. Required when Transport is SMTP. Not used by HTTP-API transports.",
     example: 587,
   })
   @Column({
-    nullable: false,
+    nullable: true,
     type: ColumnType.Number,
     transformer: Port.getDatabaseTransformer(),
   })
@@ -616,18 +623,67 @@ export default class ProjectSmtpConfig extends BaseModel {
     ],
   })
   @TableColumn({
-    required: true,
+    required: false,
     type: TableColumnType.Boolean,
+    title: "Use SSL / TLS",
+    description:
+      "Enable secure SMTP connection. Used only for SMTP transport — HTTP-API transports always use HTTPS.",
     defaultValue: true,
     example: true,
   })
   @Column({
-    nullable: false,
+    nullable: true,
     type: ColumnType.Boolean,
     default: true,
   })
   public secure?: boolean = undefined;
 
+  /*
+   * Transport type selects how mail is actually delivered.
+   * SMTP (default) uses the host/port above. HTTP-API transports (e.g. Microsoft
+   * Graph) ignore host/port and call the provider's REST API directly using the
+   * OAuth credentials below.
+   */
+
+  @ColumnAccessControl({
+    create: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.CreateProjectSMTPConfig,
+    ],
+    read: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.ProjectMember,
+      Permission.Viewer,
+      Permission.SettingsAdmin,
+      Permission.SettingsMember,
+      Permission.SettingsViewer,
+      Permission.ReadProjectSMTPConfig,
+    ],
+    update: [
+      Permission.ProjectOwner,
+      Permission.ProjectAdmin,
+      Permission.EditProjectSMTPConfig,
+    ],
+  })
+  @TableColumn({
+    required: true,
+    type: TableColumnType.ShortText,
+    title: "Transport",
+    description:
+      "How OneUptime delivers mail for this config. 'SMTP' uses the hostname/port. 'Microsoft Graph' sends via the Microsoft Graph REST API — use this when your Microsoft 365 tenant has SMTP AUTH disabled.",
+    defaultValue: MailTransportType.SMTP,
+    example: "SMTP",
+  })
+  @Column({
+    nullable: false,
+    type: ColumnType.ShortText,
+    length: ColumnLength.ShortText,
+    default: MailTransportType.SMTP,
+  })
+  public transportType?: MailTransportType = undefined;
+
   // OAuth 2.0 Configuration Fields
 
   @ColumnAccessControl({

package/Server/Infrastructure/Postgres/SchemaMigrations/1779975064262-AddTransportTypeToProjectSmtpConfig.ts

@@ -0,0 +1,37 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddTransportTypeToProjectSmtpConfig1779975064262
+  implements MigrationInterface
+{
+  name = "AddTransportTypeToProjectSmtpConfig1779975064262";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ADD "transportType" character varying(100) NOT NULL DEFAULT 'SMTP'`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ALTER COLUMN "hostname" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ALTER COLUMN "port" DROP NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ALTER COLUMN "secure" DROP NOT NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ALTER COLUMN "secure" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ALTER COLUMN "port" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" ALTER COLUMN "hostname" SET NOT NULL`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "ProjectSMTPConfig" DROP COLUMN "transportType"`,
+    );
+  }
+}

package/Server/Infrastructure/Postgres/SchemaMigrations/1779976190561-AddSmtpTransportTypeToGlobalConfig.ts

@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddSmtpTransportTypeToGlobalConfig1779976190561
+  implements MigrationInterface
+{
+  name = "AddSmtpTransportTypeToGlobalConfig1779976190561";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" ADD "smtpTransportType" character varying(100) DEFAULT 'SMTP'`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "GlobalConfig" DROP COLUMN "smtpTransportType"`,
+    );
+  }
+}

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

@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class MigrationName1779980428744 implements MigrationInterface {
+  public name = "MigrationName1779980428744";
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "AlertEpisodeMember" ADD "isOwnerNotifiedOfAlertAdded" boolean NOT NULL DEFAULT false`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeMember" ADD "isOwnerNotifiedOfIncidentAdded" boolean NOT NULL DEFAULT false`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "IncidentEpisodeMember" DROP COLUMN "isOwnerNotifiedOfIncidentAdded"`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE "AlertEpisodeMember" DROP COLUMN "isOwnerNotifiedOfAlertAdded"`,
+    );
+  }
+}

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

@@ -357,6 +357,9 @@ import { RenameStatusPageZhToZhCN1779827700000 } from "./1779827700000-RenameSta
 import { MigrationName1779879993421 } from "./1779879993421-MigrationName";
 import { MigrationName1779882573463 } from "./1779882573463-MigrationName";
 import { AddLabelGroupByToGroupingRules1779971548393 } from "./1779971548393-AddLabelGroupByToGroupingRules";
+import { AddTransportTypeToProjectSmtpConfig1779975064262 } from "./1779975064262-AddTransportTypeToProjectSmtpConfig";
+import { AddSmtpTransportTypeToGlobalConfig1779976190561 } from "./1779976190561-AddSmtpTransportTypeToGlobalConfig";
+import { MigrationName1779980428744 } from "./1779980428744-MigrationName";
 
 export default [
   InitialMigration,
@@ -718,4 +721,7 @@ export default [
   MigrationName1779879993421,
   MigrationName1779882573463,
   AddLabelGroupByToGroupingRules1779971548393,
+  AddTransportTypeToProjectSmtpConfig1779975064262,
+  AddSmtpTransportTypeToGlobalConfig1779976190561,
+  MigrationName1779980428744,
 ];

package/Server/Services/AlertEpisodeMemberService.ts

@@ -4,6 +4,7 @@ import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import PositiveNumber from "../../Types/PositiveNumber";
 import Model from "../../Models/DatabaseModels/AlertEpisodeMember";
 import Alert from "../../Models/DatabaseModels/Alert";
 import AlertEpisode from "../../Models/DatabaseModels/AlertEpisode";
@@ -62,6 +63,28 @@ export class Service extends DatabaseService<Model> {
       createBy.data.addedAt = OneUptimeDate.getCurrentDate();
     }
 
+    /*
+     * If this is the very first alert in the episode (the founder), the
+     * "episode created" notification already covers it. Mark the member as
+     * "already notified" so the AlertAdded-to-episode cron skips it. This
+     * avoids double-notifying owners when an episode is born with its first
+     * alert.
+     */
+    if (createBy.data.isOwnerNotifiedOfAlertAdded === undefined) {
+      const existingMemberCount: PositiveNumber = await this.countBy({
+        query: {
+          alertEpisodeId: createBy.data.alertEpisodeId,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (existingMemberCount.toNumber() === 0) {
+        createBy.data.isOwnerNotifiedOfAlertAdded = true;
+      }
+    }
+
     return { createBy, carryForward: null };
   }
 

package/Server/Services/IncidentEpisodeMemberService.ts

@@ -4,6 +4,7 @@ import { OnCreate, OnDelete } from "../Types/Database/Hooks";
 import DatabaseService from "./DatabaseService";
 import BadDataException from "../../Types/Exception/BadDataException";
 import ObjectID from "../../Types/ObjectID";
+import PositiveNumber from "../../Types/PositiveNumber";
 import Model from "../../Models/DatabaseModels/IncidentEpisodeMember";
 import Incident from "../../Models/DatabaseModels/Incident";
 import IncidentEpisode from "../../Models/DatabaseModels/IncidentEpisode";
@@ -64,6 +65,28 @@ export class Service extends DatabaseService<Model> {
       createBy.data.addedAt = OneUptimeDate.getCurrentDate();
     }
 
+    /*
+     * If this is the very first incident in the episode (the founder), the
+     * "episode created" notification already covers it. Mark the member as
+     * "already notified" so the IncidentAdded-to-episode cron skips it. This
+     * avoids double-notifying owners when an episode is born with its first
+     * incident.
+     */
+    if (createBy.data.isOwnerNotifiedOfIncidentAdded === undefined) {
+      const existingMemberCount: PositiveNumber = await this.countBy({
+        query: {
+          incidentEpisodeId: createBy.data.incidentEpisodeId,
+        },
+        props: {
+          isRoot: true,
+        },
+      });
+
+      if (existingMemberCount.toNumber() === 0) {
+        createBy.data.isOwnerNotifiedOfIncidentAdded = true;
+      }
+    }
+
     return { createBy, carryForward: null };
   }
 

package/Server/Services/MailService.ts

@@ -45,12 +45,24 @@ export class MailService extends BaseService {
 
     if (options && options.mailServer) {
       body["SMTP_ID"] = options.mailServer.id?.toString();
+      // host/port/secure are optional on EmailServer because HTTP-API
+      // transports (e.g. Microsoft Graph) don't use them. Only serialize the
+      // SMTP-only fields when they're actually present.
+      body["SMTP_TRANSPORT_TYPE"] =
+        options.mailServer.transportType || undefined;
       body["SMTP_USERNAME"] = options.mailServer.username || undefined;
       body["SMTP_EMAIL"] = options.mailServer.fromEmail.toString();
       body["SMTP_FROM_NAME"] = options.mailServer.fromName;
-      body["SMTP_IS_SECURE"] = options.mailServer.secure;
-      body["SMTP_PORT"] = options.mailServer.port.toNumber();
-      body["SMTP_HOST"] = options.mailServer.host.toString();
+      body["SMTP_IS_SECURE"] =
+        options.mailServer.secure === undefined
+          ? undefined
+          : options.mailServer.secure;
+      body["SMTP_PORT"] = options.mailServer.port
+        ? options.mailServer.port.toNumber()
+        : undefined;
+      body["SMTP_HOST"] = options.mailServer.host
+        ? options.mailServer.host.toString()
+        : undefined;
       body["SMTP_PASSWORD"] = options.mailServer.password || undefined;
       body["SMTP_AUTH_TYPE"] = options.mailServer.authType || undefined;
       body["SMTP_CLIENT_ID"] = options.mailServer.clientId || undefined;

package/Server/Services/ProjectSmtpConfigService.ts

@@ -1,5 +1,6 @@
 import DatabaseService from "./DatabaseService";
 import EmailServer from "../../Types/Email/EmailServer";
+import MailTransportType from "../../Types/Email/MailTransportType";
 import SMTPAuthenticationType from "../../Types/Email/SMTPAuthenticationType";
 import BadDataException from "../../Types/Exception/BadDataException";
 import URL from "../../Types/API/URL";
@@ -21,17 +22,28 @@ export class Service extends DatabaseService<Model> {
       throw new BadDataException("Project SMTP config id is not set");
     }
 
-    if (!projectSmtpConfig.hostname) {
-      throw new BadDataException("Project SMTP config host is not set");
-    }
-
-    if (!projectSmtpConfig.port) {
-      throw new BadDataException("Project SMTP config port is not set");
-    }
+    const transportType: MailTransportType =
+      projectSmtpConfig.transportType || MailTransportType.SMTP;
 
-    // Get auth type, default to UsernamePassword for backward compatibility
+    /*
+     * Get auth type, default to UsernamePassword for backward compatibility.
+     * Microsoft Graph always uses OAuth (Client Credentials) regardless of what
+     * the user picked — but we still let the existing OAuth validation apply.
+     */
     const authType: SMTPAuthenticationType =
-      projectSmtpConfig.authType || SMTPAuthenticationType.UsernamePassword;
+      transportType === MailTransportType.MicrosoftGraph
+        ? SMTPAuthenticationType.OAuth
+        : projectSmtpConfig.authType || SMTPAuthenticationType.UsernamePassword;
+
+    if (transportType === MailTransportType.SMTP) {
+      if (!projectSmtpConfig.hostname) {
+        throw new BadDataException("Project SMTP config host is not set");
+      }
+
+      if (!projectSmtpConfig.port) {
+        throw new BadDataException("Project SMTP config port is not set");
+      }
+    }
 
     // Validate based on auth type
     if (authType === SMTPAuthenticationType.UsernamePassword) {
@@ -43,7 +55,14 @@ export class Service extends DatabaseService<Model> {
         throw new BadDataException("Project SMTP config password is not set");
       }
     } else if (authType === SMTPAuthenticationType.OAuth) {
-      if (!projectSmtpConfig.username) {
+      /*
+       * For Microsoft Graph, username is optional — we fall back to fromEmail
+       * as the sender mailbox. For SMTP+XOAUTH2, username is required.
+       */
+      if (
+        transportType === MailTransportType.SMTP &&
+        !projectSmtpConfig.username
+      ) {
         throw new BadDataException(
           "Project SMTP config username (email address) is not set for OAuth",
         );
@@ -85,6 +104,7 @@ export class Service extends DatabaseService<Model> {
 
     return {
       id: projectSmtpConfig.id!,
+      transportType: transportType,
       host: projectSmtpConfig.hostname,
       port: projectSmtpConfig.port,
       username: projectSmtpConfig.username,

package/Server/Services/StatusPagePrivateUserService.ts

@@ -92,6 +92,7 @@ export class Service extends DatabaseService<Model> {
         projectId: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,

package/Server/Services/StatusPageSubscriberService.ts

@@ -684,6 +684,7 @@ Stay informed about service availability! 🚀`;
         name: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,
@@ -915,6 +916,7 @@ Stay informed about service availability! 🚀`;
         name: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,
@@ -1347,6 +1349,7 @@ Stay informed about service availability! 🚀`;
         allowSubscribersToChooseEventTypes: true,
         smtpConfig: {
           _id: true,
+          transportType: true,
           hostname: true,
           port: true,
           username: true,

package/Server/Services/UserNotificationSettingService.ts

@@ -706,6 +706,12 @@ export class Service extends DatabaseService<UserNotificationSetting> {
       projectId,
       NotificationSettingEventType.SEND_ALERT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION,
     );
+
+    await this.addNotificationSettingIfNotExists(
+      userId,
+      projectId,
+      NotificationSettingEventType.SEND_ALERT_ADDED_TO_EPISODE_OWNER_NOTIFICATION,
+    );
   }
 
   private async addIncidentEpisodeNotificationSettings(
@@ -723,6 +729,12 @@ export class Service extends DatabaseService<UserNotificationSetting> {
       projectId,
       NotificationSettingEventType.SEND_INCIDENT_EPISODE_STATE_CHANGED_OWNER_NOTIFICATION,
     );
+
+    await this.addNotificationSettingIfNotExists(
+      userId,
+      projectId,
+      NotificationSettingEventType.SEND_INCIDENT_ADDED_TO_EPISODE_OWNER_NOTIFICATION,
+    );
   }
 
   private async addNotificationSettingIfNotExists(

package/Server/Utils/WhatsAppTemplateUtil.ts

@@ -94,6 +94,8 @@ const templateIdByEventType: Record<
     WhatsAppTemplateIds.AlertEpisodeStateChangedOwnerNotification,
   [NotificationSettingEventType.SEND_ALERT_EPISODE_OWNER_ADDED_NOTIFICATION]:
     WhatsAppTemplateIds.AlertEpisodeOwnerAddedNotification,
+  [NotificationSettingEventType.SEND_ALERT_ADDED_TO_EPISODE_OWNER_NOTIFICATION]:
+    WhatsAppTemplateIds.AlertAddedToEpisodeOwnerNotification,
   [NotificationSettingEventType.SEND_INCIDENT_EPISODE_CREATED_OWNER_NOTIFICATION]:
     WhatsAppTemplateIds.IncidentEpisodeCreatedOwnerNotification,
   [NotificationSettingEventType.SEND_INCIDENT_EPISODE_NOTE_POSTED_OWNER_NOTIFICATION]:
@@ -102,6 +104,8 @@ const templateIdByEventType: Record<
     WhatsAppTemplateIds.IncidentEpisodeStateChangedOwnerNotification,
   [NotificationSettingEventType.SEND_INCIDENT_EPISODE_OWNER_ADDED_NOTIFICATION]:
     WhatsAppTemplateIds.IncidentEpisodeOwnerAddedNotification,
+  [NotificationSettingEventType.SEND_INCIDENT_ADDED_TO_EPISODE_OWNER_NOTIFICATION]:
+    WhatsAppTemplateIds.IncidentAddedToEpisodeOwnerNotification,
   [NotificationSettingEventType.SEND_MONITOR_OWNER_ADDED_NOTIFICATION]:
     WhatsAppTemplateIds.MonitorOwnerAddedNotification,
   [NotificationSettingEventType.SEND_MONITOR_CREATED_OWNER_NOTIFICATION]:

package/Types/Email/EmailServer.ts

@@ -3,20 +3,38 @@ import URL from "../API/URL";
 import Email from "../Email";
 import ObjectID from "../ObjectID";
 import Port from "../Port";
+import MailTransportType from "./MailTransportType";
 import OAuthProviderType from "./OAuthProviderType";
 import SMTPAuthenticationType from "./SMTPAuthenticationType";
 
 export default interface EmailServer {
   id?: ObjectID | undefined; // If this is custom SMTP, this is the ID of the SMTP config. Otherwise, it's undefined
-  host: Hostname;
-  port: Port;
+
+  /*
+   * Transport selection.
+   * Defaults to SMTP when undefined for backwards compatibility with existing
+   * EmailServer constructions.
+   */
+  transportType?: MailTransportType | undefined;
+
+  /*
+   * SMTP transport fields. Required when transportType === SMTP (or undefined).
+   * Not used for HTTP-API transports like MicrosoftGraph.
+   */
+  host?: Hostname | undefined;
+  port?: Port | undefined;
+  secure?: boolean | undefined;
+
   username: string | undefined;
   password: string | undefined;
-  secure: boolean;
   fromEmail: Email;
   fromName: string;
 
-  // OAuth 2.0 fields for any OAuth-enabled SMTP server
+  /*
+   * OAuth 2.0 fields. Used by:
+   * - SMTP transport when authType === OAuth (XOAUTH2)
+   * - HTTP-API transports (always — they always authenticate via OAuth2)
+   */
   authType?: SMTPAuthenticationType | undefined;
   clientId?: string | undefined; // OAuth Application Client ID
   clientSecret?: string | undefined; // OAuth Application Client Secret

package/Types/Email/EmailTemplateType.ts

@@ -47,11 +47,13 @@ enum EmailTemplateType {
   AlertEpisodeOwnerStateChanged = "AlertEpisodeOwnerStateChanged.hbs",
   AlertEpisodeOwnerNotePosted = "AlertEpisodeOwnerNotePosted.hbs",
   AlertEpisodeOwnerResourceCreated = "AlertEpisodeOwnerResourceCreated.hbs",
+  AlertEpisodeOwnerAlertAdded = "AlertEpisodeOwnerAlertAdded.hbs",
 
   IncidentEpisodeOwnerAdded = "IncidentEpisodeOwnerAdded.hbs",
   IncidentEpisodeOwnerStateChanged = "IncidentEpisodeOwnerStateChanged.hbs",
   IncidentEpisodeOwnerNotePosted = "IncidentEpisodeOwnerNotePosted.hbs",
   IncidentEpisodeOwnerResourceCreated = "IncidentEpisodeOwnerResourceCreated.hbs",
+  IncidentEpisodeOwnerIncidentAdded = "IncidentEpisodeOwnerIncidentAdded.hbs",
 
   SubscriberEpisodeCreated = "SubscriberEpisodeCreated.hbs",
   SubscriberEpisodeStateChanged = "SubscriberEpisodeStateChanged.hbs",

package/Types/Email/MailTransportType.ts

@@ -0,0 +1,18 @@
+/**
+ * Transport type for delivering email.
+ *
+ * - SMTP: traditional SMTP server (with optional XOAUTH2 / username+password / no auth)
+ * - MicrosoftGraph: Microsoft 365 mailbox via Microsoft Graph API
+ *   (POST /v1.0/users/{sender}/sendMail). Required when the tenant has SMTP AUTH
+ *   disabled — the Azure AD app only needs Mail.Send (application) permission.
+ *
+ * Adding a new HTTP-API provider (Gmail, SES, etc.) means adding a new enum value
+ * and a matching MailProvider implementation. See
+ * App/FeatureSet/Notification/Services/MailProviders.
+ */
+enum MailTransportType {
+  SMTP = "SMTP",
+  MicrosoftGraph = "Microsoft Graph",
+}
+
+export default MailTransportType;