Update to Express 4.x

This commit is contained in:
Szymon Nowak 2014-12-28 15:44:16 +01:00
parent aa7d38428b
commit acca6fe030
2 changed files with 38 additions and 25 deletions

View File

@ -9,9 +9,14 @@ module.exports.server = function (options) {
var http = require('http'),
path = require('path'),
express = require('express'),
logger = require('morgan'),
bodyParser = require('body-parser'),
cookieParser = require('cookie-parser'),
cookieSession = require('cookie-session'),
compression = require('compression'),
persona = require('express-persona'),
uuid = require('node-uuid'),
crypto = require('crypto'),
persona = require('express-persona'),
FirebaseTokenGenerator = require("firebase-token-generator"),
firebaseTokenGenerator = new FirebaseTokenGenerator(process.env.FIREBASE_SECRET),
app = express(),
@ -24,10 +29,11 @@ module.exports.server = function (options) {
app.enable('trust proxy');
app.use(express.logger());
app.use(express.urlencoded());
app.use(express.cookieParser());
app.use(express.cookieSession({
app.use(logger('combined'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({extended: true}));
app.use(cookieParser());
app.use(cookieSession({
cookie: {
// secure: true,
httpOnly: true,
@ -36,9 +42,11 @@ module.exports.server = function (options) {
secret: secret,
proxy: true
}));
app.use(express.compress());
app.use(express.json());
app.use(compression());
//
// Web server
//
base.forEach(function (dir) {
['scripts', 'styles', 'images', 'fonts'].forEach(function (subdir) {
app.use('/' + subdir, express.static(dir + '/' + subdir, {
@ -48,7 +56,7 @@ module.exports.server = function (options) {
});
//
// Web server
// API server
//
// Handle Persona authentication

View File

@ -2,9 +2,9 @@
"name": "ShareDrop",
"version": "1.0.0",
"description": "P2P file sharing",
"repository" : {
"type" : "git",
"url" : "https://github.com/cowbell/sharedrop.git"
"repository": {
"type": "git",
"url": "https://github.com/cowbell/sharedrop.git"
},
"main": "server.js",
"scripts": {
@ -13,34 +13,39 @@
"author": "Szymon Nowak",
"license": "MIT",
"dependencies": {
"express": "~3.18.6",
"body-parser": "^1.10.0",
"compression": "^1.2.2",
"cookie-parser": "^1.3.3",
"cookie-session": "^1.1.0",
"express": "^4.10.6",
"express-persona": "~0.1.2",
"node-uuid": "~1.4.2",
"firebase-token-generator": "~2.0.0",
"newrelic": "~1.14.3",
"grunt": "~0.4.2",
"grunt-autoprefixer": "~2.0.0",
"grunt-cli": "~0.1.9",
"load-grunt-tasks": "~0.2.1",
"time-grunt": "~0.2.8",
"grunt-contrib-watch": "~0.5.3",
"grunt-concurrent": "~0.4.3",
"grunt-contrib-clean": "~0.5.0",
"grunt-contrib-compass": "~0.7.1",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-uglify": "~0.3.2",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-cssmin": "~0.7.0",
"grunt-usemin": "~2.0.2",
"grunt-concurrent": "~0.4.3",
"grunt-contrib-compass": "~0.7.1",
"grunt-contrib-uglify": "~0.3.2",
"grunt-contrib-watch": "~0.5.3",
"grunt-ember-templates": "~0.4.23",
"grunt-env": "~0.4.1",
"grunt-preprocess": "^4.0.0",
"grunt-rev": "^0.1.0",
"grunt-ember-templates": "~0.4.23",
"grunt-sass": "~0.17.0",
"grunt-autoprefixer": "~2.0.0"
"grunt-usemin": "~2.0.2",
"load-grunt-tasks": "~0.2.1",
"morgan": "^1.5.0",
"newrelic": "~1.14.4",
"node-uuid": "~1.4.2",
"time-grunt": "~0.2.8"
},
"engines": {
"node": "~0.10.0",
"npm": "2.x"
}
},
"devDependencies": {}
}