chore: fix backend issues with policies and dsp endpoints/prepared v4.0.1

charts/digital-product-pass/templates/configmap-backend.yaml

@@ -157,23 +157,23 @@ data:
           strictMode: {{ .Values.backend.passport.policyCheck.strictMode }}
           policies: {{- toYaml .Values.backend.passport.policyCheck.policies | nindent 10 }}
         # -- digital product pass verification add-on configuration
-        verification:
-          enabled: {{ .Values.backend.verification.enabled }}
-          autoVerify: {{ .Values.backend.verification.autoVerify }}
-          wallet:
-            url: {{ .Values.backend.verification.wallet.url }}
-            endpoints:
-              health: {{ .Values.backend.verification.wallet.endpoints.health }}
-              verify: {{ .Values.backend.verification.wallet.endpoints.verify }}
-          certifiedDataCredential:
-            ## -- These keys are used in order to find if a subModel contains a verifiable credential, defined in the verification documentation
-            semanticIdKeys:
-              - key: "Entity"
-                value: "https://www.w3.org/ns/credentials/v2"
-              - key: "DataElement"
-                value: "urn:samm:io.catenax.dpp_verification.cdc:1.0.0#CertifiedDataCredential"
-              - key: "Operation"
-                value: "https://w3c.github.io/vc-jws-2020/contexts/v1/"
+      verification:
+        enabled: {{ .Values.backend.verification.enabled }}
+        autoVerify: {{ .Values.backend.verification.autoVerify }}
+        wallet:
+          url: {{ .Values.backend.verification.wallet.url }}
+          endpoints:
+            health: {{ .Values.backend.verification.wallet.endpoints.health }}
+            verify: {{ .Values.backend.verification.wallet.endpoints.verify }}
+        certifiedDataCredential:
+          ## -- These keys are used in order to find if a subModel contains a verifiable credential, defined in the verification documentation
+          semanticIdKeys:
+            - key: "Entity"
+              value: "https://www.w3.org/ns/credentials/v2"
+            - key: "DataElement"
+              value: "urn:samm:io.catenax.dpp_verification.cdc:1.0.0#CertifiedDataCredential"
+            - key: "Operation"
+              value: "https://w3c.github.io/vc-jws-2020/contexts/v1/"
     # -- configuration of the spring boot server
     server:
       # -- configuration of backend errors

charts/digital-product-pass/values.yaml

@@ -142,7 +142,7 @@ backend:
     hostname: ""
     apis:
       readiness: "/api/check/readiness"
-      management: "/management/v2"
+      management: "/management/v3"
       catalog: "/catalog/request"
       negotiation: "/contractnegotiations"
       transfer: "/transferprocesses"
@@ -206,15 +206,12 @@ backend:
       # -- list of allowed policies that can be selected from the edc catalog in negotiations
       policies:
         - permission:
-            - action: "USE"
+            - action: "odrl:use"
               logicalConstraint: "odrl:and"
               constraints:
                 - leftOperand: "cx-policy:Membership"
                   operator: "odrl:eq"
                   rightOperand: "active"
-                - leftOperand: "cx-policy:FrameworkAgreement"
-                  operator: "odrl:eq"
-                  rightOperand: "CircularEconomy:1.0"
                 - leftOperand: "cx-policy:UsagePurpose"
                   operator: "odrl:eq"
                   rightOperand: "cx.circular.dpp:1"
@@ -246,7 +243,7 @@ backend:
       # -- list of allowed policies that can be selected from the edc catalog in negotiations
       policies:
         - permission:
-            - action: "USE"
+            - action: "odrl:use"
               logicalConstraint: "odrl:and"
               constraints:
                 - leftOperand: "cx-policy:Membership"

dpp-backend/digitalproductpass/pom.xml

@@ -36,7 +36,7 @@
     </parent>
     <groupId>org.eclipse.tractusx</groupId>
     <artifactId>digitalproductpass</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <packaging>jar</packaging>
     <name>Catena-X Digital Product Passport Core + Verification Add-on</name>
     <description>

dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/core/http/controllers/AppController.java

