inc feedback

Signed-off-by: Martin Auer <martin.auer97@gmail.com>

demo-openid/src/Holder.ts

@@ -40,9 +40,9 @@ export class Holder extends BaseAgent<ReturnType<typeof getOpenIdHolderModules>>
     credentialsToRequest: string[]
   ) {
     const tokenResponse = await this.agent.modules.openId4VcHolder.requestToken({ resolvedCredentialOffer })
-    const credentialResponse = await this.agent.modules.openId4VcHolder.requestCredential({
+    const credentialResponse = await this.agent.modules.openId4VcHolder.requestCredentials({
       resolvedCredentialOffer,
-      tokenResponse,
+      ...tokenResponse,
       // TODO: add jwk support for holder binding
       credentialsToRequest,
       credentialBindingResolver: async () => ({

packages/openid4vc/src/openid4vc-holder/OpenId4VcHolderApi.ts

@@ -164,8 +164,9 @@ export class OpenId4VcHolderApi {
 
     return this.openId4VciHolderService.acceptCredentialOffer(this.agentContext, {
       resolvedCredentialOffer,
-      tokenResponse: { c_nonce: cNonce, access_token: accessToken },
       acceptCredentialOfferOptions: credentialRequestOptions,
+      accessToken,
+      cNonce,
     })
   }
 

packages/openid4vc/src/openid4vc-holder/OpenId4VciHolderService.ts

@@ -8,7 +8,6 @@ import type {
   OpenId4VciSupportedCredentialFormats,
   OpenId4VciCredentialResponse,
   OpenId4VciNotificationEvent,
-  OpenId4VciTokenResponse,
   OpenId4VciAcceptCredentialOfferOptions,
   OpenId4VciTokenRequestOptions,
 } from './OpenId4VciHolderServiceOptions'
@@ -138,6 +137,7 @@ export class OpenId4VciHolderService {
         credentialIssuerMetadata: credentialIssuerMetadata,
       },
       offeredCredentials: credentialsSupportedV13ToV11(offeredCredentialConfigurations),
+      credentialOfferPayload,
       credentialOfferRequestWithBaseUrl: client.credentialOffer,
       version: client.version(),
     }
@@ -306,7 +306,8 @@ export class OpenId4VciHolderService {
       resolvedCredentialOffer: OpenId4VciResolvedCredentialOffer
       acceptCredentialOfferOptions: OpenId4VciAcceptCredentialOfferOptions
       resolvedAuthorizationRequestWithCode?: OpenId4VciResolvedAuthorizationRequestWithCode
-      tokenResponse?: OpenId4VciTokenResponse
+      accessToken?: string
+      cNonce?: string
     }
   ) {
     const { resolvedCredentialOffer, acceptCredentialOfferOptions } = options
@@ -345,7 +346,9 @@ export class OpenId4VciHolderService {
       txCode: acceptCredentialOfferOptions.userPin,
     } as OpenId4VciTokenRequestOptions
 
-    const tokenResponse = options.tokenResponse ?? (await this.requestAccessToken(agentContext, tokenRequestOptions))
+    const tokenResponse = options.accessToken
+      ? { access_token: options.accessToken, c_nonce: options.cNonce }
+      : await this.requestAccessToken(agentContext, tokenRequestOptions)
 
     const receivedCredentials: Array<OpenId4VciCredentialResponse> = []
     let newCNonce: string | undefined

packages/openid4vc/src/openid4vc-holder/OpenId4VciHolderServiceOptions.ts

@@ -2,6 +2,7 @@ import type {
   OpenId4VcCredentialHolderBinding,
   OpenId4VciCredentialSupportedWithId,
   OpenId4VciIssuerMetadata,
+  OpenId4VciCredentialOfferPayload,
 } from '../shared'
 import type { JwaSignatureAlgorithm, KeyType } from '@credo-ts/core'
 import type { VerifiableCredential } from '@credo-ts/core/src/modules/dif-presentation-exchange/models/index'
@@ -53,6 +54,7 @@ export interface OpenId4VciResolvedCredentialOffer {
     credentialIssuerMetadata: OpenId4VciIssuerMetadata
   }
   credentialOfferRequestWithBaseUrl: CredentialOfferRequestWithBaseUrl
+  credentialOfferPayload: OpenId4VciCredentialOfferPayload
   offeredCredentials: OpenId4VciCredentialSupportedWithId[]
   version: OpenId4VCIVersion
 }