commit: Fix for DDCCGW-593 AND DDCCGW-667

Signed-off-by: dattatrayamote <[email protected]>
WorldHealthOrganization · Jul 16, 2024 · 8d9ca82 · 8d9ca82
1 parent b506df8
commit 8d9ca82
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 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
@@ -305,7 +305,9 @@ private String generateTrustList(DidSpecification specification, boolean onlyRef
 
         // Add Trusted Issuer (DID References)
         // TODO: Add filtering for TrustedIssuers
-        trustedIssuerEntities.forEach(did -> trustList.getVerificationMethod().add(did.getUrl()));
+        if(onlyReferences){
+            trustedIssuerEntities.forEach(did -> trustList.getVerificationMethod().add(did.getUrl()));
+        }
 
         // Sign Document
         JsonWebSignature2020LdSigner signer = new JsonWebSignature2020LdSigner(byteSigner);

diff --git a/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java b/src/main/java/tng/trustnetwork/keydistribution/service/did/entity/DidTrustListEntry.java
@@ -118,7 +118,7 @@ public static class RsaPublicKeyJwk extends PublicKeyJwk {
          */
         public RsaPublicKeyJwk(RSAPublicKey rsaPublicKey, List<String> base64EncodedCertificates) {
             super("RSA", base64EncodedCertificates);
-            valueN = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getModulus().toByteArray());
+            valueN = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getModulus().toByteArray()).split("=")[0];
             valueE = Base64.getUrlEncoder().encodeToString(rsaPublicKey.getPublicExponent().toByteArray());
         }
     }