Merge pull request #23 from 2do2go/feature/support-connection-options

Add connection options support

Author: okv

README.md

@@ -48,6 +48,8 @@ Required if collection hasn't been set.
 
 * **collection**: object -- mongodb collection instance. Required if uri hasn't been set.
 
+* **connectionOptions**: object -- mongodb connection options. Allows to pass additional connection options to mongodb. The default connection options are `useUnifiedTopology: true`, `useNewUrlParser: true`.
+
 * **expireTimeMs**: integer -- time period, in milliseconds, after which record will be reset (deleted).
 Defaults to `60 * 1000`. Notice that current implementation uses on mongodb ttl indexes - background task that removes expired documents runs every 60 seconds. As a result, documents may remain in a collection during the period between the expiration of the document and the running of the background task. See [mongodb ttl indexes doc](https://docs.mongodb.com/v3.6/core/index-ttl/#timing-of-the-delete-operation) for more information.
 

lib/mongoStore.js

@@ -35,7 +35,7 @@ var MongoStore = function(options) {
 	_(this).extend(
 		_(allOptions).pick(
 			'collection', 'expireTimeMs', 'resetExpireDateOnChange',
-			'errorHandler', 'createTtlIndex'
+			'errorHandler', 'createTtlIndex', 'connectionOptions'
 		)
 	);
 
@@ -46,24 +46,27 @@ MongoStore.prototype._createCollection = function(callback) {
 	var self = this;
 	Steppy(
 		function() {
-			var connectOptions = {
-				useNewUrlParser: true,
-				useUnifiedTopology: true
-			};
+			var connectionOptions = _({}).defaults(
+				self.connectionOptions,
+				{
+					useNewUrlParser: true,
+					useUnifiedTopology: true
+				}
+			);
 
 			if (self.dbOptions.user && self.dbOptions.password) {
 				var dbName = _(self.dbOptions.uri.split('/')).last();
 
-				connectOptions.authSource = self.dbOptions.authSource || dbName;
-				connectOptions.auth = {
+				connectionOptions.authSource = self.dbOptions.authSource || dbName;
+				connectionOptions.auth = {
 					user: self.dbOptions.user,
 					password: self.dbOptions.password
 				};
 			}
 
 			MongoClient.connect(
 				self.dbOptions.uri,
-				connectOptions,
+				connectionOptions,
 				this.slot()
 			);
 		},

package-lock.json

@@ -26,9 +26,9 @@
     "mongodb"
   ],
   "dependencies": {
+    "mongodb": ">= 3.3.4 < 4.0.0",
     "twostep": "0.4.2",
-    "underscore": "1.9.1",
-    "mongodb": ">= 3.3.4 < 4.0.0"
+    "underscore": "1.11.0"
   },
   "devDependencies": {
     "coveralls": "3.1.0",

package.json

@@ -0,0 +1,102 @@
+'use strict';
+
+var expect = require('expect.js');
+var Steppy = require('twostep').Steppy;
+var rewire = require('rewire');
+var _ = require('underscore');
+var testUtils = require('./utils');
+
+var MongoStore = rewire('../../../lib/mongoStore');
+
+var describeTitle = 'MongoClient.prototype._createCollection ' +
+	'with connection options';
+describe(describeTitle, function() {
+	var testData = testUtils.getTestData();
+	testData.mongoStoreContext.dbOptions.user = 'testUser';
+	testData.mongoStoreContext.dbOptions.password = 'testPassword';
+	testData.mongoStoreContext.dbOptions.authSource = 'testAuthSource';
+	testData.mongoStoreContext.connectionOptions = {
+		useUnifiedTopology: false,
+		ssl: true,
+		sslCA: Buffer.alloc(5)
+	};
+
+	var mocks = testUtils.getMocks(testData);
+
+	var revertMocks;
+
+	before(function() {
+		revertMocks = MongoStore.__set__(
+			_(mocks).omit('_dynamic')
+		);
+	});
+
+	it('should set collection to mongoStore context', function(done) {
+		Steppy(
+			function() {
+				MongoStore.prototype._createCollection.call(
+					testData.mongoStoreContext,
+					this.slot()
+				);
+			},
+			function() {
+				expect(testData.mongoStoreContext).keys('collection');
+				expect(
+					testData.mongoStoreContext.collection
+				).eql(testData.db.collectionResult);
+
+				this.pass(null);
+			},
+			done
+		);
+	});
+
+	it('MongoClient.connect should be called with uri and options', function() {
+		expect(mocks.MongoClient.connect.callCount).eql(1);
+
+		var MongoClientConnectArgs = mocks.MongoClient.connect.args[0];
+
+		expect(
+			_(MongoClientConnectArgs).initial()
+		).eql([
+			testData.mongoStoreContext.dbOptions.uri,
+			{
+				useNewUrlParser: true,
+				useUnifiedTopology: false,
+				authSource: testData.mongoStoreContext.dbOptions.authSource,
+				auth: {
+					user: testData.mongoStoreContext.dbOptions.user,
+					password: testData.mongoStoreContext.dbOptions.password
+				},
+				ssl: testData.mongoStoreContext.connectionOptions.ssl,
+				sslCA: testData.mongoStoreContext.connectionOptions.sslCA
+			}
+		]);
+
+		expect(
+			_(MongoClientConnectArgs).last()
+		).a('function');
+	});
+
+	it('client.db should be called', function() {
+		expect(mocks._dynamic.client.db.callCount).eql(1);
+
+		var clientDbArgs = mocks._dynamic.client.db.args[0];
+
+		expect(clientDbArgs).eql([]);
+	});
+
+	it('db.collection should be called with collection name', function() {
+		expect(mocks._dynamic.db.collection.callCount).eql(1);
+
+		var dbCollectionArgs = mocks._dynamic.db.collection.args[0];
+
+		expect(dbCollectionArgs).eql([
+			testData.mongoStoreContext.dbOptions.collectionName
+		]);
+	});
+
+	after(function() {
+		revertMocks();
+	});
+});