Merge remote-tracking branch 'origin/develop' into feature/VDX-316

Sphereon-Opensource · Jan 22, 2024 · 9ba138a · 9ba138a
2 parents 5bfdb41 + 77c9c24
commit 9ba138a
Show file tree

Hide file tree

Showing 10 changed files with 134 additions and 143 deletions.
diff --git a/.github/workflows/build-test-on-pr.yml b/.github/workflows/build-test-on-pr.yml
@@ -20,9 +20,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.18.0'
       - uses: pnpm/action-setup@v2
         with:
           version: 8

diff --git a/.github/workflows/build-test-publish-on-push.yml b/.github/workflows/build-test-publish-on-push.yml
@@ -34,9 +34,9 @@ jobs:
         with:
           fetch-depth: 0
       - name: Use Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.18.0'
       - uses: pnpm/action-setup@v2
         with:
           version: 8

diff --git a/package.json b/package.json
@@ -43,7 +43,7 @@
     "prettier": "^3.0.1",
     "rimraf": "^5.0.1",
     "ts-jest": "^29.1.1",
-    "typescript": "4.9.5"
+    "typescript": "5.3.3"
   },
   "keywords": [
     "Sphereon",

diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json
@@ -18,7 +18,7 @@
     "@sphereon/oid4vci-client": "workspace:*",
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/oid4vci-issuer": "workspace:*",
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-types": "^0.18.1",
     "jose": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@sphereon/oid4vci-common": "workspace:*",
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-types": "^0.18.1",
     "cross-fetch": "^3.1.8",
     "debug": "^4.3.4"
   },
@@ -44,11 +44,11 @@
     "open-cli": "^7.2.0",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
-    "typescript": "4.9.5",
-    "uint8arrays": "3.1.1"
+    "uint8arrays": "3.1.1",
+    "typescript": "5.3.3"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "lib/**/*",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -10,16 +10,16 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-types": "^0.18.1",
     "cross-fetch": "^3.1.8",
     "jwt-decode": "^3.1.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.3",
-    "typescript": "5.0.4"
+    "typescript": "5.3.3"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "lib/**/*",

diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json
@@ -13,15 +13,16 @@
   "dependencies": {
     "@sphereon/oid4vci-common": "workspace:*",
     "@sphereon/oid4vci-issuer": "workspace:*",
-    "@sphereon/ssi-express-support": "0.17.6-unstable.69",
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-express-support": "^0.18.1",
+    "@sphereon/ssi-types": "^0.18.1",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "dotenv-flow": "^3.2.0",
     "express": "^4.18.2",
     "http-terminator": "^3.2.0",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "typescript": "5.3.3"
   },
   "devDependencies": {
     "@digitalcredentials/did-method-key": "^2.0.3",
@@ -42,7 +43,7 @@
     "ts-jest": "^29.1.0"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "lib/**/*",

diff --git a/packages/issuer/lib/VcIssuer.ts b/packages/issuer/lib/VcIssuer.ts
@@ -255,6 +255,8 @@ export class VcIssuer<DIDDoc extends object> {
 
       const { preAuthSession, authSession, cNonceState, jwtVerifyResult } = validated
       const did = jwtVerifyResult.did
+      const jwk = jwtVerifyResult.jwk
+      const kid = jwtVerifyResult.kid
       const newcNonce = opts.newCNonce ? opts.newCNonce : v4()
       const newcNonceState = {
         cNonce: newcNonce,
@@ -305,20 +307,28 @@ export class VcIssuer<DIDDoc extends object> {
       if (!credential) {
         throw Error('A credential needs to be supplied at this point')
       }
-      if (did) {
-        if (CredentialMapper.isSdJwtDecodedCredentialPayload(credential)) {
-          credential.sub = did
-        } else {
-          const credentialSubjects = Array.isArray(credential.credentialSubject) ? credential.credentialSubject : [credential.credentialSubject]
-          credentialSubjects.map((subject) => {
-            if (!subject.id) {
-              subject.id = did
-            }
-            return subject
-          })
-          credential.credentialSubject = Array.isArray(credential.credentialSubject) ? credentialSubjects : credentialSubjects[0]
+      // Bind credential to the provided proof of possession
+      if (CredentialMapper.isSdJwtDecodedCredentialPayload(credential) && (kid || jwk) && !credential.cnf) {
+        if (kid) {
+          credential.cnf = {
+            kid,
+          }
+        } else if (jwk) {
+          credential.cnf = {
+            jwk,
+          }
         }
       }
+      if (did && !CredentialMapper.isSdJwtDecodedCredentialPayload(credential)) {
+        const credentialSubjects = Array.isArray(credential.credentialSubject) ? credential.credentialSubject : [credential.credentialSubject]
+        credentialSubjects.map((subject) => {
+          if (!subject.id) {
+            subject.id = did
+          }
+          return subject
+        })
+        credential.credentialSubject = Array.isArray(credential.credentialSubject) ? credentialSubjects : credentialSubjects[0]
+      }
 
       const verifiableCredential = await this.issueCredentialImpl(
         {
@@ -418,8 +428,10 @@ export class VcIssuer<DIDDoc extends object> {
   }) {
     let preAuthorizedCode: string | undefined
     let issuerState: string | undefined
+
+    const supportedIssuanceFormats = ['jwt_vc_json', 'jwt_vc_json-ld', 'vc+sd-jwt', 'ldp_vc']
     try {
-      if (credentialRequest.format !== 'jwt_vc_json' && credentialRequest.format !== 'jwt_vc_json-ld' && credentialRequest.format !== 'vc+sd-jwt') {
+      if (!supportedIssuanceFormats.includes(credentialRequest.format)) {
         throw Error(`Format ${credentialRequest.format} not supported yet`)
       } else if (typeof this._jwtVerifyCallback !== 'function' && typeof jwtVerifyCallback !== 'function') {
         throw new Error(JWT_VERIFY_CONFIG_ERROR)

diff --git a/packages/issuer/package.json b/packages/issuer/package.json
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@sphereon/oid4vci-common": "workspace:*",
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-types": "^0.18.1",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
@@ -27,10 +27,11 @@
     "@types/jest": "^29.5.3",
     "@types/node": "^18.17.3",
     "@types/uuid": "^9.0.2",
-    "did-resolver": "^4.1.0"
+    "did-resolver": "^4.1.0",
+    "typescript": "5.3.3"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "lib/**/*",