ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-12 04:15:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix fallback tokens (#242)

Browse source
This commit is contained in:
Brendan Kellam 2025-03-24 09:33:11 -07:00 committed by GitHub
parent c89226871e
commit 8b65a1d81d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.env.development
View file

@ -61,9 +61,9 @@ SOURCEBOT_LOG_LEVEL="debug" # valid values: info, debug, warn, error
SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
# Code-host fallback tokens # Code-host fallback tokens
# FALLBACK_GITHUB_TOKEN="" # FALLBACK_GITHUB_CLOUD_TOKEN=""
# FALLBACK_GITLAB_TOKEN="" # FALLBACK_GITLAB_CLOUD_TOKEN=""
# FALLBACK_GITEA_TOKEN="" # FALLBACK_GITEA_CLOUD_TOKEN=""
# Controls the number of concurrent indexing jobs that can run at once # Controls the number of concurrent indexing jobs that can run at once
# INDEX_CONCURRENCY_MULTIPLE= # INDEX_CONCURRENCY_MULTIPLE=

6
packages/backend/src/env.ts
View file

@ -29,9 +29,9 @@ export const env = createEnv({
POSTHOG_PAPIK: z.string().optional(), POSTHOG_PAPIK: z.string().optional(),
FALLBACK_GITHUB_TOKEN: z.string().optional(), FALLBACK_GITHUB_CLOUD_TOKEN: z.string().optional(),
FALLBACK_GITLAB_TOKEN: z.string().optional(), FALLBACK_GITLAB_CLOUD_TOKEN: z.string().optional(),
FALLBACK_GITEA_TOKEN: z.string().optional(), FALLBACK_GITEA_CLOUD_TOKEN: z.string().optional(),
REDIS_URL: z.string().url().default("redis://localhost:6379"), REDIS_URL: z.string().url().default("redis://localhost:6379"),

11
packages/backend/src/gitea.ts
View file

@ -10,9 +10,18 @@ import * as Sentry from "@sentry/node";
import { env } from './env.js'; import { env } from './env.js';
const logger = createLogger('Gitea'); const logger = createLogger('Gitea');
const GITEA_CLOUD_HOSTNAME = "gitea.com";
export const getGiteaReposFromConfig = async (config: GiteaConnectionConfig, orgId: number, db: PrismaClient) => { export const getGiteaReposFromConfig = async (config: GiteaConnectionConfig, orgId: number, db: PrismaClient) => {
const token = config.token ? await getTokenFromConfig(config.token, orgId, db, logger) : env.FALLBACK_GITEA_TOKEN; const hostname = config.url ?
new URL(config.url).hostname :
GITEA_CLOUD_HOSTNAME;
const token = config.token ?
await getTokenFromConfig(config.token, orgId, db, logger) :
hostname === GITEA_CLOUD_HOSTNAME ?
env.FALLBACK_GITEA_CLOUD_TOKEN :
undefined;
const api = giteaApi(config.url ?? 'https://gitea.com', { const api = giteaApi(config.url ?? 'https://gitea.com', {
token: token, token: token,

11
packages/backend/src/github.ts
View file

@ -10,6 +10,7 @@ import * as Sentry from "@sentry/node";
import { env } from "./env.js"; import { env } from "./env.js";
const logger = createLogger("GitHub"); const logger = createLogger("GitHub");
const GITHUB_CLOUD_HOSTNAME = "github.com";
export type OctokitRepository = { export type OctokitRepository = {
name: string, name: string,
@ -40,7 +41,15 @@ const isHttpError = (error: unknown, status: number): boolean => {
} }
export const getGitHubReposFromConfig = async (config: GithubConnectionConfig, orgId: number, db: PrismaClient, signal: AbortSignal) => { export const getGitHubReposFromConfig = async (config: GithubConnectionConfig, orgId: number, db: PrismaClient, signal: AbortSignal) => {
const token = config.token ? await getTokenFromConfig(config.token, orgId, db, logger) : env.FALLBACK_GITHUB_TOKEN; const hostname = config.url ?
new URL(config.url).hostname :
GITHUB_CLOUD_HOSTNAME;
const token = config.token ?
await getTokenFromConfig(config.token, orgId, db, logger) :
hostname === GITHUB_CLOUD_HOSTNAME ?
env.FALLBACK_GITHUB_CLOUD_TOKEN :
undefined;
const octokit = new Octokit({ const octokit = new Octokit({
auth: token, auth: token,

11
packages/backend/src/gitlab.ts
View file

@ -12,7 +12,15 @@ const logger = createLogger("GitLab");
export const GITLAB_CLOUD_HOSTNAME = "gitlab.com"; export const GITLAB_CLOUD_HOSTNAME = "gitlab.com";
export const getGitLabReposFromConfig = async (config: GitlabConnectionConfig, orgId: number, db: PrismaClient) => { export const getGitLabReposFromConfig = async (config: GitlabConnectionConfig, orgId: number, db: PrismaClient) => {
const token = config.token ? await getTokenFromConfig(config.token, orgId, db, logger) : env.FALLBACK_GITLAB_TOKEN; const hostname = config.url ?
new URL(config.url).hostname :
GITLAB_CLOUD_HOSTNAME;
const token = config.token ?
await getTokenFromConfig(config.token, orgId, db, logger) :
hostname === GITLAB_CLOUD_HOSTNAME ?
env.FALLBACK_GITLAB_CLOUD_TOKEN :
undefined;
const api = new Gitlab({ const api = new Gitlab({
...(token ? { ...(token ? {
@ -22,7 +30,6 @@ export const getGitLabReposFromConfig = async (config: GitlabConnectionConfig, o
host: config.url, host: config.url,
} : {}), } : {}),
}); });
const hostname = config.url ? new URL(config.url).hostname : GITLAB_CLOUD_HOSTNAME;
let allRepos: ProjectSchema[] = []; let allRepos: ProjectSchema[] = [];
let notFound: { let notFound: {