Only attempt publicKeyJwk import for non-Multikey type.

digitalbazaar · Mar 18, 2024 · e6642e7 · e6642e7
1 parent a263230
commit e6642e7
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -41,13 +41,13 @@ export async function generate({id, controller, seed} = {}) {
 export async function from(key) {
   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});
   }
-  // attempt loading from JWK if `publicKeyJwk` is present
-  if(multikey.publicKeyJwk) {
-    return fromJwk({jwk: multikey.publicKeyJwk, secretKey: true});
-  }
   if(!multikey.type) {
     multikey.type = 'Multikey';
   }