fix tests

TBD54566975 · Dec 8, 2023 · eaefc0d · eaefc0d
1 parent c5ce5f3
commit eaefc0d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/packages/credentials/src/compact-jwt.ts b/packages/credentials/src/compact-jwt.ts
@@ -127,9 +127,15 @@ export class CompactJwt {
    */
   static async verify(params: VerifyJwtParams) {
     const { decoded: decodedJwt, encoded: encodedJwt } = CompactJwt.parse({ compactJwt: params.compactJwt });
+
     // TODO: should really be looking for verificationMethod with authentication verification relationship
-    const verificationMethod = await CompactJwt.didResolver.dereference({ didUrl: decodedJwt.header.kid! });
-    if (!utils.isVerificationMethod(verificationMethod)) { // ensure that appropriate verification method was found
+    const dereferenceResult = await CompactJwt.didResolver.dereference({ didUrl: decodedJwt.header.kid! });
+    if (dereferenceResult.dereferencingMetadata.error) {
+      throw new Error(`Failed to resolve ${decodedJwt.header.kid}`);
+    }
+
+    const verificationMethod = dereferenceResult.contentStream;
+    if (!verificationMethod || !utils.isVerificationMethod(verificationMethod)) { // ensure that appropriate verification method was found
       throw new Error('Verification failed: Expected kid in JWT header to dereference a DID Document Verification Method');
     }
 

diff --git a/packages/dids/src/did-resolver.ts b/packages/dids/src/did-resolver.ts
@@ -134,8 +134,7 @@ export class DidResolver {
  */
   async dereference(params: DereferenceParams): Promise<DidDereferenceResult> {
     const { didUrl } = params;
-    const { didDocument, didResolutionMetadata, didDocumentMetadata } = await this.resolve(didUrl);
-
+    const { didDocument, didResolutionMetadata = {}, didDocumentMetadata = {} } = await this.resolve(didUrl);
     if (didResolutionMetadata.error) {
       return {
         dereferencingMetadata : didResolutionMetadata,