diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index f8f109faa..3099cb3a2 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -20,6 +20,7 @@
<%= render "findSession" %>
<%= render "session" %>
<%= render "profile" %>
+<%= render "bandProfile" %>
<%= render "feed" %>
<%= render "bands" %>
<%= render "musicians" %>
@@ -107,6 +108,9 @@
var profileScreen = new JK.ProfileScreen(JK.app);
profileScreen.initialize();
+ var bandProfileScreen = new JK.BandProfileScreen(JK.app);
+ bandProfileScreen.initialize();
+
var accountScreen = new JK.AccountScreen(JK.app);
accountScreen.initialize();
diff --git a/web/spec/controllers/claimed_recordings_spec.rb b/web/spec/controllers/claimed_recordings_spec.rb
index 6aecf0458..ae154c1d7 100644
--- a/web/spec/controllers/claimed_recordings_spec.rb
+++ b/web/spec/controllers/claimed_recordings_spec.rb
@@ -26,8 +26,7 @@ describe ApiClaimedRecordingsController do
it "should show the right thing when one recording just finished" do
controller.current_user = @user
get :show, :id => @claimed_recording.id
-# puts response.body
- response.should be_success
+ response.should be_success
json = JSON.parse(response.body)
json.should_not be_nil
json["id"].should == @claimed_recording.id
diff --git a/websocket-gateway/lib/jam_websockets/router.rb b/websocket-gateway/lib/jam_websockets/router.rb
index 99c6c5503..03e2208b1 100644
--- a/websocket-gateway/lib/jam_websockets/router.rb
+++ b/websocket-gateway/lib/jam_websockets/router.rb
@@ -437,7 +437,6 @@ module JamWebsockets
reconnect_music_session_id = login.client_id if login.value_for_tag(5)
@log.info("*** handle_login: token=#{token}; client_id=#{client_id}")
- connection = nil
reconnected = false
# you don't have to supply client_id in login--if you don't, we'll generate one
@@ -445,9 +444,26 @@ module JamWebsockets
# give a unique ID to this client. This is used to prevent session messages
# from echoing back to the sender, for instance.
client_id = UUIDTools::UUID.random_create.to_s
- else
+ end
+
+ user = valid_login(username, password, token, client_id)
+
+ connection = JamRuby::Connection.find_by_client_id(client_id)
+ # if this connection is reused by a different user, then whack the connection
+ # because it will recreate a new connection lower down
+ if !connection.nil? && !user.nil? && connection.user != user
+ @log.debug("user #{user.email} took client_id #{client_id} from user #{connection.user.email}")
+ connection.delete
+ connection = nil
+ end
+
+ client.client_id = client_id
+
+ if !user.nil?
+ @log.debug "user #{user} logged in with client_id #{client_id}"
+
# check if there's a connection for the client... if it's stale, reconnect it
- if connection = JamRuby::Connection.find_by_client_id(client_id)
+ unless connection.nil?
# FIXME: I think connection table needs to updated within connection_manager
# otherwise this would be 1 line of code (connection.connect!)
@@ -467,21 +483,10 @@ module JamWebsockets
end if connection.stale?
end
- # if there's a client_id but no connection object, create new client_id
- client_id = UUIDTools::UUID.random_create.to_s if !connection
- end
-
- client.client_id = client_id
-
- user = valid_login(username, password, token, client_id)
-
- if !user.nil?
- @log.debug "user #{user} logged in"
# respond with LOGIN_ACK to let client know it was successful
remote_ip = extract_ip(client)
-
@semaphore.synchronize do
# remove from pending_queue
@pending_clients.delete(client)
@@ -696,7 +701,7 @@ module JamWebsockets
@@log.debug "publishing to session:#{music_session_id} client:#{client_id} from client:#{sender_client_id}"
# put it on the topic exchange3 for clients
- self.class.client_exchange.publish(client_msg, :routing_key => "client.#{music_session_id}")
+ self.class.client_exchange.publish(client_msg, :routing_key => "client.#{client_id}")
end
end
end
+ {recording_count} 
+ {session_count} 
+