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

.github/workflows/end_to_end_tests.yml

@@ -30,7 +30,16 @@ jobs:
         run: docker-compose up -d
 
       - name: "Wait for environment to build (and downloading testcafe image)"
-        run: (docker-compose -f docker-compose.testcafe.yml pull &) && docker-compose logs -f --tail=0 front | grep -m 1 "Compiled successfully"
+        run: (docker-compose -f docker-compose.testcafe.yml pull &) && docker-compose logs -f --tail=0 front | grep -q "Compiled successfully"
+
+      - name: "temp debug: display logs"
+        run: docker-compose logs
+
+      - name: "Wait for back start"
+        run: docker-compose logs -f back | grep -q "WorkAdventure HTTP API starting on port"
+
+      - name: "Wait for pusher start"
+        run: docker-compose logs -f pusher | grep -q "WorkAdventure starting on port"
 
       - name: "Run tests"
         run: docker-compose -f docker-compose.testcafe.yml up --exit-code-from testcafe

front/src/Connexion/ConnectionManager.ts

@@ -85,7 +85,8 @@ class ConnectionManager {
         if (token) {
             this.authToken = token;
             localUserStore.setAuthToken(token);
-            //token was saved, clear url
+
+            //clean token of url
             urlParams.delete("token");
         }
 
@@ -96,8 +97,6 @@ class ConnectionManager {
             }
             urlManager.pushRoomIdToUrl(this._currentRoom);
         } else if (connexionType === GameConnexionTypes.jwt) {
-            const urlParams = new URLSearchParams(window.location.search);
-
             if (!token) {
                 const code = urlParams.get("code");
                 const state = urlParams.get("state");
@@ -140,7 +139,7 @@ class ConnectionManager {
                         "//" +
                         window.location.host +
                         roomUrl +
-                        window.location.search +
+                        urlParams.toString() + //use urlParams because the token param must be deleted
                         window.location.hash
                 )
             );
@@ -170,7 +169,7 @@ class ConnectionManager {
                     "//" +
                     window.location.host +
                     window.location.pathname +
-                    window.location.search +
+                    urlParams.toString() + //use urlParams because the token param must be deleted
                     window.location.hash;
             }
 
@@ -219,8 +218,6 @@ class ConnectionManager {
             analyticsClient.identifyUser(this.localUser.uuid, this.localUser.email);
         }
 
-        //clean history with new URL
-        window.history.pushState({}, document.title, window.location.pathname);
         this.serviceWorker = new _ServiceWorker();
         return Promise.resolve(this._currentRoom);
     }