From b020120366980a9963bdc8856769770749089dac Mon Sep 17 00:00:00 2001
From: Ludwig Behm <lbehm@users.noreply.github.com>
Date: Sat, 16 Jan 2021 19:18:28 +0100
Subject: [PATCH] Merge fediventure/feature/federation-jitsi

dynamically choose jitsi instance by jitsiUrl map property
https://gitlab.com/fediventure/workadventure/-/merge_requests/1
---
 front/src/Phaser/Game/GameScene.ts | 4 +++-
 front/src/WebRtc/JitsiFactory.ts   | 7 +++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 08d7688a..1c3c1bd3 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -12,6 +12,7 @@ import {CurrentGamerInterface, hasMovedEventName, Player} from "../Player/Player
 import {
     DEBUG_MODE,
     JITSI_PRIVATE_MODE,
+    JITSI_URL,
     POSITION_DELAY,
     RESOLUTION,
     ZOOM_LEVEL
@@ -1206,7 +1207,8 @@ export class GameScene extends ResizableScene implements CenterListener {
     }
 
     public startJitsi(roomName: string, jwt?: string): void {
-        jitsiFactory.start(roomName, this.playerName, jwt);
+        const jitsiUrl = getMapProperty(this.mapFile, 'jitsiUrl', 'string', JITSI_URL);
+        jitsiFactory.start(jitsiUrl, roomName, this.playerName, jwt);
         this.connection.setSilent(true);
         mediaManager.hideGameOverlay();
 
diff --git a/front/src/WebRtc/JitsiFactory.ts b/front/src/WebRtc/JitsiFactory.ts
index 736b5244..8e6feea6 100644
--- a/front/src/WebRtc/JitsiFactory.ts
+++ b/front/src/WebRtc/JitsiFactory.ts
@@ -1,4 +1,3 @@
-import {JITSI_URL} from "../Enum/EnvironmentVariable";
 import {mediaManager} from "./MediaManager";
 import {coWebsiteManager} from "./CoWebsiteManager";
 declare const window:any; // eslint-disable-line @typescript-eslint/no-explicit-any
@@ -30,9 +29,9 @@ class JitsiFactory {
     private audioCallback = this.onAudioChange.bind(this);
     private videoCallback = this.onVideoChange.bind(this);
     
-    public start(roomName: string, playerName:string, jwt?: string): void {
+    public start(jitsiUrl: string, roomName: string, playerName:string, jwt?: string): void {
         coWebsiteManager.insertCoWebsite((cowebsiteDiv => {
-            const domain = JITSI_URL;
+            const domain = jitsiUrl;
             const options: any = { // eslint-disable-line @typescript-eslint/no-explicit-any
                 roomName: roomName,
                 jwt: jwt,
@@ -90,4 +89,4 @@ class JitsiFactory {
 
 }
 
-export const jitsiFactory = new JitsiFactory();
\ No newline at end of file
+export const jitsiFactory = new JitsiFactory();