From c802e4806a455e5a0056ffb824e38422d4fce8d9 Mon Sep 17 00:00:00 2001
From: Joshua Arts <josha5@outlook.com>
Date: Thu, 28 Jun 2018 10:39:39 -0400
Subject: [PATCH] fix waiting to join retry logic

---
 app/assets/javascripts/wait.js         | 8 +++++---
 app/controllers/sessions_controller.rb | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/wait.js b/app/assets/javascripts/wait.js
index b07588d5..2d5ad36d 100644
--- a/app/assets/javascripts/wait.js
+++ b/app/assets/javascripts/wait.js
@@ -10,7 +10,9 @@ $(document).on("turbolinks:load", function(){
       uid: $(".background").attr("room")
     }, {
       received: function(data){
-        if(data.action = "started"){ request_to_join_meeting(); }
+        if(data.action = "started"){
+          request_to_join_meeting();
+        }
       }
     });
   }
@@ -29,8 +31,8 @@ var request_to_join_meeting = function(){
       'Content-Type': 'application/x-www-form-urlencoded',
       'X-CSRF-Token': $('meta[name="csrf-token"]').attr('content')
     },
-    error: function(){
-      // The meeting is still booting (going slowly), retry shortly.
+    success: function(){
+      // Enqueue another trial just incase they didn't actually join.
       if(join_attempts < 4){ setTimeout(request_to_join_meeting, 10000); }
       join_attempts++;
     }
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 30cdb006..585a1a88 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -17,7 +17,7 @@ class SessionsController < ApplicationController
   # POST /users/login
   def create
     user = User.find_by(email: session_params[:email])
-    if user&.authenticate(session_params[:password])
+    if user.try(:authenticate, session_params[:password])
       login(user)
     else
       redirect_to root_path, notice: LOGIN_FAILED