Merge branch 'release/openid4vc' into add-eudiplo-tests

Author: Magnus-Kuhn

.dev/compose.openid4vc.yml

@@ -0,0 +1,51 @@
+name: runtime-oid4vc-tests
+
+services:
+  oid4vc-service:
+    image: ghcr.io/js-soft/openid4vc-service:1.1.14@sha256:d8601d031769f2ce850bcfcea32da839c0d444ed90ad6d345d85d9d864f1620a
+    ports:
+      - "9000:9000"
+    platform: linux/amd64
+    environment:
+      authServer__baseUrl: "https://kc-openid4vc.is.enmeshed.eu/realms/enmeshed-openid4vci"
+    volumes:
+      - ./service-config.json:/usr/app/config.json
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    depends_on:
+      - mongodb
+    networks:
+      - default
+
+  connector:
+    image: ghcr.io/nmshd/connector:7.1.0-openid4vc.2@sha256:b8458560fa85b190485aa544d9db34ab7d0b6b7b88129eda487b723e201734f8
+    environment:
+      CUSTOM_CONFIG_LOCATION: "/config.json"
+      transportLibrary__baseUrl: "http://consumer-api:8080"
+      transportLibrary__platformClientId: test
+      transportLibrary__platformClientSecret: test
+      transportLibrary__addressGenerationHostnameOverride: localhost
+      database__connectionString: mongodb://root:example@mongodb:27017
+      infrastructure__httpServer__authentication__apiKey__keys__default__key: aVeryCoolApiKeyWith30CharactersOr+
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    depends_on:
+      - mongodb
+    networks:
+      - default
+      - local-test-backbone
+
+  mongodb:
+    image: mongo@sha256:c23684919810f0341e58744987e4b1c510fb8becdae850217d2d04b6fa7605e7
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+    networks:
+      - default
+
+networks:
+  default:
+    name: runtime-oid4vc-tests-network
+  local-test-backbone:
+    name: local-test-backbone
+    external: true

.dev/service-config.json

@@ -0,0 +1,23 @@
+{
+    "port": 9000,
+    "baseUrl": "http://127.0.0.1:9000",
+    "mongodb": {
+        "host": "mongodb",
+        "port": 27017,
+        "user": "root",
+        "password": "example"
+    },
+    "connector": {
+        "baseUrl": "http://connector:80",
+        "apiKey": "aVeryCoolApiKeyWith30CharactersOr+"
+    },
+    "customizing": {
+        "organization": {
+            "displayName": "js-soft AG",
+            "logoUrl": "http://127.0.0.1:9000/ui/img/js_soft.png"
+        }
+    },
+    "cors": {
+        "origin": "*"
+    }
+}

.github/workflows/test.yml

@@ -119,6 +119,12 @@ jobs:
       - uses: actions/checkout@v5
       - name: Start Backbone
         run: npm run start:backbone
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_USER_FOR_OID4VC_SERVICE_PULL }}
+          password: ${{ secrets.GHCR_PAT_FOR_OID4VC_SERVICE_PULL }}
       - uses: actions/setup-node@v6
         with:
           node-version: current
@@ -141,6 +147,12 @@ jobs:
       - uses: actions/checkout@v5
       - name: Start Backbone
         run: npm run start:backbone
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ secrets.GHCR_USER_FOR_OID4VC_SERVICE_PULL }}
+          password: ${{ secrets.GHCR_PAT_FOR_OID4VC_SERVICE_PULL }}
       - uses: actions/setup-node@v6
         with:
           node-version: current

package-lock.json

@@ -22,8 +22,10 @@
         "lint:prettier": "prettier --check .",
         "lint:tsc": "npm run --workspaces lint:tsc",
         "outdated": "ncu -i && ncu -i --workspaces",
-        "start:backbone": "docker compose -f .dev/compose.backbone.yml up -d",
+        "start:backbone": "docker compose -f .dev/compose.backbone.yml up -d --wait",
+        "start:openid4vc": "docker compose -f .dev/compose.openid4vc.yml up -d --wait",
         "teardown:backbone": "docker compose -f .dev/compose.backbone.yml down -v",
+        "teardown:openid4vc": "docker compose -f .dev/compose.openid4vc.yml down -v",
         "test:teardown": "docker compose -f .dev/compose.yml down -fsv",
         "postinstall": "patch-package && echo 'Postinstall done.'"
     },

package.json

@@ -86,8 +86,8 @@
         "@nmshd/core-types": "*",
         "@nmshd/iql": "^1.0.4",
         "@nmshd/transport": "*",
-        "@noble/ciphers": "^0.2.0",
-        "jose": "^6.0.13",
+        "@noble/ciphers": "^2.0.1",
+        "jose": "^6.1.1",
         "libsodium-wrappers": "^0.7.15",
         "lodash": "^4.17.21",
         "sjcl": "^1.0.8",

packages/consumption/package.json

@@ -1,15 +1,22 @@
-/* eslint-disable @typescript-eslint/naming-convention */
 import { AgentDependencies } from "@credo-ts/core";
 import { EventEmitter } from "events";
-import WebSocket from "ws";
+import { Agent, fetch as undiciFetch } from "undici";
+import webSocket from "ws";
 import { EnmeshedHolderFileSystem } from "./EnmeshedHolderFileSystem";
 
-const fetchImpl = globalThis.fetch;
-const webSocketImpl = WebSocket;
-
 export const agentDependencies: AgentDependencies = {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     FileSystem: EnmeshedHolderFileSystem,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
     EventEmitterClass: EventEmitter,
-    fetch: fetchImpl,
-    WebSocketClass: webSocketImpl
+    fetch: (async (input, init) => {
+        const response = await undiciFetch(input as any, {
+            ...(init as any),
+            dispatcher: new Agent({})
+        });
+
+        return response;
+    }) as typeof fetch,
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    WebSocketClass: webSocket
 };

packages/consumption/src/modules/openid4vc/local/LocalAgentDependencies.ts

@@ -25,7 +25,7 @@
         "test:ci:lokijs": "USE_LOKIJS=true jest -i --coverage",
         "test:ci:mongodb": "jest -i --coverage",
         "test:local:ferretdb": "npm run test:local:start:ferretdb && CONNECTION_STRING='mongodb://root:example@localhost:27022' jest",
-        "test:local:lokijs": "USE_LOKIJS=true jest -- openid4vc.test.ts",
+        "test:local:lokijs": "USE_LOKIJS=true jest",
         "test:local:mongodb": "npm run test:local:start:mongodb && CONNECTION_STRING='mongodb://root:example@localhost:27021' jest",
         "test:local:start:ferretdb": "docker compose -f ../../.dev/compose.yml up -d runtime-ferret",
         "test:local:start:mongodb": "docker compose -f ../../.dev/compose.yml up -d runtime-mongo",