Skip to content
Snippets Groups Projects
Unverified Commit 4085800c authored by Ahmad Farhat's avatar Ahmad Farhat Committed by GitHub
Browse files

Added guest=true for all users not signed in (#4414)

* Added guest=true for all users not signed in

* Rubo
parent d0a3658d
Branches
Tags
No related merge requests found
...@@ -555,6 +555,3 @@ DEPENDENCIES ...@@ -555,6 +555,3 @@ DEPENDENCIES
uglifier (~> 4.2.0) uglifier (~> 4.2.0)
web-console (~> 3.7, >= 3.7.0) web-console (~> 3.7, >= 3.7.0)
webmock (~> 3.11) webmock (~> 3.11)
BUNDLED WITH
2.1.4
...@@ -56,6 +56,7 @@ module BbbServer ...@@ -56,6 +56,7 @@ module BbbServer
join_opts[:join_via_html5] = true join_opts[:join_via_html5] = true
join_opts[:avatarURL] = options[:avatarURL] if options[:avatarURL].present? join_opts[:avatarURL] = options[:avatarURL] if options[:avatarURL].present?
join_opts[:createTime] = room.last_session.to_datetime.strftime("%Q") if room.last_session join_opts[:createTime] = room.last_session.to_datetime.strftime("%Q") if room.last_session
join_opts[:guest] = true if options[:guest]
bbb_server.join_meeting_url(room.bbb_id, name, password, join_opts) bbb_server.join_meeting_url(room.bbb_id, name, password, join_opts)
end end
......
...@@ -68,6 +68,7 @@ module Joiner ...@@ -68,6 +68,7 @@ module Joiner
opts[:record] = record_meeting opts[:record] = record_meeting
opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval") opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval")
opts[:mute_on_start] = room_setting_with_config("muteOnStart") opts[:mute_on_start] = room_setting_with_config("muteOnStart")
opts[:guest] = current_user.nil?
if current_user if current_user
redirect_to join_path(@room, current_user.name, opts, current_user.uid) redirect_to join_path(@room, current_user.name, opts, current_user.uid)
......
...@@ -270,7 +270,7 @@ describe RoomsController, type: :controller do ...@@ -270,7 +270,7 @@ describe RoomsController, type: :controller do
allow_any_instance_of(BigBlueButton::BigBlueButtonApi).to receive(:is_meeting_running?).and_return(true) allow_any_instance_of(BigBlueButton::BigBlueButtonApi).to receive(:is_meeting_running?).and_return(true)
post :join, params: { room_uid: @room, join_name: "Join Name" } post :join, params: { room_uid: @room, join_name: "Join Name" }
expect(response).to redirect_to(join_path(@owner.main_room, "Join Name", {}, response.cookies["guest_id"])) expect(response).to redirect_to(join_path(@owner.main_room, "Join Name", { guest: true }, response.cookies["guest_id"]))
end end
it "should use join name if user is not logged in and meeting running and moderator access code is enabled and set" do it "should use join name if user is not logged in and meeting running and moderator access code is enabled and set" do
...@@ -286,7 +286,8 @@ describe RoomsController, type: :controller do ...@@ -286,7 +286,8 @@ describe RoomsController, type: :controller do
post :join, params: { room_uid: room, join_name: "Join Name" }, session: { moderator_access_code: "abcdef" } post :join, params: { room_uid: room, join_name: "Join Name" }, session: { moderator_access_code: "abcdef" }
expect(response).to redirect_to(join_path(room, "Join Name", { user_is_moderator: true }, response.cookies["guest_id"])) expect(response).to redirect_to(join_path(room, "Join Name", { user_is_moderator: true, guest: true },
response.cookies["guest_id"]))
end end
it "should render wait if meeting isn't running" do it "should render wait if meeting isn't running" do
...@@ -427,7 +428,8 @@ describe RoomsController, type: :controller do ...@@ -427,7 +428,8 @@ describe RoomsController, type: :controller do
post :join, params: { room_uid: room, join_name: "Join Name" }, session: { moderator_access_code: "abcdef" } post :join, params: { room_uid: room, join_name: "Join Name" }, session: { moderator_access_code: "abcdef" }
expect(response).to redirect_to(join_path(room, "Join Name", { user_is_moderator: true }, response.cookies["guest_id"])) expect(response).to redirect_to(join_path(room, "Join Name", { user_is_moderator: true, guest: true },
response.cookies["guest_id"]))
end end
it "should join the room as moderator if the user has the moderator_access code (and regular access code is set)" do it "should join the room as moderator if the user has the moderator_access code (and regular access code is set)" do
...@@ -443,7 +445,8 @@ describe RoomsController, type: :controller do ...@@ -443,7 +445,8 @@ describe RoomsController, type: :controller do
post :join, params: { room_uid: room, join_name: "Join Name" }, session: { moderator_access_code: "abcdef" } post :join, params: { room_uid: room, join_name: "Join Name" }, session: { moderator_access_code: "abcdef" }
expect(response).to redirect_to(join_path(room, "Join Name", { user_is_moderator: true }, response.cookies["guest_id"])) expect(response).to redirect_to(join_path(room, "Join Name", { user_is_moderator: true, guest: true },
response.cookies["guest_id"]))
end end
it "should redirect to login if a wrong moderator access code is supplied" do it "should redirect to login if a wrong moderator access code is supplied" do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment