mirror of
https://github.com/andwati/dokploy.git
synced 2026-10-29 16:22:16 +00:00
Merge pull request #4136 from Dokploy/4066-git-clone-uses-external-url-instead-of-internal-url-when-oauth2-provider-has-internal-url-configured-causing-authelia-redirect-error
fix(git-provider): use internal URLs for Gitea and GitLab repository …
This commit is contained in:
@@ -90,12 +90,14 @@ const getGitlabRepoClone = (
|
|||||||
gitlab: GitlabInfo,
|
gitlab: GitlabInfo,
|
||||||
gitlabPathNamespace: string | null,
|
gitlabPathNamespace: string | null,
|
||||||
) => {
|
) => {
|
||||||
const repoClone = `${gitlab?.gitlabUrl.replace(/^https?:\/\//, "")}/${gitlabPathNamespace}.git`;
|
const url = gitlab?.gitlabInternalUrl || gitlab?.gitlabUrl;
|
||||||
|
const repoClone = `${url?.replace(/^https?:\/\//, "")}/${gitlabPathNamespace}.git`;
|
||||||
return repoClone;
|
return repoClone;
|
||||||
};
|
};
|
||||||
|
|
||||||
const getGitlabCloneUrl = (gitlab: GitlabInfo, repoClone: string) => {
|
const getGitlabCloneUrl = (gitlab: GitlabInfo, repoClone: string) => {
|
||||||
const isSecure = gitlab?.gitlabUrl.startsWith("https://");
|
const url = gitlab?.gitlabInternalUrl || gitlab?.gitlabUrl;
|
||||||
|
const isSecure = url?.startsWith("https://");
|
||||||
const cloneUrl = `http${isSecure ? "s" : ""}://oauth2:${gitlab?.accessToken}@${repoClone}`;
|
const cloneUrl = `http${isSecure ? "s" : ""}://oauth2:${gitlab?.accessToken}@${repoClone}`;
|
||||||
return cloneUrl;
|
return cloneUrl;
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user