Skip to content

The Unified and Autonomous Development Platform

fix: Unable to build from commits page if build spec imports from other build specs (#1781)

Robin Shen19e03395da39
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index e90b3e2488..928da4618c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -161,15 +161,15 @@ public class BuildSpec implements Serializable, Validatable {
if (!commitChain.contains(importCommit.name())) {
Collection<String> newCommitChain = new HashSet<>(commitChain);
newCommitChain.add(importCommit.name());
- BuildSpec importedBuildSpec = aImport.getBuildSpec();
JobAuthorizationContext.push(new JobAuthorizationContext(
aImport.getProject(), importCommit, SecurityUtils.getUser(), null));
try {
+ BuildSpec importedBuildSpec = aImport.getBuildSpec();
importedBuildSpecs.addAll(importedBuildSpec.getImportedBuildSpecs(newCommitChain));
+ importedBuildSpecs.add(importedBuildSpec);
} finally {
JobAuthorizationContext.pop();
}
- importedBuildSpecs.add(importedBuildSpec);
}
} catch (Exception e) {
// Ignore here as we rely on this method to show viewer/editor
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Import.java b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
index d3df47f438..bbd9f73d7d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Import.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Import.java
@@ -153,7 +153,7 @@ public class Import implements Serializable, Validatable {
Subject subject;
if (getAccessTokenSecret() != null) {
JobAuthorizationContext context = Preconditions.checkNotNull(JobAuthorizationContext.get());
- String accessToken = context.getSecretValue(accessTokenSecret);
+ String accessToken = context.getSecretValue(getAccessTokenSecret());
User user = OneDev.getInstance(UserManager.class).findByAccessToken(accessToken);
if (user == null) {
throw new ExplicitException(String.format(