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

Remove differentiation between private and public rooms

Browse Source
This commit is contained in:
Alban Bruder 2022-04-12 13:28:41 -04:00 committed by David Négrier
parent 1781b8423c
commit 184aeb354a
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
front/src/Connexion/Room.ts
View File

@ -15,10 +15,6 @@ export interface RoomRedirect {
export class Room { export class Room {
public readonly id: string; public readonly id: string;
/**
* @deprecated
*/
private readonly isPublic: boolean;
private _authenticationMandatory: boolean = DISABLE_ANONYMOUS; private _authenticationMandatory: boolean = DISABLE_ANONYMOUS;
private _iframeAuthentication?: string = OPID_LOGIN_SCREEN_PROVIDER; private _iframeAuthentication?: string = OPID_LOGIN_SCREEN_PROVIDER;
private _mapUrl: string | undefined; private _mapUrl: string | undefined;
@ -37,13 +33,6 @@ export class Room {
if (this.id.startsWith("/")) { if (this.id.startsWith("/")) {
this.id = this.id.substr(1); this.id = this.id.substr(1);
} }
if (this.id.startsWith("_/") || this.id.startsWith("*/")) {
this.isPublic = true;
} else if (this.id.startsWith("@/")) {
this.isPublic = false;
} else {
throw new Error("Invalid room ID");
}
this._search = new URLSearchParams(roomUrl.search); this._search = new URLSearchParams(roomUrl.search);
} }
@ -84,7 +73,7 @@ export class Room {
const currentRoom = new Room(baseUrl); const currentRoom = new Room(baseUrl);
let instance: string = "global"; let instance: string = "global";
if (currentRoom.isPublic) { if (currentRoom.id.startsWith("_/") || currentRoom.id.startsWith("*/")) {
const match = /[_*]\/([^/]+)\/.+/.exec(currentRoom.id); const match = /[_*]\/([^/]+)\/.+/.exec(currentRoom.id);
if (!match) throw new Error('Could not extract instance from "' + currentRoom.id + '"'); if (!match) throw new Error('Could not extract instance from "' + currentRoom.id + '"');
instance = match[1]; instance = match[1];