Refactoring to move all packages to "org.eclipse.edc.heleade". Fixed docker compose volume paths. Further work on verification endpoint (WIP)

Author: espona

consumers/consumer-base/resources/configuration/consumer-base-docker-configuration.properties

@@ -29,6 +29,6 @@ web.http.public.path=/public
 
 # identity
 edc.participant.registry.url=http://federated-catalog:39191/api/
-edc.participant.claims=identity/claims.json
-edc.participant.private.key=identity/ed25519_private.pem
-edc.participant.public.key=identity/ed25519_public.pem
+edc.participant.claims=/identity/claims.json
+edc.participant.private.key=/identity/ed25519_private.pem
+edc.participant.public.key=/identity/ed25519_public.pem

docker-compose.yaml

@@ -31,7 +31,7 @@ services:
     build: ./providers/provider-base
     restart: on-failure:5
     volumes:
-      - ./resources/identity:/identity
+      - ./providers/provider-base/resources/identity:/identity
     networks:
       - base-ds-network
 
@@ -43,7 +43,7 @@ services:
       - "29194:29194"
     build: ./consumers/consumer-base
     volumes:
-      - ./resources/identity:/identity
+      - ./consumers/consumer-base/resources/identity:/identity
     networks:
       - base-ds-network
 

…e/edc/identity/IamIdentityExtension.java …leade/identity/IamIdentityExtension.javaiam-identity/src/main/java/org/eclipse/edc/identity/IamIdentityExtension.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/IamIdentityExtension.java iam-identity/src/main/java/org/eclipse/edc/identity/IamIdentityExtension.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/IamIdentityExtension.java

@@ -12,11 +12,11 @@
  *
  */
 
-package org.eclipse.edc.identity;
+package org.eclipse.edc.heleade.identity;
 
-import org.eclipse.edc.identity.api.IamIdentityApiController;
-import org.eclipse.edc.identity.load.FileParticipantIdentityLoader;
-import org.eclipse.edc.identity.load.ParticipantIdentityLoader;
+import org.eclipse.edc.heleade.identity.api.IamIdentityApiController;
+import org.eclipse.edc.heleade.identity.load.FileParticipantIdentityLoader;
+import org.eclipse.edc.heleade.identity.load.ParticipantIdentityLoader;
 import org.eclipse.edc.runtime.metamodel.annotation.Extension;
 import org.eclipse.edc.runtime.metamodel.annotation.Inject;
 import org.eclipse.edc.runtime.metamodel.annotation.Provider;
@@ -64,6 +64,9 @@ public class IamIdentityExtension implements ServiceExtension {
     @Inject
     private TypeManager typeManager;
 
+    @Inject
+    WebService webService;
+
 
     @Override
     public String name() {
@@ -106,12 +109,11 @@ public void initialize(ServiceExtensionContext context) {
             }
         }
 
+        IamIdentityService iamIdentityService = new IamIdentityService(typeManager, claims, participantId, signedClaims);
+        context.registerService(IdentityService.class, iamIdentityService);
 
-        webService.registerResource(new IamIdentityApiController(context.getMonitor()));
+        webService.registerResource(new IamIdentityApiController(iamIdentityService, context.getMonitor()));
 
-        context.registerService(
-                IdentityService.class,
-                new IamIdentityService(typeManager, claims, participantId, signedClaims));
     }
 
     /**
@@ -124,8 +126,4 @@ public AudienceResolver audienceResolver() {
         return (msg) -> Result.success(msg.getCounterPartyAddress());
     }
 
-    @Inject
-    WebService webService;
-
-
 }

…pse/edc/identity/IamIdentityService.java …heleade/identity/IamIdentityService.javaiam-identity/src/main/java/org/eclipse/edc/identity/IamIdentityService.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/IamIdentityService.java iam-identity/src/main/java/org/eclipse/edc/identity/IamIdentityService.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/IamIdentityService.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.identity;
+package org.eclipse.edc.heleade.identity;
 import org.eclipse.edc.spi.iam.ClaimToken;
 import org.eclipse.edc.spi.iam.IdentityService;
 import org.eclipse.edc.spi.iam.TokenParameters;
@@ -98,6 +98,32 @@ public IamIdentityService(TypeManager typeManager,
         this.signedClaims = signedClaims;
     }
 
+    /**
+     * Returns the claims
+     *
+     * @return a {@link Map} representing the claims
+     */
+    public Map<String, Object> getClaims() {
+        return claims;
+    }
+
+    /**
+     * Returns the client id
+     *
+     * @return a {@link String} containing the participant id
+     */
+    public String getClientId() {
+        return clientId;
+    }
+
+    /**
+     * Returns the signed claims
+     *
+     * @return a {@link String} representing the signed claims
+     */
+    public String getSignedClaims() {
+        return signedClaims;
+    }
 
     /**
      * Generates and returns a client credentials token representation based on the provided token parameters.

…entity/api/IamIdentityApiController.java …entity/api/IamIdentityApiController.javaiam-identity/src/main/java/org/eclipse/edc/identity/api/IamIdentityApiController.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/api/IamIdentityApiController.java iam-identity/src/main/java/org/eclipse/edc/identity/api/IamIdentityApiController.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/api/IamIdentityApiController.java

@@ -12,13 +12,14 @@
  *
  */
 
