Merge pull request #52 from hurricanemark/Phase4-TeamRolEmiSeriousWorks

Cleanup and reorganize code structure

Author: hurricanemark

.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
+            });
+        }
+    })
+
+}));