From 3c0f61d3b3af59775d2784d65a4c94c3e6d1bcd2 Mon Sep 17 00:00:00 2001
From: kharhamel <oognic@gmail.com>
Date: Fri, 13 Nov 2020 12:11:59 +0100
Subject: [PATCH 1/2] HOTFIX: fixed server crash on /map

---
 back/src/Controller/MapController.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/back/src/Controller/MapController.ts b/back/src/Controller/MapController.ts
index abe34886..c111ba64 100644
--- a/back/src/Controller/MapController.ts
+++ b/back/src/Controller/MapController.ts
@@ -1,11 +1,9 @@
-import {OK} from "http-status-codes";
-import {URL_ROOM_STARTED} from "../Enum/EnvironmentVariable";
 import {HttpRequest, HttpResponse, TemplatedApp} from "uWebSockets.js";
 import {BaseController} from "./BaseController";
 import {parse} from "query-string";
 import {adminApi} from "../Services/AdminApi";
 
-//todo: delete this
+
 export class MapController extends BaseController{
 
     constructor(private App : TemplatedApp) {
@@ -36,18 +34,21 @@ export class MapController extends BaseController{
                 res.writeStatus("400 Bad request");
                 this.addCorsHeaders(res);
                 res.end("Expected organizationSlug parameter");
+                return;
             }
             if (typeof query.worldSlug !== 'string') {
                 console.error('Expected worldSlug parameter');
                 res.writeStatus("400 Bad request");
                 this.addCorsHeaders(res);
                 res.end("Expected worldSlug parameter");
+                return;
             }
             if (typeof query.roomSlug !== 'string' && query.roomSlug !== undefined) {
                 console.error('Expected only one roomSlug parameter');
                 res.writeStatus("400 Bad request");
                 this.addCorsHeaders(res);
                 res.end("Expected only one roomSlug parameter");
+                return;
             }
 
             (async () => {

From 0a2e967eca1ccda7f2ad55840cb6a7737b42c15b Mon Sep 17 00:00:00 2001
From: kharhamel <oognic@gmail.com>
Date: Fri, 13 Nov 2020 12:15:58 +0100
Subject: [PATCH 2/2] HOTFIX: fixed a server when trying to connect to the
 adminRoomSocket

---
 back/src/Controller/IoSocketController.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/back/src/Controller/IoSocketController.ts b/back/src/Controller/IoSocketController.ts
index 85549c03..f037a99d 100644
--- a/back/src/Controller/IoSocketController.ts
+++ b/back/src/Controller/IoSocketController.ts
@@ -43,6 +43,7 @@ export class IoSocketController {
                 if (token !== ADMIN_API_TOKEN) {
                     console.log('Admin access refused for token: '+token)
                     res.writeStatus("401 Unauthorized").end('Incorrect token');
+                    return;
                 }
                 const roomId = query.roomId as string;