build(deps): bump edc from 0.3.1 to 0.4.1 in /connector

connector/gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 format.version = "1.1"
 
 [versions]
-edc = "0.3.1"
+edc = "0.4.1"
 shadow = "8.1.1"
 
 [libraries]

src/entities/catalog.ts

@@ -2,7 +2,7 @@ import { QuerySpec } from ".";
 import { JsonLdId } from "./jsonld";
 
 export interface CatalogRequest {
-  providerUrl: string;
+  counterPartyAddress: string;
   querySpec?: QuerySpec;
 }
 
@@ -33,6 +33,7 @@ export class Offer extends JsonLdId {
   }
 
   get target(): string {
-    return this.mandatoryValue('odrl', 'target');
+    const target = this.nestedOf(() => new JsonLdId(), 'odrl', 'target');
+    return target?.id!!;
   }
 }

src/entities/contract-negotiation.ts

@@ -1,14 +1,9 @@
 import { JsonLdId, JsonLdObject } from "./jsonld";
 
 export interface ContractNegotiationRequest {
-  connectorAddress: string;
-  connectorId: string;
+  counterPartyAddress: string;
   providerId: string;
-  offer: {
-    offerId: string;
-    assetId: string;
-    policy: any;
-  };
+  policy: any;
 }
 
 export class ContractNegotiation extends JsonLdId {

src/entities/transfer-process.ts

@@ -73,7 +73,7 @@ export enum TransferProcessStates {
 
 export interface TransferProcessInput {
   assetId: string;
-  connectorAddress: string;
+  counterPartyAddress: string;
   connectorId: string;
   contractId: string;
   dataDestination: DataAddress;

src/inner.ts

@@ -70,41 +70,37 @@ export class Inner {
         return response;
       }
 
+      const errorMessage = await response.text();
+
       switch (response.status) {
         case 400: {
           const error = new EdcConnectorClientError(
             EdcConnectorClientErrorType.BadRequest,
-            "request was malformed",
+            "request was malformed: " + errorMessage,
           );
 
-          error.body = await response.text();
-
           throw error;
         }
         case 404: {
           const error = new EdcConnectorClientError(
             EdcConnectorClientErrorType.NotFound,
-            "resource not found",
+            "resource not found: " + errorMessage,
           );
 
-          error.body = await response.text();
-
           throw error;
         }
         case 409: {
           const error = new EdcConnectorClientError(
             EdcConnectorClientErrorType.Duplicate,
-            "duplicated resource",
+            "duplicated resource: " + errorMessage,
           );
 
-          error.body = await response.text();
-
           throw error;
         }
         default: {
           throw new EdcConnectorClientError(
             EdcConnectorClientErrorType.Unknown,
-            await response.text(),
+            errorMessage,
           );
         }
       }

tests/controllers/management-tests/catalog.test.ts

@@ -65,7 +65,7 @@ describe("CatalogController", () => {
       // when
       const catalog = await consumerManagement.catalog.request(
         {
-          providerUrl: providerProtocolUrl,
+          counterPartyAddress: providerProtocolUrl,
         },
       );
 
@@ -119,7 +119,7 @@ describe("CatalogController", () => {
       );
       const catalog = await consumerManagement.catalog.request(
         {
-          providerUrl: providerProtocolUrl,
+          counterPartyAddress: providerProtocolUrl,
         },
       );
 

tests/controllers/management-tests/transfer-processes.test.ts

@@ -102,7 +102,7 @@ describe("TransferProcessController", () => {
       {
         assetId,
         connectorId: "provider",
-        connectorAddress: provider.addresses.protocol!,
+        counterPartyAddress: provider.addresses.protocol!,
         contractId: contractAgreement.id,
         dataDestination: { type: "HttpProxy" },
       },

tests/controllers/public.test.ts

@@ -67,7 +67,7 @@ describe("PublicController", () => {
         {
           assetId,
           connectorId: "provider",
-          connectorAddress: provider.addresses.protocol!,
+          counterPartyAddress: provider.addresses.protocol!,
           contractId: contractAgreement.id,
           dataDestination: { type: "HttpProxy" },
         },

tests/test-utils.ts

@@ -102,7 +102,7 @@ export async function createContractNegotiation(
 
   // Retrieve catalog and select contract offer
   const catalog = await consumer.management.catalog.request({
-    providerUrl: provider.addresses.protocol!,
+    counterPartyAddress: provider.addresses.protocol!,
   });
 
   const offer = catalog.datasets
@@ -112,14 +112,9 @@ export async function createContractNegotiation(
   // Initiate contract negotiation on the consumer's side
   const idResponse = await consumer.management.contractNegotiations.initiate(
     {
-      connectorAddress: provider.addresses.protocol!,
-      connectorId: "provider",
+      counterPartyAddress: provider.addresses.protocol!,
       providerId: "provider",
-      offer: {
-        offerId: offer.id,
-        assetId: assetId,
-        policy: offer,
-      },
+      policy: offer
     },
   );