new file: config/keys_sample.js mirroring ./config/keys.js

	separate dotenv initialization:   index.js
	new file:   loadSecrets.js  load secret keys as a export module
	modified:   routes/currency-exchange-routes.js
	modified:   routes/weatherbit-routes.js

Author: hurricanemark

config/keys_sample.js

@@ -0,0 +1,27 @@
+// add this file to .gitignore
+
+const keys = {
+    google: {
+        GOOGLECLIENT_ID: 'xxxxxxxxxx',
+        GOOGLECLIENT_SECRET: 'xxxxxxxxxxx'
+    },
+    mongodb: {
+        MONGODB_CONSTR: 'mongodb+srv://[userid]:[password]@cluster0.brf1j.mongodb.net/oautho?authSource=admin&replicaSet=Cluster0-shard-0&readPreference=primary&ssl=true'
+    },
+    session: {
+        cookieKey: 'xxxxxxxxxxxxxxxx'
+    },
+    development: {
+        port: '1111',
+    },
+    weatherbitapi: {
+        WEATHERBIT_URI: 'https://api.weatherbit.io/v2.0/',
+        WEATHERBIT_APIKEY: 'xxxxxxxxxxxxxxxx'
+    },
+    exchangerateapi: {
+        EXCHANGERATE_URI: 'https://v6.exchangerate-api.com/v6/',
+        EXCHANGERATE_APIKEY: 'xxxxxxxxxxxxxxxxxxxxx',
+    }
+};
+
+export { keys };

index.js

@@ -9,38 +9,7 @@ import { compile } from 'ejs';
 import { serialize, deserialize, googleStrategy } from './config/passport-setup.js';
 import {encryptAES, decryptAES} from './crypto.js';
 
-// dev env
-dotenv.config();
-
-// application secrets
-// import { keys } from './config/keys.js';  
-
-let EXCHANGE_RATE_APIKEY;
-let EXCHANGE_BASE_URI='https://v6.exchangerate-api.com/v6/';
-let WEATHERBIT_KEY;
-let WEATHERBIT_URI='https://api.weatherbit.io/v2.0/';
-let GoogleclientID;
-let GoogleclientSecret;
-let MongoDBConString;
-let CookieKey = 'c93da061ab7f984267e36c8431645035d611bc892c58f0e64614c68a4384a179126e7ed0b5829e460f292f72e9ef4facb68a0894cb2425ba046b82a3bae0b529';
-
-if (process.env.NODE_ENV === "production") {
-    EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
-    WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
-    GoogleclientID = process.env.GoogleclientID;
-    GoogleclientSecret = process.env.GoogleclientSecret;    
-    MongoDBConString = process.env.MONGODB_URI;
-} else {
-    // dynamically importing keys.js using promise:
-    import('./config/keys.js').then((secrets) => {
-      EXCHANGE_RATE_APIKEY = secrets.keys.exchangerateapi.EXCHANGE_APIKEY;
-      WEATHERBIT_KEY = secrets.keys.weatherbitapi.WEATHERBIT_APIKEY;
-      GoogleclientID = secrets.keys.google.clientID;
-      GoogleclientSecret = secrets.keys.google.clientSecret;
-      MongoDBConString = secrets.keys.mongodb.connectionString;
-    });
-}
-
+import { CookieKey, MongoDBConString } from './loadSecrets.js';
 
 // Create network routing
 const app = express();
@@ -130,5 +99,3 @@ app.listen(port, () => {
     console.log('Sorry, failed to launch.');
   }
 });
-
-export { EXCHANGE_RATE_APIKEY, EXCHANGE_BASE_URI, WEATHERBIT_KEY, WEATHERBIT_URI,  GoogleclientID, GoogleclientSecret };

loadSecrets.js

