From de4a2c832102af3b7f96b79d7a58faea12b71f7c Mon Sep 17 00:00:00 2001 From: Seth Call Date: Wed, 18 Dec 2013 17:18:23 +0000 Subject: [PATCH] * VRFS-821; sending loggedin/loggedout events to backend from frontend --- pb/src/client_container.proto | 1 + web/app/assets/javascripts/fakeJamClient.js | 12 ++++++++++++ web/app/assets/javascripts/jamkazam.js | 7 +++++++ 3 files changed, 20 insertions(+) diff --git a/pb/src/client_container.proto b/pb/src/client_container.proto index bb65174dc..fef2995dc 100644 --- a/pb/src/client_container.proto +++ b/pb/src/client_container.proto @@ -124,6 +124,7 @@ message LoginAck { optional int32 heartbeat_interval = 4; // set your heartbeat interval to this value optional string music_session_id = 5; // the music session that the user was in very recently (likely due to dropped connection) optional bool reconnected = 6; // if reconnect_music_session_id is specified, and the server could log the user into that session, then true is returned. + optional string user_id = 7; // the database user id } // route_to: server diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js index ab06fdd5b..5e304714a 100644 --- a/web/app/assets/javascripts/fakeJamClient.js +++ b/web/app/assets/javascripts/fakeJamClient.js @@ -534,6 +534,14 @@ fakeJamClientRecordings = fakeRecordingsImpl; } + function OnLoggedIn(userId, sessionToken) { + + } + + function OnLoggedOut() { + + } + // Javascript Bridge seems to camel-case // Set the instance functions: @@ -651,6 +659,10 @@ this.OpenSystemBrowser = OpenSystemBrowser; + // Websocket/Auth sessions + this.OnLoggedIn = OnLoggedIn; + this.OnLoggedOut = OnLoggedOut; + // fake calls; not a part of the actual jam client this.RegisterP2PMessageCallbacks = RegisterP2PMessageCallbacks; this.SetFakeRecordingImpl = SetFakeRecordingImpl; diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js index cc204795e..92673c57f 100644 --- a/web/app/assets/javascripts/jamkazam.js +++ b/web/app/assets/javascripts/jamkazam.js @@ -91,6 +91,10 @@ function loggedIn(header, payload) { app.clientId = payload.client_id; + + // tell the backend that we have logged in + context.jamClient.OnLoggedIn(payload.user_id, payload.token); + $.cookie('client_id', payload.client_id); heartbeatMS = payload.heartbeat_interval * 1000; @@ -132,6 +136,9 @@ */ function socketClosed(in_error) { + // tell the backend that we have logged out + context.jamClient.OnLoggedOut(); + // stop future heartbeats if(heartbeatInterval != null) { clearInterval(heartbeatInterval);