From f1306c985471df1f865ada2f0fc972dd0cd0df95 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Thu, 12 Nov 2015 13:40:26 -0800
Subject: [PATCH] feat(oauth): pass email=false when verifying oauth tokens

Closes #1109
---
 config/index.js     | 4 ++++
 npm-shrinkwrap.json | 6 +++---
 package.json        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/config/index.js b/config/index.js
index a32e8bf70..b56eef696 100644
--- a/config/index.js
+++ b/config/index.js
@@ -298,6 +298,10 @@ var conf = convict({
       doc: 'URL at which to verify OAuth tokens',
       default: 'http://localhost:9010',
       env: 'OAUTH_URL'
+    },
+    email: {
+      doc: 'Temporary extra parameter to prevent request recursion',
+      default: false
     }
   },
   openIdProviders: {
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3bd66747f..44ba20655 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4293,9 +4293,9 @@
       }
     },
     "hapi-fxa-oauth": {
-      "version": "2.1.0",
-      "from": "https://registry.npmjs.org/hapi-fxa-oauth/-/hapi-fxa-oauth-2.1.0.tgz",
-      "resolved": "https://registry.npmjs.org/hapi-fxa-oauth/-/hapi-fxa-oauth-2.1.0.tgz",
+      "version": "2.2.0",
+      "from": "https://registry.npmjs.org/hapi-fxa-oauth/-/hapi-fxa-oauth-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/hapi-fxa-oauth/-/hapi-fxa-oauth-2.2.0.tgz",
       "dependencies": {
         "boom": {
           "version": "2.6.1",
diff --git a/package.json b/package.json
index 9d0e137ff..7381f09b8 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "fxa-jwtool": "0.7.1",
     "hapi": "8.8.1",
     "hapi-auth-hawk": "2.0.0",
-    "hapi-fxa-oauth": "2.1.0",
+    "hapi-fxa-oauth": "2.2.0",
     "hkdf": "0.0.2",
     "joi": "6.9.1",
     "mozlog": "2.0.2",