HSB-439 feature: invite link with SMTP optional #4078
+14,781
−16,730
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mirarifhasan
requested review from
ankitsridhar16,
AndrewBastin and
liyasthomas
as code owners
4 tasks
mirarifhasan
changed the title
balub
reviewed
May 27, 2024
balub
requested changes
May 27, 2024
| @@ -42,6 +46,8 @@ export class MailerService { | |||
| to: string, | |||
| mailDesc: MailDescription | UserMagicLinkMailDescription, | |||
| ) { | |||
| if (this.configService.get('INFRA.MAILER_SMTP_ENABLE') !== 'true') return; | |||
There was a problem hiding this comment.
We can throw an error here right saying "SMTP_NOT_ENABLED" ?
There was a problem hiding this comment.
Since we using event emit, throwing errors is not effective.
| @@ -64,6 +70,8 @@ export class MailerService { | |||
| to: string, | |||
| mailDesc: AdminUserInvitationMailDescription, | |||
| ) { | |||
| if (this.configService.get('INFRA.MAILER_SMTP_ENABLE') !== 'true') return; | |||
Comment on lines
25
to
53
| // If mailer SMTP is DISABLED, return the module without any configuration (service, listener, etc.) | ||
| if (env.INFRA.MAILER_SMTP_ENABLE !== 'true') { | ||
| console.log('Mailer SMTP is disabled'); | ||
| return { module: MailerModule }; | ||
| } | ||
|
|
||
| // If mailer is ENABLED, return the module with configuration (service, listener, etc.) | ||
| let transportOption: TransportType; | ||
|
|
||
| const mailerAddressFrom = | ||
| env.INFRA.MAILER_ADDRESS_FROM ?? | ||
| config.get('MAILER_ADDRESS_FROM') ?? | ||
| throwErr(MAILER_SMTP_URL_UNDEFINED); | ||
|
|
||
| if ( | ||
| (env.INFRA.MAILER_USE_ADVANCE_CONFIGS ?? | ||
| config.get('MAILER_USE_ADVANCE_CONFIGS')) === 'false' | ||
| ) { | ||
| console.log('Using simple mailer configuration'); | ||
|
|
||
| transportOption = | ||
| env.INFRA.MAILER_SMTP_URL ?? | ||
| config.get('MAILER_SMTP_URL') ?? | ||
| throwErr(MAILER_SMTP_URL_UNDEFINED); | ||
| } else if ( | ||
| (env.INFRA.MAILER_USE_ADVANCE_CONFIGS ?? | ||
| config.get('MAILER_USE_ADVANCE_CONFIGS')) === 'true' | ||
| ) { | ||
| console.log('Using advance mailer configuration'); |
There was a problem hiding this comment.
I'll split this into different functions.
.env.example
Outdated
Comment on lines
44
to
49
| MAILER_SMTP_HOST="smtp.domain.com" # if MAILER_USE_ADVANCE_CONFIGS is false | ||
| MAILER_SMTP_PORT="587" # if MAILER_USE_ADVANCE_CONFIGS is false | ||
| MAILER_SMTP_SECURE="true" # if MAILER_USE_ADVANCE_CONFIGS is false | ||
| MAILER_SMTP_USER="user@domain.com" # if MAILER_USE_ADVANCE_CONFIGS is false | ||
| MAILER_SMTP_PASSWORD="pass" # if MAILER_USE_ADVANCE_CONFIGS is false | ||
| MAILER_TLS_REJECT_UNAUTHORIZED="true" # if MAILER_USE_ADVANCE_CONFIGS is false |
There was a problem hiding this comment.
Do all these have to be strings, can some of them normal booleans and numbers and we do a toString() conversion in the infra-config module anyway??
There was a problem hiding this comment.
The default behavior is process.env always reads the env variable as string regarding of string/boolean.
No matter if you add an inverted comma or not, process.env reads it as a string.
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes HSB-439
Description
This PR
mailer-moduleoptionalmailer-modulemore configurableChecks
Additional Information
Nil