Merge pull request #1904 from thecodingmachine/HotFixToEnableFreemiumLimitation

Enable limitation freemium

front/src/Components/WarningContainer/WarningContainer.svelte

@@ -4,23 +4,20 @@
     import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
     import LL from "../../i18n/i18n-svelte";
 
-    const upgradeLink = ADMIN_URL + "/pricing";
     const registerLink = ADMIN_URL + "/second-step-register";
 </script>
 
 <main class="warningMain" transition:fly={{ y: -200, duration: 500 }}>
     {#if $userIsAdminStore}
         <h2>{$LL.warning.title()}</h2>
-        <p>
+        <p>{@html $LL.warning.content()}</p>
-            {$LL.warning.content({ upgradeLink })}
-        </p>
     {:else if $limitMapStore}
         <p>
             This map is available for 2 days. You can register your domain <a href={registerLink}>here</a>!
         </p>
     {:else}
         <h2>{$LL.warning.title()}</h2>
-        <p>{$LL.warning.limit()}</p>
+        <p>{@html $LL.warning.content()}</p>
     {/if}
 </main>
 

front/src/i18n/de-DE/warning.ts

@@ -1,9 +1,11 @@
 import type { Translation } from "../i18n-types";
+import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
+
+const upgradeLink = ADMIN_URL + "/pricing";
 
 const warning: NonNullable<Translation["warning"]> = {
     title: "Warnung!",
-    content:
+    content: `Diese Welt erreicht bald die maximale Kapazität. Du kannst die Kapazität <a href="${upgradeLink}" target="_blank">hier</a> erhöhen`,
-        'Diese Welt erreicht bald die maximale Kapazität. Du kannst die Kapazität <a href={upgradeLink} target="_blank">hier</a> erhöhen',
     limit: "Diese Welt erreicht bald die maximale Kapazität!",
     accessDenied: {
         camera: "Zugriff auf die Kamera verweigert. Hier klicken um deine Browser Berechtigungen zu prüfen.",

front/src/i18n/en-US/warning.ts

@@ -1,9 +1,11 @@
 import type { BaseTranslation } from "../i18n-types";
+import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
+
+const upgradeLink = ADMIN_URL + "/pricing";
 
 const warning: BaseTranslation = {
     title: "Warning!",
-    content:
+    content: `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>',
     limit: "This world is close to its limit!",
     accessDenied: {
         camera: "Camera access denied. Click here and check your browser permissions.",

front/src/i18n/fr-FR/warning.ts

@@ -1,9 +1,11 @@
 import type { Translation } from "../i18n-types";
+import { ADMIN_URL } from "../../Enum/EnvironmentVariable";
+
+const upgradeLink = ADMIN_URL + "/pricing";
 
 const warning: NonNullable<Translation["warning"]> = {
     title: "Attention!",
-    content:
+    content: `Ce monde est proche de sa limite ! Vous pouvez améliorer sa capacité <a href="${upgradeLink}" target="_blank">içi</a>`,
-        'Ce monde est proche de sa limite ! Vous pouvez améliorer sa capacité <a href={upgradeLink} target="_blank">içi</a>',
     limit: "Ce monde est proche de ses limites!",
     accessDenied: {
         camera: "Accès à la caméra refusé. Cliquez ici et vérifiez les autorisations de votre navigateur.",

pusher/src/Controller/AdminController.ts

@@ -84,11 +84,13 @@ export class AdminController extends BaseController {
 
             if (ADMIN_API_TOKEN === "") {
                 res.writeStatus("401 Unauthorized").end("No token configured!");
+                res.end();
                 return;
             }
             if (token !== ADMIN_API_TOKEN) {
                 console.error("Admin access refused for token: " + token);
                 res.writeStatus("401 Unauthorized").end("Incorrect token");
+                res.end();
                 return;
             }