Merge pull request #194 from xJuvi/new-features

fixes #110
fixes #184

Author: GhaziTriki

src/Parameters/CreateMeetingParameters.php

@@ -1552,6 +1552,7 @@ public function getHTTPQuery()
             'meetingKeepEvents'                      => $this->meetingKeepEvents ? 'true' : 'false',
             'meetingLayout'                          => $this->meetingLayout,
             'meetingCameraCap'                       => $this->meetingCameraCap,
+            'userCameraCap'                          => $this->userCameraCap,
             'meetingExpireIfNoUserJoinedInMinutes'   => $this->meetingExpireIfNoUserJoinedInMinutes,
             'meetingExpireWhenLastUserLeftInMinutes' => $this->meetingExpireWhenLastUserLeftInMinutes,
             'preUploadedPresentationOverrideDefault' => $this->preUploadedPresentationOverrideDefault,

src/Parameters/JoinMeetingParameters.php

@@ -88,6 +88,21 @@ class JoinMeetingParameters extends UserDataParameters
      * @var bool
      */
     private $excludeFromDashboard;
+    
+    /**
+     * @var string
+     */
+    private $configToken;
+    
+    /**
+     * @var bool
+     */
+    private $guest;
+    
+    /**
+     * @var string
+     */
+    private $defaultLayout;
 
     /**
      * JoinMeetingParametersTest constructor.
@@ -328,6 +343,66 @@ public function setExcludeFromDashboard($excludeFromDashboard): JoinMeetingParam
 
         return $this;
     }
+    
+    /**
+     * @return string
+     */
+    public function getConfigToken()
+    {
+        return $this->configToken;
+    }
+
+    /**
+     * @param string $configToken
+     *
+     * @return JoinMeetingParameters
+     */
+    public function setConfigToken($configToken)
+    {
+        $this->configToken = $configToken;
+
+        return $this;
+    }
+    
+    /**
+     * @return bool
+     */
+    public function isGuest()
+    {
+        return $this->guest;
+    }
+
+    /**
+     * @param bool $guest
+     *
+     * @return JoinMeetingParameters
+     */
+    public function setGuest($guest)
+    {
+        $this->guest = $guest;
+
+        return $this;
+    }
+    
+    /**
+     * @return string
+     */
+    public function getDefaultLayout()
+    {
+        return $this->defaultLayout;
+    }
+
+    /**
+     * @param string $defaultLayout
+     *
+     * @return JoinMeetingParameters
+     */
+    public function setDefaultLayout($defaultLayout)
+    {
+        $this->defaultLayout = $defaultLayout;
+
+        return $this;
+    }
 
     /**
      * @param string $paramName
@@ -359,6 +434,9 @@ public function getHTTPQuery()
             'avatarURL'            => $this->avatarURL,
             'redirect'             => $this->redirect ? 'true' : 'false',
             'clientURL'            => $this->clientURL,
+            'configToken'           => $this->configToken,
+            'guest'                 => $this->guest ? 'true' : 'false',
+            'defaultLayout'         => $this->defaultLayout,
         ];
 
         foreach ($this->customParameters as $key => $value) {

tests/Parameters/GetMeetingInfoParametersTest.php

@@ -31,7 +31,7 @@ class GetMeetingInfoParametersTest extends TestCase
 {
     public function testGetMeetingInfoParameters()
     {
-        $getMeetingInfoParams = new GetMeetingInfoParameters($meetingId = $this->faker->uuid, $password = $this->faker->password());
+        $getMeetingInfoParams = new GetMeetingInfoParameters($meetingId = $this->faker->uuid);
 
         $this->assertEquals($meetingId, $getMeetingInfoParams->getMeetingId());
 

tests/Parameters/JoinMeetingParametersTest.php

@@ -21,6 +21,7 @@
 namespace BigBlueButton\Parameters;
 
 use BigBlueButton\Enum\Role;
+use BigBlueButton\Enum\MeetingLayout;
 use BigBlueButton\TestCase;
 
 /**
@@ -55,6 +56,9 @@ public function testJoinMeetingParameters()
         $joinMeetingParams->setAvatarURL($avatarUrl = $this->faker->url);
         $joinMeetingParams->setRedirect($redirect = $this->faker->boolean(50));
         $joinMeetingParams->setClientURL($clientUrl = $this->faker->url);
+        $joinMeetingParams->setConfigToken($configToken = $this->faker->word);
+        $joinMeetingParams->setGuest($guest = $this->faker->boolean(50));
+        $joinMeetingParams->setDefaultLayout($defaultLayout = $this->faker->randomElement(MeetingLayout::getValues()));
         $this->assertEquals($newId, $joinMeetingParams->getMeetingId());
         $this->assertEquals($newName, $joinMeetingParams->getUsername());
         $this->assertEquals($newRole, $joinMeetingParams->getRole());
@@ -63,5 +67,8 @@ public function testJoinMeetingParameters()
         $this->assertEquals($avatarUrl, $joinMeetingParams->getAvatarURL());
         $this->assertEquals($redirect, $joinMeetingParams->isRedirect());
         $this->assertEquals($clientUrl, $joinMeetingParams->getClientURL());
+        $this->assertEquals($configToken, $joinMeetingParams->getConfigToken());
+        $this->assertEquals($guest, $joinMeetingParams->isGuest());
+        $this->assertEquals($defaultLayout, $joinMeetingParams->getDefaultLayout);
     }
 }