feat(connection): Add options to mongodb connection string

package.json

@@ -42,6 +42,7 @@
     "geopoint": "^1.0.1",
     "lodash": "^4.17.4",
     "moment": "^2.19.1",
+    "mongo-uri-builder": "^1.0.3",
     "mongodb": "^2.2.33",
     "mquery": "^2.3.2",
     "pluralize": "^7.0.0",

src/Database/index.js

@@ -14,6 +14,7 @@ const mquery = require('mquery')
 const CE = require('../Exceptions')
 const util = require('../../lib/util')
 const _ = require('lodash')
+const mongoUriBuilder = require('mongo-uri-builder')
 // const debug = require('debug')('mquery')
 
 const proxyHandler = {
@@ -107,15 +108,8 @@ class Database {
     if (config.client !== 'mongodb') {
       throw new CE.RuntimeException('invalid connection type')
     }
-    const security = (config.connection.user && config.connection.password)
-      ? `${config.connection.user}:${config.connection.password}@`
-      : (config.connection.user ? `${config.connection.user}@` : '')
 
-    const authString = (config.connection.auth && config.connection.auth.source && config.connection.auth.mechanism)
-      ? `?authSource=${config.connection.auth.source}&authMechanism=${config.connection.auth.mechanism}`
-      : ''
-
-    this.connectionString = `mongodb://${security}${config.connection.host}:${config.connection.port}/${config.connection.database}${authString}`
+    this.connectionString = config.connection.connectionString || mongoUriBuilder(config.connection)
     this.connection = null
     this._globalTrx = null
     this.query()

templates/config.mustache

@@ -23,15 +23,23 @@ module.exports = {
   */
   mongodb: {
     client: 'mongodb',
+    connectionString: Env.get('DB_CONNECTION_STRING', ''),
     connection: {
       host: Env.get('DB_HOST', 'localhost'),
       port: Env.get('DB_PORT', 27017),
-      user: Env.get('DB_USER', 'admin'),
+      username: Env.get('DB_USER', 'admin'),
       password: Env.get('DB_PASSWORD', ''),
       database: Env.get('DB_DATABASE', 'adonis'),
-      auth: {
-        source: Env.get('DB_AUTH_SOURCE', ''),
-        mechanism: Env.get('DB_AUTH_MECHANISM', '')
+      options: {
+        // replicaSet: Env.get('DB_REPLICA_SET', '')
+        // ssl: ('DB_SSL, '')
+        // connectTimeoutMS: Env.get('DB_CONNECT_TIMEOUT_MS', 15000),
+        // socketTimeoutMS: Env.get('DB_SOCKET_TIMEOUT_MS', 180000),
+        // w: ('DB_W, 0),
+        // readPreference: Env.get('DB_READ_PREFERENCE', 'secondary'),
+        // authSource: Env.get('DB_AUTH_SOURCE', ''),
+        // authMechanism: Env.get('DB_AUTH_MECHANISM', ''),
+        // other options
       }
     }
   }

test/unit/helpers/index.js

@@ -30,7 +30,7 @@ module.exports = {
         connection: {
           host: process.env.DB_HOST || '127.0.0.1',
           port: process.env.DB_PORT || '27017',
-          user: process.env.DB_USER || 'admin',
+          username: process.env.DB_USER || 'admin',
           password: process.env.DB_PASSWORD || '',
           database: process.env.DB_NAME || 'test'
         }

test/unit/helpers/mongodbConnections.js

@@ -10,7 +10,7 @@ module.exports = {
   default: {
     client: 'mongodb',
     connection: {
-      user: 'admin',
+      username: 'admin',
       password: '',
       database: 'default'
     }
@@ -19,7 +19,7 @@ module.exports = {
   alternateConnection: {
     client: 'mongodb',
     connection: {
-      user: 'admin',
+      username: 'admin',
       password: '',
       database: 'alternate'
     }
@@ -28,7 +28,7 @@ module.exports = {
   defaultPrefix: {
     client: 'mongodb',
     connection: {
-      user: 'admin',
+      username: 'admin',
       password: '',
       database: 'default'
     },