INT-1049 getId improvements

Matt Cotter · Matt Cotter · commit 0ac4870a7edb · 2015-12-22T16:17:16.000-05:00
* remove username/password from URL
* remove connection options
diff --git a/lib/model.js b/lib/model.js
@@ -142,5 +142,7 @@ module.exports.getId = function(id) {
   return id.toLowerCase()
     .replace(hostname.toLowerCase(), 'localhost')
     .replace('127.0.0.1', 'localhost')
-    .replace('mongodb://', '');
+    .replace('mongodb://', '')
+    .replace(/^[^@]+@/, '')
+    .replace(/\/?\?(?:\w+=[^&]+&)*\w+=[^&]+$/, '');
 };
diff --git a/test/index.test.js b/test/index.test.js
@@ -23,6 +23,18 @@ describe('mongodb-instance-model', function() {
     it('should remove mongodb://', function() {
       assert.equal(Instance.getId('mongodb://localhost:27017'), 'localhost:27017');
     });
+    it('should remove mongodb://user:pass@', function() {
+      assert.equal(Instance.getId('mongodb://matt:123@localhost:27017'), 'localhost:27017');
+    });
+    it('should remove user:pass@', function() {
+      assert.equal(Instance.getId('matt:123@localhost:27017'), 'localhost:27017');
+    });
+    it('should remove a trailing option', function() {
+      assert.equal(Instance.getId('localhost:27017/?option=thing'), 'localhost:27017');
+    });
+    it('should remove many trailing options', function() {
+      assert.equal(Instance.getId('localhost:27017/?option=thing&otherThing=coolStuff&zombies=true'), 'localhost:27017');
+    });
     it('should substitute localhost for 127.0.0.1', function() {
       assert.equal(Instance.getId('127.0.0.1:27017'), 'localhost:27017');
     });
