Merge pull request #69 from hurricanemark/Phase4-TeamRolEmiSeriousWorks

Phase4 team rol emi serious works

Author: hurricanemark

.dockerignore

@@ -10,4 +10,5 @@
 **/.aws
 **/dist
 **/utils.js
-**/index.copy.js
+**/index.copy.js
+**/config/keys.js

.gitignore

@@ -9,4 +9,5 @@ index.copy.js
 public/tests
 currencyRate.js
 views/index-temp.ejs
-config/keys.js
+config/keys.js
+Dockerfile.debug

README.md

@@ -195,6 +195,58 @@ To access the Local Weather app running in docker container, point your browser
 For the purpose of hosting this app, we select [Cyclic free-for-life tier](https://app.cyclic.sh/api/login).
 Cyclic deploys full stack NodeJS apps on AWS infrastructure directly from GitHub. It works by integrating with your GitHub repos. It will build and deploy your code on every merge or push to your default branch.
 
+**Build log on Cylic**
+
+To avoid building from the main branch on Cylic, you can specify build source as a git staging branch.
+
+```c
+2022-11-19 08:49:39: [CYCLIC] Building...
+2022-11-19 08:49:39: [CYCLIC] cloning...
+2022-11-19 08:49:40: From https://github.com/hurricanemark/Weather_Report_NodeJS_EJS_Express_WeatherBit_API
+ * branch            46b9aa68f54072cc8cf20f8936c79ad2bceaf306 -> FETCH_HEAD
+2022-11-19 08:49:40: HEAD is now at 46b9aa6 Merge pull request #62 from hurricanemark/Phase4-TeamRolEmiSeriousWorks
+2022-11-19 08:49:40: [CYCLIC] verifying...
+2022-11-19 08:49:40: [CYCLIC] using: node:v16.18.1 npm:8.11.0 runtime:nodejs16.x
+[CYCLIC] building from: /
+2022-11-19 08:49:40: [CYCLIC] installing dependencies from: package-lock.json
+2022-11-19 08:49:40: npm
+2022-11-19 08:49:40:  WARN config production Use `--omit=dev` instead.
+2022-11-19 08:49:47: npm 
+2022-11-19 08:49:47: WARN deprecated w3c-hr-time@1.0.2: Use your platform's native performance.now() and performance.timeOrigin.
+2022-11-19 08:49:48: npm 
+2022-11-19 08:49:48: WARN deprecated uuid@3.4.0: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
+2022-11-19 08:49:48: npm WARN deprecated querystring@0.2.0: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+2022-11-19 08:49:50: npm WARN
+2022-11-19 08:49:50:  deprecated har-validator@5.1.5: this library is no longer supported
+2022-11-19 08:49:51: npm WARN deprecated request@2.88.2: request has been deprecated, see https://github.com/request/request/issues/3142
+2022-11-19 08:49:59: 
+added 925 packages in 18s
+2022-11-19 08:49:59: npm notice 
+npm notice New major version of npm available! 8.11.0 -> 9.1.2
+npm notice Changelog: <https://github.com/npm/cli/releases/tag/v9.1.2>
+npm notice Run `npm install -g npm@9.1.2` to update!
+npm notice 
+2022-11-19 08:49:59: [CYCLIC] running build if defined...
+2022-11-19 08:49:59: [CYCLIC] pruning dev dependencies...
+2022-11-19 08:50:01: 
+up to date, audited 489 packages in 2s
+2022-11-19 08:50:01: 
+52 packages are looking for funding
+  run `npm fund` for details
+
+found 0 vulnerabilities
+2022-11-19 08:50:01: [CYCLIC] packaging 187.66 MB...
+2022-11-19 08:50:01: [CYCLIC] bundling from / ...
+2022-11-19 08:50:06: [CYCLIC] done packaging
+[CYCLIC] deploying...
+2022-11-19 08:50:16: deployed us-west-2 -  10.168s
+2022-11-19 08:50:16: SUCCESS
+
+took 36.7 seconds
+api deployed at:
+https://cute-teal-pigeon-sari.cyclic.app
+```
+
 Please do not abuse this live website below.  Thank you!
 [Live demo](https://techrolemiweather.cyclic.app/about)
 

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 };

config/passport-setup.js

@@ -1,15 +1,18 @@
-const passport = require('passport');
-const GoogleStrategy = require('passport-google-oauth20');
-const User = require('../models/user-models');
-// const keys = require ('./keys');
-import { GoogleclientID, GoogleclientSecret } from './../index.js';
+
+import passport  from 'passport';
+import GoogleStrategy  from 'passport-google-oauth20';
+import { User } from '../models/user-models.js';
+
+import { GoogleclientID, GoogleclientSecret } from '../loadSecrets.js';
+
+// const logging = console.log(GoogleclientID + '  ---  ' + GoogleclientSecret);
 
 // serialize user structure in the mongodb
-passport.serializeUser((user, done) => {
+const serialize = passport.serializeUser((user, done) => {
     done(null, user.id);
 });
 
-passport.deserializeUser((id, done) => {
+const deserialize = passport.deserializeUser((id, done) => {
 try {
     User.findById(id).then((user) => {
         done(null, user);
@@ -28,11 +31,15 @@ try {
  * 
  * Go to https://console.cloud.google.com/ to create your own clientID and clientSecret.
  */
-passport.use(new GoogleStrategy({
+const googleStrategy = passport.use(new GoogleStrategy({
     // options for google strategy
-    callbackURL: '/auth/google/redirect',
+    callbackURL: 'https://techrolemiweather.cyclic.app/auth/google/redirect',
+    // callbackURL: '/auth/google/redirect',
+    // clientID: keys.google.clientID, 
+    // clientSecret: keys.google.clientSecret
     clientID: GoogleclientID,
     clientSecret: GoogleclientSecret
+
 }, (accessToken, refreshToken, profile, done) => {
     // passport callback function
     // console.log('accessToken: ' + accessToken);
@@ -60,4 +67,6 @@ passport.use(new GoogleStrategy({
         }
     })
 
-}));
+}));
+
+export { serialize, deserialize, googleStrategy };

index.js

@@ -2,38 +2,14 @@ import * as dotenv from 'dotenv';
 import request from 'request';
 import express from 'express';
 import bodyParser from 'body-parser';
+import cookieSession from 'cookie-session';
+import passport from 'passport';
+import mongoose from 'mongoose';
+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;
-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;    
-
-} 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;
-    });
-
-}
-
-
+import { CookieKey, MongoDBConString } from './loadSecrets.js';
 
 // Create network routing
 const app = express();
@@ -48,6 +24,8 @@ import { router as weatherbitRoutes } from './routes/weatherbit-routes.js';
 // routes handler for OAuth20 methods
 import { router as oauth20Routes } from './routes/auth-routes.js';
 
+// routes handler for profile
+import { router as profileRoutes } from './routes/profile-routes.js';
 
 // EJS is accessed by default in the views directory.
 app.set('view engine', 'ejs');
@@ -58,6 +36,29 @@ app.use(express.static('public'));
 // Parse incoming request bodies in a middleware before your handlers, available under the `req.body` property.
 app.use(bodyParser.urlencoded({ extended: true }));
 
+
+
+// cookie!
+app.use(cookieSession({
+  maxAge: 24 * 60 * 60 * 1000,
+  keys: [CookieKey]
+}));
+
+
+// Initialize passport
+app.use(passport.initialize());
+app.use(passport.session());
+
+
+// connect to mongodb
+mongoose.connect(MongoDBConString, () => {
+        console.log('Connected to MongoDB.');
+    });
+
+
+
+
+
 // Set up all routes related to currency exchange rate methods
 app.use('/exchange', currencyExchangeRoutes);
 
@@ -67,14 +68,17 @@ app.use('/weatherbit', weatherbitRoutes);
 // Set up all routes related to oauth2 methods
 app.use('/auth', oauth20Routes);
 
+// set up routes for user info after logged in
+app.use('/profile', profileRoutes);
+
 // Homepage: get the locale from the client-side via the ejs form
 app.get('/', (req, res) => {
-  res.render('index', {xkey: 'hey'});
+  res.render('index', {user: req.user, xkey: 'hey'});
 })
 
 // about page
 app.get('/about', function(req, res) {
-  res.render('pages/about');
+  res.render('pages/about', {user: req.user});
 });
 
 
@@ -86,14 +90,12 @@ app.listen(port, () => {
 }).on('error', (e) => {
   console.log('Error happened: ', e.message);
   // try different port
-  try {
-    port = process.env.PORT2;
-    app.listen(port, () => {
-      console.log(`TechRolEmi is listening on port ${port}`);
-    })
-  } catch (e) {
-    console.log('Sorry, failed to launch.');
-  }
+  // try {
+  //   port = process.env.PORT2;
+  //   app.listen(port, () => {
+  //     console.log(`TechRolEmi is listening on port ${port}`);
+  //   })
+  // } catch (e) {
+  //   console.log('Sorry, failed to launch.');
+  // }
 });
-
-export { EXCHANGE_RATE_APIKEY, EXCHANGE_BASE_URI, WEATHERBIT_KEY, WEATHERBIT_URI,  GoogleclientID, GoogleclientSecret };

loadSecrets.js

@@ -0,0 +1,64 @@
+/* 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.EXCHANGERATE_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 };