From 9e1503c10600e38c0ecab5db88cbb6ca937dad5f Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Thu, 8 Feb 2024 22:29:26 +0100
Subject: [PATCH] Renamed server->backend in configuration files

---
 backend/core/src/server.cpp        | 10 +++++-----
 frontend/server/app.js             |  2 +-
 frontend/server/bin/demo           |  6 +++---
 manager/javascripts/dcsinstance.js |  4 ++--
 manager/javascripts/filesystem.js  |  4 ++--
 olympus.json                       |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/backend/core/src/server.cpp b/backend/core/src/server.cpp
index 1c5ded18..e582d7b9 100644
--- a/backend/core/src/server.cpp
+++ b/backend/core/src/server.cpp
@@ -296,14 +296,14 @@ void Server::task()
     ss << ifstream.rdbuf();
     std::error_code errorCode;
     json::value config = json::value::parse(ss.str(), errorCode);
-    if (config.is_object() && config.has_object_field(L"server") &&
-        config[L"server"].has_string_field(L"address") && config[L"server"].has_number_field(L"port"))
+    if (config.is_object() && config.has_object_field(L"backend") &&
+        config[L"backend"].has_string_field(L"address") && config[L"backend"].has_number_field(L"port"))
     {
-        address = "http://" + to_string(config[L"server"][L"address"]) + ":" + to_string(config[L"server"][L"port"].as_number().to_int32());
-        log("Starting server on " + address);
+        address = "http://" + to_string(config[L"backend"][L"address"]) + ":" + to_string(config[L"backend"][L"port"].as_number().to_int32());
+        log("Starting backend on " + address);
     }
     else
-        log("Error reading configuration file. Starting server on " + address);
+        log("Error reading configuration file. Starting backend on " + address);
 
     if (config.is_object() && config.has_object_field(L"authentication"))
     {
diff --git a/frontend/server/app.js b/frontend/server/app.js
index f82384a9..7fbdf87a 100644
--- a/frontend/server/app.js
+++ b/frontend/server/app.js
@@ -33,7 +33,7 @@ module.exports = function (configLocation) {
 
     /* Define middleware */
     app.use(logger('dev'));
-    app.use('/olympus', createProxyMiddleware({ target: `http://${config["server"]["address"]}:${config["server"]["port"]}`, changeOrigin: true }));
+    app.use('/olympus', createProxyMiddleware({ target: `http://${config["backend"]["address"]}:${config["backend"]["port"]}`, changeOrigin: true }));
     app.use(bodyParser.json({ limit: '50mb' }));
     app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
     app.use(express.static(path.join(__dirname, 'public')));
diff --git a/frontend/server/bin/demo b/frontend/server/bin/demo
index ba3a07df..b9cc8d3e 100644
--- a/frontend/server/bin/demo
+++ b/frontend/server/bin/demo
@@ -36,11 +36,11 @@ var http = require('http');
  */
 
 var configPort = null;
-if (config["server"] != undefined && config["server"]["port"] != undefined) {
-	configPort = config["server"]["port"];
+if (config["backend"] != undefined && config["backend"]["port"] != undefined) {
+	configPort = config["backend"]["port"];
 }
 
-var port = normalizePort(configPort || '3000');
+var port = normalizePort(configPort || '3001');
 app.set('port', port);
 console.log("Express server listening on port: " + port)
 
diff --git a/manager/javascripts/dcsinstance.js b/manager/javascripts/dcsinstance.js
index f28de856..2235b50d 100644
--- a/manager/javascripts/dcsinstance.js
+++ b/manager/javascripts/dcsinstance.js
@@ -163,8 +163,8 @@ class DCSInstance {
                 /* Read the olympus.json */
                 var config = JSON.parse(fs.readFileSync(path.join(this.folder, "Config", "olympus.json")));
                 this.frontendPort = config["frontend"]["port"];
-                this.backendPort = config["server"]["port"];
-                this.backendAddress = config["server"]["address"];
+                this.backendPort = config["backend"]["port"];
+                this.backendAddress = config["backend"]["address"];
                 this.gameMasterPasswordHash = config["authentication"]["gameMasterPassword"];
 
                 this.gameMasterPasswordEdited = false;
diff --git a/manager/javascripts/filesystem.js b/manager/javascripts/filesystem.js
index f53a77ee..96c2fd7e 100644
--- a/manager/javascripts/filesystem.js
+++ b/manager/javascripts/filesystem.js
@@ -159,8 +159,8 @@ async function applyConfiguration(folder, instance) {
 
         /* Apply the configuration */
         config["frontend"]["port"] = instance.frontendPort;
-        config["server"]["port"] = instance.backendPort;
-        config["server"]["address"] = instance.backendAddress;
+        config["backend"]["port"] = instance.backendPort;
+        config["backend"]["address"] = instance.backendAddress;
         config["authentication"]["gameMasterPassword"] = sha256(instance.gameMasterPassword);
         config["authentication"]["blueCommanderPassword"] = sha256(instance.blueCommanderPassword);
         config["authentication"]["redCommanderPassword"] = sha256(instance.redCommanderPassword);
diff --git a/olympus.json b/olympus.json
index eda8964e..e40a4843 100644
--- a/olympus.json
+++ b/olympus.json
@@ -1,5 +1,5 @@
 {
-    "server": {
+    "backend": {
         "address": "localhost",
         "port": 3001
     },