From 9670f92a0804e761b030a99246d691b695ccda2d Mon Sep 17 00:00:00 2001
From: znerol <lo+github@znerol.ch>
Date: Sat, 30 Jan 2021 17:51:07 +0100
Subject: [PATCH] Allow URLs relative to map base in iframe / openWebsite

---
 front/src/Phaser/Game/GameScene.ts   | 2 +-
 front/src/WebRtc/CoWebsiteManager.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index a5f29364..b4a74e89 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -653,7 +653,7 @@ export class GameScene extends ResizableScene implements CenterListener {
                 coWebsiteManager.closeCoWebsite();
             }else{
                 const openWebsiteFunction = () => {
-                    coWebsiteManager.loadCoWebsite(newValue as string, allProps.get('openWebsitePolicy') as string | undefined);
+                    coWebsiteManager.loadCoWebsite(newValue as string, this.MapUrlFile, allProps.get('openWebsitePolicy') as string | undefined);
                     layoutManager.removeActionButton('openWebsite', this.userInputManager);
                 };
 
diff --git a/front/src/WebRtc/CoWebsiteManager.ts b/front/src/WebRtc/CoWebsiteManager.ts
index ef73ac1d..4e74c4a7 100644
--- a/front/src/WebRtc/CoWebsiteManager.ts
+++ b/front/src/WebRtc/CoWebsiteManager.ts
@@ -42,7 +42,7 @@ class CoWebsiteManager {
         this.opened = iframeStates.opened;
     }
 
-    public loadCoWebsite(url: string, allowPolicy?: string): void {
+    public loadCoWebsite(url: string, base: string, allowPolicy?: string): void {
         this.load();
         this.cowebsiteDiv.innerHTML = `<button class="close-btn" id="cowebsite-close">
                     <img src="resources/logos/close.svg">
@@ -55,7 +55,7 @@ class CoWebsiteManager {
 
         const iframe = document.createElement('iframe');
         iframe.id = 'cowebsite-iframe';
-        iframe.src = url;
+        iframe.src = (new URL(url, base)).toString();
         if (allowPolicy) {
             iframe.allow = allowPolicy; 
         }