From 4c8684877e5c4993163267e53f915b570d7e40c0 Mon Sep 17 00:00:00 2001
From: catarak <ctarakajian@gmail.com>
Date: Fri, 13 May 2016 16:49:56 -0400
Subject: [PATCH] add framework for sessions

---
 package.json                    | 9 ---------
 server/routes/session.routes.js | 3 ++-
 server/server.js                | 9 +--------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 39acff40..49b3768b 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,6 @@
   "dependencies": {
     "axios": "^0.12.0",
     "babel-core": "^6.8.0",
-<<<<<<< HEAD
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.15.1",
     "classnames": "^2.2.5",
@@ -50,14 +49,6 @@
     "passport-github": "^1.1.0",
     "passport-jwt": "^2.0.0",
     "passport-local": "^1.0.0",
-=======
-    "body-parser": "^1.15.1",
-    "classnames": "^2.2.5",
-    "codemirror": "^5.14.2",
-    "cookie-parser": "^1.4.1",
-    "express": "^4.13.4",
-    "mongoose": "^4.4.16",
->>>>>>> add session and cookie and passport config for server
     "react": "^15.0.2",
     "react-dom": "^15.0.2",
     "react-inlinesvg": "^0.4.2",
diff --git a/server/routes/session.routes.js b/server/routes/session.routes.js
index 64c30e6b..6cca9a93 100644
--- a/server/routes/session.routes.js
+++ b/server/routes/session.routes.js
@@ -1,6 +1,7 @@
 import { Router } from 'express';
 import * as SessionController from '../controllers/session.controller';
 import passport from 'passport';
+
 const router = new Router();
 
 router.route('/login').get(SessionController.newSession);
@@ -9,4 +10,4 @@ router.route('/login').post(SessionController.createSession);
 
 router.route('/logout').get(SessionController.destroySession);
 
-//TODO add github authentication stuff
\ No newline at end of file
+//TODO add github authentication stuff
diff --git a/server/server.js b/server/server.js
index 6821472c..ffd60eea 100644
--- a/server/server.js
+++ b/server/server.js
@@ -24,18 +24,11 @@ import serverConfig from './config';
 import users from './routes/user.routes';
 
 //Body parser, cookie parser, sessions, serve public assets
-
-//Body parser, cookie parser, sessions, serve public assets
-app.use(bodyParser.urlencoded({extended: true}));
-app.use(bodyParser.json());
-app.use(cookieParser());
-app.use(session({secret: 'steve brule'}));
-app.use(passport.initialize());
-app.use(passport.session());
 app.use(Express.static(path.resolve(__dirname, '../static')));
 app.use(bodyParser.urlencoded({extended: true}));
 app.use(bodyParser.json());
 app.use(cookieParser());
+app.use(session({secret: 'steve brule'}));
 app.use(passport.initialize());
 app.use(passport.session());
 app.use('/', users);