add tests and make url flags explicit

Signed-off-by: Timo K <[email protected]>
matrix-org · Nov 10, 2023 · 2fce39c · 2fce39c
1 parent 4ccd536
commit 2fce39c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/models/Call.ts b/src/models/Call.ts
@@ -662,9 +662,10 @@ export class ElementCall extends Call {
         });
 
         if (client.isRoomEncrypted(roomId) && !SettingsStore.getValue("feature_disable_call_per_sender_encryption"))
-            params.append("perParticipantE2EE", "");
-        if (SettingsStore.getValue("fallbackICEServerAllowed")) params.append("allowIceFallback", "");
-        if (SettingsStore.getValue("feature_allow_screen_share_only_mode")) params.append("allowVoipWithNoMedia", "");
+            params.append("perParticipantE2EE", "true");
+        if (SettingsStore.getValue("fallbackICEServerAllowed")) params.append("allowIceFallback", "true");
+        if (SettingsStore.getValue("feature_allow_screen_share_only_mode"))
+            params.append("allowVoipWithNoMedia", "true");
 
         // Set custom fonts
         if (SettingsStore.getValue("useSystemFont")) {

diff --git a/test/models/Call-test.ts b/test/models/Call-test.ts
@@ -925,6 +925,30 @@ describe("ElementCall", () => {
             call.destroy();
             expect(destroyPersistentWidgetSpy).toHaveBeenCalled();
         });
+
+        it("the perParticipantE2EE url flag is used in encrypted rooms while respecting the feature_disable_call_per_sender_encryption flag", async () => {
+            // We destroy the call created in beforeEach because we test the call creation process.
+            call.destroy();
+            const addWidgetSpy = jest.spyOn(WidgetStore.instance, "addVirtualWidget");
+            // If a room is not encrypted we will never add the perParticipantE2EE flag.
+            client.isRoomEncrypted.mockReturnValue(true);
+            {
+                // should create call with perParticipantE2EE flag
+                ElementCall.create(room);
+
+                expect(addWidgetSpy.mock.calls[0][0].url).toContain("perParticipantE2EE=true");
+                ElementCall.get(room)?.destroy();
+
+                // should create call without perParticipantE2EE flag
+                enabledSettings.add("feature_disable_call_per_sender_encryption");
+                await ElementCall.create(room);
+                enabledSettings.delete("feature_disable_call_per_sender_encryption");
+
+                expect(addWidgetSpy.mock.calls[1][0].url).not.toContain("perParticipantE2EE=true");
+            }
+            client.isRoomEncrypted.mockClear();
+            addWidgetSpy.mockRestore();
+        });
     });
 
     describe("instance in a video room", () => {