Revert "chore(server/email): log error if email cannot be verified (#5408)" (#5416)

This reverts commit 1ce92e2980.
This commit is contained in:
Iain Sproat
2025-09-10 17:28:00 +01:00
committed by GitHub
parent 1ce92e2980
commit 2be6fa3d08
2 changed files with 11 additions and 44 deletions
@@ -1,14 +1,6 @@
import { emailLogger as logger } from '@/observability/logging'
import { MisconfiguredEnvironmentError } from '@/modules/shared/errors'
import {
getEmailHost,
getEmailPassword,
getEmailPort,
getEmailUsername,
isEmailEnabled,
isSecureEmailEnabled,
isTestEnv
} from '@/modules/shared/helpers/envHelper'
import { isEmailEnabled, isTestEnv } from '@/modules/shared/helpers/envHelper'
import type { Transporter } from 'nodemailer'
import { createTransport } from 'nodemailer'
@@ -19,23 +11,18 @@ const createJsonEchoTransporter = () => createTransport({ jsonTransport: true })
const initSmtpTransporter = async () => {
try {
const smtpTransporter = createTransport({
host: getEmailHost(),
port: getEmailPort(),
secure: isSecureEmailEnabled(),
host: process.env.EMAIL_HOST || '127.0.0.1',
port: parseInt(process.env.EMAIL_PORT || '587'),
secure: process.env.EMAIL_SECURE === 'true',
auth: {
user: getEmailUsername(),
pass: getEmailPassword()
user: process.env.EMAIL_USERNAME,
pass: process.env.EMAIL_PASSWORD
},
pool: true,
maxConnections: 20,
maxMessages: Infinity
})
const transporterVerified = await smtpTransporter.verify()
if (!transporterVerified) {
logger.error(
'📧 Email provider is likely misconfigured as validation failed, check config variables'
)
}
await smtpTransporter.verify()
return smtpTransporter
} catch (e) {
logger.error(e, '📧 Email provider is misconfigured, check config variables.')
@@ -334,6 +334,10 @@ export function getOnboardingStreamCacheBustNumber() {
return parseInt(val) || 1
}
export function getEmailFromAddress() {
return getStringFromEnv('EMAIL_FROM')
}
export function getMaximumProjectModelsPerPage() {
return getIntFromEnv('MAX_PROJECT_MODELS_PER_PAGE', '500')
}
@@ -369,30 +373,6 @@ export function isEmailEnabled() {
return getBooleanFromEnv('EMAIL')
}
export function getEmailFromAddress() {
return getStringFromEnv('EMAIL_FROM')
}
export function getEmailHost() {
return process.env.EMAIL_HOST || '127.0.0.1'
}
export function getEmailPort() {
return getIntFromEnv('EMAIL_PORT', '587')
}
export function isSecureEmailEnabled() {
return getBooleanFromEnv('EMAIL_SECURE', true) // default to secure
}
export function getEmailUsername() {
return getStringFromEnv('EMAIL_USERNAME', { unsafe: true }) // can be empty
}
export function getEmailPassword() {
return getStringFromEnv('EMAIL_PASSWORD', { unsafe: true }) // can be empty
}
export const getFileImporterQueuePostgresUrl = () =>
process.env['FILEIMPORT_QUEUE_POSTGRES_URL'] ?? null