Add options.forceAuth for SMTP

Re-introduces opt-in behavior that was changed in f419b09
repodiscover · Feb 27, 2020 · a27ed2f · a27ed2f
1 parent 705fc8f
commit a27ed2f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/lib/smtp-pool/index.js b/lib/smtp-pool/index.js
@@ -613,7 +613,7 @@ class SMTPPool extends EventEmitter {
                     return;
                 }
 
-                if (auth && connection.allowsAuth) {
+                if (auth && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(auth, err => {
                         if (returned) {
                             return;

diff --git a/lib/smtp-pool/pool-resource.js b/lib/smtp-pool/pool-resource.js
@@ -137,7 +137,7 @@ class PoolResource extends EventEmitter {
                     return;
                 }
 
-                if (this.auth && this.connection.allowsAuth) {
+                if (this.auth && (this.connection.allowsAuth || options.forceAuth)) {
                     this.connection.login(this.auth, err => {
                         if (returned) {
                             return;

diff --git a/lib/smtp-transport/index.js b/lib/smtp-transport/index.js
@@ -267,7 +267,7 @@ class SMTPTransport extends EventEmitter {
 
                 let auth = this.getAuth(mail.data.auth);
 
-                if (auth && connection.allowsAuth) {
+                if (auth && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(auth, err => {
                         if (auth && auth !== this.auth && auth.oauth2) {
                             auth.oauth2.removeAllListeners();
@@ -370,7 +370,7 @@ class SMTPTransport extends EventEmitter {
 
                 let authData = this.getAuth({});
 
-                if (authData && connection.allowsAuth) {
+                if (authData && (connection.allowsAuth || options.forceAuth)) {
                     connection.login(authData, err => {
                         if (returned) {
                             return;

diff --git a/test/smtp-transport/smtp-tranport-test.js b/test/smtp-transport/smtp-tranport-test.js
@@ -179,6 +179,34 @@ describe('SMTP Transport Tests', function() {
             );
         });
 
+        it('Should fail auth if forceAuth=true', function(done) {
+            let client = new SMTPTransport({
+                port: PORT_NUMBER,
+                auth: {
+                    user: 'zzz'
+                },
+                forceAuth: true,
+                logger: false
+            });
+
+            client.send(
+                {
+                    data: {},
+                    message: new MockBuilder(
+                        {
+                            from: '[email protected]',
+                            to: '[email protected]'
+                        },
+                        'message'
+                    )
+                },
+                function(err) {
+                    expect(err.code).to.equal('EAUTH');
+                    done();
+                }
+            );
+        });
+
         it('Should send mail', function(done) {
             let client = new SMTPTransport('smtp:localhost:' + PORT_NUMBER + '?logger=false');
             let chunks = [],