useSession in useQuery

vacuumlabs · May 6, 2024 · 68e5486 · 68e5486
1 parent 2b42965
commit 68e5486
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/components/sections/GitHub/GithubFileSelect.tsx b/src/components/sections/GitHub/GithubFileSelect.tsx
@@ -27,7 +27,6 @@ const GithubFileSelect = ({
 
   const {data: repoFilesData, isLoading: repoFilesIsLoading} = useGetRepoFiles(
     selectedRepo ?? undefined,
-    session.data?.user.provider,
   )
 
   if (session.data?.user.provider !== 'github') {

diff --git a/src/components/sections/GitHub/GithubRepoSelect.tsx b/src/components/sections/GitHub/GithubRepoSelect.tsx
@@ -17,7 +17,7 @@ const GithubRepoSelect = ({selectedRepo, onSelectRepo}: GithubRepoSelect) => {
   const session = useSession()
 
   const {data: publicReposData, isLoading: publicReposIsLoading} =
-    useGetPublicRepos(session.data?.user.provider)
+    useGetPublicRepos()
 
   if (session.data?.user.provider !== 'github') {
     return (

diff --git a/src/lib/queries/github/getGitHub.ts b/src/lib/queries/github/getGitHub.ts
@@ -1,4 +1,5 @@
 import {useQuery} from '@tanstack/react-query'
+import {useSession} from 'next-auth/react'
 
 import {queryKeys} from '../keys'
 
@@ -15,12 +16,13 @@ const getPublicReposQueryOptions = (userId: string | undefined) => ({
   queryFn: withApiErrorHandler(() => getPublicRepos()),
 })
 
-export const useGetPublicRepos = (provider: string | undefined) => {
+export const useGetPublicRepos = () => {
   const userId = useUserId()
+  const session = useSession()
 
   return useQuery({
     ...getPublicReposQueryOptions(userId),
-    enabled: !!userId && provider === 'github',
+    enabled: !!userId && session.data?.user.provider === 'github',
   })
 }
 
@@ -35,11 +37,11 @@ const getRepoFilesQueryOptions = (params: GetRepoFilesParams | undefined) => ({
   }),
 })
 
-export const useGetRepoFiles = (
-  params: GetRepoFilesParams | undefined,
-  provider: string | undefined,
-) =>
-  useQuery({
+export const useGetRepoFiles = (params: GetRepoFilesParams | undefined) => {
+  const session = useSession()
+
+  return useQuery({
     ...getRepoFilesQueryOptions(params),
-    enabled: !!params && provider === 'github',
+    enabled: !!params && session.data?.user.provider === 'github',
   })
+}