Commit 2bb0f7d1 authored by jonaslm's avatar jonaslm
Browse files

Renamed lockedOnJoin to lockOnJoin internally. Added missing locksettings for...

Renamed lockedOnJoin to lockOnJoin internally. Added missing locksettings for HideUserList and LockOnJoinConfigurable
parent 853df362
......@@ -143,18 +143,28 @@ class CreateMeetingParameters extends MetaParameters
*/
private $lockSettingsDisableNote;
/**
* @var bool
/**
* @var bool
*/
private $lockSettingsHideUserList;
/**
* @var bool
*/
private $lockSettingsLockedLayout;
/**
* @var bool
*/
private $lockSettingsLockedOnJoin = true;
private $lockSettingsLockOnJoin = true;
/**
* @var array
/**
* @var bool
*/
private $lockSettingsLockOnJoinConfigurable;
/**
* @var array
*/
private $presentations = [];
......@@ -661,10 +671,29 @@ class CreateMeetingParameters extends MetaParameters
return $this;
}
/**
* @return bool
*/
public function isLockSettingsLockedLayout()
/**
* @return bool
*/
public function isLockSettingsHideUserList()
{
return $this->lockSettingsHideUserList;
}
/**
* @param bool $lockSettingsHideUserList
* @return CreateMeetingParameters
*/
public function setLockSettingsHideUserList($lockSettingsHideUserList)
{
$this->lockSettingsHideUserList = $lockSettingsHideUserList;
return $this;
}
/**
* @return bool
*/
public function isLockSettingsLockedLayout()
{
return $this->lockSettingsLockedLayout;
}
......@@ -683,25 +712,44 @@ class CreateMeetingParameters extends MetaParameters
/**
* @return bool
*/
public function isLockSettingsLockedOnJoin()
public function isLockSettingsLockOnJoin()
{
return $this->lockSettingsLockedOnJoin;
return $this->lockSettingsLockOnJoin;
}
/**
* @param bool $lockedOnJoin
* @param bool $lockOnJoin
* @return CreateMeetingParameters
*/
public function setLockSettingsLockedOnJoin($lockedOnJoin)
public function setLockSettingsLockOnJoin($lockOnJoin)
{
$this->lockedOnJoin = $lockedOnJoin;
$this->lockSettingsLockOnJoin = $lockOnJoin;
return $this;
}
/**
* @param $endCallbackUrl
* @return CreateMeetingParameters
/**
* @return bool
*/
public function isLockSettingsLockOnJoinConfigurable()
{
return $this->lockSettingsLockOnJoinConfigurable;
}
/**
* @param bool $lockOnJoinConfigurable
* @return CreateMeetingParameters
*/
public function setLockSettingsLockOnJoinConfigurable($lockOnJoinConfigurable)
{
$this->lockSettingsLockOnJoinConfigurable = $lockOnJoinConfigurable;
return $this;
}
/**
* @param $endCallbackUrl
* @return CreateMeetingParameters
*/
public function setEndCallbackUrl($endCallbackUrl)
{
......@@ -874,7 +922,7 @@ class CreateMeetingParameters extends MetaParameters
'lockSettingsDisablePublicChat' => $this->isLockSettingsDisablePublicChat() ? 'true' : 'false',
'lockSettingsDisableNote' => $this->isLockSettingsDisableNote() ? 'true' : 'false',
'lockSettingsLockedLayout' => $this->isLockSettingsLockedLayout() ? 'true' : 'false',
'lockSettingsLockOnJoin' => $this->isLockSettingsLockedOnJoin() ? 'true' : 'false',
'lockSettingsLockOnJoin' => $this->isLockSettingsLockOnJoin() ? 'true' : 'false',
];
// Add breakout rooms parameters only if the meeting is a breakout room
......
......@@ -55,9 +55,11 @@ class CreateMeetingParametersTest extends TestCase
$this->assertEquals($params['lockSettingsDisablePrivateChat'], $createMeetingParams->isLockSettingsDisablePrivateChat());
$this->assertEquals($params['lockSettingsDisablePublicChat'], $createMeetingParams->isLockSettingsDisablePublicChat());
$this->assertEquals($params['lockSettingsDisableNote'], $createMeetingParams->isLockSettingsDisableNote());
$this->assertEquals($params['lockSettingsLockedLayout'], $createMeetingParams->isLockSettingsLockedLayout());
$this->assertEquals($params['lockSettingsLockedOnJoin'], $createMeetingParams->isLockSettingsLockedOnJoin());
$this->assertEquals($params['meta_presenter'], $createMeetingParams->getMeta('presenter'));
$this->assertEquals($params['lockSettingsHideUserList'], $createMeetingParams->isLockSettingsHideUserList());
$this->assertEquals($params['lockSettingsLockedLayout'], $createMeetingParams->isLockSettingsLockedLayout());
$this->assertEquals($params['lockSettingsLockOnJoin'], $createMeetingParams->isLockSettingsLockOnJoin());
$this->assertEquals($params['lockSettingsLockOnJoinConfigurable'], $createMeetingParams->isLockSettingsLockOnJoinConfigurable());
$this->assertEquals($params['meta_presenter'], $createMeetingParams->getMeta('presenter'));
$this->assertEquals($params['meta_endCallbackUrl'], $createMeetingParams->getMeta('endCallbackUrl'));
// Check values are empty of this is not a breakout room
......
......@@ -67,34 +67,36 @@ class TestCase extends \PHPUnit\Framework\TestCase
protected function generateCreateParams()
{
return [
'meetingName' => $this->faker->name,
'meetingId' => $this->faker->uuid,
'attendeePassword' => $this->faker->password,
'moderatorPassword' => $this->faker->password,
'autoStartRecording' => $this->faker->boolean(50),
'dialNumber' => $this->faker->phoneNumber,
'voiceBridge' => $this->faker->randomNumber(5),
'webVoice' => $this->faker->word,
'logoutUrl' => $this->faker->url,
'maxParticipants' => $this->faker->numberBetween(2, 100),
'record' => $this->faker->boolean(50),
'duration' => $this->faker->numberBetween(0, 6000),
'welcomeMessage' => $this->faker->sentence,
'allowStartStopRecording' => $this->faker->boolean(50),
'moderatorOnlyMessage' => $this->faker->sentence,
'webcamsOnlyForModerator' => $this->faker->boolean(50),
'logo' => $this->faker->imageUrl(330, 70),
'copyright' => $this->faker->text,
'muteOnStart' => $this->faker->boolean(50),
'lockSettingsDisableCam' => $this->faker->boolean(50),
'lockSettingsDisableMic' => $this->faker->boolean(50),
'lockSettingsDisablePrivateChat' => $this->faker->boolean(50),
'lockSettingsDisablePublicChat' => $this->faker->boolean(50),
'lockSettingsDisableNote' => $this->faker->boolean(50),
'lockSettingsLockedLayout' => $this->faker->boolean(50),
'lockSettingsLockedOnJoin' => $this->faker->boolean(50),
'meta_presenter' => $this->faker->name,
'meta_endCallbackUrl' => $this->faker->url
'meetingName' => $this->faker->name,
'meetingId' => $this->faker->uuid,
'attendeePassword' => $this->faker->password,
'moderatorPassword' => $this->faker->password,
'autoStartRecording' => $this->faker->boolean(50),
'dialNumber' => $this->faker->phoneNumber,
'voiceBridge' => $this->faker->randomNumber(5),
'webVoice' => $this->faker->word,
'logoutUrl' => $this->faker->url,
'maxParticipants' => $this->faker->numberBetween(2, 100),
'record' => $this->faker->boolean(50),
'duration' => $this->faker->numberBetween(0, 6000),
'welcomeMessage' => $this->faker->sentence,
'allowStartStopRecording' => $this->faker->boolean(50),
'moderatorOnlyMessage' => $this->faker->sentence,
'webcamsOnlyForModerator' => $this->faker->boolean(50),
'logo' => $this->faker->imageUrl(330, 70),
'copyright' => $this->faker->text,
'muteOnStart' => $this->faker->boolean(50),
'lockSettingsDisableCam' => $this->faker->boolean(50),
'lockSettingsDisableMic' => $this->faker->boolean(50),
'lockSettingsDisablePrivateChat' => $this->faker->boolean(50),
'lockSettingsDisablePublicChat' => $this->faker->boolean(50),
'lockSettingsDisableNote' => $this->faker->boolean(50),
'lockSettingsHideUserList' => $this->faker->boolean(50),
'lockSettingsLockedLayout' => $this->faker->boolean(50),
'lockSettingsLockOnJoin' => $this->faker->boolean(50),
'lockSettingsLockOnJoinConfigurable' => $this->faker->boolean(50),
'meta_presenter' => $this->faker->name,
'meta_endCallbackUrl' => $this->faker->url
];
}
......@@ -130,7 +132,8 @@ class TestCase extends \PHPUnit\Framework\TestCase
->setEndCallbackUrl($params['meta_endCallbackUrl'])->setMuteOnStart($params['muteOnStart'])->setLockSettingsDisableCam($params['lockSettingsDisableCam'])
->setLockSettingsDisableMic($params['lockSettingsDisableMic'])->setLockSettingsDisablePrivateChat($params['lockSettingsDisablePrivateChat'])
->setLockSettingsDisablePublicChat($params['lockSettingsDisablePublicChat'])->setLockSettingsDisableNote($params['lockSettingsDisableNote'])
->setLockSettingsLockedLayout($params['lockSettingsLockedLayout'])->setLockSettingsLockedOnJoin($params['lockSettingsLockedOnJoin'])
->setLockSettingsHideUserList($params['lockSettingsHideUserList'])->setLockSettingsLockedLayout($params['lockSettingsLockedLayout'])
->setLockSettingsLockOnJoin($params['lockSettingsLockOnJoin'])->setLockSettingsLockOnJoinConfigurable($params['lockSettingsLockOnJoin'])
->addMeta('presenter', $params['meta_presenter']);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment