KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handling cookie-ids somewhat diferrently on chromecasts

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2018-03-15 08:43:57 +01:00
parent 1abced50ca
commit c1a83648d3
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/handlers/functions.js
View File

@@ -21,11 +21,11 @@ function remove_name_from_db(guid, name) {
function getSession(socket) { function getSession(socket) {
try { try {
var cookieParser = require("cookie-parser"); /*var cookieParser = require("cookie-parser");
var cookie = require("cookie"); var cookie = require("cookie");
var parsedCookies = cookie.parse(socket.handshake.headers.cookie); var parsedCookies = cookie.parse(socket.handshake.headers.cookie);
return parsedCookies["_uI"]; return parsedCookies["_uI"];*/
return socket.guid; return socket.cookie_id;
} catch(e) { } catch(e) {
return "empty"; return "empty";
} }

18
server/handlers/io.js
View File

@@ -1,5 +1,14 @@
var cookieParser = require("cookie-parser");
var cookie = require("cookie");
module.exports = function() { module.exports = function() {
io.on('connection', function(socket){ 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.zoff_id = socket.id;
socket.emit("get_list"); socket.emit("get_list");
@@ -55,14 +64,7 @@ module.exports = function() {
typeof(msg.channel) == "string" && typeof(msg.socket_id) == "string") { typeof(msg.channel) == "string" && typeof(msg.socket_id) == "string") {
db.collection("connected_users").find({"_id": msg.channel}, function(err, connected_users_channel) { 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) { if(connected_users_channel.length > 0 && connected_users_channel[0].users.indexOf(msg.guid) > -1) {
var q = socket.handshake.headers.cookie.split(" "); socket.cookie_id = msg.guid;
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(" ");
guid = msg.guid; guid = msg.guid;
socketid = msg.socket_id; socketid = msg.socket_id;
socket.zoff_id = socketid; socket.zoff_id = socketid;

3
server/routing/client/api.js
View File

@@ -6,7 +6,6 @@ var ObjectId = mongojs.ObjectId;
var token_db = mongojs("tokens"); var token_db = mongojs("tokens");
var cookieParser = require("cookie-parser"); var cookieParser = require("cookie-parser");
var cookies = require("cookie"); var cookies = require("cookie");
var cors = require('cors');
var toShowChannel = { var toShowChannel = {
start: 1, 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 next(); // make sure we go to the next routes and don't stop here
}); });