Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2021-09-21 21:10:09 +02:00
8 changed files with 29 additions and 8 deletions
+7 -1
View File
@@ -1,5 +1,5 @@
import Axios from "axios";
import { PUSHER_URL } from "../Enum/EnvironmentVariable";
import { CONTACT_URL, PUSHER_URL } from "../Enum/EnvironmentVariable";
import type { CharacterTexture } from "./LocalUser";
import { localUserStore } from "./LocalUserStore";
@@ -20,6 +20,7 @@ export class Room {
private _textures: CharacterTexture[] | undefined;
// private instance: string | undefined;
private readonly _search: URLSearchParams;
private _contactPage: string | undefined;
private constructor(private roomUrl: URL) {
this.id = roomUrl.pathname;
@@ -106,6 +107,7 @@ export class Room {
this._textures = data.textures;
this._authenticationMandatory = data.authenticationMandatory || false;
this._iframeAuthentication = data.iframeAuthentication;
this._contactPage = data.contactPage || CONTACT_URL;
return new MapDetail(data.mapUrl, data.textures);
}
@@ -202,4 +204,8 @@ export class Room {
get iframeAuthentication(): string | undefined {
return this._iframeAuthentication;
}
get contactPage(): string | undefined {
return this._contactPage;
}
}