OAuth Login

.gitignore

@@ -227,6 +227,7 @@ dronesym-python/flask-api/pip-selfcheck.json
 dronesym-frontend/src/environments/environment.ts
 dronesym-node/db.js
 dronesym-node/config/mongoconfig.js
+dronesym-node/config/credentials.js
 dronesym-node/dronedb-213c3-firebase-adminsdk-7u7ke-14febae0d1.json
 
 #py.test caches

dronesym-frontend/package.json

@@ -10,17 +10,32 @@
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
-  "description" :"Application For Controlling Drone Systems Remotely",
-  "keywords":["npm","nodejs","mongodb","firebase","drone","python","angularjs","googlemaps"],
-  "bugs":"https://github.com/scorelab/DroneSym/issues",
-  "author":"SCoRe Community",
-  "contributors":["hasa93","rhperera","malithsen","charithccmc","iammosespaulr"],
-  "repository":"https://github.com/scorelab/DroneSym",
-  "homepage":"http://www.scorelab.org/",
-  "engines":{} ,
+  "description": "Application For Controlling Drone Systems Remotely",
+  "keywords": [
+    "npm",
+    "nodejs",
+    "mongodb",
+    "firebase",
+    "drone",
+    "python",
+    "angularjs",
+    "googlemaps"
+  ],
+  "bugs": "https://github.com/scorelab/DroneSym/issues",
+  "author": "SCoRe Community",
+  "contributors": [
+    "hasa93",
+    "rhperera",
+    "malithsen",
+    "charithccmc",
+    "iammosespaulr"
+  ],
+  "repository": "https://github.com/scorelab/DroneSym",
+  "homepage": "http://www.scorelab.org/",
+  "engines": {},
   "private": true,
   "dependencies": {
-    "@agm/core": "^1.0.0-beta.0",
+    "@agm/core": "^1.0.0-beta.2",
     "@angular/animations": "^4.0.0",
     "@angular/common": "^4.0.0",
     "@angular/compiler": "^4.0.0",
@@ -58,5 +73,5 @@
     "ts-node": "~3.0.4",
     "tslint": "~5.3.2",
     "typescript": "~2.3.3"
-  }  
+  }
 }

dronesym-frontend/src/app/login/login.component.ts

@@ -38,5 +38,4 @@ export class LoginComponent {
           }
         });
   }
-
 }

dronesym-node/Models/user.js

