Merge pull request #2661 from mozilla/bulk-mailer-fix, r=@philbooth, @…

…vbudhram

fix(mailer): Fix the bulk-mailer, add lots of tests.

docs/bulk-mail.md

@@ -0,0 +1,27 @@
+# Sending emails manually
+
+Sometimes it's necessary to send emails manually. Doing
+so requires access to a production auth-server machine and
+the user database.
+
+## Steps
+
+1. Know which users you want to send emails to.
+2. Use the [dump-users.js](https://github.com/mozilla/fxa-auth-server/blob/master/scripts/dump-users.js) script to
+   write the necessary user information to disk. Users can be dumped by `uid` or `email`
+  * uid, listing uids on the command line
+    > node ./scripts/dump-users.js -u 62f8f86fb6ce42b39431547fda1fb87d,567f8f86fb6ce42b39431547fda1fb8124 > ./user-list.json
+  * uids, listing uids in an input file
+    > node ./scripts/dump-users.js -u --input uids-to-dump.txt > ./user-list.json
+  * email, listing emails on the command line
+    > node ./scripts/dump-users.js -e testuser@testuser.com,another@another.com > ./user-list.json
+  * email, listing emails in an input file
+    > node ./scripts/dump-users.js -e --input emails-to-dump.txt > ./user-list.json
+3. Test sending the emails
+  * write to the console
+    > node ./scripts/bulk-mailer.js --input ./user-list.json --method sendVerifyCode
+  * write to disk
+    > node ./scripts/bulk-mailer.js --input ./user-list.json --method sendVerifyCode --write ./email_output/
+4. Send the emails
+  > node ./scripts/bulk-mailer.js --input ./user-list.json --method sendVerifyCode --send
+

lib/db.js

@@ -421,6 +421,10 @@ module.exports = (
       )
   }
 
+  /**
+   * This route intended for internal use only. Please use `accountRecord`
+   * for all other uses.
+   */
   SAFE_URLS.emailRecord = new SafeUrl('/emailRecord/:email', 'db.emailRecord')
   DB.prototype.emailRecord = function (email) {
     log.trace({ op: 'DB.emailRecord', email })