From b02c09fc7bf794b31fb0b5288a9ec0b5a5647a76 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Wed, 24 Nov 2021 15:49:45 +0100
Subject: [PATCH] Clean token auth of url params

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Connexion/ConnectionManager.ts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index ffd91d39..a8b172e6 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -84,7 +84,8 @@ class ConnectionManager {
         if (token) {
             this.authToken = token;
             localUserStore.setAuthToken(token);
-            //token was saved, clear url
+
+            //clean token of url
             urlParams.delete("token");
         }
 
@@ -95,8 +96,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");
@@ -139,7 +138,7 @@ class ConnectionManager {
                         "//" +
                         window.location.host +
                         roomUrl +
-                        window.location.search +
+                        urlParams.toString() + //use urlParams because the token param must be deleted
                         window.location.hash
                 )
             );
@@ -169,7 +168,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;
             }
 
@@ -218,8 +217,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);
     }