From 29bf0352058b15528ebec3a64ac98c996085fa17 Mon Sep 17 00:00:00 2001
From: Raphael Flechtner <raphael@kilt.io>
Date: Mon, 15 Jan 2024 14:00:53 -0500
Subject: [PATCH] chore: revert to keyUri on callbacks

---
 src/messaging/MessageEnvelope.ts                | 4 ++--
 src/messaging/interface/session/Session.test.ts | 2 +-
 src/messaging/interface/session/request.ts      | 2 +-
 src/tests/messageUtils.ts                       | 2 +-
 src/types/Message.ts                            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/messaging/MessageEnvelope.ts b/src/messaging/MessageEnvelope.ts
index 8d9b125..441f36a 100644
--- a/src/messaging/MessageEnvelope.ts
+++ b/src/messaging/MessageEnvelope.ts
@@ -91,7 +91,7 @@ export async function decrypt(
         peerPublicKey,
         data: hexToU8a(ciphertext),
         nonce: hexToU8a(nonce),
-        verificationMethod: receiverKeyUri,
+        keyUri: receiverKeyUri,
       })
     ).data
   } catch (cause) {
@@ -174,7 +174,7 @@ export async function encrypt(
     receivedAt: message.receivedAt,
     ciphertext,
     nonce,
-    senderKeyUri: encrypted.verificationMethod,
+    senderKeyUri: encrypted.keyUri,
     receiverKeyUri,
   }
 }
diff --git a/src/messaging/interface/session/Session.test.ts b/src/messaging/interface/session/Session.test.ts
index 553d15f..6a4a608 100644
--- a/src/messaging/interface/session/Session.test.ts
+++ b/src/messaging/interface/session/Session.test.ts
@@ -124,7 +124,7 @@ describe('Session', () => {
       data: encryptedChallenge,
       nonce: nonce,
       peerPublicKey: bobEncKey.keyAgreement[0].publicKey,
-      verificationMethod: sessionRequest.encryptionKeyUri,
+      keyUri: sessionRequest.encryptionKeyUri,
     })
     const decryptedChallenge = u8aToString(decryptedChallengeBytes.data)
     expect(decryptedChallenge).toBe(challenge)
diff --git a/src/messaging/interface/session/request.ts b/src/messaging/interface/session/request.ts
index d7d5340..f48ba1f 100644
--- a/src/messaging/interface/session/request.ts
+++ b/src/messaging/interface/session/request.ts
@@ -90,7 +90,7 @@ export async function verifySession(
     data: encryptedChallenge,
     nonce,
     peerPublicKey: Did.multibaseKeyToDidKey((encryptionKey as VerificationMethod).publicKeyMultibase).publicKey,
-    verificationMethod: encryptionKeyUri,
+    keyUri: encryptionKeyUri,
   })
 
   const decryptedChallenge = u8aToString(decryptedBytes.data)
diff --git a/src/tests/messageUtils.ts b/src/tests/messageUtils.ts
index 7b59e20..97f62a8 100644
--- a/src/tests/messageUtils.ts
+++ b/src/tests/messageUtils.ts
@@ -155,7 +155,7 @@ export function makeEncryptCallback({ secretKey }: KiltEncryptionKeypair): Encry
         // encrypted data
         data: box,
         // used did key uri for encryption.
-        verificationMethod: `${didDocument.id}${keyId}`,
+        keyUri: `${didDocument.id}${keyId}`,
       }
     }
   }
diff --git a/src/types/Message.ts b/src/types/Message.ts
index c65cc9e..5085abe 100644
--- a/src/types/Message.ts
+++ b/src/types/Message.ts
@@ -254,7 +254,7 @@ export interface EncryptResponseData {
   /**
    * The DID verification method used for the encryption.
    */
-  verificationMethod: DidUrl
+  keyUri: DidUrl
 }
 
 /**
@@ -283,7 +283,7 @@ export interface DecryptRequestData {
   /**
    * The DID verification method, which should be used for decryption.
    */
-  verificationMethod: DidUrl
+  keyUri: DidUrl
 }
 
 export interface DecryptResponseData {