From a5d4d163e18d2d9f36082e938df7674b4afeb2e5 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Fri, 10 Dec 2021 01:51:40 +0100
Subject: [PATCH 1/9] Add test mode

`*` char permit to defined test mode with warning message

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 .../WarningContainer/WarningContainer.svelte           |  9 ++++++++-
 front/src/Connexion/ConnectionManager.ts               | 10 +++++++++-
 front/src/Connexion/Room.ts                            |  4 ++--
 front/src/Stores/GameStore.ts                          |  2 ++
 front/src/Url/UrlManager.ts                            |  3 +++
 5 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index dd61d8fc..2f832fbd 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -1,9 +1,10 @@
 <script lang="typescript">
     import { fly } from "svelte/transition";
-    import { userIsAdminStore } from "../../Stores/GameStore";
+    import { userIsAdminStore, limitMap } from "../../Stores/GameStore";
     import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
 
     const upgradeLink = ADMIN_URL + "/pricing";
+    const registerLink = ADMIN_URL + "/second-step-register";
 </script>
 
 <main class="warningMain" transition:fly={{ y: -200, duration: 500 }}>
@@ -14,6 +15,12 @@
                 >here</a
             >
         </p>
+    {:else if $limitMap}
+        <p>
+            Your are une test mode. This map will be opened during 2 days. You can register your domain <a
+                href={registerLink}>here</a
+            >!
+        </p>
     {:else}
         <p>This world is close to its limit!</p>
     {/if}
diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 05d84367..aae3f386 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -8,9 +8,10 @@ import { CharacterTexture, LocalUser } from "./LocalUser";
 import { Room } from "./Room";
 import { _ServiceWorker } from "../Network/ServiceWorker";
 import { loginSceneVisibleIframeStore } from "../Stores/LoginSceneStore";
-import { userIsConnected } from "../Stores/MenuStore";
+import { userIsConnected, warningContainerStore } from "../Stores/MenuStore";
 import { analyticsClient } from "../Administration/AnalyticsClient";
 import { axiosWithRetry } from "./AxiosUtils";
