andwati/dokploy
1
0
Fork 0
mirror of https://github.com/andwati/dokploy.git synced 2026-11-10 14:05:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: update Gitea and GitLab URL handling to prioritize internal URLs if available

Browse Source
This commit is contained in:
Mauricio Siu
2026-03-07 00:33:54 -06:00
parent 2f4cbbd3ac
commit cedec5239f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/server/src/utils/providers/gitea.ts
+3 -3
View File
@@ -211,7 +211,7 @@ export const testGiteaConnection = async (input: { giteaId: string }) => {
}); });
} }
const baseUrl = provider.giteaUrl.replace(/\/+$/, ""); const baseUrl = (provider.giteaInternalUrl || provider.giteaUrl).replace(/\/+$/, "");
// Use /user/repos to get authenticated user's repositories with pagination // Use /user/repos to get authenticated user's repositories with pagination
let allRepos = 0; let allRepos = 0;
@@ -268,7 +268,7 @@ export const getGiteaRepositories = async (giteaId?: string) => {
await refreshGiteaToken(giteaId); await refreshGiteaToken(giteaId);
const giteaProvider = await findGiteaById(giteaId); const giteaProvider = await findGiteaById(giteaId);
const baseUrl = giteaProvider.giteaUrl.replace(/\/+$/, ""); const baseUrl = (giteaProvider.giteaInternalUrl || giteaProvider.giteaUrl).replace(/\/+$/, "");
// Use /user/repos to get authenticated user's repositories with pagination // Use /user/repos to get authenticated user's repositories with pagination
let allRepositories: any[] = []; let allRepositories: any[] = [];
@@ -333,7 +333,7 @@ export const getGiteaBranches = async (input: {
const giteaProvider = await findGiteaById(input.giteaId); const giteaProvider = await findGiteaById(input.giteaId);
const baseUrl = giteaProvider.giteaUrl.replace(/\/+$/, ""); const baseUrl = (giteaProvider.giteaInternalUrl || giteaProvider.giteaUrl).replace(/\/+$/, "");
// Handle pagination for branches // Handle pagination for branches
let allBranches: any[] = []; let allBranches: any[] = [];
packages/server/src/utils/providers/gitlab.ts
+4 -2
View File
@@ -214,10 +214,11 @@ export const getGitlabBranches = async (input: {
const allBranches = []; const allBranches = [];
let page = 1; let page = 1;
const perPage = 100; // GitLab's max per page is 100 const perPage = 100; // GitLab's max per page is 100
const baseUrl = (gitlabProvider.gitlabInternalUrl || gitlabProvider.gitlabUrl).replace(/\/+$/, "");
while (true) { while (true) {
const branchesResponse = await fetch( const branchesResponse = await fetch(
`${gitlabProvider.gitlabUrl}/api/v4/projects/${input.id}/repository/branches?page=${page}&per_page=${perPage}`, `${baseUrl}/api/v4/projects/${input.id}/repository/branches?page=${page}&per_page=${perPage}`,
{ {
headers: { headers: {
Authorization: `Bearer ${gitlabProvider.accessToken}`, Authorization: `Bearer ${gitlabProvider.accessToken}`,
@@ -292,10 +293,11 @@ export const validateGitlabProvider = async (gitlabProvider: Gitlab) => {
const allProjects = []; const allProjects = [];
let page = 1; let page = 1;
const perPage = 100; // GitLab's max per page is 100 const perPage = 100; // GitLab's max per page is 100
const baseUrl = (gitlabProvider.gitlabInternalUrl || gitlabProvider.gitlabUrl).replace(/\/+$/, "");
while (true) { while (true) {
const response = await fetch( const response = await fetch(
`${gitlabProvider.gitlabUrl}/api/v4/projects?membership=true&page=${page}&per_page=${perPage}`, `${baseUrl}/api/v4/projects?membership=true&page=${page}&per_page=${perPage}`,
{ {
headers: { headers: {
Authorization: `Bearer ${gitlabProvider.accessToken}`, Authorization: `Bearer ${gitlabProvider.accessToken}`,