feature/funke-mdoc

lib/PEX.ts

@@ -18,7 +18,7 @@ import {
 
 import { Status } from './ConstraintUtils';
 import { EvaluationClientWrapper, EvaluationResults, SelectResults } from './evaluation';
-import { PresentationEvaluationResults } from './evaluation/core';
+import { PresentationEvaluationResults } from './evaluation';
 import {
   PresentationFromOpts,
   PresentationResult,
@@ -72,16 +72,16 @@ export class PEX {
    */
   public evaluatePresentation(
     presentationDefinition: IPresentationDefinition,
-    presentations: OrArray<OriginalVerifiablePresentation | IPresentation>,
+    presentations: OrArray<OriginalVerifiablePresentation | IPresentation | SdJwtDecodedVerifiableCredentialWithKbJwtInput>,
     opts?: {
       limitDisclosureSignatureSuites?: string[];
       restrictToFormats?: Format;
       restrictToDIDMethods?: string[];
       presentationSubmission?: PresentationSubmission;
       /**
        * The location of the presentation submission. By default {@link PresentationSubmissionLocation.PRESENTATION}
-       * is used when one W3C presentation is passed (not as array) , while {@link PresentationSubmissionLocation.EXTERNAL} is
-       * used when an array is passed or the presentation is not a W3C presentation
+       * is used when one presentation is passed (not as array), while {@link PresentationSubmissionLocation.EXTERNAL} is
+       * used when an array is passed
        */
       presentationSubmissionLocation?: PresentationSubmissionLocation;
       generatePresentationSubmission?: boolean;
@@ -117,7 +117,10 @@ export class PEX {
       CredentialMapper.isW3cPresentation(wrappedPresentations[0].presentation) &&
       !generatePresentationSubmission
     ) {
-      presentationSubmission = wrappedPresentations[0].decoded.presentation_submission;
+      const decoded = wrappedPresentations[0].decoded;
+      if ('presentation_submission' in decoded) {
+        presentationSubmission = decoded.presentation_submission;
+      }
       if (!presentationSubmission) {
         throw Error(`Either a presentation submission as part of the VP or provided in options was expected`);
       }
@@ -134,7 +137,9 @@ export class PEX {
     // TODO: we should probably add support for holder dids in the kb-jwt of an SD-JWT. We can extract this from the
     // `wrappedPresentation.original.compactKbJwt`, but as HAIP doesn't use dids, we'll leave it for now.
     const holderDIDs = wrappedPresentations
-      .map((p) => (CredentialMapper.isW3cPresentation(p.presentation) && p.presentation.holder ? p.presentation.holder : undefined))
+      .map((p) => {
+        return CredentialMapper.isW3cPresentation(p.presentation) && p.presentation.holder ? p.presentation.holder : undefined;
+      })
       .filter((d): d is string => d !== undefined);
 
     const updatedOpts = {
@@ -336,7 +341,7 @@ export class PEX {
       // that a valid assumption? It seems to be this way for BBS SD as well
       const decoded = (
         CredentialMapper.isSdJwtEncoded(credentials[0]) ? CredentialMapper.decodeVerifiableCredential(credentials[0], opts?.hasher) : credentials[0]
-      ) as SdJwtDecodedVerifiableCredential;
+      ) as Omit<SdJwtDecodedVerifiableCredential, 'kbJwt'>;
 
       if (!opts?.hasher) {
         throw new Error('Hasher must be provided when creating a presentation with an SD-JWT VC');
@@ -525,7 +530,8 @@ export class PEX {
 
     let presentation = presentationResult.presentation;
 
-    if (CredentialMapper.isSdJwtDecodedCredential(presentationResult.presentation)) {
+    if (CredentialMapper.isSdJwtDecodedCredential(presentationResult.presentation as unknown as SdJwtDecodedVerifiableCredential)) {
+      // FIXME? SdJwtDecodedVerifiableCredentialWithKbJwtInput is local type and is not supported in ssi-sdk
       if (!this.options?.hasher) {
         throw new Error('Hasher must be provided when creating a presentation with an SD-JWT VC');
       }

lib/evaluation/handlers/didRestrictionEvaluationHandler.ts

@@ -43,8 +43,12 @@ export class DIDRestrictionEvaluationHandler extends AbstractEvaluationHandler {
       return typeof wrappedVc.credential.issuer === 'object' ? wrappedVc.credential.issuer.id : wrappedVc.credential.issuer;
     } else if (CredentialMapper.isSdJwtDecodedCredential(wrappedVc.credential)) {
       return wrappedVc.credential.decodedPayload.iss;
+    } else if (CredentialMapper.isWrappedMdocCredential(wrappedVc)) {
+      if (typeof wrappedVc.decoded === 'object' && wrappedVc.decoded.iss !== undefined) {
+        return wrappedVc.decoded.iss;
+      }
+      throw new Error('cannot get issuer from the supplied mdoc credential');
     }
-
     throw new Error('Unsupported credential type');
   }
 

lib/signing/types.ts

@@ -95,7 +95,7 @@ export interface SdJwtKbJwtInput {
   };
 }
 
-export type SdJwtDecodedVerifiableCredentialWithKbJwtInput = SdJwtDecodedVerifiableCredential & { kbJwt: SdJwtKbJwtInput };
+export type SdJwtDecodedVerifiableCredentialWithKbJwtInput = Omit<SdJwtDecodedVerifiableCredential, 'kbJwt'> & { kbJwt: SdJwtKbJwtInput };
 
 /**
  * The result object containing the presentation and presentation submission

lib/validation/bundlers/presentationSubmissionVB.ts

@@ -110,6 +110,7 @@ export class PresentationSubmissionVB extends ValidationBundler<PresentationSubm
         'di_vc',
         'di_vp',
         'vc+sd-jwt',
+        'mso_mdoc',
       ];
 
       for (let i = 0; i < descriptor_map.length; i++) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/pex",
-  "version": "4.1.0",
+  "version": "4.1.1-unstable.1",
   "description": "A Typescript implementation of the v1 and v2 DIF Presentation Exchange specification",
   "main": "dist/main/index.js",
   "module": "dist/module/index.js",
@@ -47,7 +47,7 @@
     "@sd-jwt/present": "^0.6.1",
     "@sd-jwt/types": "^0.6.1",
     "@sphereon/pex-models": "^2.3.1",
-    "@sphereon/ssi-types": "0.22.0",
+    "@sphereon/ssi-types": "0.29.1-unstable.113",
     "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "jwt-decode": "^3.1.2",