fix(config): Correctly resolve isSecondaryEmailEnabled and add more c…

…hecks for config (#1872) r=vladikoff
mozilla · Apr 30, 2017 · ae95582 · ae95582
1 parent 9f660d4
commit ae95582
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/lib/features.js b/lib/features.js
@@ -31,7 +31,7 @@ module.exports = config => {
      * @returns {boolean}
      */
     isSecondaryEmailEnabled() {
-      return !! secondaryEmail.enabled
+      return !! (secondaryEmail && secondaryEmail.enabled)
     },
 
     /**

diff --git a/lib/routes/account.js b/lib/routes/account.js
@@ -514,7 +514,7 @@ module.exports = (
         function checkSecondaryEmail() {
           log.trace({op: 'Account.login.checkSecondaryEmail'})
           if (! features.isSecondaryEmailEnabled()) {
-            return
+            return P.resolve()
           }
 
           // Currently, we only allow emails on the account table to log a user in.
@@ -529,7 +529,7 @@ module.exports = (
               // No secondary email exists for this, continue with the regular login flow
               if (err.errno === error.ERRNO.SECONDARY_EMAIL_UNKNOWN) {
                 log.trace({op: 'Account.login.checkSecondaryEmail.noconflict'})
-                return
+                return P.resolve()
               }
               throw err
             })

diff --git a/test/remote/recovery_email_emails.js b/test/remote/recovery_email_emails.js
@@ -20,7 +20,9 @@ describe('remote emails', function () {
 
   before(() => {
     config = require('../../config').getProperties()
-    config.secondaryEmail.enabled = true
+    config.secondaryEmail = {
+      enabled: true
+    }
     config.securityHistory.ipProfiling = {}
     return TestServer.start(config)
       .then(s => {