Refine computeId method.

digitalbazaar · Oct 20, 2023 · b9fde7c · b9fde7c
1 parent d753c37
commit b9fde7c
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/DidJwkDriver.js b/lib/DidJwkDriver.js
@@ -219,6 +219,17 @@ or a valid encryption value (${DidJwk.encryptionAlgorithms.join(', ')}) .`);
  * @returns {string} Returns the key's id.
  */
  async computeId({keyPair}) {
- return `${keyPair.controller}#0`;
+ if(!keyPair?.id) {
+ throw new TypeError('"keyPair" must have an "id" property.');
+ }
+
+ const [didAuthority, keyIdFragment] = keyPair.id.split('#');
+ if(didAuthority) {
+ if(keyIdFragment) {
+ return keyPair.id;
+ }
+ return didAuthority;
+ }
+ return `${keyPair.controller}#${keyPair.id}`;
  }
 }