Merge pull request #3837 from egeoztass/fix/email-error-propagation

fix: propagate SMTP transport errors from EmailService.sendEmail
This commit is contained in:
Alexander Holliday authored and GitHub committed 2026-08-18 10:36:02 -07:00
commit 6eba53d716
9 files changed
+119 -49

No files matched your search

+4 -2
View File
@@ -96,13 +96,15 @@ export class InviteService implements IInviteService {
});
}
const result = await this.emailService.sendEmail(invite.email, "Welcome to Uptime Monitor", html);
if (!result) {
try {
await this.emailService.sendEmail(invite.email, "Welcome to Uptime Monitor", html);
} catch (error: unknown) {
throw new AppError({
message: "Failed to send invite e-mail... Please verify your settings.",
service: SERVICE_NAME,
method: "sendInviteEmail",
status: 500,
details: { cause: error instanceof Error ? error.message : "Unknown error" },
});
}
};
@@ -35,16 +35,18 @@ export class EmailProvider extends NotificationProvider {
return false;
}
const messageId = await this.emailService.sendEmail(notification.address, subject, html);
if (!messageId) {
try {
await this.emailService.sendEmail(notification.address, subject, html);
return true;
} catch (error: unknown) {
this.logger.warn({
message: "Email test alert failed",
service: SERVICE_NAME,
method: "sendTestAlert",
stack: error instanceof Error ? error.stack : undefined,
});
return false;
}
return true;
}
async sendMessage(notification: Notification, message: NotificationMessage): Promise<boolean> {
@@ -64,16 +66,20 @@ export class EmailProvider extends NotificationProvider {
return false;
}
const messageId = await this.emailService.sendEmail(notification.address, subject, html);
if (!messageId) {
// Providers must resolve to a boolean: NotificationsService fans these out through
// Promise.all, so a rejection here would abort the other channels' alerts too.
try {
await this.emailService.sendEmail(notification.address, subject, html);
return true;
} catch (error: unknown) {
this.logger.warn({
message: "Email notification failed",
service: SERVICE_NAME,
method: "sendMessage",
stack: error instanceof Error ? error.stack : undefined,
});
return false;
}
return true;
}
private buildSubject(message: NotificationMessage): string {
+1 -1
View File
@@ -30,7 +30,7 @@ export interface IUserService {
currentUserEmail: string
): Promise<User>;
checkSuperadminExists(): Promise<boolean>;
requestRecovery(email: string): Promise<string | false | undefined>;
requestRecovery(email: string): Promise<string>;
validateRecovery(recoveryToken: string): Promise<void>;
resetPassword(password: string, recoveryToken: string): Promise<{ user: User; token: string }>;
deleteUser(params: { userId: string; teamId: string; roles: UserRole[] }): Promise<void>;