Merge pull request #53 from hurricanemark/Phase4-TeamRolEmiSeriousWorks

Correcting build error on environment variables

Author: hurricanemark

index.js

@@ -4,6 +4,11 @@ import express from 'express';
 import bodyParser from 'body-parser';
 import {encryptAES, decryptAES} from './crypto.js';
 
+// dev env
+dotenv.config();
+
+// Create network routing
+const app = express();
 
 // application secrets
 import { keys } from './config/keys.js';  
@@ -14,11 +19,9 @@ import { router as currencyExchangeRoutes } from './routes/currency-exchange-rou
 // routes handler for WeatherBit.io API methods
 import { router as weatherbitRoutes } from './routes/weatherbit-routes.js';
 
-// dev env
-dotenv.config();
+// routes handler for OAuth20 methods
+import { router as oauth20Routes } from './routes/auth-routes.js';
 
-// Create network routing
-const app = express();
 
 // EJS is accessed by default in the views directory.
 app.set('view engine', 'ejs');
@@ -35,6 +38,9 @@ app.use('/exchange', currencyExchangeRoutes);
 // Set up all routes to WeatherBit reports
 app.use('/weatherbit', weatherbitRoutes);
 
+// Set up all routes related to oauth2 methods
+app.use('/auth', oauth20Routes);
+
 // Homepage: get the locale from the client-side via the ejs form
 app.get('/', (req, res) => {
   res.render('index', {xkey: 'hey'});

models/user-models.js

@@ -1,4 +1,4 @@
-const mongoose = require('mongoose');
+import mongoose from 'mongoose';
 const Schema = mongoose.Schema;
 
 const userSchema = new Schema({
@@ -9,4 +9,5 @@ const userSchema = new Schema({
 
 const User = mongoose.model('user', userSchema);
 
-module.exports = User;
+// module.exports = User;
+export { User };

routes/auth-routes.js

@@ -1,8 +1,9 @@
-const router = require('express').Router();
-const passport = require('passport');
-const { rawListeners } = require('../models/user-models');
+import express from 'express';
+import passport from 'passport';
 
 
+const router = express.Router();
+
 // auth login
 router.get('/login', (req, res) => {
     res.render('login', {user: req.user});
@@ -33,4 +34,4 @@ router.get('/google/redirect', passport.authenticate('google'), (req, res) => {
 });
 
 
-module.exports = router;
+export { router };

routes/currency-exchange-routes.js

@@ -1,7 +1,22 @@
 import { data as currencyCodes } from 'currency-codes';
 import request from 'request';
 import express from 'express';
+
 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.BASE_URI;
+    SAMPLE2_URI = process.env.SAMPLE2_URI;
+} else {
+    EXCHANGE_RATE_APIKEY = keys.exchangerateapi.APIKEY;
+    BASE_URI = keys.exchangerateapi.URI;
+    SAMPLE2_URI = keys.exchangerateapi.SAMPLE2_URI;
+}
+
 const router = express.Router();
 
 
@@ -32,13 +47,11 @@ router.post('/', (req, res) => {
 function getExchangeRateData(fromCurrency, toCurrency, amount) {
     return new Promise(resolve => {
       setTimeout(() => {
-        let XchangeKey = process.env.EXCHANGE_RATE_APIKEY;
-        let XchangeURI = process.env.BASE_URI;
-        let URLStr = XchangeURI + XchangeKey + '/pair/' + fromCurrency + '/' + toCurrency + '/' + amount;
-  
+        let URLStr = BASE_URI + EXCHANGE_RATE_APIKEY + '/pair/' + fromCurrency + '/' + toCurrency + '/' + amount;
+  console.log(URLStr);
         try {
           if (fromCurrency === undefined) {
-            URLStr = process.env.SAMPLE2_URI;
+            URLStr = SAMPLE2_URI;
           }
           console.log("Calling URL: " + URLStr);
           request(URLStr, async function (err, response, body) {

routes/weatherbit-routes.js

@@ -3,10 +3,16 @@ import request from 'request';
 import { keys } from '../config/keys.js';
 const router = express.Router();
 
-let WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
-let WEATHERBIT_URI = keys.weatherbitapi.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.URI;
+}
 
 router.get('/', (req, res) => {
     res.render('pages/weatherbit');

views/index.ejs

@@ -16,7 +16,6 @@
     <input type="hidden" id="xcree" name="xcree" value="ZTg4ZTFhODA5NmNkNDg5N2I3OWIyMzBhOWM0OWIyNDM=">
     <div id="geoLatLng" action="showPosition()">
         <!-- pinpoint positon verbish will be loaded into here -->
-        <!-- <p><%= xkey %></p> -->
     </div>
     <hr>
     <p>Take the load off, sit down, look up.  The weather is telling us something about our past actions. </p>

views/pages/utils.ejs

@@ -1,7 +1,6 @@
 <%
 const MOON = '🌙';
 const SUN = '☀️';
-
 // convert unix_timestamp to local datetime
 unixTsToLocalTime = (unix_ts) => {
     // Create a new JavaScript Date object based on the timestamp
@@ -13,11 +12,9 @@ unixTsToLocalTime = (unix_ts) => {
     var minutes = "0" + date.getMinutes();
     // Seconds part from the timestamp
     var seconds = "0" + date.getSeconds();
-
     // Will display time in 10:30:23 format
     return hours + ':' + minutes.substr(-2) + ':' + seconds.substr(-2);
 }
-
 trendingTemperature = (dataArr) => {
     var sum = 0;
     for (var item of dataArr) {
@@ -35,7 +32,6 @@ trendingTemperature = (dataArr) => {
         else { return "Considerable warming trend ahead."; }
     }
 }
-
 // check if client allows saving session data
 storageAvailable = (type) => {
     let storage;
@@ -61,26 +57,21 @@ storageAvailable = (type) => {
             (storage && storage.length !== 0);
     }
 }
-
 // save data to session memory client-side 
 saveClientData = (key, value) => {
     if (storageAvailable(String)) {
         // Yippee! We can use localStorage awesomeness
         // Save data to sessionStorage
         sessionStorage.setItem(key, value);
-
         // Get saved data from sessionStorage
         let data = sessionStorage.getItem(key);
-
         alert(methodString +' says my data is ' + data);
-
     }
     else {
         // Too bad, no localStorage for us
         alert(methodString + ' says Web Storage API is disabled.')
     }
 }
-
 // retrieve saved session data
 getClientData = (key) => {
     if (storageAvailable(String)) {
@@ -89,11 +80,9 @@ getClientData = (key) => {
         return null;
     }
 }
-
 // delete session data
 deleteClientData = (key) => {
     // Remove saved data from sessionStorage
     sessionStorage.removeItem(key); 
 }
-
 %>