feat: Add support for not requiring SMTP auth with user management (#…

…3742)
n8n-io · Aug 17, 2023 · 0db5af3 · 0db5af3
1 parent 6b99e97
commit 0db5af3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -30,10 +30,8 @@ export async function getWorkflowOwner(workflowId: string): Promise<User> {
 export function isEmailSetUp(): boolean {
 	const smtp = config.getEnv('userManagement.emails.mode') === 'smtp';
 	const host = !!config.getEnv('userManagement.emails.smtp.host');
-	const user = !!config.getEnv('userManagement.emails.smtp.auth.user');
-	const pass = !!config.getEnv('userManagement.emails.smtp.auth.pass');
 
-	return smtp && host && user && pass;
+	return smtp && host;
 }
 
 export function isUserManagementEnabled(): boolean {

diff --git a/packages/cli/src/UserManagement/email/NodeMailer.ts b/packages/cli/src/UserManagement/email/NodeMailer.ts
@@ -4,20 +4,29 @@ import { createTransport } from 'nodemailer';
 import { ErrorReporterProxy as ErrorReporter, LoggerProxy as Logger } from 'n8n-workflow';
 import config from '@/config';
 import type { MailData, SendEmailResult } from './Interfaces';
+import type SMTPConnection from 'nodemailer/lib/smtp-connection';
 
 export class NodeMailer {
 	private transport?: Transporter;
 
 	async init(): Promise<void> {
-		this.transport = createTransport({
+		const transportConfig: SMTPConnection.Options = {
 			host: config.getEnv('userManagement.emails.smtp.host'),
 			port: config.getEnv('userManagement.emails.smtp.port'),
 			secure: config.getEnv('userManagement.emails.smtp.secure'),
-			auth: {
+		};
+
+		if (
+			config.getEnv('userManagement.emails.smtp.auth.user') &&
+			config.getEnv('userManagement.emails.smtp.auth.pass')
+		) {
+			transportConfig.auth = {
 				user: config.getEnv('userManagement.emails.smtp.auth.user'),
 				pass: config.getEnv('userManagement.emails.smtp.auth.pass'),
-			},
-		});
+			};
+		}
+
+		this.transport = createTransport(transportConfig);
 	}
 
 	async verifyConnection(): Promise<void> {