diff --git a/extension/java-client-operate-compat/src/main/java/io/camunda/common/auth/SaaSAuthentication.java b/extension/java-client-operate-compat/src/main/java/io/camunda/common/auth/SaaSAuthentication.java index 0e49667..587bd46 100644 --- a/extension/java-client-operate-compat/src/main/java/io/camunda/common/auth/SaaSAuthentication.java +++ b/extension/java-client-operate-compat/src/main/java/io/camunda/common/auth/SaaSAuthentication.java @@ -31,7 +31,8 @@ private static JwtAuthentication jwtAuthentication(JwtConfig jwtConfig, JsonMapp jwtCredential.getClientId(), jwtCredential.getClientSecret(), jwtCredential.getAudience(), - URI.create(jwtCredential.getAuthUrl()).toURL()); + URI.create(jwtCredential.getAuthUrl()).toURL(), + null); } catch (MalformedURLException e) { throw new RuntimeException("Error while mapping jwt credential", e); } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java index e662e9c..7febdde 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java @@ -78,6 +78,7 @@ private HttpPost buildRequest() throws URISyntaxException { formParams.add(new BasicNameValuePair("client_id", jwtCredential.clientId())); formParams.add(new BasicNameValuePair("client_secret", jwtCredential.clientSecret())); formParams.add(new BasicNameValuePair("audience", jwtCredential.audience())); + formParams.add(new BasicNameValuePair("scope", jwtCredential.scope())); httpPost.setEntity(new UrlEncodedFormEntity(formParams)); return httpPost; } diff --git a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java index d094261..d2f25bd 100644 --- a/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java +++ b/extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java @@ -2,4 +2,5 @@ import java.net.URL; -public record JwtCredential(String clientId, String clientSecret, String audience, URL authUrl) {} +public record JwtCredential( + String clientId, String clientSecret, String audience, URL authUrl, String scope) {} diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java index 3be58bb..287aae6 100644 --- a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java @@ -81,7 +81,8 @@ public Authentication authentication() { properties.clientId(), properties.clientSecret(), properties.audience(), - properties.authUrl()), + properties.authUrl(), + properties.scope()), new JacksonTokenResponseMapper(objectMapper)); } default -> throw new IllegalStateException("Unsupported profile: " + properties.profile()); diff --git a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java index a582138..800e9af 100644 --- a/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java +++ b/extension/spring-boot-starter-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java @@ -19,6 +19,7 @@ public record OperateClientConfigurationProperties( String clientSecret, URL authUrl, String audience, + String scope, // saas auth properies String region, String clusterId) {