Merge f770876de5 into 17e633ae45

front/src/Connexion/ConnectionManager.ts

@@ -33,7 +33,12 @@ 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 connexion anonymous, remove local token
+            if(connexionType !== GameConnexionTypes.organization) {
+                localUserStore.removeUser();
+            }
+            if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
                 const localUser = localUserStore.getLocalUser();
 
                 if (localUser && localUser.jwtToken && localUser.uuid && localUser.textures) {
@@ -70,6 +75,7 @@ class ConnectionManager {
                     return Promise.reject('Could not find a user in localstorage');
                 }
             }
+        }
 
         return Promise.reject('Invalid URL');
     }

front/src/Connexion/LocalUserStore.ts

@@ -6,6 +6,11 @@ class LocalUserStore {
     saveUser(localUser: LocalUser) {
         localStorage.setItem('localUser', JSON.stringify(localUser));
     }
+
+    removeUser() {
+        localStorage.removeItem('localUser');
+    }
+
     getLocalUser(): LocalUser|null {
         const data = localStorage.getItem('localUser');
         return data ? JSON.parse(data) : null;