From 13b1805d0423c4fba16148818839931ee98ce3c8 Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Mon, 13 Feb 2023 17:11:31 +0700 Subject: [PATCH] Checkpoint 2 --- frontend/src/components/utilities/SecurityClient.ts | 6 +++++- frontend/src/config/request.ts | 3 +++ frontend/src/reactQuery.ts | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/utilities/SecurityClient.ts b/frontend/src/components/utilities/SecurityClient.ts index fa1ec0bb0..f1ba05ed9 100644 --- a/frontend/src/components/utilities/SecurityClient.ts +++ b/frontend/src/components/utilities/SecurityClient.ts @@ -1,7 +1,11 @@ -import { getAuthToken, setAuthToken } from '@app/reactQuery'; +import { getAuthToken, setAuthToken , setMfaTempToken } from '@app/reactQuery'; // depreciated: go for apiRequest module in config/api export default class SecurityClient { + static setMfaToken(tokenStr: string) { + setMfaTempToken(tokenStr); + } + static setToken(tokenStr: string) { setAuthToken(tokenStr); } diff --git a/frontend/src/config/request.ts b/frontend/src/config/request.ts index 0e04789b2..7234da684 100644 --- a/frontend/src/config/request.ts +++ b/frontend/src/config/request.ts @@ -11,6 +11,9 @@ export const apiRequest = axios.create({ apiRequest.interceptors.request.use((config) => { const token = getAuthToken(); + console.log('interceptors'); + console.log('token', token); + console.log('config.headers', config.headers); if (token && config.headers) { // eslint-disable-next-line no-param-reassign config.headers.Authorization = `Bearer ${token}`; diff --git a/frontend/src/reactQuery.ts b/frontend/src/reactQuery.ts index c28dc39b1..7bb83b111 100644 --- a/frontend/src/reactQuery.ts +++ b/frontend/src/reactQuery.ts @@ -1,6 +1,7 @@ import { QueryClient } from '@tanstack/react-query'; // this is saved in react-query cache +export const MFA_TEMP_TOKEN_CACHE_KEY = ['infisical__mfa-temp-token']; export const AUTH_TOKEN_CACHE_KEY = ['infisical__auth-token']; export const queryClient = new QueryClient({ @@ -13,9 +14,13 @@ export const queryClient = new QueryClient({ }); // set token in memory cache +export const setMfaTempToken = (token: string) => + queryClient.setQueryData(MFA_TEMP_TOKEN_CACHE_KEY, token); + export const setAuthToken = (token: string) => queryClient.setQueryData(AUTH_TOKEN_CACHE_KEY, token); +export const getMfaTempToken = () => queryClient.getQueryData(MFA_TEMP_TOKEN_CACHE_KEY) as string; export const getAuthToken = () => queryClient.getQueryData(AUTH_TOKEN_CACHE_KEY) as string; export const isLoggedIn = () => Boolean(getAuthToken());