lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fixing code post rebase

Browse source
This commit is contained in:
David Négrier 2020-10-13 17:20:20 +02:00
parent ec93891c6b
commit 45a2721c5c
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
front/src/Connexion/ConnectionManager.ts
View file

@ -31,7 +31,7 @@ class ConnectionManager {
const room = new Room(window.location.pathname);
return Promise.resolve(room);
} else if (connexionType === GameConnexionTypes.anonymous) {
} else if (connexionType === GameConnexionTypes.anonymous || connexionType === GameConnexionTypes.empty) {
const localUser = localUserStore.getLocalUser();
if (localUser && localUser.jwtToken && localUser.uuid) {
@ -41,7 +41,14 @@ class ConnectionManager {
this.localUser = new LocalUser(data.userUuid, data.authToken);
localUserStore.saveUser(this.localUser);
}
const room = new Room(window.location.pathname);
let roomId: string
if (connexionType === GameConnexionTypes.empty) {
const defaultMapUrl = window.location.host.replace('play.', 'maps.') + URL_ROOM_STARTED;
roomId = urlManager.editUrlForRoom(defaultMapUrl, null, null);
} else {
roomId = window.location.pathname;
}
const room = new Room(roomId);
return Promise.resolve(room);
} else if (connexionType == GameConnexionTypes.organization) {
const localUser = localUserStore.getLocalUser();
@ -55,11 +62,8 @@ class ConnectionManager {
return Promise.reject('Could not find a user in localstorage');
}
}
//todo: cleaner way to handle the default case
const defaultMapUrl = window.location.host.replace('api.', 'maps.') + URL_ROOM_STARTED;
const defaultRoomId = urlManager.editUrlForRoom(URL_ROOM_STARTED, null, null);
return Promise.resolve(new Room(defaultRoomId, defaultMapUrl));
return Promise.reject('Invalid URL');
}
public initBenchmark(): void {

7
front/src/Url/UrlManager.ts
View file

@ -3,6 +3,7 @@ export enum GameConnexionTypes {
anonymous=1,
organization,
register,
empty,
unknown,
}
@ -17,9 +18,11 @@ class UrlManager {
} else if (url.includes('@/')) {
return GameConnexionTypes.organization;
} else if(url.includes('register/')) {
return GameConnexionTypes.register
return GameConnexionTypes.register;
} else if(url === '/') {
return GameConnexionTypes.empty;
} else {
return GameConnexionTypes.unknown
return GameConnexionTypes.unknown;
}
}