Merge branch 'feature/from-funke' into fix/SPRIND-60

# Conflicts:
#	packages/presentation-exchange/src/functions.ts
#	packages/sd-jwt/src/action-handler.ts
#	packages/siopv2-oid4vp-op-auth/src/session/OID4VP.ts

lerna.json

@@ -1,12 +1,16 @@
 {
-  "version": "0.29.0",
+  "version": "0.30",
   "npmClient": "pnpm",
   "command": {
     "version": {
       "forcePublish": true
     },
     "publish": {
-      "allowBranch": ["main", "master"],
+      "allowBranch": [
+        "main",
+        "master",
+        "feature/from-funke"
+      ],
       "conventionalCommits": true,
       "gitRemote": "origin",
       "message": "chore(release): %s"

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]>",
@@ -23,7 +23,8 @@
     "build-clean": "rimraf --glob ./packages/*/dist ./packages/*/api ./packages/*/node_modules ./packages/*/tsconfig.tsbuildinfo ./node_modules ./coverage && jest --clearCache",
     "publish:latest": "lerna publish --conventional-commits --force-publish --include-merged-tags --sync-dist-version --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org",
     "publish:next": "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",
-    "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --sync-dist-version --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org"
+    "publish:unstable.bak": "lerna publish --conventional-prerelease --force-publish --canary --sync-dist-version --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org",
+    "publish:unstable": "lerna publish 0.30.1-unstable.5 --force-publish --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org"
   },
   "publishConfig": {
     "access": "public"
@@ -113,7 +114,7 @@
       "@veramo/url-handler": "4.2.0",
       "@sphereon/ssi-types": "workspace:*",
       "@sphereon/ssi-sdk.core": "workspace:*",
-      "@sphereon/pex": "4.1.1-unstable.1",
+      "@sphereon/pex": "5.0.0-unstable.7",
       "@sphereon/pex-models": "^2.3.1",
       "@noble/hashes": "1.2.0",
       "debug": "^4.3.5",

packages/agent-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.agent-config",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

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.0",
   "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-unstable.112",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.112",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.124",
     "@sphereon/ssi-sdk.contact-manager": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.data-store": "workspace:*",

packages/contact-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.contact-manager",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/credential-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.credential-store",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     "generate-plugin-schema": "ts-node ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/pex": "4.1.1-unstable.1",
+    "@sphereon/pex": "5.0.0-unstable.7",
     "@sphereon/pex-models": "^2.3.1",
     "@sphereon/ssi-sdk.data-store": "workspace:*",
     "cross-fetch": "^3.1.8",

packages/data-store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,9 +14,9 @@
     "typeorm-postgres:migration:run": "pnpm run typeorm -- migration:run -c migration-postgres"
   },
   "dependencies": {
-    "@sphereon/pex": "4.1.1-unstable.1",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.24.1-unstable.112",
+    "@sphereon/pex": "5.0.0-unstable.7",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.24.1-unstable.124",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/kmp-mdl-mdoc": "0.2.0-SNAPSHOT.22",
     "@sphereon/ssi-sdk.core": "workspace:*",

packages/data-store/src/statusList/StatusListStore.ts

@@ -29,10 +29,10 @@ export class StatusListStore implements IStatusListStore {
   }
 
   /**
-   * Get's the available status list indices from the provided indices. Meaning it will filter out any index that is already known.
+   * Gets the available status list indices from the provided indices. Meaning it will filter out any index that is already known.
    *
    * The idea is that the caller provides a set of random status list indices. We can relatively easy check against the DB in an optimized way.
-   * If the status list is large it is probably best ot also provide at least a good number of indices. So something like 10 or 20 values.
+   * If the status list is large it is probably best to also provide at least a good number of indices. So something like 10 or 20 values.
    * Callers are also expected to call this function multiple times if it does not yield results
    *
    * @param args
@@ -169,11 +169,10 @@ export class StatusListStore implements IStatusListStore {
     const where = []
     if (args.id) {
       where.push({ id: args.id })
-    }
-    if (args.correlationId) {
+    } else if (args.correlationId) {
       where.push({ correlationId: args.correlationId })
     }
-    const result = await (await this.getStatusListRepo()).findOne({ where })
+    const result = await (await this.getStatusListRepo()).findOne({where})
     if (!result) {
       throw Error(`No status list found for id ${args.id}`)
     }
@@ -224,7 +223,7 @@ export class StatusListStore implements IStatusListStore {
   }
 
   private async getDS(): Promise<DataSource> {
-    return await this._dbConnection
+    return this._dbConnection
   }
 
   async getStatusListRepo(): Promise<Repository<StatusListEntity>> {

packages/dev/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.dev",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "lib/index.ts",
   "exports": {
     ".": {

packages/ebsi-support/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.ebsi-support",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,15 +15,15 @@
   },
   "dependencies": {
     "@ethersproject/random": "^5.7.0",
-    "@sphereon/did-auth-siop": "0.16.1-unstable.34",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-unstable.34",
-    "@sphereon/pex": "4.1.1-unstable.1",
+    "@sphereon/did-auth-siop": "0.16.1-unstable.68",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-unstable.68",
+    "@sphereon/pex": "5.0.0-unstable.7",
     "@sphereon/pex-models": "^2.3.1",
-    "@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.112",
+    "@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.124",
     "@sphereon/ssi-sdk.contact-manager": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.oid4vci-holder": "workspace:*",
@@ -44,11 +44,11 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-unstable.34",
-    "@sphereon/oid4vci-common": "0.16.1-unstable.34",
+    "@sphereon/oid4vci-client": "0.16.1-unstable.68",
+    "@sphereon/oid4vci-common": "0.16.1-unstable.68",
     "@sphereon/ssi-express-support": "workspace:*",
-    "@sphereon/ssi-sdk-ext.key-manager": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.kms-local": "0.24.1-unstable.112",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.kms-local": "0.24.1-unstable.124",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/ssi-sdk.data-store": "workspace:*",
     "@sphereon/ssi-sdk.public-key-hosting": "workspace:*",

packages/ebsi-support/src/did/EbsiDidProvider.ts

@@ -81,7 +81,7 @@ export class EbsiDidProvider extends AbstractIdentifierProvider {
     const secp256r1ManagedKeyInfo = await context.agent.keyManagerImport(secp256r1ImportKey)
 
     const identifier: IIdentifier = {
-      did: `${EBSI_DID_SPEC_INFOS.V1.method}${methodSpecificId}`,
+      did: options.did && options.did.startsWith('did:ebsi:') ? options.did : `${EBSI_DID_SPEC_INFOS.V1.method}${methodSpecificId}`,
       controllerKeyId: secp256k1ManagedKeyInfo.kid,
       keys: [secp256k1ManagedKeyInfo, secp256r1ManagedKeyInfo],
       alias,

packages/ebsi-support/src/did/types.ts

@@ -84,6 +84,7 @@ export type EbsiCreateIdentifierOpts = {
   rpcId?: number
   secp256k1Key?: IKeyOpts
   secp256r1Key?: IKeyOpts
+  did?: string
   keys?: IKeyOpts[] // additional importable keys, but only in case execute ledger is true
   executeLedgerOperation?: boolean // Whether to persist on the EBSI ledger. By default looks at whether access token opts are set or not
   baseDocument?: string

packages/event-logger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.event-logger",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/issuance-branding/__tests__/shared/issuanceBrandingAgentLogic.ts

@@ -2,17 +2,17 @@ import { TAgent } from '@veramo/core'
 import { IIssuanceBranding } from '../../src'
 import {
   IBasicCredentialBranding,
-  ICredentialBranding,
-  ILocaleBranding,
-  IUpdateCredentialLocaleBrandingArgs,
-  ICredentialLocaleBranding,
   IBasicCredentialLocaleBranding,
   IBasicIssuerBranding,
+  IBasicIssuerLocaleBranding,
+  ICredentialBranding,
+  ICredentialLocaleBranding,
   IIssuerBranding,
   IIssuerLocaleBranding,
+  ILocaleBranding,
+  IUpdateCredentialLocaleBrandingArgs,
   IUpdateIssuerLocaleBrandingArgs,
-  IBasicIssuerLocaleBranding,
-} from '../../../data-store/src'
+} from '@sphereon/ssi-sdk.data-store'
 
 type ConfiguredAgent = TAgent<IIssuanceBranding>
 
@@ -384,7 +384,7 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const fromDb: ICredentialBranding = await agent.ibAddCredentialBranding(credentialBranding)
       expect(fromDb).toBeDefined()
 
-      const result: Array<ICredentialLocaleBranding> = await agent.ibGetCredentialLocaleBranding({ filter: [{ id: 'unknownId' }] })
+      const result = await agent.ibGetCredentialLocaleBranding({ filter: [{ id: 'unknownId' }] })
 
       expect(result).toBeDefined()
       expect(result?.length).toEqual(0)

packages/issuance-branding/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.issuance-branding",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/issuance-branding/tsconfig.json

@@ -15,6 +15,9 @@
     },
     {
       "path": "../agent-config"
+    },
+    {
+      "path": "../ssi-types"
     }
   ]
 }

packages/kv-store/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-sdk.kv-store-temp",
   "description": "Key Value Store plugin",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/mdl-mdoc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.mdl-mdoc",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,12 +14,12 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-unstable.34",
-    "@sphereon/pex": "4.1.1-unstable.1",
+    "@sphereon/did-auth-siop": "0.16.1-unstable.68",
+    "@sphereon/pex": "5.0.0-unstable.7",
     "@sphereon/pex-models": "^2.3.1",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.x509-utils": "0.24.1-unstable.112",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.x509-utils": "0.24.1-unstable.124",
     "@sphereon/kmp-mdl-mdoc": "0.2.0-SNAPSHOT.22",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-types": "workspace:*",
@@ -35,11 +35,11 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-unstable.34",
-    "@sphereon/oid4vci-common": "0.16.1-unstable.34",
+    "@sphereon/oid4vci-client": "0.16.1-unstable.68",
+    "@sphereon/oid4vci-common": "0.16.1-unstable.68",
     "@sphereon/ssi-express-support": "workspace:*",
-    "@sphereon/ssi-sdk-ext.key-manager": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.kms-local": "0.24.1-unstable.112",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.kms-local": "0.24.1-unstable.124",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/ssi-sdk.data-store": "workspace:*",
     "@sphereon/ssi-sdk.public-key-hosting": "workspace:*",

packages/ms-authenticator/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.ms-authenticator",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/ms-request-api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.ms-request-api",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

packages/oid4vci-holder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.oid4vci-holder",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,12 +14,12 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-unstable.34",
-    "@sphereon/oid4vci-common": "0.16.1-unstable.34",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.24.1-unstable.112",
-    "@sphereon/ssi-sdk-ext.jwt-service": "0.24.1-unstable.112",
+    "@sphereon/oid4vci-client": "0.16.1-unstable.68",
+    "@sphereon/oid4vci-common": "0.16.1-unstable.68",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.24.1-unstable.124",
+    "@sphereon/ssi-sdk-ext.jwt-service": "0.24.1-unstable.124",
     "@sphereon/ssi-sdk.contact-manager": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.credential-store": "workspace:*",
@@ -39,7 +39,7 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.24.1-unstable.112",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.24.1-unstable.124",
     "@types/i18n-js": "^3.8.9",
     "@types/lodash.memoize": "^4.1.9",
     "@types/uuid": "^9.0.8",