Merge pull request #205 from catenax-ng/release/v2.1.0-backend-agree

[ 19º ] - Release/v2.1.0 backend agree: Enabled policy selection and handling of more than one contract in the backend

.pre-commit-config.yaml

@@ -24,9 +24,9 @@ repos:
   - repo: https://github.com/gitguardian/ggshield
     rev: v1.13.6
     hooks:
+      # - id: ggshield
+      #   language_version: python3
+      #   stages: [commit]
       - id: ggshield
         language_version: python3
-        stages: [commit]
-      - id: ggshield
-        language_version: python3
-        stages: [push]
+        stages: [push]

charts/digital-product-pass/templates/deployment-frontend.yaml

@@ -75,6 +75,9 @@ spec:
             - name: "AUTH_BPN_NUMBER"
               value: "{{ .Values.oauth.bpnCheck.bpn }}"
 
+            - name: "APP_AUTO_SIGN"
+              value: "{{ .Values.frontend.negotiation.autoSign }}"
+
             - name: "APP_PORTAL_URL"
               value: "https://{{ .Values.frontend.portal.hostname }}"
 
@@ -87,8 +90,11 @@ spec:
             - name: "IDP_URL"
               value: "https://{{ .Values.oauth.hostname }}"
 
-            - name: "API_TIMEOUT"
-              value: "{{ .Values.frontend.api.timeout }}"
+            - name: "API_NEGOTIATE_TIMEOUT"
+              value: "{{ .Values.frontend.api.negotiateTimeout }}"
+
+            - name: "API_SEARCH_TIMEOUT"
+              value: "{{ .Values.frontend.api.searchTimeout }}"
 
             - name: "API_MAX_RETRIES"
               value: "{{ .Values.frontend.api.max_retries }}"

charts/digital-product-pass/values.yaml

@@ -95,8 +95,7 @@ backend:
       catalog: "/catalog/request"
       negotiation: "/contractnegotiations"
       transfer: "/transferprocesses"
-    # -- Negotiation status Delay in milliseconds in between async requests [<= 500]
-    delay: 100
+    delay: 100 # -- Negotiation status Delay in milliseconds in between async requests [<= 500]
 
   # -- backend hostname (without protocol prefix [DEFAULT HTTPS] for security )
   hostname: *hostname
@@ -129,13 +128,12 @@ backend:
     # -- unique sha512 hash key used for the passport encryption
     encryptionKey: ""
 
-  # -- passport data transfer configuration
   passport:
-    # -- passport versions and aspects allowed
     aspects:
       - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport"
       - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass"
       - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"
+      - "urn:samm:io.catenax.generic.digital_product_passport:2.0.0#DigitalProductPassport"
 
   digitalTwinRegistry:
     endpoints:
@@ -183,7 +181,7 @@ frontend:
   ingress:
     enabled: false
     hosts: []
-
+  
   # -- The [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) defines privilege and access control settings for a Pod within the deployment
   podSecurityContext:
     seccompProfile:
@@ -227,12 +225,17 @@ frontend:
   portal:
     hostname: ""
 
+  negotiation:
+    autoSign: true
+
   # -- api timeouts
   api:
     # -- max retries for getting status
     max_retries: 30
     # -- default timeout  - 90 seconds in milliseconds
-    timeout: 90000
+    negotiateTimeout: 20000
+    searchTimeout: 40000
+
     # -- delay from getting status
     delay: 1000
 

dpp-backend/charts/digital-product-pass-backend/values.yaml

@@ -96,14 +96,6 @@ process:
   # -- unique sha512 hash key used for the passport encryption
   encryptionKey: ""
 
-# -- passport data transfer configuration
-passport:
-  # -- passport versions and aspects allowed
-  aspects:
-    - "urn:bamm:io.catenax.generic.digital_product_passport:1.0.0#DigitalProductPassport"
-    - "urn:bamm:io.catenax.battery.battery_pass:3.0.1#BatteryPass"
-    - "urn:bamm:io.catenax.transmission.transmission_pass:1.0.0#TransmissionPass"
-
 digitalTwinRegistry:
   endpoints:
     search: "/lookup/shells"

dpp-backend/digitalproductpass/pom.xml

@@ -29,12 +29,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.eclipse.tractusx</groupId>
     <artifactId>digitalproductpass</artifactId>
-    <version>2.0.3</version>
+    <version>2.1.0</version>
     <packaging>jar</packaging>
     <name>Catena-X Digital Product Passport Backend</name>
     <description>Digital Product Passport Consumer Backend Reference Implementation System for Product Passport Consumer Frontend Application
@@ -179,7 +179,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.0.3</version>
+            <version>2.0.2</version>
         </dependency>
     </dependencies>
     <build>

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

@@ -32,6 +32,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
 import org.eclipse.tractusx.digitalproductpass.config.DtrConfig;
 import org.eclipse.tractusx.digitalproductpass.config.IrsConfig;
 import org.eclipse.tractusx.digitalproductpass.config.PassportConfig;
@@ -232,6 +233,7 @@ public Response getDigitalTwin(@RequestBody Object body, @PathVariable String pr
             ));
             String bpn =  dtr.getBpn();
             Boolean childrenCondition = search.getChildren();
+            processManager.saveDtr(processId, endpointId);
             processManager.saveTransferInfo(processId, connectorAddress, semanticId, dataPlaneUrl, bpn, childrenCondition);
             processManager.saveDigitalTwin(processId, digitalTwin, dtRequestTime);
 

dpp-backend/digitalproductpass/src/main/java/org/eclipse/tractusx/digitalproductpass/http/controllers/api/ApiController.java

@@ -150,22 +150,19 @@ public Response getData(@Valid @RequestBody TokenRequest tokenRequestBody) {
             }
 
             // Check if the contract id is correct
-            History history = status.getHistory("contract-dataset");
-            if (!history.getId().equals(contractId)) {
-                response = httpUtil.getBadRequest("This contract id is incorrect!");
-                return httpUtil.buildResponse(response, httpResponse);
-            }
-
+            Map<String, Dataset> availableContracts = processManager.loadDatasets(processId);
+            String seedId = String.join("|",availableContracts.keySet()); // Generate Seed
             // Check the validity of the token
-            String expectedToken = processManager.generateToken(process, contractId);
+            String expectedToken = processManager.generateToken(process, seedId);
             String token = tokenRequestBody.getToken();
             if (!expectedToken.equals(token)) {
                 response = httpUtil.getForbiddenResponse("The token is invalid!");
                 return httpUtil.buildResponse(response, httpResponse);
             }
+            Dataset dataset = availableContracts.get(contractId);
 
-            if (status.historyExists("contract-decline")) {
-                response = httpUtil.getForbiddenResponse("The contract for this passport has been declined!");
+            if (dataset == null) {
+                response.message = "The Contract Selected was not found!";
                 return httpUtil.buildResponse(response, httpResponse);
             }
 
@@ -187,7 +184,6 @@ public Response getData(@Valid @RequestBody TokenRequest tokenRequestBody) {
                 response = httpUtil.getNotFound("Failed to load passport!");
                 return httpUtil.buildResponse(response, httpResponse);
             }
-            Dataset dataset = processManager.loadDataset(processId);
             Map<String, Object> negotiation = processManager.loadNegotiation(processId);
             Map<String, Object> transfer = processManager.loadTransfer(processId);
             response = httpUtil.getResponse();