chore: Set express session options

This commit is contained in:
Blade Barringer 2016-03-26 08:31:59 -05:00
parent b1c3b8e7e7
commit cb5a79b1bf
2 changed files with 17 additions and 10 deletions

View file

@ -19,12 +19,11 @@
"browserify": "~12.0.1", "browserify": "~12.0.1",
"compression": "^1.6.1", "compression": "^1.6.1",
"connect-ratelimit": "0.0.7", "connect-ratelimit": "0.0.7",
"cookie-parser": "^1.4.1", "cookie-session": "^1.2.0",
"coupon-code": "~0.3.0", "coupon-code": "~0.3.0",
"domain-middleware": "~0.1.0", "domain-middleware": "~0.1.0",
"express": "^4.13.4", "express": "^4.13.4",
"express-csv": "~0.6.0", "express-csv": "~0.6.0",
"express-session": "^1.13.0",
"firebase": "^2.2.9", "firebase": "^2.2.9",
"firebase-token-generator": "^2.0.0", "firebase-token-generator": "^2.0.0",
"glob": "^4.3.5", "glob": "^4.3.5",

View file

@ -28,12 +28,13 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
} else { } else {
var express = require("express"); var express = require("express");
var bodyParser = require('body-parser'); var bodyParser = require('body-parser');
var session = require('express-session'); var session = require('cookie-session');
var cookieParser = require('cookie-parser');
var logger = require('morgan'); var logger = require('morgan');
var compression = require('compression'); var compression = require('compression');
var favicon = require('serve-favicon'); var favicon = require('serve-favicon');
var BODY_PARSER_LIMIT = '1mb';
var http = require("http"); var http = require("http");
var path = require("path"); var path = require("path");
var swagger = require("swagger-node-express"); var swagger = require("swagger-node-express");
@ -126,13 +127,20 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
var redirects = require('./middlewares/redirects'); var redirects = require('./middlewares/redirects');
oldApp.use(redirects.forceHabitica); oldApp.use(redirects.forceHabitica);
oldApp.use(redirects.forceSSL); oldApp.use(redirects.forceSSL);
oldApp.use(bodyParser.urlencoded({ extended: true })); oldApp.use(bodyParser.urlencoded({
oldApp.use(bodyParser.json()); extended: true,
limit: BODY_PARSER_LIMIT,
}));
oldApp.use(bodyParser.json({
limit: BODY_PARSER_LIMIT,
}));
oldApp.use(require('method-override')()); oldApp.use(require('method-override')());
//oldApp.use(express.cookieParser(nconf.get('SESSION_SECRET'))); oldApp.use(session({
oldApp.use(cookieParser()); name: 'connect:sess', // Used to keep backward compatibility with Express 3 cookies
oldApp.use(session({ secret: nconf.get('SESSION_SECRET'), httpOnly: false, cookie: { maxAge: TWO_WEEKS }})); secret: nconf.get('SESSION_SECRET'),
//oldApp.use(express.session()); httpOnly: false,
maxAge: TWO_WEEKS
}));
// Initialize Passport! Also use passport.session() middleware, to support // Initialize Passport! Also use passport.session() middleware, to support
// persistent login sessions (recommended). // persistent login sessions (recommended).