From c099275b313c695d715d4c64bb1f8056b81e440c Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Tue, 20 Aug 2024 11:11:45 -0500
Subject: [PATCH] doRefresh now only depends on router.

---
 src/AuthAwareQueryClientProvider.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/AuthAwareQueryClientProvider.tsx b/src/AuthAwareQueryClientProvider.tsx
index bee58d9..3fde344 100644
--- a/src/AuthAwareQueryClientProvider.tsx
+++ b/src/AuthAwareQueryClientProvider.tsx
@@ -1,6 +1,6 @@
 import { QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools'
-import { useLocation, useNavigate } from '@tanstack/react-router'
+import { useRouter } from '@tanstack/react-router'
 import React, { useCallback, useMemo, useRef } from 'react'
 import { ApiError } from './api/ApiError'
 import ExpiredTokenError from './api/ExpiredTokenError'
@@ -9,8 +9,7 @@ import { useAuth } from './auth'
 
 const AuthAwareQueryClientProvider = ({ children }: React.PropsWithChildren) => {
     const { putToken } = useAuth()
-    const navigate = useNavigate()
-    const location = useLocation()
+    const router = useRouter()
     const refreshing = useRef(false)
 
     const doRefresh = useCallback(async () => {
@@ -26,11 +25,11 @@ const AuthAwareQueryClientProvider = ({ children }: React.PropsWithChildren) =>
                 })
             } catch (error) {
                 if (error instanceof RefreshTokenError) {
-                    navigate({
+                    router.navigate({
                         to: '/login',
                         search: {
                             reason: error.reason,
-                            redirect: location.href
+                            redirect: router.state.location.href
                         }
                     })
                 } else if (error instanceof ApiError) {
@@ -39,7 +38,7 @@ const AuthAwareQueryClientProvider = ({ children }: React.PropsWithChildren) =>
             }
             refreshing.current = false
         }
-    }, [putToken, navigate, location])
+    }, [putToken, router])
 
     const queryClient = useMemo(
         () =>