Merge branch 'develop' of github.com:thecodingmachine/workadventure

front/src/Components/App.svelte

@@ -102,7 +102,7 @@
     {/if}
     {#if $consoleGlobalMessageManagerVisibleStore}
         <div>
-            <ConsoleGlobalMessageManager game={game}></ConsoleGlobalMessageManager>
+            <ConsoleGlobalMessageManager></ConsoleGlobalMessageManager>
         </div>
     {/if}
     {#if $helpCameraSettingsVisibleStore}

front/src/Components/ConsoleGlobalMessageManager/ConsoleGlobalMessageManager.svelte

@@ -3,10 +3,8 @@
     import InputTextGlobalMessage from "./InputTextGlobalMessage.svelte";
     import UploadAudioGlobalMessage from "./UploadAudioGlobalMessage.svelte";
     import { gameManager } from "../../Phaser/Game/GameManager";
-    import type { Game } from "../../Phaser/Game/Game";
     import { consoleGlobalMessageManagerVisibleStore } from "../../Stores/ConsoleGlobalMessageManagerStore";
 
-    export let game: Game;
     let inputSendTextActive = true;
     let uploadMusicActive = false;
     let handleSendText: { sendTextMessage(broadcast: boolean): void };
@@ -57,10 +55,10 @@
         </div>
         <div class="content-console-global-message">
             {#if inputSendTextActive}
-                <InputTextGlobalMessage game={game} gameManager={gameManager} bind:handleSending={handleSendText}/>
+                <InputTextGlobalMessage gameManager={gameManager} bind:handleSending={handleSendText}/>
             {/if}
             {#if uploadMusicActive}
-                <UploadAudioGlobalMessage game={game} gameManager={gameManager} bind:handleSending={handleSendAudio}/>
+                <UploadAudioGlobalMessage gameManager={gameManager} bind:handleSending={handleSendAudio}/>
             {/if}
         </div>
         <div class="footer-console-global-message">

front/src/Components/ConsoleGlobalMessageManager/InputTextGlobalMessage.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
     import { consoleGlobalMessageManagerFocusStore, consoleGlobalMessageManagerVisibleStore } from "../../Stores/ConsoleGlobalMessageManagerStore";
     import {onDestroy, onMount} from "svelte";
-    import type { Game } from "../../Phaser/Game/Game";
     import type { GameManager } from "../../Phaser/Game/GameManager";
     import { AdminMessageEventTypes } from "../../Connexion/AdminMessagesService";
     import type { Quill } from "quill";
@@ -31,10 +30,9 @@
         // remove formatting button
     ];
 
-    export let game: Game;
     export let gameManager: GameManager;
 
-    const gameScene = gameManager.getCurrentGameScene(game.findAnyScene());
+    const gameScene = gameManager.getCurrentGameScene();
     let quill: Quill;
     let INPUT_CONSOLE_MESSAGE: HTMLDivElement;
 

front/src/Components/ConsoleGlobalMessageManager/UploadAudioGlobalMessage.svelte

@@ -1,6 +1,5 @@
 <script lang="ts">
     import { HtmlUtils } from "../../WebRtc/HtmlUtils";
-    import type { Game } from "../../Phaser/Game/Game";
     import type { GameManager } from "../../Phaser/Game/GameManager";
     import { consoleGlobalMessageManagerFocusStore, consoleGlobalMessageManagerVisibleStore } from "../../Stores/ConsoleGlobalMessageManagerStore";
     import { AdminMessageEventTypes } from "../../Connexion/AdminMessagesService";
@@ -11,10 +10,9 @@
         files: Array<File>;
     }
 
-    export let game: Game;
     export let gameManager: GameManager;
 
-    let gameScene = gameManager.getCurrentGameScene(game.findAnyScene());
+    let gameScene = gameManager.getCurrentGameScene();
     let fileInput: HTMLInputElement;
     let fileName: string;
     let fileSize: string;

front/src/Connexion/ConnectionManager.ts

@@ -29,8 +29,10 @@ class ConnectionManager {
         });
     }
 
