From cf38dbcfd494eec9bc479845d918f1354197321f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 21 Jul 2014 21:18:28 -0700
Subject: Upgrade express and other dependencies to the latest and greatest

---
 app.js | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'app.js')

diff --git a/app.js b/app.js
index 277d04f7..05452d81 100644
--- a/app.js
+++ b/app.js
@@ -1,8 +1,12 @@
 (function() {
-  var RedisStore, app, authorize, calculator, engines, express, passport, path, sessionStore, sessions, transactions, users;
+  var RedisStore, app, authorize, bodyParser, calculator, cookieParser, engines, express, passport, path, session, sessionStore, sessions, transactions, users;
 
   express = require('express');
 
+  bodyParser = require('body-parser');
+
+  cookieParser = require('cookie-parser');
+
   path = require('path');
 
   engines = require('consolidate');
@@ -17,7 +21,9 @@
 
   users = require("./routes/users")(sessions);
 
-  RedisStore = require('connect-redis')(express);
+  session = require('express-session');
+
+  RedisStore = require('connect-redis')(session);
 
   sessionStore = new RedisStore(require('./redis').host, {
     ttl: 172800
@@ -39,11 +45,21 @@
     src: 'public'
   }));
 
-  app.use(express.bodyParser());
+  app.use(bodyParser.urlencoded({
+    extended: true
+  }));
+
+  app.use(bodyParser.json());
+
+  app.use(bodyParser.json({
+    type: 'application/vnd.api+json'
+  }));
 
-  app.use(express.cookieParser());
+  app.use(cookieParser('weareallmadeofstars'));
 
-  app.use(express.session({
+  app.use(session({
+    resave: true,
+    saveUninitialized: true,
     secret: 'weareallmadeofstars',
     store: sessionStore,
     cookie: {
@@ -56,8 +72,6 @@
 
   app.use(passport.session());
 
-  app.use(app.router);
-
   authorize = function(req, res, next) {
     var _ref, _ref1, _ref2;
     if (req.params.user === ((_ref = req.user) != null ? _ref.username : void 0) || ((_ref1 = req.user) != null ? _ref1.username : void 0) === 'admin' || ((_ref2 = req.user) != null ? _ref2.username : void 0) === 'ben') {
-- 
cgit v1.2.3