From 0623ee0bf2ebb8cb1f4b4277aad3d1373d2050f9 Mon Sep 17 00:00:00 2001
From: kharhamel <oognic@gmail.com>
Date: Mon, 21 Jun 2021 11:44:18 +0200
Subject: [PATCH 01/11] HOTFIX: loading errors after the preload stage should
 not crash the game anymore

---
 .../Entity/PlayerTexturesLoadingManager.ts    | 22 ++++++++++++++++---
 front/src/Phaser/Game/GameScene.ts            | 16 +++++++++-----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts b/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts
index 95f00a9e..eaba79aa 100644
--- a/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts
+++ b/front/src/Phaser/Entity/PlayerTexturesLoadingManager.ts
@@ -59,9 +59,11 @@ export const lazyLoadPlayerCharacterTextures = (loadPlugin: LoaderPlugin, textur
     } else {
         returnPromise = Promise.resolve(texturekeys);
     }
+
+    //If the loading fail, we render the default model instead.
     return returnPromise.then((keys) => keys.map((key) => {
         return typeof key !== 'string' ? key.name : key;
-    }))
+    })).catch(() => lazyLoadPlayerCharacterTextures(loadPlugin, ["color_22", "eyes_23"]));
 }
 
 export const getRessourceDescriptor = (textureKey: string|BodyResourceDescriptionInterface): BodyResourceDescriptionInterface => {
@@ -80,11 +82,25 @@ export const getRessourceDescriptor = (textureKey: string|BodyResourceDescriptio
 }
 
 export const createLoadingPromise = (loadPlugin: LoaderPlugin, playerResourceDescriptor: BodyResourceDescriptionInterface, frameConfig: FrameConfig) => {
-    return new Promise<BodyResourceDescriptionInterface>((res) => {
+    return new Promise<BodyResourceDescriptionInterface>((res, rej) => {
+        console.log('count', loadPlugin.listenerCount('loaderror'));
         if (loadPlugin.textureManager.exists(playerResourceDescriptor.name)) {
             return res(playerResourceDescriptor);
         }
         loadPlugin.spritesheet(playerResourceDescriptor.name, playerResourceDescriptor.img, frameConfig);
-        loadPlugin.once('filecomplete-spritesheet-' + playerResourceDescriptor.name, () => res(playerResourceDescriptor));
+        const errorCallback = (file: {src: string}) => {
+            if (file.src !== playerResourceDescriptor.img) return;
+            console.error('failed loading player ressource: ', playerResourceDescriptor)
+            rej(playerResourceDescriptor);
+            loadPlugin.off('filecomplete-spritesheet-' + playerResourceDescriptor.name, successCallback);
+            loadPlugin.off('loaderror', errorCallback);
+        }
+        const successCallback = () => {
+            loadPlugin.off('loaderror', errorCallback);
+            res(playerResourceDescriptor);
+        }
+
+        loadPlugin.once('filecomplete-spritesheet-' + playerResourceDescriptor.name, successCallback);
+        loadPlugin.on('loaderror', errorCallback);
     });
 }
diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index 72279c61..62d66c30 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -192,6 +192,7 @@ export class GameScene extends DirtyScene implements CenterListener {
     private pinchManager: PinchManager|undefined;
     private mapTransitioning: boolean = false; //used to prevent transitions happenning at the same time.
     private emoteManager!: EmoteManager;
+    private preloading: boolean = true;
 
     constructor(private room: Room, MapUrlFile: string, customKey?: string|undefined) {
         super({
@@ -259,11 +260,15 @@ export class GameScene extends DirtyScene implements CenterListener {
                 return;
             }
 
-            this.scene.start(ErrorSceneName, {
-                title: 'Network error',
-                subTitle: 'An error occurred while loading resource:',
-                message: this.originalMapUrl ?? file.src
-            });
+            //once preloading is over, we don't want loading errors to crash the game, so we need to disable this behavior after preloading.
+            console.error('Error when loading: ', file);
+            if (this.preloading) {
+                this.scene.start(ErrorSceneName, {
+                    title: 'Network error',
+                    subTitle: 'An error occurred while loading resource:',
+                    message: this.originalMapUrl ?? file.src
+                });
+            }
         });
         this.load.on('filecomplete-tilemapJSON-'+this.MapUrlFile, (key: string, type: string, data: unknown) => {
             this.onMapLoad(data);
@@ -388,6 +393,7 @@ export class GameScene extends DirtyScene implements CenterListener {
 
     //hook create scene
     create(): void {
+        this.preloading = false;
         this.trackDirtyAnims();
 
         gameManager.gameSceneIsCreated(this);

From 3e29ed4376a9e469c51291a93f8d0c1599e03b84 Mon Sep 17 00:00:00 2001
From: GRL <g.lesniewski@thecodingmachine.com>
Date: Tue, 22 Jun 2021 11:48:08 +0200
Subject: [PATCH 02/11] Correction of button customize WOKA scene issue

---
 .../CustomCharacterScene.svelte               | 12 +++----
 front/src/Phaser/Login/CustomizeScene.ts      | 32 +++++++++----------
 front/src/Stores/CustomCharacterStore.ts      |  4 ++-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/front/src/Components/CustomCharacterScene/CustomCharacterScene.svelte b/front/src/Components/CustomCharacterScene/CustomCharacterScene.svelte
index f9e3a66b..3fff6bc0 100644
--- a/front/src/Components/CustomCharacterScene/CustomCharacterScene.svelte
+++ b/front/src/Components/CustomCharacterScene/CustomCharacterScene.svelte
@@ -1,11 +1,11 @@
 <script lang="typescript">
     import { Game } from "../../Phaser/Game/Game";
     import { CustomizeSceneName } from "../../Phaser/Login/CustomizeScene";
+    import {activeRowStore} from "../../Stores/CustomCharacterStore";
 
     export let game: Game;
 
     const customCharacterScene = game.scene.getScene(CustomizeSceneName);
-    let activeRow = customCharacterScene.activeRow;
 
     function selectLeft() {
         customCharacterScene.moveCursorHorizontally(-1);
@@ -17,12 +17,10 @@
 
     function selectUp() {
         customCharacterScene.moveCursorVertically(-1);
-        activeRow = customCharacterScene.activeRow;
     }
 
     function selectDown() {
         customCharacterScene.moveCursorVertically(1);
-        activeRow = customCharacterScene.activeRow;
     }
 
     function previousScene() {
@@ -44,16 +42,16 @@
         <button class="customCharacterSceneButton customCharacterSceneButtonRight nes-btn" on:click|preventDefault={ selectRight }> &gt; </button>
     </section>
     <section class="action">
-        {#if activeRow === 0}
+        {#if $activeRowStore === 0}
             <button type="submit" class="customCharacterSceneFormBack nes-btn" on:click|preventDefault={ previousScene }>Return</button>
         {/if}
-        {#if activeRow !== 0}
+        {#if $activeRowStore !== 0}
             <button type="submit" class="customCharacterSceneFormBack nes-btn" on:click|preventDefault={ selectUp }>Back <img src="resources/objects/arrow_up_black.png" alt=""/></button>
         {/if}
-        {#if activeRow === 5}
+        {#if $activeRowStore === 5}
             <button type="submit" class="customCharacterSceneFormSubmit nes-btn is-primary" on:click|preventDefault={ finish }>Finish</button>
         {/if}
-        {#if activeRow !== 5}
+        {#if $activeRowStore !== 5}
             <button type="submit" class="customCharacterSceneFormSubmit nes-btn is-primary" on:click|preventDefault={ selectDown }>Next <img src="resources/objects/arrow_down.png" alt=""/></button>
         {/if}
     </section>
diff --git a/front/src/Phaser/Login/CustomizeScene.ts b/front/src/Phaser/Login/CustomizeScene.ts
index 9d0e7877..3096c6f6 100644
--- a/front/src/Phaser/Login/CustomizeScene.ts
+++ b/front/src/Phaser/Login/CustomizeScene.ts
@@ -9,10 +9,11 @@ import type {BodyResourceDescriptionInterface} from "../Entity/PlayerTextures";
 import {AbstractCharacterScene} from "./AbstractCharacterScene";
 import {areCharacterLayersValid} from "../../Connexion/LocalUser";
 import { SelectCharacterSceneName } from "./SelectCharacterScene";
-import {customCharacterSceneVisibleStore} from "../../Stores/CustomCharacterStore";
+import {activeRowStore, customCharacterSceneVisibleStore} from "../../Stores/CustomCharacterStore";
 import {waScaleManager} from "../Services/WaScaleManager";
 import {isMobile} from "../../Enum/EnvironmentVariable";
 import {CustomizedCharacter} from "../Entity/CustomizedCharacter";
+import {get} from "svelte/store";
 
 export const CustomizeSceneName = "CustomizeScene";
 
@@ -21,7 +22,6 @@ export class CustomizeScene extends AbstractCharacterScene {
 
     private selectedLayers: number[] = [0];
     private containersRow: CustomizedCharacter[][] = [];
-    public activeRow:number = 0;
     private layers: BodyResourceDescriptionInterface[][] = [];
 
     protected lazyloadingAttempt = true; //permit to update texture loaded after renderer
@@ -95,7 +95,7 @@ export class CustomizeScene extends AbstractCharacterScene {
 
         const customCursorPosition = localUserStore.getCustomCursorPosition();
         if (customCursorPosition) {
-            this.activeRow = customCursorPosition.activeRow;
+            activeRowStore.set(customCursorPosition.activeRow);
             this.selectedLayers = customCursorPosition.selectedLayers;
             this.moveLayers();
             this.updateSelectedLayer();
@@ -113,11 +113,11 @@ export class CustomizeScene extends AbstractCharacterScene {
     }
 
     private doMoveCursorHorizontally(index: number): void {
-        this.selectedLayers[this.activeRow] += index;
-        if (this.selectedLayers[this.activeRow] < 0) {
-            this.selectedLayers[this.activeRow] = 0
-        } else if(this.selectedLayers[this.activeRow] > this.layers[this.activeRow].length - 1) {
-            this.selectedLayers[this.activeRow] = this.layers[this.activeRow].length - 1
+        this.selectedLayers[get(activeRowStore)] += index;
+        if (this.selectedLayers[get(activeRowStore)] < 0) {
+            this.selectedLayers[get(activeRowStore)] = 0
+        } else if(this.selectedLayers[get(activeRowStore)] > this.layers[get(activeRowStore)].length - 1) {
+            this.selectedLayers[get(activeRowStore)] = this.layers[get(activeRowStore)].length - 1
         }
         this.moveLayers();
         this.updateSelectedLayer();
@@ -126,18 +126,18 @@ export class CustomizeScene extends AbstractCharacterScene {
 
     private doMoveCursorVertically(index:number): void {
 
-        this.activeRow += index;
-        if (this.activeRow < 0) {
-            this.activeRow = 0
-        } else if (this.activeRow > this.layers.length - 1) {
-            this.activeRow = this.layers.length - 1
+        activeRowStore.set(get(activeRowStore) + index);
+        if (get(activeRowStore) < 0) {
+            activeRowStore.set(0);
+        } else if (get(activeRowStore) > this.layers.length - 1) {
+            activeRowStore.set(this.layers.length - 1);
         }
         this.moveLayers();
         this.saveInLocalStorage();
     }
 
     private saveInLocalStorage() {
-        localUserStore.setCustomCursorPosition(this.activeRow, this.selectedLayers);
+        localUserStore.setCustomCursorPosition(get(activeRowStore), this.selectedLayers);
     }
 
     /**
@@ -207,9 +207,9 @@ export class CustomizeScene extends AbstractCharacterScene {
                         selectedX = 0;
                     }
                     this.containersRow[i][j].x = screenCenterX + (j - selectedX) * 40;
-                    this.containersRow[i][j].y = screenCenterY + (i - this.activeRow) * 40;
+                    this.containersRow[i][j].y = screenCenterY + (i - get(activeRowStore)) * 40;
                     const alpha1 = Math.abs(selectedX - j)*47*2/screenWidth;
-                    const alpha2 = Math.abs(this.activeRow - i)*49*2/screenHeight;
+                    const alpha2 = Math.abs(get(activeRowStore) - i)*49*2/screenHeight;
                     this.containersRow[i][j].setAlpha((1 -alpha1)*(1 - alpha2));
             }
 
diff --git a/front/src/Stores/CustomCharacterStore.ts b/front/src/Stores/CustomCharacterStore.ts
index 4bef7768..f966471e 100644
--- a/front/src/Stores/CustomCharacterStore.ts
+++ b/front/src/Stores/CustomCharacterStore.ts
@@ -1,3 +1,5 @@
 import { derived, writable, Writable } from "svelte/store";
 
-export const customCharacterSceneVisibleStore = writable(false);
\ No newline at end of file
+export const customCharacterSceneVisibleStore = writable(false);
+
+export const activeRowStore = writable(0);
\ No newline at end of file

From feab5da2ad36d1905ad2cb52b8eea6d29255fbf6 Mon Sep 17 00:00:00 2001
From: GRL <g.lesniewski@thecodingmachine.com>
Date: Mon, 28 Jun 2021 15:55:30 +0200
Subject: [PATCH 03/11] Allow a website opened by script to use iframe_api

---
 docs/maps/api-reference.md                 |   4 +-
 front/src/Api/Events/OpenCoWebSiteEvent.ts |   2 +
 front/src/Api/IframeListener.ts            |   2 +-
 front/src/Api/ScriptUtils.ts               |   4 +-
 front/src/iframe_api.ts                    |   8 +-
 maps/tests/Metadata/cowebsiteAllowApi.html |  15 ++++
 maps/tests/Metadata/cowebsiteAllowApi.js   |   1 +
 maps/tests/Metadata/cowebsiteAllowApi.json |  98 +++++++++++++++++++++
 maps/tests/Metadata/tileset_dungeon.png    | Bin 0 -> 9696 bytes
 9 files changed, 126 insertions(+), 8 deletions(-)
 create mode 100644 maps/tests/Metadata/cowebsiteAllowApi.html
 create mode 100644 maps/tests/Metadata/cowebsiteAllowApi.js
 create mode 100644 maps/tests/Metadata/cowebsiteAllowApi.json
 create mode 100644 maps/tests/Metadata/tileset_dungeon.png

diff --git a/docs/maps/api-reference.md b/docs/maps/api-reference.md
index 9891a88a..49bc9dac 100644
--- a/docs/maps/api-reference.md
+++ b/docs/maps/api-reference.md
@@ -190,11 +190,11 @@ WA.goToPage('https://www.wikipedia.org/');
 ### Opening/closing a web page in an iFrame
 
 ```
-openCoWebSite(url: string): void
+openCoWebSite(url : string, allowApi: boolean = false, allowPolicy: string = "") : void
 closeCoWebSite(): void
 ```
 
-Opens the webpage at "url" in an iFrame (on the right side of the screen) or close that iFrame.
+Opens the webpage at "url" in an iFrame (on the right side of the screen) or close that iFrame. `allowApi` allow the webpage to use the "IFrame API" and execute script. `allowPolicy` grant additional access rights to the webpage.
 
 Example:
 
diff --git a/front/src/Api/Events/OpenCoWebSiteEvent.ts b/front/src/Api/Events/OpenCoWebSiteEvent.ts
index 0fbc0ce2..d2937405 100644
--- a/front/src/Api/Events/OpenCoWebSiteEvent.ts
+++ b/front/src/Api/Events/OpenCoWebSiteEvent.ts
@@ -5,6 +5,8 @@ import * as tg from "generic-type-guard";
 export const isOpenCoWebsite =
     new tg.IsInterface().withProperties({
         url: tg.isString,
+        allowApi: tg.isBoolean,
+        allowPolicy: tg.isString,
     }).get();
 
 /**
diff --git a/front/src/Api/IframeListener.ts b/front/src/Api/IframeListener.ts
index 6c3afa31..47f04aad 100644
--- a/front/src/Api/IframeListener.ts
+++ b/front/src/Api/IframeListener.ts
@@ -114,7 +114,7 @@ class IframeListener {
                     this._loadSoundStream.next(payload.data);
                 }
                 else if (payload.type === 'openCoWebSite' && isOpenCoWebsite(payload.data)) {
-                    scriptUtils.openCoWebsite(payload.data.url, foundSrc);
+                    scriptUtils.openCoWebsite(payload.data.url, foundSrc, payload.data.allowApi, payload.data.allowPolicy);
                 }
 
                 else if (payload.type === 'closeCoWebSite') {
diff --git a/front/src/Api/ScriptUtils.ts b/front/src/Api/ScriptUtils.ts
index e1c94507..08775e4a 100644
--- a/front/src/Api/ScriptUtils.ts
+++ b/front/src/Api/ScriptUtils.ts
@@ -11,8 +11,8 @@ class ScriptUtils {
 
     }
 
-    public openCoWebsite(url: string, base: string) {
-           coWebsiteManager.loadCoWebsite(url, base);
+    public openCoWebsite(url: string, base: string, allowApi: boolean, allowPolicy: string) {
+           coWebsiteManager.loadCoWebsite(url, base, allowApi, allowPolicy);
     }
 
     public closeCoWebSite(){
diff --git a/front/src/iframe_api.ts b/front/src/iframe_api.ts
index 17b979df..0264d0a6 100644
--- a/front/src/iframe_api.ts
+++ b/front/src/iframe_api.ts
@@ -22,7 +22,7 @@ interface WorkAdventureApi {
     openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[]): Popup;
     openTab(url : string): void;
     goToPage(url : string): void;
-    openCoWebSite(url : string): void;
+    openCoWebSite(url : string, allowApi: boolean, allowPolicy: string): void;
     closeCoWebSite(): void;
     disablePlayerControls(): void;
     restorePlayerControls(): void;
@@ -166,11 +166,13 @@ window.WA = {
         }, '*');
     },
 
-    openCoWebSite(url : string) : void{
+    openCoWebSite(url : string, allowApi: boolean = false, allowPolicy: string = "") : void{
         window.parent.postMessage({
             "type" : 'openCoWebSite',
             "data" : {
-                url
+                url,
+                allowApi,
+                allowPolicy,
             } as OpenCoWebSiteEvent
         }, '*');
     },
diff --git a/maps/tests/Metadata/cowebsiteAllowApi.html b/maps/tests/Metadata/cowebsiteAllowApi.html
new file mode 100644
index 00000000..0076b9e4
--- /dev/null
+++ b/maps/tests/Metadata/cowebsiteAllowApi.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <script src="http://play.workadventure.localhost/iframe_api.js"></script>
+        <script>
+
+        </script>
+    </head>
+    <body>
+    <p>Website opened by script.</p>
+        <script>
+            WA.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
+        </script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/maps/tests/Metadata/cowebsiteAllowApi.js b/maps/tests/Metadata/cowebsiteAllowApi.js
new file mode 100644
index 00000000..71ba96fa
--- /dev/null
+++ b/maps/tests/Metadata/cowebsiteAllowApi.js
@@ -0,0 +1 @@
+WA.openCoWebSite("cowebsiteAllowApi.html", true, "");
\ No newline at end of file
diff --git a/maps/tests/Metadata/cowebsiteAllowApi.json b/maps/tests/Metadata/cowebsiteAllowApi.json
new file mode 100644
index 00000000..55ed615f
--- /dev/null
+++ b/maps/tests/Metadata/cowebsiteAllowApi.json
@@ -0,0 +1,98 @@
+{ "compressionlevel":-1,
+ "height":10,
+ "infinite":false,
+ "layers":[
+        {
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":10,
+         "id":2,
+         "name":"start",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":10,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51],
+         "height":10,
+         "id":1,
+         "name":"bottom",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":10,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "draworder":"topdown",
+         "id":3,
+         "name":"floorLayer",
+         "objects":[
+                {
+                 "height":116.5,
+                 "id":1,
+                 "name":"",
+                 "rotation":0,
+                 "text":
+                    {
+                     "text":"Test : \nThe iframe is opened by script.\n\nResult : \nA message is send to the chat.",
+                     "wrap":true
+                    },
+                 "type":"",
+                 "visible":true,
+                 "width":295.875,
+                 "x":11.8125,
+                 "y":188.5
+                }],
+         "opacity":1,
+         "type":"objectgroup",
+         "visible":true,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 16, 0, 0, 0, 16, 16, 16, 0, 0, 16, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 16, 16, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 16, 16, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+         "height":10,
+         "id":4,
+         "name":"mushroom",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":10,
+         "x":0,
+         "y":0
+        }],
+ "nextlayerid":5,
+ "nextobjectid":2,
+ "orientation":"orthogonal",
+ "properties":[
+        {
+         "name":"script",
+         "type":"string",
+         "value":"cowebsiteAllowApi.js"
+        }],
+ "renderorder":"right-down",
+ "tiledversion":"1.4.3",
+ "tileheight":32,
+ "tilesets":[
+        {
+         "columns":8,
+         "firstgid":1,
+         "image":"tileset_dungeon.png",
+         "imageheight":256,
+         "imagewidth":256,
+         "margin":0,
+         "name":"tileset_dungeon",
+         "spacing":0,
+         "tilecount":64,
+         "tileheight":32,
+         "tilewidth":32
+        }],
+ "tilewidth":32,
+ "type":"map",
+ "version":1.4,
+ "width":10
+}
\ No newline at end of file
diff --git a/maps/tests/Metadata/tileset_dungeon.png b/maps/tests/Metadata/tileset_dungeon.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcac082c33704b31451bc8a58af5982c06586aa6
GIT binary patch
literal 9696
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

literal 0
HcmV?d00001


From 9ab73c0aa0eb3778b70c3de738894790ca6b84ea Mon Sep 17 00:00:00 2001
From: GRL78 <80678534+GRL78@users.noreply.github.com>
Date: Mon, 28 Jun 2021 16:05:29 +0200
Subject: [PATCH 04/11] Update docs/maps/api-reference.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
---
 docs/maps/api-reference.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/maps/api-reference.md b/docs/maps/api-reference.md
index 49bc9dac..e5fc2c48 100644
--- a/docs/maps/api-reference.md
+++ b/docs/maps/api-reference.md
@@ -194,7 +194,7 @@ openCoWebSite(url : string, allowApi: boolean = false, allowPolicy: string = "")
 closeCoWebSite(): void
 ```
 
-Opens the webpage at "url" in an iFrame (on the right side of the screen) or close that iFrame. `allowApi` allow the webpage to use the "IFrame API" and execute script. `allowPolicy` grant additional access rights to the webpage.
+Opens the webpage at "url" in an iFrame (on the right side of the screen) or close that iFrame. `allowApi` allows the webpage to use the "IFrame API" and execute script (it is equivalent to putting the `openWebsiteAllowApi` property in the map). `allowPolicy` grants additional access rights to the iFrame. The `allowPolicy` parameter is turned into an [`allow` feature policy in the iFrame](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-allow).
 
 Example:
 

From 06920a227121597e9bef3bc033827e01ce0b0b16 Mon Sep 17 00:00:00 2001
From: GRL <g.lesniewski@thecodingmachine.com>
Date: Mon, 28 Jun 2021 16:13:38 +0200
Subject: [PATCH 05/11] Use dynamic Iframe API

---
 maps/tests/Metadata/cowebsiteAllowApi.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/maps/tests/Metadata/cowebsiteAllowApi.html b/maps/tests/Metadata/cowebsiteAllowApi.html
index 0076b9e4..ded7193e 100644
--- a/maps/tests/Metadata/cowebsiteAllowApi.html
+++ b/maps/tests/Metadata/cowebsiteAllowApi.html
@@ -1,9 +1,12 @@
 <!doctype html>
 <html lang="en">
     <head>
-        <script src="http://play.workadventure.localhost/iframe_api.js"></script>
         <script>
-
+            var script = document.createElement('script');
+            // Don't do this at home kids! The "document.referrer" part is actually inserting a XSS security.
+            // We are OK in this precise case because the HTML page is hosted on the "maps" domain that contains only static files.
+            script.setAttribute('src', document.referrer + 'iframe_api.js');
+            document.head.appendChild(script);
         </script>
     </head>
     <body>

From 65d1e4e76893926b760011fab135e86a07e9347b Mon Sep 17 00:00:00 2001
From: GRL <g.lesniewski@thecodingmachine.com>
Date: Tue, 29 Jun 2021 09:40:15 +0200
Subject: [PATCH 06/11] Add CHANGELOG and a map for test

---
 CHANGELOG.md                               | 8 +++++++-
 maps/tests/Metadata/cowebsiteAllowApi.html | 4 +++-
 maps/tests/index.html                      | 8 ++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dd2c973..e4b9cf6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,10 @@
-## Version 1.3.9 - in dev
+## Version 1.4.2 
+
+## Updates 
+
+- A script in an iframe opened by another script can use the IFrame API.
+
+## Version 1.4.0
 
 ### BREAKING CHANGES
 
diff --git a/maps/tests/Metadata/cowebsiteAllowApi.html b/maps/tests/Metadata/cowebsiteAllowApi.html
index ded7193e..b9affd75 100644
--- a/maps/tests/Metadata/cowebsiteAllowApi.html
+++ b/maps/tests/Metadata/cowebsiteAllowApi.html
@@ -12,7 +12,9 @@
     <body>
     <p>Website opened by script.</p>
         <script>
-            WA.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
+            window.addEventListener('load', () => {
+                WA.sendChatMessage('The iframe opened by a script works !', 'Mr Robot');
+            })
         </script>
     </body>
 </html>
\ No newline at end of file
diff --git a/maps/tests/index.html b/maps/tests/index.html
index 9c95c281..b7e88925 100644
--- a/maps/tests/index.html
+++ b/maps/tests/index.html
@@ -90,6 +90,14 @@
                     <a href="#" class="testLink" data-testmap="help_camera_setting.json" target="_blank">Test the HelpCameraSettingScene</a>
                 </td>
             </tr>
+            <tr>
+                <td>
+                    <input type="radio" name="test-cowebsite-allowAPI"> Success <input type="radio" name="test-cowebsite-allowAPI"> Failure <input type="radio" name="test-cowebsite-allowAPI" checked> Pending
+                </td>
+                <td>
+                    <a href="#" class="testLink" data-testmap="Metadata/cowebsiteAllowApi.json" target="_blank">Test a iframe opened by a script can use Iframe API</a>
+                </td>
+            </tr>
         </table>
 
         <script>

From 1cd18db56054f8d53be24896a6eedb17c4f27f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Tue, 29 Jun 2021 16:59:54 +0200
Subject: [PATCH 07/11] Fixing broken NPM typings package build

---
 .github/workflows/push-to-npm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-to-npm.yml b/.github/workflows/push-to-npm.yml
index 798e2530..43542c28 100644
--- a/.github/workflows/push-to-npm.yml
+++ b/.github/workflows/push-to-npm.yml
@@ -49,7 +49,7 @@ jobs:
       - name: "Build"
         run: yarn run build
         env:
-          API_URL: "localhost:8080"
+          PUSHER_URL: "//localhost:8080"
         working-directory: "front"
 
       # We build the front to generate the typings of iframe_api, then we copy those typings in a separate package.

From 285712bfc76a26adfb9348fdffa17d66d03d9ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Tue, 29 Jun 2021 17:31:01 +0200
Subject: [PATCH 08/11] Fixing building of typings

---
 .github/workflows/push-to-npm.yml |  4 ----
 front/package.json                |  1 +
 front/webpack.config.ts           | 17 ++++++++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/push-to-npm.yml b/.github/workflows/push-to-npm.yml
index 43542c28..011ae440 100644
--- a/.github/workflows/push-to-npm.yml
+++ b/.github/workflows/push-to-npm.yml
@@ -13,10 +13,6 @@ jobs:
           node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Edit tsconfig.json to add declarations
-        run: "sed -i 's/\"declaration\": false/\"declaration\": true/g' tsconfig.json"
-        working-directory: "front"
-
       - name: Replace version number
         run: 'sed -i "s#VERSION_PLACEHOLDER#${GITHUB_REF/refs\/tags\//}#g" package.json'
         working-directory: "front/packages/iframe-api-typings"
diff --git a/front/package.json b/front/package.json
index 1c938195..077b992f 100644
--- a/front/package.json
+++ b/front/package.json
@@ -52,6 +52,7 @@
   "scripts": {
     "start": "TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" webpack serve --open",
     "build": "TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production webpack",
+    "build-typings": "TS_NODE_PROJECT=\"tsconfig-for-webpack.json\" NODE_ENV=production NODE_ENV=production BUILD_TYPINGS=1 webpack",
     "test": "TS_NODE_PROJECT=\"tsconfig-for-jasmine.json\" ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
     "lint": "node_modules/.bin/eslint src/ . --ext .ts",
     "fix": "node_modules/.bin/eslint --fix src/ . --ext .ts"
diff --git a/front/webpack.config.ts b/front/webpack.config.ts
index 3a69b74a..04ad8445 100644
--- a/front/webpack.config.ts
+++ b/front/webpack.config.ts
@@ -10,14 +10,18 @@ import NodePolyfillPlugin from 'node-polyfill-webpack-plugin';
 import {DISPLAY_TERMS_OF_USE} from "./src/Enum/EnvironmentVariable";
 
 const mode = process.env.NODE_ENV ?? 'development';
+const buildNpmTypingsForApi = !!process.env.BUILD_TYPINGS;
 const isProduction = mode === 'production';
 const isDevelopment = !isProduction;
 
+let entries: { [key: string]: string; } = {};
+if (!buildNpmTypingsForApi) {
+    entries.main = './src/index.ts';
+}
+entries.iframe_api = './src/iframe_api.ts';
+
 module.exports = {
-    entry: {
-        'main': './src/index.ts',
-        'iframe_api': './src/iframe_api.ts'
-    },
+    entry: entries,
     mode: mode,
     devtool: isDevelopment ? 'inline-source-map' : 'source-map',
     devServer: {
@@ -40,7 +44,10 @@ module.exports = {
                 exclude: /node_modules/,
                 loader: 'ts-loader',
                 options: {
-                    transpileOnly: true,
+                    transpileOnly: !buildNpmTypingsForApi,
+                    compilerOptions: {
+                        declaration: buildNpmTypingsForApi
+                    }
                 },
             },
             {

From ef0d422a4960458282b8bf30d509891d1e480f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Tue, 29 Jun 2021 17:55:19 +0200
Subject: [PATCH 09/11] Fixing building of typings

---
 .github/workflows/push-to-npm.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/push-to-npm.yml b/.github/workflows/push-to-npm.yml
index 011ae440..3b90e846 100644
--- a/.github/workflows/push-to-npm.yml
+++ b/.github/workflows/push-to-npm.yml
@@ -43,7 +43,7 @@ jobs:
         working-directory: "front"
 
       - name: "Build"
-        run: yarn run build
+        run: yarn run build-typings
         env:
           PUSHER_URL: "//localhost:8080"
         working-directory: "front"

From c5949a0337d5ac2177db36dfb331c788f32f9ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Tue, 29 Jun 2021 17:57:19 +0200
Subject: [PATCH 10/11] Fixing linting

---
 front/webpack.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/webpack.config.ts b/front/webpack.config.ts
index 04ad8445..44f66564 100644
--- a/front/webpack.config.ts
+++ b/front/webpack.config.ts
@@ -14,7 +14,7 @@ const buildNpmTypingsForApi = !!process.env.BUILD_TYPINGS;
 const isProduction = mode === 'production';
 const isDevelopment = !isProduction;
 
-let entries: { [key: string]: string; } = {};
+const entries: { [key: string]: string; } = {};
 if (!buildNpmTypingsForApi) {
     entries.main = './src/index.ts';
 }

From 50fcc1caaab973e7306c3fd4623b9f11be5d0a82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Wed, 30 Jun 2021 10:40:53 +0200
Subject: [PATCH 11/11] Fixing signature of openCoWebSite

---
 front/src/iframe_api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/iframe_api.ts b/front/src/iframe_api.ts
index 0264d0a6..9fa204b9 100644
--- a/front/src/iframe_api.ts
+++ b/front/src/iframe_api.ts
@@ -22,7 +22,7 @@ interface WorkAdventureApi {
     openPopup(targetObject: string, message: string, buttons: ButtonDescriptor[]): Popup;
     openTab(url : string): void;
     goToPage(url : string): void;
-    openCoWebSite(url : string, allowApi: boolean, allowPolicy: string): void;
+    openCoWebSite(url : string, allowApi?: boolean, allowPolicy?: string): void;
     closeCoWebSite(): void;
     disablePlayerControls(): void;
     restorePlayerControls(): void;