Feat: add identity provider to DTR

backend/src/main/java/org/eclipse/tractusx/puris/backend/common/ddtr/logic/DtrAdapterService.java

@@ -21,6 +21,7 @@
 package org.eclipse.tractusx.puris.backend.common.ddtr.logic;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.annotation.Nullable;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.*;
 import org.eclipse.tractusx.puris.backend.common.ddtr.logic.util.DtrRequestBodyBuilder;
@@ -29,7 +30,6 @@
 import org.eclipse.tractusx.puris.backend.masterdata.domain.model.Material;
 import org.eclipse.tractusx.puris.backend.masterdata.domain.model.MaterialPartnerRelation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.lang.Nullable;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;

backend/src/main/java/org/eclipse/tractusx/puris/backend/common/security/DtrSecurityConfiguration.java

@@ -44,17 +44,17 @@ public class DtrSecurityConfiguration {
      * token url of the OAuth2 identity provider
      **/
     @Value("${puris.dtr.idp.tokenurl}")
-    String tokenUrl;
+    private String tokenUrl;
     /**
      * client id of the puris client with write access for DTR
      **/
     @Value("${puris.dtr.idp.puris-client.id}")
-    String purisClientId;
+    private String purisClientId;
     /**
      * client secret of the puris client with write access for DTR
      **/
     @Value("${puris.dtr.idp.puris-client.secret}")
-    String purisClientSecret;
+    private String purisClientSecret;
     /**
      * grant_type. Currently only client_credentials is supported
      **/
@@ -64,10 +64,10 @@ public class DtrSecurityConfiguration {
      * client id of the edc client with read access for DTR
      **/
     @Value("${puris.dtr.idp.edc-client.id}")
-    String edcClientId;
+    private String edcClientId;
     /**
      * vault alias for the client secret of the edc client with read access for DTR
      **/
     @Value("${puris.dtr.idp.edc-client.secret.alias}")
-    String edcClientSecretAlias;
+    private String edcClientSecretAlias;
 }

local/cleanup.sh

@@ -22,7 +22,6 @@
 
 docker compose down -v
 docker compose -f docker-compose-infrastructure.yaml down -v
-docker compose -f docker-compose-idp.yaml down -v
 docker image rm local-vault
 rm .env
 rm ./vault/secrets -r

local/docker-compose.yaml

@@ -21,7 +21,7 @@
 version: "3"
 services:
 
   puris-frontend-customer:
     image: puris-frontend:dev
     container_name: customer-frontend
     ports:
@@ -84,7 +84,6 @@
       postgres-customer:
         condition: service_healthy
     healthcheck:
-      # as security is enabled by default and we don't provide a bearer accept auth issues
       test: ["CMD-SHELL", "wget -q --spider http://dtr-customer:4243/actuator/health/readiness"]
       interval: 4s
       timeout: 3s
@@ -173,7 +172,7 @@
     extra_hosts:
       - "host.docker.internal:host-gateway" # Adjusts container's host file to allow for communication with docker-host machine
 
   puris-frontend-supplier:
     image: puris-frontend:dev
     container_name: supplier-frontend
     ports:
@@ -210,7 +209,7 @@
     image: puris-backend:dev
     container_name: supplier-backend
     depends_on:
       edc-supplier-control-plane:
         condition: service_started #service_healthy
       postgres-supplier:
         condition: service_healthy