diff --git a/app/api/CircleCI.js b/app/api/CircleCI.js index ad179ed..3312da1 100644 --- a/app/api/CircleCI.js +++ b/app/api/CircleCI.js @@ -1,6 +1,5 @@ import endpoints from './endpoints'; import request from './request'; -import token from './token'; function JSONify(response) { return response.json(); @@ -15,24 +14,16 @@ export async function checkToken(possibleToken) { } export async function getUserDetails() { - const CIToken = await token.get(); const url = endpoints.get('USER_INFO'); - return await request(url, GET, {}, CIToken).then(JSONify); + return await request(url, GET).then(JSONify); } export async function getProjects() { - const CIToken = await token.get(); const url = endpoints.get('ALL_PROJECTS'); - return await request(url, GET, {}, CIToken).then(JSONify); + return await request(url, GET).then(JSONify); } export async function getProjectRecentBuilds(user, repo, limit = 1, offset = 0) { - const CIToken = await token.get(); const url = endpoints.get('PROJECT_RECENTS').param({ user, repo }).query({ limit, offset }); - return await request( - url, - GET, - {}, - CIToken) - .then(JSONify); + return await request(url, GET).then(JSONify); } diff --git a/app/api/request.js b/app/api/request.js index 6c3c7ae..b972cd2 100644 --- a/app/api/request.js +++ b/app/api/request.js @@ -1,7 +1,7 @@ import token from './token'; -export default function request(url, method, data = {}, CIToken) { - CIToken = CIToken || token.get(); +export default async function request(url, method = 'GET', data = {}, CIToken) { + CIToken = CIToken || await token.get(); const fullURL = url.query({ 'circle-token': CIToken }).toString(); let fetchParams = { method, @@ -11,6 +11,7 @@ export default function request(url, method, data = {}, CIToken) { }; if (method !== 'GET' && method !== 'HEAD') { fetchParams.body = JSON.stringify(data); + fetchParams.headers['Content-Type'] = 'application/json'; } - return fetch(fullURL, fetchParams); + return await fetch(fullURL, fetchParams); }