Merge branch 'develop' into feature/CWALL-253

Sphereon-Opensource · Oct 28, 2024 · a37f3e2 · a37f3e2
2 parents 46624fe + 0a48d0d
commit a37f3e2
Show file tree

Hide file tree

Showing 243 changed files with 19,842 additions and 12,985 deletions.
diff --git a/.github/workflows/build-test-on-pr.yml b/.github/workflows/build-test-on-pr.yml
@@ -5,6 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       VC_HTTP_API_AUTH_TOKEN: ${{secrets.VC_HTTP_API_AUTH_TOKEN}}
+      NODE_OPTIONS: --max_old_space_size=4096
     services:
       postgres:
         image: postgres:10.10
@@ -19,9 +20,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v4
         with:
-          version: 8
+          version: 9
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -47,4 +48,12 @@ jobs:
           SPHEREON_SSI_MSAL_USERNAME: ${{ secrets.SPHEREON_SSI_MSAL_USERNAME }}
           SPHEREON_SSI_MSAL_PASSWORD: ${{ secrets.SPHEREON_SSI_MSAL_PASSWORD }}
         run: pnpm test:ci
-      - run: npx codecov
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: false # optional (default = false)
+          files: ./coverage1.xml,./coverage2.xml # optional
+          flags: unittests # optional
+          name: codecov-umbrella # optional
+          token: ${{ secrets.CODECOV_TOKEN }} # required
+          verbose: true # optional (default = false)
+
diff --git a/.github/workflows/build-test-publish-on-push.yml b/.github/workflows/build-test-publish-on-push.yml
@@ -19,6 +19,7 @@ jobs:
       GH_USER: ${{secrets.GH_USER}}
       GH_EMAIL: ${{secrets.GH_EMAIL}}
       VC_HTTP_API_AUTH_TOKEN: ${{secrets.VC_HTTP_API_AUTH_TOKEN}}
+      NODE_OPTIONS: --max_old_space_size=4096
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -33,9 +34,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v4
         with:
-          version: 8
+          version: 9
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
@@ -71,23 +72,27 @@ jobs:
           echo "link-workspace-packages=deep" >> .npmrc
           echo "prefer-workspace-packages=true" >> .npmrc
 
-      #          npm whoami
-
       - name: show diff to track issues with lock file
         run: git diff -u
 
+      - name: Sets PREID
+        env:
+          name: "${{github.ref_name}}"
+        run: |
+          echo "PRE_ID=${name//[\/_-]/.}" >> $GITHUB_ENV
+
       - name: publish @latest when on main
         if: github.ref == 'refs/heads/main'
-        run: pnpm publish:latest
+        run: lerna publish --conventional-commits --force-publish --include-merged-tags --sync-dist-version --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org
 
       - name: publish @next when on develop
         if: github.ref == 'refs/heads/develop'
-        run: pnpm publish:next
+        run: lerna publish --conventional-prerelease --force-publish --canary --sync-dist-version --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org
 
       - name: publish @next when on fix branch
         if: startsWith(github.ref, 'refs/heads/fix')
-        run: pnpm publish:next
+        run: lerna publish --conventional-prerelease --force-publish --canary --sync-dist-version --no-git-tag-version --include-merged-tags --preid fix --pre-dist-tag fix --yes --registry https://registry.npmjs.org
 
       - name: publish @unstable when on unstable branch
         if: startsWith(github.ref, 'refs/heads/feat')
-        run: pnpm publish:unstable
+        run: lerna publish --conventional-prerelease --force-publish --canary --sync-dist-version --no-git-tag-version --include-merged-tags --preid $PRE_ID --pre-dist-tag unstable --yes --throttle-size 75 --registry https://registry.npmjs.org
diff --git a/.gitignore b/.gitignore
@@ -70,9 +70,14 @@ test/*.js
 /packages/issuance-branding/plugin.schema.json
 /packages/oid4vci-issuer-rest-client/plugin.schema.json
 /packages/xstate-persistence/plugin.schema.json
+/packages/credential-store/plugin.schema.json
+/packages/pd-manager/plugin.schema.json
 
 **/.env.energyshr
 **/.env.local
 /packages/web3-provider-headless/__tests__/config.json
 /packages/event-logger/plugin.schema.json
 /packages/public-key-hosting/__tests__/database/test.sqlite
