Skip to content

Commit

Permalink
upgrade to express 4
Browse files Browse the repository at this point in the history
  • Loading branch information
btouellette committed Jun 24, 2014
1 parent 32bf3ca commit 085f42d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"name": "concarneau",
"main": "server.js",
"dependencies": {
"express": "~3.4.8",
"express": "~4.0.0",
"express-session": "~1.0.4",
"compression": "~1.0.8",
"body-parser": "~1.0.2",
"cookie-parser": "~1.0.1",
"ejs": "~1.0.0",
"mongoose": "~3.8.12",
"passport": "~0.2.0",
Expand All @@ -13,7 +17,7 @@
"connect-flash": "~0.1.1",
"bcrypt-nodejs": "latest",
"tunnel": "0.0.3",
"socket.io": "~1.0.4",
"socket.io": "~1.0.6",
"yargs": "~1.2.6",
"cookie": "~0.1.2",
"connect": "~2.14.5",
Expand Down
29 changes: 16 additions & 13 deletions server.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@ if(process.env.HTTP_PROXY) {
var port = process.env.PORT || 8080;

// get all the tools we need
var express = require('express');
var app = express();
var mongoose = require('mongoose');
var passport = require('passport');
var flash = require('connect-flash');
var configDB = require('./config/database');
var MongoStore = require('connect-mongo')(express);
var express = require('express');
var app = express();
var cookieParser = require('cookie-parser');
var bodyParser = require('body-parser');
var session = require('express-session');
var compression = require('compression');
var mongoose = require('mongoose');
var passport = require('passport');
var flash = require('connect-flash');
var configDB = require('./config/database');
var MongoStore = require('connect-mongo')(session);

// configuration ===============================================================
var sessionStore = new MongoStore({
Expand All @@ -61,17 +65,16 @@ if(!process.env.C9_PROJECT) {
next();
});
}
//app.use(express.logger('dev')); // log every request to the console
app.use(express.compress());
app.use(express.cookieParser()); // read cookies (needed for auth)
app.use(express.json());
app.use(express.urlencoded()); // get information from html forms
app.use(compression());
app.use(cookieParser()); // read cookies (needed for auth)
app.use(bodyParser.json());
app.use(bodyParser.urlencoded()); // get information from html forms
//TODO: consider using static cache (https://github.com/isaacs/st)
app.use('/content', express.static(__dirname + '/content', { maxAge: 604800000 /* one week caching */ }));

// required for passport
process.env.EXPRESS_SESSION_SECRET = process.env.EXPRESS_SESSION_SECRET || 'ilovescotchscotchyscotchscotch';
app.use(express.session({ secret: process.env.EXPRESS_SESSION_SECRET, key: 'express.sid', store: sessionStore })); // session secret
app.use(session({ secret: process.env.EXPRESS_SESSION_SECRET, key: 'express.sid', store: sessionStore })); // session secret
app.use(passport.initialize());
app.use(passport.session()); // persistent login sessions
app.use(flash()); // use connect-flash for flash messages stored in session
Expand Down

0 comments on commit 085f42d

Please sign in to comment.