From 18e1100d155176151cc9b209781b8dbee4f8f3bb Mon Sep 17 00:00:00 2001 From: Thomas Diesler Date: Mon, 9 Mar 2026 14:26:23 +0100 Subject: [PATCH] [OID4VCI] Remove deprecated constants used in the old testsuite (#46948) closes #46984 Signed-off-by: Thomas Diesler --- .../models/oid4vci/CredentialScopeModel.java | 13 ---------- .../signing/OID4VCAttestationProofTest.java | 2 +- .../OID4VCAuthorizationCodeFlowTestBase.java | 16 ++++++------ ...ID4VCAuthorizationCodeFlowWithPARTest.java | 4 +-- ...ID4VCAuthorizationDetailsFlowTestBase.java | 22 ++++++++-------- .../OID4VCIssuerEndpointEncryptionTest.java | 10 +++---- .../signing/OID4VCIssuerEndpointTest.java | 20 +++++++------- .../OID4VCIssuerWellKnownProviderTest.java | 14 +++++----- .../signing/OID4VCJWTIssuerEndpointTest.java | 26 +++++++++---------- .../OID4VCSdJwtIssuingEndpointTest.java | 18 ++++++------- ...4VCSdJwtPreInstalledNaturalPersonTest.java | 4 +-- .../OID4VCTimeNormalizationSdJwtTest.java | 2 +- .../signing/OID4VCTimeNormalizationTest.java | 2 +- 13 files changed, 70 insertions(+), 83 deletions(-) diff --git a/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java b/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java index 4eacc9d9f97..983ec795ab2 100644 --- a/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java +++ b/server-spi-private/src/main/java/org/keycloak/models/oid4vci/CredentialScopeModel.java @@ -136,19 +136,6 @@ public class CredentialScopeModel implements ClientScopeModel { */ public static final String VC_KEY_ATTESTATION_REQUIRED_USER_AUTH = "vc.key_attestations_required.user_authentication"; - // [TODO] Remove deprecated constants used in the old testsuite - @Deprecated public static final String CONFIGURATION_ID = VC_CONFIGURATION_ID; - @Deprecated public static final String CREDENTIAL_IDENTIFIER = VC_IDENTIFIER; - @Deprecated public static final String CONTEXTS = VC_CONTEXTS; - @Deprecated public static final String EXPIRY_IN_SECONDS = VC_EXPIRY_IN_SECONDS; - @Deprecated public static final Integer EXPIRY_IN_SECONDS_DEFAULT = VC_EXPIRY_IN_SECONDS_DEFAULT; - @Deprecated public static final String FORMAT = VC_FORMAT; - @Deprecated public static final String ISSUER_DID = VC_ISSUER_DID; - @Deprecated public static final String KEY_ATTESTATION_REQUIRED = VC_KEY_ATTESTATION_REQUIRED; - @Deprecated public static final String KEY_ATTESTATION_REQUIRED_KEY_STORAGE = VC_KEY_ATTESTATION_REQUIRED_KEY_STORAGE; - @Deprecated public static final String KEY_ATTESTATION_REQUIRED_USER_AUTH = VC_KEY_ATTESTATION_REQUIRED_USER_AUTH; - @Deprecated public static final String TYPES = VC_SUPPORTED_TYPES; - /** * the actual object that is represented by this scope */ diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAttestationProofTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAttestationProofTest.java index 6df88079c3b..af060fb93e8 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAttestationProofTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAttestationProofTest.java @@ -142,7 +142,7 @@ public class OID4VCAttestationProofTest extends OID4VCIssuerEndpointTest { @Test public void testCredentialIssuanceWithAttestationProof() { final String scopeName = jwtTypeCredentialClientScope.getName(); - String configIdFromScope = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String configIdFromScope = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); final String credConfigId = configIdFromScope != null ? configIdFromScope : scopeName; CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java index 33bfded4b9d..83498b48a4f 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowTestBase.java @@ -194,7 +194,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn // Perform authorization code flow to get authorization code (includes authorization_details) AccessTokenResponse tokenResponse = authzCodeFlow(ctx); - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Clear events before credential request events.clear(); @@ -293,7 +293,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn // Perform authorization code flow to get authorization code AccessTokenResponse tokenResponse = authzCodeFlow(ctx); String credentialIdentifier = assertTokenResponse(tokenResponse); - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Clear events before credential request events.clear(); @@ -351,7 +351,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn // Request with mandatory lastName will fail as user does not have "lastName" String credentialIdentifier = assertTokenResponse(tokenResponseWithMandatoryLastName); - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); Oid4vcCredentialRequest credentialRequest = getCredentialRequest(ctx, credRequestSupplier, tokenResponseWithMandatoryLastName, credentialConfigurationId, credentialIdentifier); Oid4vcCredentialResponse credentialResponse = credentialRequest.send(); @@ -410,7 +410,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn // Perform authorization code flow to get authorization code AccessTokenResponse tokenResponse = authzCodeFlow(ctx); String credentialIdentifier = assertTokenResponse(tokenResponse); - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Clear events before credential request events.clear(); @@ -573,7 +573,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn assertNotNull("authorization_details should be derived from requested OID4VC scope", authDetailsResponse); assertFalse("authorization_details should not be empty", authDetailsResponse.isEmpty()); assertEquals("credential_configuration_id should match requested scope", - getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID), + getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID), authDetailsResponse.get(0).getCredentialConfigurationId()); assertNotNull("credential_identifiers should be present", authDetailsResponse.get(0).getCredentialIdentifiers()); assertFalse("credential_identifiers should not be empty", authDetailsResponse.get(0).getCredentialIdentifiers().isEmpty()); @@ -927,7 +927,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn // Perform authorization code flow to get authorization code AccessTokenResponse tokenResponse = authzCodeFlow(ctx); String credentialIdentifier = assertTokenResponse(tokenResponse); - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Request the actual credential using the identifier Oid4vcCredentialRequest credentialRequest = getCredentialRequest(ctx, credentialRequestSupplier, tokenResponse, credentialConfigurationId, credentialIdentifier); @@ -972,7 +972,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setClaims(claimsForAuthorizationDetailsParameter); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); @@ -1070,7 +1070,7 @@ public abstract class OID4VCAuthorizationCodeFlowTestBase extends OID4VCIssuerEn authDetail.setType(OPENID_CREDENTIAL); authDetail.setCredentialConfigurationId(credentialConfigurationId != null ? credentialConfigurationId - : getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + : getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); return authDetail; } diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java index 90f94a68486..3bf82b05391 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationCodeFlowWithPARTest.java @@ -106,7 +106,7 @@ public class OID4VCAuthorizationCodeFlowWithPARTest extends OID4VCIssuerEndpoint Oid4vcTestContext ctx = prepareOid4vcTestContext(); // Step 1: Create PAR request with authorization_details - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Create authorization details with claims ClaimsDescription claim = new ClaimsDescription(); @@ -290,7 +290,7 @@ public class OID4VCAuthorizationCodeFlowWithPARTest extends OID4VCIssuerEndpoint assertFalse("authorization_details should not be empty", authDetailsResponse.isEmpty()); OID4VCAuthorizationDetail firstAuthorizationDetail = authDetailsResponse.get(0); assertEquals("credential_configuration_id should match requested scope", - getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID), + getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID), firstAuthorizationDetail.getCredentialConfigurationId()); assertNotNull("credential_identifiers should be present", firstAuthorizationDetail.getCredentialIdentifiers()); assertFalse("credential_identifiers should not be empty", firstAuthorizationDetail.getCredentialIdentifiers().isEmpty()); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java index 7c748f1f973..8128f91bf3b 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCAuthorizationDetailsFlowTestBase.java @@ -117,7 +117,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue protected Oid4vcTestContext prepareOid4vcTestContext(String token) throws Exception { Oid4vcTestContext ctx = new Oid4vcTestContext(); - String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Clear events before credential offer URI request events.clear(); @@ -182,7 +182,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue // Get credential_configuration_id ClientScopeRepresentation credClientScope = getCredentialClientScope(); - String credConfigId = credClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = credClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); // Build authorization_details OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); @@ -297,7 +297,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); List authDetails = List.of(authDetail); @@ -322,7 +322,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue assertEquals(1, authDetailsResponse.size()); OID4VCAuthorizationDetail authDetailResponse = authDetailsResponse.get(0); assertEquals(OPENID_CREDENTIAL, authDetailResponse.getType()); - assertEquals(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID), authDetailResponse.getCredentialConfigurationId()); + assertEquals(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID), authDetailResponse.getCredentialConfigurationId()); assertNotNull(authDetailResponse.getCredentialIdentifiers()); assertEquals(1, authDetailResponse.getCredentialIdentifiers().size()); String firstIdentifier = authDetailResponse.getCredentialIdentifiers().get(0); @@ -357,7 +357,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setClaims(Arrays.asList(claim)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); @@ -375,7 +375,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue assertEquals(1, authDetailsResponse.size()); OID4VCAuthorizationDetail authDetailResponse = authDetailsResponse.get(0); assertEquals(OPENID_CREDENTIAL, authDetailResponse.getType()); - assertEquals(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID), authDetailResponse.getCredentialConfigurationId()); + assertEquals(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID), authDetailResponse.getCredentialConfigurationId()); assertNotNull(authDetailResponse.getClaims()); assertEquals(1, authDetailResponse.getClaims().size()); ClaimsDescription responseClaim = authDetailResponse.getClaims().get(0); @@ -407,7 +407,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setClaims(Arrays.asList(claim)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); @@ -438,7 +438,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setClaims(Arrays.asList(claim)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); @@ -469,7 +469,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setClaims(Arrays.asList(claim)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); @@ -533,7 +533,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); - authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID)); + authDetail.setCredentialConfigurationId(getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID)); authDetail.setClaims(Arrays.asList(claim)); authDetail.setLocations(Collections.singletonList(ctx.credentialIssuer.getCredentialIssuer())); @@ -846,7 +846,7 @@ public abstract class OID4VCAuthorizationDetailsFlowTestBase extends OID4VCIssue @Test public void testCompleteFlowWithClaimsValidation() throws Exception { String token = getBearerToken(oauth, client, getCredentialClientScope().getName()); - String credConfigId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = getCredentialClientScope().getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); Oid4vcTestContext ctx = prepareOid4vcTestContext(token); // Step 1: Request token with authorization details containing specific claims diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java index 46018f82e9a..6748b156ad6 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointEncryptionTest.java @@ -81,7 +81,7 @@ public class OID4VCIssuerEndpointEncryptionTest extends OID4VCIssuerEndpointTest @Test public void testRequestCredentialWithEncryption() { final String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -190,7 +190,7 @@ public class OID4VCIssuerEndpointEncryptionTest extends OID4VCIssuerEndpointTest @Test public void testEncryptedCredentialRequest() { final String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -270,7 +270,7 @@ public class OID4VCIssuerEndpointEncryptionTest extends OID4VCIssuerEndpointTest @Test public void testEncryptedCredentialRequestWithCompression() { final String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -389,7 +389,7 @@ public class OID4VCIssuerEndpointEncryptionTest extends OID4VCIssuerEndpointTest public void testCredentialIssuanceWithEncryption() throws Exception { // Integration test for the full credential issuance flow with encryption String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); testCredentialIssuanceWithAuthZCodeFlow(jwtTypeCredentialClientScope, @@ -536,7 +536,7 @@ public class OID4VCIssuerEndpointEncryptionTest extends OID4VCIssuerEndpointTest @Test public void testRequestCredentialWithInvalidJWK() throws Throwable { final String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java index 2343e60fad7..cb6d8d0f54c 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerEndpointTest.java @@ -341,16 +341,16 @@ public abstract class OID4VCIssuerEndpointTest extends OID4VCTest { clientScope.setProtocol(OID4VCIConstants.OID4VC_PROTOCOL); Map attributes = new HashMap<>(Map.of(ClientScopeModel.INCLUDE_IN_TOKEN_SCOPE, "true", - CredentialScopeModel.EXPIRY_IN_SECONDS, "15")); + CredentialScopeModel.VC_EXPIRY_IN_SECONDS, "15")); BiConsumer addAttribute = (attributeName, value) -> { if (value != null) { attributes.put(attributeName, value); } }; - addAttribute.accept(CredentialScopeModel.ISSUER_DID, issuerDid); - addAttribute.accept(CredentialScopeModel.CONFIGURATION_ID, credentialConfigurationId); - addAttribute.accept(CredentialScopeModel.CREDENTIAL_IDENTIFIER, credentialIdentifier); - addAttribute.accept(CredentialScopeModel.FORMAT, format); + addAttribute.accept(CredentialScopeModel.VC_ISSUER_DID, issuerDid); + addAttribute.accept(CredentialScopeModel.VC_CONFIGURATION_ID, credentialConfigurationId); + addAttribute.accept(CredentialScopeModel.VC_IDENTIFIER, credentialIdentifier); + addAttribute.accept(CredentialScopeModel.VC_FORMAT, format); addAttribute.accept(CredentialScopeModel.VCT, Optional.ofNullable(vct).orElse(credentialIdentifier)); if (credentialConfigurationId != null) { String vcDisplay; @@ -365,11 +365,11 @@ public abstract class OID4VCIssuerEndpointTest extends OID4VCTest { addAttribute.accept(CredentialScopeModel.VC_DISPLAY, vcDisplay); } if (acceptedKeyAttestationValues != null) { - attributes.put(CredentialScopeModel.KEY_ATTESTATION_REQUIRED, "true"); + attributes.put(CredentialScopeModel.VC_KEY_ATTESTATION_REQUIRED, "true"); if (!acceptedKeyAttestationValues.isEmpty()) { - attributes.put(CredentialScopeModel.KEY_ATTESTATION_REQUIRED_KEY_STORAGE, + attributes.put(CredentialScopeModel.VC_KEY_ATTESTATION_REQUIRED_KEY_STORAGE, String.join(",", acceptedKeyAttestationValues)); - attributes.put(CredentialScopeModel.KEY_ATTESTATION_REQUIRED_USER_AUTH, + attributes.put(CredentialScopeModel.VC_KEY_ATTESTATION_REQUIRED_USER_AUTH, String.join(",", acceptedKeyAttestationValues)); } } @@ -558,8 +558,8 @@ public abstract class OID4VCIssuerEndpointTest extends OID4VCTest { BiFunction f, Consumer> c) { String testScope = clientScope.getName(); - String testFormat = clientScope.getAttributes().get(CredentialScopeModel.FORMAT); - String testCredentialConfigurationId = clientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String testFormat = clientScope.getAttributes().get(CredentialScopeModel.VC_FORMAT); + String testCredentialConfigurationId = clientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); try (Client client = AdminClientUtil.createResteasyClient()) { String metadataUrl = getRealmMetadataPath(TEST_REALM_NAME); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java index b4f05ec7472..ade8d6cdce2 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCIssuerWellKnownProviderTest.java @@ -527,7 +527,7 @@ public class OID4VCIssuerWellKnownProviderTest extends OID4VCIssuerEndpointTest private void compareMetadataToClientScope(CredentialIssuer credentialIssuer, ClientScopeRepresentation clientScope) { String credentialConfigurationId = Optional.ofNullable(clientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID)) + .get(CredentialScopeModel.VC_CONFIGURATION_ID)) .orElse(clientScope.getName()); SupportedCredentialConfiguration supportedConfig = credentialIssuer.getCredentialsSupported() .get(credentialConfigurationId); @@ -535,7 +535,7 @@ public class OID4VCIssuerWellKnownProviderTest extends OID4VCIssuerEndpointTest supportedConfig); assertEquals(credentialConfigurationId, supportedConfig.getId()); - String expectedFormat = Optional.ofNullable(clientScope.getAttributes().get(CredentialScopeModel.FORMAT)) + String expectedFormat = Optional.ofNullable(clientScope.getAttributes().get(CredentialScopeModel.VC_FORMAT)) .orElse(SD_JWT_VC); assertEquals(expectedFormat, supportedConfig.getFormat()); @@ -559,7 +559,7 @@ public class OID4VCIssuerWellKnownProviderTest extends OID4VCIssuerEndpointTest assertNotNull(supportedConfig.getCredentialDefinition()); assertNotNull(supportedConfig.getCredentialDefinition().getType()); List credentialDefinitionTypes = Optional.ofNullable(clientScope.getAttributes() - .get(CredentialScopeModel.TYPES)) + .get(CredentialScopeModel.VC_SUPPORTED_TYPES)) .map(s -> s.split(",")) .map(Arrays::asList) .orElseGet(() -> List.of(clientScope.getName())); @@ -569,7 +569,7 @@ public class OID4VCIssuerWellKnownProviderTest extends OID4VCIssuerEndpointTest MatcherAssert.assertThat(supportedConfig.getCredentialDefinition().getContext(), Matchers.containsInAnyOrder(credentialDefinitionTypes.toArray())); List credentialDefinitionContexts = Optional.ofNullable(clientScope.getAttributes() - .get(CredentialScopeModel.CONTEXTS)) + .get(CredentialScopeModel.VC_CONTEXTS)) .map(s -> s.split(",")) .map(Arrays::asList) .orElseGet(() -> List.of(clientScope.getName())); @@ -589,16 +589,16 @@ public class OID4VCIssuerWellKnownProviderTest extends OID4VCIssuerEndpointTest List expectedProofSigningAlgs = getAllAsymmetricAlgorithms(); KeyAttestationsRequired expectedKeyAttestationsRequired; - if (Boolean.parseBoolean(clientScope.getAttributes().get(CredentialScopeModel.KEY_ATTESTATION_REQUIRED))) { + if (Boolean.parseBoolean(clientScope.getAttributes().get(CredentialScopeModel.VC_KEY_ATTESTATION_REQUIRED))) { expectedKeyAttestationsRequired = new KeyAttestationsRequired(); expectedKeyAttestationsRequired.setKeyStorage( Optional.ofNullable(clientScope.getAttributes() - .get(CredentialScopeModel.KEY_ATTESTATION_REQUIRED_KEY_STORAGE)) + .get(CredentialScopeModel.VC_KEY_ATTESTATION_REQUIRED_KEY_STORAGE)) .map(s -> Arrays.asList(s.split(","))) .orElse(null)); expectedKeyAttestationsRequired.setUserAuthentication( Optional.ofNullable(clientScope.getAttributes() - .get(CredentialScopeModel.KEY_ATTESTATION_REQUIRED_USER_AUTH)) + .get(CredentialScopeModel.VC_KEY_ATTESTATION_REQUIRED_USER_AUTH)) .map(s -> Arrays.asList(s.split(","))) .orElse(null)); } else { diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java index 34d88f631bc..96c9fabd3d9 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCJWTIssuerEndpointTest.java @@ -141,7 +141,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { public void testGetCredentialOfferURI() { final String scopeName = jwtTypeCredentialClientScope.getName(); final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); String token = getBearerToken(oauth, client, scopeName); testingClient.server(TEST_REALM_NAME).run((session) -> { @@ -301,7 +301,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { @Test public void testRequestCredentialNoMatchingCredentialBuilder() throws Throwable { final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); final String scopeName = jwtTypeCredentialClientScope.getName(); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); @@ -361,7 +361,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { @Test public void testRequestCredential() { String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -447,7 +447,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { // 1. Retrieving the credential-offer-uri final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialOfferURI credOfferUri = oauth.oid4vc() .credentialOfferUriRequest(credentialConfigurationId) .preAuthorized(true) @@ -522,7 +522,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { @Test public void testCredentialIssuanceWithAuthZCodeWithScopeMatched() throws Exception { String scopeName = jwtTypeCredentialClientScope.getName(); - String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); String authCode = getAuthorizationCode(oauth, client, "john", scopeName); @@ -625,7 +625,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { @Test public void testRequestMultipleCredentialsWithProofs() { final String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); @@ -712,7 +712,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { public void testGetJwtVcConfigFromMetadata() { final String scopeName = jwtTypeCredentialClientScope.getName(); final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); final String verifiableCredentialType = jwtTypeCredentialClientScope.getAttributes() .get(CredentialScopeModel.VCT); String expectedIssuer = suiteContext.getAuthServerInfo().getContextRoot().toString() + "/auth/realms/" + TEST_REALM_NAME; @@ -934,7 +934,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { @Test public void testRequestCredentialWhenNoCredentialBuilderForFormat() { String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -980,7 +980,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { public void testProofToProofsConversion() throws Exception { final String scopeName = jwtTypeCredentialClientScope.getName(); final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); @@ -1066,7 +1066,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { // Extract serializable data before lambda final String scopeName = optionalScope.getName(); - final String configId = optionalScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + final String configId = optionalScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); @@ -1198,7 +1198,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { public void testCredentialOfferReplayProtection() { String token = getBearerToken(oauth, client, jwtTypeCredentialClientScope.getName()); final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); // 1. Retrieving the create-credential-offer CredentialOfferURI credentialOfferURI = oauth.oid4vc() @@ -1246,7 +1246,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { public void testCredentialOfferDifferentNoncesIndependent() { String token = getBearerToken(oauth, client, jwtTypeCredentialClientScope.getName()); final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); // 1. Create first credential offer CredentialOfferURI credentialOfferURI1 = oauth.oid4vc() @@ -1323,7 +1323,7 @@ public class OID4VCJWTIssuerEndpointTest extends OID4VCIssuerEndpointTest { public void testPreAuthorizedCodeValidAfterOfferConsumed() { String token = getBearerToken(oauth, client, jwtTypeCredentialClientScope.getName()); final String credentialConfigurationId = jwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); // 1. Fetch the Offer URI CredentialOfferURI credentialOfferURI = oauth.oid4vc() diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java index a72f2ca08a7..f40d899470e 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtIssuingEndpointTest.java @@ -92,7 +92,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { @Test public void testRequestTestCredential() { String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -120,7 +120,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { public void testRequestTestCredentialWithKeybinding() { String cNonce = getCNonce(); String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -153,7 +153,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { public void testRequestTestCredentialWithInvalidKeybinding() throws Throwable { String cNonce = getCNonce(); String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -190,7 +190,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { public void testProofOfPossessionWithMissingAudience() throws Throwable { try { String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -235,7 +235,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { public void testProofOfPossessionWithIllegalSourceEndpoint() throws Throwable { try { String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -279,7 +279,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { public void testProofOfPossessionWithExpiredState() throws Throwable { try { String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); @@ -373,7 +373,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { String token = getBearerToken(oauth, client, clientScope.getName()); // 1. Retrieving the credential-offer-uri - final String credentialConfigurationId = clientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + final String credentialConfigurationId = clientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialOfferURI credOfferUri = oauth.oid4vc() .credentialOfferUriRequest(credentialConfigurationId) .preAuthorized(true) @@ -454,7 +454,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { public void testGetSdJwtConfigFromMetadata() { final String scopeName = sdJwtTypeCredentialClientScope.getName(); final String credentialConfigurationId = sdJwtTypeCredentialClientScope.getAttributes() - .get(CredentialScopeModel.CONFIGURATION_ID); + .get(CredentialScopeModel.VC_CONFIGURATION_ID); final String verifiableCredentialType = sdJwtTypeCredentialClientScope.getAttributes() .get(CredentialScopeModel.VCT); String expectedIssuer = suiteContext.getAuthServerInfo().getContextRoot().toString() + "/auth/realms/" + TEST_REALM_NAME; @@ -625,7 +625,7 @@ public class OID4VCSdJwtIssuingEndpointTest extends OID4VCIssuerEndpointTest { RealmModel realmModel = session.getContext().getRealm(); ClientScopeModel credentialScope = session.clientScopes() .addClientScope(realmModel, jwtTypeCredentialScopeName); - credentialScope.setAttribute(CredentialScopeModel.CREDENTIAL_IDENTIFIER, + credentialScope.setAttribute(CredentialScopeModel.VC_IDENTIFIER, jwtTypeCredentialScopeName); credentialScope.setProtocol(OID4VCIConstants.OID4VC_PROTOCOL); return credentialScope; diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java index 3342a4cf918..13f44494d6d 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCSdJwtPreInstalledNaturalPersonTest.java @@ -27,7 +27,7 @@ import org.keycloak.representations.idm.ClientScopeRepresentation; import org.junit.Test; import org.slf4j.LoggerFactory; -import static org.keycloak.models.oid4vci.CredentialScopeModel.CONFIGURATION_ID; +import static org.keycloak.models.oid4vci.CredentialScopeModel.VC_CONFIGURATION_ID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -46,7 +46,7 @@ public class OID4VCSdJwtPreInstalledNaturalPersonTest extends OID4VCIssuerEndpoi public void testGetSdJwtConfigFromMetadata() { String scopeName = sdJwtTypeNaturalPersonScopeName; ClientScopeRepresentation clientScope = requireExistingClientScope(scopeName); - String credentialConfigurationId = clientScope.getAttributes().get(CONFIGURATION_ID); + String credentialConfigurationId = clientScope.getAttributes().get(VC_CONFIGURATION_ID); String expectedIssuer = suiteContext.getAuthServerInfo().getContextRoot() + "/auth/realms/" + TEST_REALM_NAME; testingClient .server(TEST_REALM_NAME) diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationSdJwtTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationSdJwtTest.java index aa00ff27386..98a1007be36 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationSdJwtTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationSdJwtTest.java @@ -65,7 +65,7 @@ public class OID4VCTimeNormalizationSdJwtTest extends OID4VCIssuerEndpointTest { }); String scopeName = sdJwtTypeCredentialClientScope.getName(); - String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = sdJwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL); diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationTest.java index a14559c4ac7..54d48105f37 100644 --- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationTest.java +++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/oid4vc/issuance/signing/OID4VCTimeNormalizationTest.java @@ -61,7 +61,7 @@ public class OID4VCTimeNormalizationTest extends OID4VCIssuerEndpointTest { }); final String scopeName = jwtTypeCredentialClientScope.getName(); - String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.CONFIGURATION_ID); + String credConfigId = jwtTypeCredentialClientScope.getAttributes().get(CredentialScopeModel.VC_CONFIGURATION_ID); CredentialIssuer credentialIssuer = getCredentialIssuerMetadata(); OID4VCAuthorizationDetail authDetail = new OID4VCAuthorizationDetail(); authDetail.setType(OPENID_CREDENTIAL);