fix(did-comm): fix potential null exception when unpacking message

decentralized-identity · Jul 14, 2021 · 584766c · 584766c
1 parent c33e39e
commit 584766c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/did-comm/src/utils.ts b/packages/did-comm/src/utils.ts
@@ -51,7 +51,7 @@ export function decodeJoseBlob(blob: string) {
 }
 
 export function isDefined<T>(arg: T): arg is Exclude<T, null | undefined> {
-  return typeof arg !== 'undefined'
+  return arg && typeof arg !== 'undefined'
 }
 
 export function createEcdhWrapper(secretKeyRef: string, context: IAgentContext<IKeyManager>): ECDH {
@@ -173,7 +173,7 @@ export async function mapIdentifierKeysToDoc(
     context,
   )
 
-  let localKeys = identifier.keys
+  let localKeys = identifier.keys.filter(isDefined)
   if (section === 'keyAgreement') {
     localKeys = convertIdentifierEncryptionKeys(identifier)
   }