Skip to content

fix: use SMTPMailService for ESS email handler #1663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jekabs-karklins wants to merge 3 commits into
base: develop
Choose a base branch
from
+24 −3
Open

fix: use SMTPMailService for ESS email handler #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8f7fb6
feat: add SMTP mail service for development environment
Jul 20, 2026
5efbeee
feat: enhance SMTPMailService to resolve email templates by identifie…
Jul 21, 2026
fd601cb
Merge branch 'develop' into SWAP-5677-use-papercut-for-useroffice-dev…
jekabs-karklins Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion apps/backend/src/config/dependencyConfigESS.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-empty-function */
import 'reflect-metadata';

import { DataAccessUsersAuthorization } from '../auth/DataAccessUsersAuthorization';
Expand Down Expand Up @@ -65,6 +64,7 @@ import { configureESSDevelopmentEnvironment } from './ess/configureESSEnvironmen
import { configureGraylogLogger } from './ess/configureGrayLogLogger';
import { Tokens } from './Tokens';
import { mapClass, mapValue } from './utils';
import { SMTPMailService } from '../eventHandlers/MailService/SMTP/SMTPMailService';

mapClass(Tokens.RoleDataSource, PostgresRoleDataSource);
mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade);
Expand Down Expand Up @@ -130,6 +130,12 @@ mapClass(Tokens.AssetRegistrar, EAMAssetRegistrar);

mapClass(Tokens.MailService, SparkPostMailService);

if (isDevelopment) {
mapValue(Tokens.MailService, new SMTPMailService());
} else {
mapClass(Tokens.MailService, SparkPostMailService);
}

mapValue(Tokens.FapDataColumns, FapDataColumns);
mapValue(Tokens.FapDataRow, getDataRow);
mapValue(Tokens.PopulateRow, populateRow);
Expand Down
19 changes: 17 additions & 2 deletions apps/backend/src/eventHandlers/MailService/SMTP/SMTPMailService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,21 @@ export class SMTPMailService extends MailService {
);
}

private async resolveEmailTemplate(identifier: string) {
const isNumericIdentifier = /^\d+$/.test(identifier);

if (isNumericIdentifier) {
const byId =
await this.emailTemplateDataSource.getEmailTemplate(+identifier);

if (byId) {
return byId;
}
}

return this.emailTemplateDataSource.getEmailTemplateByName(identifier);
}

private async compileEmailTemplate(options: SendMailOptions): Promise<{
subject: string;
body: string;
Expand All @@ -113,8 +128,8 @@ export class SMTPMailService extends MailService {
return { subject: '= ``', body: '' };
}

const emailTemplate = await this.emailTemplateDataSource.getEmailTemplate(
+options.content.template
const emailTemplate = await this.resolveEmailTemplate(
options.content.template
);

if (!emailTemplate) {
Expand Down
Loading