update for express 4.x

1 files changed, 5 insertions, 4 deletions

diff --git a/src/node/hooks/express/socketio.js b/src/node/hooks/express/socketio.js
index 35d6d074..23622f3a 100644
--- a/src/node/hooks/express/socketio.js
+++ b/src/node/hooks/express/socketio.js
@@ -6,7 +6,8 @@ var webaccess = require("ep_etherpad-lite/node/hooks/express/webaccess");
 
 var padMessageHandler = require("../../handler/PadMessageHandler");
 
-var connect = require('connect');
+var cookieParser = require('cookie-parser');
+var sessionModule = require('express-session');
  
 exports.expressCreateServer = function (hook_name, args, cb) {
   //init socket.io and redirect all requests to the MessageHandler
@@ -20,6 +21,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   /* Require an express session cookie to be present, and load the
    * session. See http://www.danielbaulig.de/socket-ioexpress for more
    * info */
+  var cookieParserFn = cookieParser(webaccess.secret, {});
 
   io.use(function(socket, accept) {
     var data = socket.request;
@@ -29,8 +31,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
     }else{
       if (!data.headers.cookie) return accept('No session cookie transmitted.', false);
     }
-    // Use connect's cookie parser, because it knows how to parse signed cookies
-    connect.cookieParser(webaccess.secret)(data, {}, function(err){
+    cookieParserFn(data, {}, function(err){
       if(err) {
         console.error(err);
         accept("Couldn't parse request cookies. ", false);
@@ -40,7 +41,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
       data.sessionID = data.signedCookies.express_sid;
       args.app.sessionStore.get(data.sessionID, function (err, session) {
         if (err || !session) return accept('Bad session / session has expired', false);
-        data.session = new connect.middleware.session.Session(data, session);
+        data.session = new sessionModule.Session(data, session);
         accept(null, true);
       });
     });