@@ -229,7 +229,7 @@ public Response getDigitalTwin(@RequestBody Object body, @PathVariable String pr
             }
 
             try {
-                connectorAddress = CatenaXUtil.buildEndpoint(connectorAddress);
+                connectorAddress = CatenaXUtil.buildDspEndpoint(connectorAddress);
             } catch (Exception e) {
                 return null;
             }

dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/core/models/negotiation/request/TransferRequest.java

@@ -44,8 +44,6 @@
 public class TransferRequest extends DidDocument {
 
     /** ATTRIBUTES **/
-    @JsonProperty("assetId")
-    String assetId;
     @JsonProperty("counterPartyAddress")
     String counterPartyAddress;
     @JsonProperty("contractId")
@@ -66,9 +64,8 @@ public class TransferRequest extends DidDocument {
     public TransferRequest() {
     }
 
-    public TransferRequest(String id, String type, String assetId, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
+    public TransferRequest(String id, String type, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
         super(id, type);
-        this.assetId = assetId;
         this.counterPartyAddress = counterPartyAddress;
         this.contractId = contractId;
         this.dataDestination = dataDestination;
@@ -78,8 +75,7 @@ public TransferRequest(String id, String type, String assetId, String counterPar
         this.callbackAddresses = callbackAddresses;
     }
 
-    public TransferRequest(String assetId, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
-        this.assetId = assetId;
+    public TransferRequest(String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
         this.counterPartyAddress = counterPartyAddress;
         this.contractId = contractId;
         this.dataDestination = dataDestination;
@@ -89,9 +85,8 @@ public TransferRequest(String assetId, String counterPartyAddress, String contra
         this.callbackAddresses = callbackAddresses;
     }
 
-    public TransferRequest(String id, String type, JsonNode context, String assetId, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
+    public TransferRequest(String id, String type, JsonNode context, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
         super(id, type, context);
-        this.assetId = assetId;
         this.counterPartyAddress = counterPartyAddress;
         this.contractId = contractId;
         this.dataDestination = dataDestination;
@@ -101,9 +96,8 @@ public TransferRequest(String id, String type, JsonNode context, String assetId,
         this.callbackAddresses = callbackAddresses;
     }
 
-    public TransferRequest(String type, String assetId, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
+    public TransferRequest(String type, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
         super(type);
-        this.assetId = assetId;
         this.counterPartyAddress = counterPartyAddress;
         this.contractId = contractId;
         this.dataDestination = dataDestination;
@@ -113,9 +107,8 @@ public TransferRequest(String type, String assetId, String counterPartyAddress,
         this.callbackAddresses = callbackAddresses;
     }
 
-    public TransferRequest(JsonNode context, String assetId, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
+    public TransferRequest(JsonNode context, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
         super(context);
-        this.assetId = assetId;
         this.counterPartyAddress = counterPartyAddress;
         this.contractId = contractId;
         this.dataDestination = dataDestination;
@@ -125,9 +118,8 @@ public TransferRequest(JsonNode context, String assetId, String counterPartyAddr
         this.callbackAddresses = callbackAddresses;
     }
 
-    public TransferRequest(JsonNode context, String type, String assetId, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
+    public TransferRequest(JsonNode context, String type, String counterPartyAddress, String contractId, DataDestination dataDestination, Boolean managedResources, String protocol, String transferType, List<CallbackAddress> callbackAddresses) {
         super(context, type);
-        this.assetId = assetId;
         this.counterPartyAddress = counterPartyAddress;
         this.contractId = contractId;
         this.dataDestination = dataDestination;
@@ -139,12 +131,6 @@ public TransferRequest(JsonNode context, String type, String assetId, String cou
 
 
     /** GETTERS AND SETTERS **/
-    public String getAssetId() {
-        return assetId;
-    }
-    public void setAssetId(String assetId) {
-        this.assetId = assetId;
-    }
     public String getCounterPartyAddress() {
         return counterPartyAddress;
     }

dpp-backend/digitalproductpass/src/main/java/utils/CatenaXUtil.java

@@ -196,18 +196,47 @@ public static String buildManagementEndpoint(Environment env, String path) {
             throw new UtilException(CatenaXUtil.class, e, "[ERROR] Invalid edc endpoint or management endpoint");
         }
     }
+    /**
+     * Builds a dsp endpoint, adding the /api/v1/dsp endpoint.
+     * <p>
+     * @param   endpoint
+     *          the {@code String} partial endpoint.
+     *
+     * @return  the built {@code String} endpoint by cleaning the given endpoint and adding the EDC data endpoint and BPN number (if applied).
+     *
+     * @throws  UtilException
+     *          if the given endpoint is an invalid one.
+     */
+    public static String buildDspEndpoint(String endpoint) {
+        try {
+            if (CatenaXUtil.containsEdcEndpoint(endpoint)) {
+                return endpoint;
+            }
+            String cleanUrl = HttpUtil.cleanUrlWithPath(endpoint);
+            // Remove the trailing slash
+            if (endpoint.endsWith("/")) {
+                cleanUrl =  endpoint.substring(0, endpoint.length() - 1);
+            }
+            //Contact the dsp endpoint
+            return cleanUrl + edcDataEndpoint;
+        } catch (Exception e) {
+            throw new UtilException(CatenaXUtil.class, e, "[ERROR] Invalid url [" + endpoint + "] given!");
+        }
+
+    }
 
     /**
+     * @deprecated Use {@code CatenaXUtil.buildEndpointSafe()} instead. This method provided the old logic of parsing dsp endpoints with BPNs
      * Builds the full Endpoint for a given partial endpoint.
      * <p>
      * @param   endpoint
      *          the {@code String} partial endpoint.
      *
      * @return  the built {@code String} endpoint by cleaning the given endpoint and adding the EDC data endpoint and BPN number (if applied).
-     *
      * @throws  UtilException
      *          if the given endpoint is an invalid one.
      */
+    @Deprecated
     public static String buildEndpoint(String endpoint) {
         try {
             if (CatenaXUtil.containsEdcEndpoint(endpoint)) {

dpp-backend/digitalproductpass/src/main/java/utils/HttpUtil.java

@@ -456,6 +456,22 @@ public static String cleanUrl(String strUrl) throws MalformedURLException{
         String authority = url.getAuthority();
         return String.format("%s://%s", protocol, authority);
     }
+    /**
+     * Parses the given {@code String} URL into a String format with protocol and authority information with path
+     * <p>
+     * @param   strUrl
+     *          the {@code String} URL.
+     *
+     * @return  a {@code String} object with format result.
+     *
+     */
+    public static String cleanUrlWithPath(String strUrl) throws MalformedURLException{
+        URL url = new URL(strUrl);
+        String protocol = url.getProtocol();
+        String authority = url.getAuthority();
+        String path = url.getPath();
+        return String.format("%s://%s%s", protocol, authority, path);
+    }
 
 
     /**************************************************

dpp-backend/digitalproductpass/src/test/java/managers/ProcessManagerTest.java

@@ -571,7 +571,6 @@ void saveTransferRequestAndTransfer() {
         String connectorId = UUID.randomUUID().toString();
         transferRequest.setProtocol("HTTP");
         transferRequest.setContractId(contractId);
-        transferRequest.setAssetId(assetId);
         transferRequest.setCounterPartyAddress("connectorAddress");
 
         String transferId = UUID.randomUUID().toString();

dpp-backend/digitalproductpass/src/test/java/services/DataTransferServiceTest.java

@@ -325,7 +325,6 @@ void initiateTransferAndSeeTransfer() {
         List<CallbackAddress> callbackAddresses = List.of(CallbackAddress.builder().transactional(false).uri("http://test.endpoint/4546").events(List.of("transfer.process")).build());
         TransferRequest transferRequest = new TransferRequest(
                 jsonUtil.toJsonNode(Map.of("odrl", "http://www.w3.org/ns/odrl/2/")),
-                dataSet.getAssetId(),
                 status.getEndpoint(),
                 negotiation.getContractAgreementId(),
                 null,

dpp-backend/digitalproductpass/src/test/java/utils/CatenaXUtilTest.java

@@ -0,0 +1,98 @@
+/*********************************************************************************
+ *
+ * Tractus-X - Digital Product Pass Application
+ *
+ * Copyright (c) 2022, 2024 BMW AG
+ * Copyright (c) 2022, 2024 Henkel AG & Co. KGaA
+ * Copyright (c) 2023, 2024 CGI Deutschland B.V. & Co. KG
+ * Copyright (c) 2023, 2024 Contributors to the Eclipse Foundation
+ *
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Apache License, Version 2.0 which is available at
+ * https://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the
+ * License for the specific language govern in permissions and limitations
+ * under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ********************************************************************************/
+
+package utils;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class CatenaXUtilTest {
+    String edcUrlWithoutDsp = "https://edc-url.com/";
+    String edcUrlWithoutDspBar = "https://edc-url.com";
+    String edcUrlWithPathWithoutDsp = "https://edc-url.com/provider/";
+    String edcUrlWithPathWithoutDspBar = "https://edc-url.com/provider";
+    String edcUrlWithDsp = "https://edc-url.com"+CatenaXUtil.edcDataEndpoint;
+    String edcUrlWithPathDsp = "https://edc-url.com/provider"+CatenaXUtil.edcDataEndpoint;
+    String edcUrlWithBpnDsp = "https://edc-url.com/BPNL000000000000"+CatenaXUtil.edcDataEndpoint;
+    String edcUrlWithBpnWithoutDsp = "https://edc-url.com/BPNL000000000000";
+    String edcUrlWithPort = "https://edc-url.com:8888/BPNL000000000000";
+    String edcUrlWithBpnWithoutDspMorePath = "https://edc-url.com/BPNL000000000000/this/is/more/path";
+    @Test
+    void buildEdcUrlWithoutDsp() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithoutDsp);
+        LogUtil.printTest("[CatenaXUtil.buildEdcUrlWithoutDsp] Input: ["+edcUrlWithoutDsp+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithDsp, output);
+    }
+    @Test
+    void buildEdcUrlWithoutDspBar() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithoutDspBar);
+        LogUtil.printTest("[CatenaXUtil.buildEdcUrlWithoutDspBar] Input: ["+edcUrlWithoutDspBar+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithDsp, output);
+    }
+    @Test
+    void buildEdcUrlWithPathWithoutDsp() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithPathWithoutDsp);
+        LogUtil.printTest("[CatenaXUtil.buildEdcUrlWithPathWithoutDsp] Input: ["+edcUrlWithPathWithoutDsp+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithPathDsp, output);
+    }
+
+    @Test
+    void buildEdcUrlWithPathWithoutDspBar() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithPathWithoutDspBar);
+        LogUtil.printTest("[CatenaXUtil.buildEdcUrlWithPathWithoutDspBar] Input: ["+edcUrlWithPathWithoutDspBar+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithPathDsp, output);
+    }
+    @Test
+    void buildEdcUrlWithBpnDsp() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithBpnDsp);
+        LogUtil.printTest("[CatenaXUtil.buildEdcUrlWithBpnDsp] Input: ["+edcUrlWithBpnDsp+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithBpnDsp, output);
+    }
+
+    @Test
+    void buildEdcUrlWithBpnWithoutDsp() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithBpnWithoutDsp);
+        LogUtil.printTest("[CatenaXUtil.buildEdcUrlWithBpnWithoutDsp] Input: ["+edcUrlWithBpnWithoutDsp+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithBpnDsp, output);
+    }
+
+    @Test
+    void buildEdcUrlWithBpnWithoutDspMorePath() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithBpnWithoutDspMorePath);
+        LogUtil.printTest("[CatenaXUtil.edcUrlWithBpnWithoutDspMorePath] Input: ["+edcUrlWithBpnWithoutDspMorePath+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithBpnWithoutDspMorePath+CatenaXUtil.edcDataEndpoint,output);
+    }
+    @Test
+    void buildEdcWithPort() {
+        String output = CatenaXUtil.buildDspEndpoint(edcUrlWithPort);
+        LogUtil.printTest("[CatenaXUtil.buildEdcWithPort] Input: ["+edcUrlWithPort+"] Output: ["+output+"]");
+        assertEquals(edcUrlWithPort+CatenaXUtil.edcDataEndpoint, output);
+    }
+
+
+}