feat: add resource parameter to the OAuth2 token request to follow RF…

…C-8707
eclipse-edc · Dec 18, 2024 · 0f2ebea · 0f2ebea
1 parent abdc001
commit 0f2ebea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/...uth2/oauth2-core/src/main/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImpl.java b/...uth2/oauth2-core/src/main/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImpl.java
@@ -102,6 +102,7 @@ private Oauth2CredentialsRequest createRequest(TokenParameters parameters, Strin
                 .url(tokenUrl)
                 .clientAssertion(assertion)
                 .scope(parameters.getStringClaim(JwtRegisteredClaimNames.SCOPE))
+                .resource(parameters.getStringClaim(JwtRegisteredClaimNames.AUDIENCE))
                 .grantType(GRANT_TYPE)
                 .build();
     }

diff --git a/.../oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImplTest.java b/.../oauth2-core/src/test/java/org/eclipse/edc/iam/oauth2/identity/Oauth2ServiceImplTest.java
@@ -143,6 +143,7 @@ void obtainClientCredentials() {
         assertThat(capturedRequest.getScope()).isEqualTo("scope");
         assertThat(capturedRequest.getClientAssertion()).isEqualTo("assertionToken");
         assertThat(capturedRequest.getClientAssertionType()).isEqualTo("urn:ietf:params:oauth:client-assertion-type:jwt-bearer");
+        assertThat(capturedRequest.getResource()).isEqualTo("audience");
     }
 
 

diff --git a/...th2-spi/src/main/java/org/eclipse/edc/iam/oauth2/spi/client/Oauth2CredentialsRequest.java b/...th2-spi/src/main/java/org/eclipse/edc/iam/oauth2/spi/client/Oauth2CredentialsRequest.java
@@ -25,6 +25,7 @@ public abstract class Oauth2CredentialsRequest {
 
     private static final String GRANT_TYPE = "grant_type";
     private static final String SCOPE = "scope";
+    private static final String RESOURCE = "resource";
 
     protected String url;
     protected final Map<String, String> params = new HashMap<>();
@@ -44,6 +45,11 @@ public String getGrantType() {
         return params.get(GRANT_TYPE);
     }
 
+    @NotNull
+    public String getResource() {
+        return this.params.get(RESOURCE);
+    }
+
     public Map<String, String> getParams() {
         return params;
     }
@@ -80,12 +86,17 @@ public B params(Map<String, String> params) {
             return self();
         }
 
+        public B resource(String targetedAudience) {
+            return param(RESOURCE, targetedAudience);
+        }
+
         public abstract B self();
 
         protected T build() {
             Objects.requireNonNull(request.url, "url");
             Objects.requireNonNull(request.params.get(GRANT_TYPE), GRANT_TYPE);
             return request;
         }
+
     }
 }