-package org.eclipse.edc.identity.api;
+package org.eclipse.edc.heleade.identity.api;
 
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
+import org.eclipse.edc.heleade.identity.IamIdentityService;
 import org.eclipse.edc.spi.monitor.Monitor;
 
 /**
@@ -30,17 +31,19 @@
 public class IamIdentityApiController {
 
     private final Monitor monitor;
+    private final IamIdentityService iamIdentityService;
 
     /**
      * Instantiates the controller for the verify identity endpoint
      *
+     * @param iamIdentityService identity service
      * @param monitor logger object
      */
-    public IamIdentityApiController(Monitor monitor) {
+    public IamIdentityApiController(IamIdentityService iamIdentityService, Monitor monitor) {
+        this.iamIdentityService = iamIdentityService;
         this.monitor = monitor;
     }
-
-
+    
     /**
      * Defines the verify identity endpoint
      *
@@ -49,7 +52,8 @@ public IamIdentityApiController(Monitor monitor) {
     @GET
     @Path("/verify-identity")
     public String verify() {
-        monitor.info("Verify received a health request");
+        monitor.debug("Verify identity received a request");
+
         return "{\"response\":\"IdentityProvider: I'm alive!\"}";
     }
 }

…/load/FileParticipantIdentityLoader.java …/load/FileParticipantIdentityLoader.javaiam-identity/src/main/java/org/eclipse/edc/identity/load/FileParticipantIdentityLoader.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/load/FileParticipantIdentityLoader.java iam-identity/src/main/java/org/eclipse/edc/identity/load/FileParticipantIdentityLoader.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/load/FileParticipantIdentityLoader.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.identity.load;
+package org.eclipse.edc.heleade.identity.load;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

…tity/load/ParticipantIdentityLoader.java …tity/load/ParticipantIdentityLoader.javaiam-identity/src/main/java/org/eclipse/edc/identity/load/ParticipantIdentityLoader.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/load/ParticipantIdentityLoader.java iam-identity/src/main/java/org/eclipse/edc/identity/load/ParticipantIdentityLoader.java renamed to iam-identity/src/main/java/org/eclipse/edc/heleade/identity/load/ParticipantIdentityLoader.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.identity.load;
+package org.eclipse.edc.heleade.identity.load;
 
 import org.eclipse.edc.spi.monitor.Monitor;
 

iam-identity/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension

@@ -1 +1 @@
-org.eclipse.edc.identity.IamIdentityExtension
+org.eclipse.edc.heleade.identity.IamIdentityExtension

…extension/AlwaysTruePolicyExtension.java …extension/AlwaysTruePolicyExtension.javaproviders/policy/policy-always-true/src/main/java/org/eclipse/edc/policy/extension/AlwaysTruePolicyExtension.java renamed to providers/policy/policy-always-true/src/main/java/org/eclipse/edc/heleade/policy/extension/AlwaysTruePolicyExtension.java providers/policy/policy-always-true/src/main/java/org/eclipse/edc/policy/extension/AlwaysTruePolicyExtension.java renamed to providers/policy/policy-always-true/src/main/java/org/eclipse/edc/heleade/policy/extension/AlwaysTruePolicyExtension.java

@@ -12,7 +12,7 @@
  *
  */
 
-package org.eclipse.edc.policy.extension;
+package org.eclipse.edc.heleade.policy.extension;
 
 import org.eclipse.edc.connector.controlplane.policy.spi.PolicyDefinition;
 import org.eclipse.edc.connector.controlplane.services.spi.policydefinition.PolicyDefinitionService;
@@ -24,7 +24,7 @@
 import org.eclipse.edc.spi.EdcException;
 import org.eclipse.edc.spi.system.ServiceExtension;
 
-import static org.eclipse.edc.policy.extension.AlwaysTruePolicyExtension.NAME;
+import static org.eclipse.edc.heleade.policy.extension.AlwaysTruePolicyExtension.NAME;
 import static org.eclipse.edc.policy.model.OdrlNamespace.ODRL_SCHEMA;
 
 

providers/policy/policy-always-true/src/main/resources/META-INF/services/org.eclipse.edc.spi.system.ServiceExtension

@@ -1 +1 @@
-org.eclipse.edc.policy.extension.AlwaysTruePolicyExtension
+org.eclipse.edc.heleade.policy.extension.AlwaysTruePolicyExtension