Merge branch 'master' into story-134624635

services/passport.js

@@ -3,6 +3,7 @@ const UsersService = require('./users');
 const SettingsService = require('./settings');
 const LocalStrategy = require('passport-local').Strategy;
 const FacebookStrategy = require('passport-facebook').Strategy;
+const errors = require('../errors');
 
 //==============================================================================
 // SESSION SERIALIZATION
@@ -34,7 +35,7 @@ function ValidateUserLogin(loginProfile, user, done) {
   }
 
   if (user.disabled) {
-    return done(null, false, {message: 'Account disabled'});
+    return done(new errors.ErrAuthentication('Account disabled'));
   }
 
   // If the user isn't a local user (i.e., a social user).
@@ -61,7 +62,7 @@ function ValidateUserLogin(loginProfile, user, done) {
       // If the profile doesn't have a metadata field, or it does not have a
       // confirmed_at field, or that field is null, then send them back.
       if (!profile.metadata || !profile.metadata.confirmed_at || profile.metadata.confirmed_at === null) {
-        return done(null, false, {message: `Email address ${loginProfile.id} not verified.`});
+        return done(new errors.ErrAuthentication(loginProfile.id));
       }
     }
 

services/users.js

@@ -554,40 +554,51 @@ module.exports = class UsersService {
    * @param  {String} email The email that we are needing to get confirmed.
    * @return {Promise}
    */
-  static createEmailConfirmToken(userID, email) {
+  static createEmailConfirmToken(userID = null, email, referer = process.env.TALK_ROOT_URL) {
     if (!email || typeof email !== 'string') {
       return Promise.reject('email is required when creating a JWT for resetting passord');
     }
 
+    // Conform the email to lowercase.
     email = email.toLowerCase();
 
-    return UsersService
-      .findById(userID)
-      .then((user) => {
-        if (!user) {
-          return Promise.reject(new Error('user not found'));
-        }
+    const tokenOptions = {
+      jwtid: uuid.v4(),
+      algorithm: 'HS256',
+      expiresIn: '1d',
+      subject: EMAIL_CONFIRM_JWT_SUBJECT
+    };
 
-        // Get the profile representing the local account.
-        let profile = user.profiles.find((profile) => profile.id === email && profile.provider === 'local');
+    let userPromise;
 
-        // Ensure that the user email hasn't already been verified.
-        if (profile && profile.metadata && profile.metadata.confirmed_at) {
-          return Promise.reject(new Error('email address already confirmed'));
-        }
+    if (!userID) {
 
-        const payload = {
-          email,
-          userID
-        };
+      // If there is no userID, we're coming from the endpoint where a new user
+      // is re-requesting a confirmation email and we don't know the userID.
+      userPromise = UserModel.findOne({profiles: {$elemMatch: {id: email, provider: 'local'}}});
+    } else {
+      userPromise = UsersService.findById(userID);
+    }
 
-        return jwt.sign(payload, process.env.TALK_SESSION_SECRET, {
-          jwtid: uuid.v4(),
-          algorithm: 'HS256',
-          expiresIn: '1d',
-          subject: EMAIL_CONFIRM_JWT_SUBJECT
-        });
-      });
+    return userPromise.then((user) => {
+      if (!user) {
+        return Promise.reject(errors.ErrNotFound);
+      }
+
+      // Get the profile representing the local account.
+      let profile = user.profiles.find((profile) => profile.id === email && profile.provider === 'local');
+
+      // Ensure that the user email hasn't already been verified.
+      if (profile && profile.metadata && profile.metadata.confirmed_at) {
+        return Promise.reject(new Error('email address already confirmed'));
+      }
+
+      return jwt.sign({
+        email,
+        referer,
+        userID: user.id
+      }, process.env.TALK_SESSION_SECRET, tokenOptions);
+    });
   }
 
   /**
@@ -602,8 +613,7 @@ module.exports = class UsersService {
       .verifyToken(token, {
         subject: EMAIL_CONFIRM_JWT_SUBJECT
       })
-      .then(({userID, email}) => {
-
+      .then(({userID, email, referer}) => {
         return UserModel
           .update({
             id: userID,
@@ -617,8 +627,10 @@ module.exports = class UsersService {
             $set: {
               'profiles.$.metadata.confirmed_at': new Date()
             }
-          });
+          })
+          .then(() => ({userID, email, referer}));
       });
+
   }
 
   /**