Implement and test sending of signup email

Author: drew-gross

spec/ParseUser.spec.js

@@ -47,6 +47,40 @@ describe('Parse.User testing', () => {
     });
   });
 
+  it('sends verification email if email verification is enabled', done => {
+    var emailAdapter = {
+      sendVerificationEmail: () => Promise.resolve()
+    }
+    setServerConfiguration({
+      serverURL: 'http://localhost:8378/1',
+      appId: 'test',
+      appName: 'unused',
+      javascriptKey: 'test',
+      dotNetKey: 'windows',
+      clientKey: 'client',
+      restAPIKey: 'rest',
+      masterKey: 'test',
+      collectionPrefix: 'test_',
+      fileKey: 'test',
+      verifyUserEmails: true,
+      emailAdapter: emailAdapter,
+    });
+    spyOn(emailAdapter, 'sendVerificationEmail');
+    var user = new Parse.User();
+    user.setPassword("asdf");
+    user.setUsername("zxcv");
+    user.signUp(null, {
+      success: function(user) {
+        expect(emailAdapter.sendVerificationEmail).toHaveBeenCalled();
+        done();
+      },
+      error: function(userAgain, error) {
+        fail('Failed to save user');
+        done();
+      }
+    });
+  });
+
   it("user login wrong username", (done) => {
     Parse.User.signUp("asdf", "zxcv", null, {
       success: function(user) {
@@ -1628,7 +1662,7 @@ describe('Parse.User testing', () => {
       done();
     });
   });
-  
+
   it('test parse user become', (done) => {
     var sessionToken = null;
     Parse.Promise.as().then(function() {

src/Adapters/Email/SimpleMailgunAdapter.js

@@ -28,7 +28,7 @@ export default (mailgunOptions) => {
 	      "You are being asked to confirm the e-mail address " + user.email + " with " + appName + "\n\n" +
 	      "" +
 	      "Click here to confirm it:\n" + link;
-			sendMail(user.email, 'Please verify your e-mail for ' + appName, verifyMessage);
+			return sendMail(user.email, 'Please verify your e-mail for ' + appName, verifyMessage);
 		}
 	}
 }

src/RestWrite.js

@@ -406,7 +406,6 @@ RestWrite.prototype.transformUser = function() {
         }
         if (this.config.verifyUserEmails && this.data.email) {
           this.data.emailVerified = false;
-          this.data._email_verify_token = cryptoUtils.randomString(25);
           this.data._perishable_token = cryptoUtils.randomString(25);
         }
         return Promise.resolve();
@@ -721,23 +720,10 @@ RestWrite.prototype.runDatabaseOperation = function() {
     throw new Parse.Error(Parse.Error.INVALID_ACL, 'Invalid ACL.');
   }
 
-  function sendEmailVerification() {
-    var hasUserEmail = typeof this.data.email !== 'undefined' && this.className === "_User";
-    if (hasUserEmail && this.config.verifyUserEmails) {
-      let link = this.config.mount + "/verify_email?token=" + encodeURIComponent(this.data._email_verify_token) + "&username=" + encodeURIComponent(this.data.username);
-      this.config.emailAdapter.sendVerificationEmail({
-        link: link,
-        user: this.auth.user,
-        appName: this.co.appName,
-      });
-    }
-  }
-
   if (this.query) {
     // Run an update
     return this.config.database.update(
       this.className, this.query, this.data, this.runOptions).then((resp) => {
-        sendEmailVerification.call(this);
         this.response = resp;
         this.response.updatedAt = this.updatedAt;
       });
@@ -751,9 +737,6 @@ RestWrite.prototype.runDatabaseOperation = function() {
     } 
     // Run a create
     return this.config.database.create(this.className, this.data, this.runOptions)
-      .then(() => {
-        sendEmailVerification.call(this);
-      })
       .then(() => {
         var resp = {
           objectId: this.data.objectId,

src/Routers/UsersRouter.js

@@ -8,7 +8,7 @@ import rest           from '../rest';
 import Auth           from '../Auth';
 import passwordCrypto from '../password';
 import RestWrite      from '../RestWrite';
-import { newToken }   from '../cryptoUtils';
+let cryptoUtils = require('../cryptoUtils');
 
 export class UsersRouter extends ClassesRouter {
   handleFind(req) {
@@ -25,7 +25,25 @@ export class UsersRouter extends ClassesRouter {
     let data = deepcopy(req.body);
     req.body = data;
     req.params.className = '_User';
-    return super.handleCreate(req);
+
+    if (req.config.verifyUserEmails) {
+      req.body._email_verify_token = cryptoUtils.randomString(25);
+    }
+
+    let p = super.handleCreate(req);
+
+    if (req.config.verifyUserEmails) {
+      // Send email as fire-and-forget once the user makes it into the DB.
+      p.then(() => {
+        let link = req.config.mount + "/verify_email?token=" + encodeURIComponent(req.body._email_verify_token) + "&username=" + encodeURIComponent(req.body.username);
+        req.config.emailAdapter.sendVerificationEmail({
+          appName: req.config.appName,
+          link: link,
+          user: req.auth.user,
+        });
+      });
+    }
+    return p;
   }
 
   handleUpdate(req) {
@@ -84,7 +102,7 @@ export class UsersRouter extends ClassesRouter {
           throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'Invalid username/password.');
         }
 
-        let token = 'r:' + newToken();
+        let token = 'r:' + cryptoUtils.newToken();
         user.sessionToken = token;
         delete user.password;
 

src/index.js

@@ -146,6 +146,7 @@ function ParseServer({
     enableAnonymousUsers: enableAnonymousUsers,
     oauth: oauth,
     verifyUserEmails: verifyUserEmails,
+    emailAdapter: emailAdapter,
   };
 
   // To maintain compatibility. TODO: Remove in v2.1