From d3964ae25b86ee03af1a212a8412eda89365b86a Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Mon, 15 Nov 2021 16:36:10 +0100
Subject: [PATCH] HotFix conflict merging

---
 front/src/Connexion/ConnectionManager.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 87f23843..00e721ae 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -111,7 +111,7 @@ class ConnectionManager {
 
             this._currentRoom = await Room.createRoom(new URL(localUserStore.getLastRoomUrl()));
             try {
-                await this.checkAuthUserConnexion(this._currentRoom.key);
+                await this.checkAuthUserConnexion();
                 analyticsClient.loggedWithSso();
             } catch (err) {
                 console.error(err);
@@ -296,7 +296,7 @@ class ConnectionManager {
         return this.connexionType;
     }
 
-    async checkAuthUserConnexion(playUri: string) {
+    async checkAuthUserConnexion() {
         //set connected store for menu at false
         userIsConnected.set(false);
 
@@ -313,9 +313,9 @@ class ConnectionManager {
                 throw "No Auth code provided";
             }
         }
-        const { authToken, userUuid, textures, email } = await Axios.get(`${PUSHER_URL}/login-callback`, { params: { code, nonce, token } }).then(
-            (res) => res.data
-        );
+        const { authToken, userUuid, textures, email } = await Axios.get(`${PUSHER_URL}/login-callback`, {
+            params: { code, nonce, token },
+        }).then((res) => res.data);
         localUserStore.setAuthToken(authToken);
         this.localUser = new LocalUser(userUuid, textures, email);
         localUserStore.saveUser(this.localUser);