Use overloaded methods.

Signed-off-by: Markus Sabadello <[email protected]>

Author: peacekeeper

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiableCredential.java

@@ -145,7 +145,7 @@ public String getCompactSerialization() {
 		return this.compactSerialization;
 	}
 
-	public String toJwtRSA(RSAKey rsaKey) throws JOSEException {
+	public String toJwt(RSAKey rsaKey) throws JOSEException {
 
 		JWSHeader jwsHeader = new JWSHeader.Builder(JWSAlgorithm.RS256).build();
 		SignedJWT signedJWT = new SignedJWT(jwsHeader, this.getPayload());
@@ -158,7 +158,7 @@ public String toJwtRSA(RSAKey rsaKey) throws JOSEException {
 		return compactSerialization;
 	}
 
-	public String toJwtEd25519(OctetKeyPair octetKeyPair) throws JOSEException {
+	public String toJwt(OctetKeyPair octetKeyPair) throws JOSEException {
 
 		JWSHeader jwsHeader = new JWSHeader.Builder(JWSAlgorithm.EdDSA).build();
 		SignedJWT signedJWT = new SignedJWT(jwsHeader, this.getPayload());
@@ -171,7 +171,7 @@ public String toJwtEd25519(OctetKeyPair octetKeyPair) throws JOSEException {
 		return compactSerialization;
 	}
 
-	public String toJwtES256K(ECKey ecKey) throws JOSEException {
+	public String toJwt(ECKey ecKey) throws JOSEException {
 
 		JWSHeader jwsHeader = new JWSHeader.Builder(JWSAlgorithm.ES256K).build();
 		SignedJWT signedJWT = new SignedJWT(jwsHeader, this.getPayload());

src/main/java/com/danubetech/verifiablecredentials/jwt/JwtVerifiablePresentation.java

@@ -1,7 +1,6 @@
 package com.danubetech.verifiablecredentials.jwt;
 
 import java.io.IOException;
-import java.security.PrivateKey;
 import java.util.Date;
 import java.util.UUID;
 
@@ -11,6 +10,7 @@
 import com.nimbusds.jose.JWSHeader;
 import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.crypto.RSASSASigner;
+import com.nimbusds.jose.jwk.RSAKey;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 
@@ -77,12 +77,12 @@ public String getCompactSerialization() {
 		return this.compactSerialization;
 	}
 
-	public String toJwt(String algorithm, PrivateKey privateKey) throws JOSEException {
+	public String toJwt(RSAKey rsaKey) throws JOSEException {
 
-		JWSHeader jwsHeader = new JWSHeader.Builder(JWSAlgorithm.parse(algorithm)).build();
+		JWSHeader jwsHeader = new JWSHeader.Builder(JWSAlgorithm.RS256).build();
 		SignedJWT signedJWT = new SignedJWT(jwsHeader, this.getPayload());
 
-		JWSSigner signer = new RSASSASigner(privateKey);
+		JWSSigner signer = new RSASSASigner(rsaKey);
 
 		signedJWT.sign(signer);
 

src/main/java/com/danubetech/verifiablecredentials/w3ctestsuite/Generator.java

@@ -3,8 +3,6 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
-import java.security.PrivateKey;
-import java.security.PublicKey;
 import java.text.ParseException;
 import java.util.Arrays;
 import java.util.List;
@@ -57,12 +55,11 @@ public static void main(String[] args) throws Exception {
 				output = verifiableCredential.toJsonString();
 			} else {
 
-				PrivateKey privateKey = readPrivateKey(argJwt);
-				PublicKey publicKey = readPublicKey(argJwt);
+				RSAKey rsaKey = readRSAKey(argJwt);
 
 				if (argDecode) {
 
-					JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromJwt(input, JWSAlgorithm.RS256.getName(), publicKey, false);
+					JwtVerifiableCredential jwtVerifiableCredential = JwtVerifiableCredential.fromJwt(input, JWSAlgorithm.RS256.getName(), rsaKey.toPublicKey(), false);
 					VerifiableCredential verifiableCredential = jwtVerifiableCredential.toVerifiableCredential();
 
 					output = verifiableCredential.toJsonString();
@@ -73,18 +70,18 @@ public static void main(String[] args) throws Exception {
 
 					if (argPresentation) {
 
-						jwtVerifiableCredential.toJwt(JWSAlgorithm.RS256.getName(), privateKey);
+						jwtVerifiableCredential.toJwt(rsaKey);
 						JwtVerifiablePresentation jwtVerifiablePresentation = JwtVerifiablePresentation.fromJwtVerifiableCredential(jwtVerifiableCredential, argAud);
 
-						output = jwtVerifiablePresentation.toJwt(JWSAlgorithm.RS256.getName(), privateKey);
+						output = jwtVerifiablePresentation.toJwt(rsaKey);
 					} else {
 
 						if (argNoJws) {
 
 							output = jwtVerifiableCredential.getPayload().toJSONObject().toJSONString();
 						} else {
 
-							output = jwtVerifiableCredential.toJwt(JWSAlgorithm.RS256.getName(), privateKey);
+							output = jwtVerifiableCredential.toJwt(rsaKey);
 						}
 					}
 				}
@@ -136,24 +133,14 @@ static String argInput(List<String> argsList) {
 		return argsList.get(argsList.size()-1);
 	}
 
-	static PrivateKey readPrivateKey(String jwt) throws ParseException, JOSEException {
+	static RSAKey readRSAKey(String jwt) throws ParseException, JOSEException {
 
 		JSONObject jsonObject = JSONObjectUtils.parse(new String(Base64.decodeBase64(jwt)));
 		JSONObject rs256PrivateKeyJwk = (JSONObject) jsonObject.get("rs256PrivateKeyJwk");
 
 		RSAKey jwk = (RSAKey) JWK.parse(rs256PrivateKeyJwk);
 
-		return jwk.toPrivateKey();
-	}
-
-	static PublicKey readPublicKey(String jwt) throws ParseException, JOSEException {
-
-		JSONObject jsonObject = JSONObjectUtils.parse(new String(Base64.decodeBase64(jwt)));
-		JSONObject rs256PrivateKeyJwk = (JSONObject) jsonObject.get("rs256PrivateKeyJwk");
-
-		RSAKey jwk = (RSAKey) JWK.parse(rs256PrivateKeyJwk);
-
-		return jwk.toPublicKey();
+		return jwk;
 	}
 
 	static String readInput(File input) throws Exception {

src/test/java/com/danubetech/verifiablecredentials/JwtTest.java

@@ -30,7 +30,7 @@ public void testSign() throws Exception {
 
 		assertNotNull(jwtPayload);
 
-		String jwtString = jwtVerifiableCredential.toJwt(JWSAlgorithm.RS256.getName(), TestUtil.testRSAPrivateKey);
+		String jwtString = jwtVerifiableCredential.toJwt(TestUtil.rsaKey);
 
 		assertNotNull(jwtString);
 

src/test/java/com/danubetech/verifiablecredentials/TestUtil.java

@@ -11,10 +11,13 @@
 
 import org.apache.commons.codec.binary.Base64;
 
+import com.nimbusds.jose.jwk.RSAKey;
+
 class TestUtil {
 
 	static final RSAPrivateKey testRSAPrivateKey;
 	static final RSAPublicKey testRSAPublicKey;
+	static final RSAKey rsaKey;
 
 	static {
 
@@ -49,6 +52,10 @@ class TestUtil {
 
 			throw new RuntimeException(ex.getMessage(), ex);
 		}
+
+		rsaKey = new com.nimbusds.jose.jwk.RSAKey.Builder(testRSAPublicKey)
+				.privateKey(testRSAPrivateKey)
+				.build();
 	}
 
 	static String read(InputStream inputStream) throws Exception {