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

front/dist/.htaccess

@@ -23,4 +23,4 @@ RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule "^[_@]/" "/index.html" [L]
 RewriteRule "^register/" "/index.html" [L]
 RewriteRule "^login" "/index.html" [L]
-RewriteRule "^jwt/" "/index.html" [L]
+RewriteRule "^jwt" "/index.html" [L]

front/src/Connexion/ConnectionManager.ts

@@ -81,8 +81,10 @@ class ConnectionManager {
         this._currentRoom = null;
         if (connexionType === GameConnexionTypes.login) {
             this._currentRoom = await Room.createRoom(new URL(localUserStore.getLastRoomUrl()));
-            this.loadOpenIDScreen();
-            return Promise.reject(new Error("You will be redirect on login page"));
+            if (this.loadOpenIDScreen() !== null) {
+                return Promise.reject(new Error("You will be redirect on login page"));
+            }
+            urlManager.pushRoomIdToUrl(this._currentRoom);
         } else if (connexionType === GameConnexionTypes.jwt) {
             const urlParams = new URLSearchParams(window.location.search);
             const code = urlParams.get("code");
@@ -191,7 +193,7 @@ class ConnectionManager {
             return Promise.reject(new Error("Invalid URL"));
         }
         if (this.localUser) {
-            analyticsClient.identifyUser(this.localUser.uuid)
+            analyticsClient.identifyUser(this.localUser.uuid);
         }
 
         this.serviceWorker = new _ServiceWorker();