Merge pull request #142 from jbrunton/fix-require-auth

fix: useAccessToken hook
jbrunton · Aug 17, 2024 · 77ea8ed · 77ea8ed
2 parents f9b3515 + 3785519
commit 77ea8ed
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/client/src/features/auth/hooks/useAccessToken.tsx b/client/src/features/auth/hooks/useAccessToken.tsx
@@ -2,11 +2,15 @@ import { useAuth0 } from '@auth0/auth0-react'
 import { useEffect, useState } from 'react'
 
 export const useAccessToken = (): { accessToken: string | undefined; isLoading: boolean } => {
-  const { isAuthenticated, getAccessTokenSilently } = useAuth0()
+  const { isAuthenticated, getAccessTokenSilently, isLoading: isLoadingAuth } = useAuth0()
   const [accessToken, setAccessToken] = useState<string>()
   const [isLoading, setIsLoading] = useState(true)
 
   useEffect(() => {
+    if (isLoadingAuth) {
+      return
+    }
+
     if (isAuthenticated) {
       const getAccessToken = async () => {
         const accessToken = await getAccessTokenSilently({
@@ -17,8 +21,10 @@ export const useAccessToken = (): { accessToken: string | undefined; isLoading:
         setIsLoading(false)
       }
       getAccessToken()
+    } else {
+      setIsLoading(false)
     }
-  }, [isAuthenticated, isLoading])
+  }, [isAuthenticated, isLoading, isLoadingAuth])
 
   return { accessToken, isLoading }
 }