chore: separate identity-trust-spi (#4080)

eclipse-edc · Apr 3, 2024 · 4e706af · 4e706af
1 parent 41c69db
commit 4e706af
Show file tree

Hide file tree

Showing 80 changed files with 573 additions and 211 deletions.
diff --git a/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-core/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
 
     testImplementation(project(":core:common:junit"))
     testImplementation(testFixtures(project(":spi:common:identity-trust-spi")))
+    testImplementation(testFixtures(project(":spi:common:verifiable-credentials-spi")))
     testImplementation(project(":core:common:lib:json-ld-lib"))
     testImplementation(project(":extensions:common:json-ld"))
     testImplementation(libs.nimbus.jwt)

diff --git a/...re/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java b/...re/src/main/java/org/eclipse/edc/iam/identitytrust/core/IatpDefaultServicesExtension.java
@@ -54,12 +54,12 @@ public class IatpDefaultServicesExtension implements ServiceExtension {
     public static final String STS_PRIVATE_KEY_ALIAS = "edc.iam.sts.privatekey.alias";
     @Setting(value = "Id used by the counterparty to resolve the public key for token validation, e.g. did:example:123#public-key-0", defaultValue = "A random EC public key")
     public static final String STS_PUBLIC_KEY_ID = "edc.iam.sts.publickey.id";
+    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)
     private static final String STS_TOKEN_EXPIRATION = "edc.iam.sts.token.expiration"; // in minutes
     private static final int DEFAULT_STS_TOKEN_EXPIRATION_MIN = 5;
-    public static final String CLAIMTOKEN_VC_KEY = "vc";
     @Inject
     private Clock clock;
     @Inject

diff --git a/.../java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java b/.../java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClient.java
@@ -23,12 +23,13 @@
 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.VcConstants;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer;
-import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage;
-import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage;
+import org.eclipse.edc.iam.identitytrust.spi.IatpConstants;
+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;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentation;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.spi.monitor.Monitor;
@@ -147,7 +148,7 @@ private JsonObject createPresentationQuery(List<String> scopes) {
         return jsonFactory.createObjectBuilder()
                 .add(JsonLdKeywords.CONTEXT, jsonFactory.createArrayBuilder()
                         .add(VcConstants.PRESENTATION_EXCHANGE_URL)
-                        .add(VcConstants.IATP_CONTEXT_URL))
+                        .add(IatpConstants.IATP_CONTEXT_URL))
                 .add(JsonLdKeywords.TYPE, PresentationQueryMessage.PRESENTATION_QUERY_MESSAGE_TYPE)
                 .add("scope", scopeArray.build())
                 .build();

diff --git a/...ipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java b/...ipse/edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtension.java
@@ -15,8 +15,8 @@
 package org.eclipse.edc.iam.identitytrust.core.defaults;
 
 import org.eclipse.edc.iam.identitytrust.spi.IatpParticipantAgentServiceExtension;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
+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;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...in/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistry.java b/...in/java/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistry.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.iam.identitytrust.core.defaults;
 
 import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/...a/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java b/...a/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultCredentialServiceClientTest.java
@@ -27,12 +27,12 @@
 import okhttp3.ResponseBody;
 import okio.Buffer;
 import org.eclipse.edc.http.spi.EdcHttpClient;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentation;
-import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage;
+import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentation;
 import org.eclipse.edc.jsonld.spi.JsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.spi.result.Result;
@@ -68,9 +68,9 @@ class DefaultCredentialServiceClientTest {
     public static final String PRESENTATION_QUERY = "/presentations/query";
     private static final String CS_URL = "http://test.com/cs";
     private final EdcHttpClient httpClientMock = mock();
+    private final ObjectMapper mapper = JacksonJsonLd.createObjectMapper().enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
     private DefaultCredentialServiceClient client;
     private TypeTransformerRegistry transformerRegistry;
-    private ObjectMapper mapper = JacksonJsonLd.createObjectMapper().enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
 
     @BeforeEach
     void setup() {

diff --git a/.../edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java b/.../edc/iam/identitytrust/core/defaults/DefaultIatpParticipantAgentServiceExtensionTest.java
@@ -23,7 +23,7 @@
 
 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.spi.TestFunctions.createCredential;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createCredential;
 
 class DefaultIatpParticipantAgentServiceExtensionTest {
 

diff --git a/...ava/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistryTest.java b/...ava/org/eclipse/edc/iam/identitytrust/core/defaults/DefaultTrustedIssuerRegistryTest.java
@@ -14,7 +14,7 @@
 
 package org.eclipse.edc.iam.identitytrust.core.defaults;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 import org.junit.jupiter.api.Test;
 
 import java.util.Map;

diff --git a/...lipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java b/...lipse/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtension.java
@@ -16,7 +16,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Setting;

diff --git a/...e/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java b/...e/edc/iam/identitytrust/issuer/configuration/TrustedIssuerConfigurationExtensionTest.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.iam.identitytrust.issuer.configuration;
 
 import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 import org.eclipse.edc.junit.extensions.DependencyInjectionExtension;
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.system.ServiceExtensionContext;

diff --git a/extensions/common/iam/identity-trust/identity-trust-service/build.gradle.kts b/extensions/common/iam/identity-trust/identity-trust-service/build.gradle.kts
@@ -18,6 +18,7 @@ dependencies {
     testImplementation(project(":core:common:lib:json-ld-lib"))
     testImplementation(project(":core:common:lib:crypto-common-lib"))
 
+    testImplementation(testFixtures(project(":spi:common:verifiable-credentials-spi")))
     testImplementation(testFixtures(project(":extensions:common:crypto:ldp-verifiable-credentials")))
     testImplementation(testFixtures(project(":extensions:common:crypto:jwt-verifiable-credentials")))
 

diff --git a/...vice/src/main/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustService.java b/...vice/src/main/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustService.java
@@ -22,11 +22,11 @@
 import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient;
 import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService;
 import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule;
 import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction;
 import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.validation.CredentialValidationRule;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.iam.TokenParameters;

diff --git a/.../main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuer.java b/.../main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuer.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.iam.identitytrust.service.validation.rules;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.validation.CredentialValidationRule;
 import org.eclipse.edc.spi.result.Result;
 
 import java.util.Collection;

diff --git a/...n/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIds.java b/...n/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIds.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.iam.identitytrust.service.validation.rules;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.validation.CredentialValidationRule;
 import org.eclipse.edc.spi.result.Result;
 
 import static org.eclipse.edc.spi.result.Result.failure;

diff --git a/...rc/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsNotExpired.java b/...rc/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsNotExpired.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.iam.identitytrust.service.validation.rules;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.validation.CredentialValidationRule;
 import org.eclipse.edc.spi.result.Result;
 
 import java.time.Clock;

diff --git a/...e/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsRevoked.java b/...e/src/main/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/IsRevoked.java
@@ -14,8 +14,8 @@
 
 package org.eclipse.edc.iam.identitytrust.service.validation.rules;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.validation.CredentialValidationRule;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.validation.CredentialValidationRule;
 import org.eclipse.edc.spi.result.Result;
 
 import static org.eclipse.edc.spi.result.Result.success;

diff --git a/...g/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifier.java b/...g/eclipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifier.java
@@ -14,10 +14,10 @@
 
 package org.eclipse.edc.iam.identitytrust.service.verification;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.iam.identitytrust.spi.verification.CredentialVerifier;
 import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier;
 import org.eclipse.edc.iam.identitytrust.spi.verification.VerifierContext;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.spi.result.Result;
 
 import java.util.List;

diff --git a/.../src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java b/.../src/test/java/org/eclipse/edc/iam/identitytrust/service/IdentityAndTrustServiceTest.java
@@ -20,13 +20,13 @@
 import org.eclipse.edc.iam.identitytrust.spi.CredentialServiceClient;
 import org.eclipse.edc.iam.identitytrust.spi.SecureTokenService;
 import org.eclipse.edc.iam.identitytrust.spi.TrustedIssuerRegistry;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiableCredential;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.iam.identitytrust.spi.validation.TokenValidationAction;
 import org.eclipse.edc.iam.identitytrust.spi.verification.PresentationVerifier;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiableCredential;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.policy.model.Policy;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.iam.TokenParameters;
@@ -51,10 +51,10 @@
 
 import static org.eclipse.edc.iam.identitytrust.spi.SelfIssuedTokenConstants.PRESENTATION_TOKEN_CLAIM;
 import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.TRUSTED_ISSUER;
-import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredentialBuilder;
 import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createJwt;
-import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createPresentationBuilder;
-import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createPresentationContainer;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createCredentialBuilder;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createPresentationBuilder;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createPresentationContainer;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
 import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.AUDIENCE;
 import static org.eclipse.edc.jwt.spi.JwtRegisteredClaimNames.SCOPE;

diff --git a/...t/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuerTest.java b/...t/java/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidIssuerTest.java
@@ -14,14 +14,14 @@
 
 package org.eclipse.edc.iam.identitytrust.service.validation.rules;
 
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 import java.util.Map;
 
-import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredentialBuilder;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createCredentialBuilder;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
 
 class HasValidIssuerTest {

diff --git a/...va/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIdsTest.java b/...va/org/eclipse/edc/iam/identitytrust/service/validation/rules/HasValidSubjectIdsTest.java
@@ -15,12 +15,12 @@
 package org.eclipse.edc.iam.identitytrust.service.validation.rules;
 
 
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject;
 import org.junit.jupiter.api.Test;
 
 import java.util.List;
 
-import static org.eclipse.edc.iam.identitytrust.spi.TestFunctions.createCredentialBuilder;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.TestFunctions.createCredentialBuilder;
 import static org.eclipse.edc.junit.assertions.AbstractResultAssert.assertThat;
 
 class HasValidSubjectIdsTest {

diff --git a/...lipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifierTest.java b/...lipse/edc/iam/identitytrust/service/verification/MultiFormatPresentationVerifierTest.java
@@ -23,9 +23,9 @@
 import com.nimbusds.jose.jwk.Curve;
 import com.nimbusds.jose.jwk.ECKey;
 import com.nimbusds.jose.jwk.gen.ECKeyGenerator;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialFormat;
-import org.eclipse.edc.iam.identitytrust.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.iam.identitytrust.spi.verification.SignatureSuiteRegistry;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialFormat;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.VerifiablePresentationContainer;
 import org.eclipse.edc.jsonld.TitaniumJsonLd;
 import org.eclipse.edc.jsonld.util.JacksonJsonLd;
 import org.eclipse.edc.keys.spi.PublicKeyResolver;

diff --git a/...ain/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtension.java b/...ain/java/org/eclipse/edc/iam/identitytrust/transform/IdentityTrustTransformExtension.java
@@ -40,7 +40,7 @@
 import java.net.URISyntaxException;
 
 import static java.lang.String.format;
-import static org.eclipse.edc.iam.identitytrust.spi.VcConstants.IATP_CONTEXT_URL;
+import static org.eclipse.edc.iam.identitytrust.spi.IatpConstants.IATP_CONTEXT_URL;
 import static org.eclipse.edc.spi.constants.CoreConstants.JSON_LD;
 
 @Extension(value = IdentityTrustTransformExtension.NAME, categories = { "iam", "transform", "jsonld" })

diff --git a/...ipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationQueryTransformer.java b/...ipse/edc/iam/identitytrust/transform/from/JsonObjectFromPresentationQueryTransformer.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.iam.identitytrust.transform.from;
 
 import jakarta.json.JsonObject;
-import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationQueryMessage;
+import org.eclipse.edc.iam.identitytrust.spi.model.PresentationQueryMessage;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.jetbrains.annotations.NotNull;

diff --git a/...am/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformer.java b/...am/identitytrust/transform/from/JsonObjectFromPresentationResponseMessageTransformer.java
@@ -16,15 +16,15 @@
 
 import jakarta.json.Json;
 import jakarta.json.JsonObject;
-import org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage;
+import org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY;
-import static org.eclipse.edc.iam.identitytrust.spi.model.credentialservice.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY;
+import static org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_PRESENTATION_PROPERTY;
+import static org.eclipse.edc.iam.identitytrust.spi.model.PresentationResponseMessage.PRESENTATION_RESPONSE_MESSAGE_TYPE_PROPERTY;
 import static org.eclipse.edc.jsonld.spi.JsonLdKeywords.TYPE;
 
 

diff --git a/...g/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformer.java b/...g/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialStatusTransformer.java
@@ -15,15 +15,15 @@
 package org.eclipse.edc.iam.identitytrust.transform.to;
 
 import jakarta.json.JsonObject;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialStatus;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 
-import static org.eclipse.edc.iam.identitytrust.spi.model.CredentialStatus.CREDENTIAL_STATUS_TYPE_PROPERTY;
+import static org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialStatus.CREDENTIAL_STATUS_TYPE_PROPERTY;
 
 public class JsonObjectToCredentialStatusTransformer extends AbstractJsonLdTransformer<JsonObject, CredentialStatus> {
     public JsonObjectToCredentialStatusTransformer() {

diff --git a/.../eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformer.java b/.../eclipse/edc/iam/identitytrust/transform/to/JsonObjectToCredentialSubjectTransformer.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.iam.identitytrust.transform.to;
 
 import jakarta.json.JsonObject;
-import org.eclipse.edc.iam.identitytrust.spi.model.CredentialSubject;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.CredentialSubject;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
 import org.eclipse.edc.transform.spi.TransformerContext;
 import org.jetbrains.annotations.NotNull;

diff --git a/...in/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToIssuerTransformer.java b/...in/java/org/eclipse/edc/iam/identitytrust/transform/to/JsonObjectToIssuerTransformer.java
@@ -15,7 +15,7 @@
 package org.eclipse.edc.iam.identitytrust.transform.to;
 
 import jakarta.json.JsonObject;
-import org.eclipse.edc.iam.identitytrust.spi.model.Issuer;
+import org.eclipse.edc.iam.verifiablecredentials.spi.model.Issuer;
 import org.eclipse.edc.jsonld.spi.JsonLdKeywords;
 import org.eclipse.edc.jsonld.spi.transformer.AbstractJsonLdTransformer;
 import org.eclipse.edc.transform.spi.TransformerContext;