The Unified and Autonomous Development Platform
Fix issue #825 - Gitea import doesn't authenticate correctly with private repositories
Robin Shenec67156762e4
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.javaindex bef7a49e49..fd2be79eaa 100644--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportServer.java@@ -204,8 +204,7 @@ public class ImportServer implements Serializable, Validatable {throw new ExplicitException("Https clone url not found");URIBuilder builder = new URIBuilder(cloneUrl);- if (isPrivate)- builder.setUserInfo(getUserName(), getAppPassword());+ builder.setUserInfo(getUserName(), getAppPassword());if (!dryRun) {projectManager.clone(project, builder.build().toString());diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.javaindex 86ca901faa..c7c012e6fb 100644--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportServer.java@@ -504,8 +504,7 @@ public class ImportServer implements Serializable, Validatable {project.setDefaultRole(option.getPublicRole());URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());- if (isPrivate)- builder.setUserInfo("git", getAccessToken());+ builder.setUserInfo("git", getAccessToken());if (!dryRun) {projectManager.clone(project, builder.build().toString());diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.javaindex 1366d6b75f..a63f0aa8a3 100644--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportServer.java@@ -552,8 +552,7 @@ public class ImportServer implements Serializable, Validatable {project.setDefaultRole(option.getPublicRole());URIBuilder builder = new URIBuilder(repoNode.get("clone_url").asText());- if (isPrivate)- builder.setUserInfo("git", getAccessToken());+ builder.setUserInfo("git", getAccessToken());if (!dryRun) {projectManager.clone(project, builder.build().toString());diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.javaindex 7d00ba0551..e3b4cb3116 100644--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportServer.java@@ -284,8 +284,7 @@ public class ImportServer implements Serializable, Validatable {project.setDefaultRole(option.getPublicRole());URIBuilder builder = new URIBuilder(projectNode.get("http_url_to_repo").asText());- if (!visibility.equals("public"))- builder.setUserInfo("git", getAccessToken());+ builder.setUserInfo("git", getAccessToken());if (!dryRun) {projectManager.clone(project, builder.build().toString());