From 453a78f15d7578a5963662496c1d7b39a9412ee0 Mon Sep 17 00:00:00 2001 From: Mingfei Shao Date: Tue, 31 Mar 2020 15:41:53 -0500 Subject: [PATCH 1/2] feat/use get endpoint --- src/server/auth/arboristClient.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/server/auth/arboristClient.js b/src/server/auth/arboristClient.js index 096b854a..977fb9b0 100644 --- a/src/server/auth/arboristClient.js +++ b/src/server/auth/arboristClient.js @@ -9,21 +9,15 @@ class ArboristClient { } listAuthorizedResources(jwt) { - if (!jwt) { - log.error('[ArboristClient] jwt token undefined'); - throw new CodedError(401, 'not authorized'); - } // Make request to arborist for list of resources with access const resourcesEndpoint = `${this.baseEndpoint}/auth/resources`; log.debug('[ArboristClient] listAuthorizedResources jwt: ', jwt); + const headers = (jwt) ? { Authorization: `bearer ${jwt}` } : {}; return fetch( resourcesEndpoint, { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ user: { token: jwt } }), + method: 'GET', + headers, }, ).then( (response) => response.json(), From a4dd6bedcb1d7f8c7c098e87f3f02ae734de43da Mon Sep 17 00:00:00 2001 From: Mingfei Shao Date: Tue, 31 Mar 2020 15:49:09 -0500 Subject: [PATCH 2/2] fix/test --- src/server/__mocks__/mockDataFromES.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/__mocks__/mockDataFromES.js b/src/server/__mocks__/mockDataFromES.js index 064320d2..576857cd 100644 --- a/src/server/__mocks__/mockDataFromES.js +++ b/src/server/__mocks__/mockDataFromES.js @@ -203,7 +203,7 @@ const mockResourcePath = () => { const mockArborist = () => { nock(config.arboristEndpoint) .persist() - .post('/auth/resources') + .get('/auth/resources') .reply(200, { resources: [ 'internal-project-1',