Starting move to mongoose.

Author: rcreasey

config/settings.js

@@ -1,3 +1,6 @@
+'use strict';
+var mongoose = require('mongoose');
+
 module.exports = function () {
 
 	var getSetting = function (setting) {
@@ -10,6 +13,7 @@ module.exports = function () {
 	};
 
 	var settings = {
+		db: getSetting('MONGODB_URI'),
 		domain: 'https://standing-fleet.herokuapp.com/',
 
 		cookieSession: {
@@ -24,9 +28,9 @@ module.exports = function () {
 
 		port: getSetting('PORT'),
 		cookieSecret: getSetting('COOKIE_SECRET'),
-		storage: getSetting('STORAGE_MODE'),
 		log: 'console',
-
+		sessionSecret: getSetting('SESSION_SECRET'),
+		
 		hostileTtl: 900000,
 		memberTtl: 60000,
 		armadaTtl: 43200000,
@@ -49,7 +53,6 @@ module.exports = function () {
 		whitelist: { url: 'https://standings.goonfleet.com', threshold: 0.1, alliances: ['1354830081'], corporations: [] }
 	};
 
-	if (settings.storage == 'mongodb') settings.mongoDbURI = getSetting('MONGODB_URI');
 	settings.ships = require('../public/data/ships.json')
 
 	return settings;

lib/express/expressSetup.js

@@ -1,8 +1,7 @@
-module.exports = function (express, expressRoutes, expressMiddlewares, passportInit, consuelaService, standingsService, settings, passport, flash, logger, _) {
+module.exports = function (express, expressRoutes, expressMiddlewares, passportInit, consuelaService, standingsService, session, settings, passport, flash, logger, _) {
 
 	var pub = {};
 
-
 	pub.start = function (port) {
 		passportInit.start();
 
@@ -18,7 +17,14 @@ module.exports = function (express, expressRoutes, expressMiddlewares, passportI
 		expressApp.use(expressMiddlewares.staticRewrite);
 
 		expressApp.use(express.cookieParser(settings.cookieSecret));
-		expressApp.use(express.cookieSession(settings.cookieSession));
+
+		expressApp.use(express.session({
+		  secret: settings.cookieSecret,
+		  store: new session(express)({
+				secret: settings.sessionSecret,
+				url: settings.db
+			})
+		}));
 
 		expressApp.use(passport.initialize());
 		expressApp.use(passport.session());

package.json

@@ -17,22 +17,25 @@
     "chunk": "0.0.1",
     "connect-flash": "^0.1.1",
     "express": "3.10.x",
+    "express-session": "^1.8.2",
     "gulp": "^3.8.7",
-    "gulp-concat": "^2.3.4",
+    "gulp-concat": "^2.4.1",
     "gulp-declare": "^0.3.0",
     "gulp-handlebars": "^2.2.0",
-    "gulp-minify-css": "0.3.7",
+    "gulp-minify-css": "^0.3.10",
     "gulp-order": "^1.1.1",
     "gulp-rename": "1.2.0",
-    "gulp-uglify": "0.3.1",
-    "gulp-util": "^3.0.1",
+    "gulp-uglify": "^1.0.1",
+    "gulp-util": "^3.0.0",
     "gulp-wrap": "^0.3.0",
     "jade": "^1.5.0",
     "lodash": "2.4.1",
     "main-bower-files": "^2.0.0",
+    "moment": "^2.8.3",
     "mongodb": "1.3.23",
+    "mongoose": "^3.8.16",
     "neow": "1.0.0",
-    "newrelic": "1.8.0",
+    "newrelic": "^1.11.2",
     "passport": "^0.2.0",
     "pkginfo": "^0.3.0",
     "q": "1.0.1",

server.js

@@ -7,12 +7,12 @@ require('simple-ioc')
 	.register('express', require('express'))
 	.register('flash', require('connect-flash'))
 	.register('fs', require('fs'))
+	.register('session', require('session-mongoose'))
 	.register('neow', require('neow'))
 	.register('passport', require('passport'))
 	.register('Q', require('q'))
 	.register('rawbody', require('raw-body'))
 
-
 	.autoRegister('./lib/')
 	.autoRegister('./config/')
 	.start(function(expressSetup, settings) {