Migration ES6: Config

Related OWASP#152
UlisesGascon · Jan 26, 2020 · a779d68 · a779d68
1 parent a5c959d
commit a779d68
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/config/config.js b/config/config.js
@@ -1,13 +1,13 @@
-var _ = require("underscore");
-var path = require("path");
+const _ = require("underscore");
+const path = require("path");
 
-var finalEnv = process.env.NODE_ENV || "development";
+const finalEnv = process.env.NODE_ENV || "development";
 
-var config = _.extend(
-    require(path.resolve(__dirname + "/../config/env/all.js")),
-    require(path.resolve(__dirname + "/../config/env/" + finalEnv.toLowerCase() + ".js") || {})
-);
+const allConf = require(path.resolve(__dirname + "/../config/env/all.js"))
+const envConf = require(path.resolve(__dirname + "/../config/env/" + finalEnv.toLowerCase() + ".js")) || {}
 
-console.log("Current Config:", config)
+const config = { ...allConf, ...envConf }
+
+console.log(`Current Config: ${config}`)
 
 module.exports = config;
diff --git a/config/env/all.js b/config/env/all.js
@@ -1,15 +1,15 @@
 // default app configuration
 
-var port = process.env.PORT || 4000;
-var db = process.env.MONGOLAB_URI || process.env.MONGODB_URI;
+const port = process.env.PORT || 4000;
+let db = process.env.MONGOLAB_URI || process.env.MONGODB_URI;
 
 if (!db) {
   db = process.env.NODE_ENV === 'test' ? "mongodb://localhost:27017/nodegoat" : "mongodb://nodegoat:owasp@ds159217.mlab.com:59217/nodegoat";
 }
 
 module.exports = {
-    port: port,
-    db:  db,
+    port,
+    db,
     cookieSecret: "session_cookie_secret_key_here",
     cryptoKey: "a_secure_key_for_crypto_here",
     cryptoAlgo: "aes256",