From e5bc5c909995edd3f826c1cc9f41dca8b83c4dee Mon Sep 17 00:00:00 2001 From: Lucas Schoenfelder <les17@inf.ufpr.br> Date: Fri, 19 Feb 2021 09:57:27 -0300 Subject: [PATCH] fetchall async --- .../HelperFunctions/getAxiosConfig.js | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/src/Components/HelperFunctions/getAxiosConfig.js b/src/Components/HelperFunctions/getAxiosConfig.js index d7980b41..7937cc9d 100644 --- a/src/Components/HelperFunctions/getAxiosConfig.js +++ b/src/Components/HelperFunctions/getAxiosConfig.js @@ -191,23 +191,40 @@ export const postRequest = (url, payload, onSuccess, onError) => { }) } -export const fetchAllRequest = (urls, onSuccess, onError) => { - Promise.all( urls.map( url => fetch(`${apiUrl}${url}`, { +export async function fetchAllRequest (urls, onSuccess, onError) { + let responses = await Promise.all( urls.map( url => fetch(`${apiUrl}${url}`, { headers : fetchHeaders() - }))).then( (responses) => { - for(let res of responses) { - if (res.headers.has('access-token') && res.status !== 304) { - updateAccessToken(res.headers.get('access-token')) - } + }))) + + console.log(responses) + for (let res of responses) { + if (res.headers.has('access-token') && res.status !== 304) { + updateAccessToken(res.headers.get('access-token')) } - return Promise.all(responses.map( (response) => response.json().catch(err => { - return {}; - }))) - }).then( (data) => { - onSuccess(data) - }).catch((error) => { - onError(error) - }) + } + + let data = await Promise.all(responses.map( (response) => response.json().catch(err => { + return {}; + }))) + + onSuccess(data) + + // await Promise.all( urls.map( url => fetch(`${apiUrl}${url}`, { + // headers : fetchHeaders() + // }))).then( (responses) => { + // for(let res of responses) { + // if (res.headers.has('access-token') && res.status !== 304) { + // updateAccessToken(res.headers.get('access-token')) + // } + // } + // return Promise.all(responses.map( (response) => response.json().catch(err => { + // return {}; + // }))) + // }).then( (data) => { + // onSuccess(data) + // }).catch((error) => { + // onError(error) + // }) } export const validateGoogleLoginToken = (url, config, onSuccess, onError) => { @@ -282,7 +299,7 @@ export async function authentication (url, payload, onSuccess, onError) { // } // // sessionStorage.setItem('@portalmec/auth_headers', JSON.stringify(auth_headers)) - // + // // return response.json().catch(err => { // return {}; // }) -- GitLab