From 30838f4b36cb4d68a7366a7cc24a8c8448f382b9 Mon Sep 17 00:00:00 2001
From: Zachary Chai <zachary.chai@blindsidenetworks.com>
Date: Fri, 21 Apr 2017 13:51:45 -0400
Subject: [PATCH] encode room id separately from meeting id

---
 app/controllers/bbb_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/bbb_controller.rb b/app/controllers/bbb_controller.rb
index 8fbbdc55..b99d5ef7 100644
--- a/app/controllers/bbb_controller.rb
+++ b/app/controllers/bbb_controller.rb
@@ -56,11 +56,11 @@ class BbbController < ApplicationController
 
         meeting_id = "#{params[:room_id]}-#{params[:id]}"
         meeting_name = params[:id]
-        meeting_path = "#{params[:room_id]}/#{params[:id]}"
+        meeting_path = "#{URI.encode(params[:room_id])}/#{URI.encode(params[:id]).gsub('/','%2F')}"
       else
         user = User.find_by encrypted_id: params[:id]
         meeting_id = params[:id]
-        meeting_path = meeting_id
+        meeting_path = URI.encode(meeting_id).gsub('/','%2F')
       end
 
       options = if user
@@ -77,7 +77,7 @@ class BbbController < ApplicationController
         }
       end
 
-      base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{URI.encode(meeting_path).gsub('/','%2F')}"
+      base_url = "#{request.base_url}#{relative_root}/#{params[:resource]}/#{meeting_path}"
       options[:meeting_logout_url] = base_url
       options[:hook_url] = "#{base_url}/callback"
       options[:moderator_message] = t('moderator_default_message', url: "<a href=\"#{base_url}\" target=\"_blank\"><u>#{base_url}</u></a>")