From ccf80c1dd0c386af4f80e3a4c3ebc26a0d07fb89 Mon Sep 17 00:00:00 2001 From: arp Date: Tue, 13 Oct 2020 16:42:05 +0200 Subject: [PATCH] added an edge case for the default map url --- front/src/Connexion/ConnectionManager.ts | 8 +++++++- front/src/Url/UrlManager.ts | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts index 9fb7cbdb..f41f26c0 100644 --- a/front/src/Connexion/ConnectionManager.ts +++ b/front/src/Connexion/ConnectionManager.ts @@ -7,6 +7,8 @@ import {localUserStore} from "./LocalUserStore"; import {LocalUser} from "./LocalUser"; import {Room} from "./Room"; +const URL_ROOM_STARTED = '/Floor0/floor0.json'; + class ConnectionManager { private localUser!:LocalUser; @@ -53,7 +55,11 @@ class ConnectionManager { return Promise.reject('Could not find a user in localstorage'); } } - return Promise.reject('ConnexionManager initialization failed: invalid URL'); + + //todo: cleaner way to handle the default case + const defaultMapUrl = window.location.host.replace('api.', 'maps.') + URL_ROOM_STARTED; + const defaultRoomId = urlManager.editUrlForRoom(URL_ROOM_STARTED, null, null); + return Promise.resolve(new Room(defaultRoomId, defaultMapUrl)); } public initBenchmark(): void { diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts index 0199bf75..85168e7c 100644 --- a/front/src/Url/UrlManager.ts +++ b/front/src/Url/UrlManager.ts @@ -36,6 +36,8 @@ class UrlManager { } + //todo: simply use the roomId + //todo: test this with cypress public editUrlForRoom(roomSlug: string, organizationSlug: string|null, worldSlug: string |null): string { let newUrl:string; if (organizationSlug) {