commit: DDCCGW - resolving by kid on upper level did documents

WorldHealthOrganization · Aug 29, 2024 · dd5317b · dd5317b
1 parent e640777
commit dd5317b
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 43 deletions.
diff --git a/src/main/java/tng/trustnetwork/keydistribution/service/did/DidTrustListService.java b/src/main/java/tng/trustnetwork/keydistribution/service/did/DidTrustListService.java
@@ -146,6 +146,23 @@ private String getListPathElement(boolean ref) {
                 return "";
             }
         }
+
+        public String generateTrustListVerificationId(SignerInformationEntity signerInformationEntity) {
+
+            String defaultPath = signerInformationEntity.getDomain()
+                + SEPARATOR_DID_PATH + getParticipantCode(signerInformationEntity.getCountry())
+                + SEPARATOR_DID_PATH + getMappedGroupName(signerInformationEntity.getGroup())
+                + SEPARATOR_DID_PATH + encodeKid(signerInformationEntity.getKid());
+
+            StringBuffer buf = new StringBuffer();
+            String[] pathArray =  defaultPath.split(SEPARATOR_DID_PATH);
+
+            for (int i = path.size(); i <= pathArray.length - 1; i++) {
+                buf.append(SEPARATOR_DID_PATH + pathArray[i]);
+            }
+
+            return getDocumentId(false) + buf + SEPARATOR_DID_ID + encodeKid(signerInformationEntity.getKid());
+        }
     }
 
     /**
@@ -555,7 +572,7 @@ private void addTrustListEntry(DidTrustList trustList,
 
         DidTrustListEntry trustListEntry = new DidTrustListEntry();
         trustListEntry.setType("JsonWebKey2020");
-        trustListEntry.setId(specification.getEntryId(encodeKid(signerInformationEntity.getKid())));
+        trustListEntry.setId(specification.generateTrustListVerificationId(signerInformationEntity));
         trustListEntry.setController(specification.getDocumentId(false));
         publicKeyJwk.setKid(encodeKid(signerInformationEntity.getKid()));
         trustListEntry.setPublicKeyJwk(publicKeyJwk);