Trim down configuration variables

Author: aesclever

index.js

@@ -11,29 +11,22 @@ dotenv.config();
 // import { keys } from './config/keys.js';  
 
 let EXCHANGE_RATE_APIKEY;
-let BASE_URI;
-let SAMPLE2_URI;
+let EXCHANGE_BASE_URI='https://v6.exchangerate-api.com/v6/';
 let WEATHERBIT_KEY;
-let WEATHERBIT_URI;
+let WEATHERBIT_URI='https://api.weatherbit.io/v2.0/';
 let GoogleclientID;
 let GoogleclientSecret;
 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;
     GoogleclientID = process.env.GoogleclientID;
     GoogleclientSecret = process.env.GoogleclientSecret;    
 
 } else {
     // dynamically importing keys.js using promise:
     import('./config/keys.js').then((secrets) => {
       EXCHANGE_RATE_APIKEY = secrets.keys.exchangerateapi.EXCHANGE_APIKEY;
-      BASE_URI = secrets.keys.exchangerateapi.EXCHANGE_BASE_URI;
-      SAMPLE2_URI = secrets.keys.exchangerateapi.SAMPLE2_URI;
       WEATHERBIT_KEY = secrets.keys.weatherbitapi.WEATHERBIT_APIKEY;
-      WEATHERBIT_URI = secrets.keys.weatherbitapi.WEATHERBIT_BASE_URI;
       GoogleclientID = secrets.keys.google.clientID;
       GoogleclientSecret = secrets.keys.google.clientSecret;
     });
@@ -103,4 +96,4 @@ app.listen(port, () => {
   }
 });
 
-export { EXCHANGE_RATE_APIKEY, BASE_URI, SAMPLE2_URI, WEATHERBIT_KEY, WEATHERBIT_URI,  GoogleclientID, GoogleclientSecret };
+export { EXCHANGE_RATE_APIKEY, EXCHANGE_BASE_URI, WEATHERBIT_KEY, WEATHERBIT_URI,  GoogleclientID, GoogleclientSecret };

routes/currency-exchange-routes.js

@@ -1,20 +1,8 @@
 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 { EXCHANGE_RATE_APIKEY, EXCHANGE_BASE_URI } from '../index.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;
-// }
 
 const router = express.Router();
 
@@ -46,11 +34,11 @@ router.post('/', (req, res) => {
 function getExchangeRateData(fromCurrency, toCurrency, amount) {
     return new Promise(resolve => {
       setTimeout(() => {
-        let URLStr = BASE_URI + EXCHANGE_RATE_APIKEY + '/pair/' + fromCurrency + '/' + toCurrency + '/' + amount;
+        let URLStr = EXCHANGE_BASE_URI + EXCHANGE_RATE_APIKEY + '/pair/' + fromCurrency + '/' + toCurrency + '/' + amount;
   console.log(URLStr);
         try {
           if (fromCurrency === undefined) {
-            URLStr = SAMPLE2_URI;
+            URLStr = EXCHANGE_BASE_URI + EXCHANGE_RATE_APIKEY + '/pair/EUR/GBP/1';
           }
           console.log("Calling URL: " + URLStr);
           request(URLStr, async function (err, response, body) {

routes/weatherbit-routes.js

@@ -53,16 +53,11 @@ function getWeatherAlerts(city){
         city = "&city=" + city;
       }
 
-      var Xcode = "";
-      if (process.env.NODE_ENV === 'awsdeploy') {
-        Xcode = JSON.parse(decryptAES(WEATHERBIT_KEY)).text;
-      } else { 
-        Xcode = WEATHERBIT_KEY;
-      }
+
 
       setTimeout(() => {
         // https://api.weatherbit.io/v2.0/alerts?lat=39.75895&lon=-84.19161&key=API_KEY
-        let uriWeatherBitStr = `${WEATHERBIT_URI}alerts?units=I${city}&key=${Xcode}`;
+        let uriWeatherBitStr = `${WEATHERBIT_URI}alerts?units=I${city}&key=${WEATHERBIT_KEY}`;
         let retCode;
         if (WEATHERBIT_URI.length === 0) {
           console.log('Failed to get API URI!');
@@ -107,16 +102,10 @@ function getWeatherAlerts(city){
         city = "&city=" + city;
       }
 
-      var Xcode = "";
-      if (process.env.NODE_ENV === 'awsdeploy') {
-        Xcode = JSON.parse(decryptAES(WEATHERBIT_KEY)).text;
-      } else { 
-        Xcode = WEATHERBIT_KEY;
-      }
 
       setTimeout(() => {
 
-        let uriWeatherBitStr = `${WEATHERBIT_URI}current?units=I${city}&key=${Xcode}`;
+        let uriWeatherBitStr = `${WEATHERBIT_URI}current?units=I${city}&key=${WEATHERBIT_KEY}`;
         let retCode;
         if (WEATHERBIT_URI.length === 0) {
           console.log('Failed to get aws secrets!');
@@ -159,15 +148,8 @@ function getWeatherAlerts(city){
         city = "&city=" + city;
       }
 
-      var Xcode = "";
-      if (process.env.NODE_ENV === 'awsdeploy') {
-        Xcode = JSON.parse(decryptAES(WEATHERBIT_KEY)).text;
-      } else { 
-        Xcode = WEATHERBIT_KEY;
-      }
-  
       setTimeout(() => {
-        let uriWeatherBitStr = `${WEATHERBIT_URI}forecast/daily?units=I${city}&key=${Xcode}`;
+        let uriWeatherBitStr = `${WEATHERBIT_URI}forecast/daily?units=I${city}&key=${WEATHERBIT_KEY}`;
         let retCode;
         // console.log(uriWeatherBitStr);
         try {
@@ -204,12 +186,6 @@ function getWeatherAlerts(city){
         city = "?city=" + city;
       }
 
-      var Xcode = "";
-      if (process.env.NODE_ENV === 'awsdeploy') {
-        Xcode = JSON.parse(decryptAES(WEATHERBIT_KEY)).text;
-      } else { 
-        Xcode = WEATHERBIT_KEY;
-      }
 
       setTimeout(() => {
         let e =  new Date().toISOString().slice(0, 16).replace('T', ' ')
@@ -221,7 +197,7 @@ function getWeatherAlerts(city){
         let startdate = s.split(' ')[0];
 
         let retCode;
-        let uriWeatherBitAPIStr = `${WEATHERBIT_URI}history/airquality${city}&start_date=${startdate}&end_date=${enddate}&key=${Xcode}`;
+        let uriWeatherBitAPIStr = `${WEATHERBIT_URI}history/airquality${city}&start_date=${startdate}&end_date=${enddate}&key=${WEATHERBIT_KEY}`;
 
         // console.log(uriWeatherBitAPIStr);
         try {