-    public loadOpenIDScreen() {
+    /**
-        localUserStore.setAuthToken(null);
+     * @return Promise<void>
+     */
+    public loadOpenIDScreen(): Promise<void> {
         const state = localUserStore.generateState();
         const nonce = localUserStore.generateNonce();
 
@@ -45,7 +47,18 @@ class ConnectionManager {
             loginUrl = `http://` + loginUrl;
         }
 
-        window.location.assign(loginUrl);
+        localUserStore.setAuthToken(null);
+
+        //TODO refactor this and don't realise previous call
+        return Axios.get(loginUrl)
+            .then(() => {
+                window.location.assign(loginUrl);
+            })
+            .catch((err) => {
+                console.error(err, "We don't have URL to regenerate authentication user");
+                //TODO show modal login
+                window.location.reload();
+            });
     }
 
     public logout() {
@@ -104,11 +117,11 @@ class ConnectionManager {
             room = await Room.createRoom(
                 new URL(
                     window.location.protocol +
-                        "//" +
+                    "//" +
-                        window.location.host +
+                    window.location.host +
-                        roomUrl +
+                    roomUrl +
-                        window.location.search +
+                    window.location.search +
-                        window.location.hash
+                    window.location.hash
                 )
             );
             urlManager.pushRoomIdToUrl(room);
@@ -120,8 +133,8 @@ class ConnectionManager {
             this.authToken = localUserStore.getAuthToken();
             //todo: add here some kind of warning if authToken has expired.
             if (!this.authToken) {
-               await this.anonymousLogin();
+                await this.anonymousLogin();
-               // this.loadOpenIDScreen();
+                // this.loadOpenIDScreen();
             }
             this.localUser = localUserStore.getLocalUser() as LocalUser; //if authToken exist in localStorage then localUser cannot be null
 
@@ -217,9 +230,9 @@ class ConnectionManager {
                 reject(
                     new Error(
                         "An error occurred while connecting to socket server. Retrying. Code: " +
-                            event.code +
+                        event.code +
-                            ", Reason: " +
+                        ", Reason: " +
-                            event.reason
+                        event.reason
                     )
                 );
             });

front/src/Phaser/Game/GameManager.ts

@@ -19,6 +19,7 @@ export class GameManager {
     private characterLayers: string[] | null;
     private companion: string | null;
     private startRoom!: Room;
+    private scenePlugin!: Phaser.Scenes.ScenePlugin;
     currentGameSceneName: string | null = null;
 
     constructor() {
@@ -28,8 +29,9 @@ export class GameManager {
     }
 
     public async init(scenePlugin: Phaser.Scenes.ScenePlugin): Promise<string> {
+        this.scenePlugin = scenePlugin;
         this.startRoom = await connectionManager.initGameConnexion();
-        this.loadMap(this.startRoom, scenePlugin);
+        this.loadMap(this.startRoom);
 
         if(!this.playerName) {
             const res = await Axios.get("/");
@@ -74,20 +76,20 @@ export class GameManager {
         return this.companion;
     }
 
-    public loadMap(room: Room, scenePlugin: Phaser.Scenes.ScenePlugin) {
+    public loadMap(room: Room) {
         const roomID = room.key;
 
-        const gameIndex = scenePlugin.getIndex(roomID);
+        const gameIndex = this.scenePlugin.getIndex(roomID);
         if (gameIndex === -1) {
             const game: Phaser.Scene = new GameScene(room, room.mapUrl);
-            scenePlugin.add(roomID, game, false);
+            this.scenePlugin.add(roomID, game, false);
         }
     }
 
-    public goToStartingMap(scenePlugin: Phaser.Scenes.ScenePlugin): void {
+    public goToStartingMap(): void {
         console.log("starting " + (this.currentGameSceneName || this.startRoom.key));
-        scenePlugin.start(this.currentGameSceneName || this.startRoom.key);
+        this.scenePlugin.start(this.currentGameSceneName || this.startRoom.key);
-        scenePlugin.launch(MenuSceneName);
+        this.scenePlugin.launch(MenuSceneName);
 
         if (
             !localUserStore.getHelpCameraSettingsShown() &&
@@ -108,33 +110,33 @@ export class GameManager {
      * Temporary leave a gameScene to go back to the loginScene for example.
      * This will close the socket connections and stop the gameScene, but won't remove it.
      */
-    leaveGame(scene: Phaser.Scene, targetSceneName: string, sceneClass: Phaser.Scene): void {
+    leaveGame(targetSceneName: string, sceneClass: Phaser.Scene): void {
         if (this.currentGameSceneName === null) throw "No current scene id set!";
-        const gameScene: GameScene = scene.scene.get(this.currentGameSceneName) as GameScene;
+        const gameScene: GameScene = this.scenePlugin.get(this.currentGameSceneName) as GameScene;
         gameScene.cleanupClosingScene();
-        scene.scene.stop(this.currentGameSceneName);
+        this.scenePlugin.stop(this.currentGameSceneName);
-        scene.scene.sleep(MenuSceneName);
+        this.scenePlugin.sleep(MenuSceneName);
-        if (!scene.scene.get(targetSceneName)) {
+        if (!this.scenePlugin.get(targetSceneName)) {
-            scene.scene.add(targetSceneName, sceneClass, false);
+            this.scenePlugin.add(targetSceneName, sceneClass, false);
         }
-        scene.scene.run(targetSceneName);
+        this.scenePlugin.run(targetSceneName);
     }
 
     /**
      * follow up to leaveGame()
      */
-    tryResumingGame(scene: Phaser.Scene, fallbackSceneName: string) {
+    tryResumingGame(fallbackSceneName: string) {
         if (this.currentGameSceneName) {
-            scene.scene.start(this.currentGameSceneName);
+            this.scenePlugin.start(this.currentGameSceneName);
-            scene.scene.wake(MenuSceneName);
+            this.scenePlugin.wake(MenuSceneName);
         } else {
-            scene.scene.run(fallbackSceneName);
+            this.scenePlugin.run(fallbackSceneName);
         }
     }
 
-    public getCurrentGameScene(scene: Phaser.Scene): GameScene {
+    public getCurrentGameScene(): GameScene {
         if (this.currentGameSceneName === null) throw "No current scene id set!";
-        return scene.scene.get(this.currentGameSceneName) as GameScene;
+        return this.scenePlugin.get(this.currentGameSceneName) as GameScene;
     }
 }
 

front/src/Phaser/Game/GameScene.ts

@@ -927,9 +927,10 @@ export class GameScene extends DirtyScene {
         });
 
         this.gameMap.onPropertyChange("zone", (newValue, oldValue) => {
-            if (newValue === undefined || newValue === false || newValue === "") {
+            if (oldValue) {
                 iframeListener.sendLeaveEvent(oldValue as string);
-            } else {
+            }
+            if (newValue) {
                 iframeListener.sendEnterEvent(newValue as string);
             }
         });
@@ -1482,7 +1483,7 @@ export class GameScene extends DirtyScene {
     private async loadNextGame(exitRoomPath: URL): Promise<void> {
         try {
             const room = await Room.createRoom(exitRoomPath);
-            return gameManager.loadMap(room, this.scene);
+            return gameManager.loadMap(room);
         } catch (e /*: unknown*/) {
             console.warn('Error while pre-loading exit room "' + exitRoomPath.toString() + '"', e);
         }
@@ -1542,7 +1543,7 @@ export class GameScene extends DirtyScene {
             });
         } catch (err) {
             if (err instanceof TextureError) {
-                gameManager.leaveGame(this, SelectCharacterSceneName, new SelectCharacterScene());
+                gameManager.leaveGame(SelectCharacterSceneName, new SelectCharacterScene());
             }
             throw err;
         }

front/src/Phaser/Login/CustomizeScene.ts

@@ -282,7 +282,7 @@ export class CustomizeScene extends AbstractCharacterScene {
         this.scene.sleep(CustomizeSceneName);
         waScaleManager.restoreZoom();
         this.events.removeListener("wake");
-        gameManager.tryResumingGame(this, EnableCameraSceneName);
+        gameManager.tryResumingGame(EnableCameraSceneName);
         customCharacterSceneVisibleStore.set(false);
     }
 

front/src/Phaser/Login/EnableCameraScene.ts

@@ -1,50 +1,43 @@
-import {gameManager} from "../Game/GameManager";
+import { gameManager } from "../Game/GameManager";
-import {TextField} from "../Components/TextField";
+import { TextField } from "../Components/TextField";
 import Image = Phaser.GameObjects.Image;
-import {mediaManager} from "../../WebRtc/MediaManager";
+import { mediaManager } from "../../WebRtc/MediaManager";
-import {SoundMeter} from "../Components/SoundMeter";
+import { SoundMeter } from "../Components/SoundMeter";
-import {HtmlUtils} from "../../WebRtc/HtmlUtils";
+import { HtmlUtils } from "../../WebRtc/HtmlUtils";
-import {touchScreenManager} from "../../Touch/TouchScreenManager";
+import { touchScreenManager } from "../../Touch/TouchScreenManager";
-import {PinchManager} from "../UserInput/PinchManager";
+import { PinchManager } from "../UserInput/PinchManager";
 import Zone = Phaser.GameObjects.Zone;
 import { MenuScene } from "../Menu/MenuScene";
-import {ResizableScene} from "./ResizableScene";
+import { ResizableScene } from "./ResizableScene";
-import {
+import { enableCameraSceneVisibilityStore } from "../../Stores/MediaStore";
-    enableCameraSceneVisibilityStore,
-} from "../../Stores/MediaStore";
 
 export const EnableCameraSceneName = "EnableCameraScene";
 
 export class EnableCameraScene extends ResizableScene {
-
     constructor() {
         super({
-            key: EnableCameraSceneName
+            key: EnableCameraSceneName,
         });
     }
 
-    preload() {
+    preload() {}
-    }
 
     create() {
-
+        this.input.keyboard.on("keyup-ENTER", () => {
-        this.input.keyboard.on('keyup-ENTER', () => {
             this.login();
         });
 
         enableCameraSceneVisibilityStore.showEnableCameraScene();
     }
 
-    public onResize(): void {
+    public onResize(): void {}
-    }
 
-    update(time: number, delta: number): void {
+    update(time: number, delta: number): void {}
-    }
 
     public login(): void {
         enableCameraSceneVisibilityStore.hideEnableCameraScene();
 
         this.scene.sleep(EnableCameraSceneName);
-        gameManager.goToStartingMap(this.scene);
+        gameManager.goToStartingMap();
     }
 }

front/src/Phaser/Login/LoginScene.ts

@@ -1,23 +1,21 @@
-import {gameManager} from "../Game/GameManager";
+import { gameManager } from "../Game/GameManager";
-import {SelectCharacterSceneName} from "./SelectCharacterScene";
+import { SelectCharacterSceneName } from "./SelectCharacterScene";
-import {ResizableScene} from "./ResizableScene";
+import { ResizableScene } from "./ResizableScene";
-import {loginSceneVisibleStore} from "../../Stores/LoginSceneStore";
+import { loginSceneVisibleStore } from "../../Stores/LoginSceneStore";
 
 export const LoginSceneName = "LoginScene";
 
 export class LoginScene extends ResizableScene {
-
+    private name: string = "";
-    private name: string = '';
 
     constructor() {
         super({
-            key: LoginSceneName
+            key: LoginSceneName,
         });
-        this.name = gameManager.getPlayerName() || '';
+        this.name = gameManager.getPlayerName() || "";
     }
 
-    preload() {
+    preload() {}
-    }
 
     create() {
         loginSceneVisibleStore.set(true);
@@ -27,15 +25,13 @@ export class LoginScene extends ResizableScene {
         name = name.trim();
         gameManager.setPlayerName(name);
 
-        this.scene.stop(LoginSceneName)
+        this.scene.stop(LoginSceneName);
-        gameManager.tryResumingGame(this, SelectCharacterSceneName);
+        gameManager.tryResumingGame(SelectCharacterSceneName);
         this.scene.remove(LoginSceneName);
         loginSceneVisibleStore.set(false);
     }
 
-    update(time: number, delta: number): void {
+    update(time: number, delta: number): void {}
-    }
 
-    public onResize(): void {
+    public onResize(): void {}
-    }
 }

front/src/Phaser/Login/SelectCharacterScene.ts

@@ -101,7 +101,7 @@ export class SelectCharacterScene extends AbstractCharacterScene {
         this.scene.stop(SelectCharacterSceneName);
         waScaleManager.restoreZoom();
         gameManager.setCharacterLayers([this.selectedPlayer.texture.key]);
-        gameManager.tryResumingGame(this, EnableCameraSceneName);
+        gameManager.tryResumingGame(EnableCameraSceneName);
         this.players = [];
         selectCharacterSceneVisibleStore.set(false);
         this.events.removeListener("wake");

front/src/Phaser/Login/SelectCompanionScene.ts

@@ -1,18 +1,18 @@
 import Image = Phaser.GameObjects.Image;
 import Rectangle = Phaser.GameObjects.Rectangle;
 import { addLoader } from "../Components/Loader";
-import { gameManager} from "../Game/GameManager";
+import { gameManager } from "../Game/GameManager";
 import { ResizableScene } from "./ResizableScene";
 import { EnableCameraSceneName } from "./EnableCameraScene";
 import { localUserStore } from "../../Connexion/LocalUserStore";
 import type { CompanionResourceDescriptionInterface } from "../Companion/CompanionTextures";
 import { getAllCompanionResources } from "../Companion/CompanionTexturesLoadingManager";
-import {touchScreenManager} from "../../Touch/TouchScreenManager";
+import { touchScreenManager } from "../../Touch/TouchScreenManager";
-import {PinchManager} from "../UserInput/PinchManager";
+import { PinchManager } from "../UserInput/PinchManager";
 import { MenuScene } from "../Menu/MenuScene";
-import {selectCompanionSceneVisibleStore} from "../../Stores/SelectCompanionStore";
+import { selectCompanionSceneVisibleStore } from "../../Stores/SelectCompanionStore";
-import {waScaleManager} from "../Services/WaScaleManager";
+import { waScaleManager } from "../Services/WaScaleManager";
-import {isMobile} from "../../Enum/EnvironmentVariable";
+import { isMobile } from "../../Enum/EnvironmentVariable";
 
 export const SelectCompanionSceneName = "SelectCompanionScene";
 
@@ -28,12 +28,12 @@ export class SelectCompanionScene extends ResizableScene {
 
     constructor() {
         super({
-            key: SelectCompanionSceneName
+            key: SelectCompanionSceneName,
         });
     }
 
     preload() {
-        getAllCompanionResources(this.load).forEach(model => {
+        getAllCompanionResources(this.load).forEach((model) => {
             this.companionModels.push(model);
         });
 
@@ -42,7 +42,6 @@ export class SelectCompanionScene extends ResizableScene {
     }
 
     create() {
-
         selectCompanionSceneVisibleStore.set(true);
 
         waScaleManager.saveZoom();
@@ -53,14 +52,16 @@ export class SelectCompanionScene extends ResizableScene {
         }
 
         // input events
-        this.input.keyboard.on('keyup-ENTER', this.selectCompanion.bind(this));
+        this.input.keyboard.on("keyup-ENTER", this.selectCompanion.bind(this));
 
-        this.input.keyboard.on('keydown-RIGHT', this.moveToRight.bind(this));
+        this.input.keyboard.on("keydown-RIGHT", this.moveToRight.bind(this));
-        this.input.keyboard.on('keydown-LEFT', this.moveToLeft.bind(this));
+        this.input.keyboard.on("keydown-LEFT", this.moveToLeft.bind(this));
 
-        if(localUserStore.getCompanion()){
+        if (localUserStore.getCompanion()) {
-            const companionIndex = this.companionModels.findIndex((companion) => companion.name === localUserStore.getCompanion());
+            const companionIndex = this.companionModels.findIndex(
-            if(companionIndex > -1 || companionIndex < this.companions.length){
+                (companion) => companion.name === localUserStore.getCompanion()
+            );
+            if (companionIndex > -1 || companionIndex < this.companions.length) {
                 this.currentCompanion = companionIndex;
                 this.selectedCompanion = this.companions[companionIndex];
             }
@@ -89,26 +90,26 @@ export class SelectCompanionScene extends ResizableScene {
         this.closeScene();
     }
 
-    public closeScene(){
+    public closeScene() {
         // next scene
         this.scene.stop(SelectCompanionSceneName);
         waScaleManager.restoreZoom();
-        gameManager.tryResumingGame(this, EnableCameraSceneName);
+        gameManager.tryResumingGame(EnableCameraSceneName);
         this.scene.remove(SelectCompanionSceneName);
         selectCompanionSceneVisibleStore.set(false);
     }
 
     private createCurrentCompanion(): void {
         for (let i = 0; i < this.companionModels.length; i++) {
-            const companionResource = this.companionModels[i]
+            const companionResource = this.companionModels[i];
             const [middleX, middleY] = this.getCompanionPosition();
             const companion = this.physics.add.sprite(middleX, middleY, companionResource.name, 0);
             this.setUpCompanion(companion, i);
             this.anims.create({
                 key: companionResource.name,
-                frames: this.anims.generateFrameNumbers(companionResource.name, {start: 0, end: 2,}),
+                frames: this.anims.generateFrameNumbers(companionResource.name, { start: 0, end: 2 }),
                 frameRate: 10,
-                repeat: -1
+                repeat: -1,
             });
 
             companion.setInteractive().on("pointerdown", () => {
@@ -140,87 +141,84 @@ export class SelectCompanionScene extends ResizableScene {
         this.selectedCompanion = companion;
     }
 
-    private moveCompanion(){
+    private moveCompanion() {
-        for(let i = 0; i < this.companions.length; i++){
+        for (let i = 0; i < this.companions.length; i++) {
             const companion = this.companions[i];
             this.setUpCompanion(companion, i);
         }
         this.updateSelectedCompanion();
     }
 
-    public moveToRight(){
+    public moveToRight() {
-        if(this.currentCompanion === (this.companions.length - 1)){
+        if (this.currentCompanion === this.companions.length - 1) {
             return;
         }
         this.currentCompanion += 1;
         this.moveCompanion();
     }
 
-    public moveToLeft(){
+    public moveToLeft() {
-        if(this.currentCompanion === 0){
+        if (this.currentCompanion === 0) {
             return;
         }
         this.currentCompanion -= 1;
         this.moveCompanion();
     }
 
-    private defineSetupCompanion(num: number){
+    private defineSetupCompanion(num: number) {
         const deltaX = 30;
         const deltaY = 2;
         let [companionX, companionY] = this.getCompanionPosition();
         let companionVisible = true;
         let companionScale = 1.5;
         let companionOpactity = 1;
-        if( this.currentCompanion !== num ){
+        if (this.currentCompanion !== num) {
             companionVisible = false;
         }
-        if( num === (this.currentCompanion + 1) ){
+        if (num === this.currentCompanion + 1) {
             companionY -= deltaY;
             companionX += deltaX;
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        if( num === (this.currentCompanion + 2) ){
+        if (num === this.currentCompanion + 2) {
             companionY -= deltaY;
-            companionX += (deltaX * 2);
+            companionX += deltaX * 2;
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        if( num === (this.currentCompanion - 1) ){
+        if (num === this.currentCompanion - 1) {
             companionY -= deltaY;
             companionX -= deltaX;
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        if( num === (this.currentCompanion - 2) ){
+        if (num === this.currentCompanion - 2) {
             companionY -= deltaY;
-            companionX -= (deltaX * 2);
+            companionX -= deltaX * 2;
             companionScale = 0.8;
             companionOpactity = 0.6;
             companionVisible = true;
         }
-        return {companionX, companionY, companionScale, companionOpactity, companionVisible}
+        return { companionX, companionY, companionScale, companionOpactity, companionVisible };
     }
 
     /**
      * Returns pixel position by on column and row number
      */
     private getCompanionPosition(): [number, number] {
-        return [
+        return [this.game.renderer.width / 2, this.game.renderer.height / 3];
-            this.game.renderer.width / 2,
-            this.game.renderer.height / 3
-        ];
     }
 
-    private setUpCompanion(companion: Phaser.Physics.Arcade.Sprite, numero: number){
+    private setUpCompanion(companion: Phaser.Physics.Arcade.Sprite, numero: number) {
-
+        const { companionX, companionY, companionScale, companionOpactity, companionVisible } =
-        const {companionX, companionY, companionScale, companionOpactity, companionVisible} = this.defineSetupCompanion(numero);
+            this.defineSetupCompanion(numero);
         companion.setBounce(0.2);
         companion.setCollideWorldBounds(true);
-        companion.setVisible( companionVisible );
+        companion.setVisible(companionVisible);
         companion.setScale(companionScale, companionScale);
         companion.setAlpha(companionOpactity);
         companion.setX(companionX);

front/src/Phaser/Menu/MenuScene.ts

@@ -171,7 +171,7 @@ export class MenuScene extends Phaser.Scene {
         this.closeAll();
         this.sideMenuOpened = true;
         this.menuButton.getChildByID("openMenuButton").innerHTML = "X";
-        const connection = gameManager.getCurrentGameScene(this).connection;
+        const connection = gameManager.getCurrentGameScene().connection;
         if (connection && connection.isAdmin()) {
             const adminSection = this.menuElement.getChildByID("adminConsoleSection") as HTMLElement;
             adminSection.hidden = false;
@@ -322,18 +322,18 @@ export class MenuScene extends Phaser.Scene {
         switch ((event?.target as HTMLInputElement).id) {
             case "changeNameButton":
                 this.closeSideMenu();
-                gameManager.leaveGame(this, LoginSceneName, new LoginScene());
+                gameManager.leaveGame(LoginSceneName, new LoginScene());
                 break;
             case "sparkButton":
                 this.gotToCreateMapPage();
                 break;
             case "changeSkinButton":
                 this.closeSideMenu();
-                gameManager.leaveGame(this, SelectCharacterSceneName, new SelectCharacterScene());
+                gameManager.leaveGame(SelectCharacterSceneName, new SelectCharacterScene());
                 break;
             case "changeCompanionButton":
                 this.closeSideMenu();
-                gameManager.leaveGame(this, SelectCompanionSceneName, new SelectCompanionScene());
+                gameManager.leaveGame(SelectCompanionSceneName, new SelectCompanionScene());
                 break;
             case "closeButton":
                 this.closeSideMenu();

front/src/Phaser/Menu/ReportMenu.ts

@@ -62,7 +62,7 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
 
         this.opened = true;
 
-        gameManager.getCurrentGameScene(this.scene).userInputManager.disableControls();
+        gameManager.getCurrentGameScene().userInputManager.disableControls();
 
         this.scene.tweens.add({
             targets: this,
@@ -73,7 +73,7 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
     }
 
     public close(): void {
-        gameManager.getCurrentGameScene(this.scene).userInputManager.restoreControls();
+        gameManager.getCurrentGameScene().userInputManager.restoreControls();
         this.opened = false;
         const mainEl = this.getChildByID("gameReport") as HTMLElement;
         this.scene.tweens.add({
@@ -112,9 +112,7 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
             gamePError.style.display = "block";
             return;
         }
-        gameManager
+        gameManager.getCurrentGameScene().connection?.emitReportPlayerMessage(this.userUuid, gameTextArea.value);
-            .getCurrentGameScene(this.scene)
-            .connection?.emitReportPlayerMessage(this.userUuid, gameTextArea.value);
         this.close();
     }
 }

pusher/src/Controller/IoSocketController.ts

@@ -174,7 +174,7 @@ export class IoSocketController {
                         }
 
                         const tokenData =
-                            token && typeof token === "string" ? jwtTokenManager.decodeJWTToken(token) : null;
+                            token && typeof token === "string" ? jwtTokenManager.verifyJWTToken(token) : null;
                         const userIdentifier = tokenData ? tokenData.identifier : "";
 
                         let memberTags: string[] = [];

pusher/src/Controller/MapController.ts

@@ -6,7 +6,8 @@ import { ADMIN_API_URL } from "../Enum/EnvironmentVariable";
 import { GameRoomPolicyTypes } from "../Model/PusherRoom";
 import { MapDetailsData } from "../Services/AdminApi/MapDetailsData";
 import { socketManager } from "../Services/SocketManager";
-import { jwtTokenManager } from "../Services/JWTTokenManager";
+import { AuthTokenData, jwtTokenManager } from "../Services/JWTTokenManager";
+import { v4 } from "uuid";
 
 export class MapController extends BaseController {
     constructor(private App: TemplatedApp) {
@@ -71,8 +72,16 @@ export class MapController extends BaseController {
                 try {
                     let userId: string | undefined = undefined;
                     if (query.authToken != undefined) {
-                        const authTokenData = jwtTokenManager.decodeJWTToken(query.authToken as string);
+                        let authTokenData: AuthTokenData;
-                        userId = authTokenData.identifier;
+                        try {
+                            authTokenData = jwtTokenManager.verifyJWTToken(query.authToken as string);
+                            userId = authTokenData.identifier;
+                        } catch (e) {
+                            // Decode token, in this case we don't need to create new token.
+                            authTokenData = jwtTokenManager.verifyJWTToken(query.authToken as string, true);
+                            userId = authTokenData.identifier;
+                            console.info("JWT expire, but decoded", userId);
+                        }
                     }
                     const mapDetails = await adminApi.fetchMapDetails(query.playUri as string, userId);
 

pusher/src/Services/JWTTokenManager.ts

@@ -15,9 +15,9 @@ class JWTTokenManager {
         return Jwt.sign({ identifier }, SECRET_KEY, { expiresIn: "200d" });
     }
 
-    public decodeJWTToken(token: string): AuthTokenData {
+    public verifyJWTToken(token: string, ignoreExpiration: boolean = false): AuthTokenData {
         try {
-            return Jwt.verify(token, SECRET_KEY, { ignoreExpiration: false }) as AuthTokenData;
+            return Jwt.verify(token, SECRET_KEY, { ignoreExpiration }) as AuthTokenData;
         } catch (e) {
             throw { reason: tokenInvalidException, message: e.message };
         }