@sphereon/ssi-sdk.siopv2-oid4vp-rp-auth 0.34.1-fix.166 → 0.34.1-fix.169

package/src/agent/SIOPv2RP.ts

@@ -4,7 +4,7 @@ import {
   AuthorizationResponseState,
   AuthorizationResponseStateStatus,
   AuthorizationResponseStateWithVerifiedData,
-  decodeUriAsJson,
+  decodeUriAsJson, EncodedDcqlPresentationVpToken,
   VerifiedAuthorizationResponse
 } from '@sphereon/did-auth-siop'
 import { getAgentResolver } from '@sphereon/ssi-sdk-ext.did-utils'
@@ -12,9 +12,12 @@ import { shaHasher as defaultHasher } from '@sphereon/ssi-sdk.core'
 import {
   AdditionalClaims,
   CredentialMapper,
+  //decodeSdJwtVc,
   HasherSync,
   ICredentialSubject,
   IPresentation,
+  //IProofPurpose,
+  //IProofType,
   IVerifiableCredential,
   IVerifiablePresentation,
   JwtDecodedVerifiablePresentation,
@@ -22,6 +25,7 @@ import {
   MdocOid4vpMdocVpToken,
   OriginalVerifiablePresentation,
   SdJwtDecodedVerifiableCredential,
+  //sha256
 } from '@sphereon/ssi-types'
 import { IAgentPlugin } from '@veramo/core'
 import { DcqlQuery } from 'dcql'
@@ -40,11 +44,11 @@ import {
   ISiopv2RPOpts,
   IUpdateRequestStateArgs,
   IVerifyAuthResponseStateArgs,
-  schema,
-  VerifiedDataMode,
+  schema
 } from '../index'
 import { RPInstance } from '../RPInstance'
 import { ISIOPv2RP } from '../types/ISIOPv2RP'
+//import { jwtDecode } from 'jwt-decode'
 
 export class SIOPv2RP implements IAgentPlugin {
   private readonly opts: ISiopv2RPOpts
@@ -126,11 +130,7 @@ export class SIOPv2RP implements IAgentPlugin {
     }
 
     const responseState = authorizationResponseState as AuthorizationResponseStateWithVerifiedData
-    if (
-      responseState.status === AuthorizationResponseStateStatus.VERIFIED &&
-      args.includeVerifiedData &&
-      args.includeVerifiedData !== VerifiedDataMode.NONE
-    ) {
+    if (responseState.status === AuthorizationResponseStateStatus.VERIFIED) {
       let hasher: HasherSync | undefined
       if (
         CredentialMapper.isSdJwtEncoded(responseState.response.payload.vp_token as OriginalVerifiablePresentation) &&
@@ -138,45 +138,119 @@ export class SIOPv2RP implements IAgentPlugin {
       ) {
         hasher = defaultHasher
       }
-      // todo this should also include mdl-mdoc
-      const presentationDecoded = CredentialMapper.decodeVerifiablePresentation(
-        responseState.response.payload.vp_token as OriginalVerifiablePresentation,
-        //todo: later we want to conditionally pass in options for mdl-mdoc here
-        hasher,
-      )
-      switch (args.includeVerifiedData) {
-        case VerifiedDataMode.VERIFIED_PRESENTATION:
-          responseState.response.payload.verifiedData = this.presentationOrClaimsFrom(presentationDecoded)
-          break
-        case VerifiedDataMode.CREDENTIAL_SUBJECT_FLATTENED: // TODO debug cs-flat for SD-JWT
-          const allClaims: AdditionalClaims = {}
-          for (const credential of this.presentationOrClaimsFrom(presentationDecoded).verifiableCredential || []) {
-            const vc = credential as IVerifiableCredential
-            const schemaValidationResult = await context.agent.cvVerifySchema({
-              credential,
-              hasher,
-              validationPolicy: rpInstance.rpOptions.verificationPolicies?.schemaValidation,
-            })
-            if (!schemaValidationResult.result) {
-              responseState.status = AuthorizationResponseStateStatus.ERROR
-              responseState.error = new Error(schemaValidationResult.error)
-              return responseState
-            }
 
-            const credentialSubject = vc.credentialSubject as ICredentialSubject & AdditionalClaims
-            if (!('id' in allClaims)) {
-              allClaims['id'] = credentialSubject.id
+      const vpToken = responseState.response.payload.vp_token && JSON.parse(responseState.response.payload.vp_token as EncodedDcqlPresentationVpToken)
+      const claims = []
+      for (const [key, value] of Object.entries(vpToken)) {
+        const presentationDecoded = CredentialMapper.decodeVerifiablePresentation(
+          value as OriginalVerifiablePresentation,
+          //todo: later we want to conditionally pass in options for mdl-mdoc here
+          hasher,
+        )
+        console.log(`presentationDecoded: ${JSON.stringify(presentationDecoded)}`)
+
+        const allClaims: AdditionalClaims = {}
+        for (const credential of this.presentationOrClaimsFrom(presentationDecoded).verifiableCredential || []) {
+          const vc = credential as IVerifiableCredential
+          const schemaValidationResult = await context.agent.cvVerifySchema({
+            credential,
+            hasher,
+            validationPolicy: rpInstance.rpOptions.verificationPolicies?.schemaValidation,
+          })
+          if (!schemaValidationResult.result) {
+            responseState.status = AuthorizationResponseStateStatus.ERROR
+            responseState.error = new Error(schemaValidationResult.error)
+            return responseState
+          }
+
+          const credentialSubject = vc.credentialSubject as ICredentialSubject & AdditionalClaims
+          if (!('id' in allClaims)) {
+            allClaims['id'] = credentialSubject.id
+          }
+
+          Object.entries(credentialSubject).forEach(([key, value]) => {
+            if (!(key in allClaims)) {
+              allClaims[key] = value
             }
+          })
+
+          claims.push({
+            id: key,
+            type: vc.type[0],
+            claims: allClaims
+          })
+        }
+      }
 
-            Object.entries(credentialSubject).forEach(([key, value]) => {
-              if (!(key in allClaims)) {
-                allClaims[key] = value
-              }
-            })
+      // const claimsPromises = responseState.response.payload.vp_token && JSON.parse(responseState.response.payload.vp_token as EncodedDcqlPresentationVpToken)
+      //   .map(async (presentation: OriginalVerifiablePresentation) => {
+      //     const presentationDecoded = CredentialMapper.decodeVerifiablePresentation(
+      //       presentation,
+      //       //todo: later we want to conditionally pass in options for mdl-mdoc here
+      //       hasher,
+      //     )
+      //
+      //
+      //
+      //     return {
+      //       id: presentationDecoded.id
+      //     }
+      //
+      //   })
+
+      // // todo this should also include mdl-mdoc
+      // const presentationDecoded = CredentialMapper.decodeVerifiablePresentation(
+      //   responseState.response.payload.vp_token as OriginalVerifiablePresentation,
+      //   //todo: later we want to conditionally pass in options for mdl-mdoc here
+      //   hasher,
+      // )
+      // console.log(`presentationDecoded: ${JSON.stringify(presentationDecoded)}`)
+
+      responseState.verifiedData = {
+        ...(responseState.response.payload.vp_token && {
+          authorization_response: {
+            vp_token: typeof responseState.response.payload.vp_token === 'string' // TODO we might not need this string check
+                ? JSON.parse(responseState.response.payload.vp_token)
+                : responseState.response.payload.vp_token
           }
-          responseState.verifiedData = allClaims
-          break
+        }),
+
+        credential_claims: claims//(this.presentationOrClaimsFrom(presentationDecoded).verifiableCredential || []).map()
       }
+
+      // switch (args.includeVerifiedData) {
+      //   case VerifiedDataMode.VERIFIED_PRESENTATION:
+      //     responseState.response.payload.verifiedData = this.presentationOrClaimsFrom(presentationDecoded)
+      //     break
+      //   case VerifiedDataMode.CREDENTIAL_SUBJECT_FLATTENED: // TODO debug cs-flat for SD-JWT
+      //     const allClaims: AdditionalClaims = {}
+      //     for (const credential of this.presentationOrClaimsFrom(presentationDecoded).verifiableCredential || []) {
+      //       const vc = credential as IVerifiableCredential
+      //       const schemaValidationResult = await context.agent.cvVerifySchema({
+      //         credential,
+      //         hasher,
+      //         validationPolicy: rpInstance.rpOptions.verificationPolicies?.schemaValidation,
+      //       })
+      //       if (!schemaValidationResult.result) {
+      //         responseState.status = AuthorizationResponseStateStatus.ERROR
+      //         responseState.error = new Error(schemaValidationResult.error)
+      //         return responseState
+      //       }
+      //
+      //       const credentialSubject = vc.credentialSubject as ICredentialSubject & AdditionalClaims
+      //       if (!('id' in allClaims)) {
+      //         allClaims['id'] = credentialSubject.id
+      //       }
+      //
+      //       Object.entries(credentialSubject).forEach(([key, value]) => {
+      //         if (!(key in allClaims)) {
+      //           allClaims[key] = value
+      //         }
+      //       })
+      //     }
+      //     responseState.verifiedData = allClaims
+      //     break
+      // }
     }
     return responseState
   }
@@ -187,7 +261,7 @@ export class SIOPv2RP implements IAgentPlugin {
       | IVerifiablePresentation
       | SdJwtDecodedVerifiableCredential
       | MdocOid4vpMdocVpToken
-      | MdocDeviceResponse,
+      | MdocDeviceResponse
   ): AdditionalClaims | IPresentation =>
     CredentialMapper.isSdJwtDecodedCredential(presentationDecoded)
       ? presentationDecoded.decodedPayload

package/src/types/ISIOPv2RP.ts

@@ -89,11 +89,11 @@ export interface IGetAuthResponseStateArgs {
   queryId?: string
   errorOnNotFound?: boolean
   progressRequestStateTo?: AuthorizationRequestStateStatus
-  includeVerifiedData?: VerifiedDataMode
+  //includeVerifiedData?: VerifiedDataMode
 }
 
 export interface IUpdateRequestStateArgs {
-  queryId: string
+  queryId?: string
   correlationId: string
   state: AuthorizationRequestStateStatus
   error?: string