From 6caa0e5b62dda41c2d9ba0e969c7cc35fd498379 Mon Sep 17 00:00:00 2001
From: kharhamel <oognic@gmail.com>
Date: Tue, 5 Jan 2021 17:08:33 +0100
Subject: [PATCH] HOTFIX: the map property exitUrl now accept relative links
 that are deep enough to rewrite the base url

---
 front/src/Connexion/Room.ts         |  8 ++++++--
 front/tests/Phaser/Game/RoomTest.ts | 16 ++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts
index 5cd26045..d9bfe905 100644
--- a/front/src/Connexion/Room.ts
+++ b/front/src/Connexion/Room.ts
@@ -30,8 +30,12 @@ export class Room {
         let roomId = '';
         let hash = '';
         if (!identifier.startsWith('/_/') && !identifier.startsWith('/@/')) { //relative file link
-            const absoluteExitSceneUrl = new URL(identifier, baseUrl);
-            roomId = '_/'+currentInstance+'/'+absoluteExitSceneUrl.hostname + absoluteExitSceneUrl.pathname; //in case of a relative url, we need to create a public roomId
+            //Relative identifier can be deep enough to rewrite the base domain, so we cannot use the variable 'baseUrl' as the actual base url for the URL objects.
+            //We instead use 'workadventure' as a dummy base value.
+            const baseUrlObject = new URL(baseUrl);
+            const absoluteExitSceneUrl = new URL(identifier, 'http://workadventure/_/'+currentInstance+'/'+baseUrlObject.hostname+baseUrlObject.pathname);
+            roomId = absoluteExitSceneUrl.pathname; //in case of a relative url, we need to create a public roomId
+            roomId = roomId.substring(1); //remove the leading slash
             hash = absoluteExitSceneUrl.hash;
             hash = hash.substring(1); //remove the leading diese
         } else { //absolute room Id
diff --git a/front/tests/Phaser/Game/RoomTest.ts b/front/tests/Phaser/Game/RoomTest.ts
index 40218d53..80624d64 100644
--- a/front/tests/Phaser/Game/RoomTest.ts
+++ b/front/tests/Phaser/Game/RoomTest.ts
@@ -34,6 +34,22 @@ describe("Room getIdFromIdentifier()", () => {
         expect(roomId).toEqual('_/global/maps.workadventu.re/floor1/Floor1.json');
         expect(hash).toEqual('');
     });
+    it("should work with a relative file link that rewrite the map domain", () => {
+        const {roomId, hash} = Room.getIdFromIdentifier('../../maps.workadventure.localhost/Floor1/floor1.json', 'https://maps.workadventu.re/floor0/Floor0.json', 'global');
+        expect(roomId).toEqual('_/global/maps.workadventure.localhost/Floor1/floor1.json');
+        expect(hash).toEqual('');
+    });
+    it("should work with a relative file link that rewrite the map instance", () => {
+        const {roomId, hash} = Room.getIdFromIdentifier('../../../notglobal/maps.workadventu.re/Floor1/floor1.json', 'https://maps.workadventu.re/floor0/Floor0.json', 'global');
+        expect(roomId).toEqual('_/notglobal/maps.workadventu.re/Floor1/floor1.json');
+        expect(hash).toEqual('');
+    });
+    it("should work with a relative file link that change the map type", () => {
+        const {roomId, hash} = Room.getIdFromIdentifier('../../../../@/tcm/is/great', 'https://maps.workadventu.re/floor0/Floor0.json', 'global');
+        expect(roomId).toEqual('@/tcm/is/great');
+        expect(hash).toEqual('');
+    });
+    
     it("should work with a relative file link and a hash as parameters", () => {
         const {roomId, hash} = Room.getIdFromIdentifier('./test2.json#start', 'https://maps.workadventu.re/test.json', 'global');
         expect(roomId).toEqual('_/global/maps.workadventu.re/test2.json');