Only attempt publicKeyJwk import for non-Multikey type.

digitalbazaar · Mar 18, 2024 · 7d49c49 · 7d49c49
1 parent 4124171
commit 7d49c49
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -57,13 +57,13 @@ export async function from(key, options = {}) {
 
   let multikey = {...key};
   if(multikey.type && multikey.type !== 'Multikey') {
+    // attempt loading from JWK if `publicKeyJwk` is present
+    if(multikey.publicKeyJwk) {
+      return fromJwk({jwk: multikey.publicKeyJwk, secretKey: true});
+    }
     multikey = await toMultikey({keyPair: multikey});
     return _createKeyPairInterface({keyPair: multikey, keyAgreement});
   }
-  // attempt loading from JWK if `publicKeyJwk` is present
-  if(multikey.publicKeyJwk) {
-    return fromJwk({jwk: multikey.publicKeyJwk, secretKey: true});
-  }
   if(!multikey.type) {
     multikey.type = 'Multikey';
   }