Replace OR for AND in mail (totaljs#522).

petersirka · petersirka · commit 2829405c9015 · 2017-07-16T08:35:30.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -10,6 +10,8 @@
 - updated: `controller.viewCompile(body, model, [headers], [partial], [cacheKey])` add a cache key
 - updated: `image.command(arg, value, [priority], [escape])` a `priority` argument can be `escape` when it contains `boolean` value
 
+- fixed: mail auth when `options.user` and `options.password` are blank
+
 ======= 2.7.0
 
 - added: __IMPORTANT__ new unit-testing mechanism
diff --git a/mail.js b/mail.js
@@ -675,7 +675,8 @@ Mailer.prototype.$send = function(obj, options, autosend) {
 		var code = +line.match(REG_STATE)[0];
 
 		if (code === 250 && !isAuthorization) {
-			if ((line.indexOf('AUTH LOGIN PLAIN') !== -1 || line.indexOf('AUTH PLAIN LOGIN') !== -1) || (options.user && options.password)) {
+			// OR was replaced to AND --> https://github.com/totaljs/framework/issues/522
+			if ((line.indexOf('AUTH LOGIN PLAIN') !== -1 || line.indexOf('AUTH PLAIN LOGIN') !== -1) && (options.user && options.password)) {
 				isAuthorization = true;
 				if (line.indexOf('XOAUTH') === -1) {
 					auth.push('AUTH LOGIN');
@@ -710,7 +711,7 @@ Mailer.prototype.$send = function(obj, options, autosend) {
 			case 250: // OPERATION
 			case 251: // FORWARD
 			case 235: // VERIFY
-			case 999: // total.js again
+			case 999: // Total.js again
 
 				obj.messagecallback && obj.messagecallback(null, obj.instance);
 				obj.messagecallback = null;
