modified: .gitignore

	modified:   README.md
	new file:   TODOs.md
	new file:   config/passport-setup.js
	modified:   index.js
	new file:   models/user-models.js
	modified:   package-lock.json
	modified:   package.json
	modified:   public/README.md
	new file:   routes/auth-routes.js
	new file:   routes/profile-routes.js

Author: aesclever

.gitignore

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

README.md

@@ -24,7 +24,7 @@ There are weather detection stations situated in and around you.  The inner work
 
 <br />
 
-> Below is the template for a rudimentary completion of an example on interfacing with a weather data provider.  <br /><span style="color:green">For indepth logics and real life data implementation, continue to</span> [here](public/README.md).
+> Below is the template for a rudimentary completion of an example on interfacing with a weather data provider.  <br /><span style="color:green">For indepth logics and real life data implementation, continue to</span> [HERE!](public/README.md).
 
 <br />
 
@@ -49,7 +49,7 @@ First, you will need to change your `package.json` to include:
 
 Then, use imports in your `index.js`.  Here is an express start with dotenv:
 
-```c
+```javascript
 import dotenv  from "dotenv"
 import express from "express"
 
@@ -218,7 +218,7 @@ We will choose [Selenium IDE chrome extension](https://chrome.google.com/webstor
 
 4. Install [`selenium-side-runner`](https://www.selenium.dev/selenium-ide/docs/en/introduction/command-line-runner), then run the test script above from the command console.
 
-```c
+```c#
   StagingProjs> selenium-side-runner .\public\tests\SeleniumIDE_ChromeTestWeatherBitApp.side -c "browserName=chrome"
 
   info: Running test UITests

TODOs.md

@@ -0,0 +1,11 @@
+# TODOs
+
+1. Clean up preparing for passport integration
+
+2. Setup OAuth routes
+
+3. Configure Passport, setup routes
+
+4. Set up strategy: { Google+ API, LocalStrategy}
+
+5. setup user model integrating with mongodb

config/passport-setup.js

@@ -0,0 +1,62 @@
+const passport = require('passport');
+const GoogleStrategy = require('passport-google-oauth20');
+const User = require('../models/user-models');
+const keys = require ('./keys');
+
+// serialize user structure in the mongodb
+passport.serializeUser((user, done) => {
+    done(null, user.id);
+});
+
+passport.deserializeUser((id, done) => {
+try {
+    User.findById(id).then((user) => {
+        done(null, user);
+    })
+} catch (err) {
+    console.log(err);
+}
+});
+
+
+/*
+ * Note: Passport google strategy required clientID and clientSecret
+ * which can be obtained from registering within your google account.
+ * There is a configuration file `keys.js` containing the above info code,
+ * which is not part of this source code.
+ * 
+ * Go to https://console.cloud.google.com/ to create your own clientID and clientSecret.
+ */
+passport.use(new GoogleStrategy({
+    // options for google strategy
+    callbackURL: '/auth/google/redirect',
+    clientID: keys.google.clientID,
+    clientSecret: keys.google.clientSecret
+}, (accessToken, refreshToken, profile, done) => {
+    // passport callback function
+    // console.log('accessToken: ' + accessToken);
+
+    // console.log(profile);
+
+    // now that the google profile is here, let's store it in database.  However, to avoid duplicates in mongoDB collection, we perform dbase checking first.
+
+    //1. Check if user exists in mongoDb
+    User.findOne({googleId: profile.id}).then((currentUser) => {
+        if (currentUser) {
+            // found user already saved previously, proceed.
+            // console.log('user is: ' + currentUser);
+            done(null, currentUser);  // trigger serializer
+        } else {
+            // if not, this is then the first time this user logon
+            new User({
+                username: profile.displayName,
+                googleId: profile.id,
+                thumbnail: profile._json.picture
+            }).save().then((newUser) => {
+                console.log('New user created: ' + newUser);
+                done(null, newUser);  // trigger the serializer method
+            });
+        }
+    })
+
+}));

index.js

@@ -1,32 +1,34 @@
 import * as dotenv from 'dotenv';
-let WEATHERBIT_KEY = "";
-let WEATHERBIT_URI = "";
-
-dotenv.config();
-
-// dotenv.config()
 import request from 'request';
 import express from 'express';
 import bodyParser from 'body-parser';
 import {encryptAES, decryptAES} from './crypto.js';
-
 import { data as currencyCodes } from 'currency-codes';
 import awssdk from 'aws-sdk';
 
+// application secrets
+import { keys } from './config/keys.js';  
 
+let WEATHERBIT_KEY = "";
+let WEATHERBIT_URI = "";
 
+dotenv.config();
 
 if (process.env.NODE_ENV === 'awsdeploy') {
   WEATHERBIT_URI="https://api.weatherbit.io/v2.0/";
   WEATHERBIT_KEY="U2FsdGVkX18HMV5UUT9rJN76hOtIHDw1bH0beQYWH8a6E7uzKqskdgHvc6Nq2lO6O+GAb2vrcL+X8ZDqcGPuLw==";
-console.log("AWSDEPLOY mode!");
+  console.log("AWSDEPLOY mode!");
 } else {
   // Code for Development Mode
-  WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
-  WEATHERBIT_URI = process.env.WEATHERBIT_URI;
+  // WEATHERBIT_KEY = process.env.WEATHERBIT_KEY;
+  // WEATHERBIT_URI = process.env.WEATHERBIT_URI;
+
+  WEATHERBIT_KEY = keys.weatherbitapi.APIKEY;
+  WEATHERBIT_URI = keys.weatherbitapi.URI;
 }
 
 
+
 // Create network routing
 const app = express();
 
@@ -36,12 +38,11 @@ app.set('view engine', 'ejs');
 // Allow access to 'public' folder where resources are available to this app
 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 }));
 
 // get the locale from the client-side via the ejs form
 app.get('/', (req, res) => {
-  // console.dir(req.params);
-  // console.dir(req.body);
   let apikey = encryptAES(WEATHERBIT_KEY);
   res.render('index', {xkey: apikey});
 })
@@ -454,6 +455,13 @@ let port = process.env.PORT || 3000;
 
 // creating a server that is listening on ${port} for connections.
 app.listen(port, () => {
-    console.log(`TechRolEmi weather report is listening on port ${port}`);
+    console.log(`TechRolEmi is listening on port ${port}`);
+}).on('error', (e) => {
+  console.log('Error happened: ', e.message);
+  // try different port
+  port = process.env.PORT2;
+  app.listen(port, () => {
+    console.log(`TechRolEmi is listening on port ${port}`);
+  }
+  )
 });
-

models/user-models.js

@@ -0,0 +1,12 @@
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+
+const userSchema = new Schema({
+    username: String,
+    googleId: String,
+    thumbnail: String
+});
+
+const User = mongoose.model('user', userSchema);
+
+module.exports = User;