Skip to content

refactor(auth-server): remove the canSend feature flag from the mailer #21023

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
vbudhram wants to merge 2 commits into
base: main
Choose a base branch
from
Open

refactor(auth-server): remove the canSend feature flag from the mailer #21023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b79b647
refactor(auth-server): remove the canSend feature flag from the mailer
vbudhram Aug 13, 2026
ad31e17
fix(auth): drop returns that trip TS7030 after canSend removal
vbudhram Aug 13, 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
6 changes: 0 additions & 6 deletions packages/fxa-auth-server/config/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,12 +704,6 @@ const convictConf = convict({
default: true,
env: 'SMTP_METRICS_ENABLED',
},
fxaMailerDisableSend: {
doc: 'Array of templates that should not be supported by fxa mailer. Used to fallback to previous email sending if in a pinch.',
format: Array,
default: [''],
env: 'SMTP_FXA_MAILER_DISABLE_SEND',
},
},
maxEventLoopDelay: {
doc: 'Max event-loop delay before which incoming requests are rejected',
Expand Down
38 changes: 15 additions & 23 deletions packages/fxa-auth-server/lib/inactive-accounts/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,29 +296,21 @@ export class InactiveAccountsManager {
inactiveDeletionEta: now + emailTypeSpecificVals.timeToDeletion,
};

if (this.fxaMailer.canSend(emailTypeSpecificVals.emailTemplate)) {
await this.fxaMailer[emailTypeSpecificVals.emailSender]({
...FxaMailerFormat.account(account),
...(await FxaMailerFormat.metricsContext(requestForGlean)),
...FxaMailerFormat.localTime(requestForGlean),
...FxaMailerFormat.location(requestForGlean),
...FxaMailerFormat.device(requestForGlean),
...FxaMailerFormat.sync(false),
// use the formatter to convert inactiveDeletionEta to localized strings
deletionDate: FxaMailerFormat.localTime(
requestForGlean,
message.inactiveDeletionEta
).date,
// override acceptLanguage to ensure email is localized as best we can
acceptLanguage: account.locale,
});
} else {
await this.mailer[emailTypeSpecificVals.emailSender](
account.emails,
account,
message
);
}
await this.fxaMailer[emailTypeSpecificVals.emailSender]({
...FxaMailerFormat.account(account),
...(await FxaMailerFormat.metricsContext(requestForGlean)),
...FxaMailerFormat.localTime(requestForGlean),
...FxaMailerFormat.location(requestForGlean),
...FxaMailerFormat.device(requestForGlean),
...FxaMailerFormat.sync(false),
// use the formatter to convert inactiveDeletionEta to localized strings
deletionDate: FxaMailerFormat.localTime(
requestForGlean,
message.inactiveDeletionEta
).date,
// override acceptLanguage to ensure email is localized as best we can
acceptLanguage: account.locale,
});

this.statsd.increment(
`account.inactive.${emailTypeSpecificVals.attempt}-email.sent`
Expand Down
Loading