diff --git a/packages/server/src/utils/docker/domain.ts b/packages/server/src/utils/docker/domain.ts index 4127248f9..5a68146a6 100644 --- a/packages/server/src/utils/docker/domain.ts +++ b/packages/server/src/utils/docker/domain.ts @@ -14,7 +14,10 @@ import { cloneGitRawRepository, cloneRawGitRepositoryRemote, } from "../providers/git"; -import { cloneRawGiteaRepository } from "../providers/gitea"; +import { + cloneRawGiteaRepository, + cloneRawGiteaRepositoryRemote, +} from "../providers/gitea"; import { cloneRawGithubRepository, cloneRawGithubRepositoryRemote, @@ -62,7 +65,7 @@ export const cloneComposeRemote = async (compose: Compose) => { } else if (compose.sourceType === "git") { await cloneRawGitRepositoryRemote(compose); } else if (compose.sourceType === "gitea") { - await cloneRawGiteaRepository(compose); + await cloneRawGiteaRepositoryRemote(compose); } else if (compose.sourceType === "raw") { await createComposeFileRawRemote(compose); } diff --git a/packages/server/src/utils/providers/gitea.ts b/packages/server/src/utils/providers/gitea.ts index da8ab9d92..7b22e490f 100644 --- a/packages/server/src/utils/providers/gitea.ts +++ b/packages/server/src/utils/providers/gitea.ts @@ -31,16 +31,8 @@ export const getErrorCloneRequirements = (entity: { return reasons; }; -/** - * Function to refresh the Gitea token if expired - */ export const refreshGiteaToken = async (giteaProviderId: string) => { try { - console.log("Attempting to refresh Gitea token:", { - giteaProviderId, - timestamp: new Date().toISOString(), - }); - const giteaProvider = await findGiteaById(giteaProviderId); if ( @@ -48,7 +40,6 @@ export const refreshGiteaToken = async (giteaProviderId: string) => { !giteaProvider?.clientSecret || !giteaProvider?.refreshToken ) { - console.warn("Missing credentials for token refresh"); return giteaProvider?.accessToken || null; } @@ -60,9 +51,6 @@ export const refreshGiteaToken = async (giteaProviderId: string) => { client_secret: giteaProvider.clientSecret, }); - console.log("Token Endpoint:", tokenEndpoint); - console.log("Request Parameters:", params.toString()); - const response = await fetch(tokenEndpoint, { method: "POST", headers: { @@ -72,14 +60,7 @@ export const refreshGiteaToken = async (giteaProviderId: string) => { body: params.toString(), }); - console.log("Token Refresh Response:", { - status: response.status, - statusText: response.statusText, - }); - if (!response.ok) { - const errorText = await response.text(); - console.error("Token Refresh Failed:", errorText); return giteaProvider?.accessToken || null; } @@ -87,7 +68,6 @@ export const refreshGiteaToken = async (giteaProviderId: string) => { const { access_token, refresh_token, expires_in } = data; if (!access_token) { - console.error("Missing access token in refresh response"); return giteaProvider?.accessToken || null; } @@ -100,11 +80,9 @@ export const refreshGiteaToken = async (giteaProviderId: string) => { expiresAt: expiresAtSeconds, }); - console.log("Gitea token refreshed successfully."); return access_token; } catch (error) { - console.error("Token Refresh Error:", error); - // Return the existing token if refresh fails + console.error("Error refreshing Gitea token:", error); const giteaProvider = await findGiteaById(giteaProviderId); return giteaProvider?.accessToken || null; } @@ -177,15 +155,8 @@ export const getGiteaCloneCommand = async ( return cloneCommand; }; -interface CloneGiteaRepository { - appName: string; - giteaBranch: string; - giteaId: string; - giteaOwner: string; - giteaRepository: string; -} export const cloneGiteaRepository = async ( - entity: CloneGiteaRepository, + entity: ApplicationWithGitea | ComposeWithGitea, logPath: string, isCompose = false, ) => { @@ -226,7 +197,7 @@ export const cloneGiteaRepository = async ( [ "clone", "--branch", - giteaBranch, + giteaBranch!, "--depth", "1", "--recurse-submodules",