fix: Incorrect verification method id returned when signing credentia…

…ls in some cases
Sphereon-Opensource · Jan 13, 2023 · c508507 · c508507
1 parent 00892e2
commit c508507
Show file tree

Hide file tree

Showing 8 changed files with 177 additions and 228 deletions.
diff --git a/packages/did-auth-siop-op-authenticator/README.md b/packages/did-auth-siop-op-authenticator/README.md
@@ -176,7 +176,7 @@ For more detailed information see: [Self Issued OpenID Provider v2 (SIOP)](https
 const sessionId = 'example_session_id'
 const authorizationRequestDetailsResponse = await agent.getSiopAuthorizationRequestDetails({
   sessionId,
-  verifiedAuthorizationRequest: createAuthorizationResponse
+  verifiedAuthorizationRequest: createAuthorizationResponse,
 })
 ```
 

diff --git a/packages/did-auth-siop-op-authenticator/__tests__/localAgent.test.ts b/packages/did-auth-siop-op-authenticator/__tests__/localAgent.test.ts
@@ -17,13 +17,11 @@ function getFileAsJson(path: string) {
 let agent: any
 
 const presentationSignCallback: PresentationSignCallback = async (args) => {
-  const presentationSignProof = getFileAsJson(
-      './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/psc/psc.json'
-  )
+  const presentationSignProof = getFileAsJson('./packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/psc/psc.json')
 
   return {
     ...args.presentation,
-    ...presentationSignProof
+    ...presentationSignProof,
   }
 }
 

diff --git a/packages/did-auth-siop-op-authenticator/__tests__/restAgent.test.ts b/packages/did-auth-siop-op-authenticator/__tests__/restAgent.test.ts
@@ -32,13 +32,11 @@ let serverAgent: IAgent
 let restServer: Server
 
 const presentationSignCallback: PresentationSignCallback = async (args) => {
-  const presentationSignProof = getFileAsJson(
-      './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/psc/psc.json'
-  )
+  const presentationSignProof = getFileAsJson('./packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/psc/psc.json')
 
   return {
     ...args.presentation,
-    ...presentationSignProof
+    ...presentationSignProof,
   }
 }
 

diff --git a/...s/did-auth-siop-op-authenticator/__tests__/shared/didAuthSiopOpAuthenticatorAgentLogic.ts b/...s/did-auth-siop-op-authenticator/__tests__/shared/didAuthSiopOpAuthenticatorAgentLogic.ts
@@ -12,7 +12,7 @@ import {
   UrlEncodingFormat,
   VerificationMode,
   VerifiedAuthorizationRequest,
-  ParsedAuthorizationRequestURI
+  ParsedAuthorizationRequestURI,
 } from '@sphereon/did-auth-siop'
 import { mapIdentifierKeysToDoc } from '@veramo/utils'
 
@@ -348,10 +348,10 @@ export default (testContext: {
 
     it('should get authentication details with getting specific credentials', async () => {
       const pdSingle: PresentationDefinitionWithLocation = getFileAsJson(
-          './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/pd/pd_single.json'
+        './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/pd/pd_single.json'
       )
       const vpSingle: VerifiablePresentationWithLocation = getFileAsJson(
-          './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/vp/vp_single.json'
+        './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/vp/vp_single.json'
       )
       vpSingle.presentation.presentation_submission!.id = expect.any(String)
 
@@ -365,11 +365,13 @@ export default (testContext: {
           payload: {},
         },
         credentialFilter: {
-          where: [{
-            column: 'id',
-            value: ['https://example.com/credentials/1872']
-          }]
-        }
+          where: [
+            {
+              column: 'id',
+              value: ['https://example.com/credentials/1872'],
+            },
+          ],
+        },
       })
 
       expect(result).toEqual({
@@ -434,7 +436,7 @@ export default (testContext: {
 
     it('should send authentication response', async () => {
       const pdMultiple: PresentationDefinitionWithLocation = getFileAsJson(
-          './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/pd/pd_multiple.json'
+        './packages/did-auth-siop-op-authenticator/__tests__/vc_vp_examples/pd/pd_multiple.json'
       )
 
       const result = await agent.sendSiopAuthorizationResponse({

diff --git a/packages/vc-handler-ld-local/src/agent/CredentialHandlerLDLocal.ts b/packages/vc-handler-ld-local/src/agent/CredentialHandlerLDLocal.ts
@@ -40,6 +40,7 @@ export class CredentialHandlerLDLocal implements IAgentPlugin {
     verifyCredentialLDLocal: this.verifyCredentialLDLocal.bind(this),
   }
   private keyStore?: AbstractPrivateKeyStore
+
   constructor(options: {
     contextMaps: RecordLike<OrPromise<ContextDoc>>[]
     suites: SphereonLdSignature[]
@@ -127,7 +128,7 @@ export class CredentialHandlerLDLocal implements IAgentPlugin {
           ...identifier.keys.find((k) => k.kid === keyRef),
           privateKeyHex: k.privateKeyHex as string,
         } as IKey
-        verificationMethod = `${identifier.did}#${identifier.did.substring(8)}`
+        verificationMethod = `${identifier.did}#${managedKey.kid ? managedKey.kid : k.alias}`
       }
     }
     return { managedKey, verificationMethod }
@@ -183,8 +184,8 @@ export class CredentialHandlerLDLocal implements IAgentPlugin {
       return await this.ldCredentialModule.signLDVerifiablePresentation(
         presentation,
         identifier.did,
-        managedKey || signingKey,
-        managedKey ? (verificationMethod as string) : verificationMethodId,
+        signingKey || managedKey,
+        verificationMethodId ? verificationMethodId : (verificationMethod as string),
         args.challenge,
         args.domain,
         args.purpose,

diff --git a/packages/vc-handler-ld-local/src/suites/JsonWebSignature2020.ts b/packages/vc-handler-ld-local/src/suites/JsonWebSignature2020.ts
@@ -67,12 +67,15 @@ export class SphereonJsonWebSignature2020 extends SphereonLdSignature {
           x: u8a.toString(u8a.fromString(key.publicKeyHex, 'hex'), 'base64url'),
         }
 
-    const verificationKey = await JsonWebKey.from({
-      id: id,
-      type: this.getSupportedVerificationType(),
-      controller: controller,
-      publicKeyJwk,
-    }, {signer, verifier: false})
+    const verificationKey = await JsonWebKey.from(
+      {
+        id: id,
+        type: this.getSupportedVerificationType(),
+        controller: controller,
+        publicKeyJwk,
+      },
+      { signer, verifier: false }
+    )
 
     // verificationKey.signer = () => signer