@@ -0,0 +1,65 @@
+/* IMPORTANT SECRETS */
+/*
+ * To load environment variables, this file must be initialized 
+ * at the top of the application 
+ * 
+ * This file depends on ./config/keys.js in development mode!
+ */
+
+import * as dotenv from 'dotenv';
+
+// dev env
+dotenv.config();
+
+let EXCHANGE_RATE_APIKEY;
+let WEATHERBIT_KEY;
+let GoogleclientID;
+let GoogleclientSecret;
+let MongoDBConString;
+let WEATHERBIT_URI='https://api.weatherbit.io/v2.0/';
+let EXCHANGE_RATE_URI='https://v6.exchangerate-api.com/v6/';
+let CookieKey = 'c93da061ab7f984267e36c8431645035d611bc892c58f0e64614c68a4384a179126e7ed0b5829e460f292f72e9ef4facb68a0894cb2425ba046b82a3bae0b529';
+
+if (process.env.NODE_ENV === "production") {
+    EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
+    WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
+    GoogleclientID = process.env.GOOGLECLIENT_ID;
+    GoogleclientSecret = process.env.GOOGLECLIENT_SECRET;    
+    MongoDBConString = process.env.MONGODB_URI;
+    console.log('Loaded keys from dotenv');
+} else {
+    // dynamically importing keys.js using promise:
+    let secrets = await getSecrets();
+    // console.log(secrets);
+    if(secrets) {
+      EXCHANGE_RATE_APIKEY = secrets.keys.exchangerateapi.EXCHANGERATE_APIKEY;
+      WEATHERBIT_KEY = secrets.keys.weatherbitapi.WEATHERBIT_APIKEY;
+      GoogleclientID = secrets.keys.google.GOOGLECLIENT_ID;
+      GoogleclientSecret = secrets.keys.google.GOOGLECLIENT_SECRET;
+      MongoDBConString = secrets.keys.mongodb.MONGODB_CONSTR;
+    };
+}
+
+/*
+ * Async function loading keys dynamically from ./config/keys.js
+ * IMPORTANT NOTE: ./config/keys.js is not saved in the archive!
+ * It is meant to be used in development environment only.
+ * For `production` build, you must change NODE_ENV accordingly.
+ */
+function getSecrets(){
+    return new Promise(resolve => {
+      setTimeout(() => {
+        try {
+            import('./config/keys.js').then((secrets) => {
+                resolve(secrets);
+            });
+        } catch (err) {
+            console.log(err);
+            resolve(null);
+        }
+      })
+    }, 200);
+}
+
+
+export { EXCHANGE_RATE_APIKEY, EXCHANGE_RATE_URI, WEATHERBIT_KEY, WEATHERBIT_URI, GoogleclientID, GoogleclientSecret, CookieKey, MongoDBConString };

routes/currency-exchange-routes.js

@@ -1,8 +1,8 @@
 import { data as currencyCodes } from 'currency-codes';
 import request from 'request';
 import express from 'express';
-import { EXCHANGE_RATE_APIKEY, EXCHANGE_BASE_URI } from '../index.js';
 
+import { EXCHANGE_RATE_APIKEY, EXCHANGE_RATE_URI } from '../loadSecrets.js';
 
 const router = express.Router();
 
@@ -34,11 +34,11 @@ router.post('/', (req, res) => {
 function getExchangeRateData(fromCurrency, toCurrency, amount) {
     return new Promise(resolve => {
       setTimeout(() => {
-        let URLStr = EXCHANGE_BASE_URI + EXCHANGE_RATE_APIKEY + '/pair/' + fromCurrency + '/' + toCurrency + '/' + amount;
+        let URLStr = EXCHANGE_RATE_URI + EXCHANGE_RATE_APIKEY + '/pair/' + fromCurrency + '/' + toCurrency + '/' + amount;
   console.log(URLStr);
         try {
           if (fromCurrency === undefined) {
-            URLStr = EXCHANGE_BASE_URI + EXCHANGE_RATE_APIKEY + '/pair/EUR/GBP/1';
+            URLStr = EXCHANGE_RATE_URI + EXCHANGE_RATE_APIKEY + '/pair/EUR/GBP/1';
           }
           console.log("Calling URL: " + URLStr);
           request(URLStr, async function (err, response, body) {

routes/weatherbit-routes.js

@@ -1,21 +1,10 @@
 import express from 'express';
 import request from 'request';
 
-import { WEATHERBIT_KEY, WEATHERBIT_URI } from '../index.js';
+import { WEATHERBIT_KEY, WEATHERBIT_URI } from '../loadSecrets.js';
 
 const router = express.Router();
 
-// let WEATHERBIT_KEY;
-// let WEATHERBIT_URI;
-
-// if (process.env.NODE_ENV === "production") {
-//     WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
-//     WEATHERBIT_URI = process.env.WEATHERBIT_URI;
-// } else {
-//     WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
-//     WEATHERBIT_URI = keys.weatherbitapi.BASE_URI;
-// }
-
 router.get('/', (req, res) => {
     res.render('pages/weatherbit', {user: req.user});
 });