diff --git a/server/handlers/functions.js b/server/handlers/functions.js index d98a581b..e4d70935 100644 --- a/server/handlers/functions.js +++ b/server/handlers/functions.js @@ -21,11 +21,11 @@ function remove_name_from_db(guid, name) { function getSession(socket) { try { - var cookieParser = require("cookie-parser"); + /*var cookieParser = require("cookie-parser"); var cookie = require("cookie"); var parsedCookies = cookie.parse(socket.handshake.headers.cookie); - return parsedCookies["_uI"]; - return socket.guid; + return parsedCookies["_uI"];*/ + return socket.cookie_id; } catch(e) { return "empty"; } diff --git a/server/handlers/io.js b/server/handlers/io.js index 8fb733b7..09e52db0 100644 --- a/server/handlers/io.js +++ b/server/handlers/io.js @@ -1,5 +1,14 @@ +var cookieParser = require("cookie-parser"); +var cookie = require("cookie"); module.exports = function() { io.on('connection', function(socket){ + try { + var parsedCookies = cookie.parse(socket.handshake.headers.cookie); + socket.cookie_id = parsedCookies["_uI"]; + //return socket.guid; + } catch(e) { + socket.cookie_id = "empty"; + } socket.zoff_id = socket.id; socket.emit("get_list"); @@ -55,14 +64,7 @@ module.exports = function() { typeof(msg.channel) == "string" && typeof(msg.socket_id) == "string") { db.collection("connected_users").find({"_id": msg.channel}, function(err, connected_users_channel) { if(connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.guid) > -1) { - var q = socket.handshake.headers.cookie.split(" "); - for(var i = 0; i < q.length; i++) { - if(q[i].substring(0,4) == "_uI=") { - q[i] = "_uI=rpmFLmS2QvgRavsU6uTNYLAOWjXj5UUi0a4P24eqbao%3D; "; - break; - } - } - socket.handshake.headers.cookie = q.join(" "); + socket.cookie_id = msg.guid; guid = msg.guid; socketid = msg.socket_id; socket.zoff_id = socketid; diff --git a/server/routing/client/api.js b/server/routing/client/api.js index 59c1e56c..81020c70 100644 --- a/server/routing/client/api.js +++ b/server/routing/client/api.js @@ -6,7 +6,6 @@ var ObjectId = mongojs.ObjectId; var token_db = mongojs("tokens"); var cookieParser = require("cookie-parser"); var cookies = require("cookie"); -var cors = require('cors'); var toShowChannel = { start: 1, @@ -89,7 +88,7 @@ var error = { } } -router.use('/api/', cors(), function(req, res, next) { +router.use(function(req, res, next) { next(); // make sure we go to the next routes and don't stop here });