diff --git a/.dev/eudiplo/config/test/issuance/issuance.json b/.dev/eudiplo/config/test/issuance/issuance.json index 13655570f..e38d65a13 100644 --- a/.dev/eudiplo/config/test/issuance/issuance.json +++ b/.dev/eudiplo/config/test/issuance/issuance.json @@ -15,7 +15,6 @@ "issuer": "https://kc-openid4vc.frosch.work/realms/enmeshed-openid4vci" } ], - "preferredAuthServer": "authorization-server:test-built-in", "batchSize": 1, "dPopRequired": false, "display": [ diff --git a/.dev/eudiplo/config/test/presentation/test.json b/.dev/eudiplo/config/test/presentation/test.json index b417622bc..6ffacc73f 100644 --- a/.dev/eudiplo/config/test/presentation/test.json +++ b/.dev/eudiplo/config/test/presentation/test.json @@ -10,6 +10,6 @@ } ] }, - "accessCertId": "f712261e-70aa-459d-af79-330c86bd0711", + "accessKeyChainId": "c02bae13-e5a5-42fd-94bd-c6999f5e4b45", "lifeTime": 300 } diff --git a/.dev/eudiplo/startEudiplo.ts b/.dev/eudiplo/startEudiplo.ts index 678631808..4420d61ce 100644 --- a/.dev/eudiplo/startEudiplo.ts +++ b/.dev/eudiplo/startEudiplo.ts @@ -2,7 +2,7 @@ import { GenericContainer, StartedTestContainer, Wait } from "testcontainers"; import { fileURLToPath } from "url"; export async function startEudiplo(): Promise { - return await new GenericContainer("ghcr.io/openwallet-foundation/eudiplo:6.1.0@sha256:1aa0fd250d40c88f842dd5853dba81f87b75bc435b486b79e0789ed9297440ce") + return await new GenericContainer("ghcr.io/openwallet-foundation/eudiplo:7.2.0@sha256:9ea50673acaa8a69bea2043c3abba5c38bc1a994dafa5a2484e72b5d003fd7d1") .withEnvironment({ PUBLIC_URL: "http://localhost:3000", // eslint-disable-line @typescript-eslint/naming-convention MASTER_SECRET: "OgwrDcgVQQ2yZwcFt7kPxQm3nUF+X3etF6MdLTstZAY=", // eslint-disable-line @typescript-eslint/naming-convention diff --git a/.github/renovate.json b/.github/renovate.json index b8ae3568a..a9346f4c1 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -1,5 +1,23 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": ["github>js-soft/renovate-config"], - "reviewers": ["team:npm-dependency-update-reviewers"] + "reviewers": ["team:npm-dependency-update-reviewers"], + "customManagers": [ + { + "customType": "regex", + "description": "Update EUDIPLO image when used in test containers", + "managerFilePatterns": ["/\\.ts$/"], + "matchStrings": ["new GenericContainer\\(\"(?ghcr\\.io/openwallet-foundation/eudiplo):(?[^\"@]+)@(?sha256:[a-f0-9]+)\"\\)"], + "datasourceTemplate": "docker", + "versioningTemplate": "docker" + } + ], + "packageRules": [ + { + "description": "Update the EUDIPLO SDK and testcontainer image together", + "matchPackageNames": ["@eudiplo/sdk-core", "ghcr.io/openwallet-foundation/eudiplo"], + "groupName": "EUDIPLO", + "groupSlug": "eudiplo" + } + ] } diff --git a/package-lock.json b/package-lock.json index 3d7a72f84..f2a6d36c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2419,9 +2419,9 @@ } }, "node_modules/@eudiplo/sdk-core": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/@eudiplo/sdk-core/-/sdk-core-6.2.0.tgz", - "integrity": "sha512-K2aAl/XNacJJdnTX4N3ZK6eq4iBN7vxBQBWez+ctyMSOqwTlShGB6YeKje6yqebK1PB5oZxsBEkKju+Rprq2vA==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@eudiplo/sdk-core/-/sdk-core-7.0.1.tgz", + "integrity": "sha512-zEaZuwgkKfxHvrb7MibEm8YUdlx/GBdr3J6totn2R8sH8GNXOvF8N9c66+rMhaeuAxk+0gFDCyyG8s+Eou1g6Q==", "dev": true, "license": "Apache-2.0", "engines": { @@ -15122,7 +15122,7 @@ "lodash": "^4.18.1" }, "devDependencies": { - "@eudiplo/sdk-core": "6.2.0", + "@eudiplo/sdk-core": "7.0.1", "@js-soft/node-logger": "1.2.10", "@types/lodash": "4.17.25", "@types/lokijs": "1.5.14", @@ -15216,7 +15216,7 @@ "ts-simple-nameof": "^1.3.3" }, "devDependencies": { - "@eudiplo/sdk-core": "6.2.0", + "@eudiplo/sdk-core": "7.0.1", "@js-soft/docdb-access-loki": "1.4.3", "@js-soft/docdb-access-mongo": "1.4.3", "@js-soft/node-logger": "1.2.10", diff --git a/package.json b/package.json index b3e16cd24..91ad9adda 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "lint:tsc": "npm run --workspaces lint:tsc", "outdated": "ncu -i && ncu -i --workspaces", "start:backbone": "docker compose -f .dev/compose.backbone.yml up -d --wait", - "start:openid4vc": "docker run --rm --name eudiplo --add-host host.docker.internal:host-gateway -p 3000:3000 -e PUBLIC_URL=http://localhost:3000 -e MASTER_SECRET='OgwrDcgVQQ2yZwcFt7kPxQm3nUF+X3etF6MdLTstZAY=' -e AUTH_CLIENT_ID='root' -e AUTH_CLIENT_SECRET='test' -e CONFIG_IMPORT=true -e CONFIG_FOLDER=/app/assets/config -e PORT=3000 -v \"$(pwd)/.dev/eudiplo/config:/app/assets/config\" ghcr.io/openwallet-foundation/eudiplo:6.1.0@sha256:1aa0fd250d40c88f842dd5853dba81f87b75bc435b486b79e0789ed9297440ce", "teardown:backbone": "docker compose -f .dev/compose.backbone.yml down -v", "teardown:openid4vc": "docker rm -f eudiplo", "test:teardown": "docker compose -f .dev/compose.yml down -fsv" diff --git a/packages/app-runtime/package.json b/packages/app-runtime/package.json index 93ae5d218..956908b9c 100644 --- a/packages/app-runtime/package.json +++ b/packages/app-runtime/package.json @@ -71,7 +71,7 @@ "lodash": "^4.18.1" }, "devDependencies": { - "@eudiplo/sdk-core": "6.2.0", + "@eudiplo/sdk-core": "7.0.1", "@js-soft/node-logger": "1.2.10", "@types/lodash": "4.17.25", "@types/lokijs": "1.5.14", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 53f8a4b8d..4150f259c 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -95,7 +95,7 @@ "ts-simple-nameof": "^1.3.3" }, "devDependencies": { - "@eudiplo/sdk-core": "6.2.0", + "@eudiplo/sdk-core": "7.0.1", "@js-soft/docdb-access-loki": "1.4.3", "@js-soft/docdb-access-mongo": "1.4.3", "@js-soft/node-logger": "1.2.10",