Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Enhance Gitea repository handling and clean up token refresh logic

Browse Source 
- Updated Gitea repository cloning to use the remote variant for better consistency.
- Removed unnecessary logging and comments in the token refresh function to streamline the code.
- Improved type handling in the cloneGiteaRepository function for better clarity.
This commit is contained in:
Mauricio Siu 2025-03-23 03:35:02 -06:00
parent 9359ee7a04
commit a067abd3e4
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/server/src/utils/docker/domain.ts
View File

@ -14,7 +14,10 @@ import {
cloneGitRawRepository, cloneGitRawRepository,
cloneRawGitRepositoryRemote, cloneRawGitRepositoryRemote,
} from "../providers/git"; } from "../providers/git";
import { cloneRawGiteaRepository } from "../providers/gitea"; import {
cloneRawGiteaRepository,
cloneRawGiteaRepositoryRemote,
} from "../providers/gitea";
import { import {
cloneRawGithubRepository, cloneRawGithubRepository,
cloneRawGithubRepositoryRemote, cloneRawGithubRepositoryRemote,
@ -62,7 +65,7 @@ export const cloneComposeRemote = async (compose: Compose) => {
} else if (compose.sourceType === "git") { } else if (compose.sourceType === "git") {
await cloneRawGitRepositoryRemote(compose); await cloneRawGitRepositoryRemote(compose);
} else if (compose.sourceType === "gitea") { } else if (compose.sourceType === "gitea") {
await cloneRawGiteaRepository(compose); await cloneRawGiteaRepositoryRemote(compose);
} else if (compose.sourceType === "raw") { } else if (compose.sourceType === "raw") {
await createComposeFileRawRemote(compose); await createComposeFileRawRemote(compose);
} }

35
packages/server/src/utils/providers/gitea.ts
View File

@ -31,16 +31,8 @@ export const getErrorCloneRequirements = (entity: {
return reasons; return reasons;
}; };
/**
* Function to refresh the Gitea token if expired
*/
export const refreshGiteaToken = async (giteaProviderId: string) => { export const refreshGiteaToken = async (giteaProviderId: string) => {
try { try {
console.log("Attempting to refresh Gitea token:", {
giteaProviderId,
timestamp: new Date().toISOString(),
});
const giteaProvider = await findGiteaById(giteaProviderId); const giteaProvider = await findGiteaById(giteaProviderId);
if ( if (
@ -48,7 +40,6 @@ export const refreshGiteaToken = async (giteaProviderId: string) => {
!giteaProvider?.clientSecret || !giteaProvider?.clientSecret ||
!giteaProvider?.refreshToken !giteaProvider?.refreshToken
) { ) {
console.warn("Missing credentials for token refresh");
return giteaProvider?.accessToken || null; return giteaProvider?.accessToken || null;
} }
@ -60,9 +51,6 @@ export const refreshGiteaToken = async (giteaProviderId: string) => {
client_secret: giteaProvider.clientSecret, client_secret: giteaProvider.clientSecret,
}); });
console.log("Token Endpoint:", tokenEndpoint);
console.log("Request Parameters:", params.toString());
const response = await fetch(tokenEndpoint, { const response = await fetch(tokenEndpoint, {
method: "POST", method: "POST",
headers: { headers: {
@ -72,14 +60,7 @@ export const refreshGiteaToken = async (giteaProviderId: string) => {
body: params.toString(), body: params.toString(),
}); });
console.log("Token Refresh Response:", {
status: response.status,
statusText: response.statusText,
});
if (!response.ok) { if (!response.ok) {
const errorText = await response.text();
console.error("Token Refresh Failed:", errorText);
return giteaProvider?.accessToken || null; return giteaProvider?.accessToken || null;
} }
@ -87,7 +68,6 @@ export const refreshGiteaToken = async (giteaProviderId: string) => {
const { access_token, refresh_token, expires_in } = data; const { access_token, refresh_token, expires_in } = data;
if (!access_token) { if (!access_token) {
console.error("Missing access token in refresh response");
return giteaProvider?.accessToken || null; return giteaProvider?.accessToken || null;
} }
@ -100,11 +80,9 @@ export const refreshGiteaToken = async (giteaProviderId: string) => {
expiresAt: expiresAtSeconds, expiresAt: expiresAtSeconds,
}); });
console.log("Gitea token refreshed successfully.");
return access_token; return access_token;
} catch (error) { } catch (error) {
console.error("Token Refresh Error:", error); console.error("Error refreshing Gitea token:", error);
// Return the existing token if refresh fails
const giteaProvider = await findGiteaById(giteaProviderId); const giteaProvider = await findGiteaById(giteaProviderId);
return giteaProvider?.accessToken || null; return giteaProvider?.accessToken || null;
} }
@ -177,15 +155,8 @@ export const getGiteaCloneCommand = async (
return cloneCommand; return cloneCommand;
}; };
interface CloneGiteaRepository {
appName: string;
giteaBranch: string;
giteaId: string;
giteaOwner: string;
giteaRepository: string;
}
export const cloneGiteaRepository = async ( export const cloneGiteaRepository = async (
entity: CloneGiteaRepository, entity: ApplicationWithGitea | ComposeWithGitea,
logPath: string, logPath: string,
isCompose = false, isCompose = false,
) => { ) => {
@ -226,7 +197,7 @@ export const cloneGiteaRepository = async (
[ [
"clone", "clone",
"--branch", "--branch",
giteaBranch, giteaBranch!,
"--depth", "--depth",
"1", "1",
"--recurse-submodules", "--recurse-submodules",