+
+.nx/cache
+.nx/workspace-data
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.1](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.30.0...v0.30.1) (2024-10-01)
+
+### Bug Fixes
+
+- codecov ([e5a7eb7](https://github.com/Sphereon-Opensource/SSI-SDK/commit/e5a7eb771da447f09b0901d3570d7246a14888d4))
+- codecov ([bc65177](https://github.com/Sphereon-Opensource/SSI-SDK/commit/bc651778754e769c58de5fe225d429a7b1d01bd9))
+- fixes issuer signed flow ([44dabf4](https://github.com/Sphereon-Opensource/SSI-SDK/commit/44dabf46d5ea45db0ba3dc4d8e55343980011464))
+- lerna version ([789d4d5](https://github.com/Sphereon-Opensource/SSI-SDK/commit/789d4d551ecd2a7b1b7b9e0fe48cde64d01bb1ef))
+
 # [0.29.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.28.0...v0.29.0) (2024-08-01)
 
 ### Bug Fixes

diff --git a/jest.json b/jest.json
@@ -40,7 +40,7 @@
     "<rootDir>/packages/siopv2-oid4vp-rp-rest-api/.yalc/"
   ],
   "transformIgnorePatterns": [
-    "<rootDir>/node_modules/.pnpm/(?!(nist-weierstrauss|multiformatsgggggg|@digitalcredentials\\+vc-status-list)@)"
+    "<rootDir>/node_modules/.pnpm/(?!(nist-weierstrauss|multiformatsgggggg|@digitalcredentials\\+vc-status-list|valibot)@)"
   ],
   "testMatch": [
     "**/__tests__/**/*.test.*",

diff --git a/lerna.json b/lerna.json
@@ -1,12 +1,12 @@
 {
-  "version": "0.29.0",
+  "version": "0.30.1",
   "npmClient": "pnpm",
   "command": {
     "version": {
       "forcePublish": true
     },
     "publish": {
-      "allowBranch": ["main", "master"],
+      "allowBranch": ["main", "master", "feature/from-funke"],
       "conventionalCommits": true,
       "gitRemote": "origin",
       "message": "chore(release): %s"

diff --git a/nx.json b/nx.json
@@ -0,0 +1,18 @@
+{
+  "targetDefaults": {
+    "build": { "cache": true, "dependsOn": ["^build"], "outputs": ["{workspaceRoot}/coverage" ,"{projectRoot}/coverage", "{projectRoot}/dist"] },
+    "build:clean": { "dependsOn": [] },
+    "start:prod": { "dependsOn": ["build"] },
+    "start:dev": { "dependsOn": [] },
+    "generate-plugin-schema": { "dependsOn": [] },
+    "typeorm": { "dependsOn": [] },
+    "typeorm-sqlite:migration:generate": { "dependsOn": [] },
+    "typeorm-sqlite:migration:run": { "dependsOn": [] },
+    "typeorm-postgres:migration:generate": { "dependsOn": [] },
+    "typeorm-postgres:migration:run": { "dependsOn": [] },
+    "build:copyfilesdis": { "dependsOn": [] },
+    "start:energyshr": { "dependsOn": [] },
+    "start:dev2": { "dependsOn": [] }
+  },
+  "nxCloudId": "66ff23d99fb700eb0f2270df"
+}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/sphereon-sdk.workspace",
   "private": true,
-  "version": "0.28.0",
+  "version": "0.30.0",
   "description": "Sphereon SSI SDK (Workspace)",
   "repository": "[email protected]:Sphereon-Opensource/SSI-SDK.git",
   "author": "Sphereon <[email protected]>",
@@ -49,10 +49,9 @@
     "@babel/preset-typescript": "^7.24.7",
     "@types/debug": "^4.1.12",
     "@types/jest": "^27.5.2",
-    "@types/node": "^18.19.41",
+    "@types/node": "^20.17.1",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
-    "codecov": "^3.8.3",
     "cross-fetch": "^3.1.8",
     "did-jwt": "6.11.6",
     "eslint": "^8.57.0",
@@ -67,6 +66,7 @@
     "json-schema": "^0.4.0",
     "lerna": "^8.1.6",
     "lerna-changelog": "^2.2.0",
+    "nx": "^19.8.8",
     "oas-resolver": "^2.5.6",
     "openapi-types": "^12.1.3",
     "patch-package": "^8.0.0",
@@ -76,10 +76,10 @@
     "semantic-release": "^19.0.5",
     "ts-jest": "^27.1.5",
     "ts-node": "^10.9.2",
-    "typescript": "5.4.2"
+    "typescript": "5.6.3"
   },
   "engines": {
-    "node": ">= 20.0.0"
+    "node": ">= 20.0.0 < 22"
   },
   "prettier": {
     "endOfLine": "auto",
@@ -113,7 +113,8 @@
       "@veramo/url-handler": "4.2.0",
       "@sphereon/ssi-types": "workspace:*",
       "@sphereon/ssi-sdk.core": "workspace:*",
-      "@sphereon/pex": "^4.0.1",
+      "@sphereon/pex": "5.0.0-unstable.18",
+      "@sphereon/pex-models": "^2.3.1",
       "@noble/hashes": "1.2.0",
       "debug": "^4.3.5",
       "did-jwt": "6.11.6",
@@ -122,7 +123,9 @@
       "typeorm": "^0.3.20",
       "@transmute/jsonld": "^0.0.4",
       "jsonld": "npm:@digitalcredentials/jsonld@^6.0.0",
-      "node-fetch": "2.7.0"
+      "node-fetch": "2.7.0",
+      "typescript": "5.6.3",
+      "@types/node": "^20.17.1"
     },
     "patchedDependencies": {
       "@veramo/[email protected]": "patches/@[email protected]",

diff --git a/packages/agent-config/CHANGELOG.md b/packages/agent-config/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.1](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.30.0...v0.30.1) (2024-10-01)
+
+**Note:** Version bump only for package @sphereon/ssi-sdk.agent-config
+
 # [0.29.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.28.0...v0.29.0) (2024-08-01)
 
 ### Features

diff --git a/packages/agent-config/package.json b/packages/agent-config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.agent-config",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -37,5 +37,6 @@
     "Sphereon",
     "SSI",
     "Agent"
-  ]
+  ],
+  "nx": {}
 }
diff --git a/packages/agent-config/src/dataSources.ts b/packages/agent-config/src/dataSources.ts
@@ -126,14 +126,19 @@ export const getDbConnection = async (
   return DataSources.singleInstance().getDbConnection(connectionName)
 }
 
-export const dropDatabase = async (dbName: string): Promise<void> => {
+export const dropDatabase = async (dbName: string, opts?: {removeDataSource?: boolean}): Promise<void> => {
+  const {removeDataSource = false} = {...opts}
   if (!DataSources.singleInstance().has(dbName)) {
     return Promise.reject(Error(`No database present with name: ${dbName}`))
   }
 
   const connection: DataSource = await getDbConnection(dbName)
   await connection.dropDatabase()
-  DataSources.singleInstance().delete(dbName)
+  if (removeDataSource) {
+    DataSources.singleInstance().delete(dbName)
+  } else if (!connection.isInitialized) {
+      await connection.initialize()
+  }
 }
 
 /**

diff --git a/packages/contact-manager-rest-api/CHANGELOG.md b/packages/contact-manager-rest-api/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.1](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.30.0...v0.30.1) (2024-10-01)
+
+**Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager-rest-api
+
 # [0.29.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.28.0...v0.29.0) (2024-08-01)
 
 ### Features

diff --git a/packages/contact-manager-rest-api/__tests__/database/config.ts b/packages/contact-manager-rest-api/__tests__/database/config.ts
@@ -1,6 +1,6 @@
 import { DataStoreContactEntities } from '@sphereon/ssi-sdk.data-store'
 import { SqliteConnectionOptions } from 'typeorm/driver/sqlite/SqliteConnectionOptions'
-import { DataStoreContactMigrations } from '@sphereon/ssi-sdk.data-store/dist/migrations/generic'
+import { DataStoreContactMigrations } from '@sphereon/ssi-sdk.data-store'
 import { Entities as VeramoDataStoreEntities } from '@veramo/data-store'
 import { migrations as VeramoDataStoreMigrations } from '@veramo/data-store/build/migrations'
 

diff --git a/packages/contact-manager-rest-api/package.json b/packages/contact-manager-rest-api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.contact-manager-rest-api",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@sphereon/ssi-express-support": "workspace:*",
-    "@sphereon/ssi-sdk-ext.key-manager": "0.24.1-next.96",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-next.96",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.25.0",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.25.0",
     "@sphereon/ssi-sdk.contact-manager": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.data-store": "workspace:*",
@@ -42,7 +42,7 @@
     "@types/express": "^4.17.21",
     "@types/express-http-proxy": "^1.6.6",
     "@types/morgan": "^1.9.9",
-    "@types/node": "^18.19.41",
+    "@types/node": "^20.17.1",
     "@types/passport": "^1.0.16",
     "@types/passport-azure-ad": "^4.3.6",
     "@types/uuid": "^9.0.8",
@@ -79,5 +79,6 @@
     "contact-management",
     "REST",
     "API"
-  ]
+  ],
+  "nx": {}
 }
diff --git a/packages/contact-manager/CHANGELOG.md b/packages/contact-manager/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.1](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.30.0...v0.30.1) (2024-10-01)
+
+**Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager
+
 # [0.29.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.28.0...v0.29.0) (2024-08-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.contact-manager

diff --git a/packages/contact-manager/package.json b/packages/contact-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.contact-manager",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -44,5 +44,6 @@
     "Veramo",
     "OpenID",
     "Contact Manager"
-  ]
+  ],
+  "nx": {}
 }
diff --git a/packages/credential-store/CHANGELOG.md b/packages/credential-store/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.30.1](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.30.0...v0.30.1) (2024-10-01)
+
+**Note:** Version bump only for package @sphereon/ssi-sdk.credential-store
+
 # [0.29.0](https://github.com/Sphereon-Opensource/SSI-SDK/compare/v0.28.0...v0.29.0) (2024-08-01)
 
 **Note:** Version bump only for package @sphereon/ssi-sdk.credential-store