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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk-ext.identifier-resolution",
-  "version": "0.36.1-feature.integration.fides.88+5eba8a30",
+  "version": "0.36.1-fix.110+f9c60269",
   "source": "./src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -27,12 +27,12 @@
     "generate-plugin-schema": "tsx ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk-ext.x509-utils": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk.agent-config": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk.oidf-client": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-types": "0.36.1-feature.integration.fides.88+5eba8a30",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk-ext.x509-utils": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk.agent-config": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk.oidf-client": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-types": "0.36.1-fix.110+f9c60269",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "debug": "^4.3.4",
@@ -40,11 +40,11 @@
     "uint8arrays": "3.1.1"
   },
   "devDependencies": {
-    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk-ext.key-manager": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk-ext.kms-local": "0.36.1-feature.integration.fides.88+5eba8a30",
-    "@sphereon/ssi-sdk.dev": "0.36.1-feature.integration.fides.88+5eba8a30",
+    "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk-ext.kms-local": "0.36.1-fix.110+f9c60269",
+    "@sphereon/ssi-sdk.dev": "0.36.1-fix.110+f9c60269",
     "@veramo/data-store": "4.2.0",
     "@veramo/did-manager": "4.2.0",
     "@veramo/did-resolver": "4.2.0",
@@ -78,5 +78,5 @@
     "X.509 Certificates",
     "ARF"
   ],
-  "gitHead": "5eba8a30455af768df2d4129f6934bf5c1246715"
+  "gitHead": "f9c60269e8060a6bb360a5080747a652ed3e54f1"
 }

package/src/functions/managedIdentifierFunctions.ts

@@ -195,8 +195,8 @@ export async function getManagedDidIdentifier(opts: ManagedIdentifierDidOpts, co
   const key = extendedKey
   const jwk = toJwk(key.publicKeyHex, key.type, { key })
   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)) {
     // Make sure we create a fully qualified kid
     const hash = kid.startsWith('#') ? '' : '#'
     kid = `${did}${hash}${kid}`
@@ -206,16 +206,20 @@ export async function getManagedDidIdentifier(opts: ManagedIdentifierDidOpts, co
   // filter keys based on the criteria
   let filteredKeys = identifier?.keys ?? []
 
+  // Use a flag to track if we have successfully applied a specific filter
+  let isFiltered = false
+
   // first try to filter by kmsKeyRef if supplied
   if (opts.kmsKeyRef) {
     const keysByKmsKeyRef = filteredKeys.filter((k) => k.kid === opts.kmsKeyRef)
     if (keysByKmsKeyRef.length > 0) {
       filteredKeys = keysByKmsKeyRef
+      isFiltered = true
     }
   }
 
   // no match or kmsKeyRef not supplied, try vmRelationship
-  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) {
@@ -225,11 +229,12 @@ export async function getManagedDidIdentifier(opts: ManagedIdentifierDidOpts, co
     })
     if (keysByVmRelationship.length > 0) {
       filteredKeys = keysByVmRelationship
+      isFiltered = true
     }
   }
 
   //no match, try to filter by fragment from opts.identifier (if it's a string with fragment)
-  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
@@ -240,7 +245,7 @@ export async function getManagedDidIdentifier(opts: ManagedIdentifierDidOpts, co
     }
   }
 
-  // fall back to original keys if no filtering occurred
+  // Use the filtered keys (or original keys if no filtering occurred)
   const keys = filteredKeys
 
   // Update controllerKeyId to match the selected key
@@ -389,10 +394,10 @@ export async function getManagedIdentifier(
   },
   context: IAgentContext<IKeyManager>,
 ): Promise<ManagedIdentifierResult> {
-  let resolutionResult: ManagedIdentifierResult
   if (isManagedIdentifierResult(opts)) {
-    opts
+    return opts
   }
+  let resolutionResult: ManagedIdentifierResult
   if (isManagedIdentifierKidOpts(opts)) {
     resolutionResult = await getManagedKidIdentifier(opts, context)
   } else if (isManagedIdentifierDidOpts(opts)) {