Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Re-use existing or upcoming mongoose connection * Re-use existing or upcoming node-mongodb-native connection * Accept full-featured MongoDB connection strings + advanced options * Compatible with legacy config * Replace callback by `connected` event * Add debug Fix #51, #58, #62, #66, #70, #85, #94, #96, #115, #117, #120 Fix #124, #128, #129, #130, #131, #133, #134
- Loading branch information
1 parent
d19b127
commit ca40b78
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,26 +7,27 @@ | |
| /** | ||
| * Module dependencies | ||
| */ | ||
| var crypto = require('crypto'); | ||
| var mongo = require('mongodb'); | ||
| var util = require('util'); | ||
| var debug = require('debug')('connect-mongo'); | ||
|
|
||
| var MongoClient = mongo.MongoClient; | ||
| var Db = mongo.Db; | ||
|
|
||
|
|
||
| /** | ||
| * Default options | ||
| */ | ||
| var defaultOptions = { | ||
| host: '127.0.0.1', | ||
| port: 27017, | ||
| collection: 'sessions', | ||
| auto_reconnect: true, | ||
| ssl: false, | ||
| w: 1, | ||
| defaultExpirationTime: 1000 * 60 * 60 * 24 * 14 // 14 days | ||
| }; | ||
|
|
||
| function defaultSerializer (session) { | ||
| // Copy each property of the session to a new object | ||
|
|
@@ -53,157 +54,149 @@ module.exports = function(connect) { | |
|
|
||
| /** | ||
| * Initialize MongoStore with the given `options`. | ||
| * | ||
| * @param {Object} options | ||
| * @api public | ||
| */ | ||
|
|
||
| function MongoStore(options) { | ||
| options = options || {}; | ||
| var collectionName = options.collection || defaultOptions.collection; | ||
|
|
||
| Store.call(this, options); | ||
|
|
||
| // Hash sid | ||
| if (options.hash) { | ||
| var defaultSalt = 'connect-mongo'; | ||
| var defaultAlgorithm = 'sha1'; | ||
| this.hash = {}; | ||
| this.hash.salt = options.hash.salt ? options.hash.salt : defaultSalt; | ||
| this.hash.algorithm = options.hash.algorithm ? options.hash.algorithm : defaultAlgorithm; | ||
| } | ||
|
|
||
| // Serialization | ||
| if (options.stringify || (!('stringify' in options) && !('serialize' in options) && !('unserialize' in options))) { | ||
| this._serialize_session = JSON.stringify; | ||
| this._unserialize_session = JSON.parse; | ||
| } else { | ||
| this._serialize_session = options.serialize || defaultSerializer; | ||
| this._unserialize_session = options.unserialize || identity; | ||
| } | ||
|
|
||
| // Expiration time | ||
| this.defaultExpirationTime = options.defaultExpirationTime || defaultOptions.defaultExpirationTime; | ||
|
|
||
| var self = this; | ||
|
|
||
| function changeState(newState) { | ||
| debug('switched to state: %s', newState); | ||
| self.state = newState; | ||
| self.emit(newState); | ||
| } | ||
|
|
||
| function connectionReady(err) { | ||
| if (err) { | ||
| debug('not able to connect to the database'); | ||
| changeState('disconnected'); | ||
| throw err; | ||
| } | ||
| self.collection = self.db.collection(collectionName); | ||
| self.collection.ensureIndex({ expires: 1 }, { expireAfterSeconds: 0 }, function (err) { | ||
| if (err) throw err; | ||
| changeState('connected'); | ||
| }); | ||
| } | ||
|
|
||
| function buildUrlFromOptions() { | ||
| if(!options.db || typeof options.db !== 'string') { | ||
| throw new Error('Required MongoStore option `db` missing'); | ||
| } | ||
|
|
||
| options.url = 'mongodb://'; | ||
|
|
||
| if (options.username) { | ||
| options.url += options.username; | ||
| if (options.password) options.url += ':' + options.password; | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong. 
jdesboeufs
Author
Owner
|
||
| options.url += '@'; | ||
| } | ||
|
|
||
| options.url += options.host || defaultOptions.host; | ||
| options.url += ':' + (options.port || defaultOptions.port); | ||
| options.url += '/' + options.db; | ||
|
|
||
| if (options.ssl || defaultOptions.ssl) options.url += '?ssl=true'; | ||
|
|
||
| if (!options.mongoOptions) { | ||
| options.mongoOptions = { | ||
| server: { auto_reconnect: options.auto_reconnect || defaultOptions.auto_reconnect }, | ||
| db: { w: options.w || defaultOptions.w } | ||
| }; | ||
| } | ||
| } | ||
|
|
||
| function initWithUrl() { | ||
| MongoClient.connect(options.url, options.mongoOptions || {}, function(err, db) { | ||
| if (!err) self.db = db; | ||
| connectionReady(err); | ||
| }); | ||
| } | ||
|
|
||
| function initWithMongooseConnection() { | ||
| if (options.mongoose_connection.readyState === 1) { | ||
| self.db = options.mongoose_connection.db; | ||
| process.nextTick(connectionReady); | ||
| } else { | ||
| options.mongoose_connection.once('open', function() { | ||
| self.db = options.mongoose_connection.db; | ||
| connectionReady(); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| function initWithNativeDb() { | ||
| self.db = options.db; | ||
|
|
||
| if (options.db.openCalled) { | ||
| options.db.collection(collectionName, connectionReady); | ||
| } else { | ||
| options.db.open(connectionReady); | ||
| } | ||
| } | ||
|
|
||
| this.getCollection = function (done) { | ||
| switch (self.state) { | ||
| case 'connected': | ||
| done(null, self.collection); | ||
| break; | ||
| case 'connecting': | ||
| self.once('connected', function () { | ||
| done(null, self.collection); | ||
| }); | ||
| break; | ||
| case 'disconnected': | ||
| done(new Error('Not connected')); | ||
| break; | ||
| } | ||
| }; | ||
|
|
||
| changeState('init'); | ||
|
|
||
| if (options.url) { | ||
| debug('use strategy: `url`'); | ||
| initWithUrl(); | ||
| } else if (options.mongoose_connection) { | ||
| debug('use strategy: `mongoose_connection`'); | ||
| initWithMongooseConnection(); | ||
| } else if (options.db && options.db instanceof Db) { | ||
| debug('use strategy: `native_db`'); | ||
| initWithNativeDb(); | ||
| } else { | ||
| debug('use strategy: `legacy`'); | ||
| buildUrlFromOptions(); | ||
| initWithUrl(); | ||
| } | ||
|
|
||
| changeState('connecting'); | ||
|
|
||
| } | ||
|
|
||
|
|
@@ -223,7 +216,7 @@ module.exports = function(connect) { | |
| MongoStore.prototype.get = function(sid, callback) { | ||
| sid = this.hash ? crypto.createHash(this.hash.algorithm).update(this.hash.salt + sid).digest('hex') : sid; | ||
| var self = this; | ||
| this.getCollection(function(err, collection) { | ||
| if (err) return callback(err); | ||
| collection.findOne({_id: sid}, function(err, session) { | ||
| if (err) { | ||
|
|
@@ -282,7 +275,7 @@ module.exports = function(connect) { | |
| s.expires = new Date(today.getTime() + this.defaultExpirationTime); | ||
| } | ||
|
|
||
| this.getCollection(function(err, collection) { | ||
| if (err) return callback(err); | ||
| collection.update({_id: sid}, s, {upsert: true, safe: true}, function(err) { | ||
| if (err) debug('not able to set/update session: ' + sid); | ||
|
|
@@ -301,7 +294,7 @@ module.exports = function(connect) { | |
|
|
||
| MongoStore.prototype.destroy = function(sid, callback) { | ||
| sid = this.hash ? crypto.createHash(this.hash.algorithm).update(this.hash.salt + sid).digest('hex') : sid; | ||
| this.getCollection(function(err, collection) { | ||
| if (err) return callback(err); | ||
| collection.remove({_id: sid}, function(err) { | ||
| if (err) debug('not able to destroy session: ' + sid); | ||
|
|
@@ -318,7 +311,7 @@ module.exports = function(connect) { | |
| */ | ||
|
|
||
| MongoStore.prototype.length = function(callback) { | ||
| this.getCollection(function(err, collection) { | ||
| if (err) return callback(err); | ||
| collection.count({}, function(err, count) { | ||
| if (err) debug('not able to count sessions'); | ||
|
|
@@ -335,7 +328,7 @@ module.exports = function(connect) { | |
| */ | ||
|
|
||
| MongoStore.prototype.clear = function(callback) { | ||
| this.getCollection(function(err, collection) { | ||
| if (err) return callback(err); | ||
| collection.drop(function(err) { | ||
| if (err) debug('not able to clear sessions'); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Does this work with a blank (empty string) password? Or does it need to be
if ('password' in options)?