From 16e28b5f3d9ea23c17c330bbfb459bb44325ae64 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Thu, 21 Feb 2013 19:42:56 -0600 Subject: [PATCH 1/2] added arg client_id from cookie to login_with_token --- app/assets/javascripts/AAB_message_factory.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/AAB_message_factory.js b/app/assets/javascripts/AAB_message_factory.js index 5c31c0a79..76f08b556 100644 --- a/app/assets/javascripts/AAB_message_factory.js +++ b/app/assets/javascripts/AAB_message_factory.js @@ -69,7 +69,10 @@ // create a login message using token (a cookie or similiar) factory.login_with_token = function(token) { - var login = { token : token }; + //context.JK.logger.debug("*** login_with_token: client_id = "+$.cookie("client_id")); + var login = { token : token, + client_id : $.cookie("client_id") + }; return client_container(msg.LOGIN, route_to.SERVER, login); }; From 5f67bf9234e14034f10d2a2b348db9b426a68e24 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Thu, 21 Feb 2013 19:43:30 -0600 Subject: [PATCH 2/2] in loggedIn, assign client_id cookie from payload --- app/assets/javascripts/jamkazam.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/jamkazam.js b/app/assets/javascripts/jamkazam.js index be974d1de..969c0b47f 100644 --- a/app/assets/javascripts/jamkazam.js +++ b/app/assets/javascripts/jamkazam.js @@ -51,6 +51,7 @@ function loggedIn(header, payload) { app.clientId = payload.client_id; + $.cookie('client_id', payload.client_id); var heartbeatMS = payload.heartbeat_interval * 1000; logger.debug("jamkazam.js.loggedIn(): clientId now " + app.clientId + "; Setting up heartbeat every " + heartbeatMS + " MS"); heartbeatInterval = context.setInterval(_heartbeat, heartbeatMS);