NODE-1435: move all auth to connect

lib/auth/auth_provider.js

@@ -41,11 +41,9 @@ class AuthProvider {
 
         // If we have an error
         if (err) {
-          errorObject = err;
-        } else if (r.result && r.result['$err']) {
-          errorObject = r.result;
-        } else if (r.result && r.result['errmsg']) {
-          errorObject = r.result;
+          errorObject = new MongoError(err);
+        } else if (r && (r.$err || r.errmsg)) {
+          errorObject = new MongoError(r);
         } else {
           numberOfValidConnections = numberOfValidConnections + 1;
         }

lib/auth/gssapi.js

@@ -128,11 +128,10 @@ var MongoDBGSSAPIFirstStep = function(
   };
 
   // Write the commmand on the connection
-  sendAuthCommand(connection, '$external.$cmd', command, (err, r) => {
+  sendAuthCommand(connection, '$external.$cmd', command, (err, doc) => {
     if (err) return callback(err, false);
-    var doc = r.result;
     // Execute mongodb transition
-    mongo_auth_process.transition(r.result.payload, function(err, payload) {
+    mongo_auth_process.transition(doc.payload, function(err, payload) {
       if (err) return callback(err, false);
 
       // MongoDB API Second Step
@@ -177,9 +176,8 @@ var MongoDBGSSAPISecondStep = function(
 
   // Execute the command
   // Write the commmand on the connection
-  sendAuthCommand(connection, '$external.$cmd', command, (err, r) => {
+  sendAuthCommand(connection, '$external.$cmd', command, (err, doc) => {
     if (err) return callback(err, false);
-    var doc = r.result;
     // Call next transition for kerberos
     mongo_auth_process.transition(doc.payload, function(err, payload) {
       if (err) return callback(err, false);

lib/auth/mongocr.js

@@ -24,7 +24,7 @@ class MongoCR extends AuthProvider {
 
       // Get nonce
       if (err == null) {
-        nonce = r.result.nonce;
+        nonce = r.nonce;
         // Use node md5 generator
         let md5 = crypto.createHash('md5');
         // Generate keys used for authentication

lib/auth/scram.js

@@ -121,8 +121,8 @@ class ScramSHA extends AuthProvider {
       return err;
     }
 
-    if (r.result['$err'] || r.result['errmsg']) {
-      return r.result;
+    if (r.$err || r.errmsg) {
+      return new MongoError(r);
     }
   }
 
@@ -177,7 +177,7 @@ class ScramSHA extends AuthProvider {
         return callback(tmpError, null);
       }
 
-      const dict = parsePayload(r.result.payload.value());
+      const dict = parsePayload(r.payload.value());
       const iterations = parseInt(dict.i, 10);
       const salt = dict.s;
       const rnonce = dict.r;
@@ -198,29 +198,25 @@ class ScramSHA extends AuthProvider {
 
       const clientKey = HMAC(cryptoMethod, saltedPassword, 'Client Key');
       const storedKey = H(cryptoMethod, clientKey);
-      const authMessage = [
-        firstBare,
-        r.result.payload.value().toString('base64'),
-        withoutProof
-      ].join(',');
+      const authMessage = [firstBare, r.payload.value().toString('base64'), withoutProof].join(',');
 
       const clientSignature = HMAC(cryptoMethod, storedKey, authMessage);
       const clientProof = `p=${xor(clientKey, clientSignature)}`;
       const clientFinal = [withoutProof, clientProof].join(',');
       const saslContinueCmd = {
         saslContinue: 1,
-        conversationId: r.result.conversationId,
+        conversationId: r.conversationId,
         payload: new Binary(Buffer.from(clientFinal))
       };
 
       sendAuthCommand(connection, `${db}.$cmd`, saslContinueCmd, (err, r) => {
-        if (!r || r.result.done !== false) {
+        if (!r || r.done !== false) {
           return callback(err, r);
         }
 
         const retrySaslContinueCmd = {
           saslContinue: 1,
-          conversationId: r.result.conversationId,
+          conversationId: r.conversationId,
           payload: Buffer.alloc(0)
         };
 

lib/auth/sspi.js

@@ -90,9 +90,8 @@ function SSIPAuthenticate(
         autoAuthorize: 1
       };
 
-      authCommand(command, (err, result) => {
+      authCommand(command, (err, doc) => {
         if (err) return callback(err, false);
-        const doc = result.result;
 
         authProcess.transition(doc.payload, (err, payload) => {
           if (err) return callback(err, false);
@@ -102,9 +101,8 @@ function SSIPAuthenticate(
             payload
           };
 
-          authCommand(command, (err, result) => {
+          authCommand(command, (err, doc) => {
             if (err) return callback(err, false);
-            const doc = result.result;
 
             authProcess.transition(doc.payload, (err, payload) => {
               if (err) return callback(err, false);

lib/connection/connect.js

@@ -5,8 +5,14 @@ const Connection = require('./connection');
 const Query = require('./commands').Query;
 const createClientInfo = require('../topologies/shared').createClientInfo;
 const MongoError = require('../error').MongoError;
+const defaultAuthProviders = require('../auth/defaultAuthProviders').defaultAuthProviders;
+let AUTH_PROVIDERS;
 
 function connect(options, callback) {
+  if (AUTH_PROVIDERS == null) {
+    AUTH_PROVIDERS = defaultAuthProviders(options.bson);
+  }
+
   if (options.family !== void 0) {
     makeConnection(options.family, options, (err, socket) => {
       if (err) {
@@ -132,6 +138,14 @@ function performInitialHandshake(conn, options, callback) {
     //       relocated, or at very least restructured.
     conn.ismaster = ismaster;
     conn.lastIsMasterMS = new Date().getTime() - start;
+
+    const credentials = options.credentials;
+    if (credentials) {
+      credentials.resolveAuthMechanism(ismaster);
+      authenticate(conn, credentials, callback);
+      return;
+    }
+
     callback(null, conn);
   });
 }
@@ -260,6 +274,7 @@ function makeConnection(family, options, callback) {
 
 const CONNECTION_ERROR_EVENTS = ['error', 'close', 'timeout', 'parseError'];
 function runCommand(conn, ns, command, options, callback) {
+  if (typeof options === 'function') (callback = options), (options = {});
   const socketTimeout = typeof options.socketTimeout === 'number' ? options.socketTimeout : 360000;
   const bson = conn.options.bson;
   const query = new Query(bson, ns, command, {
@@ -293,4 +308,18 @@ function runCommand(conn, ns, command, options, callback) {
   conn.write(query.toBin());
 }
 
+function authenticate(conn, credentials, callback) {
+  const mechanism = credentials.mechanism;
+  if (!AUTH_PROVIDERS[mechanism]) {
+    callback(new MongoError(`authMechanism '${mechanism}' not supported`));
+    return;
+  }
+
+  const provider = AUTH_PROVIDERS[mechanism];
+  provider.auth(runCommand, [conn], credentials, err => {
+    if (err) return callback(err);
+    callback(null, conn);
+  });
+}
+
 module.exports = connect;