feat: Correct submission_data when send in incorrectly as string

Sphereon-Opensource · Jan 22, 2024 · c5d6b76 · c5d6b76
1 parent 1ae4b94
commit c5d6b76
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/packages/siopv2-oid4vp-op-auth/package.json b/packages/siopv2-oid4vp-op-auth/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.6.0-unstable.1",
+    "@sphereon/did-auth-siop": "0.6.0-unstable.3",
     "@sphereon/pex": "3.0.1",
     "@sphereon/pex-models": "2.1.5",
     "@sphereon/ssi-sdk-ext.did-utils": "0.15.0",

diff --git a/packages/siopv2-oid4vp-rp-auth/package.json b/packages/siopv2-oid4vp-rp-auth/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.6.0-unstable.1",
+    "@sphereon/did-auth-siop": "0.6.0-unstable.3",
     "@sphereon/pex": "3.0.1",
     "@sphereon/ssi-sdk-ext.did-utils": "0.15.0",
     "@sphereon/ssi-sdk.core": "workspace:*",

diff --git a/packages/siopv2-oid4vp-rp-rest-api/package.json b/packages/siopv2-oid4vp-rp-rest-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.6.0-unstable.1",
+    "@sphereon/did-auth-siop": "0.6.0-unstable.3",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

diff --git a/packages/siopv2-oid4vp-rp-rest-api/src/siop-api-functions.ts b/packages/siopv2-oid4vp-rp-rest-api/src/siop-api-functions.ts
@@ -1,5 +1,6 @@
 import { AuthorizationResponsePayload, PresentationDefinitionLocation } from '@sphereon/did-auth-siop'
 import { checkAuth, ISingleEndpointOpts, sendErrorResponse } from '@sphereon/ssi-express-support'
+import { PresentationSubmission } from '@sphereon/ssi-types'
 import { Request, Response, Router } from 'express'
 import { IRequiredContext } from './types'
 
@@ -24,7 +25,12 @@ export function verifyAuthResponseSIOPv2Endpoint(
       console.log('Authorization Response (siop-sessions')
       console.log(JSON.stringify(request.body, null, 2))
       const definition = await context.agent.pexStoreGetDefinition({ definitionId })
-      const authorizationResponse = typeof request.body === 'string' ? request.body : (request.body as AuthorizationResponsePayload)
+      const authorizationResponse =
+        typeof request.body === 'string' ? (JSON.parse(request.body) as AuthorizationResponsePayload) : (request.body as AuthorizationResponsePayload)
+      if (typeof authorizationResponse.presentation_submission === 'string') {
+        console.log(`Supplied presentation_submission was a string instead of JSON. Correctig, but external party should fix their implementation!`)
+        authorizationResponse.presentation_submission = JSON.parse(authorizationResponse.presentation_submission) as PresentationSubmission
+      }
       console.log(`URI: ${JSON.stringify(authorizationResponse)}`)
       if (!definition) {
         response.statusCode = 404

diff --git a/packages/w3c-vc-api/package.json b/packages/w3c-vc-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/agent.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.6.0-unstable.1",
+    "@sphereon/did-auth-siop": "0.6.0-unstable.3",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml