From 7b2215e9da2c6e0e465996802b88d29b52a94b9a Mon Sep 17 00:00:00 2001
From: Logan Cusano <Logan@simplestepsolutions.com>
Date: Sat, 6 May 2023 15:22:28 -0400
Subject: [PATCH] Remove config files in favor of environment variables

---
 Server/config/databaseConfig.js       |  8 --------
 Server/config/discordConfig.js        |  5 -----
 Server/controllers/adminController.js |  4 ++--
 Server/libCore.js                     |  8 ++++----
 Server/libStorage.js                  |  8 ++++----
 Server/utilities/mysqlHandler.js      | 14 +++++++-------
 6 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 Server/config/databaseConfig.js
 delete mode 100644 Server/config/discordConfig.js

diff --git a/Server/config/databaseConfig.js b/Server/config/databaseConfig.js
deleted file mode 100644
index 79fe352..0000000
--- a/Server/config/databaseConfig.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const databaseConfig = {
-    database_host: '100.20.1.45',
-    database_user: 'DRB_CNC',
-    database_password: 'baMbC6IAl$Rn7$h0PS',
-    database_database: 'DRB_CNC'
-}
-
-module.exports = databaseConfig;
\ No newline at end of file
diff --git a/Server/config/discordConfig.js b/Server/config/discordConfig.js
deleted file mode 100644
index 06e4004..0000000
--- a/Server/config/discordConfig.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const discordConfig = {
-    channelID: '367396189529833476'
-}
-
-module.exports = discordConfig;
\ No newline at end of file
diff --git a/Server/controllers/adminController.js b/Server/controllers/adminController.js
index 480329b..46b6b8c 100644
--- a/Server/controllers/adminController.js
+++ b/Server/controllers/adminController.js
@@ -1,5 +1,5 @@
 // Config
-const discordConfig = require("../config/discordConfig");
+require('dotenv').config();
 // Debug
 const { DebugBuilder } = require("../utilities/debugBuilder.js");
 const log = new DebugBuilder("server", "adminController");
@@ -28,7 +28,7 @@ async function requestNodeListenToPreset(preset, nodeId, callback) {
     mysqlHandler.getNodeInfoFromId(nodeId, (nodeObject) =>{
         reqOptions = new requests.requestOptions("/bot/join", "POST", nodeObject.ip, nodeObject.port);
         requests.sendHttpRequest(reqOptions, JSON.stringify({
-            "channelID": discordConfig.channelID,
+            "channelID": process.env.DEFAULT_VOICE_CHANNEL_ID,
             "presetName": preset
         }), (responseObject) => {
             return callback(responseObject)
diff --git a/Server/libCore.js b/Server/libCore.js
index 81f6d3c..8d95b50 100644
--- a/Server/libCore.js
+++ b/Server/libCore.js
@@ -134,10 +134,10 @@ exports.updateFeeds = (client) => {
   if (!client) throw new Error("Client object not passed");
   // Create a temp pool to use for all connections while updating the feed
   var tempConnection = mysql.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASS,
-    database: process.env.DB_NAME,
+    host: process.env.EM_DB_HOST,
+    user: process.env.EM_DB_USER,
+    password: process.env.EM_DB_PASS,
+    database: process.env.EM_DB_NAME,
     connectionLimit: 10
   });
   
diff --git a/Server/libStorage.js b/Server/libStorage.js
index e36df63..3cc0d3a 100644
--- a/Server/libStorage.js
+++ b/Server/libStorage.js
@@ -17,10 +17,10 @@ const transactionsTable = process.env.DB_TRANSACTIONS_TABLE;
 const pricingTable = process.env.DB_PRICING_TABLE;
 
 var Connection = mysql.createPool({
-    host: process.env.DB_HOST,
-    user: process.env.DB_USER,
-    password: process.env.DB_PASS,
-    database: process.env.DB_NAME,
+    host: process.env.EM_DB_HOST,
+    user: process.env.EM_DB_USER,
+    password: process.env.EM_DB_PASS,
+    database: process.env.EM_DB_NAME,
     connectionLimit: 10
 });
 
diff --git a/Server/utilities/mysqlHandler.js b/Server/utilities/mysqlHandler.js
index d8939d3..06d21f4 100644
--- a/Server/utilities/mysqlHandler.js
+++ b/Server/utilities/mysqlHandler.js
@@ -1,15 +1,15 @@
+require('dotenv').config();
 const mysql = require('mysql');
-const databaseConfig = require('../config/databaseConfig');
 const utils = require('./utils');
-
+ 
 const connection = mysql.createPool({
-    host: databaseConfig.database_host,
-    user: databaseConfig.database_user,
-    password: databaseConfig.database_password,
-    database: databaseConfig.database_database
+    host: process.env.NODE_DB_HOST,
+    user: process.env.NODE_DB_USER,
+    password: process.env.NODE_DB_PASS,
+    database: process.env.NODE_DB_NAME
 });
 
-const nodesTable = `${databaseConfig.database_database}.nodes`;
+const nodesTable = `${process.env.NODE_DB_NAME}.nodes`;
 
 /** Get all nodes the server knows about regardless of status
  * @param {*} callback Callback function