PR remarks

Think-iT-Labs · Jul 28, 2023 · 20220b6 · 20220b6
1 parent 4e6da0d
commit 20220b6
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 899 deletions.
diff --git a/.github/workflows/pull-request-testing.yml b/.github/workflows/pull-request-testing.yml
@@ -39,6 +39,15 @@ jobs:
         with:
           node-version: '18.x'
 
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            */*/node_modules
+          key: yarn-deps-${{ hashFiles('**/yarn.lock') }}
+
+
       - name: Install dependencies
         run: |
           yarn

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@think-it-labs/edc-connector-client",
-  "version": "0.0.1-milestone-8.beta-5",
+  "version": "0.1.2",
   "description": "EDC Connector HTTP client",
   "private": false,
   "main": "dist/src/index.js",
@@ -20,8 +20,7 @@
   "license": "MIT",
   "dependencies": {
     "@think-it-labs/typed-error": "^0.1.4",
-    "jsonld": "^8.2.0",
-    "schema-dts-gen": "^1.1.2"
+    "jsonld": "^8.2.0"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^17.1.0",

diff --git a/src/controllers/management-controller.ts b/src/controllers/management-controller.ts
@@ -19,14 +19,17 @@ import {
   QuerySpec,
   TransferProcess,
   TransferProcessInput,
-  defaultContextValues,
+  EDC_CONTEXT,
 } from "../entities";
 import { Inner } from "../inner";
 import jsonld from "jsonld";
 
 export class ManagementController {
   #inner: Inner;
   protocol: String = "dataspace-protocol-http";
+  defaultContextValues = {
+    edc: EDC_CONTEXT,
+  };
 
   constructor(inner: Inner) {
     this.#inner = inner;
@@ -65,7 +68,7 @@ export class ManagementController {
         apiToken: context.apiToken,
         body: {
           ...input,
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
         },
       })
       .then((body) => jsonld.expand(body))
@@ -118,7 +121,7 @@ export class ManagementController {
           ? null
           : {
               ...query,
-              "@context": defaultContextValues,
+              "@context": this.defaultContextValues,
             },
     });
   }
@@ -134,7 +137,7 @@ export class ManagementController {
         apiToken: context.apiToken,
         body: {
           ...input,
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
         },
       })
       .then((body) => jsonld.expand(body))
@@ -177,7 +180,7 @@ export class ManagementController {
             ? null
             : {
                 ...query,
-                "@context": defaultContextValues,
+                "@context": this.defaultContextValues,
               },
       })
       .then((body) => jsonld.expand(body))
@@ -199,7 +202,7 @@ export class ManagementController {
         apiToken: context.apiToken,
         body: {
           ...input,
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
         },
       })
       .then((body) => jsonld.expand(body))
@@ -242,7 +245,7 @@ export class ManagementController {
             ? null
             : {
                 ...query,
-                "@context": defaultContextValues,
+                "@context": this.defaultContextValues,
               },
       })
       .then((body) => jsonld.expand(body))
@@ -263,7 +266,7 @@ export class ManagementController {
         method: "POST",
         apiToken: context.apiToken,
         body: {
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
           protocol: this.protocol,
           ...input,
         },
@@ -283,7 +286,7 @@ export class ManagementController {
         apiToken: context.apiToken,
         body: {
           protocol: this.protocol,
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
           ...input,
         },
       })
@@ -304,7 +307,7 @@ export class ManagementController {
           ? null
           : {
               ...query,
-              "@context": defaultContextValues,
+              "@context": this.defaultContextValues,
             },
     });
   }
@@ -391,7 +394,7 @@ export class ManagementController {
             ? null
             : {
                 ...query,
-                "@context": defaultContextValues,
+                "@context": this.defaultContextValues,
               },
       })
       .then((body) => jsonld.expand(body))
@@ -426,7 +429,7 @@ export class ManagementController {
         method: "POST",
         apiToken: context.apiToken,
         body: {
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
           protocol: this.protocol,
           ...input,
         },
@@ -444,9 +447,9 @@ export class ManagementController {
         path: "/v2/transferprocesses/request",
         method: "POST",
         apiToken: context.apiToken,
-        body: Object.keys(query).length === 0 ? null : {
+        body: {
           ...query,
-          "@context": defaultContextValues,
+          "@context": this.defaultContextValues,
         },
       })
       .then((body) => jsonld.expand(body))

diff --git a/src/entities/context.ts b/src/entities/context.ts
@@ -11,8 +11,3 @@ export interface ContextProperties {
 }
 
 export const EDC_CONTEXT = "https://w3id.org/edc/v0.0.1/ns/";
-
-type DefaultContextValues = Pick<Context, "edc">;
-export const defaultContextValues: DefaultContextValues = {
-  edc: EDC_CONTEXT,
-};
diff --git a/src/entities/data-address.ts b/src/entities/data-address.ts
@@ -1,5 +1,5 @@
 export interface BaseDataAddress {
-  [key: string]: string | undefined | any;
+  [key: string]: string | undefined;
   type: string;
 }
 

diff --git a/tests/controllers/public.test.ts b/tests/controllers/public.test.ts
@@ -83,9 +83,7 @@ describe("PublicController", () => {
         consumerContext,
       );
 
-      const receiverCallback = receiverServer.waitForEvent('endpoint-data-reference');
-
-      await edcClient.management.initiateTransfer(
+      const idResponse = await edcClient.management.initiateTransfer(
         consumerContext,
         {
           assetId,
@@ -97,7 +95,7 @@ describe("PublicController", () => {
         },
       );
 
-      const transferProcessResponse = await receiverCallback;
+      const transferProcessResponse = await receiverServer.waitForEvent(idResponse.id);
 
       // when
       const data = await edcClient.public.getTranferedData(consumerContext, {

diff --git a/tests/test-utils.ts b/tests/test-utils.ts
@@ -192,7 +192,9 @@ export function createReceiverServer() {
       },
     );
 
-    emitter.emit("endpoint-data-reference", body);
+    if (body.id) {
+      emitter.emit(body.id, body);
+    }
 
     res.statusCode = 204;
     res.end();