Feature/star 951 (#13)

* Add starategy mode for jaas mode jitsi * Add variable to TestCase * Add package_status in testcase * Correct bug * Add try catch * Add try catch * Add debug * Add debug * Add debug * Repair tests * Add priority for mode video conference * Remove secret key from config * Add ServiceProvider to testCase * REmove on provider * Add missing provider totestbench * Add provider to testcase file * Remove courses from jitsi composer * Add missing field to config * Change config to jitsi, change generate url * Add missing method to strategy * Add app_id in jaas config Co-authored-by: Hubert Krzysztofiak <[email protected]>
EscolaLMS · Jan 5, 2023 · 235fb77 · 235fb77
1 parent bc498dc
commit 235fb77
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 21 deletions.
diff --git a/src/Providers/SettingsServiceProvider.php b/src/Providers/SettingsServiceProvider.php
@@ -27,7 +27,6 @@ public function register()
             AdministrableConfig::registerConfig(self::CONFIG_KEY . '.aud', ['nullable', 'string'], false);
             AdministrableConfig::registerConfig(self::CONFIG_KEY . '.iss', ['nullable', 'string'], false);
             AdministrableConfig::registerConfig(self::CONFIG_KEY . '.kid', ['nullable', 'string'], false);
-            AdministrableConfig::registerConfig(self::CONFIG_KEY . '.sub', ['nullable', 'string'], false);
             AdministrableConfig::registerConfig(self::CONFIG_KEY . '.private_key', ['nullable', 'string'], false);
         }
     }

diff --git a/src/Services/JaasService.php b/src/Services/JaasService.php
@@ -23,7 +23,7 @@ public function generateJwt(
             'aud' => $this->config['aud'],
             'iss' => $this->config['iss'],
             'exp' => now()->addMinutes($expireInMinutes)->timestamp,
-            'sub' => $this->config['sub'],
+            'sub' => $this->config['app_id'],
             'room' => $room,
             'context' => [
                 'user' =>  $userData,

diff --git a/src/Services/JitsiService.php b/src/Services/JitsiService.php
@@ -78,6 +78,7 @@ public function getChannelData(
         $channelName = $this->getChannelSlug($channelDisplayName);
         $data = [
             "domain" => $this->config[$this->mode . '_host'],
+            "app_id" => $this->config['app_id'],
             "roomName" => $channelName,
             "configOverwrite" => $configOverwrite,
             "interfaceConfigOverwrite" => $interfaceConfigOverwrite,
@@ -150,7 +151,7 @@ protected function getUserData($user, $isModerator = false): array
      */
     private function getMode(): string
     {
-        $jaasKeys = collect(['jaas_host', 'aud', 'iss', 'kid', 'private_key']);
+        $jaasKeys = collect(['app_id', 'jaas_host', 'aud', 'iss', 'kid', 'private_key']);
         $jaasConfigUse = true;
         $jaasKeys->each(function (string $key) use (&$jaasConfigUse) {
             if (!config('jitsi.' . $key)) $jaasConfigUse = false;

diff --git a/tests/Api/SettingsApiTest.php b/tests/Api/SettingsApiTest.php
@@ -41,7 +41,6 @@ public function testAdministrableConfigApi(): void
         $appId = $this->faker->uuid;
         $secret = $this->faker->uuid;
         $aud = $this->faker->word;
-        $sub = $this->faker->word;
         $iss = $this->faker->word;
         $kid = $this->faker->word;
         $privateKey = $this->faker->word;
@@ -83,10 +82,6 @@ public function testAdministrableConfigApi(): void
                         'key' => "$configKey.kid",
                         'value' => $kid,
                     ],
-                    [
-                        'key' => "$configKey.sub",
-                        'value' => $sub,
-                    ],
                     [
                         'key' => "$configKey.private_key",
                         'value' => $privateKey,
@@ -172,17 +167,6 @@ public function testAdministrableConfigApi(): void
                     'readonly' => false,
                     'value' => $iss,
                 ],
-                'sub' => [
-                    'full_key' => "$configKey.sub",
-                    'key' => 'sub',
-                    'rules' => [
-                        'nullable',
-                        'string'
-                    ],
-                    'public' => false,
-                    'readonly' => false,
-                    'value' => $sub,
-                ],
                 'app_id' => [
                     'full_key' => "$configKey.app_id",
                     'key' => 'app_id',

diff --git a/tests/Services/ServiceTest.php b/tests/Services/ServiceTest.php
@@ -52,7 +52,7 @@ public function testServiceWithJwtJaas()
             'private_key_type' => OPENSSL_KEYTYPE_RSA
         ]);
         \Config::set('jitsi.private_key', $private_key);
-        \Config::set('jitsi.sub', Str::random(40));
+        \Config::set('jitsi.app_id', Str::random(40));
         \Config::set('jitsi.kid', Str::random(40));
         $config = config('jitsi');
         $data = Jitsi::getChannelData($this->user, $this->faker->text(15));
@@ -72,7 +72,7 @@ public function testServiceWithJwtAndSettingsJaas()
             'private_key_type' => OPENSSL_KEYTYPE_RSA
         ]);
         \Config::set('jitsi.private_key', $private_key);
-        \Config::set('jitsi.sub', Str::random(40));
+        \Config::set('jitsi.app_id', Str::random(40));
         \Config::set('jitsi.kid', Str::random(40));
         $config = config('jitsi');
         $data = Jitsi::getChannelData($this->user, "Test Channel Name", true, ['foo' => 'bar'], ['bar' => 'foo']);