Fixes required for making the logouturl work

This commit is contained in:
jfederico
2016-10-19 13:59:40 -04:00
parent 061f9c794a
commit bd3cbee2b4
4 changed files with 7 additions and 5 deletions

View File

@ -8,7 +8,7 @@ class BbbController < ApplicationController
elsif ( !params.has_key?(:name) )
render_response("missing_parameter", "user name was not included", :bad_request)
else
bbb_join_url = helpers.bbb_join_url(params[:id], false, params[:name], false, )
bbb_join_url = helpers.bbb_join_url(params[:id], false, params[:name], false, "#{request.base_url}/#{params[:resource]}/#{params[:id]}")
if bbb_join_url[:returncode]
logger.info "#Execute the redirect"
render_response("ok", "execute the redirect", :ok, {:join_url => bbb_join_url[:join_url]})

View File

@ -3,6 +3,7 @@ class LandingController < ApplicationController
def meeting
@refreshable = (params[:resource] == 'meetings' && !params.has_key?(:id))
@meeting_token = params[:id] || @meeting_token = helpers.new_meeting_token
@resource = params[:resource]
@resource_url = meeting_url(@meeting_token)
end
@ -16,9 +17,10 @@ class LandingController < ApplicationController
def room
@room_name = params[:name]
@meeting_token = @room_name
@resource_url = room_url(@meeting_token)
@user = User.find_by(username: @room_name)
@meeting_token = @room_name
@resource = params[:resource]
@resource_url = room_url(@meeting_token)
if @user.nil?
redirect_to root_path
end