@@ -2,6 +2,25 @@ var mongoose = require('mongoose');
 var bcrypt = require('bcrypt-nodejs');
 
 var userSchema = mongoose.Schema({
+	github: {
+		id: { type: Number },
+		username: { type: String, default: '' },
+		email: { type: String, unique: true },
+		token: { type: String }
+	},
+	google: {
+		id: { type: Number },
+		username: { type: String, default: '' },
+		email: { type: String, unique: true },
+		token: { type: String }
+	},
+	facebook: {
+		id: { type: Number },
+		username: { type: Number, default: '' },
+		email: { type: String, unique: true },
+		authToken: { type: Number },
+		refreshToken: { type: Number }
+	},
 	uname: {
 		type: String,
 		required: true

dronesym-node/Routers/authRouter.js

@@ -0,0 +1,35 @@
+const router = require('express').Router()
+const passport = require('../auth/passporthandler')
+const creds = require('../config/credentials')
+
+router.get('/facebook', passport.authenticate('facebook', {
+    session: false,
+    scope: creds.facebook.profileFields
+}), function(req,res){
+      res.send(200)
+})
+router.get('/google', passport.authenticate('google', { session: false }))
+router.get('/github', passport.authenticate('github', { session: false }))
+
+
+router.get('/facebook/callback', passport.authenticate('facebook', {
+    scope: creds.facebook.profileFields,
+    failureRedirect: '/dronesym/api/node/user/login'
+}), function (req,res){
+      res.redirect('/dronesym/api/node/user/role')
+})
+
+router.get('/google/callback', passport.authenticate('google', {
+    failureRedirect: '/dronesym/api/node/user/login'
+}), function (req,res){
+      res.redirect('/dronesym/api/node/user/role')
+})
+
+router.get('/github/callback', passport.authenticate('github', {
+    failureRedirect: '/dronesym/api/node/user/login'
+}), function (req,res){
+      res.redirect('/dronesym/api/node/user/role')
+})
+
+module.exports = router
+

dronesym-node/auth/passport/facebook.js

@@ -0,0 +1,81 @@
+const FacebookStrategy = require('passport-facebook').Strategy
+const creds = require('../../config/credentials')
+const User = require('../../Models/user')
+
+module.exports = new FacebookStrategy({
+  clientID: creds.facebook.clientID,
+  clientSecret: creds.facebook.clientSecret,
+  callbackURL: creds.facebook.callbackURL,
+  passReqToCallback: true,
+  profileFields: creds.facebook.profileFields
+}, async (req, authToken, refreshToken, profile, done) => {
+
+    let data = profile._json
+
+    if (req.user) {
+      //Already logged in user trying to connect, check whether already connected
+      const fbaccount = await User.findOne({'facebook.id': data.id})
+
+      if (fbaccount) {
+        throw new Error('Your facebook account is already connected')
+      }
+      else {
+        const update = await User.findOne({id: req.user.id})
+
+        if (update) {
+          update.facebook.id = data.id;
+          update.facebook.username = data.first_name;
+          update.facebook.email = data.email;
+          update.facebook.authToken = authToken;
+          update.facebook.refreshToken = refreshToken;
+        }
+        await update.save()
+
+        const user = await User.findOne({'facbook.id': data.id})
+
+        if (!user) {
+          return done(null, false, {message:'failure'})
+        }
+        if (user) {
+          return done(null, user, {message:'success'})
+        }
+      }
+    }
+    else {
+      //New login or signup
+
+      const user = User.findOne({'facebook.id': data.id})
+      //user logged in, if exists
+
+      if (!user) {
+        const users = await User.find({'facebook.email': data.email})
+
+        if (users && users.length > 0) {
+          return done(null, false, {message:'Account having this email already exists, please log into your account and connect to facebook there instead'})
+        }
+
+        let newFB = new User({
+          facebook: {
+              id: data.id,
+              username: data.first_name,
+              email: data.email,
+              authToken: authToken,
+              refreshToken: refreshToken
+          }
+        })
+        newFB.save()
+        //new signup
+        const authed = await User.findOne({'facebook.id': data.id})
+
+        if(!authed){
+          return done(null, false, {message: 'Authentication failed'})
+        }
+        else {
+          return done(null, authed)
+        }
+      }
+      else {
+        return done(null, user)
+      }
+    }
+})

dronesym-node/auth/passport/github.js

@@ -0,0 +1,79 @@
+const GithubStrategy = require('passport-github2').Strategy
+const creds = require('../../config/credentials')
+const User = require('../../Models/user')
+
+module.exports = new GithubStrategy({
+  clientID: creds.github.clientID,
+  clientSecret: creds.github.clientSecret,
+  callbackURL: creds.github.callbackURL,
+  passReqToCallback: true
+}, async (req, token, tokenSecret, profile, done) => {
+
+    let data = profile._json;
+
+      if (req.user){
+        //Already logged in user trying to connect, check whether already connected
+        const ghaccount = await User.findOne({'github.id': data.id})
+
+        if (ghaccount) {
+          throw new Error('Your github account is already connected')
+        }
+        else {
+          const update = await User.findOne({id: req.user.id})
+
+          if (update) {
+            update.github.id = data.id;
+            update.github.username = data.name;
+            update.github.email = data.email || 'N/A';
+            update.github.token = token;
+          }
+          await update.save()
+
+          const user = await User.findOne({'github.id': data.id})
+
+          if (!user) {
+            return done(null, false, {message:'failure'})
+          }
+          if (user) {
+            return done(null, user, {message:'success'})
+          }
+        }
+
+      }
+      else {
+        //New login or signup
+
+        const user = User.findOne({'github.id': data.id})
+        //user logged in, if exists
+
+        if (!user) {
+          const users = await User.find({'github.email': data.email})
+
+          if (users && users.length > 0) {
+            return done(null, false, {message:'Account having this email already exists, please log into your account and connect to github there instead'})
+          }
+
+          let newGH = new User({
+            github: {
+                id: data.id,
+                username: data.name,
+                email: data.email,
+                token: token
+            }
+          })
+          newGH.save()
+          //new signup
+          const authed = await User.findOne({'github.id': data.id})
+
+          if(!authed){
+            return done(null, false, {message: 'Authentication failed'})
+          }
+          else {
+            return done(null, authed)
+          }
+        }
+        else {
+          return done(null, user)
+        }
+      }
+})

dronesym-node/auth/passport/google.js

@@ -0,0 +1,79 @@
+const GoogleStrategy = require('passport-google-oauth20').Strategy
+const creds = require('../../config/credentials')
+const User = require('../../Models/user')
+
+module.exports = new GoogleStrategy({
+  clientID: creds.google.clientID,
+  clientSecret: creds.google.clientSecret,
+  callbackURL: creds.google.callbackURL,
+  passReqToCallback: true,
+  scope: creds.google.scope
+}, async (req, accessToken, refreshToken, profile, done) => {
+
+    let data = profile._json    
+
+    if (req.user) {
+      //Already logged in user trying to connect, check whether already connected
+      const googleaccount = await User.findOne({'google.id': data.id})
+
+      if (googleaccount) {
+        throw new Error('Your google account is already connected')
+      }
+      else {
+        const update = await User.findOne({'google.id': data.id})
+
+        if (update) {
+          update.google.id = data.id;
+          update.google.username = data.emails[0].value.split('@')[0];
+          update.google.email = data.emails[0].value;
+          update.google.token = accessToken;
+        }
+        await update.save()
+
+        const user = await User.findOne({'google.id': data.id})
+
+        if (!user) {
+          return done(null, false, {message:'failure'})
+        }
+        if (user) {
+          return done(null, user, {message:'success'})
+        }
+      }
+    }
+    else {
+      //New login or signup
+
+      const user = User.findOne({'google.id': data.id})
+      //user logged in, if exists
+
+      if (!user) {
+        const users = await User.find({'google.email': data.email})
+
+        if (users && users.length > 0) {
+          return done(null, false, {message:'Account having this email already exists, please log into your account and connect to google there instead'})
+        }
+
+        let newGGL = new User({
+          google: {
+              id: data.id,
+              username: data.emails[0].value.split('@')[0],
+              email: data.emails[0].value,
+              token: accessToken
+          }
+        })
+        newGGL.save()
+        //new signup
+        const authed = await User.findOne({'google.id': data.id})
+
+        if(!authed){
+          return done(null, false, {message: 'Authentication failed'})
+        }
+        else {
+          return done(null, authed)
+        }
+      }
+      else {
+        return done(null, user)
+      }
+    }
+})

dronesym-node/auth/passporthandler.js

@@ -0,0 +1,24 @@
+const passport = require('passport')
+
+const github = require('./passport/github')
+const facebook = require('./passport/facebook')
+const google = require('./passport/google')
+const User = require('../Models/user')
+
+passport.use(github)
+passport.use(facebook)
+passport.use(google)
+
+passport.serializeUser((user, done) => {
+  done(null, user)
+})
+
+passport.deserializeUser((id, done) => {
+  User.findById(id, (err, user) => {
+    done(err, user)
+  })
+})
+
+passport.transformAuthInfo((info, done) => done(null, info))
+
+module.exports = passport