add isImpersonating in querykey (#2126)

onlydustxyz · May 17, 2024 · 84e5131 · 84e5131
1 parent 770bd03
commit 84e5131
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/api-client/adapter/react-query/react-query-adapter.ts b/api-client/adapter/react-query/react-query-adapter.ts
@@ -3,10 +3,12 @@
 import { IFetchAdapater } from "api-client/adapter/fetch/fetch-adapter.types";
 import { useReactQueryAuthAdapter } from "api-client/adapter/react-query-auth/react-query-auth-adapter";
 
+import { useImpersonation } from "components/features/impersonation/use-impersonation";
+
 interface IuseReactQueryAdapter<T> {
   fetcher: IFetchAdapater<T>;
   query: {
-    queryKey: string[];
+    queryKey: (string | boolean)[];
     queryFn: () => Promise<T>;
   };
   mutation: {
@@ -15,9 +17,10 @@ interface IuseReactQueryAdapter<T> {
 }
 export const useReactQueryAdapter = <T>(fetchAdapter: IFetchAdapater<T>): IuseReactQueryAdapter<T> => {
   const { fetcher } = useReactQueryAuthAdapter(fetchAdapter);
+  const { isImpersonating } = useImpersonation();
 
   const query = {
-    queryKey: fetcher.tag ? [fetcher.tag] : [],
+    queryKey: [...(fetcher.tag || []), isImpersonating],
     queryFn: () => fetcher.request(),
   };
 

diff --git a/src/api/useBaseQuery.ts b/src/api/useBaseQuery.ts
@@ -41,10 +41,10 @@ export function useBaseQuery<R = unknown>({
 
   const { enabled, ...restQueryOptions } = queryOptions;
   const { isAuthenticated, getAccessTokenSilently, logout } = useAuth0();
-  const { getImpersonateHeaders } = useImpersonation();
+  const { getImpersonateHeaders, isImpersonating } = useImpersonation();
 
   return useQuery<R>({
-    queryKey: [...(tags || []), resourcePath, queryParams, isAuthenticated],
+    queryKey: [...(tags || []), resourcePath, queryParams, isAuthenticated, isImpersonating],
     queryFn: async () => {
       const { options } = await getHttpOptions({
         isAuthenticated,

diff --git a/src/hooks/useRestfulData/useRestfulData.tsx b/src/hooks/useRestfulData/useRestfulData.tsx
@@ -34,10 +34,10 @@ export function useRestfulData<R = unknown>({
 }: UseRestfulDataProps<R>) {
   const { enabled, ...restQueryOptions } = queryOptions;
   const { isAuthenticated, getAccessTokenSilently, logout } = useAuth0();
-  const { getImpersonateHeaders } = useImpersonation();
+  const { getImpersonateHeaders, isImpersonating } = useImpersonation();
 
   return useQuery<R>({
-    queryKey: [...(queryKey || []), resourcePath, pathParam, queryParams, isAuthenticated],
+    queryKey: [...(queryKey || []), resourcePath, pathParam, queryParams, isAuthenticated, isImpersonating],
     queryFn: async () => {
       const { options } = await getHttpOptions({
         isAuthenticated,