diff --git a/app/helpers/bbb_helper.rb b/app/helpers/bbb_helper.rb index 321e05bf..9a3a6fc0 100644 --- a/app/helpers/bbb_helper.rb +++ b/app/helpers/bbb_helper.rb @@ -6,23 +6,27 @@ module BbbHelper else meeting_id = (Digest::SHA1.hexdigest(Rails.application.secrets[:secret_key_base]+meeting_token)).to_s - #See if the meeting is running + # See if the meeting is running begin bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil ) rescue BigBlueButton::BigBlueButtonException => exc + # This means that is not created logger.info "Message for the log file #{exc.key}: #{exc.message}" - #This means that is not created, so create the meeting - logout_url = "#{request.base_url}/bbb/close" #Closes the window after correct logout + + # Prepare parameters for create + logout_url = "#{request.base_url}/meeting/#{meeting_token}" moderator_password = random_password(12) viewer_password = random_password(12) meeting_options = {:record => meeting_recorded.to_s, :logoutURL => logout_url, :moderatorPW => moderator_password, :attendeePW => viewer_password } + + # Create the meeting bbb.create_meeting(meeting_token, meeting_id, meeting_options) - #And then get meeting info + # And then get meeting info bbb_meeting_info = bbb.get_meeting_info( meeting_id, nil ) end - #Get the join url + # Get the join url if (user_is_moderator) password = bbb_meeting_info[:moderatorPW] else diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb index 58d2872c..7cd1612e 100644 --- a/app/views/landing/index.html.erb +++ b/app/views/landing/index.html.erb @@ -57,8 +57,6 @@ $(document).ready(function($) { $(location).attr("href", data.response.join_url); }, error : function(xhr, status, error) { - console.info(status); - console.info(error); }, complete : function(xhr, status) { } diff --git a/config/routes.rb b/config/routes.rb index 81a13543..e1e04b54 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,5 @@ Rails.application.routes.draw do get 'bbb/join/:id', to: 'bbb#join', as: :bbb_join - get 'bbb/close' get 'meeting(/:id)', to: 'landing#index' get '/auth/:provider/callback', to: 'sessions#create'