Merge pull request #210 from Sphereon-Opensource/feature/DIIPv4

feature/DIIPv4

Author: sanderPostma

README.md

@@ -7,7 +7,7 @@
 
 [![CI](https://github.com/Sphereon-Opensource/OID4VC/actions/workflows/build-test-on-pr.yml/badge.svg)](https://github.com/Sphereon-Opensource/OID4VC/actions/workflows/build-test-on-pr.yml) [![codecov](https://codecov.io/gh/Sphereon-Opensource/OID4VC/branch/develop/graph/badge.svg)](https://codecov.io/gh/Sphereon-Opensource/OID4VC) [![NPM Version](https://img.shields.io/npm/v/@sphereon/oid4vci-client.svg)](https://npm.im/@sphereon/oid4vci-client)
 
-_IMPORTANT the packages are still in an early development stage, which means that breaking changes are to be expected_
+_IMPORTANT the packages are still in an early development stage, which means that breaking changes are to be expected The current branch only supports OID4VCI draft v15, for draft v13 and lower use branch archive/draft-v13-support_
 
 # Background
 

package.json

@@ -13,9 +13,9 @@
     "fix:lint": "biome lint --error-on-warnings",
     "fix:prettier": "biome format --write",
     "build": "turbo run build",
-    "test:ci": "vitest run --config ./vitest.config.ts --coverage",
+    "test:ci": "vitest run --config vitest.config.mts --coverage",
     "test": "turbo run test:vitest",
-    "test:vitest": "vitest run --config ./vitest.config.ts --coverage",
+    "test:vitest": "vitest run --config vitest.config.mts --coverage",
     "clean": "rimraf --glob **/dist **/.turbo **/.tsup **/coverage **/pnpm-lock.yaml packages/**/node_modules node_modules packages/**/tsconfig.tsbuildinfo",
     "publish:latest": "lerna publish --conventional-commits --include-merged-tags --create-release github --yes --dist-tag latest --registry https://registry.npmjs.org",
     "publish:next": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid next --pre-dist-tag next --yes --registry https://registry.npmjs.org",
@@ -26,8 +26,8 @@
     "pnpm": ">=10"
   },
   "resolutions": {
-    "@sphereon/ssi-types": "0.34.1-next.3",
-    "dcql": "0.2.22",
+    "@sphereon/ssi-types": "0.34.1-feature.DIIPv4.245",
+    "dcql": "1.0.1",
     "node-fetch": "2.6.12",
     "typescript": "5.8.3"
   },
@@ -51,6 +51,12 @@
     "typescript": "5.8.3",
     "vitest": "^3.1.1"
   },
+  "pnpm": {
+    "patchedDependencies": {
+      "did-jwt@6.11.6": "patches/did-jwt@6.11.6.patch",
+      "dcql@1.0.1": "patches/dcql@1.0.1.patch"
+    }
+  },
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",

packages/callback-example/lib/IssuerCallback.ts

@@ -3,7 +3,7 @@ import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020
 import { Ed25519VerificationKey2020 } from '@digitalcredentials/ed25519-verification-key-2020'
 import { securityLoader } from '@digitalcredentials/security-document-loader'
 import vc from '@digitalcredentials/vc'
-import { CredentialRequest, CredentialRequestV1_0_11 } from '@sphereon/oid4vci-common'
+import { CredentialRequest } from '@sphereon/oid4vci-common'
 import { CredentialIssuanceInput } from '@sphereon/oid4vci-issuer'
 import { CompactSdJwtVc, W3CVerifiableCredential } from '@sphereon/ssi-types'
 
@@ -14,27 +14,7 @@ export const generateDid = async () => {
   return { didDocument, keyPairs, methodFor }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const getIssuerCallbackV1_0_11 = (credential: CredentialIssuanceInput, keyPair: any, verificationMethod: string) => {
-  if (!credential) {
-    throw new Error('A credential needs to be provided')
-  }
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  return async (_opts: {
-    credentialRequest?: CredentialRequestV1_0_11
-    credential?: CredentialIssuanceInput
-  }): Promise<W3CVerifiableCredential | CompactSdJwtVc> => {
-    const documentLoader = securityLoader().build()
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const verificationKey: any = Array.from(keyPair.values())[0]
-    const keys = await Ed25519VerificationKey2020.from({ ...verificationKey })
-    const suite = new Ed25519Signature2020({ key: keys })
-    suite.verificationMethod = verificationMethod
-    return await vc.issue({ credential, suite, documentLoader })
-  }
-}
-
-export const getIssuerCallbackV1_0_13 = (
+export const getIssuerCallbackV1_0_15 = (
   credential: CredentialIssuanceInput,
   credentialRequest: CredentialRequest,
   keyPair: any,