move getting account to requireGitHubAuth

src/server/actions/github/getGithub.ts

@@ -4,26 +4,14 @@ import {Octokit} from 'octokit'
 import {z} from 'zod'
 
 import {requireGitHubAuth} from '@/server/utils/auth'
-import {db} from '@/server/db'
-import {ServerError} from '@/lib/types/error'
 import {serializeServerErrors} from '@/lib/utils/common/error'
 
 export type GetPublicReposResponse = Awaited<
   ReturnType<typeof getPublicReposAction>
 >
 
 const getPublicReposAction = async () => {
-  const session = await requireGitHubAuth()
-
-  const account = await db.query.accounts.findFirst({
-    columns: {access_token: true},
-    where: (account, {eq, and}) =>
-      and(eq(account.userId, session.user.id), eq(account.provider, 'github')),
-  })
-
-  if (!account) {
-    throw new ServerError('GitHub account not found')
-  }
+  const {account} = await requireGitHubAuth()
 
   const octokit = new Octokit({
     auth: account.access_token,
@@ -58,20 +46,10 @@ const getRepoFilesParamsSchema = z.object({
 export type GetRepoFilesParams = z.infer<typeof getRepoFilesParamsSchema>
 
 const getRepoFilesAction = async (request: GetRepoFilesParams) => {
-  const session = await requireGitHubAuth()
+  const {account} = await requireGitHubAuth()
 
   const {repo, owner, defaultBranch} = getRepoFilesParamsSchema.parse(request)
 
-  const account = await db.query.accounts.findFirst({
-    columns: {access_token: true},
-    where: (account, {eq, and}) =>
-      and(eq(account.userId, session.user.id), eq(account.provider, 'github')),
-  })
-
-  if (!account) {
-    throw new ServerError('GitHub account not found')
-  }
-
   const octokit = new Octokit({
     auth: account.access_token,
   })

src/server/utils/auth.ts

@@ -3,6 +3,7 @@ import {Session, getServerSession} from 'next-auth'
 
 import {authOptions} from '../authOptions'
 import {UserRole} from '../db/models'
+import {db} from '../db'
 
 import {ServerError} from '@/lib/types/error'
 
@@ -55,5 +56,15 @@ export const requireGitHubAuth = async () => {
     )
   }
 
-  return session
+  const account = await db.query.accounts.findFirst({
+    columns: {access_token: true},
+    where: (account, {eq, and}) =>
+      and(eq(account.userId, session.user.id), eq(account.provider, 'github')),
+  })
+
+  if (!account) {
+    throw new ServerError('GitHub account not found.')
+  }
+
+  return {session, account}
 }