chore(proofs): use core pex implementation

Signed-off-by: Berend Sliedrecht <sliedrecht@berend.io>

packages/core/package.json

@@ -21,7 +21,6 @@
     "prepublishOnly": "yarn run build"
   },
   "dependencies": {
-    "@aries-framework/presentation-exchange": "^0.4.2",
     "@digitalcredentials/jsonld": "^5.2.1",
     "@digitalcredentials/jsonld-signatures": "^9.3.1",
     "@digitalcredentials/vc": "^1.1.2",

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

@@ -1,6 +1,6 @@
 import type { W3cCredentialRecord, W3cVerifiableCredential } from '../../../vc'
+import type { PresentationDefinition } from '../../services'
 import type { ProofFormat } from '../ProofFormat'
-import type { PresentationDefinition } from '@aries-framework/presentation-exchange'
 
 export interface PresentationExchangeProofFormat extends ProofFormat {
   formatKey: 'presentationExchange'
@@ -15,7 +15,9 @@ export interface PresentationExchangeProofFormat extends ProofFormat {
       version?: string
     }
 
-    createRequest: { presentationDefinition: PresentationDefinition }
+    createRequest: {
+      presentationDefinition: PresentationDefinition
+    }
 
     acceptRequest: {
       credentials: Record<string, Array<W3cVerifiableCredential>>

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

@@ -1,10 +1,8 @@
-/* eslint-disable import/no-extraneous-dependencies */
-/* eslint-disable import/no-cycle */
-/* eslint-disable workspaces/require-dependency */
-
 import type { PresentationExchangeProofFormat } from './PresentationExchangeProofFormat'
 import type { AgentContext } from '../../../../agent'
 import type { W3cCredentialRecord } from '../../../vc'
+import type { InputDescriptorToCredentials } from '../../models'
+import type { PresentationDefinition, VerifiablePresentation } from '../../services'
 import type { ProofFormatService } from '../ProofFormatService'
 import type {
   ProofFormatCreateProposalOptions,
@@ -20,19 +18,13 @@ import type {
   ProofFormatAutoRespondRequestOptions,
   ProofFormatAutoRespondPresentationOptions,
 } from '../ProofFormatServiceOptions'
-import type {
-  InputDescriptorToCredentials,
-  PexPresentationSubmission,
-  PresentationDefinition,
-  VerifiablePresentation,
-} from '@aries-framework/presentation-exchange'
-
-import { PresentationExchangeService } from '@aries-framework/presentation-exchange'
+import type { PresentationSubmission as PexPresentationSubmission } from '@sphereon/pex-models'
 
 import { Attachment, AttachmentData } from '../../../../decorators/attachment/Attachment'
 import { AriesFrameworkError } from '../../../../error'
 import { deepEquality } from '../../../../utils'
 import { ProofFormatSpec } from '../../models'
+import { PresentationExchangeService } from '../../services'
 
 const PRESENTATION_EXCHANGE_PRESENTATION_PROPOSAL = 'dif/presentation-exchange/definitions@v1.0'
 const PRESENTATION_EXCHANGE_PRESENTATION_REQUEST = 'dif/presentation-exchange/definitions@v1.0'

packages/core/src/modules/proofs/formats/presentation-exchange/__tests__/PresentationExchangeProofFormatService.test.ts

@@ -1,13 +1,12 @@
 import type { AgentContext } from '../../../../../agent'
+import type { PresentationDefinition } from '../../../services'
 import type { ProofFormatService } from '../../ProofFormatService'
 import type { PresentationExchangeProofFormat } from '../PresentationExchangeProofFormat'
-import type { PresentationDefinition } from '@aries-framework/presentation-exchange'
-
-import { PresentationExchangeModule } from '@aries-framework/presentation-exchange'
 
 import { getIndySdkModules } from '../../../../../../../indy-sdk/tests/setupIndySdkModule'
 import { getAgentOptions } from '../../../../../../tests'
 import { Agent } from '../../../../../agent/Agent'
+import { PresentationExchangeModule } from '../../../../presentation-exchange'
 import { ProofsModule } from '../../../ProofsModule'
 import { ProofState } from '../../../models'
 import { V2ProofProtocol } from '../../../protocol'

packages/core/src/modules/proofs/services/PresentationExchangeService.ts

@@ -6,22 +6,24 @@ import type { InputDescriptorToCredentials, PresentationSubmission } from '../mo
 import type {
   IPresentationDefinition,
   PresentationSignCallBackParams,
+  Validated,
   VerifiablePresentationResult,
 } from '@sphereon/pex'
 import type {
   InputDescriptorV2,
   PresentationSubmission as PexPresentationSubmission,
   PresentationDefinitionV1,
 } from '@sphereon/pex-models'
-import type { OriginalVerifiableCredential } from '@sphereon/ssi-types'
+import type { IVerifiablePresentation, OriginalVerifiableCredential } from '@sphereon/ssi-types'
 
-import { PEVersion, PEX, PresentationSubmissionLocation } from '@sphereon/pex'
+import { Status, PEVersion, PEX, PresentationSubmissionLocation } from '@sphereon/pex'
 import { injectable } from 'tsyringe'
 
 import { getJwkFromKey } from '../../../crypto'
 import { AriesFrameworkError } from '../../../error'
 import { JsonTransformer } from '../../../utils'
 import { getKeyFromVerificationMethod, DidsApi } from '../../dids'
+import { PresentationExchangeError } from '../../presentation-exchange'
 import { SignatureSuiteRegistry, W3cPresentation, W3cCredentialService, ClaimFormat } from '../../vc'
 import { W3cCredentialRepository } from '../../vc/repository'
 import { selectCredentialsForRequest } from '../utils/credentialSelection'
@@ -32,7 +34,9 @@ import {
 } from '../utils/transform'
 
 export type ProofStructure = Record<string, Record<string, Array<W3cVerifiableCredential>>>
-export type PresentationDefinition = IPresentationDefinition
+export type PresentationDefinition = IPresentationDefinition & Record<string, unknown>
+
+export type VerifiablePresentation = IVerifiablePresentation & Record<string, unknown>
 
 @injectable()
 export class PresentationExchangeService {
@@ -51,6 +55,50 @@ export class PresentationExchangeService {
     return selectCredentialsForRequest(presentationDefinition, credentialRecords, holderDids)
   }
 
+  public validatePresentationDefinition(presentationDefinition: PresentationDefinition) {
+    const validation = PEX.validateDefinition(presentationDefinition)
+    const errorMessages = this.formatValidated(validation)
+    if (errorMessages.length > 0) {
+      throw new PresentationExchangeError(
+        `Invalid presentation definition. The following errors were found: ${errorMessages.join(', ')}`
+      )
+    }
+  }
+
+  public validatePresentationSubmission(presentationSubmission: PexPresentationSubmission) {
+    const validation = PEX.validateSubmission(presentationSubmission)
+    const errorMessages = this.formatValidated(validation)
+    if (errorMessages.length > 0) {
+      throw new PresentationExchangeError(
+        `Invalid presentation submission. The following errors were found: ${errorMessages.join(', ')}`
+      )
+    }
+  }
+
+  public validatePresentation(presentationDefinition: PresentationDefinition, presentation: VerifiablePresentation) {
+    const { errors } = this.pex.evaluatePresentation(presentationDefinition, presentation)
+
+    if (errors) {
+      const errorMessages = this.formatValidated(errors as Validated)
+      if (errorMessages.length > 0) {
+        throw new PresentationExchangeError(
+          `Invalid presentation. The following errors were found: ${errorMessages.join(', ')}`
+        )
+      }
+    }
+  }
+
+  private formatValidated(v: Validated) {
+    return Array.isArray(v)
+      ? (v
+          .filter((r) => r.tag === Status.ERROR)
+          .map((r) => r.message)
+          .filter((m) => Boolean(m)) as Array<string>)
+      : v.tag === Status.ERROR && typeof v.message === 'string'
+      ? [v.message]
+      : []
+  }
+
   /**
    * Queries the wallet for credentials that match the given presentation definition. This only does an initial query based on the
    * schema of the input descriptors. It does not do any further filtering based on the constraints in the input descriptors.