Merge pull request #56 from hurricanemark/Phase4-TeamRolEmiSeriousWorks

Passing keys from index.js to routes handler

Author: hurricanemark

index.js

@@ -7,6 +7,28 @@ import {encryptAES, decryptAES} from './crypto.js';
 // dev env
 dotenv.config();
 
+let EXCHANGE_RATE_APIKEY;
+let BASE_URI;
+let SAMPLE2_URI;
+let WEATHERBIT_KEY;
+let WEATHERBIT_URI;
+
+if (process.env.NODE_ENV === "production") {
+    EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
+    BASE_URI = process.env.EXCHANGE_BASE_URI;
+    SAMPLE2_URI = process.env.SAMPLE2_URI;
+    WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
+    WEATHERBIT_URI = process.env.WEATHERBIT_URI;    
+} else {
+    EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
+    BASE_URI = keys.exchangerateapi.BASE_URI;
+    SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
+    WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
+    WEATHERBIT_URI = keys.weatherbitapi.BASE_URI;
+}
+
+
+
 // Create network routing
 const app = express();
 
@@ -69,3 +91,5 @@ app.listen(port, () => {
     console.log('Sorry, failed to launch.');
   }
 });
+
+export { EXCHANGE_RATE_APIKEY, BASE_URI, SAMPLE2_URI, WEATHERBIT_KEY, WEATHERBIT_URI };

routes/currency-exchange-routes.js

@@ -1,21 +1,20 @@
 import { data as currencyCodes } from 'currency-codes';
 import request from 'request';
 import express from 'express';
+import { EXCHANGE_RATE_APIKEY, BASE_URI, SAMPLE2_URI } from '../index.js';
 
-import { keys } from '../config/keys.js';
-
-let EXCHANGE_RATE_APIKEY;
-let BASE_URI;
-let SAMPLE2_URI;
-if (process.env.NODE_ENV === "production") {
-    EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
-    BASE_URI = process.env.EXCHANGE_BASE_URI;
-    SAMPLE2_URI = process.env.SAMPLE2_URI;
-} else {
-    EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
-    BASE_URI = keys.exchangerateapi.BASE_URI;
-    SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
-}
+// let EXCHANGE_RATE_APIKEY;
+// let BASE_URI;
+// let SAMPLE2_URI;
+// if (process.env.NODE_ENV === "production") {
+//     EXCHANGE_RATE_APIKEY = process.env.EXCHANGE_RATE_APIKEY;
+//     BASE_URI = process.env.EXCHANGE_BASE_URI;
+//     SAMPLE2_URI = process.env.SAMPLE2_URI;
+// } else {
+//     EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
+//     BASE_URI = keys.exchangerateapi.BASE_URI;
+//     SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
+// }
 
 const router = express.Router();
 

routes/weatherbit-routes.js

@@ -1,18 +1,20 @@
 import express from 'express';
 import request from 'request';
-import { keys } from '../config/keys.js';
+
+import { WEATHERBIT_KEY, WEATHERBIT_URI } from '../index.js';
+
 const router = express.Router();
 
-let WEATHERBIT_KEY;
-let WEATHERBIT_URI;
+// 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;
-}
+// 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');