mirror of
https://github.com/RayLabsHQ/gitea-mirror.git
synced 2026-04-09 20:47:36 +03:00
Add optional external Gitea URL for UI links
This commit is contained in:
@@ -35,6 +35,7 @@ export const githubConfigSchema = z.object({
|
||||
|
||||
export const giteaConfigSchema = z.object({
|
||||
url: z.url(),
|
||||
externalUrl: z.url().optional(),
|
||||
token: z.string(),
|
||||
defaultOwner: z.string(),
|
||||
organization: z.string().optional(),
|
||||
|
||||
@@ -28,6 +28,7 @@ interface EnvConfig {
|
||||
};
|
||||
gitea: {
|
||||
url?: string;
|
||||
externalUrl?: string;
|
||||
username?: string;
|
||||
token?: string;
|
||||
organization?: string;
|
||||
@@ -118,6 +119,7 @@ function parseEnvConfig(): EnvConfig {
|
||||
},
|
||||
gitea: {
|
||||
url: process.env.GITEA_URL,
|
||||
externalUrl: process.env.GITEA_EXTERNAL_URL,
|
||||
username: process.env.GITEA_USERNAME,
|
||||
token: process.env.GITEA_TOKEN,
|
||||
organization: process.env.GITEA_ORGANIZATION,
|
||||
@@ -267,6 +269,7 @@ export async function initializeConfigFromEnv(): Promise<void> {
|
||||
// Build Gitea config
|
||||
const giteaConfig = {
|
||||
url: envConfig.gitea.url || existingConfig?.[0]?.giteaConfig?.url || '',
|
||||
externalUrl: envConfig.gitea.externalUrl || existingConfig?.[0]?.giteaConfig?.externalUrl || undefined,
|
||||
token: envConfig.gitea.token ? encrypt(envConfig.gitea.token) : existingConfig?.[0]?.giteaConfig?.token || '',
|
||||
defaultOwner: envConfig.gitea.username || existingConfig?.[0]?.giteaConfig?.defaultOwner || '',
|
||||
organization: envConfig.gitea.organization || existingConfig?.[0]?.giteaConfig?.organization || undefined,
|
||||
|
||||
@@ -9,6 +9,7 @@ export interface DefaultConfigOptions {
|
||||
githubToken?: string;
|
||||
githubUsername?: string;
|
||||
giteaUrl?: string;
|
||||
giteaExternalUrl?: string;
|
||||
giteaToken?: string;
|
||||
giteaUsername?: string;
|
||||
scheduleEnabled?: boolean;
|
||||
@@ -38,6 +39,8 @@ export async function createDefaultConfig({ userId, envOverrides = {} }: Default
|
||||
const githubToken = envOverrides.githubToken || process.env.GITHUB_TOKEN || "";
|
||||
const githubUsername = envOverrides.githubUsername || process.env.GITHUB_USERNAME || "";
|
||||
const giteaUrl = envOverrides.giteaUrl || process.env.GITEA_URL || "";
|
||||
const giteaExternalUrl =
|
||||
envOverrides.giteaExternalUrl || process.env.GITEA_EXTERNAL_URL || "";
|
||||
const giteaToken = envOverrides.giteaToken || process.env.GITEA_TOKEN || "";
|
||||
const giteaUsername = envOverrides.giteaUsername || process.env.GITEA_USERNAME || "";
|
||||
|
||||
@@ -77,6 +80,7 @@ export async function createDefaultConfig({ userId, envOverrides = {} }: Default
|
||||
},
|
||||
giteaConfig: {
|
||||
url: giteaUrl,
|
||||
externalUrl: giteaExternalUrl || undefined,
|
||||
token: giteaToken ? encrypt(giteaToken) : "",
|
||||
defaultOwner: giteaUsername,
|
||||
mirrorInterval: "8h",
|
||||
|
||||
@@ -61,6 +61,7 @@ export function mapUiToDbConfig(
|
||||
// Map Gitea config to match database schema
|
||||
const dbGiteaConfig: DbGiteaConfig = {
|
||||
url: giteaConfig.url,
|
||||
externalUrl: giteaConfig.externalUrl?.trim() || undefined,
|
||||
token: giteaConfig.token,
|
||||
defaultOwner: giteaConfig.username, // Map username to defaultOwner
|
||||
organization: giteaConfig.organization, // Add organization field
|
||||
@@ -127,6 +128,7 @@ export function mapDbToUiConfig(dbConfig: any): {
|
||||
// Map from database Gitea config to UI fields
|
||||
const giteaConfig: GiteaConfig = {
|
||||
url: dbConfig.giteaConfig?.url || "",
|
||||
externalUrl: dbConfig.giteaConfig?.externalUrl || "",
|
||||
username: dbConfig.giteaConfig?.defaultOwner || "", // Map defaultOwner to username
|
||||
token: dbConfig.giteaConfig?.token || "",
|
||||
organization: dbConfig.githubConfig?.defaultOrg || "github-mirrors", // Get from GitHub config
|
||||
|
||||
Reference in New Issue
Block a user