feat(auth): allow auth option in MongoClient.connect

* allow auth option

* copy auth from user-provided options

* dont fail if no options

* try once more

* and once more

* add back in options.auth

* try options as separate test

Author: vkarpov15

lib/mongo_client.js

@@ -38,7 +38,7 @@ var validOptionNames = ['poolSize', 'ssl', 'sslValidate', 'sslCA', 'sslCert',
   'serializeFunctions', 'ignoreUndefined', 'raw', 'promoteLongs', 'bufferMaxEntries',
   'readPreference', 'pkFactory', 'promiseLibrary', 'readConcern', 'maxStalenessSeconds',
   'loggerLevel', 'logger', 'promoteValues', 'promoteBuffers', 'promoteLongs',
-  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions', 'appname'];
+  'domainsEnabled', 'keepAliveInitialDelay', 'checkServerIdentity', 'validateOptions', 'appname', 'auth'];
 var ignoreOptionNames = ['native_parser'];
 var legacyOptionNames = ['server', 'replset', 'replSet', 'mongos', 'db'];
 
@@ -114,6 +114,8 @@ function MongoClient() {
    * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for Mongos proxies selection.
    * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
    * @param {string} [options.authSource=undefined] Define the database to authenticate against
+   * @param {string} [options.auth.user=undefined] The username for auth
+   * @param {string} [options.auth.password=undefined] The username for auth
    * @param {(number|string)} [options.w=null] The write concern.
    * @param {number} [options.wtimeout=null] The write concern timeout.
    * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -183,6 +185,8 @@ var define = MongoClient.define = new Define('MongoClient', MongoClient, false);
  * @param {number} [options.acceptableLatencyMS=15] Cutoff latency point in MS for Mongos proxies selection.
  * @param {boolean} [options.connectWithNoPrimary=false] Sets if the driver should connect even if no primary is available
  * @param {string} [options.authSource=undefined] Define the database to authenticate against
+ * @param {string} [options.auth.user=undefined] The username for auth
+ * @param {string} [options.auth.password=undefined] The username for auth
  * @param {(number|string)} [options.w=null] The write concern.
  * @param {number} [options.wtimeout=null] The write concern timeout.
  * @param {boolean} [options.j=false] Specify a journal write concern.
@@ -488,6 +492,10 @@ var connect = function(self, url, options, callback) {
   if(_finalOptions.socketTimeoutMS == null) _finalOptions.socketTimeoutMS = 360000;
   if(_finalOptions.connectTimeoutMS == null) _finalOptions.connectTimeoutMS = 30000;
 
+  if (_finalOptions.db_options && _finalOptions.db_options.auth) {
+    delete _finalOptions.db_options.auth;
+  }
+
   // Failure modes
   if(object.servers.length == 0) {
     throw new Error("connection string must contain at least one seed host");

lib/url_parser.js

@@ -145,6 +145,8 @@ module.exports = function(url, options) {
 
   // Add auth to final object if we have 2 elements
   if(auth.length == 2) object.auth = {user: auth[0], password: auth[1]};
+  // if user provided auth options, use that
+  if(options && options.auth != null) object.auth = options.auth;
 
   // Variables used for temporary storage
   var hostPart;

test/functional/connection_tests.js

@@ -292,6 +292,37 @@ exports.testConnectGoodAuth = {
   }
 }
 
+/**
+ * @ignore
+ */
+exports.testConnectGoodAuthAsOption = {
+  metadata: { requires: { topology: 'single' } },
+
+  // The actual test we wish to run
+  test: function(configuration, test) {
+    var connect = configuration.require;
+    var user = 'testConnectGoodAuthAsOption', password = 'password';
+    // First add a user.
+    connect(configuration.url(), function(err, db) {
+      test.equal(err, null);
+
+      db.addUser(user, password, function(err, result) {
+        test.equal(err, null);
+        db.close();
+        restOfTest();
+      });
+    });
+
+    function restOfTest() {
+      var opts = { auth: { user: user, password: password } };
+      connect(configuration.url('baduser', 'badpassword'), opts, connectionTester(test, 'testConnectGoodAuthAsOption', function(db) {
+        db.close();
+        test.done();
+      }));
+    }
+  }
+}
+
 /**
  * @ignore
  */