Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: upgrade express to version 4

Browse Source
This commit is contained in:
Blade Barringer
2016-03-25 21:05:30 -05:00
parent 6552f04b0c
commit 41b961004a
9 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/src/server.js
+21 -18
View File
@@ -27,6 +27,13 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
} else {
var express = require("express");
var bodyParser = require('body-parser');
var session = require('express-session');
var cookieParser = require('cookie-parser');
var logger = require('morgan');
var compression = require('compression');
var favicon = require('serve-favicon');
var http = require("http");
var path = require("path");
var swagger = require("swagger-node-express");
@@ -102,8 +109,6 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
var oldApp = express(); // api v1 and v2, and not scoped routes
var newApp = express(); // api v3
// Route requests to the right app
app.use(app.router);
// Matches all request except the ones going to /api/v3/**
app.all(/^(?!\/api\/v3).+/i, oldApp);
// Matches all requests going to /api/v3
@@ -111,22 +116,22 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
require('./middlewares/apiThrottle')(oldApp);
oldApp.use(require('./middlewares/domain')(server,mongoose));
if (!isProd && !DISABLE_LOGGING) oldApp.use(express.logger("dev"));
oldApp.use(express.compress());
if (!isProd && !DISABLE_LOGGING) oldApp.use(logger("dev"));
oldApp.use(compression());
oldApp.set("views", __dirname + "/../views");
oldApp.set("view engine", "jade");
oldApp.use(express.favicon(publicDir + '/favicon.ico'));
oldApp.use(favicon(publicDir + '/favicon.ico'));
oldApp.use(require('./middlewares/cors'));
var redirects = require('./middlewares/redirects');
oldApp.use(redirects.forceHabitica);
oldApp.use(redirects.forceSSL);
oldApp.use(express.urlencoded());
oldApp.use(express.json());
oldApp.use(bodyParser.urlencoded());
oldApp.use(bodyParser.json());
oldApp.use(require('method-override')());
//oldApp.use(express.cookieParser(nconf.get('SESSION_SECRET')));
oldApp.use(express.cookieParser());
oldApp.use(express.cookieSession({ secret: nconf.get('SESSION_SECRET'), httpOnly: false, cookie: { maxAge: TWO_WEEKS }}));
oldApp.use(cookieParser());
oldApp.use(session({ secret: nconf.get('SESSION_SECRET'), httpOnly: false, cookie: { maxAge: TWO_WEEKS }}));
//oldApp.use(express.session());
// Initialize Passport! Also use passport.session() middleware, to support
@@ -134,8 +139,6 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
oldApp.use(passport.initialize());
oldApp.use(passport.session());
oldApp.use(oldApp.router);
var maxAge = isProd ? 31536000000 : 0;
// Cache emojis without copying them to build, they are too many
oldApp.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge }));
@@ -146,15 +149,15 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
oldApp.use(express['static'](publicDir));
// Custom Directives
oldApp.use(require('./routes/pages').middleware);
oldApp.use(require('./routes/payments').middleware);
oldApp.use(require('./routes/api-v2/auth').middleware);
oldApp.use(require('./routes/api-v2/coupon').middleware);
oldApp.use(require('./routes/api-v2/unsubscription').middleware);
oldApp.use('/', require('./routes/pages'));
oldApp.use('/', require('./routes/payments'));
oldApp.use('/', require('./routes/api-v2/auth'));
oldApp.use('/', require('./routes/api-v2/coupon'));
oldApp.use('/', require('./routes/api-v2/unsubscription'));
var v2 = express();
oldApp.use('/api/v2', v2);
oldApp.use('/api/v1', require('./routes/api-v1').middleware);
oldApp.use('/export', require('./routes/dataexport').middleware);
oldApp.use('/api/', require('./routes/api-v1'));
oldApp.use('/export', require('./routes/dataexport'));
require('./routes/api-v2/swagger')(swagger, v2);
oldApp.use(require('./middlewares/errorHandler'));