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

Merge pull request #473 from thecodingmachine/master

Browse Source 
hotfixes from master
This commit is contained in:
Kharhamel 2020-12-03 18:48:43 +01:00 committed by GitHub
commit 57a59cba8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class ConnectionManager {
const room = new Room(window.location.pathname + window.location.hash); const room = new Room(window.location.pathname + window.location.hash);
return Promise.resolve(room); return Promise.resolve(room);
} else if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) { } else if (connexionType === GameConnexionTypes.organization || connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
const localUser = localUserStore.getLocalUser(); const localUser = localUserStore.getLocalUser();
if (localUser && localUser.jwtToken && localUser.uuid && localUser.textures) { if (localUser && localUser.jwtToken && localUser.uuid && localUser.textures) {
@ -57,18 +57,6 @@ class ConnectionManager {
} }
const room = new Room(roomId); const room = new Room(roomId);
return Promise.resolve(room); return Promise.resolve(room);
} else if (connexionType == GameConnexionTypes.organization) {
const localUser = localUserStore.getLocalUser();
if (localUser) {
this.localUser = localUser;
await this.verifyToken(localUser.jwtToken);
const room = new Room(window.location.pathname + window.location.hash);
return Promise.resolve(room);
} else {
//todo: find some kind of fallback?
return Promise.reject('Could not find a user in localstorage');
}
} }
return Promise.reject('Invalid URL'); return Promise.reject('Invalid URL');

3
front/src/Phaser/Login/EntryScene.ts
View File

@ -31,7 +31,8 @@ export class EntryScene extends Scene {
create() { create() {
gameManager.init(this.scene).then(() => { gameManager.init(this.scene).then(() => {
this.scene.start(LoginSceneName); this.scene.start(LoginSceneName);
}).catch(() => { }).catch((err) => {
console.error(err)
this.scene.start(FourOFourSceneName, { this.scene.start(FourOFourSceneName, {
url: window.location.pathname.toString() url: window.location.pathname.toString()
}); });