Skip to content

Commit 4d6ad9c

Browse files
committed
Javadoc and remove redundant method call.
1 parent 408ac2e commit 4d6ad9c

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

hub/src/main/java/cloud/katta/crypto/uvf/UvfMetadataPayload.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,13 @@ public JWKSet toJWKSet() {
173173
return new JWKSet(Arrays.asList(memberKey, recoveryKeyJWK));
174174
}
175175

176-
public String serializePublicRecoverykey() {
177-
return new JWKSet(recoveryKeyJWK).toPublicJWKSet().toString();
176+
/**
177+
* Retrieve Recovery Key as JSON
178+
*
179+
* @return The JSON object string representation. Only public keys will be included
180+
*/
181+
public String serializePublicRecoveryKey() {
182+
return new JWKSet(recoveryKeyJWK).toString();
178183
}
179184

180185
public UvfAccessTokenPayload toAccessToken() {

hub/src/main/java/cloud/katta/protocols/hub/HubUVFVault.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public AbstractVault create(final Session<?> session, final String region, final
111111
.archived(false)
112112
.creationTime(DateTime.now())
113113
.uvfMetadataFile(new String(VaultIdMetadataUVFProvider.cast(metadata).getMetadata(), StandardCharsets.US_ASCII))
114-
.uvfKeySet(VaultIdMetadataUVFProvider.cast(metadata).getJwks().serializePublicRecoverykey());
114+
.uvfKeySet(VaultIdMetadataUVFProvider.cast(metadata).getJwks().serializePublicRecoveryKey());
115115
// Create vault in Hub
116116
final VaultResourceApi vaultResourceApi = new VaultResourceApi(hub.getClient());
117117
log.debug("Create vault {}", vaultDto);

hub/src/test/java/cloud/katta/crypto/uvf/UvfMetadataPayloadTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class UvfMetadataPayloadTest {
4848
void serializePublicRecoverykey() throws JOSEException {
4949
final UvfMetadataPayload.UniversalVaultFormatJWKS jwks = UvfMetadataPayload.createKeys();
5050
final ECKey recoveryKey = jwks.recoveryKey();
51-
assertEquals(String.format("{\"keys\":[{\"kty\":\"EC\",\"crv\":\"P-384\",\"kid\":\"%s\",\"x\":\"%s\",\"y\":\"%s\",\"alg\":\"ECDH-ES+A256KW\"}]}", recoveryKey.getKeyID(), recoveryKey.getX(), recoveryKey.getY()), jwks.serializePublicRecoverykey());
51+
assertEquals(String.format("{\"keys\":[{\"kty\":\"EC\",\"crv\":\"P-384\",\"kid\":\"%s\",\"x\":\"%s\",\"y\":\"%s\",\"alg\":\"ECDH-ES+A256KW\"}]}", recoveryKey.getKeyID(), recoveryKey.getX(), recoveryKey.getY()), jwks.serializePublicRecoveryKey());
5252
}
5353

5454
@Test
@@ -64,7 +64,7 @@ void recoveryKeyToOwnerAccessTokenAndBack() throws JOSEException, ParseException
6464
final UvfMetadataPayload.UniversalVaultFormatJWKS jwks = UvfMetadataPayload.createKeys();
6565
final UvfAccessTokenPayload accessToken = jwks.toOwnerAccessToken();
6666

67-
final JWKSet recoveredJwks = JWKSet.parse(jwks.serializePublicRecoverykey());
67+
final JWKSet recoveredJwks = JWKSet.parse(jwks.serializePublicRecoveryKey());
6868
assertEquals(1, recoveredJwks.getKeys().size());
6969
final ECKey publicRecoveryKey = (ECKey) recoveredJwks.getKeys().get(0);
7070
assertFalse(publicRecoveryKey.isPrivate());

0 commit comments

Comments
 (0)