From 48999e0d63ce5c84c9771e8a68f9d05d322c772b Mon Sep 17 00:00:00 2001
From: Logan Cusano <Logan@simplestepsolutions.com>
Date: Sun, 7 May 2023 19:31:53 -0400
Subject: [PATCH] Resolved bug in Client with .env config migration

---
 Client/controllers/clientController.js |  2 +-
 Client/utilities/httpRequests.js       | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Client/controllers/clientController.js b/Client/controllers/clientController.js
index 6b4b3cd..3bde31b 100644
--- a/Client/controllers/clientController.js
+++ b/Client/controllers/clientController.js
@@ -98,7 +98,7 @@ exports.checkIn = async () => {
     let reqOptions;
     await this.checkConfig();
     // Check if there is an ID found, if not add the node to the server. If there was an ID, check in with the server to make sure it has the correct information
-    if (clientId === 0) {
+    if (runningClientConfig.id === 0) {
         // ID was not found in the config, creating a new node
         reqOptions = new requests.requestOptions("/nodes/newNode", "POST");                
         requests.sendHttpRequest(reqOptions, JSON.stringify(), (responseObject) => {
diff --git a/Client/utilities/httpRequests.js b/Client/utilities/httpRequests.js
index ee98681..2f81ebf 100644
--- a/Client/utilities/httpRequests.js
+++ b/Client/utilities/httpRequests.js
@@ -5,19 +5,18 @@ const log = new DebugBuilder("client", "httpRequests");
 require('dotenv').config();
 // Modules
 const http = require("http");
-
-var runningClientConfig = new nodeObject({_id: process.env.CLIENT_ID, _ip: process.env.CLIENT_IP, _name: process.env.CLIENT_NAME, _port: process.env.CLIENT_PORT, _location: process.env.CLIENT_LOCATION, _nearbySystems: process.env.CLIENT_NEARBY_SYSTEMS, _online: process.env.CLIENT_ONLINE});
+const { nodeObject } = require("./recordHelper.js");
 
 exports.requestOptions = class requestOptions {
     constructor(path, method, hostname = undefined, headers = undefined, port = undefined) {
         if (method === "POST"){
-            this.hostname = hostname ?? runningClientConfig.hostname
-            this.path = path
-            this.port = port ?? runningClientConfig.port
-            this.method = method
+            this.hostname = hostname ?? process.env.SERVER_HOSTNAME ?? process.env.SERVER_IP;
+            this.path = path;
+            this.port = port ?? process.env.SERVER_PORT;
+            this.method = method;
             this.headers = headers ?? {
                 'Content-Type': 'application/json',
-            }
+            };
         }
     }
 }