Fixes #649. Fixes issue that prevents verification emails from being …

…sent
pencilblue · Jun 16, 2015 · fee15f4 · fee15f4
1 parent 509f6cd
commit fee15f4
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/plugins/pencilblue/controllers/actions/user/resend_verification.js b/plugins/pencilblue/controllers/actions/user/resend_verification.js
@@ -32,21 +32,24 @@ module.exports = function ResendVerificationModule(pb) {
 
         var message = this.hasRequiredParams(post, this.getRequiredFields());
         if(message) {
-            self.formError(message, '/user/resend_verification', cb);
-            return;
+            return self.formError(message, '/user/resend_verification', cb);
         }
 
         var dao = new pb.DAO();
         dao.loadByValue('email', post.email, 'user', function(err, user) {
-            if(util.isError(err) || user === null) {
-                self.formError(self.ls.get('USER_VERIFIED'), '/user/login', cb);
-                return;
+            if(util.isError(err)) {
+                return cb(err);
+            }
+            else if (!util.isNullOrUndefined(user)) {
+                return self.formError(self.ls.get('USER_VERIFIED'), '/user/login', cb);
             }
 
             dao.loadByValue('email', post.email, 'unverified_user', function(err, user) {
-                if(util.isError(err) || user === null) {
-                    self.formError(self.ls.get('NOT_REGISTERED'), '/user/sign_up', cb);
-                    return;
+                if(util.isError(err)) {
+                    return cb(err);
+                }
+                else if(util.isNullOrUndefined(user)) {
+                    return self.formError(self.ls.get('NOT_REGISTERED'), '/user/sign_up', cb);
                 }
 
                user.verification_code = util.uniqueId();