Skip to content

feat: add oauth scope (for entra id) (#110) #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 16, 2024
Merged

feat: add oauth scope (for entra id) (#110) #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
193bf3c
feat: add oauth scope (for entra id) (#110)
tea-one Oct 16, 2024
8e6137c
saas does not require a scope
jonathanlukas Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...n/java-client-operate-compat/src/main/java/io/camunda/common/auth/SaaSAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion extension/java-client-operate/src/main/java/io/camunda/operate/auth/JwtCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
3 changes: 2 additions & 1 deletion ...r-camunda-operate/src/main/java/io/camunda/operate/spring/OperateClientConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
1 change: 1 addition & 0 deletions ...operate/src/main/java/io/camunda/operate/spring/OperateClientConfigurationProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public record OperateClientConfigurationProperties(
String clientSecret,
URL authUrl,
String audience,
String scope,
// saas auth properies
String region,
String clusterId) {
Expand Down