From 5927906013ae68e74e1579b2f0523ec08defe402 Mon Sep 17 00:00:00 2001 From: kingcody Date: Fri, 14 Aug 2015 03:03:32 -0400 Subject: [PATCH 1/2] chore(dependencies): update socket.io related dependencies --- app/templates/_package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/_package.json b/app/templates/_package.json index 7ea2eda4b..467e2a8ba 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -28,9 +28,9 @@ "passport-facebook": "latest",<% } %><% if (filters.twitterAuth) { %> "passport-twitter": "latest",<% } %><% if (filters.googleAuth) { %> "passport-google-oauth": "latest",<% } %><% if (filters.socketio) { %> - "socket.io": "^1.0.6", - "socket.io-client": "^1.0.6", - "socketio-jwt": "^3.0.0",<% } %> + "socket.io": "^1.3.5", + "socket.io-client": "^1.3.5", + "socketio-jwt": "^4.2.0",<% } %> "serve-favicon": "~2.0.1" }, "devDependencies": { From f4bf6851551742aa525df17d971694aad5549db6 Mon Sep 17 00:00:00 2001 From: kingcody Date: Fri, 14 Aug 2015 03:07:31 -0400 Subject: [PATCH 2/2] fix(socket.io): update docs and socket.addres ref --- app/templates/server/config/socketio(socketio).js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/templates/server/config/socketio(socketio).js b/app/templates/server/config/socketio(socketio).js index 446b49dff..92f629729 100644 --- a/app/templates/server/config/socketio(socketio).js +++ b/app/templates/server/config/socketio(socketio).js @@ -27,7 +27,7 @@ module.exports = function(socketio) { // // ex: DEBUG: "http*,socket.io:socket" - // We can authenticate socket.io users and access their token through socket.handshake.decoded_token + // We can authenticate socket.io users and access their token through socket.decoded_token // // 1. You will need to send the token in `client/components/socket/socket.service.js` // @@ -38,10 +38,8 @@ module.exports = function(socketio) { // })); socketio.on('connection', function(socket) { - socket.address = - socket.handshake.address !== null ? - socket.handshake.address.address + ':' + socket.handshake.address.port : - process.env.DOMAIN; + socket.address = socket.request.connection.remoteAddress + + ':' + socket.request.connection.remotePort; socket.connectedAt = new Date();