From c6486b82bfce98aa222cc808771b989cab35fe8c Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Thu, 8 Mar 2018 07:23:39 -0600
Subject: [PATCH] Allow whitespace on signin.  Fix bug in session messaging

---
 ruby/lib/jam_ruby/models/chat_message.rb   | 18 +++++++++++++-----
 web/app/controllers/sessions_controller.rb |  7 ++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/chat_message.rb b/ruby/lib/jam_ruby/models/chat_message.rb
index 4afa56cc5..478962532 100644
--- a/ruby/lib/jam_ruby/models/chat_message.rb
+++ b/ruby/lib/jam_ruby/models/chat_message.rb
@@ -26,9 +26,16 @@ module JamRuby
 
     def self.create(user, music_session, message, channel, client_id, target_user = nil, lesson_session = nil, purpose = nil, music_notation = nil, recording = nil)
       source_user = user
-      # we hide the real source user; always make it from the teacher
-      if lesson_session && user.id != lesson_session.student_id
-        source_user = lesson_session.teacher
+
+      if lesson_session # force the messaging to be to/from
+        if user.id != lesson_session.student_id
+          source_user = lesson_session.teacher
+          target_user = lesson_session.student
+        else
+          source_user = lesson_session.student
+          target_user = lesson_session.teacher
+        end
+
       end
       chat_msg = ChatMessage.new
       chat_msg.user_id = source_user.id
@@ -111,6 +118,7 @@ module JamRuby
         end
       end
 
+
       def send_chat_msg(music_session, chat_msg, user, client_id, channel, lesson_session, purpose, target_user, music_notation, claimed_recording)
 
         music_session_id = music_session.id if music_session
@@ -154,8 +162,8 @@ module JamRuby
         elsif channel == 'global'
           @@mq_router.publish_to_active_clients(msg)
         elsif channel == 'lesson'
-          @@mq_router.publish_to_user(target_user.id, msg, sender = {:client_id => client_id})
-          @@mq_router.publish_to_user(user.id, msg, sender = {:client_id => client_id})
+          @@mq_router.publish_to_user(target_user.id, msg, sender = {:client_id => client_id}) if target_user
+          @@mq_router.publish_to_user(user.id, msg, sender = {:client_id => client_id}) if user
         end
 
       end
diff --git a/web/app/controllers/sessions_controller.rb b/web/app/controllers/sessions_controller.rb
index 9e4273440..96fd5c367 100644
--- a/web/app/controllers/sessions_controller.rb
+++ b/web/app/controllers/sessions_controller.rb
@@ -21,7 +21,12 @@ class SessionsController < ApplicationController
   end
 
   def create
-    user = User.authenticate(params[:session][:email], params[:session][:password])
+    email = params[:session][:email]
+    password = params[:session][:password]
+    email.strip! if email
+    password.strip! if password
+    
+    user = User.authenticate(email, password)
 
     if user.nil?
       @login_error = true