From 14b328c733941da18dc9450ed26ce662f9d118cf Mon Sep 17 00:00:00 2001
From: Thomas Basler <thomas@familie-basler.net>
Date: Thu, 7 Jan 2021 12:15:33 +0100
Subject: [PATCH] Removed hard coded default map

You can apply local maps using the maps vhost as previously.
But it's also possible to specify external maps by prepending http or https.
---
 .env.template                            |  1 +
 docker-compose.yaml                      |  1 +
 front/src/Connexion/ConnectionManager.ts | 10 ++++++----
 front/src/Enum/EnvironmentVariable.ts    |  2 ++
 front/webpack.config.js                  |  2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.env.template b/.env.template
index d0db42e3..ce3937d3 100644
--- a/.env.template
+++ b/.env.template
@@ -5,3 +5,4 @@ JITSI_PRIVATE_MODE=false
 JITSI_ISS=
 SECRET_JITSI_KEY=
 ADMIN_API_TOKEN=123
+START_ROOM_URL=/Floor0/floor0.json
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 23fa58a4..36d51c92 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -33,6 +33,7 @@ services:
       TURN_SERVER: "turn:coturn.workadventu.re:443,turns:coturn.workadventu.re:443"
       TURN_USER: workadventure
       TURN_PASSWORD: WorkAdventure123
+      START_ROOM_URL: "$START_ROOM_URL"
     command: yarn run start
     volumes:
       - ./front:/usr/src/app
diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 12595f9d..b7788536 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, START_ROOM_URL} from "../Enum/EnvironmentVariable";
 import {RoomConnection} from "./RoomConnection";
 import {OnConnectInterface, PositionInterface, ViewportInterface} from "./ConnexionModels";
 import {GameConnexionTypes, urlManager} from "../Url/UrlManager";
@@ -7,8 +7,6 @@ import {localUserStore} from "./LocalUserStore";
 import {LocalUser} from "./LocalUser";
 import {Room} from "./Room";
 
-const URL_ROOM_STARTED = 'tcm/workadventure/floor0';
-
 class ConnectionManager {
     private localUser!:LocalUser;
 
@@ -50,7 +48,11 @@ class ConnectionManager {
             }
             let roomId: string
             if (connexionType === GameConnexionTypes.empty) {
-                roomId = urlManager.editUrlForRoom(URL_ROOM_STARTED, null, null);
+                if (START_ROOM_URL.startsWith('http://') || START_ROOM_URL.startsWith('https://')) {
+                    roomId = '/_/global/' + START_ROOM_URL.replace('http://', '').replace('https://', '');
+                } else {
+                    roomId = urlManager.editUrlForRoom(START_ROOM_URL, null, null);
+                }
             } else {
                 roomId = window.location.pathname + window.location.hash;
             }
diff --git a/front/src/Enum/EnvironmentVariable.ts b/front/src/Enum/EnvironmentVariable.ts
index e5aa5deb..0ee1906f 100644
--- a/front/src/Enum/EnvironmentVariable.ts
+++ b/front/src/Enum/EnvironmentVariable.ts
@@ -1,4 +1,5 @@
 const DEBUG_MODE: boolean = process.env.DEBUG_MODE == "true";
+const START_ROOM_URL : string = process.env.START_ROOM_URL || 'tcm/workadventure/floor0';
 const API_URL = (process.env.API_PROTOCOL || (typeof(window) !== 'undefined' ? window.location.protocol : 'http:')) + '//' + (process.env.API_URL || "pusher.workadventure.localhost");
 const UPLOADER_URL = (process.env.API_PROTOCOL || (typeof(window) !== 'undefined' ? window.location.protocol : 'http:')) + '//' + (process.env.UPLOADER_URL || 'uploader.workadventure.localhost');
 const ADMIN_URL = (process.env.API_PROTOCOL || (typeof(window) !== 'undefined' ? window.location.protocol : 'http:')) + '//' + (process.env.ADMIN_URL || "workadventure.localhost");
@@ -14,6 +15,7 @@ const MAX_EXTRAPOLATION_TIME = 100; // Extrapolate a maximum of 250ms if no new
 
 export {
     DEBUG_MODE,
+    START_ROOM_URL,
     API_URL,
     UPLOADER_URL,
     ADMIN_URL,
diff --git a/front/webpack.config.js b/front/webpack.config.js
index 82bb34fa..3b97081c 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', 'UPLOADER_URL', 'ADMIN_URL', 'DEBUG_MODE', 'TURN_SERVER', 'TURN_USER', 'TURN_PASSWORD', 'JITSI_URL', 'JITSI_PRIVATE_MODE'])
+        new webpack.EnvironmentPlugin(['API_URL', 'UPLOADER_URL', 'ADMIN_URL', 'DEBUG_MODE', 'TURN_SERVER', 'TURN_USER', 'TURN_PASSWORD', 'JITSI_URL', 'JITSI_PRIVATE_MODE', 'START_ROOM_URL'])
     ],
 
 };