From 411a15d39db950c05adae7185bf0c4a63e5c7847 Mon Sep 17 00:00:00 2001
From: Curtis SerVaas <cservaas@purdue.edu>
Date: Wed, 20 Aug 2014 12:19:01 -0700
Subject: [PATCH] changed MemoryStore to MongoStore

---
 app.js             | 14 +++++++++++---
 config/config.js   |  9 +++++++++
 config/database.js | 15 ---------------
 lib/helperLib.js   | 42 +++++++++++++++++++-----------------------
 package.json       |  3 ++-
 5 files changed, 41 insertions(+), 42 deletions(-)
 delete mode 100644 config/database.js

diff --git a/app.js b/app.js
index 50d8886..1d98cac 100644
--- a/app.js
+++ b/app.js
@@ -1,13 +1,21 @@
 var express = require('express');
 var app = express(); 
-var port = require('./config/config.js').port; 
+var config = require('./config/config.js')
+var port = config.port; 
 
 var passport = require('passport');
 var flash    = require('connect-flash');
 require('./config/passport')(passport); // pass passport for configuration
 
-require('./config/database.js').safeConnect(); 
 var helperLib = require('./lib/helperLib.js');
+helperLib.safeConnectToDB(); 
+
+
+
+var MongoStore = require('connect-mongo')(express); 
+
+
+
 
 
 // all environments
@@ -27,7 +35,7 @@ app.use(express.methodOverride());
 
 app.use(express.cookieParser()); //(I've also installed cookie module)
 app.use(express.bodyParser()); //not sure...
-app.use(express.session({secret: 'secretpasswordforsessions', store: helperLib.getSessionStore()}));
+app.use(express.session({secret: config.sessionSecret, store: new MongoStore(config.StoreDB) }));
 //the session stuff differs from the scotch tutorial. 
 
 app.use(passport.initialize()); 
diff --git a/config/config.js b/config/config.js
index b89ef86..64ef324 100644
--- a/config/config.js
+++ b/config/config.js
@@ -1,4 +1,13 @@
 var config = {}
 config.port = process.env.PORT || 3000; 
 
+var username =  "throwaway"
+var password = "throwaway1";//
+var address = '@ds037637.mongolab.com:37637/throwaway_db';
+
+config.DB_URL = 'mongodb://' + username + ':' + password + address;
+config.sessionSecret = "yourPassWordHere"; 
+
+config.StoreDB = {db: "throwaway_db", url: config.DB_URL }
+
 module.exports = config; 
\ No newline at end of file
diff --git a/config/database.js b/config/database.js
deleted file mode 100644
index 58dd181..0000000
--- a/config/database.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var mongoose = require('mongoose'); 
-
-// Connect to cloud database
-//https://mongolab.com/
-var username = "throwaway"
-var password = "throwaway1";
-var address = '@ds037637.mongolab.com:37637/throwaway_db';
-var url = 'mongodb://' + username + ':' + password + address;
-
-function safeConnect() {
-	try {  mongoose.connect(url); }
-	catch(err) { console.log("Error: Sign In to MongoLab") }
-	// console.log("error caught"); 
-}
-
diff --git a/lib/helperLib.js b/lib/helperLib.js
index 0d0134b..c460cda 100644
--- a/lib/helperLib.js
+++ b/lib/helperLib.js
@@ -1,39 +1,26 @@
-var //cookie = require('cookie'), 
-   crypto = require('crypto')
-  //, exchange = require('./exchange')
+var crypto = require('crypto')
   , express = require('express')
   , http = require('http')
-  , MemoryStore = express.session.MemoryStore
   , ObjectID = require('mongodb').ObjectID, 
   cookie = require('cookie');
   
 var mongoose = require('mongoose'); 
 var User = mongoose.model('User'); 
 var Node = require('../models/Node.js');
-var sessionStore = new MemoryStore();
+
 var io;
 var online = [];
 var lastExchangeData = {};
 var makeCommit = require("./makeCommit.js").makeCommit; 
 var getAndSendRevHistory = require("./revAlgorithm.js").getAndSendRevHistory; 
 
-
-console.log("\n\nLOOK HERE!!")
-// console.log(revAlg);
-
-// var revAlg = require('./revControlAlg.js');
-// var getTimeHash = revAlg.getTimeHash;
-console.log("\n\n");
-
-
 module.exports = {
-  createUser: function(username, password, callback){
-    User.addUser(username, password, callback);
-  },  
 
-  getSessionStore: function(){
-    return sessionStore;
-  },
+  safeConnectToDB: function(){
+    var url = require("../config/config.js").DB_URL; 
+    try {  mongoose.connect(url); }
+    catch(err) { console.log("Error: Sign In to MongoLab") }
+  }
 
   createSocket: function(server) {
     io = require('socket.io').listen(server);
@@ -66,6 +53,15 @@ module.exports = {
 
 
 
+
+
+
+
+
+
+
+
+
 function attachLogInListeners(socket){
   socket.on("COMMIT", function(){
     makeCommit(); 
@@ -136,12 +132,12 @@ function attachLogInListeners(socket){
     
   });
 
-  socket.on("removeNode", function(data){
-    // console.log("removeNode!!!"); 
+  socket.on("removeNode", function(data){ 
     var thisId = data[0];
     var thisIndex = data[1];
     var parId = data[2];
-    var author = data[3]; data[3] = null; 
+    var author = data[3];
+    // data[3] = null; //improve efficiency. 
     socket.broadcast.emit("removeNode", data);
     Node.removeNode(thisId, thisIndex, parId, author._id);
 
diff --git a/package.json b/package.json
index e9fa832..043559a 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "underscore": "1.5.2",
     "passport": "^0.2.0",
     "passport-google-oauth": "^0.1.5",
-    "connect-flash": "^0.1.1"
+    "connect-flash": "^0.1.1",
+    "connect-mongo": "^0.4.1"
   },
   "subdomain": "ndent",
   "engines": {