refactor(url parser): collect connection string options

Author: Jessica Lord

lib/url_parser.js

@@ -52,16 +52,18 @@ module.exports = function(url, options, callback) {
       });
 
       let connectionString = connectionStrings.join(',') + '/';
-      
-      if (!options.ssl && !result.search.match('ssl')) {
-        // Default to SSL true
-        connectionString += '?ssl=true';
-      } else if (!result.search) connectionString += '?'
+      let connectionStringOptions = [];
+
+      // Default to SSL true
+      if (!options.ssl && !result.search) {
+        connectionStringOptions.push('ssl=true');
+      } else if (!options.ssl && result.search && !result.search.match('ssl')) {
+        connectionStringOptions.push('ssl=true');
+      }
+
       // Keep original uri options
-      if (result.search && !result.search.match('ssl')) {
-        connectionString += result.search.replace('?', '&');
-      } else if (result.search && result.search.match('ssl')) {
-        connectionString += result.search;
+      if (result.search) {
+        connectionStringOptions.push(result.search.replace('?', ''));
       }
 
       dns.resolveTxt(result.host, function(err, record) {
@@ -81,8 +83,14 @@ module.exports = function(url, options, callback) {
             return callback(new Error('text record must only set `authSource` or `replicaSet`'));
           }
 
-          connectionString += '&' + record;
+          connectionStringOptions.push(record);
         }
+
+        // Add any options to the connection string
+        if (connectionStringOptions.length) {
+          connectionString += `?${connectionStringOptions.join('&')}`;
+        }
+
         parseHandler(connectionString, options, callback);
       });
     });