Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
# Conflicts:
#	back/src/Services/Logger.ts
This commit is contained in:
David Négrier 2021-11-24 17:03:29 +01:00
commit 94959e2e91
37 changed files with 162 additions and 542 deletions
Download patch file Download diff file Expand all files Collapse all files

3
front/src/Connexion/Room.ts
View file

@ -107,7 +107,8 @@ export class Room {
this._mapUrl = data.mapUrl;
this._textures = data.textures;
this._group = data.group;
this._authenticationMandatory = data.authenticationMandatory || DISABLE_ANONYMOUS;
this._authenticationMandatory =
data.authenticationMandatory != null ? data.authenticationMandatory : DISABLE_ANONYMOUS;
this._iframeAuthentication = data.iframeAuthentication || OPID_LOGIN_SCREEN_PROVIDER;
this._contactPage = data.contactPage || CONTACT_URL;
return new MapDetail(data.mapUrl, data.textures);