_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HotFix conflict merging

Browse Source
This commit is contained in:
Gregoire Parant 2021-11-15 16:36:10 +01:00
parent 20164417fb
commit d3964ae25b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
front/src/Connexion/ConnectionManager.ts
View File

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