feat: allow ignoring revocation status when requesting credentials fo…

…r request

packages/core/src/modules/dif-presentation-exchange/DifPresentationExchangeService.ts

@@ -67,10 +67,27 @@ export class DifPresentationExchangeService {
 
   public async getCredentialsForRequest(
     agentContext: AgentContext,
-    presentationDefinition: DifPresentationExchangeDefinition
+    presentationDefinition: DifPresentationExchangeDefinition,
+    options?: {
+      filterByNonRevocationRequirements: boolean
+    }
   ): Promise<DifPexCredentialsForRequest> {
-    const credentialRecords = await this.queryCredentialForPresentationDefinition(agentContext, presentationDefinition)
-    return getCredentialsForRequest(this.pex, presentationDefinition, credentialRecords)
+    let pd = presentationDefinition
+
+    if (options?.filterByNonRevocationRequirements === false) {
+      pd = {
+        ...pd,
+        input_descriptors: (pd.input_descriptors = pd.input_descriptors.map((inputDescriptor) => {
+          return {
+            ...inputDescriptor,
+            constraints: { ...inputDescriptor.constraints, statuses: undefined },
+          }
+        })),
+      }
+    }
+
+    const credentialRecords = await this.queryCredentialForPresentationDefinition(agentContext, pd)
+    return getCredentialsForRequest(this.pex, pd, credentialRecords)
   }
 
   /**

packages/core/src/modules/proofs/formats/dif-presentation-exchange/DifPresentationExchangeProofFormat.ts

@@ -8,8 +8,9 @@ import type { ProofFormat } from '../ProofFormat'
 
 export type DifPresentationExchangeProposal = DifPresentationExchangeDefinitionV1
 
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface DifPexGetCredentialsForProofRequestOptions {}
+export interface DifPexGetCredentialsForProofRequestOptions {
+  filterByNonRevocationRequirements?: boolean
+}
 
 export type DifPresentationExchangeRequest = {
   options?: {

packages/core/src/modules/proofs/formats/dif-presentation-exchange/DifPresentationExchangeProofFormatService.ts

@@ -197,7 +197,9 @@ export class DifPresentationExchangeProofFormatService
     if (proofFormats?.presentationExchange?.credentials) {
       credentials = proofFormats.presentationExchange.credentials
     } else {
-      const credentialsForRequest = await ps.getCredentialsForRequest(agentContext, presentationDefinition)
+      const credentialsForRequest = await ps.getCredentialsForRequest(agentContext, presentationDefinition, {
+        filterByNonRevocationRequirements: true,
+      })
       credentials = ps.selectCredentialsForRequest(credentialsForRequest)
     }
 
@@ -354,27 +356,38 @@ export class DifPresentationExchangeProofFormatService
 
   public async getCredentialsForRequest(
     agentContext: AgentContext,
-    { requestAttachment }: ProofFormatGetCredentialsForRequestOptions<DifPresentationExchangeProofFormat>
+    { requestAttachment, proofFormats }: ProofFormatGetCredentialsForRequestOptions<DifPresentationExchangeProofFormat>
   ) {
     const ps = this.presentationExchangeService(agentContext)
     const { presentation_definition: presentationDefinition } =
       requestAttachment.getDataAsJson<DifPresentationExchangeRequest>()
 
     ps.validatePresentationDefinition(presentationDefinition)
 
-    const presentationSubmission = await ps.getCredentialsForRequest(agentContext, presentationDefinition)
+    // Set default values
+    const { filterByNonRevocationRequirements = true } = proofFormats?.presentationExchange ?? {}
+    const presentationSubmission = await ps.getCredentialsForRequest(agentContext, presentationDefinition, {
+      filterByNonRevocationRequirements,
+    })
     return presentationSubmission
   }
 
   public async selectCredentialsForRequest(
     agentContext: AgentContext,
-    { requestAttachment }: ProofFormatSelectCredentialsForRequestOptions<DifPresentationExchangeProofFormat>
+    {
+      requestAttachment,
+      proofFormats,
+    }: ProofFormatSelectCredentialsForRequestOptions<DifPresentationExchangeProofFormat>
   ) {
     const ps = this.presentationExchangeService(agentContext)
     const { presentation_definition: presentationDefinition } =
       requestAttachment.getDataAsJson<DifPresentationExchangeRequest>()
 
-    const credentialsForRequest = await ps.getCredentialsForRequest(agentContext, presentationDefinition)
+    // Set default values
+    const { filterByNonRevocationRequirements = true } = proofFormats?.presentationExchange ?? {}
+    const credentialsForRequest = await ps.getCredentialsForRequest(agentContext, presentationDefinition, {
+      filterByNonRevocationRequirements,
+    })
     return { credentials: ps.selectCredentialsForRequest(credentialsForRequest) }
   }
 

packages/openid4vc/src/openid4vc-issuer/router/credentialEndpoint.ts

@@ -3,8 +3,6 @@ import type { OpenId4VciCredentialRequest } from '../../shared'
 import type { OpenId4VciCredentialRequestToCredentialMapper } from '../OpenId4VcIssuerServiceOptions'
 import type { Router, Response } from 'express'
 
-import { CredoError, JwsService, Jwt } from '@credo-ts/core'
-
 import { getRequestContext, sendErrorResponse } from '../../shared/router'
 import { OpenId4VcIssuerService } from '../OpenId4VcIssuerService'
 import { getCNonceFromCredentialRequest } from '../util/credentialRequest'

packages/openid4vc/tests/utils.ts

@@ -9,8 +9,6 @@ import type { TenantsModule } from '@credo-ts/tenants'
 import type { Observable } from 'rxjs'
 
 import { Agent, LogLevel, utils } from '@credo-ts/core'
-import { tap, ReplaySubject, lastValueFrom, filter, timeout, catchError, take, map } from 'rxjs'
-import { threadId } from 'worker_threads'
 
 import {
   TestLogger,