From fc4be589c1a3f97c54d6df7f4ec09aa921393420 Mon Sep 17 00:00:00 2001
From: Mathias Wegener <wegener@sipgate.de>
Date: Tue, 15 Dec 2020 12:21:30 +0100
Subject: [PATCH 1/3] Adds environment variable to configure start map in empty
 case

---
 .env.template                            | 1 +
 docker-compose.yaml                      | 1 +
 front/src/Connexion/ConnectionManager.ts | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.env.template b/.env.template
index d0db42e3..ab3297a1 100644
--- a/.env.template
+++ b/.env.template
@@ -5,3 +5,4 @@ JITSI_PRIVATE_MODE=false
 JITSI_ISS=
 SECRET_JITSI_KEY=
 ADMIN_API_TOKEN=123
+PATH_TO_START_MAP=/Floor0/floor0.json
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7f21b16d..05acc89d 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -24,6 +24,7 @@ services:
       DEBUG_MODE: "$DEBUG_MODE"
       JITSI_URL: $JITSI_URL
       JITSI_PRIVATE_MODE: "$JITSI_PRIVATE_MODE"
+      PATH_TO_START_MAP: "$PATH_TO_START_MAP"
       HOST: "0.0.0.0"
       NODE_ENV: development
       API_URL: api.workadventure.localhost
diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 19dfd8be..18ecbf66 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -7,7 +7,7 @@ import {localUserStore} from "./LocalUserStore";
 import {LocalUser} from "./LocalUser";
 import {Room} from "./Room";
 
-const URL_ROOM_STARTED = '/Floor0/floor0.json';
+const URL_ROOM_STARTED = (process.env.PATH_TO_START_MAP) ? process.env.PATH_TO_START_MAP : '/Floor0/floor0.json';
 
 class ConnectionManager {
     private localUser!:LocalUser;

From c24be367dada854a0bfc85c67d6430c33b2af445 Mon Sep 17 00:00:00 2001
From: Mathias Wegener <wegener@sipgate.de>
Date: Tue, 15 Dec 2020 12:39:23 +0100
Subject: [PATCH 2/3] fix: moves process.env access to EnvironmentVariables.ts

---
 front/src/Connexion/ConnectionManager.ts | 4 ++--
 front/src/Enum/EnvironmentVariable.ts    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 18ecbf66..0265e425 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -1,5 +1,5 @@
 import Axios from "axios";
-import {API_URL} from "../Enum/EnvironmentVariable";
+import {API_URL, PATH_TO_START_MAP} from "../Enum/EnvironmentVariable";
 import {RoomConnection} from "./RoomConnection";
 import {PositionInterface, ViewportInterface} from "./ConnexionModels";
 import {GameConnexionTypes, urlManager} from "../Url/UrlManager";
@@ -7,7 +7,7 @@ import {localUserStore} from "./LocalUserStore";
 import {LocalUser} from "./LocalUser";
 import {Room} from "./Room";
 
-const URL_ROOM_STARTED = (process.env.PATH_TO_START_MAP) ? process.env.PATH_TO_START_MAP : '/Floor0/floor0.json';
+const URL_ROOM_STARTED = PATH_TO_START_MAP || '/Floor0/floor0.json';
 
 class ConnectionManager {
     private localUser!:LocalUser;
diff --git a/front/src/Enum/EnvironmentVariable.ts b/front/src/Enum/EnvironmentVariable.ts
index d3b6c809..c0ed4e01 100644
--- a/front/src/Enum/EnvironmentVariable.ts
+++ b/front/src/Enum/EnvironmentVariable.ts
@@ -6,6 +6,7 @@ const TURN_USER: string = process.env.TURN_USER || 'g.parant@thecodingmachine.co
 const TURN_PASSWORD: string = process.env.TURN_PASSWORD || 'itcugcOHxle9Acqi$';
 const JITSI_URL : string|undefined = (process.env.JITSI_URL === '') ? undefined : process.env.JITSI_URL;
 const JITSI_PRIVATE_MODE : boolean = process.env.JITSI_PRIVATE_MODE == "true";
+const PATH_TO_START_MAP: string = process.env.PATH_TO_START_MAP || '/Floor0/floor0.json';
 const RESOLUTION = 2;
 const ZOOM_LEVEL = 1/*3/4*/;
 const POSITION_DELAY = 200; // Wait 200ms between sending position events
@@ -23,5 +24,6 @@ export {
     TURN_USER,
     TURN_PASSWORD,
     JITSI_URL,
-    JITSI_PRIVATE_MODE
+    JITSI_PRIVATE_MODE,
+    PATH_TO_START_MAP
 }

From 69c4cb8b5f9c19852de2b6b4e389f43ad88e8c2d Mon Sep 17 00:00:00 2001
From: Mathias Wegener <wegener@sipgate.de>
Date: Tue, 15 Dec 2020 12:54:32 +0100
Subject: [PATCH 3/3] Adds missing environment variable in webpack config

---
 front/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/webpack.config.js b/front/webpack.config.js
index f03c4fbc..b6d28f1e 100644
--- a/front/webpack.config.js
+++ b/front/webpack.config.js
@@ -45,7 +45,7 @@ module.exports = {
         new webpack.ProvidePlugin({
             Phaser: 'phaser'
         }),
-        new webpack.EnvironmentPlugin(['API_URL', 'ADMIN_URL', 'DEBUG_MODE', 'TURN_SERVER', 'TURN_USER', 'TURN_PASSWORD', 'JITSI_URL', 'JITSI_PRIVATE_MODE'])
+        new webpack.EnvironmentPlugin(['API_URL', 'ADMIN_URL', 'DEBUG_MODE', 'TURN_SERVER', 'TURN_USER', 'TURN_PASSWORD', 'JITSI_URL', 'JITSI_PRIVATE_MODE','PATH_TO_START_MAP'])
     ],
 
 };