fix(client): propagate metrics context data to /account/reset (#226) …

…r=vladikoff

client/FxAccountClient.js

@@ -530,6 +530,9 @@ define([
    *   is required if `options.keys` is true.
    *   @param {Boolean} [options.sessionToken]
    *   If `true`, a new `sessionToken` is provisioned.
+   *   @param {Object} [options.metricsContext={}] Metrics context metadata
+   *     @param {String} options.metricsContext.flowId identifier for the current event flow
+   *     @param {Number} options.metricsContext.flowBeginTime flow.begin event time
    * @return {Promise} A promise that will be fulfilled with JSON `xhr.responseText` of the request
    */
   FxAccountClient.prototype.accountReset = function(email, newPassword, accountResetToken, options) {
@@ -543,6 +546,10 @@ define([
       data.sessionToken = options.sessionToken;
     }
 
+    if (options.metricsContext) {
+      data.metricsContext = metricsContext.marshall(options.metricsContext);
+    }
+
     required(email, 'email');
     required(newPassword, 'new password');
     required(accountResetToken, 'accountResetToken');

tests/lib/account.js

@@ -154,7 +154,14 @@ define([
             var newPassword = 'newturles';
             assert.ok(accountResetToken, 'accountResetToken is returned');
 
-            return respond(client.accountReset(email, newPassword, accountResetToken, { keys: true, sessionToken: true }), RequestMocks.accountReset);
+            return respond(client.accountReset(email, newPassword, accountResetToken, {
+              keys: true,
+              metricsContext: {
+                flowBeginTime: 1480615985437,
+                flowId: '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef'
+              },
+              sessionToken: true
+            }), RequestMocks.accountReset);
           })
           .then(
             function (result) {