mirror of
https://github.com/codeflash-ai/codeflash-internal.git
synced 2026-05-04 18:25:18 +00:00
Merge pull request #2267 from codeflash-ai/ashraf/cf-1024-correct-error-message-when-github-app-is-not-installed
Enhance error handling for GitHub App installation checks in code con…
This commit is contained in:
commit
bf68c1a50d
1 changed files with 33 additions and 6 deletions
|
|
@ -1,5 +1,6 @@
|
||||||
import { prisma } from "@codeflash-ai/common"
|
import { prisma } from "@codeflash-ai/common"
|
||||||
import { Request, Response } from "express"
|
import { Request, Response } from "express"
|
||||||
|
import { Octokit } from "@octokit/core"
|
||||||
import { githubApp } from "../github/github-app.js"
|
import { githubApp } from "../github/github-app.js"
|
||||||
import { getInstallationOctokitByOwner, isUserCollaborator } from "../github/github-utils.js"
|
import { getInstallationOctokitByOwner, isUserCollaborator } from "../github/github-utils.js"
|
||||||
import { userNickname } from "../auth0-mgmt.js"
|
import { userNickname } from "../auth0-mgmt.js"
|
||||||
|
|
@ -12,8 +13,38 @@ import {
|
||||||
validationFailure,
|
validationFailure,
|
||||||
internalServerError,
|
internalServerError,
|
||||||
conflict,
|
conflict,
|
||||||
|
githubInstallationNotFound,
|
||||||
|
githubInstallationError,
|
||||||
} from "../exceptions/index.js"
|
} from "../exceptions/index.js"
|
||||||
|
|
||||||
|
const GITHUB_APP_INSTALL_LINK = "https://github.com/apps/codeflash-ai/installations/select_target"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Validates the installation octokit result and throws appropriate errors if it's an Error.
|
||||||
|
* Uses TypeScript assertion to narrow the type to Octokit on success.
|
||||||
|
*/
|
||||||
|
function assertInstallationOctokit(
|
||||||
|
octokit: Octokit | Error,
|
||||||
|
owner: string,
|
||||||
|
repo: string,
|
||||||
|
req: Request,
|
||||||
|
): asserts octokit is Octokit {
|
||||||
|
if (!(octokit instanceof Error)) return
|
||||||
|
|
||||||
|
const repoPath = `${owner}/${repo}`
|
||||||
|
const errorMessage = octokit.message
|
||||||
|
|
||||||
|
if (errorMessage.includes("not installed")) {
|
||||||
|
logger.warn("GitHub App not installed on repository", req, {
|
||||||
|
repo: repoPath,
|
||||||
|
installationLink: GITHUB_APP_INSTALL_LINK,
|
||||||
|
})
|
||||||
|
throw githubInstallationNotFound(`${repoPath}. Please install the GitHub App at: ${GITHUB_APP_INSTALL_LINK}`)
|
||||||
|
} else {
|
||||||
|
throw githubInstallationError(errorMessage)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function is_code_being_optimized_again(req: Request, res: Response) {
|
export async function is_code_being_optimized_again(req: Request, res: Response) {
|
||||||
try {
|
try {
|
||||||
const { owner, repo, pr_number, code_contexts } = req.body
|
const { owner, repo, pr_number, code_contexts } = req.body
|
||||||
|
|
@ -27,9 +58,7 @@ export async function is_code_being_optimized_again(req: Request, res: Response)
|
||||||
throw unauthorized("")
|
throw unauthorized("")
|
||||||
}
|
}
|
||||||
const octokit = await getInstallationOctokitByOwner(githubApp, owner, repo, userId)
|
const octokit = await getInstallationOctokitByOwner(githubApp, owner, repo, userId)
|
||||||
if (octokit instanceof Error) {
|
assertInstallationOctokit(octokit, owner, repo, req)
|
||||||
throw internalServerError(octokit.message)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check collaborator status with error handling
|
// Check collaborator status with error handling
|
||||||
try {
|
try {
|
||||||
|
|
@ -163,9 +192,7 @@ export async function add_optimized_code_context(req: Request, res: Response) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const octokit = await getInstallationOctokitByOwner(githubApp, owner, repo, userId)
|
const octokit = await getInstallationOctokitByOwner(githubApp, owner, repo, userId)
|
||||||
if (octokit instanceof Error) {
|
assertInstallationOctokit(octokit, owner, repo, req)
|
||||||
throw internalServerError(octokit.message)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check collaborator status with error handling
|
// Check collaborator status with error handling
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue