moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-76620 mod_bigbluebuttonbn: Fix guest access with forcelogin

Browse source 
*With "forcelogin" setting turned on, the new external guest
 links in the bigbluebutton plugin do not work but show the login screen instead
This commit is contained in:
Laurent David 2023-01-05 19:09:55 +01:00
parent 0780e87f06
commit 8fcf662484
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/bigbluebuttonbn/guest.php
View file

@ -31,8 +31,8 @@ use mod_bigbluebuttonbn\plugin;
require(__DIR__.'/../../config.php'); require(__DIR__.'/../../config.php');
global $PAGE, $OUTPUT, $DB, $SITE; global $PAGE, $OUTPUT, $DB, $SITE;
// Still run through basic setup of the page. // Note here that we do not use require_login as the $CFG->forcelogin would prevent guest user from accessing this page.
require_course_login($SITE); $PAGE->set_course($SITE); // Intialise the page and run through the setup.
$uid = required_param('uid', PARAM_ALPHANUMEXT); $uid = required_param('uid', PARAM_ALPHANUMEXT);
$bbid = $DB->get_field('bigbluebuttonbn', 'id', ['guestlinkuid' => trim($uid)]); $bbid = $DB->get_field('bigbluebuttonbn', 'id', ['guestlinkuid' => trim($uid)]);

14
mod/bigbluebuttonbn/tests/behat/guest_access.feature
View file

@ -10,7 +10,7 @@ Feature: Guest access allows external users to connect to a meeting
And the following "activities" exist: And the following "activities" exist:
| activity | name | intro | course | idnumber | type | recordings_imported | guestallowed | | activity | name | intro | course | idnumber | type | recordings_imported | guestallowed |
| bigbluebuttonbn | RoomRecordings | Test Room Recording description | C1 | bigbluebuttonbn1 | 0 | 0 | 0 | | bigbluebuttonbn | RoomRecordings | Test Room Recording description | C1 | bigbluebuttonbn1 | 0 | 0 | 0 |
| bigbluebuttonbn | RoomRecordingsWithguest | Test Room with guest | C1 | bigbluebuttonbn1 | 0 | 0 | 1 | | bigbluebuttonbn | RoomRecordingsWithGuest | Test Room with guest | C1 | bigbluebuttonbn1 | 0 | 0 | 1 |
@javascript @javascript
Scenario: I need to enable guest access to see the instance parameters Scenario: I need to enable guest access to see the instance parameters
@ -47,9 +47,8 @@ Feature: Guest access allows external users to connect to a meeting
Scenario: I should be able to invite guest to the meeting Scenario: I should be able to invite guest to the meeting
Given the following config values are set as admin: Given the following config values are set as admin:
| bigbluebuttonbn_guestaccess_enabled | 1 | | bigbluebuttonbn_guestaccess_enabled | 1 |
When I am on the "RoomRecordingsWithguest" "bigbluebuttonbn activity" page logged in as "admin" When I am on the "RoomRecordingsWithGuest" "bigbluebuttonbn activity" page logged in as "admin"
Then I should see "Add guests" Then I click on "Add guests" "button"
And I click on "Add guests" "button"
And I should see "Meeting link" And I should see "Meeting link"
And I should see "Meeting password" And I should see "Meeting password"
And I should see "Copy link" And I should see "Copy link"
@ -61,3 +60,10 @@ Feature: Guest access allows external users to connect to a meeting
When I click on "OK" "button" in the "Add guests to this meeting" "dialogue" When I click on "OK" "button" in the "Add guests to this meeting" "dialogue"
Then I should see "An invitation will be sent to testuser@email.com." Then I should see "An invitation will be sent to testuser@email.com."
Then I log out Then I log out
Scenario: I should be able to invite guest to the meeting even if forcelogin is set
Given the following config values are set as admin:
| bigbluebuttonbn_guestaccess_enabled | 1 |
| forcelogin | 1 |
When I am on the "RoomRecordingsWithGuest" "mod_bigbluebuttonbn > BigblueButtonBN Guest" page
Then I should see "C1: RoomRecordingsWithGuest"