Handle api error json (#18)

* Handle api error json

* Fix get vehicles error handling
Update .env.template

src/services/__mocks__/vehicles.js

@@ -11,7 +11,10 @@ const data = [
 
 const vehiclesAPI = {
   getVehicles: async (search, token) => { return { data: { data } }; },
-  addVehicle: async (vehicle, token) => { data.push(vehicle); },
+  addVehicle: async (vehicle, token) => { 
+    data.push(vehicle);
+    return vehicle;
+  },
 };
 
 export default vehiclesAPI;

src/services/auth.js

@@ -1,3 +1,5 @@
+import { fetchRespHandler } from "../utils/http";
+
 const AUTH_URL = process.env.REACT_APP_AUTH_SERVICE_URL || "https://gw-dev.fiskerdps.com/compute_auth";
 const CALLBACK_URL = process.env.REACT_APP_AUTH_CALLBACK_URL || "https://dev-ota-admin.fiskerdps.com";
 
@@ -13,7 +15,7 @@ const auth = {
       code,
       redirect: CALLBACK_URL,
     })
-  }).then((response) => response.json()),
+  }).then(fetchRespHandler),
 
   verify: (idToken) => fetch(`${AUTH_URL}/verify`, {
     method: "POST",
@@ -21,7 +23,7 @@ const auth = {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({ token: idToken })
-  }).then((response) => response.json()),
+  }).then(fetchRespHandler),
 
   refresh: (refreshToken) => fetch(`${AUTH_URL}/refresh`, {
     method: "POST",
@@ -29,7 +31,7 @@ const auth = {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({ refresh_token: refreshToken })
-  }).then((response) => response.json()),
+  }).then(fetchRespHandler),
 };
 
 export default auth;

src/services/vehicles.js

@@ -1,20 +1,20 @@
-import axios from 'axios';
+import { getAuthHeaderOptions, fetchRespHandler } from "../utils/http"
 
 const API_ENDPOINT = process.env.REACT_APP_UPLOAD_SERVICE_URL || "https://gw-dev.fiskerdps.com/ota_update";
 
-const getOptions = (token) => ({
-  headers: {
-    "Authorization": `Bearer ${token}`,
-  },
-});
-
 const vehiclesAPI = {
-  getVehicles: async (search, token) => {
-    return axios.get(`${API_ENDPOINT}/vehicles`, getOptions(token));
-  },
-  addVehicle: async (vehicle, token) => {
-    return axios.post(`${API_ENDPOINT}/vehicle`, vehicle, getOptions(token));
-  } 
+  addVehicle: async (vehicle, token) => fetch(`${API_ENDPOINT}/vehicle`, {
+    method: "POST",
+    headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
+    body: JSON.stringify(vehicle),
+  })
+    .then(fetchRespHandler),
+  getVehicles: async (search, token) => fetch(`${API_ENDPOINT}/vehicles`, {
+    method: "GET",
+    headers: Object.assign({ "Content-Type": "application/json" }, getAuthHeaderOptions(token)),
+
+  })
+    .then(fetchRespHandler)
 };
 
 export default vehiclesAPI;