updated test

package.json

@@ -32,6 +32,7 @@
     "express-session": "1.15.6",
     "joi": "14.3.1",
     "jsonwebtoken": "8.5.0",
+    "jwt-decode": "2.2.0",
     "morgan": "1.9.1",
     "passport": "0.4.0",
     "passport-facebook": "3.0.0",

server/controllers/social-controller.js

@@ -22,14 +22,11 @@ const authUser = (req, res) => {
       socialProvider: userInfo.provider
     }
   }).then(([user]) => {
-    const {
-      dataValues: { id }
-    } = user;
     user.username = userInfo.displayName;
     user.image = userInfo.photos[0].value;
     user.email = userInfo.emails[0].value;
     user.socialProvider = userInfo.provider;
-    const verificationToken = generateToken({ id }, '1d');
+    const verificationToken = generateToken({ user }, '1d');
     user.token = verificationToken;
     return res.redirect(
       `${process.env.UI_CLIENT_HOST}/auth?token=${user.token}`

server/routes/social-routes.js

@@ -15,7 +15,6 @@ router.get(
   passport.authenticate('google', { scope: ['profile', 'email'] })
 );
 router.get('/google/callback', passport.authenticate('google'), authUser);
-
 router.get(
   '/login/twitter',
   passport.authenticate('twitter', {

server/utils/helpers.js

@@ -1,6 +1,7 @@
 import jwt from 'jsonwebtoken';
 import bcrypt from 'bcrypt';
 import Joi from 'joi';
+import jwtDecode from 'jwt-decode';
 import env from '../config/env-config';
 
 const { SECRET, UI_CLIENT_HOST, HEROKU_APP_NAME } = env;
@@ -26,6 +27,13 @@ export const generateToken = (payload, expiresIn = '7d') =>
  */
 export const verifyToken = token => jwt.verify(token, SECRET);
 
+/**
+ * Synchronously decode given JWT token
+ * @param {string} token JWT token
+ * @returns {string | object} decoded JWT payload
+ */
+export const decodeToken = token => jwtDecode(token);
+
 /**
  * Sends a success response to the client
  * @param {Response} res Response object

test/fixtures.js

@@ -53,3 +53,9 @@ export const randomSocialUser = {
   emails: [{ value: faker.internet.email() }],
   photos: [{ value: faker.image.image() }]
 };
+
+export const userWithNoEmail = {
+  id: faker.random.number(),
+  displayName: faker.random.alphaNumeric(10),
+  photos: [{ value: faker.image.image() }]
+};

test/mockStrategy.js

@@ -10,12 +10,13 @@ class MockStrategy extends passport.Strategy {
   /**
    * @param {*} name
    * @param {*} callback
+   * @param {*} user
    */
-  constructor(name, callback) {
+  constructor(name, callback, user) {
     super(name, callback);
     this.name = name;
     this._cb = callback;
-    this._user = { ...randomSocialUser, provider: name };
+    this._user = { ...user, provider: name };
   }
 
   /**
@@ -29,8 +30,10 @@ class MockStrategy extends passport.Strategy {
   }
 }
 
-passport.use(new MockStrategy('google', socialAuthCallback));
-passport.use(new MockStrategy('facebook', socialAuthCallback));
-passport.use(new MockStrategy('twitter', socialAuthCallback));
+passport.use(new MockStrategy('google', socialAuthCallback, randomSocialUser));
+passport.use(
+  new MockStrategy('facebook', socialAuthCallback, randomSocialUser)
+);
+passport.use(new MockStrategy('twitter', socialAuthCallback, randomSocialUser));
 
 export { MockStrategy, randomSocialUser };

test/socialAuth.spec.js

@@ -1,7 +1,10 @@
 import chai, { expect } from 'chai';
 import chaiHttp from 'chai-http';
+import passport from 'passport';
 import server from '../server';
-import { randomSocialUser } from './mockStrategy';
+import { MockStrategy, randomSocialUser } from './mockStrategy';
+import { userWithNoEmail } from './fixtures';
+import { decodeToken, socialAuthCallback } from '../server/utils/helpers';
 
 chai.use(chaiHttp);
 
@@ -12,8 +15,13 @@ describe('GET Social Authentication', () => {
         .request(server)
         .get('/api/auth/twitter/callback')
         .end((err, res) => {
+          const { user } = decodeToken(res.redirects[0].split('token=')[1]);
+          expect(user.username).to.equal(randomSocialUser.displayName);
+          expect(user.email).to.equal(randomSocialUser.emails[0].value);
+          expect(user.image).to.equal(randomSocialUser.photos[0].value);
+          expect(user.socialProvider).to.equal('twitter');
           expect(res.redirects.length).to.equal(1);
-          expect(res.redirects[0].includes('token')).to.equal(true);
+          expect(res.redirects[0].includes('/auth?token=')).to.equal(true);
           done(err);
         });
     });
@@ -23,8 +31,13 @@ describe('GET Social Authentication', () => {
         .request(server)
         .get('/api/auth/facebook/callback', randomSocialUser)
         .end((err, res) => {
+          const { user } = decodeToken(res.redirects[0].split('token=')[1]);
+          expect(user.username).to.equal(randomSocialUser.displayName);
+          expect(user.email).to.equal(randomSocialUser.emails[0].value);
+          expect(user.image).to.equal(randomSocialUser.photos[0].value);
+          expect(user.socialProvider).to.equal('facebook');
           expect(res.redirects.length).to.equal(1);
-          expect(res.redirects[0].includes('token')).to.equal(true);
+          expect(res.redirects[0].includes('/auth?token=')).to.equal(true);
           done(err);
         });
     });
@@ -34,18 +47,26 @@ describe('GET Social Authentication', () => {
         .request(server)
         .get('/api/auth/google/callback')
         .end((err, res) => {
+          const { user } = decodeToken(res.redirects[0].split('token=')[1]);
+          expect(user.username).to.equal(randomSocialUser.displayName);
+          expect(user.email).to.equal(randomSocialUser.emails[0].value);
+          expect(user.image).to.equal(randomSocialUser.photos[0].value);
+          expect(user.socialProvider).to.equal('google');
           expect(res.redirects.length).to.equal(1);
-          expect(res.redirects[0].includes('token')).to.equal(true);
+          expect(res.redirects[0].includes('/auth?token=')).to.equal(true);
           done(err);
         });
     });
 
     it('should return an error if no email is present', done => {
+      passport.use(
+        new MockStrategy('facebook', socialAuthCallback, userWithNoEmail)
+      );
       chai
         .request(server)
-        .get('/api/auth/google/callback')
+        .get('/api/auth/facebook/callback')
         .end((err, res) => {
-          expect(res.error.status).to.equal(404);
+          expect(res.body.errors[0]).to.equal('No email found. Add email');
           done(err);
         });
     });