From 043ee68e58010a165c62c8d1e63e91579ec7701d Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 18 May 2021 13:35:48 -0700 Subject: [PATCH] IO-1145 Remove force token refresh. --- admin/src/components/auth-provider/auth-provider.js | 2 +- .../jobs-close-export-button.component.jsx | 6 +++--- .../jobs-export-all-button.component.jsx | 4 ++-- .../payable-export-all-button.component.jsx | 2 +- .../payable-export-button.component.jsx | 2 +- .../payment-export-button.component.jsx | 2 +- .../payments-export-all-button.component.jsx | 2 +- client/src/utils/CleanAxios.js | 3 +-- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/admin/src/components/auth-provider/auth-provider.js b/admin/src/components/auth-provider/auth-provider.js index 2adf29d50..ba8132048 100644 --- a/admin/src/components/auth-provider/auth-provider.js +++ b/admin/src/components/auth-provider/auth-provider.js @@ -8,7 +8,7 @@ const authProvider = { username, password ); - const token = await user.getIdToken(true); + const token = await user.getIdToken(); localStorage.setItem("token", token); return Promise.resolve(); } catch (error) { diff --git a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx index fa6875628..b6e2006f8 100644 --- a/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx +++ b/client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx @@ -40,7 +40,7 @@ export function JobsCloseExportButton({ { jobIds: [jobId] }, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); @@ -64,7 +64,7 @@ export function JobsCloseExportButton({ QbXmlResponse.data, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); @@ -86,7 +86,7 @@ export function JobsCloseExportButton({ failedTransactions.forEach((ft) => { //insert failed export log notification.open({ - // key: "failedexports", + // key: "failedexports", type: "error", message: t("jobs.errors.exporting", { error: ft.errorMessage || "", diff --git a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx index 56b38122d..e0be5621c 100644 --- a/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx +++ b/client/src/components/jobs-export-all-button/jobs-export-all-button.component.jsx @@ -43,7 +43,7 @@ export function JobsExportAllButton({ { jobIds: jobIds }, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); @@ -66,7 +66,7 @@ export function JobsExportAllButton({ QbXmlResponse.data, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); diff --git a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx index 7e190bb7f..4583251f9 100644 --- a/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx +++ b/client/src/components/payable-export-all-button/payable-export-all-button.component.jsx @@ -46,7 +46,7 @@ export function PayableExportAll({ { bills: billids }, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); diff --git a/client/src/components/payable-export-button/payable-export-button.component.jsx b/client/src/components/payable-export-button/payable-export-button.component.jsx index 1ba480b78..bdeaa4455 100644 --- a/client/src/components/payable-export-button/payable-export-button.component.jsx +++ b/client/src/components/payable-export-button/payable-export-button.component.jsx @@ -44,7 +44,7 @@ export function PayableExportButton({ { bills: [billId] }, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); diff --git a/client/src/components/payment-export-button/payment-export-button.component.jsx b/client/src/components/payment-export-button/payment-export-button.component.jsx index d808a0d37..3c0254180 100644 --- a/client/src/components/payment-export-button/payment-export-button.component.jsx +++ b/client/src/components/payment-export-button/payment-export-button.component.jsx @@ -43,7 +43,7 @@ export function PaymentExportButton({ { payments: [paymentId] }, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); diff --git a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx index 77381c810..62f47b890 100644 --- a/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx +++ b/client/src/components/payments-export-all-button/payments-export-all-button.component.jsx @@ -42,7 +42,7 @@ export function PaymentsExportAllButton({ { payments: paymentIds }, { headers: { - Authorization: `Bearer ${await auth.currentUser.getIdToken(true)}`, + Authorization: `Bearer ${await auth.currentUser.getIdToken()}`, }, } ); diff --git a/client/src/utils/CleanAxios.js b/client/src/utils/CleanAxios.js index a35b44aa4..49da5740a 100644 --- a/client/src/utils/CleanAxios.js +++ b/client/src/utils/CleanAxios.js @@ -9,8 +9,7 @@ if (process.env.NODE_ENV === "production") { export const axiosAuthInterceptorId = axios.interceptors.request.use( async (config) => { if (!config.headers.Authorization) { - const token = - auth.currentUser && (await auth.currentUser.getIdToken(true)); + const token = auth.currentUser && (await auth.currentUser.getIdToken()); if (token) { config.headers.Authorization = `Bearer ${token}`; }