Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling

# Conflicts:
#	back/src/Services/SocketManager.ts
#	deeployer.libsonnet
#	docker-compose.yaml
#	front/src/Connexion/RoomConnection.ts
#	front/src/Enum/EnvironmentVariable.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/webpack.config.js
#	pusher/src/Controller/IoSocketController.ts

front/src/Connexion/ConnectionManager.ts

@@ -12,12 +12,14 @@ const URL_ROOM_STARTED = '/Floor0/floor0.json';
 class ConnectionManager {
     private localUser!:LocalUser;
 
+    private connexionType?: GameConnexionTypes
     /**
      * Tries to login to the node server and return the starting map url to be loaded
      */
     public async initGameConnexion(): Promise<Room> {
 
         const connexionType = urlManager.getGameConnexionType();
+        this.connexionType = connexionType;
         if(connexionType === GameConnexionTypes.register) {
            const organizationMemberToken = urlManager.getOrganizationToken();
             const data = await Axios.post(`${API_URL}/register`, {organizationMemberToken}).then(res => res.data);
@@ -31,7 +33,7 @@ class ConnectionManager {
 
             const room = new Room(window.location.pathname + window.location.hash);
             return Promise.resolve(room);
-        } else if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
+        } else if (connexionType === GameConnexionTypes.organization || connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
             const localUser = localUserStore.getLocalUser();
 
             if (localUser && localUser.jwtToken && localUser.uuid && localUser.textures) {
@@ -55,18 +57,6 @@ class ConnectionManager {
             }
             const room = new Room(roomId);
             return Promise.resolve(room);
-        } else if (connexionType == GameConnexionTypes.organization) {
-            const localUser = localUserStore.getLocalUser();
-
-            if (localUser) {
-                this.localUser = localUser;
-                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?
-                return Promise.reject('Could not find a user in localstorage');
-            }
         }
 
         return Promise.reject('Invalid URL');
@@ -116,6 +106,10 @@ class ConnectionManager {
             });
         });
     }
+
+    get getConnexionType(){
+        return this.connexionType;
+    }
 }
 
 export const connectionManager = new ConnectionManager();

front/src/Connexion/Room.ts

@@ -6,10 +6,8 @@ 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);
         }
@@ -24,11 +22,28 @@ export class Room {
 
         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 static getIdFromIdentifier(identifier: string, baseUrl: string, currentInstance: string): {roomId: string, hash: string} {
+        let roomId = '';
+        let hash = '';
+        if (!identifier.startsWith('/_/') && !identifier.startsWith('/@/')) { //relative file link
+            const absoluteExitSceneUrl = new URL(identifier, baseUrl);
+            roomId = '_/'+currentInstance+'/'+absoluteExitSceneUrl.hostname + absoluteExitSceneUrl.pathname; //in case of a relative url, we need to create a public roomId
+            hash = absoluteExitSceneUrl.hash;
+            hash = hash.substring(1); //remove the leading diese
+        } else { //absolute room Id
+            const parts = identifier.split('#');
+            roomId = parts[0];
+            roomId = roomId.substring(1); //remove the leading slash
+            if (parts.length > 1) {
+                hash = parts[1]
+            }
+        }
+        return {roomId, hash}
+    }
 
     public async getMapUrl(): Promise<string> {
         return new Promise<string>((resolve, reject) => {