@sphereon/ssi-sdk-ext.identifier-resolution 0.36.1-feature.integration.fides.82 → 0.36.1-fix.110

package/dist/index.js

@@ -4794,20 +4794,22 @@ async function getManagedDidIdentifier(opts, context) {
   const jwkThumbprint = key.meta?.jwkThumbprint ?? calculateJwkThumbprint({
     jwk
   });
-  let kid = opts.kid ?? extendedKey.meta?.verificationMethod?.id;
-  if (!kid.startsWith(did)) {
+  let kid = opts.kid ?? extendedKey.meta?.verificationMethod?.id ?? extendedKey.kid;
+  if (kid && !kid.startsWith(did)) {
     const hash = kid.startsWith("#") ? "" : "#";
     kid = `${did}${hash}${kid}`;
   }
   const issuer = opts.issuer ?? did;
   let filteredKeys = identifier?.keys ?? [];
+  let isFiltered = false;
   if (opts.kmsKeyRef) {
     const keysByKmsKeyRef = filteredKeys.filter((k) => k.kid === opts.kmsKeyRef);
     if (keysByKmsKeyRef.length > 0) {
       filteredKeys = keysByKmsKeyRef;
+      isFiltered = true;
     }
   }
-  if (filteredKeys.length === identifier?.keys?.length && opts.vmRelationship) {
+  if (!isFiltered && opts.vmRelationship) {
     const keysByVmRelationship = filteredKeys.filter((k) => {
       const purposes = k.meta?.purposes;
       if (!purposes || purposes.length === 0) {
@@ -4817,9 +4819,10 @@ async function getManagedDidIdentifier(opts, context) {
     });
     if (keysByVmRelationship.length > 0) {
       filteredKeys = keysByVmRelationship;
+      isFiltered = true;
     }
   }
-  if (filteredKeys.length === identifier?.keys?.length && typeof opts.identifier === "string" && opts.identifier.includes("#")) {
+  if (!isFiltered && typeof opts.identifier === "string" && opts.identifier.includes("#")) {
     const fragment = opts.identifier.split("#")[1];
     const keysByFragment = filteredKeys.filter((k) => {
       const vmId = k.meta?.verificationMethod?.id;
@@ -4967,10 +4970,10 @@ async function getManagedOID4VCIssuerIdentifier(opts, context) {
 }
 __name(getManagedOID4VCIssuerIdentifier, "getManagedOID4VCIssuerIdentifier");
 async function getManagedIdentifier(opts, context) {
-  let resolutionResult;
   if (isManagedIdentifierResult(opts)) {
-    opts;
+    return opts;
   }
+  let resolutionResult;
   if (isManagedIdentifierKidOpts(opts)) {
     resolutionResult = await getManagedKidIdentifier(opts, context);
   } else if (isManagedIdentifierDidOpts(opts)) {