From 32beb3274d928af4df2415bc11b09846581a2a13 Mon Sep 17 00:00:00 2001
From: andreluis034 <andreluis034@users.noreply.github.com>
Date: Mon, 5 Mar 2018 10:27:54 +0000
Subject: [PATCH] refactor config file and db.js

---
 db.js               | 24 +++++++++++++++---------
 example.config.json | 11 +++++++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/db.js b/db.js
index 9939491..d6b0208 100644
--- a/db.js
+++ b/db.js
@@ -1,13 +1,19 @@
-let mongoist = require('mongoist'),
-    config = require('./config.json'),
-    user_database_name = 'nintendo_acts',
-    user_database_collection_name = 'users',
-    user_database, user_collection;
+const mongoist = require('mongoist');
+const config = require('./config.json');
+const user_database_collection_name = 'users';
+const database = config.mongo.database
+const hostname = config.mongo.hostname
+const port     = config.mongo.port
+const auth     = config.mongo.authentication
 
-let username = config.mongo.nintendo_acts.username;
-let password = config.mongo.nintendo_acts.password;
-let hostname = config.mongo.nintendo_acts.hostname;
-let connection_string = 'mongodb://' + username + ':' + password + '@' + hostname + '/' + user_database_name + '?authSource=admin';
+let connection_string = '';
+
+if(config.mongo.use_authentication) {
+    connection_string = `mongodb://${auth.username}:${auth.password}@${hostname}:${port}/\
+        ${user_database_name}?authSource=${auth.authentication_database}` 
+}else {
+    connection_string = `mongodb://${hostname}:${port}/${user_database_name}`
+}
 
 user_database = mongoist(connection_string);
 user_collection = user_database.collection(user_database_collection_name);
diff --git a/example.config.json b/example.config.json
index 4a8ed22..1acce34 100644
--- a/example.config.json
+++ b/example.config.json
@@ -4,10 +4,17 @@
         "password": "password"
     },
     "mongo": {
-        "database_name": {
+        "database": "foo",
+        "hostname": "localhost",
+        "port": 27017,
+        "use_authentication": true,
+        "authentication": {
             "username": "username",
             "password": "password",
-            "hostname": "localhost"
+            "authentication_database": "admin"
         }
+    },
+    "http": {
+        "port": 8080
     }
 }
\ No newline at end of file