From fc8136dc192739ff0f5c0885d513f1dbc5d857e0 Mon Sep 17 00:00:00 2001
From: Chris Cowan <chris@chriscowan.us>
Date: Wed, 10 May 2017 09:16:04 -0700
Subject: [PATCH] Return Boom errors directly to the browser for Time Series
 Visual Builder (#11656)

* Fixed #11643 - Return Boom errors directly to the browser

* Checking for 401 and boom errors instead of just boom errors

* removing the returns from the hapi routes
---
 .../metrics/server/lib/vis_data/handle_error_response.js   | 2 +-
 src/core_plugins/metrics/server/routes/fields.js           | 7 +++++--
 src/core_plugins/metrics/server/routes/vis.js              | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/core_plugins/metrics/server/lib/vis_data/handle_error_response.js b/src/core_plugins/metrics/server/lib/vis_data/handle_error_response.js
index d37cd7592df5df..6a8a8d1c08c1ba 100644
--- a/src/core_plugins/metrics/server/lib/vis_data/handle_error_response.js
+++ b/src/core_plugins/metrics/server/lib/vis_data/handle_error_response.js
@@ -1,5 +1,5 @@
 export default panel => error => {
-  console.log(error);
+  if (error.isBoom && error.status === 401) throw error;
   const result = {};
   let errorResponse;
   try {
diff --git a/src/core_plugins/metrics/server/routes/fields.js b/src/core_plugins/metrics/server/routes/fields.js
index e5a42ea1fa704b..a056bd05506b1d 100644
--- a/src/core_plugins/metrics/server/routes/fields.js
+++ b/src/core_plugins/metrics/server/routes/fields.js
@@ -5,9 +5,12 @@ export default (server) => {
     path: '/api/metrics/fields',
     method: 'GET',
     handler: (req, reply) => {
-      return getFields(req)
+      getFields(req)
         .then(reply)
-        .catch(() => reply([]));
+        .catch((err) => {
+          if (err.isBoom && err.status === 401) return reply(err);
+          reply([]);
+        });
     }
   });
 
diff --git a/src/core_plugins/metrics/server/routes/vis.js b/src/core_plugins/metrics/server/routes/vis.js
index 34e0bc199039a6..b0b2fe1cf36914 100644
--- a/src/core_plugins/metrics/server/routes/vis.js
+++ b/src/core_plugins/metrics/server/routes/vis.js
@@ -6,10 +6,9 @@ export default (server) => {
     path: '/api/metrics/vis/data',
     method: 'POST',
     handler: (req, reply) => {
-      return getVisData(req)
+      getVisData(req)
         .then(reply)
         .catch(err => {
-          console.error(err.stack);
           reply(Boom.wrap(err, 400));
         });
     }