added email scope

app.js

@@ -57,6 +57,11 @@ if (process.env.NODE_ENV === 'development') {
   app.use(morgan('dev'));
 }
 
+// All
+app.all('/*', function (req, res, next) {
+  res.header('Access-Control-Allow-Origin', '*');
+  next();
+});
 // routes
 
 app.get('/', (req, res) => {

config/passport.js

@@ -10,15 +10,18 @@ module.exports = function (passport) {
         clientID: process.env.GOOGLE_CLIENT_ID,
         clientSecret: process.env.GOOGLE_CLIENT_SECRET,
         callbackURL: '/api/v1/auth/google/callback',
+        proxy: true,
       },
       async (accessToken, refreshToken, profile, done) => {
-        console.log(profile);
+        // console.log(profile);
+        // console.log('email', profile.emails[0].value);
         const newUser = {
           googleId: profile.id,
           displayName: profile.displayName,
           firstName: profile.name.givenName,
           lastName: profile.name.familyName,
           image: profile.photos[0].value,
+          email: profile.emails[0].value,
         };
 
         try {

controller/auth.js

@@ -2,11 +2,18 @@ const passport = require('passport');
 const User = require('../models/Users');
 
 const loginUser = async (req, res) => {
-  res.json('User logged in');
+  res.json({ msg: 'User Authenticated', user: req.user });
 };
 
 const googleLogin = async (req, res) => {
-  passport.authenticate('google', { scope: ['profile'] });
+  passport.authenticate('google', { scope: ['email', 'profile'] });
+};
+
+const googleLoginSuccess = async (req, res) => {
+  if (!req.user) {
+    res.status(400).json({ msg: 'User Not Authenticated', user: null });
+  }
+  res.json({ msg: 'User Authenticated', user: req.user });
 };
 
 const googleCallback = async (req, res, next) => {
@@ -18,9 +25,19 @@ const registerUser = async (req, res) => {
   res.status(200).json({ user });
 };
 
-const logoutUser = async (req, res) => {
-  req.logout();
-  res.redirect('/');
+const logoutUser = async (req, res, next) => {
+  req.logout(function (err) {
+    if (err) {
+      return next(err);
+    }
+    res.redirect('/');
+  });
 };
 
-module.exports = { loginUser, logoutUser, registerUser, googleLogin };
+module.exports = {
+  loginUser,
+  logoutUser,
+  registerUser,
+  googleLogin,
+  googleLoginSuccess,
+};

controller/dashboard.js

@@ -1,4 +1,8 @@
 const dashboard = async (req, res) => {
+  if (!req.user) {
+    res.status(400).json({ msg: 'User Not Authenticated', user: null });
+  }
+  res.json({ msg: 'User Authenticated', user: req.user });
   res.send('Dashboard');
 };
 

package.json

@@ -26,6 +26,7 @@
     "morgan": "^1.10.0",
     "passport": "^0.6.0",
     "passport-google-oauth20": "^2.0.0",
+    "passport-twitter-oauth2": "^2.1.1",
     "rate-limiter": "^0.2.0",
     "xss-clean": "^0.1.1"
   },

routes/auth.js

@@ -1,27 +1,40 @@
 const express = require('express');
 const router = express.Router();
 const passport = require('passport');
-const { loginUser, registerUser, logoutUser } = require('../controller/auth');
+const {
+  loginUser,
+  registerUser,
+  logoutUser,
+  googleLoginSuccess,
+} = require('../controller/auth');
 const { ensureGuest } = require('../middleware/authentication');
 
 router.route('/login').get(ensureGuest, loginUser);
+router.route('/login/success').get(googleLoginSuccess);
+
 router.route('/register').post(registerUser);
 
 // @desc Auth with Google
 // @route GET /auth/google
 
 router
   .route('/google')
-  .get(passport.authenticate('google', { scope: ['profile'] }));
-router
-  .route('/google/callback')
   .get(
-    passport.authenticate('google', { failureRedirect: '/' }),
-    (req, res) => {
-      res.redirect('/api/v1/dashboard');
-    }
+    passport.authenticate('google', { scope: ['openid ', 'email', 'profile'] })
   );
 
+router.route('/google/callback').get(
+  passport.authenticate('google', {
+    failureRedirect: '/',
+    // successRedirect: '/dashboard',
+  }),
+  async (req, res) => {
+    res.redirect('http://localhost:3000/dashboard');
+
+    res.status(200).json(req.user).then();
+  }
+);
+
 //@desc logout user
 // @route /auth/logout