From a5ba535f7b8f26c3bdbf5a91a3d827ef9256a1a8 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 6 Sep 2018 14:41:56 -0400 Subject: [PATCH] make get send errors too --- embark-ui/src/services/api.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/embark-ui/src/services/api.js b/embark-ui/src/services/api.js index 3717006a..dc328254 100644 --- a/embark-ui/src/services/api.js +++ b/embark-ui/src/services/api.js @@ -1,16 +1,21 @@ import axios from "axios"; import constants from '../constants'; -function get(path, params, endpoint) { +function get(path, params = {}, endpoint) { + const callback = params.callback || function(){}; return axios.get((endpoint || constants.httpEndpoint) + path, params) .then((response) => { - return {response, error: null}; + const data = (response.data && response.data.error) ? {error: response.data.error} : {response, error: null}; + callback(data.error, data.response); + return data; }).catch((error) => { - return {response: null, error: error.message || 'Something bad happened'}; + const data = {response: null, error: error.message || 'Something bad happened'}; + callback(data.error, data.response); + return data; }); } -function post(path, params) { +function post(path, params = {}) { const callback = params.callback || function(){}; delete params.callback; return axios.post(constants.httpEndpoint + path, params)