diff --git a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java index d647508a4e6..29dab9b6a4e 100644 --- a/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java +++ b/extensions/common/crypto/jwt-verifiable-credentials/src/main/java/org/eclipse/edc/verifiablecredentials/jwt/JwtPresentationVerifier.java @@ -63,8 +63,8 @@ */ public class JwtPresentationVerifier implements CredentialVerifier { - public static final String JWT_VC_TOKEN_CONTEXT = "iatp-vc"; - public static final String JWT_VP_TOKEN_CONTEXT = "iatp-vp"; + public static final String JWT_VC_TOKEN_CONTEXT = "dcp-vc"; + public static final String JWT_VP_TOKEN_CONTEXT = "dcp-vp"; public static final String VERIFIABLE_CREDENTIAL_JSON_KEY = "verifiableCredential"; public static final String VP_CLAIM = "vp"; public static final String VC_CLAIM = "vc"; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/DcpDefaultServicesExtension.java similarity index 88% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/DcpDefaultServicesExtension.java index 0e9996337d5..8945f044b59 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/DcpDefaultServicesExtension.java @@ -14,12 +14,12 @@ package org.eclipse.edc.iam.identitytrust.core; -import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultIatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultDcpParticipantAgentServiceExtension; import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultTrustedIssuerRegistry; import org.eclipse.edc.iam.identitytrust.core.defaults.InMemorySignatureSuiteRegistry; -import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.core.scope.DcpScopeExtractorRegistry; import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction; -import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.spi.DcpParticipantAgentServiceExtension; import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; @@ -48,7 +48,7 @@ import static org.eclipse.edc.spi.result.Result.success; @Extension("Identity And Trust Extension to register default services") -public class IatpDefaultServicesExtension implements ServiceExtension { +public class DcpDefaultServicesExtension implements ServiceExtension { @Setting(value = "Alias of private key used for signing tokens, retrieved from private key resolver", defaultValue = "A random EC private key") public static final String STS_PRIVATE_KEY_ALIAS = "edc.iam.sts.privatekey.alias"; @@ -57,7 +57,7 @@ public class IatpDefaultServicesExtension implements ServiceExtension { public static final String CLAIMTOKEN_VC_KEY = "vc"; // not a setting, it's defined in Oauth2ServiceExtension private static final String OAUTH_TOKENURL_PROPERTY = "edc.oauth.token.url"; - @Setting(value = "Self-issued ID Token expiration in minutes. By default is 5 minutes", defaultValue = "" + IatpDefaultServicesExtension.DEFAULT_STS_TOKEN_EXPIRATION_MIN) + @Setting(value = "Self-issued ID Token expiration in minutes. By default is 5 minutes", defaultValue = "" + DcpDefaultServicesExtension.DEFAULT_STS_TOKEN_EXPIRATION_MIN) private static final String STS_TOKEN_EXPIRATION = "edc.iam.sts.token.expiration"; // in minutes private static final int DEFAULT_STS_TOKEN_EXPIRATION_MIN = 5; @Inject @@ -95,16 +95,16 @@ public SignatureSuiteRegistry createSignatureSuiteRegistry() { } @Provider(isDefault = true) - public IatpParticipantAgentServiceExtension createDefaultIatpParticipantAgentServiceExtension() { - return new DefaultIatpParticipantAgentServiceExtension(); + public DcpParticipantAgentServiceExtension createDefaultDcpParticipantAgentServiceExtension() { + return new DefaultDcpParticipantAgentServiceExtension(); } @Provider(isDefault = true) public ScopeExtractorRegistry scopeExtractorRegistry() { - return new IatpScopeExtractorRegistry(); + return new DcpScopeExtractorRegistry(); } - // Default audience for IATP is the counter-party id + // Default audience for DCP is the counter-party id @Provider(isDefault = true) public AudienceResolver defaultAudienceResolver() { return RemoteMessage::getCounterPartyId; diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/DcpScopeExtractorExtension.java similarity index 81% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/DcpScopeExtractorExtension.java index bb1a174abed..615490f4d3d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/DcpScopeExtractorExtension.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core; -import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorFunction; +import org.eclipse.edc.iam.identitytrust.core.scope.DcpScopeExtractorFunction; import org.eclipse.edc.iam.identitytrust.spi.scope.ScopeExtractorRegistry; import org.eclipse.edc.policy.engine.spi.PolicyEngine; import org.eclipse.edc.runtime.metamodel.annotation.Extension; @@ -23,12 +23,12 @@ import org.eclipse.edc.spi.system.ServiceExtension; import org.eclipse.edc.spi.system.ServiceExtensionContext; -import static org.eclipse.edc.iam.identitytrust.core.IatpScopeExtractorExtension.NAME; +import static org.eclipse.edc.iam.identitytrust.core.DcpScopeExtractorExtension.NAME; @Extension(NAME) -public class IatpScopeExtractorExtension implements ServiceExtension { +public class DcpScopeExtractorExtension implements ServiceExtension { - public static final String NAME = "IATP scope extractor extension"; + public static final String NAME = "DCP scope extractor extension"; public static final String CATALOG_REQUEST_SCOPE = "request.catalog"; public static final String NEGOTIATION_REQUEST_SCOPE = "request.contract.negotiation"; @@ -50,7 +50,7 @@ public String name() { @Override public void initialize(ServiceExtensionContext context) { - var contextMappingFunction = new IatpScopeExtractorFunction(scopeExtractorRegistry, monitor); + var contextMappingFunction = new DcpScopeExtractorFunction(scopeExtractorRegistry, monitor); policyEngine.registerPreValidator(CATALOG_REQUEST_SCOPE, contextMappingFunction); policyEngine.registerPreValidator(NEGOTIATION_REQUEST_SCOPE, contextMappingFunction); policyEngine.registerPreValidator(TRANSFER_PROCESS_REQUEST_SCOPE, contextMappingFunction); diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java index 8a17b7eff34..f413fb77be9 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityAndTrustExtension.java @@ -24,7 +24,7 @@ import org.eclipse.edc.iam.identitytrust.service.verification.MultiFormatPresentationVerifier; import org.eclipse.edc.iam.identitytrust.spi.ClaimTokenCreatorFunction; import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient; -import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.spi.DcpParticipantAgentServiceExtension; import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService; import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction; import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry; @@ -75,7 +75,7 @@ public class IdentityAndTrustExtension implements ServiceExtension { public static final String REVOCATION_CACHE_VALIDITY = "edc.iam.credential.revocation.cache.validity"; @Setting(value = "DID of this connector", required = true) public static final String CONNECTOR_DID_PROPERTY = "edc.iam.issuer.id"; - public static final String IATP_SELF_ISSUED_TOKEN_CONTEXT = "iatp-si"; + public static final String DCP_SELF_ISSUED_TOKEN_CONTEXT = "dcp-si"; public static final String JSON_2020_SIGNATURE_SUITE = "JsonWebSignature2020"; @@ -121,7 +121,7 @@ public class IdentityAndTrustExtension implements ServiceExtension { private ParticipantAgentService participantAgentService; @Inject - private IatpParticipantAgentServiceExtension participantAgentServiceExtension; + private DcpParticipantAgentServiceExtension participantAgentServiceExtension; private PresentationVerifier presentationVerifier; private CredentialServiceClient credentialServiceClient; @@ -131,13 +131,13 @@ public class IdentityAndTrustExtension implements ServiceExtension { public void initialize(ServiceExtensionContext context) { // add all rules for self-issued ID tokens - rulesRegistry.addRule(IATP_SELF_ISSUED_TOKEN_CONTEXT, new IssuerEqualsSubjectRule()); - rulesRegistry.addRule(IATP_SELF_ISSUED_TOKEN_CONTEXT, new SubJwkIsNullRule()); - rulesRegistry.addRule(IATP_SELF_ISSUED_TOKEN_CONTEXT, new AudienceValidationRule(getOwnDid(context))); + rulesRegistry.addRule(DCP_SELF_ISSUED_TOKEN_CONTEXT, new IssuerEqualsSubjectRule()); + rulesRegistry.addRule(DCP_SELF_ISSUED_TOKEN_CONTEXT, new SubJwkIsNullRule()); + rulesRegistry.addRule(DCP_SELF_ISSUED_TOKEN_CONTEXT, new AudienceValidationRule(getOwnDid(context))); context.getMonitor().warning("The JTI Validation rule is not yet implemented as it depends on https://github.com/eclipse-edc/Connector/issues/3749."); - rulesRegistry.addRule(IATP_SELF_ISSUED_TOKEN_CONTEXT, new JtiValidationRule()); - rulesRegistry.addRule(IATP_SELF_ISSUED_TOKEN_CONTEXT, new ExpirationIssuedAtValidationRule(clock, 5)); - rulesRegistry.addRule(IATP_SELF_ISSUED_TOKEN_CONTEXT, new TokenNotNullRule()); + rulesRegistry.addRule(DCP_SELF_ISSUED_TOKEN_CONTEXT, new JtiValidationRule()); + rulesRegistry.addRule(DCP_SELF_ISSUED_TOKEN_CONTEXT, new ExpirationIssuedAtValidationRule(clock, 5)); + rulesRegistry.addRule(DCP_SELF_ISSUED_TOKEN_CONTEXT, new TokenNotNullRule()); // add all rules for validating VerifiableCredential JWTs rulesRegistry.addRule(JWT_VC_TOKEN_CONTEXT, new HasSubjectRule()); @@ -206,7 +206,7 @@ public RevocationListService createRevocationListService(ServiceExtensionContext @NotNull private TokenValidationAction tokenValidationAction() { return (tokenRepresentation) -> { - var rules = rulesRegistry.getRules(IATP_SELF_ISSUED_TOKEN_CONTEXT); + var rules = rulesRegistry.getRules(DCP_SELF_ISSUED_TOKEN_CONTEXT); return tokenValidationService.validate(tokenRepresentation, didPublicKeyResolver, rules); }; } diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityTrustTransformExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityTrustTransformExtension.java index 278c05642dc..bbaa77cd4b3 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityTrustTransformExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/IdentityTrustTransformExtension.java @@ -40,7 +40,7 @@ import java.net.URISyntaxException; import static java.lang.String.format; -import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.DcpConstants.DCP_CONTEXT_URL; import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD; @Extension(value = IdentityTrustTransformExtension.NAME, categories = { "iam", "transform", "jsonld" }) @@ -65,8 +65,8 @@ public void initialize(ServiceExtensionContext context) { .onSuccess(uri -> jsonLdService.registerCachedDocument("https://www.w3.org/2018/credentials/v1", uri)) .onFailure(failure -> context.getMonitor().warning("Failed to register cached json-ld document: " + failure.getFailureDetail())); - getResourceUri("document" + File.separator + "iatp.v08.jsonld") - .onSuccess(uri -> jsonLdService.registerCachedDocument(IATP_CONTEXT_URL, uri)) + getResourceUri("document" + File.separator + "dcp.v08.jsonld") + .onSuccess(uri -> jsonLdService.registerCachedDocument(DCP_CONTEXT_URL, uri)) .onFailure(failure -> context.getMonitor().warning("Failed to register cached json-ld document: " + failure.getFailureDetail())); typeTransformerRegistry.register(new JsonObjectToPresentationQueryTransformer(typeManager.getMapper(JSON_LD))); diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java index 6c7bb78ae82..24f489c0102 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java @@ -23,7 +23,7 @@ import okhttp3.RequestBody; import org.eclipse.edc.http.spi.EdcHttpClient; import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient; -import org.eclipse.edc.iam.identitytrust.spi.IatpConstants; +import org.eclipse.edc.iam.identitytrust.spi.DcpConstants; import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage; import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage; import org.eclipse.edc.iam.verifiablecredentials.spi.VcConstants; @@ -148,7 +148,7 @@ private JsonObject createPresentationQuery(List scopes) { return jsonFactory.createObjectBuilder() .add(JsonLdKeywords.CONTEXT, jsonFactory.createArrayBuilder() .add(VcConstants.PRESENTATION_EXCHANGE_URL) - .add(IatpConstants.IATP_CONTEXT_URL)) + .add(DcpConstants.DCP_CONTEXT_URL)) .add(JsonLdKeywords.TYPE, PresentationQueryMessage.PRESENTATION_QUERY_MESSAGE_TYPE) .add("scope", scopeArray.build()) .build(); diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultDcpParticipantAgentServiceExtension.java similarity index 85% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultDcpParticipantAgentServiceExtension.java index 7c62091b8a7..bb8173f9a9f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultDcpParticipantAgentServiceExtension.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core.defaults; -import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension; +import org.eclipse.edc.iam.identitytrust.spi.DcpParticipantAgentServiceExtension; import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject; import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential; import org.eclipse.edc.spi.iam.ClaimToken; @@ -26,14 +26,14 @@ import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; import static java.util.Optional.ofNullable; -import static org.eclipse.edc.iam.identitytrust.core.IatpDefaultServicesExtension.CLAIMTOKEN_VC_KEY; +import static org.eclipse.edc.iam.identitytrust.core.DcpDefaultServicesExtension.CLAIMTOKEN_VC_KEY; import static org.eclipse.edc.spi.agent.ParticipantAgent.PARTICIPANT_IDENTITY; /** * Retrieve subject id from the list of {@link VerifiableCredential} and set the * PARTICIPANT_IDENTITY attribute accordingly. */ -public class DefaultIatpParticipantAgentServiceExtension implements IatpParticipantAgentServiceExtension { +public class DefaultDcpParticipantAgentServiceExtension implements DcpParticipantAgentServiceExtension { @Override public @NotNull Map attributesFor(ClaimToken token) { return ofNullable(token.getListClaim(CLAIMTOKEN_VC_KEY)).orElse(emptyList()) diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorFunction.java similarity index 85% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorFunction.java index f87f59531bc..26b83f31dbf 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunction.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorFunction.java @@ -27,15 +27,15 @@ import static java.lang.String.format; /** - * IATP pre-validator function for extracting scopes from a {@link Policy} using the registered {@link ScopeExtractor} + * DCP pre-validator function for extracting scopes from a {@link Policy} using the registered {@link ScopeExtractor} * in the {@link ScopeExtractorRegistry}. */ -public class IatpScopeExtractorFunction implements BiFunction { +public class DcpScopeExtractorFunction implements BiFunction { private final ScopeExtractorRegistry registry; private final Monitor monitor; - public IatpScopeExtractorFunction(ScopeExtractorRegistry registry, Monitor monitor) { + public DcpScopeExtractorFunction(ScopeExtractorRegistry registry, Monitor monitor) { this.registry = registry; this.monitor = monitor; } diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorRegistry.java similarity index 89% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorRegistry.java index aa0ae65e4c3..c3bf0777ce6 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistry.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorRegistry.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; -public class IatpScopeExtractorRegistry implements ScopeExtractorRegistry { +public class DcpScopeExtractorRegistry implements ScopeExtractorRegistry { private final List extractors = new ArrayList<>(); @@ -35,7 +35,7 @@ public void registerScopeExtractor(ScopeExtractor extractor) { @Override public Result> extractScopes(Policy policy, PolicyContext policyContext) { - var visitor = new IatpScopeExtractorVisitor(extractors, policyContext); + var visitor = new DcpScopeExtractorVisitor(extractors, policyContext); var policies = policy.accept(visitor); if (policyContext.hasProblems()) { return Result.failure(policyContext.getProblems()); diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorVisitor.java similarity index 92% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorVisitor.java index 6020134d68a..657ccee3f79 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorVisitor.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorVisitor.java @@ -37,14 +37,14 @@ import java.util.stream.Collectors; /** - * IATP scope visitor for invoking {@link ScopeExtractor}s during the pre-validation phase. + * DCP scope visitor for invoking {@link ScopeExtractor}s during the pre-validation phase. */ -public class IatpScopeExtractorVisitor implements Policy.Visitor>, Rule.Visitor>, Constraint.Visitor>, Expression.Visitor { +public class DcpScopeExtractorVisitor implements Policy.Visitor>, Rule.Visitor>, Constraint.Visitor>, Expression.Visitor { private final List mappers; private final PolicyContext policyContext; - public IatpScopeExtractorVisitor(List mappers, PolicyContext policyContext) { + public DcpScopeExtractorVisitor(List mappers, PolicyContext policyContext) { this.mappers = mappers; this.policyContext = policyContext; } diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension b/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension index af31c131c1b..fc561b9060e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension @@ -12,7 +12,7 @@ # # -org.eclipse.edc.iam.identitytrust.core.IatpDefaultServicesExtension -org.eclipse.edc.iam.identitytrust.core.IatpScopeExtractorExtension +org.eclipse.edc.iam.identitytrust.core.DcpDefaultServicesExtension +org.eclipse.edc.iam.identitytrust.core.DcpScopeExtractorExtension org.eclipse.edc.iam.identitytrust.core.IdentityAndTrustExtension org.eclipse.edc.iam.identitytrust.core.IdentityTrustTransformExtension \ No newline at end of file diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/document/iatp.v08.jsonld b/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/document/dcp.v08.jsonld similarity index 61% rename from extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/document/iatp.v08.jsonld rename to extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/document/dcp.v08.jsonld index 68d33163ed4..fa5b6db9c0d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/document/iatp.v08.jsonld +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/document/dcp.v08.jsonld @@ -2,124 +2,124 @@ "@context": { "@version": 1.1, "@protected": true, - "iatp": "https://w3id.org/tractusx-trust/v0.8/", + "dcp": "https://w3id.org/tractusx-trust/v0.8/", "cred": "https://www.w3.org/2018/credentials/", "xsd": "http://www.w3.org/2001/XMLSchema/", "CredentialContainer": { - "@id": "iatp:CredentialContainer", + "@id": "dcp:CredentialContainer", "@context": { "payload": { - "@id": "iatp:payload", + "@id": "dcp:payload", "@type": "xsd:string" } } }, "CredentialMessage": { - "@id": "iatp:CredentialMessage", + "@id": "dcp:CredentialMessage", "@context": { - "credentials": "iatp:credentials" + "credentials": "dcp:credentials" } }, "CredentialObject": { - "@id": "iatp:CredentialObject", + "@id": "dcp:CredentialObject", "@context": { "credentialType": { - "@id": "iatp:credentialType", + "@id": "dcp:credentialType", "@container": "@set" }, - "format": "iatp:format", + "format": "dcp:format", "offerReason": { - "@id": "iatp:offerReason", + "@id": "dcp:offerReason", "@type": "xsd:string" }, "bindingMethods": { - "@id": "iatp:bindingMethods", + "@id": "dcp:bindingMethods", "@type": "xsd:string", "@container": "@set" }, "cryptographicSuites": { - "@id": "iatp:cryptographicSuites", + "@id": "dcp:cryptographicSuites", "@type": "xsd:string", "@container": "@set" }, - "issuancePolicy": "iatp:issuancePolicy" + "issuancePolicy": "dcp:issuancePolicy" } }, "CredentialOfferMessage": { - "@id": "iatp:CredentialOfferMessage", + "@id": "dcp:CredentialOfferMessage", "@context": { "credentialIssuer": "cred:issuer", - "credentials": "iatp:credentials" + "credentials": "dcp:credentials" } }, "CredentialRequestMessage": { - "@id": "iatp:CredentialRequestMessage", + "@id": "dcp:CredentialRequestMessage", "@context": { - "format": "iatp:format", + "format": "dcp:format", "type": "@type" } }, - "CredentialService": "iatp:CredentialService", + "CredentialService": "dcp:CredentialService", "CredentialStatus": { - "@id": "iatp:CredentialStatus", + "@id": "dcp:CredentialStatus", "@context": { "requestId": { - "@id": "iatp:requestId", + "@id": "dcp:requestId", "@type": "@id" }, "status": { - "@id": "iatp:status", + "@id": "dcp:status", "@type": "xsd:string" } } }, "IssuerMetadata": { - "@id": "iatp:IssuerMetadata", + "@id": "dcp:IssuerMetadata", "@context": { "credentialIssuer": "cred:issuer", "credentialsSupported": { - "@id": "iatp:credentialsSupported", + "@id": "dcp:credentialsSupported", "@container": "@set" } } }, "PresentationQueryMessage": { - "@id": "iatp:PresentationQueryMessage", + "@id": "dcp:PresentationQueryMessage", "@context": { "presentationDefinition": { - "@id": "iatp:presentationDefinition", + "@id": "dcp:presentationDefinition", "@type": "@json" }, "scope": { - "@id": "iatp:scope", + "@id": "dcp:scope", "@type": "xsd:string", "@container": "@set" } } }, "PresentationResponseMessage": { - "@id": "iatp:PresentationResponseMessage", + "@id": "dcp:PresentationResponseMessage", "@context": { "presentation": { - "@id": "iatp:presentation", + "@id": "dcp:presentation", "@type": "@json" }, "presentationSubmission": { - "@id": "iatp:presentationSubmission", + "@id": "dcp:presentationSubmission", "@type": "@json" } } }, "credentials": { - "@id": "iatp:credentials", + "@id": "dcp:credentials", "@container": "@set" }, "credentialSubject": { - "@id": "iatp:credentialSubject", + "@id": "dcp:credentialSubject", "@type": "cred:credentialSubject" }, "format": { - "@id": "iatp:format", + "@id": "dcp:format", "@type": "xsd:string" }, "type": "@type" diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/DcpDefaultServicesExtensionTest.java similarity index 85% rename from extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/DcpDefaultServicesExtensionTest.java index 4bb56b98dcc..cff872e16cc 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/DcpDefaultServicesExtensionTest.java @@ -19,7 +19,7 @@ import com.nimbusds.jose.jwk.gen.RSAKeyGenerator; import org.eclipse.edc.boot.system.injection.ObjectFactory; import org.eclipse.edc.iam.identitytrust.core.defaults.DefaultTrustedIssuerRegistry; -import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorRegistry; +import org.eclipse.edc.iam.identitytrust.core.scope.DcpScopeExtractorRegistry; import org.eclipse.edc.iam.identitytrust.sts.embedded.EmbeddedSecureTokenService; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.keys.spi.PrivateKeyResolver; @@ -35,8 +35,8 @@ import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.core.IatpDefaultServicesExtension.STS_PRIVATE_KEY_ALIAS; -import static org.eclipse.edc.iam.identitytrust.core.IatpDefaultServicesExtension.STS_PUBLIC_KEY_ID; +import static org.eclipse.edc.iam.identitytrust.core.DcpDefaultServicesExtension.STS_PRIVATE_KEY_ALIAS; +import static org.eclipse.edc.iam.identitytrust.core.DcpDefaultServicesExtension.STS_PUBLIC_KEY_ID; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; @@ -45,7 +45,7 @@ import static org.mockito.Mockito.when; @ExtendWith(DependencyInjectionExtension.class) -class IatpDefaultServicesExtensionTest { +class DcpDefaultServicesExtensionTest { private final PrivateKeyResolver privateKeyResolver = mock(); @@ -64,7 +64,7 @@ void setup(ServiceExtensionContext context) throws JOSEException { } @Test - void verify_defaultService(ServiceExtensionContext context, IatpDefaultServicesExtension ext) { + void verify_defaultService(ServiceExtensionContext context, DcpDefaultServicesExtension ext) { var publicKeyId = "did:web:" + UUID.randomUUID() + "#key-id"; var privateKeyAlias = "private"; Monitor mockedMonitor = mock(); @@ -79,7 +79,7 @@ void verify_defaultService(ServiceExtensionContext context, IatpDefaultServicesE } @Test - void verify_defaultServiceWithWarning(ServiceExtensionContext context, IatpDefaultServicesExtension ext) { + void verify_defaultServiceWithWarning(ServiceExtensionContext context, DcpDefaultServicesExtension ext) { Monitor mockedMonitor = mock(); context.registerService(Monitor.class, mockedMonitor); when(context.getSetting(eq("edc.oauth.token.url"), any())).thenReturn("https://some.url"); @@ -94,20 +94,20 @@ void verify_defaultServiceWithWarning(ServiceExtensionContext context, IatpDefau void verify_defaultIssuerRegistry(ServiceExtensionContext context, ObjectFactory factory) { Monitor mockedMonitor = mock(); context.registerService(Monitor.class, mockedMonitor); - var ext = factory.constructInstance(IatpDefaultServicesExtension.class); + var ext = factory.constructInstance(DcpDefaultServicesExtension.class); assertThat(ext.createInMemoryIssuerRegistry()).isInstanceOf(DefaultTrustedIssuerRegistry.class); } @Test - void verify_defaultCredentialMapperRegistry(ServiceExtensionContext context, IatpDefaultServicesExtension ext) { + void verify_defaultCredentialMapperRegistry(ServiceExtensionContext context, DcpDefaultServicesExtension ext) { Monitor mockedMonitor = mock(); context.registerService(Monitor.class, mockedMonitor); - assertThat(ext.scopeExtractorRegistry()).isInstanceOf(IatpScopeExtractorRegistry.class); + assertThat(ext.scopeExtractorRegistry()).isInstanceOf(DcpScopeExtractorRegistry.class); } @Test - void verify_defaultAudienceResolver(IatpDefaultServicesExtension ext) { + void verify_defaultAudienceResolver(DcpDefaultServicesExtension ext) { var id = "counterPartyId"; var remoteMessage = mock(RemoteMessage.class); when(remoteMessage.getCounterPartyId()).thenReturn(id); diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/DcpScopeExtractorExtensionTest.java similarity index 67% rename from extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/DcpScopeExtractorExtensionTest.java index 0d7af855f75..8d10cad5d17 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/IatpScopeExtractorExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/DcpScopeExtractorExtensionTest.java @@ -14,7 +14,7 @@ package org.eclipse.edc.iam.identitytrust.core; -import org.eclipse.edc.iam.identitytrust.core.scope.IatpScopeExtractorFunction; +import org.eclipse.edc.iam.identitytrust.core.scope.DcpScopeExtractorFunction; import org.eclipse.edc.junit.extensions.DependencyInjectionExtension; import org.eclipse.edc.policy.engine.spi.PolicyEngine; import org.eclipse.edc.spi.system.ServiceExtensionContext; @@ -22,16 +22,16 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import static org.eclipse.edc.iam.identitytrust.core.IatpScopeExtractorExtension.CATALOG_REQUEST_SCOPE; -import static org.eclipse.edc.iam.identitytrust.core.IatpScopeExtractorExtension.NEGOTIATION_REQUEST_SCOPE; -import static org.eclipse.edc.iam.identitytrust.core.IatpScopeExtractorExtension.TRANSFER_PROCESS_REQUEST_SCOPE; +import static org.eclipse.edc.iam.identitytrust.core.DcpScopeExtractorExtension.CATALOG_REQUEST_SCOPE; +import static org.eclipse.edc.iam.identitytrust.core.DcpScopeExtractorExtension.NEGOTIATION_REQUEST_SCOPE; +import static org.eclipse.edc.iam.identitytrust.core.DcpScopeExtractorExtension.TRANSFER_PROCESS_REQUEST_SCOPE; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @ExtendWith(DependencyInjectionExtension.class) -class IatpScopeExtractorExtensionTest { +class DcpScopeExtractorExtensionTest { private final PolicyEngine policyEngine = mock(); @@ -42,13 +42,13 @@ void setup(ServiceExtensionContext context) { } @Test - void initialize(ServiceExtensionContext context, IatpScopeExtractorExtension ext) { + void initialize(ServiceExtensionContext context, DcpScopeExtractorExtension ext) { ext.initialize(context); - verify(policyEngine).registerPreValidator(eq(CATALOG_REQUEST_SCOPE), isA(IatpScopeExtractorFunction.class)); - verify(policyEngine).registerPreValidator(eq(NEGOTIATION_REQUEST_SCOPE), isA(IatpScopeExtractorFunction.class)); - verify(policyEngine).registerPreValidator(eq(TRANSFER_PROCESS_REQUEST_SCOPE), isA(IatpScopeExtractorFunction.class)); + verify(policyEngine).registerPreValidator(eq(CATALOG_REQUEST_SCOPE), isA(DcpScopeExtractorFunction.class)); + verify(policyEngine).registerPreValidator(eq(NEGOTIATION_REQUEST_SCOPE), isA(DcpScopeExtractorFunction.class)); + verify(policyEngine).registerPreValidator(eq(TRANSFER_PROCESS_REQUEST_SCOPE), isA(DcpScopeExtractorFunction.class)); } diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultDcpParticipantAgentServiceExtensionTest.java similarity index 85% rename from extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultDcpParticipantAgentServiceExtensionTest.java index ffb5c53a251..5cdc9c4808f 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultDcpParticipantAgentServiceExtensionTest.java @@ -22,12 +22,12 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.core.IatpDefaultServicesExtension.CLAIMTOKEN_VC_KEY; +import static org.eclipse.edc.iam.identitytrust.core.DcpDefaultServicesExtension.CLAIMTOKEN_VC_KEY; import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createCredential; -class DefaultIatpParticipantAgentServiceExtensionTest { +class DefaultDcpParticipantAgentServiceExtensionTest { - private final DefaultIatpParticipantAgentServiceExtension extension = new DefaultIatpParticipantAgentServiceExtension(); + private final DefaultDcpParticipantAgentServiceExtension extension = new DefaultDcpParticipantAgentServiceExtension(); @Test void attributesFor_success() { diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorFunctionTest.java similarity index 94% rename from extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorFunctionTest.java index eac644c6eb8..80314059f5c 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorFunctionTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorFunctionTest.java @@ -33,15 +33,15 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class IatpScopeExtractorFunctionTest { +public class DcpScopeExtractorFunctionTest { private final ScopeExtractorRegistry registry = mock(); private final PolicyContext policyContext = mock(); - private IatpScopeExtractorFunction function; + private DcpScopeExtractorFunction function; @BeforeEach void setup() { - function = new IatpScopeExtractorFunction(registry, mock(Monitor.class)); + function = new DcpScopeExtractorFunction(registry, mock(Monitor.class)); } @Test diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorRegistryTest.java similarity index 97% rename from extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java rename to extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorRegistryTest.java index 9b03781f670..9237a6594bf 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/IatpScopeExtractorRegistryTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-core/src/test/java/org/eclipse/edc/iam/identitytrust/core/scope/DcpScopeExtractorRegistryTest.java @@ -48,9 +48,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class IatpScopeExtractorRegistryTest { +public class DcpScopeExtractorRegistryTest { - private final IatpScopeExtractorRegistry registry = new IatpScopeExtractorRegistry(); + private final DcpScopeExtractorRegistry registry = new DcpScopeExtractorRegistry(); private ScopeExtractor extractor; private PolicyContext ctx; diff --git a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java index 0f7658bda3e..6f41f84ae34 100644 --- a/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java +++ b/extensions/common/iam/identity-trust/identity-trust-issuers-configuration/src/main/java/org/eclipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java @@ -31,7 +31,7 @@ import static org.eclipse.edc.iam.identitytrust.issuer.configuration.TrustedIssuerConfigurationExtension.NAME; /** - * This IATP extension makes it possible to configure a list of trusted issuers, that will be matched against the Verifiable Credential issuers. + * This DCP extension makes it possible to configure a list of trusted issuers, that will be matched against the Verifiable Credential issuers. */ @Extension(NAME) public class TrustedIssuerConfigurationExtension implements ServiceExtension { diff --git a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java index fed8471eb1d..8ba19b4723e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java +++ b/extensions/common/iam/identity-trust/identity-trust-service/src/main/java/org/eclipse/edc/iam/identitytrust/service/DidCredentialServiceUrlResolver.java @@ -33,7 +33,7 @@ public DidCredentialServiceUrlResolver(DidResolverRegistry didResolverRegistry) } /** - * Resolves the IATP credential service URL from the DID document based on the issuer. The issuer is interpreted as DID + * Resolves the DCP credential service URL from the DID document based on the issuer. The issuer is interpreted as DID * identifier, and the resolved DID is expected to contain a "CredentialServiceUrl" service endpoint. * * @param issuer The issuer of the DID document. diff --git a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/README.md b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/README.md index f335c3c5f4e..18c43ad9ac0 100644 --- a/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/README.md +++ b/extensions/common/iam/identity-trust/identity-trust-sts/identity-trust-sts-embedded/README.md @@ -3,12 +3,12 @@ ## Overview This module implements the `SecureTokenService` spi, which will be used for generating the Self-Issued ID Token -in the `IATP` protocol flow. This is an embeddable implementation, which can be used in the same process of +in the `DCP` protocol flow. This is an embeddable implementation, which can be used in the same process of the EDC control-plane runtime. ## Self-Issued ID Token Contents -As outlined in the [IATP](https://github.com/eclipse-tractusx/identity-trust/blob/main/specifications/M1/identity.protocol.base.md#41-self-issued-id-token-contents) spec +As outlined in the [DCP](https://github.com/eclipse-tractusx/identity-trust/blob/main/specifications/M1/identity.protocol.base.md#41-self-issued-id-token-contents) spec the token includes the following claims: - The `iss` and `sub` claims MUST be equal and set to the bearer's (participant's) DID. @@ -23,7 +23,7 @@ Additionally, when generating the Self-Issued ID Token the `bearerAccessScope` p ## VP Access Token format -The `IATP` protocol does not specify the format of the VP Access Token, which it's up to the specific STS implementation. +The `DCP` protocol does not specify the format of the VP Access Token, which it's up to the specific STS implementation. In this implementation the VP access token is still a JWT token with the following claims: - The `iss` is the same of the SI token (participant's DID) diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java index ab0d490a1c5..ed2c06480d3 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/serde/PresentationResponseMessageSerdeTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.DcpConstants.DCP_CONTEXT_URL; import static org.mockito.Mockito.mock; public class PresentationResponseMessageSerdeTest { @@ -49,8 +49,8 @@ public class PresentationResponseMessageSerdeTest { @BeforeEach void setUp() { jsonLd.registerCachedDocument("https://identity.foundation/presentation-exchange/submission/v1", TestUtils.getFileFromResourceName("presentation_ex.json").toURI()); - jsonLd.registerCachedDocument(IATP_CONTEXT_URL, TestUtils.getFileFromResourceName("document/iatp.v08.jsonld").toURI()); - jsonLd.registerContext(IATP_CONTEXT_URL); + jsonLd.registerCachedDocument(DCP_CONTEXT_URL, TestUtils.getFileFromResourceName("document/dcp.v08.jsonld").toURI()); + jsonLd.registerContext(DCP_CONTEXT_URL); // delegate to the generic transformer trr.register(new JsonValueToGenericTypeTransformer(mapper)); diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java index bc11544e1f7..e9f9259d40e 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationQueryMessageTransformerTest.java @@ -30,7 +30,7 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.DcpConstants.DCP_CONTEXT_URL; import static org.mockito.Mockito.mock; class JsonObjectToPresentationQueryMessageTransformerTest { @@ -44,7 +44,7 @@ class JsonObjectToPresentationQueryMessageTransformerTest { @BeforeEach void setUp() { jsonLd.registerCachedDocument("https://identity.foundation/presentation-exchange/submission/v1", TestUtils.getFileFromResourceName("presentation_ex.json").toURI()); - jsonLd.registerCachedDocument(IATP_CONTEXT_URL, TestUtils.getFileFromResourceName("document/iatp.v08.jsonld").toURI()); + jsonLd.registerCachedDocument(DCP_CONTEXT_URL, TestUtils.getFileFromResourceName("document/dcp.v08.jsonld").toURI()); // delegate to the generic transformer trr.register(new JsonValueToGenericTypeTransformer(mapper)); diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java index aa322b667e6..d4982dd666d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToPresentationResponseMessageTransformerTest.java @@ -32,7 +32,7 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; -import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL; +import static org.eclipse.edc.iam.identitytrust.spi.DcpConstants.DCP_CONTEXT_URL; import static org.mockito.Mockito.mock; class JsonObjectToPresentationResponseMessageTransformerTest { @@ -45,7 +45,7 @@ class JsonObjectToPresentationResponseMessageTransformerTest { @BeforeEach void setUp() { jsonLd.registerCachedDocument("https://identity.foundation/presentation-exchange/submission/v1", TestUtils.getFileFromResourceName("presentation_ex.json").toURI()); - jsonLd.registerCachedDocument(IATP_CONTEXT_URL, TestUtils.getFileFromResourceName("document/iatp.v08.jsonld").toURI()); + jsonLd.registerCachedDocument(DCP_CONTEXT_URL, TestUtils.getFileFromResourceName("document/dcp.v08.jsonld").toURI()); // delegate to the generic transformer trr.register(new JsonValueToGenericTypeTransformer(mapper)); diff --git a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/iatp.v08.jsonld b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/dcp.v08.jsonld similarity index 61% rename from extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/iatp.v08.jsonld rename to extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/dcp.v08.jsonld index 68d33163ed4..fa5b6db9c0d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/iatp.v08.jsonld +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/dcp.v08.jsonld @@ -2,124 +2,124 @@ "@context": { "@version": 1.1, "@protected": true, - "iatp": "https://w3id.org/tractusx-trust/v0.8/", + "dcp": "https://w3id.org/tractusx-trust/v0.8/", "cred": "https://www.w3.org/2018/credentials/", "xsd": "http://www.w3.org/2001/XMLSchema/", "CredentialContainer": { - "@id": "iatp:CredentialContainer", + "@id": "dcp:CredentialContainer", "@context": { "payload": { - "@id": "iatp:payload", + "@id": "dcp:payload", "@type": "xsd:string" } } }, "CredentialMessage": { - "@id": "iatp:CredentialMessage", + "@id": "dcp:CredentialMessage", "@context": { - "credentials": "iatp:credentials" + "credentials": "dcp:credentials" } }, "CredentialObject": { - "@id": "iatp:CredentialObject", + "@id": "dcp:CredentialObject", "@context": { "credentialType": { - "@id": "iatp:credentialType", + "@id": "dcp:credentialType", "@container": "@set" }, - "format": "iatp:format", + "format": "dcp:format", "offerReason": { - "@id": "iatp:offerReason", + "@id": "dcp:offerReason", "@type": "xsd:string" }, "bindingMethods": { - "@id": "iatp:bindingMethods", + "@id": "dcp:bindingMethods", "@type": "xsd:string", "@container": "@set" }, "cryptographicSuites": { - "@id": "iatp:cryptographicSuites", + "@id": "dcp:cryptographicSuites", "@type": "xsd:string", "@container": "@set" }, - "issuancePolicy": "iatp:issuancePolicy" + "issuancePolicy": "dcp:issuancePolicy" } }, "CredentialOfferMessage": { - "@id": "iatp:CredentialOfferMessage", + "@id": "dcp:CredentialOfferMessage", "@context": { "credentialIssuer": "cred:issuer", - "credentials": "iatp:credentials" + "credentials": "dcp:credentials" } }, "CredentialRequestMessage": { - "@id": "iatp:CredentialRequestMessage", + "@id": "dcp:CredentialRequestMessage", "@context": { - "format": "iatp:format", + "format": "dcp:format", "type": "@type" } }, - "CredentialService": "iatp:CredentialService", + "CredentialService": "dcp:CredentialService", "CredentialStatus": { - "@id": "iatp:CredentialStatus", + "@id": "dcp:CredentialStatus", "@context": { "requestId": { - "@id": "iatp:requestId", + "@id": "dcp:requestId", "@type": "@id" }, "status": { - "@id": "iatp:status", + "@id": "dcp:status", "@type": "xsd:string" } } }, "IssuerMetadata": { - "@id": "iatp:IssuerMetadata", + "@id": "dcp:IssuerMetadata", "@context": { "credentialIssuer": "cred:issuer", "credentialsSupported": { - "@id": "iatp:credentialsSupported", + "@id": "dcp:credentialsSupported", "@container": "@set" } } }, "PresentationQueryMessage": { - "@id": "iatp:PresentationQueryMessage", + "@id": "dcp:PresentationQueryMessage", "@context": { "presentationDefinition": { - "@id": "iatp:presentationDefinition", + "@id": "dcp:presentationDefinition", "@type": "@json" }, "scope": { - "@id": "iatp:scope", + "@id": "dcp:scope", "@type": "xsd:string", "@container": "@set" } } }, "PresentationResponseMessage": { - "@id": "iatp:PresentationResponseMessage", + "@id": "dcp:PresentationResponseMessage", "@context": { "presentation": { - "@id": "iatp:presentation", + "@id": "dcp:presentation", "@type": "@json" }, "presentationSubmission": { - "@id": "iatp:presentationSubmission", + "@id": "dcp:presentationSubmission", "@type": "@json" } } }, "credentials": { - "@id": "iatp:credentials", + "@id": "dcp:credentials", "@container": "@set" }, "credentialSubject": { - "@id": "iatp:credentialSubject", + "@id": "dcp:credentialSubject", "@type": "cred:credentialSubject" }, "format": { - "@id": "iatp:format", + "@id": "dcp:format", "@type": "xsd:string" }, "type": "@type" diff --git a/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/document/iatp.v08.jsonld b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/document/dcp.v08.jsonld similarity index 61% rename from extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/document/iatp.v08.jsonld rename to extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/document/dcp.v08.jsonld index 68d33163ed4..fa5b6db9c0d 100644 --- a/extensions/common/iam/identity-trust/identity-trust-core/src/main/resources/document/iatp.v08.jsonld +++ b/extensions/common/iam/identity-trust/identity-trust-transform/src/test/resources/document/dcp.v08.jsonld @@ -2,124 +2,124 @@ "@context": { "@version": 1.1, "@protected": true, - "iatp": "https://w3id.org/tractusx-trust/v0.8/", + "dcp": "https://w3id.org/tractusx-trust/v0.8/", "cred": "https://www.w3.org/2018/credentials/", "xsd": "http://www.w3.org/2001/XMLSchema/", "CredentialContainer": { - "@id": "iatp:CredentialContainer", + "@id": "dcp:CredentialContainer", "@context": { "payload": { - "@id": "iatp:payload", + "@id": "dcp:payload", "@type": "xsd:string" } } }, "CredentialMessage": { - "@id": "iatp:CredentialMessage", + "@id": "dcp:CredentialMessage", "@context": { - "credentials": "iatp:credentials" + "credentials": "dcp:credentials" } }, "CredentialObject": { - "@id": "iatp:CredentialObject", + "@id": "dcp:CredentialObject", "@context": { "credentialType": { - "@id": "iatp:credentialType", + "@id": "dcp:credentialType", "@container": "@set" }, - "format": "iatp:format", + "format": "dcp:format", "offerReason": { - "@id": "iatp:offerReason", + "@id": "dcp:offerReason", "@type": "xsd:string" }, "bindingMethods": { - "@id": "iatp:bindingMethods", + "@id": "dcp:bindingMethods", "@type": "xsd:string", "@container": "@set" }, "cryptographicSuites": { - "@id": "iatp:cryptographicSuites", + "@id": "dcp:cryptographicSuites", "@type": "xsd:string", "@container": "@set" }, - "issuancePolicy": "iatp:issuancePolicy" + "issuancePolicy": "dcp:issuancePolicy" } }, "CredentialOfferMessage": { - "@id": "iatp:CredentialOfferMessage", + "@id": "dcp:CredentialOfferMessage", "@context": { "credentialIssuer": "cred:issuer", - "credentials": "iatp:credentials" + "credentials": "dcp:credentials" } }, "CredentialRequestMessage": { - "@id": "iatp:CredentialRequestMessage", + "@id": "dcp:CredentialRequestMessage", "@context": { - "format": "iatp:format", + "format": "dcp:format", "type": "@type" } }, - "CredentialService": "iatp:CredentialService", + "CredentialService": "dcp:CredentialService", "CredentialStatus": { - "@id": "iatp:CredentialStatus", + "@id": "dcp:CredentialStatus", "@context": { "requestId": { - "@id": "iatp:requestId", + "@id": "dcp:requestId", "@type": "@id" }, "status": { - "@id": "iatp:status", + "@id": "dcp:status", "@type": "xsd:string" } } }, "IssuerMetadata": { - "@id": "iatp:IssuerMetadata", + "@id": "dcp:IssuerMetadata", "@context": { "credentialIssuer": "cred:issuer", "credentialsSupported": { - "@id": "iatp:credentialsSupported", + "@id": "dcp:credentialsSupported", "@container": "@set" } } }, "PresentationQueryMessage": { - "@id": "iatp:PresentationQueryMessage", + "@id": "dcp:PresentationQueryMessage", "@context": { "presentationDefinition": { - "@id": "iatp:presentationDefinition", + "@id": "dcp:presentationDefinition", "@type": "@json" }, "scope": { - "@id": "iatp:scope", + "@id": "dcp:scope", "@type": "xsd:string", "@container": "@set" } } }, "PresentationResponseMessage": { - "@id": "iatp:PresentationResponseMessage", + "@id": "dcp:PresentationResponseMessage", "@context": { "presentation": { - "@id": "iatp:presentation", + "@id": "dcp:presentation", "@type": "@json" }, "presentationSubmission": { - "@id": "iatp:presentationSubmission", + "@id": "dcp:presentationSubmission", "@type": "@json" } } }, "credentials": { - "@id": "iatp:credentials", + "@id": "dcp:credentials", "@container": "@set" }, "credentialSubject": { - "@id": "iatp:credentialSubject", + "@id": "dcp:credentialSubject", "@type": "cred:credentialSubject" }, "format": { - "@id": "iatp:format", + "@id": "dcp:format", "@type": "xsd:string" }, "type": "@type" diff --git a/launchers/sts-server/README.md b/launchers/sts-server/README.md index ae09b3b11be..8ab9010c2ed 100644 --- a/launchers/sts-server/README.md +++ b/launchers/sts-server/README.md @@ -56,7 +56,7 @@ curl --request POST \ ``` For attaching the `bearer_access_scope` as described in the -IATP [spec](https://github.com/eclipse-tractusx/identity-trust/blob/main/specifications/M1/identity.protocol.base.md#6-using-the-oauth-2-client-credential-grant-to-obtain-access-tokens-from-an-sts) : +DCP [spec](https://github.com/eclipse-tractusx/identity-trust/blob/main/specifications/M1/identity.protocol.base.md#6-using-the-oauth-2-client-credential-grant-to-obtain-access-tokens-from-an-sts) : ```shell curl --request POST \ diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpConstants.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpConstants.java similarity index 76% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpConstants.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpConstants.java index 67a766fc22a..9d08b2d65f4 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpConstants.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpConstants.java @@ -14,9 +14,9 @@ package org.eclipse.edc.iam.identitytrust.spi; -public interface IatpConstants { +public interface DcpConstants { - String IATP_CONTEXT_URL = "https://w3id.org/tractusx-trust/v0.8"; - String IATP_PREFIX = IATP_CONTEXT_URL + "/"; + String DCP_CONTEXT_URL = "https://w3id.org/tractusx-trust/v0.8"; + String DCP_PREFIX = DCP_CONTEXT_URL + "/"; } diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpParticipantAgentServiceExtension.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java similarity index 86% rename from spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpParticipantAgentServiceExtension.java rename to spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java index 1e9b00f4ce2..b508e40fbd9 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/IatpParticipantAgentServiceExtension.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/DcpParticipantAgentServiceExtension.java @@ -20,5 +20,5 @@ * Marker class for a {@link ParticipantAgentServiceExtension} that will be registered for Identity And Trust * module. */ -public interface IatpParticipantAgentServiceExtension extends ParticipantAgentServiceExtension { +public interface DcpParticipantAgentServiceExtension extends ParticipantAgentServiceExtension { } diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java index 4d7dc6d9053..c509bfede3e 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/SecureTokenService.java @@ -30,7 +30,7 @@ public interface SecureTokenService { * Generates the self-signed ID token. * * @param claims a set of claims, that are to be included in the SI token. MUST include {@code iss}, {@code sub} and {@code aud}. - * @param bearerAccessScope if non-null, must be a space-separated list of scopes as per IATP specification + * @param bearerAccessScope if non-null, must be a space-separated list of scopes as per DCP specification * if bearerAccessScope != null -> creates a {@code token} claim, which is another JWT containing the scope as claims. * if bearerAccessScope == null -> creates a normal JWT using all the claims in the map */ diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationQueryMessage.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationQueryMessage.java index ee422a657ad..1b36da02116 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationQueryMessage.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationQueryMessage.java @@ -20,19 +20,19 @@ import java.util.ArrayList; import java.util.List; -import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.DcpConstants.DCP_PREFIX; /** * Represents a query DTO that is sent to a CredentialService. Must be serialized to JSON-LD. * - * @see IATP Specification + * @see DCP Specification */ public class PresentationQueryMessage { - public static final String PRESENTATION_QUERY_MESSAGE_SCOPE_PROPERTY = IATP_PREFIX + "scope"; - public static final String PRESENTATION_QUERY_MESSAGE_DEFINITION_PROPERTY = IATP_PREFIX + "presentationDefinition"; + public static final String PRESENTATION_QUERY_MESSAGE_SCOPE_PROPERTY = DCP_PREFIX + "scope"; + public static final String PRESENTATION_QUERY_MESSAGE_DEFINITION_PROPERTY = DCP_PREFIX + "presentationDefinition"; public static final String PRESENTATION_QUERY_MESSAGE_TYPE = "PresentationQueryMessage"; - public static final String PRESENTATION_QUERY_MESSAGE_TYPE_PROPERTY = IATP_PREFIX + PRESENTATION_QUERY_MESSAGE_TYPE; + public static final String PRESENTATION_QUERY_MESSAGE_TYPE_PROPERTY = DCP_PREFIX + PRESENTATION_QUERY_MESSAGE_TYPE; private final List scopes = new ArrayList<>(); private PresentationDefinition presentationDefinition; diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationResponseMessage.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationResponseMessage.java index 2f6ea7d37c1..53fa69d38ae 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationResponseMessage.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/model/PresentationResponseMessage.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; -import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_PREFIX; +import static org.eclipse.edc.iam.identitytrust.spi.DcpConstants.DCP_PREFIX; /** * A representation of a Presentation Response @@ -31,9 +31,9 @@ */ public class PresentationResponseMessage { - public static final String PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY = IATP_PREFIX + "presentation"; - public static final String PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_SUBMISSION_PROPERTY = IATP_PREFIX + "presentationSubmission"; - public static final String PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY = IATP_PREFIX + "PresentationResponseMessage"; + public static final String PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY = DCP_PREFIX + "presentation"; + public static final String PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_SUBMISSION_PROPERTY = DCP_PREFIX + "presentationSubmission"; + public static final String PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY = DCP_PREFIX + "PresentationResponseMessage"; private List presentation = new ArrayList<>(); diff --git a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java index 851db68ed1a..42ca9d656eb 100644 --- a/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java +++ b/spi/common/identity-trust-spi/src/main/java/org/eclipse/edc/iam/identitytrust/spi/scope/ScopeExtractor.java @@ -22,7 +22,7 @@ import java.util.Set; /** - * Invoked during the pre-validation phase in the {@link PolicyEngine} for extracting the scopes needed for the IATP flow from an {@link AtomicConstraint} . + * Invoked during the pre-validation phase in the {@link PolicyEngine} for extracting the scopes needed for the DCP flow from an {@link AtomicConstraint} . * Extractors can be registered in {@link ScopeExtractorRegistry} */ @FunctionalInterface