From ddbee9fc9d626741710dd23a0a53cc04f5e50f3f Mon Sep 17 00:00:00 2001 From: wonderdogone Date: Wed, 17 Dec 2014 20:10:56 -0800 Subject: [PATCH 1/3] updated express version for example updated the example to work with express version 4.10.6. Removed connect middleware. Added serve-static and body-parser middleware. Updated package.json to reflect changes --- example/server.js | 9 +++++---- package.json | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/example/server.js b/example/server.js index c481456..979b02e 100644 --- a/example/server.js +++ b/example/server.js @@ -9,10 +9,11 @@ var jwt_secret = 'foo bar big secret'; var app = express(); -app.configure(function(){ - this.use(express.json()); - this.use(express.static(__dirname + '/public')); -}); +var serveStatic = require('serve-static') +var bodyParser = require('body-parser'); + +app.use(serveStatic('public', {'index': ['index.html']})) +app.use(bodyParser.json()); app.post('/login', function (req, res) { var profile = { diff --git a/package.json b/package.json index 2454fc1..6907fee 100644 --- a/package.json +++ b/package.json @@ -26,8 +26,9 @@ "xtend": "~2.1.2" }, "devDependencies": { - "connect": "~2.7.11", - "express": "~3.1.2", + "express": "~4.10.6", + "body-parser": "^1.10.0", + "serve-static": "^1.7.1", "mocha": "~1.17.0", "passport-local": "~0.1.6", "request": "~2.19.0", From 8d6dd198f01e6ce7bf67260f9d0344066b4dda36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20F=2E=20Romaniello?= Date: Mon, 31 Aug 2015 11:08:31 -0300 Subject: [PATCH 2/3] fix fixtures --- package.json | 4 ++-- test/fixture/index.js | 6 ++---- test/fixture/namespace.js | 6 ++---- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 2434dc4..8f9de3e 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ "xtend": "~2.1.2" }, "devDependencies": { + "body-parser": "~1.13.3", "express": "~4.10.6", - "body-parser": "^1.10.0", - "serve-static": "^1.7.1", "mocha": "~1.17.0", "passport-local": "~0.1.6", "request": "~2.19.0", + "serve-static": "^1.7.1", "server-destroy": "~1.0.1", "should": "~1.2.2", "socket.io": "^1.0.4", diff --git a/test/fixture/index.js b/test/fixture/index.js index b57f766..c5f59b3 100644 --- a/test/fixture/index.js +++ b/test/fixture/index.js @@ -7,6 +7,7 @@ var socketio_jwt = require('../../lib'); var jwt = require('jsonwebtoken'); var xtend = require('xtend'); +var bodyParser = require('body-parser'); var server, sio; var enableDestroy = require('server-destroy'); @@ -26,10 +27,7 @@ exports.start = function (options, callback) { var app = express(); - app.configure(function(){ - this.use(express.json()); - this.use(express.urlencoded()); - }); + app.use(bodyParser.json()); app.post('/login', function (req, res) { var profile = { diff --git a/test/fixture/namespace.js b/test/fixture/namespace.js index 5078d74..bf5cb09 100644 --- a/test/fixture/namespace.js +++ b/test/fixture/namespace.js @@ -7,6 +7,7 @@ var socketio_jwt = require('../../lib'); var jwt = require('jsonwebtoken'); var xtend = require('xtend'); +var bodyParser = require('body-parser'); var server, sio; var enableDestroy = require('server-destroy'); @@ -26,10 +27,7 @@ exports.start = function (callback) { var app = express(); - app.configure(function(){ - this.use(express.json()); - this.use(express.urlencoded()); - }); + app.use(bodyParser.json()); app.post('/login', function (req, res) { var profile = { From d6cd5c22547417f8da27f0af44977b2c5c3c0d11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=CC=81=20F=2E=20Romaniello?= Date: Mon, 31 Aug 2015 11:09:22 -0300 Subject: [PATCH 3/3] minor --- example/server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/server.js b/example/server.js index 979b02e..274635a 100644 --- a/example/server.js +++ b/example/server.js @@ -9,10 +9,10 @@ var jwt_secret = 'foo bar big secret'; var app = express(); -var serveStatic = require('serve-static') +var serveStatic = require('serve-static'); var bodyParser = require('body-parser'); -app.use(serveStatic('public', {'index': ['index.html']})) +app.use(serveStatic('public', {'index': ['index.html']})); app.use(bodyParser.json()); app.post('/login', function (req, res) {