fix(email): Return createdAt when calling db.emailRecord (#209), r=@…

…rfk

lib/db/mysql.js

@@ -454,9 +454,9 @@ module.exports = function (log, error) {
   }
 
   // Select : accounts
-  // Fields : uid, email, normalizedEmail, emailVerified, emailCode, kA, wrapWrapKb, verifierVersion, authSalt, verifierSetAt, lockedAt
+  // Fields : uid, email, normalizedEmail, emailVerified, emailCode, kA, wrapWrapKb, verifierVersion, authSalt, verifierSetAt, createdAt, lockedAt
   // Where  : accounts.normalizedEmail = LOWER($1)
-  var EMAIL_RECORD = 'CALL emailRecord_3(?)'
+  var EMAIL_RECORD = 'CALL emailRecord_4(?)'
 
   MySql.prototype.emailRecord = function (emailBuffer) {
     return this.readFirstResult(EMAIL_RECORD, [emailBuffer.toString('utf8')])

lib/db/patch.js

@@ -4,4 +4,4 @@
 
 // The expected patch level of the database. Update if you add a new
 // patch in the ./schema/ directory.
-module.exports.level = 43
+module.exports.level = 44

lib/db/schema/patch-043-044.sql

@@ -0,0 +1,27 @@
+-- Update email record to return `createdAt`
+-- emailRecord v4
+CREATE PROCEDURE `emailRecord_4` (
+    IN `inEmail` VARCHAR(255)
+)
+BEGIN
+    SELECT
+        a.uid,
+        a.email,
+        a.normalizedEmail,
+        a.emailVerified,
+        a.emailCode,
+        a.kA,
+        a.wrapWrapKb,
+        a.verifierVersion,
+        a.authSalt,
+        a.verifierSetAt,
+        a.lockedAt,
+        a.createdAt
+    FROM
+        accounts a
+    WHERE
+        a.normalizedEmail = LOWER(inEmail)
+    ;
+END;
+
+UPDATE dbMetadata SET value = '44' WHERE name = 'schema-patch-level';

lib/db/schema/patch-044-043.sql

@@ -0,0 +1,3 @@
+-- DROP PROCEDURE `emailRecord_4`;
+
+-- UPDATE dbMetadata SET value = '43' WHERE name = 'schema-patch-level';

test/local/mysql_tests.js

@@ -7,6 +7,11 @@ var DB = require('../../lib/db/mysql')(log, dbServer.errors)
 var config = require('../../config')
 var test = require('tap').test
 var P = require('../../lib/promise')
+var crypto = require('crypto')
+
+var zeroBuffer16 = Buffer.from('00000000000000000000000000000000', 'hex')
+var zeroBuffer32 = Buffer.from('0000000000000000000000000000000000000000000000000000000000000000', 'hex')
+var now = Date.now()
 
 DB.connect(config)
   .then(
@@ -332,6 +337,46 @@ DB.connect(config)
         }
       )
 
+      test(
+        'create account and read email record',
+        function (t) {
+          var uid = crypto.randomBytes(16)
+          var account = {
+            uid: uid,
+            email: ('' + Math.random()).substr(2) + '@bar.com',
+            emailCode: zeroBuffer16,
+            emailVerified: false,
+            verifierVersion: 1,
+            verifyHash: zeroBuffer32,
+            authSalt: zeroBuffer32,
+            kA: zeroBuffer32,
+            wrapWrapKb: zeroBuffer32,
+            verifierSetAt: now,
+            createdAt: now,
+            locale : 'en_US',
+          }
+          account.normalizedEmail = account.email.toLowerCase()
+
+          return db.createAccount(uid, account)
+            .then(
+              function(result) {
+                t.deepEqual(result, {}, 'Returned an empty object on account creation')
+                return db.emailRecord(account.email)
+              }
+            )
+            .then(
+              function(result) {
+                t.equal(result.createdAt, account.createdAt, 'createdAt set')
+                t.equal(result.email, account.email, 'email set')
+                t.equal(result.emailVerified, 0, 'emailVerified set')
+                t.equal(result.normalizedEmail, account.normalizedEmail, 'normalizedEmail set')
+                t.equal(result.verifierSetAt, account.verifierSetAt, 'verifierSetAt set')
+                t.equal(result.verifierVersion, account.verifierVersion, 'verifierVersion set')
+              }
+            )
+        }
+      )
+
       test(
         'teardown',
         function (t) {