Merge branch 'develop' of github.com:thecodingmachine/workadventure into player-report

# Conflicts:
#	back/src/Controller/AuthenticateController.ts

back/src/Controller/AuthenticateController.ts

@@ -3,6 +3,7 @@ import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js";
 import {BaseController} from "./BaseController";
 import {adminApi} from "../Services/AdminApi";
 import {jwtTokenManager} from "../Services/JWTTokenManager";
+import {parse} from "query-string";
 
 export interface TokenInterface {
     userUuid: string
@@ -13,11 +14,12 @@ export class AuthenticateController extends BaseController {
     constructor(private App : TemplatedApp) {
         super();
         this.register();
+        this.verify();
         this.anonymLogin();
     }
 
     //Try to login with an admin token
-    register(){
+    private register(){
         this.App.options("/register", (res: HttpResponse, req: HttpRequest) => {
             this.addCorsHeaders(res);
 
@@ -26,8 +28,6 @@ export class AuthenticateController extends BaseController {
 
         this.App.post("/register", (res: HttpResponse, req: HttpRequest) => {
             (async () => {
-                this.addCorsHeaders(res);
-
                 res.onAborted(() => {
                     console.warn('Login request was aborted');
                 })
@@ -47,7 +47,9 @@ export class AuthenticateController extends BaseController {
                     const mapUrlStart = data.mapUrlStart;
 
                     const authToken = jwtTokenManager.createJWTToken(userUuid);
-                    res.writeStatus("200 OK").end(JSON.stringify({
+                    res.writeStatus("200 OK");
+                    this.addCorsHeaders(res);
+                    res.end(JSON.stringify({
                         authToken,
                         userUuid,
                         organizationSlug,
@@ -58,7 +60,9 @@ export class AuthenticateController extends BaseController {
 
                 } catch (e) {
                     console.error("An error happened", e)
-                    res.writeStatus(e.status || "500 Internal Server Error").end('An error happened');
+                    res.writeStatus(e.status || "500 Internal Server Error");
+                    this.addCorsHeaders(res);
+                    res.end('An error happened');
                 }
 
 
@@ -67,8 +71,44 @@ export class AuthenticateController extends BaseController {
 
     }
 
+    private verify(){
+        this.App.options("/verify", (res: HttpResponse, req: HttpRequest) => {
+            this.addCorsHeaders(res);
+
+            res.end();
+        });
+
+        this.App.get("/verify", (res: HttpResponse, req: HttpRequest) => {
+            (async () => {
+                const query = parse(req.getQuery());
+
+                res.onAborted(() => {
+                    console.warn('verify request was aborted');
+                })
+
+                try {
+                    await jwtTokenManager.getUserUuidFromToken(query.token as string);
+                } catch (e) {
+                    res.writeStatus("400 Bad Request");
+                    this.addCorsHeaders(res);
+                    res.end(JSON.stringify({
+                        "success": false,
+                        "message": "Invalid JWT token"
+                    }));
+                    return;
+                }
+                res.writeStatus("200 OK");
+                this.addCorsHeaders(res);
+                res.end(JSON.stringify({
+                    "success": true
+                }));
+            })();
+        });
+
+    }
+
     //permit to login on application. Return token to connect on Websocket IO.
-    anonymLogin(){
+    private anonymLogin(){
         this.App.options("/anonymLogin", (res: HttpResponse, req: HttpRequest) => {
             this.addCorsHeaders(res);
 
@@ -76,7 +116,6 @@ export class AuthenticateController extends BaseController {
         });
 
         this.App.post("/anonymLogin", (res: HttpResponse, req: HttpRequest) => {
-            this.addCorsHeaders(res);
 
             res.onAborted(() => {
                 console.warn('Login request was aborted');
@@ -84,7 +123,9 @@ export class AuthenticateController extends BaseController {
 
             const userUuid = v4();
             const authToken = jwtTokenManager.createJWTToken(userUuid);
-            res.writeStatus("200 OK").end(JSON.stringify({
+            res.writeStatus("200 OK");
+            this.addCorsHeaders(res);
+            res.end(JSON.stringify({
                 authToken,
                 userUuid,
             }));

back/src/Controller/FileController.ts

@@ -44,8 +44,6 @@ export class FileController extends BaseController {
 
         this.App.post("/upload-audio-message", (res: HttpResponse, req: HttpRequest) => {
             (async () => {
-                this.addCorsHeaders(res);
-
                 res.onAborted(() => {
                     console.warn('upload-audio-message request was aborted');
                 })
@@ -80,14 +78,18 @@ export class FileController extends BaseController {
                         }
                     });
 
-                    res.writeStatus("200 OK").end(JSON.stringify({
+                    res.writeStatus("200 OK");
+                    this.addCorsHeaders(res);
+                    res.end(JSON.stringify({
                         id: audioMessageId,
                         path: `/download-audio-message/${audioMessageId}`
                     }));
 
                 } catch (e) {
                     console.log("An error happened", e)
-                    res.writeStatus(e.status || "500 Internal Server Error").end('An error happened');
+                    res.writeStatus(e.status || "500 Internal Server Error");
+                    this.addCorsHeaders(res);
+                    res.end('An error happened');
                 }
             })();
         });
@@ -101,7 +103,6 @@ export class FileController extends BaseController {
         });
 
         this.App.get("/download-audio-message/:id", (res: HttpResponse, req: HttpRequest) => {
-            this.addCorsHeaders(res);
 
             res.onAborted(() => {
                 console.warn('upload-audio-message request was aborted');
@@ -111,7 +112,9 @@ export class FileController extends BaseController {
 
             const file = this.uploadedFileBuffers.get(id);
             if (file === undefined) {
-                res.writeStatus("404 Not found").end("Cannot find file");
+                res.writeStatus("404 Not found");
+                this.addCorsHeaders(res);
+                res.end("Cannot find file");
                 return;
             }
 

back/src/Controller/IoSocketController.ts

@@ -62,6 +62,26 @@ function emitInBatch(socket: ExSocketInterface, payload: SubMessage): void {
             socket.batchTimeout = null;
         }, 100);
     }
+
+    // If we send a message, we don't need to keep the connection alive
+    resetPing(socket);
+}
+
+/**
+ * Schedule a ping to keep the connection open.
+ * If a ping is already set, the timeout of the ping is reset.
+ */
+function resetPing(ws: ExSocketInterface): void {
+    if (ws.pingTimeout) {
+        clearTimeout(ws.pingTimeout);
+    }
+    ws.pingTimeout = setTimeout(() => {
+        if (ws.disconnecting) {
+            return;
+        }
+        ws.ping();
+        resetPing(ws);
+    }, 29000);
 }
 
 export class IoSocketController {
@@ -234,6 +254,8 @@ export class IoSocketController {
 
                 // Let's join the room
                 this.handleJoinRoom(client, client.position, client.viewport);
+
+                resetPing(client);
             },
             message: (ws, arrayBuffer, isBinary): void => {
                 const client = ws as ExSocketInterface;

back/src/Controller/MapController.ts

@@ -24,7 +24,6 @@ export class MapController extends BaseController{
         });
 
         this.App.get("/map", (res: HttpResponse, req: HttpRequest) => {
-            this.addCorsHeaders(res);
 
             res.onAborted(() => {
                 console.warn('/map request was aborted');
@@ -34,25 +33,35 @@ export class MapController extends BaseController{
 
             if (typeof query.organizationSlug !== 'string') {
                 console.error('Expected organizationSlug parameter');
-                res.writeStatus("400 Bad request").end("Expected organizationSlug parameter");
+                res.writeStatus("400 Bad request");
+                this.addCorsHeaders(res);
+                res.end("Expected organizationSlug parameter");
             }
             if (typeof query.worldSlug !== 'string') {
                 console.error('Expected worldSlug parameter');
-                res.writeStatus("400 Bad request").end("Expected worldSlug parameter");
+                res.writeStatus("400 Bad request");
+                this.addCorsHeaders(res);
+                res.end("Expected worldSlug parameter");
             }
             if (typeof query.roomSlug !== 'string' && query.roomSlug !== undefined) {
                 console.error('Expected only one roomSlug parameter');
-                res.writeStatus("400 Bad request").end("Expected only one roomSlug parameter");
+                res.writeStatus("400 Bad request");
+                this.addCorsHeaders(res);
+                res.end("Expected only one roomSlug parameter");
             }
 
             (async () => {
                 try {
                     const mapDetails = await adminApi.fetchMapDetails(query.organizationSlug as string, query.worldSlug as string, query.roomSlug as string|undefined);
 
-                    res.writeStatus("200 OK").end(JSON.stringify(mapDetails));
+                    res.writeStatus("200 OK");
+                    this.addCorsHeaders(res);
+                    res.end(JSON.stringify(mapDetails));
                 } catch (e) {
                     console.error(e);
-                    res.writeStatus("500 Internal Server Error").end("An error occurred");
+                    res.writeStatus("500 Internal Server Error")
+                    this.addCorsHeaders(res);
+                    res.end("An error occurred");
                 }
             })();
 

back/src/Model/Websocket/ExSocketInterface.ts

@@ -19,6 +19,7 @@ export interface ExSocketInterface extends WebSocket, Identificable {
     emitInBatch: (payload: SubMessage) => void;
     batchedMessages: BatchMessage;
     batchTimeout: NodeJS.Timeout|null;
+    pingTimeout: NodeJS.Timeout|null;
     disconnecting: boolean,
     tags: string[]
 }

back/src/Services/JWTTokenManager.ts

@@ -6,7 +6,7 @@ import {TokenInterface} from "../Controller/AuthenticateController";
 class JWTTokenManager {
     
     public createJWTToken(userUuid: string) {
-        return Jwt.sign({userUuid: userUuid}, SECRET_KEY, {expiresIn: '24h'});
+        return Jwt.sign({userUuid: userUuid}, SECRET_KEY, {expiresIn: '200d'}); //todo: add a mechanic to refresh or recreate token
     }
 
     public async getUserUuidFromToken(token: unknown): Promise<string> {

front/src/Connexion/ConnectionManager.ts

@@ -29,24 +29,29 @@ class ConnectionManager {
             const roomSlug = data.roomSlug;
             urlManager.editUrlForRoom(roomSlug, organizationSlug, worldSlug);
 
-            const room = new Room(window.location.pathname);
+            const room = new Room(window.location.pathname + window.location.hash);
             return Promise.resolve(room);
         } else if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
             const localUser = localUserStore.getLocalUser();
 
             if (localUser && localUser.jwtToken && localUser.uuid) {
-                this.localUser = localUser
+                this.localUser = localUser;
+                try {
+                    await this.verifyToken(localUser.jwtToken);
+                } catch(e) {
+                    // If the token is invalid, let's generate an anonymous one.
+                    console.error('JWT token invalid. Did it expire? Login anonymously instead.');
+                    await this.anonymousLogin();
+                }
             } else {
-                const data = await Axios.post(`${API_URL}/anonymLogin`).then(res => res.data);
+                await this.anonymousLogin();
-                this.localUser = new LocalUser(data.userUuid, data.authToken);
-                localUserStore.saveUser(this.localUser);
             }
             let roomId: string
             if (connexionType === GameConnexionTypes.empty) {
                 const defaultMapUrl = window.location.host.replace('play.', 'maps.') + URL_ROOM_STARTED;
                 roomId = urlManager.editUrlForRoom(defaultMapUrl, null, null);
             } else {
-                roomId = window.location.pathname;
+                roomId = window.location.pathname + window.location.hash;
             }
             const room = new Room(roomId);
             return Promise.resolve(room);
@@ -54,8 +59,9 @@ class ConnectionManager {
             const localUser = localUserStore.getLocalUser();
 
             if (localUser) {
-                this.localUser = localUser
+                this.localUser = localUser;
-                const room = new Room(window.location.pathname);
+                await this.verifyToken(localUser.jwtToken);
+                const room = new Room(window.location.pathname + window.location.hash);
                 return Promise.resolve(room);
             } else {
                 //todo: find some kind of fallback?
@@ -66,6 +72,16 @@ class ConnectionManager {
         return Promise.reject('Invalid URL');
     }
 
+    private async verifyToken(token: string): Promise<void> {
+        await Axios.get(`${API_URL}/verify`, {params: {token}});
+    }
+
+    private async anonymousLogin(): Promise<void> {
+        const data = await Axios.post(`${API_URL}/anonymLogin`).then(res => res.data);
+        this.localUser = new LocalUser(data.userUuid, data.authToken);
+        localUserStore.saveUser(this.localUser);
+    }
+
     public initBenchmark(): void {
         this.localUser = new LocalUser('', 'test');
     }

front/src/Connexion/LocalUserStore.ts

@@ -1,5 +1,6 @@
 import {LocalUser} from "./LocalUser";
 
+//todo: add localstorage fallback
 class LocalUserStore {
     
     saveUser(localUser: LocalUser) {
@@ -10,6 +11,14 @@ class LocalUserStore {
         const data = localStorage.getItem('localUser');
         return data ? JSON.parse(data) : null;
     }
+    
+    setName(name:string): void {
+        window.localStorage.setItem('playerName', name);
+    }
+    
+    getName(): string {
+        return window.localStorage.getItem('playerName') ?? '';
+    }
      
 }
 

front/src/Connexion/Room.ts

@@ -6,8 +6,10 @@ export class Room {
     public readonly isPublic: boolean;
     private mapUrl: string|undefined;
     private instance: string|undefined;
+    public readonly hash: string;
 
     constructor(id: string) {
+        this.hash = '';
         if (id.startsWith('/')) {
             id = id.substr(1);
         }
@@ -19,6 +21,13 @@ export class Room {
         } else {
             throw new Error('Invalid room ID');
         }
+
+        const indexOfHash = this.id.indexOf('#');
+        if (indexOfHash !== -1) {
+            const idWithHash = this.id;
+            this.id = this.id.substr(0, indexOfHash);
+            this.hash = idWithHash.substr(indexOfHash + 1);
+        }
     }
 
     public async getMapUrl(): Promise<string> {

front/src/Phaser/Components/TextField.ts

@@ -1,7 +1,10 @@
 
 export class TextField extends Phaser.GameObjects.BitmapText {
-    constructor(scene: Phaser.Scene, x: number, y: number, text: string | string[]) {
+    constructor(scene: Phaser.Scene, x: number, y: number, text: string | string[], center: boolean = true) {
         super(scene, x, y, 'main_font', text, 8);
-        this.scene.add.existing(this)
+        this.scene.add.existing(this);
+        if (center) {
+            this.setOrigin(0.5).setCenterAlign()
+        }
     }
 }

front/src/Phaser/Components/TextInput.ts

@@ -1,13 +1,15 @@
 
 export class TextInput extends Phaser.GameObjects.BitmapText {
-    private underLineLength = 10;
+    private minUnderLineLength = 4;
     private underLine: Phaser.GameObjects.Text;
 
     constructor(scene: Phaser.Scene, x: number, y: number, maxLength: number, text: string, onChange: (text: string) => void) {
         super(scene, x, y, 'main_font', text, 32);
+        this.setOrigin(0.5).setCenterAlign()
         this.scene.add.existing(this);
 
-        this.underLine = this.scene.add.text(x, y+1, '_______', { fontFamily: 'Arial', fontSize: "32px", color: '#ffffff'})
+        this.underLine = this.scene.add.text(x, y+1, this.getUnderLineBody(text.length), { fontFamily: 'Arial', fontSize: "32px", color: '#ffffff'})
+        this.underLine.setOrigin(0.5)
 
 
         this.scene.input.keyboard.on('keydown', (event: KeyboardEvent) => {
@@ -16,23 +18,27 @@ export class TextInput extends Phaser.GameObjects.BitmapText {
             } else if ((event.keyCode === 32 || (event.keyCode >= 48 && event.keyCode <= 90)) && this.text.length < maxLength) {
                 this.addLetter(event.key);
             }
+            this.underLine.text = this.getUnderLineBody(this.text.length);
             onChange(this.text);
         });
     }
+    
+    private getUnderLineBody(textLength:number): string {
+        if (textLength < this.minUnderLineLength) textLength = this.minUnderLineLength;
+        let text = '_______';
+        for (let i = this.minUnderLineLength; i < textLength; i++) {
+            text += '__'
+        }
+        return text;
+    }
 
     private deleteLetter() {
         this.text = this.text.substr(0, this.text.length - 1);
-        if (this.underLine.text.length > this.underLineLength) {
-            this.underLine.text = this.underLine.text.substr(0, this.underLine.text.length - 1);
-        }
     }
 
 
     private addLetter(letter: string) {
         this.text += letter;
-        if (this.text.length > this.underLineLength) {
-            this.underLine.text +=  '_';
-        }
     }
 
     getText(): string {

front/src/Phaser/Entity/Character.ts

@@ -88,7 +88,7 @@ export abstract class Character extends Container {
         this.add(this.teleportation);*/
 
         this.PlayerValue = name;
-        this.playerName = new BitmapText(scene, x, y - 25, 'main_font', name, 8);
+        this.playerName = new BitmapText(scene, x, y - 25, 'main_font', name, 7);
         this.playerName.setOrigin(0.5).setCenterAlign().setDepth(99999);
         scene.add.existing(this.playerName);
 
@@ -189,6 +189,7 @@ export abstract class Character extends Container {
             //this.anims.playReverse(`${this.PlayerTexture}-${PlayerAnimationNames.WalkLeft}`, true);
         }
 
+        //todo:remove this, use a container tech to move the bubble instead
         if (this.bubble) {
             this.bubble.moveBubble(this.x, this.y);
         }

front/src/Phaser/Game/GameManager.ts

@@ -64,7 +64,7 @@ export class GameManager {
     public async goToStartingMap(scenePlugin: Phaser.Scenes.ScenePlugin) {
         const url = await this.startRoom.getMapUrl();
         console.log('Starting scene '+url);
-        scenePlugin.start(url, {startLayerName: 'global'});
+        scenePlugin.start(url);
     }
 }
 

front/src/Phaser/Game/GameScene.ts

@@ -54,8 +54,7 @@ export enum Textures {
 }
 
 export interface GameSceneInitInterface {
-    initPosition: PointInterface|null,
+    initPosition: PointInterface|null
-    startLayerName: string|undefined
 }
 
 interface InitUserPositionEventInterface {
@@ -130,7 +129,6 @@ export class GameScene extends ResizableScene implements CenterListener {
     }
 
     private PositionNextScene: Array<Array<{ key: string, hash: string }>> = new Array<Array<{ key: string, hash: string }>>();
-    private startLayerName: string|undefined;
     private presentationModeSprite!: Sprite;
     private chatModeSprite!: Sprite;
     private gameMap!: GameMap;
@@ -303,8 +301,6 @@ export class GameScene extends ResizableScene implements CenterListener {
     init(initData : GameSceneInitInterface) {
         if (initData.initPosition !== undefined) {
             this.initPosition = initData.initPosition;
-        } else if (initData.startLayerName !== undefined) {
-            this.startLayerName = initData.startLayerName;
         }
     }
 
@@ -329,7 +325,10 @@ export class GameScene extends ResizableScene implements CenterListener {
                 this.addLayer(this.Map.createStaticLayer(layer.name, this.Terrains, 0, 0).setDepth(depth));
             }
             if (layer.type === 'tilelayer' && this.getExitSceneUrl(layer) !== undefined) {
-                this.loadNextGame(layer, this.mapFile.width, this.mapFile.tilewidth, this.mapFile.tileheight);
+                this.loadNextGameFromExitSceneUrl(layer, this.mapFile.width);
+            } else if (layer.type === 'tilelayer' && this.getExitUrl(layer) !== undefined) {
+                console.log('Loading exitUrl ', this.getExitUrl(layer))
+                this.loadNextGameFromExitUrl(layer, this.mapFile.width);
             }
             if (layer.type === 'objectgroup' && layer.name === 'floorLayer') {
                 depth = 10000;
@@ -345,9 +344,9 @@ export class GameScene extends ResizableScene implements CenterListener {
             this.startY = this.initPosition.y;
         } else {
             // Now, let's find the start layer
-            if (this.startLayerName) {
+            if (this.room.hash) {
                 for (const layer of this.mapFile.layers) {
-                    if (this.startLayerName === layer.name && layer.type === 'tilelayer' && this.isStartLayer(layer)) {
+                    if (this.room.hash === layer.name && layer.type === 'tilelayer' && this.isStartLayer(layer)) {
                         const startPosition = this.startUser(layer);
                         this.startX = startPosition.x;
                         this.startY = startPosition.y;
@@ -405,6 +404,13 @@ export class GameScene extends ResizableScene implements CenterListener {
         context.stroke();
         this.circleTexture.refresh();
 
+        // Let's alter browser history
+        let path = this.room.id;
+        if (this.room.hash) {
+            path += '#'+this.room.hash;
+        }
+        window.history.pushState({}, 'WorkAdventure', path);
+
         // Let's pause the scene if the connection is not established yet
         if (this.connection === undefined) {
             // Let's wait 0.5 seconds before printing the "connecting" screen to avoid blinking
@@ -637,6 +643,10 @@ export class GameScene extends ResizableScene implements CenterListener {
         }
     }
 
+    private getExitUrl(layer: ITiledMapLayer): string|undefined {
+        return this.getProperty(layer, "exitUrl") as string|undefined;
+    }
+
     private getExitSceneUrl(layer: ITiledMapLayer): string|undefined {
         return this.getProperty(layer, "exitSceneUrl") as string|undefined;
     }
@@ -661,15 +671,7 @@ export class GameScene extends ResizableScene implements CenterListener {
         return obj.value;
     }
 
-    /**
+    private loadNextGameFromExitSceneUrl(layer: ITiledMapLayer, mapWidth: number) {
-     *
-     * @param layer
-     * @param mapWidth
-     * @param tileWidth
-     * @param tileHeight
-     */
-    //todo: push that into the gameManager
-    private loadNextGame(layer: ITiledMapLayer, mapWidth: number, tileWidth: number, tileHeight: number){
         const exitSceneUrl = this.getExitSceneUrl(layer);
         if (exitSceneUrl === undefined) {
             throw new Error('Layer is not an exit scene layer.');
@@ -679,17 +681,33 @@ export class GameScene extends ResizableScene implements CenterListener {
             instance = this.instance;
         }
 
-        console.log('existSceneUrl', exitSceneUrl);
+        //console.log('existSceneUrl', exitSceneUrl);
-        console.log('existSceneInstance', instance);
+        //console.log('existSceneInstance', instance);
-
-        // TODO: eventually compute a relative URL
-
-        // TODO: handle /@/ URL CASES!
 
         const absoluteExitSceneUrl = new URL(exitSceneUrl, this.MapUrlFile).href;
         const absoluteExitSceneUrlWithoutProtocol = absoluteExitSceneUrl.toString().substr(absoluteExitSceneUrl.toString().indexOf('://')+3);
         const roomId = '_/'+instance+'/'+absoluteExitSceneUrlWithoutProtocol;
-        console.log("Foo", instance, absoluteExitSceneUrlWithoutProtocol);
+
+        this.loadNextGame(layer, mapWidth, roomId);
+    }
+
+    private loadNextGameFromExitUrl(layer: ITiledMapLayer, mapWidth: number) {
+        const exitUrl = this.getExitUrl(layer);
+        if (exitUrl === undefined) {
+            throw new Error('Layer is not an exit layer.');
+        }
+        const fullPath = new URL(exitUrl, window.location.toString()).pathname;
+
+        this.loadNextGame(layer, mapWidth, fullPath);
+    }
+
+    /**
+     *
+     * @param layer
+     * @param mapWidth
+     */
+    //todo: push that into the gameManager
+    private loadNextGame(layer: ITiledMapLayer, mapWidth: number, roomId: string){
         const room = new Room(roomId);
         gameManager.loadMap(room, this.scene);
         const exitSceneKey = roomId;
@@ -704,7 +722,7 @@ export class GameScene extends ResizableScene implements CenterListener {
             const y : number = parseInt(((key + 1) / mapWidth).toString());
             const x : number = key - (y * mapWidth);
 
-            let hash = new URL(exitSceneUrl, this.MapUrlFile).hash;
+            let hash = new URL(roomId, this.MapUrlFile).hash;
             if (hash) {
                 hash = hash.substr(1);
             }
@@ -941,9 +959,7 @@ export class GameScene extends ResizableScene implements CenterListener {
             this.simplePeer.unregister();
             this.scene.stop();
             this.scene.remove(this.scene.key);
-            this.scene.start(nextSceneKey.key, {
+            this.scene.start(nextSceneKey.key);
-                startLayerName: nextSceneKey.hash
-            });
         }
     }
 

front/src/Phaser/Login/CustomizeScene.ts

@@ -54,12 +54,8 @@ export class CustomizeScene extends ResizableScene {
 
     create() {
         this.textField = new TextField(this, this.game.renderer.width / 2, 30, 'Customize your own Avatar!');
-        this.textField.setOrigin(0.5).setCenterAlign();
-        this.textField.setVisible(true);
 
-        this.enterField = new TextField(this, this.game.renderer.width / 2, 500, 'you can start the game by pressing SPACE..');
+        this.enterField = new TextField(this, this.game.renderer.width / 2, 40, 'you can start the game by pressing SPACE..');
-        this.enterField.setOrigin(0.5).setCenterAlign();
-        this.enterField.setVisible(true);
 
         this.logo = new Image(this, this.game.renderer.width - 30, this.game.renderer.height - 20, CustomizeTextures.icon);
         this.add.existing(this.logo);

front/src/Phaser/Login/EnableCameraScene.ts

@@ -53,16 +53,12 @@ export class EnableCameraScene extends Phaser.Scene {
 
     create() {
         this.textField = new TextField(this, this.game.renderer.width / 2, 20, 'Turn on your camera and microphone');
-        this.textField.setOrigin(0.5).setCenterAlign();
 
         this.pressReturnField = new TextField(this, this.game.renderer.width / 2, this.game.renderer.height - 30, 'Press enter to start');
-        this.pressReturnField.setOrigin(0.5).setCenterAlign();
 
         this.cameraNameField = new TextField(this, this.game.renderer.width / 2, this.game.renderer.height - 60, '');
-        this.cameraNameField.setOrigin(0.5).setCenterAlign();
 
         this.microphoneNameField = new TextField(this, this.game.renderer.width / 2, this.game.renderer.height - 40, '');
-        this.microphoneNameField.setOrigin(0.5).setCenterAlign();
 
         this.arrowRight = new Image(this, 0, 0, LoginTextures.arrowRight);
         this.arrowRight.setOrigin(0.5, 0.5);

front/src/Phaser/Login/LoginScene.ts

@@ -8,6 +8,7 @@ import {PLAYER_RESOURCES, PlayerResourceDescriptionInterface} from "../Entity/Ch
 import {cypressAsserter} from "../../Cypress/CypressAsserter";
 import {SelectCharacterSceneName} from "./SelectCharacterScene";
 import {ResizableScene} from "./ResizableScene";
+import {localUserStore} from "../../Connexion/LocalUserStore";
 
 //todo: put this constants in a dedicated file
 export const LoginSceneName = "LoginScene";
@@ -28,9 +29,7 @@ export class LoginScene extends ResizableScene {
         super({
             key: LoginSceneName
         });
-        if (window.localStorage) {
+        this.name = localUserStore.getName();
-            this.name = window.localStorage.getItem('playerName') ?? '';
-        }
     }
 
     preload() {
@@ -54,22 +53,18 @@ export class LoginScene extends ResizableScene {
         cypressAsserter.initStarted();
 
         this.textField = new TextField(this, this.game.renderer.width / 2, 50, 'Enter your name:');
-        this.textField.setOrigin(0.5).setCenterAlign()
+        this.nameInput = new TextInput(this, this.game.renderer.width / 2, 70, 8, this.name,(text: string) => {
-        this.nameInput = new TextInput(this, this.game.renderer.width / 2 - 64, 70, 4, this.name,(text: string) => {
             this.name = text;
-            if (window.localStorage) {
+            localUserStore.setName(text);
-                window.localStorage.setItem('playerName', text);
-            }
         });
 
         this.pressReturnField = new TextField(this, this.game.renderer.width / 2, 130, 'Press enter to start');
-        this.pressReturnField.setOrigin(0.5).setCenterAlign()
 
         this.logo = new Image(this, this.game.renderer.width - 30, this.game.renderer.height - 20, LoginTextures.icon);
         this.add.existing(this.logo);
 
         const infoText = "Commands: \n - Arrows or Z,Q,S,D to move\n - SHIFT to run";
-        this.infoTextField = new TextField(this, 10, this.game.renderer.height - 35, infoText);
+        this.infoTextField = new TextField(this, 10, this.game.renderer.height - 35, infoText, false);
 
         this.input.keyboard.on('keyup-ENTER', () => {
             if (this.name === '') {

front/src/Phaser/Login/SelectCharacterScene.ts

@@ -57,10 +57,8 @@ export class SelectCharacterScene extends ResizableScene {
 
     create() {
         this.textField = new TextField(this, this.game.renderer.width / 2, 50, 'Select your character');
-        this.textField.setOrigin(0.5).setCenterAlign()
 
         this.pressReturnField = new TextField(this, this.game.renderer.width / 2, 256, 'Press enter to start');
-        this.pressReturnField.setOrigin(0.5).setCenterAlign()
 
         const rectangleXStart = this.game.renderer.width / 2 - (this.nbCharactersPerRow / 2) * 32 + 16;
 
@@ -123,30 +121,6 @@ export class SelectCharacterScene extends ResizableScene {
         } else {
             this.scene.start(CustomizeSceneName);
         }
-
-        // Do we have a start URL in the address bar? If so, let's redirect to this address
-        /*const instanceAndMapUrl = this.findMapUrl();
-        if (instanceAndMapUrl !== null) {
-            const [mapUrl, instance] = instanceAndMapUrl;
-            const key = gameManager.loadMap(mapUrl, this.scene, instance);
-            this.scene.start(key, {
-                startLayerName: window.location.hash ? window.location.hash.substr(1) : undefined
-            } as GameSceneInitInterface);
-            return {
-                mapUrlStart: mapUrl,
-                startInstance: instance
-            };
-        } else {
-            // If we do not have a map address in the URL, let's ask the server for a start map.
-            return gameManager.loadStartMap().then((startMap: StartMapInterface) => {
-                const key = gameManager.loadMap(window.location.protocol + "//" + startMap.mapUrlStart, this.scene, startMap.startInstance);
-                this.scene.start(key);
-                return startMap;
-            }).catch((err) => {
-                console.error(err);
-                throw err;
-            });
-        }*/
     }
 
     /**

front/src/Phaser/Reconnecting/FourOFourScene.ts

@@ -45,7 +45,6 @@ export class FourOFourScene extends Phaser.Scene {
         this.add.existing(this.logo);
 
         this.mapNotFoundField = new TextField(this, this.game.renderer.width / 2, this.game.renderer.height / 2, "404 - File not found");
-        this.mapNotFoundField.setOrigin(0.5, 0.5).setCenterAlign();
 
         let text: string = '';
         if (this.file !== undefined) {
@@ -56,7 +55,6 @@ export class FourOFourScene extends Phaser.Scene {
         }
 
         this.couldNotFindField = new TextField(this, this.game.renderer.width / 2, this.game.renderer.height / 2 + 24, text);
-        this.couldNotFindField.setOrigin(0.5, 0.5).setCenterAlign();
 
         const url = this.file ? this.file : this.url;
         if (url !== undefined) {

front/src/Phaser/Reconnecting/ReconnectingScene.ts

@@ -34,7 +34,6 @@ export class ReconnectingScene extends Phaser.Scene {
         this.add.existing(this.logo);
 
         this.reconnectingField = new TextField(this, this.game.renderer.width / 2, this.game.renderer.height / 2, "Connection lost. Reconnecting...");
-        this.reconnectingField.setOrigin(0.5, 0.5).setCenterAlign();
 
         const cat = this.physics.add.sprite(this.game.renderer.width / 2, this.game.renderer.height / 2 - 32, 'cat');
         this.anims.create({

website/dist/create-map.html

@@ -44,7 +44,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col">
+            < class="col">
                 <h2 id="tools-you-will-need" class="pixel-title">Tools you will need</h2>
                 <p>In order to build your own map for WorkAdventure, you need:</p>
                 <ul>
@@ -131,11 +131,22 @@
                 <p>In order to place an exit on your scene that leads to another scene:</p>
                 <ul>
                     <li>You must create a specific layer. When a character reaches ANY tile of that layer, it will exit the scene.</li>
-                    <li>In layer properties, you MUST add &quot;exitSceneUrl&quot; property. It represents the map URL of the next scene. For example : <code>/&lt;map folder&gt;/&lt;map&gt;.json</code>. Be careful, if you want the next map to be correctly loaded, you must check that the map files are in folder <code>back/src/Assets/Maps/&lt;your map folder&gt;</code>. The files will be accessible by url <code>&lt;HOST&gt;/map/files/&lt;your map folder&gt;/...</code>.</li>
+                    <li>In layer properties, you MUST add "exitUrl&quot; property. It represents the URL of the next scene. You can put relative or absolute URLs.</li>
-                    <li>In layer properties, you CAN add an &quot;exitInstance&quot; property. If set, you will join the map of the specified instance. Otherwise, you will stay on the same instance.</li>
                     <li>If you want to have multiple exits, you can create many layers with name &quot;exit&quot;. Each layer has a different key <code>exitSceneUrl</code> and have tiles that represent exits to another scene.</li>
                 </ul>
+                <p>
+                    <strong>Understanding map URLs in WorkAdventure:</strong><br/>
+                    There are 2 kinds of URLs in WorkAdventure:
+                    <ul>
+                        <li>Public URLs are in the form https://play.workadventu.re/_/[instance]/[server]/[path to map]</li>
+                        <li>Private URLs (used in paid accounts) are in the form https://play.workadventu.re/@/[organization]/[world]/[map]</li>
+                    </ul>
+                    Assuming your JSON map is hosted at "https://example.com/my/map.json", then you can browse your map at "https://play.workadventu.re/_/global/example.com/my/map.json".
+                    Here, "global" is a name of an "instance" of your map. You can put anything instead of "global" here. People on the same instance of the map can see each others.
+                    If 2 users use 2 different instances, they are on the same map, but in 2 parallel universes. They cannot see each other.
+                </p>
                 <p class="text-center"><img src="docs/exit_layer_map.png" alt="" style="width: 90%"></p>
+                <p>Note: in older releases of WorkAdventure, you could link to a map file directly using properties "exitSceneUrl&quot; and &quot;exitInstance&quot;. Those properties are now deprecated. Use "exitUrl" instead.</p>
                 <h3 id="defining-several-entry-points" class="pixel-title">Defining several entry points</h3>
                 <p>Often your map will have several exits, and therefore, several entry points. For instance, if there
                     is an exit by a door that leads to the garden map, when you come back from the garden you expect to
@@ -146,7 +157,7 @@
                     <li>You must create a specific layer. When a character enters the map by this entry point, it will enter the map randomly on ANY tile of that layer.</li>
                     <li>In layer properties, you MUST add a boolean &quot;startLayer&quot; property. It should be set to true.</li>
                     <li>The name of the entry point is the name of the layer</li>
-                    <li>To enter via this entry point, simply add a hash with the entry point name to the URL (&quot;#[<em>startLayerName</em>]&quot;). For instance: &quot;<a href="https://workadventu.re/_/global/mymap.com/path/map.json#my-entry-point">https://workadventu.re/_/global/mymap.com/path/map.json#my-entry-point</a>&quot;.</li>
+                    <li>To enter via this entry point, simply add a hash with the entry point name to the URL (&quot;#[<em>startLayerName</em>]&quot;). For instance: &quot;https://workadventu.re/_/global/mymap.com/path/map.json#my-entry-point&quot;.</li>
                     <li>You can of course use the &quot;#&quot; notation in an exit scene URL (so an exit scene URL will point to a given entry scene URL)</li>
                 </ul>