diff --git a/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.ts b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.ts index 2408233360714..be6669792e812 100644 --- a/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.ts +++ b/packages/nodes-base/nodes/EmailReadImap/EmailReadImap.node.ts @@ -433,10 +433,18 @@ export class EmailReadImap implements INodeType { }, }; + const tlsOptions: IDataObject = {}; + if (options.allowUnauthorizedCerts === true) { - config.imap.tlsOptions = { - rejectUnauthorized: false, - }; + tlsOptions.rejectUnauthorized = false; + } + + if (credentials.secure) { + tlsOptions.servername = credentials.host as string; + } + + if (!_.isEmpty(tlsOptions)) { + config.imap.tlsOptions = tlsOptions; } // Connect to the IMAP server and open the mailbox @@ -456,9 +464,8 @@ export class EmailReadImap implements INodeType { } } else { Logger.error('Email Read Imap node encountered a connection error', { error }); + this.emitError(error); } - - this.emitError(error); }); return conn; });