From c95419f0e7eee320ba81adf1ce86750b6e467340 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Mon, 18 Jan 2021 22:52:25 +0100
Subject: [PATCH] Prepar release 1.1.0

Automatically redirect on floor0 of TCM map
---
 front/src/Connexion/ConnectionManager.ts | 5 ++---
 front/src/Url/UrlManager.ts              | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index a113a00c..12595f9d 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 = 'tcm/workadventure/floor0';
 
 class ConnectionManager {
     private localUser!:LocalUser;
@@ -50,8 +50,7 @@ class ConnectionManager {
             }
             let roomId: string
             if (connexionType === GameConnexionTypes.empty) {
-                const defaultMapUrl = window.location.host.replace('play.', 'maps.') + URL_ROOM_STARTED;
-                roomId = urlManager.editUrlForRoom(defaultMapUrl, null, null);
+                roomId = urlManager.editUrlForRoom(URL_ROOM_STARTED, null, null);
             } else {
                 roomId = window.location.pathname + window.location.hash;
             }
diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts
index bed26240..443dcee5 100644
--- a/front/src/Url/UrlManager.ts
+++ b/front/src/Url/UrlManager.ts
@@ -40,7 +40,7 @@ class UrlManager {
         if (organizationSlug) {
             newUrl = '/@/'+organizationSlug+'/'+worldSlug+'/'+roomSlug;
         } else {
-            newUrl = '/_/global/'+roomSlug;
+            newUrl = '/@/'+roomSlug;
         }
         history.pushState({}, 'WorkAdventure', newUrl);
         return newUrl;