Fix reporting error for incomplete credentials

- Add test for completely missing credentials - Add test for partially missing credentials (eg. user is defined, but password is missing) - Fix reporting "Missing credentials" error for only partially defined credentials
bijanmmarkes · Nov 13, 2017 · e217417 · e217417
1 parent 9e0e926
commit e217417
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/lib/smtp-connection/index.js b/lib/smtp-connection/index.js
@@ -330,7 +330,7 @@ class SMTPConnection extends EventEmitter {
             this._authMethod = (this._supportedAuth[0] || 'PLAIN').toUpperCase().trim();
         }
 
-        if (this._authMethod !== 'XOAUTH2' && !this._auth.credentials) {
+        if (this._authMethod !== 'XOAUTH2' && (!this._auth.credentials || !this._auth.credentials.user || !this._auth.credentials.pass)) {
             if (this._auth.user && this._auth.pass) {
                 this._auth.credentials = {
                     user: this._auth.user,

diff --git a/test/smtp-connection/smtp-connection-test.js b/test/smtp-connection/smtp-connection-test.js
@@ -626,6 +626,44 @@ describe('SMTP-Connection Tests', function() {
             );
         });
 
+        it('should return error for missing credentials', function(done) {
+            expect(client.authenticated).to.be.false;
+            client.login(
+                {
+                    user: 'testuser'
+                },
+                function(err) {
+                    expect(err).to.exist;
+                    expect(client.authenticated).to.be.false;
+                    expect(err.message).to.match(/^Missing credentials/);
+                    expect(err.code).to.equal('EAUTH');
+                    expect(err.response).to.be.undefined;
+                    done();
+                }
+            );
+        });
+
+        it('should return error for incomplete credentials', function(done) {
+            expect(client.authenticated).to.be.false;
+            client.login(
+                {
+                    user: 'testuser',
+                    credentials: {
+                        user: 'testuser'
+                    }
+                },
+                function(err) {
+                    expect(err).to.exist;
+                    expect(client.authenticated).to.be.false;
+                    expect(err.message).to.match(/^Missing credentials/);
+                    expect(err.code).to.equal('EAUTH');
+                    expect(err.response).to.be.undefined;
+                    done();
+                }
+            );
+        });
+
+
         describe('xoauth2 login', function() {
             this.timeout(10 * 1000);
             let x2server;