joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #297 from taylorstine/mongo_uri

Browse Source 
reverted uri encoding
This commit is contained in:
Drew
2016-02-08 09:38:27 -08:00
parent 5c8f09b429 f504cbb786
commit 123ac5fe76
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ExportAdapter.js
View File

@@ -34,21 +34,8 @@ ExportAdapter.prototype.connect = function() {
return this.connectionPromise; return this.connectionPromise;
} }
//http://regexr.com/3cncm
if (!this.mongoURI.match(/^mongodb:\/\/((.+):(.+)@)?([^:@]+):{0,1}([^:]+)\/(.+?)$/gm)) {
throw new Error("Invalid mongoURI: " + this.mongoURI)
}
var usernameStart = this.mongoURI.indexOf('://') + 3;
var lastAtIndex = this.mongoURI.lastIndexOf('@');
var encodedMongoURI = this.mongoURI;
var split = null;
if (lastAtIndex > 0) {
split = this.mongoURI.slice(usernameStart, lastAtIndex).split(':');
encodedMongoURI = this.mongoURI.slice(0, usernameStart) + encodeURIComponent(split[0]) + ':' + encodeURIComponent(split[1]) + this.mongoURI.slice(lastAtIndex);
}
this.connectionPromise = Promise.resolve().then(() => { this.connectionPromise = Promise.resolve().then(() => {
return MongoClient.connect(encodedMongoURI, {uri_decode_auth:true}); return MongoClient.connect(this.mongoURI);
}).then((db) => { }).then((db) => {
this.db = db; this.db = db;
}); });