+import { limitMap } from "../Stores/GameStore";
 
 class ConnectionManager {
     private localUser!: LocalUser;
@@ -148,6 +149,7 @@ class ConnectionManager {
         } else if (
             connexionType === GameConnexionTypes.organization ||
             connexionType === GameConnexionTypes.anonymous ||
+            connexionType === GameConnexionTypes.limit ||
             connexionType === GameConnexionTypes.empty
         ) {
             this.authToken = localUserStore.getAuthToken();
@@ -228,6 +230,12 @@ class ConnectionManager {
             analyticsClient.identifyUser(this.localUser.uuid, this.localUser.email);
         }
 
+        //if limit room active test headband
+        if (connexionType === GameConnexionTypes.limit) {
+            warningContainerStore.activateWarningContainer();
+            limitMap.set(true);
+        }
+
         this.serviceWorker = new _ServiceWorker();
         return Promise.resolve(this._currentRoom);
     }
diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts
index 044d8d67..3e36f84c 100644
--- a/front/src/Connexion/Room.ts
+++ b/front/src/Connexion/Room.ts
@@ -32,7 +32,7 @@ export class Room {
         if (this.id.startsWith("/")) {
             this.id = this.id.substr(1);
         }
-        if (this.id.startsWith("_/")) {
+        if (this.id.startsWith("_/") || this.id.startsWith("*/")) {
             this.isPublic = true;
         } else if (this.id.startsWith("@/")) {
             this.isPublic = false;
@@ -138,7 +138,7 @@ export class Room {
         }
 
         if (this.isPublic) {
-            const match = /_\/([^/]+)\/.+/.exec(this.id);
+            const match = /[_*]\/([^/]+)\/.+/.exec(this.id);
             if (!match) throw new Error('Could not extract instance from "' + this.id + '"');
             this.instance = match[1];
             return this.instance;
diff --git a/front/src/Stores/GameStore.ts b/front/src/Stores/GameStore.ts
index eada6d26..1ad975ee 100644
--- a/front/src/Stores/GameStore.ts
+++ b/front/src/Stores/GameStore.ts
@@ -5,3 +5,5 @@ export const userMovingStore = writable(false);
 export const requestVisitCardsStore = writable<string | null>(null);
 
 export const userIsAdminStore = writable(false);
+
+export const limitMap = writable(false);
diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts
index 50dbedc9..8a39354d 100644
--- a/front/src/Url/UrlManager.ts
+++ b/front/src/Url/UrlManager.ts
@@ -9,6 +9,7 @@ export enum GameConnexionTypes {
     unknown,
     jwt,
     login,
+    limit,
 }
 
 //this class is responsible with analysing and editing the game's url
@@ -19,6 +20,8 @@ class UrlManager {
             return GameConnexionTypes.login;
         } else if (url === "/jwt") {
             return GameConnexionTypes.jwt;
+        } else if (url.includes("*/")) {
+            return GameConnexionTypes.limit;
         } else if (url.includes("_/")) {
             return GameConnexionTypes.anonymous;
         } else if (url.includes("@/")) {

From 9357afd13f9a63554bf191e16b1d0ff8b408bf2a Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Fri, 10 Dec 2021 01:54:48 +0100
Subject: [PATCH 2/9] Update warning container

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Components/WarningContainer/WarningContainer.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index 2f832fbd..29a6740f 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -8,8 +8,8 @@
 </script>
 
 <main class="warningMain" transition:fly={{ y: -200, duration: 500 }}>
-    <h2>Warning!</h2>
     {#if $userIsAdminStore}
+        <h2>Warning!</h2>
         <p>
             This world is close to its limit!. You can upgrade its capacity <a href={upgradeLink} target="_blank"
                 >here</a
@@ -22,6 +22,7 @@
             >!
         </p>
     {:else}
+        <h2>Warning!</h2>
         <p>This world is close to its limit!</p>
     {/if}
 </main>

From fd64fc43a4c062e529bbde8559bf6791cc5a4ba1 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Thu, 23 Dec 2021 13:09:28 +0100
Subject: [PATCH 3/9] Finish 2 days room limit

 - Create modal to register when limit is past
 - Create modal to share the link
 - Use UrlManager to check if limit room is active

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Components/App.svelte               |  13 +++
 front/src/Components/Menu/GuestSubMenu.svelte |   4 +-
 front/src/Components/Menu/MenuIcon.svelte     |  21 +++-
 .../Components/Modal/LimitRoomModal.svelte    |  45 +++++++++
 .../Components/Modal/ShareLinkMapModal.svelte |  90 ++++++++++++++++++
 .../WarningContainer/WarningContainer.svelte  |   7 +-
 .../Components/images/logo-invite-pixel.png   | Bin 0 -> 1104 bytes
 .../Components/images/logo-register-pixel.png | Bin 0 -> 977 bytes
 front/src/Connexion/ConnectionManager.ts      |  10 +-
 front/src/Stores/GameStore.ts                 |   2 +-
 front/src/Stores/ModalStore.ts                |   4 +
 front/src/Url/UrlManager.ts                   |   9 ++
 12 files changed, 194 insertions(+), 11 deletions(-)
 create mode 100644 front/src/Components/Modal/LimitRoomModal.svelte
 create mode 100644 front/src/Components/Modal/ShareLinkMapModal.svelte
 create mode 100644 front/src/Components/images/logo-invite-pixel.png
 create mode 100644 front/src/Components/images/logo-register-pixel.png
 create mode 100644 front/src/Stores/ModalStore.ts

diff --git a/front/src/Components/App.svelte b/front/src/Components/App.svelte
index 4886cc4e..cee819e1 100644
--- a/front/src/Components/App.svelte
+++ b/front/src/Components/App.svelte
@@ -23,6 +23,9 @@
     import { chatVisibilityStore } from "../Stores/ChatStore";
     import { helpCameraSettingsVisibleStore } from "../Stores/HelpCameraSettingsStore";
     import HelpCameraSettingsPopup from "./HelpCameraSettings/HelpCameraSettingsPopup.svelte";
+    import { showLimitRoomModalStore, showShareLinkMapModalStore } from "../Stores/ModalStore";
+    import LimitRoomModal from "./Modal/LimitRoomModal.svelte";
+    import ShareLinkMapModal from "./Modal/ShareLinkMapModal.svelte";
     import AudioPlaying from "./UI/AudioPlaying.svelte";
     import { soundPlayingStore } from "../Stores/SoundPlayingStore";
     import ErrorDialog from "./UI/ErrorDialog.svelte";
@@ -129,6 +132,16 @@
             <HelpCameraSettingsPopup />
         </div>
     {/if}
+    {#if $showLimitRoomModalStore}
+        <div>
+            <LimitRoomModal />
+        </div>
+    {/if}
+    {#if $showShareLinkMapModalStore}
+        <div>
+            <ShareLinkMapModal />
+        </div>
+    {/if}
     {#if $requestVisitCardsStore}
         <VisitCard visitCardUrl={$requestVisitCardsStore} />
     {/if}
diff --git a/front/src/Components/Menu/GuestSubMenu.svelte b/front/src/Components/Menu/GuestSubMenu.svelte
index 0ae25b75..408dcbce 100644
--- a/front/src/Components/Menu/GuestSubMenu.svelte
+++ b/front/src/Components/Menu/GuestSubMenu.svelte
@@ -21,12 +21,12 @@
 <div class="guest-main">
     <section class="container-overflow">
         <section class="share-url not-mobile">
-            <h3>Share the link of the room !</h3>
+            <h3>Share the link of the room!</h3>
             <input type="text" readonly id="input-share-link" value={location.toString()} />
             <button type="button" class="nes-btn is-primary" on:click={copyLink}>Copy</button>
         </section>
         <section class="is-mobile">
-            <h3>Share the link of the room !</h3>
+            <h3>Share the link of the room!</h3>
             <input type="hidden" readonly id="input-share-link" value={location.toString()} />
             <button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button>
         </section>
diff --git a/front/src/Components/Menu/MenuIcon.svelte b/front/src/Components/Menu/MenuIcon.svelte
index bb5a2df2..90248115 100644
--- a/front/src/Components/Menu/MenuIcon.svelte
+++ b/front/src/Components/Menu/MenuIcon.svelte
@@ -1,9 +1,14 @@
 <script lang="typescript">
     import logoTalk from "../images/logo-message-pixel.png";
     import logoWA from "../images/logo-WA-pixel.png";
+    import logoInvite from "../images/logo-invite-pixel.png";
+    import logoRegister from "../images/logo-register-pixel.png";
     import { menuVisiblilityStore } from "../../Stores/MenuStore";
     import { chatVisibilityStore } from "../../Stores/ChatStore";
+    import { limitMapStore } from "../../Stores/GameStore";
     import { get } from "svelte/store";
+    import {ADMIN_URL} from "../../Enum/EnvironmentVariable";
+    import {showShareLinkMapModalStore} from "../../Stores/ModalStore";
 
     function showMenu() {
         menuVisiblilityStore.set(!get(menuVisiblilityStore));
@@ -11,13 +16,25 @@
     function showChat() {
         chatVisibilityStore.set(true);
     }
+
+    function register() {
+        window.open(`${ADMIN_URL}/second-step-register`, '_self');
+    }
+    function showInvite() {
+        showShareLinkMapModalStore.set(true);
+    }
 </script>
 
 <svelte:window />
 
 <main class="menuIcon">
-    <img src={logoWA} alt="open menu" class="nes-pointer" on:click|preventDefault={showMenu} />
-    <img src={logoTalk} alt="open menu" class="nes-pointer" on:click|preventDefault={showChat} />
+    {#if $limitMapStore}
+        <img src={logoInvite} alt="open menu" class="nes-pointer" on:click|preventDefault={showInvite} />
+        <img src={logoRegister} alt="open menu" class="nes-pointer" on:click|preventDefault={register} />
+    {:else}
+        <img src={logoWA} alt="open menu" class="nes-pointer" on:click|preventDefault={showMenu} />
+        <img src={logoTalk} alt="open menu" class="nes-pointer" on:click|preventDefault={showChat} />
+    {/if}
 </main>
 
 <style lang="scss">
diff --git a/front/src/Components/Modal/LimitRoomModal.svelte b/front/src/Components/Modal/LimitRoomModal.svelte
new file mode 100644
index 00000000..8fb6c09f
--- /dev/null
+++ b/front/src/Components/Modal/LimitRoomModal.svelte
@@ -0,0 +1,45 @@
+<script lang="typescript">
+    import { fly } from "svelte/transition";
+    import {ADMIN_URL} from "../../Enum/EnvironmentVariable";
+
+    function register(){
+        window.open(`${ADMIN_URL}/second-step-register`, '_self');
+    }
+</script>
+
+<div class="limit-map nes-container"
+     transition:fly={{ y: -900, duration: 500 }}>
+    <section>
+        <h2>Limit of your room</h2>
+        <p>Register your account!</p>
+        <p>This map is limited in the time and to continue to use WorkAdventure, you must register your account in our back office.</p>
+    </section>
+    <section>
+        <button class="nes-btn is-primary" on:click|preventDefault={register}>Register</button>
+    </section>
+</div>
+
+<style lang="scss">
+  .limit-map {
+    pointer-events: auto;
+    background: #eceeee;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 10vh;
+    max-height: 80vh;
+    max-width: 80vw;
+    overflow: auto;
+    text-align: center;
+
+    h2 {
+      font-family: "Press Start 2P";
+    }
+
+    section {
+      p {
+        margin: 15px;
+        font-family: "Press Start 2P";
+      }
+    }
+  }
+</style>
diff --git a/front/src/Components/Modal/ShareLinkMapModal.svelte b/front/src/Components/Modal/ShareLinkMapModal.svelte
new file mode 100644
index 00000000..5f84e791
--- /dev/null
+++ b/front/src/Components/Modal/ShareLinkMapModal.svelte
@@ -0,0 +1,90 @@
+<script lang="typescript">
+    import { fly } from "svelte/transition";
+    import {showShareLinkMapModalStore} from "../../Stores/ModalStore";
+
+    interface ExtNavigator extends Navigator{
+        canShare?(data?: ShareData): Promise<boolean>;
+    }
+
+    const myNavigator : ExtNavigator = window.navigator;
+    const haveNavigatorSharingFeature = myNavigator && myNavigator.canShare && myNavigator.share;
+
+    let copied = false;
+
+    function copyLink() {
+        try {
+            const input: HTMLInputElement = document.getElementById("input-share-link") as HTMLInputElement;
+            input.focus();
+            input.select();
+            document.execCommand("copy");
+            copied = true;
+        }catch (e){
+            console.error(e);
+            copied = false;
+        }
+    }
+
+    async function shareLink() {
+        const shareData = { url: location.toString() };
+
+        try {
+            await myNavigator.share(shareData);
+        } catch (err) {
+            console.error("Error: " + err);
+            copyLink();
+        }
+    }
+
+    function close() {
+        showShareLinkMapModalStore.set(false);
+        copied = false;
+    }
+</script>
+
+<div class="share-link-map nes-container"
+     transition:fly={{ y: -900, duration: 500 }}>
+    <section>
+        <h2>Invite your friends or colleagues</h2>
+        <p>Share the link of the room!</p>
+    </section>
+    <section>
+        {#if $haveNavigatorSharingFeature}
+            <input type="hidden" readonly id="input-share-link" value={location.toString()} />
+            <button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button>
+        {:else}
+            <input type="text" readonly id="input-share-link" value={location.toString()} />
+            <button type="button" class="nes-btn is-primary" on:click={copyLink}>Copy</button>
+        {/if}
+        {#if $copied}
+            <p>Copied!</p>
+        {/if}
+    </section>
+    <section>
+        <button class="nes-btn" on:click|preventDefault={close}>Close</button>
+    </section>
+</div>
+
+<style lang="scss">
+  div.share-link-map {
+    pointer-events: auto;
+    background: #eceeee;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 10vh;
+    max-height: 80vh;
+    max-width: 80vw;
+    overflow: auto;
+    text-align: center;
+
+    h2 {
+      font-family: "Press Start 2P";
+    }
+
+    section {
+      p {
+        margin: 15px;
+        font-family: "Press Start 2P";
+      }
+    }
+  }
+</style>
diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index 29a6740f..1c5f7793 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -1,6 +1,6 @@
 <script lang="typescript">
     import { fly } from "svelte/transition";
-    import { userIsAdminStore, limitMap } from "../../Stores/GameStore";
+    import { userIsAdminStore, limitMapStore } from "../../Stores/GameStore";
     import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
 
     const upgradeLink = ADMIN_URL + "/pricing";
@@ -11,11 +11,10 @@
     {#if $userIsAdminStore}
         <h2>Warning!</h2>
         <p>
-            This world is close to its limit!. You can upgrade its capacity <a href={upgradeLink} target="_blank"
-                >here</a
+            This world is close to its limit!. You can upgrade its capacity <a href={upgradeLink} target="_blank">here</a
             >
         </p>
-    {:else if $limitMap}
+    {:else if $limitMapStore}
         <p>
             Your are une test mode. This map will be opened during 2 days. You can register your domain <a
                 href={registerLink}>here</a
diff --git a/front/src/Components/images/logo-invite-pixel.png b/front/src/Components/images/logo-invite-pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8ae6fff9c3af9526d13ca8c47a2e412df612a3d
GIT binary patch
literal 1104
zcmV-W1h4yvP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XT
z000XT0n*)m`~Uz10!c(cRCt{2TRlt^K@@&xs5nX$D^0LE63;>!NKl)LM+aV~Knt;y
z#KeTe_!A2e?aUcVjFl*zD3zE%a};ukRFGgLNGY~!KIRUVz5Scn_jVU=zvObs-R$n0
zZ{FX0bC<I$i~Nww<@^Vv9F}F}{46|mk|)Q3jDQr_kSJPmKv2wEH*TeSLZ9FHe(%f)
zZSMhXPe2EiZ(mP=9r3|2U&O<Sj`<)2<%G5mfsB9@*pMh%a)4;ecb_2|DH9F!5uH7K
z{JZ)F(U)bS)f&;CzhWjhb3%vMlbjf>5RKmS{{B)yy>=@^&#Of18?l%bPY6s+`cK{t
zc*e77qSDn^Op_;Ia*U`nsDItmgbEd5$P!R25Dk~juLlWTotzf6K$d{9O0?_qo#LS&
zM*uQDl3G-hu8Ell$PsYy0?&PV&hy;I19AlPFcCnEWV+yFbb@)gL?}nV&TqbZZEf@2
z%K<q8xQyQ26K##<2-w_K#z)0>*_K!~2Vip(6>sN7O_U`7#&7+MaQz3~T;c-xDll6m
z+Bb;drElV^56BaMTyXD+UOre@RK&%Ac=P~}aOXbJ@Q@Njyy`kck-7QUv;aVs0CaHu
zeMFZFM8EcwOXG!IVzKvV9O4|4#yd7YGZj_(R%%C|3xQt}>uT)aMuu8tFJN^|O$?LT
z*(2(1jKSXDO)3K(y;RpQKu!|F#DiQM=)a;~L2zn>Mcd92Np+K_(c&QhD+lp{qi4tD
z5GEfNl_x<?b0ZAnR@T(m2q6-k02pW@dAR|TLdC#}&rJL42?t`ypn9QdROgHy8I1tW
z$pa5xsP|V-^}GqPTRv}8I?ek4xIO3O(e+^i_291e<k1{?b(XLN3!({g0-*MC0j|IB
ziD+Wny$T!>@YTN>fP|u+3};3F9^z-HE|!*+3v+msrVwjLKyQda8UO(UAxdKyAaO#F
z4GA*>G#(HNsOg-CAR1v{Rt3&6x_`aV_ag-CK(gE4KmHkV1!{iXu~)!?*h5ldf#N$H
z4T4?%KIjJ?yGvp4mL-SKf)&Skq5+a8pt<r`)n?;^GWh;Y>sT~N$Uk8ZT0<atS-iRO
zoWiF@Yn+aA0l4t`55D_p=n3f{0Ox;*YZK|r32e8;J%DK|dI&T?$OYH|Mun!1Xhr}G
z<<R`?Kx-YOB2SJhy}=9EPiQWV83AxHXneD;mCJDedw%TyQU1J0K*IFfC>f~8e3BSC
zxu(_^<w*O0)LJ-oi5fivt_dlbIVCZ<pUHs?h@$Aqn#bE=elTI5P*Y}usEXruI~nL3
zFb2s}ql5+$;6(OY;r|>N0V%K{QDpxak~S#q$OuS*4T&QA?{Ivkq!SqdDX<|q5Ya#X
W;77$Yjq=?90000<MNUMnLSTY!g!HNa

literal 0
HcmV?d00001

diff --git a/front/src/Components/images/logo-register-pixel.png b/front/src/Components/images/logo-register-pixel.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9a45d3cbe3e5d8dc4f75df15abee420042c5722
GIT binary patch
literal 977
zcmV;?11|iDP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XT
z000XT0n*)m`~Uz0gGod|RCt{2n>|bvK@`XTXQ((z6)R1!!UP&@B$3#NM+ed=)Y2-^
z%8wY01qqhsuJzQ8Xo+4WCfaBrBvMJDmFSfo?V5jvmA$>&&zZM7m)&1NF5G_Hy#K!U
z=FOYCisLv4qf)7apI|wT<5a>%cx;f3GeIeU1!KsSo*WPr^UjrPb{q8eRp@blPAI$w
z6kdQK)UIE$U>w=uvzPHO&@mrHR8A;-2$TX?Fos;|$pPXqKQau=&jAZHpgOGH``rfW
zP2l5aaV`8gA$t#4y9X>?Ju;r0JPzEy30$7Zd^p((Km*542OnR(0gRr=azq#s{{*`H
z>WX?DI}?5WgIhqS1APCX!a^8%0ciY%srcu+9x^cw?Ee8?Z;B0#m=$39Jg~H=jM&))
zZa-E}J}uR%x^VNQdj0f8c?E?rgt;8R_+}yti*a4(Nza}b%@bw>;8R{%?tagGdb*tT
z<&A2e&(gq*0F&psr!^eLGKKlNoBqD7t^SEKNluBti~vE|o%!I!2Jj|fBI_Ig>kTy<
zEHCyyXL3CGIQt+w3(VJmzXvLDQHVIx;C@>rIeHI^CKgG8$WMc;`etWTnM*O^z$7<4
z)f-j<$P0kOQkULfA%$NJmI7EXhFp=&0j&?fdOiL1?o1$9UCMgE_BXxjIcsoLD2S{F
zaD6|k(d1w`ExESHWEz|>Q?bQ@>jt*lNb5bY9bJZJQwK=U@fB5Ejnd=(|9?@H(_Bx4
zAS=M$PyI%xw|VM9!@Rk{Z@i29UWf>?0z7=G-@M@UUgP{vHOP1u9^*X%!a-I5_V?<~
z(_cSQ?OyvQHQr@mE++w)!PoAZxmQ}_fzY<xU{r!S#*<&|z(ex0z>Y>oh`ig<GoFdK
z5gdlH0>qex5|PIEJC8#95V9e_UZE)jj3=@lz+!}dNzsk@n8p+Pl3=5mneoJo0DFd3
zY}_XIZiNXOPs|9wWv{<BPeXI#=%NgaCuRh2Ti?2PT|de0PfFv7xg^NJ(+k|q(WH3m
z1-8ZGw!}4zCuU~>uKe89U(%f$ZwQUX+zin)p2$suF`5y9#Hk+)7*Fh63q);y8#12Q
zDZr_a5HM&wv9l${Ep@k-NQ2qXU<ZiPtxjn5!QSr*a}96cDG%;<g$=oQ6oua!E4%>Z
zZ-%4?WILq*7K|ZR%HIxWHxxT51+ZWY`2pY`4+=K%QEgaO00000NkvXXu0mjfp5Mn5

literal 0
HcmV?d00001

diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index aae3f386..b93be739 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -11,7 +11,8 @@ import { loginSceneVisibleIframeStore } from "../Stores/LoginSceneStore";
 import { userIsConnected, warningContainerStore } from "../Stores/MenuStore";
 import { analyticsClient } from "../Administration/AnalyticsClient";
 import { axiosWithRetry } from "./AxiosUtils";
-import { limitMap } from "../Stores/GameStore";
+import {limitMapStore} from "../Stores/GameStore";
+import {showLimitRoomModalStore} from "../Stores/ModalStore";
 
 class ConnectionManager {
     private localUser!: LocalUser;
@@ -233,7 +234,12 @@ class ConnectionManager {
         //if limit room active test headband
         if (connexionType === GameConnexionTypes.limit) {
             warningContainerStore.activateWarningContainer();
-            limitMap.set(true);
+            limitMapStore.set(true);
+
+            //check time of map
+            if(!urlManager.isActiveLimitRoom){
+                showLimitRoomModalStore.set(true);
+            }
         }
 
         this.serviceWorker = new _ServiceWorker();
diff --git a/front/src/Stores/GameStore.ts b/front/src/Stores/GameStore.ts
index 1ad975ee..e5298b7c 100644
--- a/front/src/Stores/GameStore.ts
+++ b/front/src/Stores/GameStore.ts
@@ -6,4 +6,4 @@ export const requestVisitCardsStore = writable<string | null>(null);
 
 export const userIsAdminStore = writable(false);
 
-export const limitMap = writable(false);
+export const limitMapStore = writable(false);
diff --git a/front/src/Stores/ModalStore.ts b/front/src/Stores/ModalStore.ts
new file mode 100644
index 00000000..3e99cde9
--- /dev/null
+++ b/front/src/Stores/ModalStore.ts
@@ -0,0 +1,4 @@
+import { writable } from "svelte/store";
+
+export const showLimitRoomModalStore = writable(false);
+export const showShareLinkMapModalStore = writable(false);
diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts
index 8a39354d..4e2b20df 100644
--- a/front/src/Url/UrlManager.ts
+++ b/front/src/Url/UrlManager.ts
@@ -58,6 +58,15 @@ class UrlManager {
     pushStartLayerNameToUrl(startLayerName: string): void {
         window.location.hash = startLayerName;
     }
+
+    get isActiveLimitRoom(): boolean {
+        const match = /\*\/(\w+)\/(?:\w+)/.exec(window.location.pathname.toString());
+        const timestamp = match ? Number.parseInt(match[1]) : null;
+        if(!timestamp){
+            return false;
+        }
+        return ((new Date()).getTime() - 48*60*60*1000) < timestamp;
+    }
 }
 
 export const urlManager = new UrlManager();

From 96d46e96c2847c6ff92b93cee1545e823a1d3668 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Thu, 23 Dec 2021 14:52:42 +0100
Subject: [PATCH 4/9] Fix svelte error

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Components/Modal/ShareLinkMapModal.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/front/src/Components/Modal/ShareLinkMapModal.svelte b/front/src/Components/Modal/ShareLinkMapModal.svelte
index 5f84e791..25cde5bd 100644
--- a/front/src/Components/Modal/ShareLinkMapModal.svelte
+++ b/front/src/Components/Modal/ShareLinkMapModal.svelte
@@ -7,9 +7,9 @@
     }
 
     const myNavigator : ExtNavigator = window.navigator;
-    const haveNavigatorSharingFeature = myNavigator && myNavigator.canShare && myNavigator.share;
+    const haveNavigatorSharingFeature:boolean = myNavigator && myNavigator.canShare != null && myNavigator.share != null;
 
-    let copied = false;
+    let copied:boolean = false;
 
     function copyLink() {
         try {
@@ -48,14 +48,14 @@
         <p>Share the link of the room!</p>
     </section>
     <section>
-        {#if $haveNavigatorSharingFeature}
+        {#if haveNavigatorSharingFeature}
             <input type="hidden" readonly id="input-share-link" value={location.toString()} />
             <button type="button" class="nes-btn is-primary" on:click={shareLink}>Share</button>
         {:else}
             <input type="text" readonly id="input-share-link" value={location.toString()} />
             <button type="button" class="nes-btn is-primary" on:click={copyLink}>Copy</button>
         {/if}
-        {#if $copied}
+        {#if copied}
             <p>Copied!</p>
         {/if}
     </section>

From efa57d2754f6119feb879a62826d3178ed7c159b Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Thu, 23 Dec 2021 15:06:32 +0100
Subject: [PATCH 5/9] Fix pretier

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Components/Menu/MenuIcon.svelte     |  6 +--
 .../Components/Modal/LimitRoomModal.svelte    | 52 +++++++++---------
 .../Components/Modal/ShareLinkMapModal.svelte | 54 +++++++++----------
 .../WarningContainer/WarningContainer.svelte  |  3 +-
 front/src/Connexion/ConnectionManager.ts      |  6 +--
 front/src/Url/UrlManager.ts                   |  4 +-
 6 files changed, 64 insertions(+), 61 deletions(-)

diff --git a/front/src/Components/Menu/MenuIcon.svelte b/front/src/Components/Menu/MenuIcon.svelte
index 90248115..9d3f72dd 100644
--- a/front/src/Components/Menu/MenuIcon.svelte
+++ b/front/src/Components/Menu/MenuIcon.svelte
@@ -7,8 +7,8 @@
     import { chatVisibilityStore } from "../../Stores/ChatStore";
     import { limitMapStore } from "../../Stores/GameStore";
     import { get } from "svelte/store";
-    import {ADMIN_URL} from "../../Enum/EnvironmentVariable";
-    import {showShareLinkMapModalStore} from "../../Stores/ModalStore";
+    import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
+    import { showShareLinkMapModalStore } from "../../Stores/ModalStore";
 
     function showMenu() {
         menuVisiblilityStore.set(!get(menuVisiblilityStore));
@@ -18,7 +18,7 @@
     }
 
     function register() {
-        window.open(`${ADMIN_URL}/second-step-register`, '_self');
+        window.open(`${ADMIN_URL}/second-step-register`, "_self");
     }
     function showInvite() {
         showShareLinkMapModalStore.set(true);
diff --git a/front/src/Components/Modal/LimitRoomModal.svelte b/front/src/Components/Modal/LimitRoomModal.svelte
index 8fb6c09f..43941a6b 100644
--- a/front/src/Components/Modal/LimitRoomModal.svelte
+++ b/front/src/Components/Modal/LimitRoomModal.svelte
@@ -1,18 +1,20 @@
 <script lang="typescript">
     import { fly } from "svelte/transition";
-    import {ADMIN_URL} from "../../Enum/EnvironmentVariable";
+    import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
 
-    function register(){
-        window.open(`${ADMIN_URL}/second-step-register`, '_self');
+    function register() {
+        window.open(`${ADMIN_URL}/second-step-register`, "_self");
     }
 </script>
 
-<div class="limit-map nes-container"
-     transition:fly={{ y: -900, duration: 500 }}>
+<div class="limit-map nes-container" transition:fly={{ y: -900, duration: 500 }}>
     <section>
         <h2>Limit of your room</h2>
         <p>Register your account!</p>
-        <p>This map is limited in the time and to continue to use WorkAdventure, you must register your account in our back office.</p>
+        <p>
+            This map is limited in the time and to continue to use WorkAdventure, you must register your account in our
+            back office.
+        </p>
     </section>
     <section>
         <button class="nes-btn is-primary" on:click|preventDefault={register}>Register</button>
@@ -20,26 +22,26 @@
 </div>
 
 <style lang="scss">
-  .limit-map {
-    pointer-events: auto;
-    background: #eceeee;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 10vh;
-    max-height: 80vh;
-    max-width: 80vw;
-    overflow: auto;
-    text-align: center;
+    .limit-map {
+        pointer-events: auto;
+        background: #eceeee;
+        margin-left: auto;
+        margin-right: auto;
+        margin-top: 10vh;
+        max-height: 80vh;
+        max-width: 80vw;
+        overflow: auto;
+        text-align: center;
 
-    h2 {
-      font-family: "Press Start 2P";
-    }
+        h2 {
+            font-family: "Press Start 2P";
+        }
 
-    section {
-      p {
-        margin: 15px;
-        font-family: "Press Start 2P";
-      }
+        section {
+            p {
+                margin: 15px;
+                font-family: "Press Start 2P";
+            }
+        }
     }
-  }
 </style>
diff --git a/front/src/Components/Modal/ShareLinkMapModal.svelte b/front/src/Components/Modal/ShareLinkMapModal.svelte
index 25cde5bd..42ac1294 100644
--- a/front/src/Components/Modal/ShareLinkMapModal.svelte
+++ b/front/src/Components/Modal/ShareLinkMapModal.svelte
@@ -1,15 +1,16 @@
 <script lang="typescript">
     import { fly } from "svelte/transition";
-    import {showShareLinkMapModalStore} from "../../Stores/ModalStore";
+    import { showShareLinkMapModalStore } from "../../Stores/ModalStore";
 
-    interface ExtNavigator extends Navigator{
+    interface ExtNavigator extends Navigator {
         canShare?(data?: ShareData): Promise<boolean>;
     }
 
-    const myNavigator : ExtNavigator = window.navigator;
-    const haveNavigatorSharingFeature:boolean = myNavigator && myNavigator.canShare != null && myNavigator.share != null;
+    const myNavigator: ExtNavigator = window.navigator;
+    const haveNavigatorSharingFeature: boolean =
+        myNavigator && myNavigator.canShare != null && myNavigator.share != null;
 
-    let copied:boolean = false;
+    let copied: boolean = false;
 
     function copyLink() {
         try {
@@ -18,7 +19,7 @@
             input.select();
             document.execCommand("copy");
             copied = true;
-        }catch (e){
+        } catch (e) {
             console.error(e);
             copied = false;
         }
@@ -41,8 +42,7 @@
     }
 </script>
 
-<div class="share-link-map nes-container"
-     transition:fly={{ y: -900, duration: 500 }}>
+<div class="share-link-map nes-container" transition:fly={{ y: -900, duration: 500 }}>
     <section>
         <h2>Invite your friends or colleagues</h2>
         <p>Share the link of the room!</p>
@@ -65,26 +65,26 @@
 </div>
 
 <style lang="scss">
-  div.share-link-map {
-    pointer-events: auto;
-    background: #eceeee;
-    margin-left: auto;
-    margin-right: auto;
-    margin-top: 10vh;
-    max-height: 80vh;
-    max-width: 80vw;
-    overflow: auto;
-    text-align: center;
+    div.share-link-map {
+        pointer-events: auto;
+        background: #eceeee;
+        margin-left: auto;
+        margin-right: auto;
+        margin-top: 10vh;
+        max-height: 80vh;
+        max-width: 80vw;
+        overflow: auto;
+        text-align: center;
 
-    h2 {
-      font-family: "Press Start 2P";
-    }
+        h2 {
+            font-family: "Press Start 2P";
+        }
 
-    section {
-      p {
-        margin: 15px;
-        font-family: "Press Start 2P";
-      }
+        section {
+            p {
+                margin: 15px;
+                font-family: "Press Start 2P";
+            }
+        }
     }
-  }
 </style>
diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index 1c5f7793..079274c4 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -11,7 +11,8 @@
     {#if $userIsAdminStore}
         <h2>Warning!</h2>
         <p>
-            This world is close to its limit!. You can upgrade its capacity <a href={upgradeLink} target="_blank">here</a
+            This world is close to its limit!. You can upgrade its capacity <a href={upgradeLink} target="_blank"
+                >here</a
             >
         </p>
     {:else if $limitMapStore}
diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 007a5608..e7fad797 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -14,8 +14,8 @@ import { axiosWithRetry } from "./AxiosUtils";
 import axios from "axios";
 import { isRegisterData } from "../Messages/JsonMessages/RegisterData";
 import { isAdminApiData } from "../Messages/JsonMessages/AdminApiData";
-import {limitMapStore} from "../Stores/GameStore";
-import {showLimitRoomModalStore} from "../Stores/ModalStore";
+import { limitMapStore } from "../Stores/GameStore";
+import { showLimitRoomModalStore } from "../Stores/ModalStore";
 
 class ConnectionManager {
     private localUser!: LocalUser;
@@ -246,7 +246,7 @@ class ConnectionManager {
             limitMapStore.set(true);
 
             //check time of map
-            if(!urlManager.isActiveLimitRoom){
+            if (!urlManager.isActiveLimitRoom) {
                 showLimitRoomModalStore.set(true);
             }
         }
diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts
index 4e2b20df..f45c1db8 100644
--- a/front/src/Url/UrlManager.ts
+++ b/front/src/Url/UrlManager.ts
@@ -62,10 +62,10 @@ class UrlManager {
     get isActiveLimitRoom(): boolean {
         const match = /\*\/(\w+)\/(?:\w+)/.exec(window.location.pathname.toString());
         const timestamp = match ? Number.parseInt(match[1]) : null;
-        if(!timestamp){
+        if (!timestamp) {
             return false;
         }
-        return ((new Date()).getTime() - 48*60*60*1000) < timestamp;
+        return new Date().getTime() - 48 * 60 * 60 * 1000 < timestamp;
     }
 }
 

From 5d729d05603f4e3d2d2bbc65f159c4f75b0747ea Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Fri, 24 Dec 2021 12:02:47 +0100
Subject: [PATCH 6/9] Fix message Warning Container

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Components/WarningContainer/WarningContainer.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index 079274c4..86b2d972 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -17,7 +17,7 @@
         </p>
     {:else if $limitMapStore}
         <p>
-            Your are une test mode. This map will be opened during 2 days. You can register your domain <a
+            This map is available for 2 days. You can register your domain <a
                 href={registerLink}>here</a
             >!
         </p>

From ae122261d482f4bcb9f4bfb3af1a34b936622199 Mon Sep 17 00:00:00 2001
From: Gregoire Parant <g.parant@thecodingmachine.com>
Date: Wed, 5 Jan 2022 11:49:01 +0100
Subject: [PATCH 7/9] Fix prettier update

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
---
 front/src/Components/WarningContainer/WarningContainer.svelte | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index 86b2d972..f75050fc 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -17,9 +17,7 @@
         </p>
     {:else if $limitMapStore}
         <p>
-            This map is available for 2 days. You can register your domain <a
-                href={registerLink}>here</a
-            >!
+            This map is available for 2 days. You can register your domain <a href={registerLink}>here</a>!
         </p>
     {:else}
         <h2>Warning!</h2>

From 968e71cbca28df16cdfd6e13060c997d42707b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Wed, 5 Jan 2022 14:32:02 +0100
Subject: [PATCH 8/9] Removing completely any analysis of the URL from the
 front.

Instead, data related to room is sent from the admin, via the pusher.
---
 .../Components/ReportMenu/ReportMenu.svelte   |  7 +++----
 .../WarningContainer/WarningContainer.svelte  |  4 +---
 front/src/Connexion/ConnectionManager.ts      | 11 +++-------
 front/src/Connexion/Room.ts                   | 14 +++++++++++++
 front/src/Url/UrlManager.ts                   | 21 +++----------------
 messages/JsonMessages/MapDetailsData.ts       |  4 ++++
 6 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/front/src/Components/ReportMenu/ReportMenu.svelte b/front/src/Components/ReportMenu/ReportMenu.svelte
index 8479a5b0..92601774 100644
--- a/front/src/Components/ReportMenu/ReportMenu.svelte
+++ b/front/src/Components/ReportMenu/ReportMenu.svelte
@@ -6,12 +6,11 @@
     import type { Unsubscriber } from "svelte/store";
     import { playersStore } from "../../Stores/PlayersStore";
     import { connectionManager } from "../../Connexion/ConnectionManager";
-    import { GameConnexionTypes } from "../../Url/UrlManager";
     import { get } from "svelte/store";
 
     let blockActive = true;
     let reportActive = !blockActive;
-    let anonymous: boolean = false;
+    let disableReport: boolean = false;
     let userUUID: string | undefined = playersStore.getPlayerById(get(showReportScreenStore).userId)?.userUuid;
     let userName = "No name";
     let unsubscriber: Unsubscriber;
@@ -26,7 +25,7 @@
                 }
             }
         });
-        anonymous = connectionManager.getConnexionType === GameConnexionTypes.anonymous;
+        disableReport = !connectionManager.currentRoom?.canReport ?? true;
     });
 
     onDestroy(() => {
@@ -65,7 +64,7 @@
             <button type="button" class="nes-btn" on:click|preventDefault={close}>X</button>
         </section>
     </section>
-    <section class="report-menu-action {anonymous ? 'hidden' : ''}">
+    <section class="report-menu-action {disableReport ? 'hidden' : ''}">
         <section class="justify-center">
             <button
                 type="button"
diff --git a/front/src/Components/WarningContainer/WarningContainer.svelte b/front/src/Components/WarningContainer/WarningContainer.svelte
index 86b2d972..f75050fc 100644
--- a/front/src/Components/WarningContainer/WarningContainer.svelte
+++ b/front/src/Components/WarningContainer/WarningContainer.svelte
@@ -17,9 +17,7 @@
         </p>
     {:else if $limitMapStore}
         <p>
-            This map is available for 2 days. You can register your domain <a
-                href={registerLink}>here</a
-            >!
+            This map is available for 2 days. You can register your domain <a href={registerLink}>here</a>!
         </p>
     {:else}
         <h2>Warning!</h2>
diff --git a/front/src/Connexion/ConnectionManager.ts b/front/src/Connexion/ConnectionManager.ts
index 16771496..9c81fb25 100644
--- a/front/src/Connexion/ConnectionManager.ts
+++ b/front/src/Connexion/ConnectionManager.ts
@@ -154,12 +154,7 @@ class ConnectionManager {
                 )
             );
             urlManager.pushRoomIdToUrl(this._currentRoom);
-        } else if (
-            connexionType === GameConnexionTypes.organization ||
-            connexionType === GameConnexionTypes.anonymous ||
-            connexionType === GameConnexionTypes.limit ||
-            connexionType === GameConnexionTypes.empty
-        ) {
+        } else if (connexionType === GameConnexionTypes.room || connexionType === GameConnexionTypes.empty) {
             this.authToken = localUserStore.getAuthToken();
 
             let roomPath: string;
@@ -241,12 +236,12 @@ class ConnectionManager {
         }
 
         //if limit room active test headband
-        if (connexionType === GameConnexionTypes.limit) {
+        if (this._currentRoom.expireOn !== undefined) {
             warningContainerStore.activateWarningContainer();
             limitMapStore.set(true);
 
             //check time of map
-            if (!urlManager.isActiveLimitRoom) {
+            if (new Date() > this._currentRoom.expireOn) {
                 showLimitRoomModalStore.set(true);
             }
         }
diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts
index ad0cde7b..7d7c2667 100644
--- a/front/src/Connexion/Room.ts
+++ b/front/src/Connexion/Room.ts
@@ -27,6 +27,8 @@ export class Room {
     private readonly _search: URLSearchParams;
     private _contactPage: string | undefined;
     private _group: string | null = null;
+    private _expireOn: Date | undefined;
+    private _canReport: boolean = false;
 
     private constructor(private roomUrl: URL) {
         this.id = roomUrl.pathname;
@@ -121,6 +123,10 @@ export class Room {
                     data.authenticationMandatory != null ? data.authenticationMandatory : DISABLE_ANONYMOUS;
                 this._iframeAuthentication = data.iframeAuthentication || OPID_LOGIN_SCREEN_PROVIDER;
                 this._contactPage = data.contactPage || CONTACT_URL;
+                if (data.expireOn) {
+                    this._expireOn = new Date(data.expireOn);
+                }
+                this._canReport = data.canReport ?? false;
                 return new MapDetail(data.mapUrl, data.textures);
             } else {
                 throw new Error("Data received by the /map endpoint of the Pusher is not in a valid format.");
@@ -222,4 +228,12 @@ export class Room {
     get group(): string | null {
         return this._group;
     }
+
+    get expireOn(): Date | undefined {
+        return this._expireOn;
+    }
+
+    get canReport(): boolean {
+        return this._canReport;
+    }
 }
diff --git a/front/src/Url/UrlManager.ts b/front/src/Url/UrlManager.ts
index 8e633fbf..011efa5a 100644
--- a/front/src/Url/UrlManager.ts
+++ b/front/src/Url/UrlManager.ts
@@ -2,14 +2,12 @@ import type { Room } from "../Connexion/Room";
 import { localUserStore } from "../Connexion/LocalUserStore";
 
 export enum GameConnexionTypes {
-    anonymous = 1,
-    organization,
+    room = 1,
     register,
     empty,
     unknown,
     jwt,
     login,
-    limit,
 }
 
 //this class is responsible with analysing and editing the game's url
@@ -20,12 +18,8 @@ class UrlManager {
             return GameConnexionTypes.login;
         } else if (url === "/jwt") {
             return GameConnexionTypes.jwt;
-        } else if (url.includes("*/")) {
-            return GameConnexionTypes.limit;
-        } else if (url.includes("_/")) {
-            return GameConnexionTypes.anonymous;
-        } else if (url.includes("@/")) {
-            return GameConnexionTypes.organization;
+        } else if (url.includes("_/") || url.includes("*/") || url.includes("@/")) {
+            return GameConnexionTypes.room;
         } else if (url.includes("register/")) {
             return GameConnexionTypes.register;
         } else if (url === "/") {
@@ -58,15 +52,6 @@ class UrlManager {
     pushStartLayerNameToUrl(startLayerName: string): void {
         window.location.hash = startLayerName;
     }
-
-    get isActiveLimitRoom(): boolean {
-        const match = /\*\/(\w+)\/(?:\w+)/.exec(window.location.pathname.toString());
-        const timestamp = match ? Number.parseInt(match[1]) : null;
-        if (!timestamp) {
-            return false;
-        }
-        return new Date().getTime() - 48 * 60 * 60 * 1000 < timestamp;
-    }
 }
 
 export const urlManager = new UrlManager();
diff --git a/messages/JsonMessages/MapDetailsData.ts b/messages/JsonMessages/MapDetailsData.ts
index 794c9bac..39866eee 100644
--- a/messages/JsonMessages/MapDetailsData.ts
+++ b/messages/JsonMessages/MapDetailsData.ts
@@ -20,6 +20,10 @@ export const isMapDetailsData = new tg.IsInterface()
     })
     .withOptionalProperties({
         iframeAuthentication: tg.isNullable(tg.isString),
+        // The date (in ISO 8601 format) at which the room will expire
+        expireOn: tg.isString,
+        // Whether the "report" feature is enabled or not on this room
+        canReport: tg.isBoolean,
     })
     .get();
 

From f82012d31556e6be315c7337f3144931e3daf785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Wed, 5 Jan 2022 16:30:41 +0100
Subject: [PATCH 9/9] Flagging Room.isPublic property as deprecated

---
 front/src/Connexion/Room.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/front/src/Connexion/Room.ts b/front/src/Connexion/Room.ts
index 7d7c2667..74dd06de 100644
--- a/front/src/Connexion/Room.ts
+++ b/front/src/Connexion/Room.ts
@@ -18,7 +18,10 @@ export interface RoomRedirect {
 
 export class Room {
     public readonly id: string;
-    public readonly isPublic: boolean;
+    /**
+     * @deprecated
+     */
+    private readonly isPublic: boolean;
     private _authenticationMandatory: boolean = DISABLE_ANONYMOUS;
     private _iframeAuthentication?: string = OPID_LOGIN_SCREEN_PROVIDER;
     private _mapUrl: string | undefined;
@@ -149,6 +152,8 @@ export class Room {
      * Instance name is:
      * - In a public URL: the second part of the URL ( _/[instance]/map.json)
      * - In a private URL: [organizationId/worldId]
+     *
+     * @deprecated
      */
     public getInstance(): string {
         if (this.instance !== undefined) {