From 071eeda423d9de788e1b57e5a139cdf23f46948d Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Sun, 29 Mar 2020 12:56:06 +0200 Subject: [PATCH] correclty map token meta in lookup response (fix #34) --- CHANGELOG.md | 6 ++++++ pom.xml | 2 +- .../connector/model/response/embedded/TokenData.java | 6 ++++-- .../connector/model/response/TokenResponseTest.java | 8 +++++++- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a451d..38bdee9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.9.0 (unreleased) + +### Fixes +* Correctly parse Map field for token metadata (#34) + + ## 0.8.2 (2019-10-20) ### Fixes diff --git a/pom.xml b/pom.xml index 43474f6..0c13a31 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.stklcode.jvault jvault-connector - 0.8.2 + 0.9.0-SNAPSHOT jar diff --git a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java index fb503c7..1652a05 100644 --- a/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java +++ b/src/main/java/de/stklcode/jvault/connector/model/response/embedded/TokenData.java @@ -19,6 +19,8 @@ package de.stklcode.jvault.connector.model.response.embedded; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + /** * Embedded token information inside Vault response. * @@ -43,7 +45,7 @@ public final class TokenData { private String id; @JsonProperty("meta") - private String meta; + private Map meta; @JsonProperty("num_uses") private Integer numUses; @@ -133,7 +135,7 @@ public final class TokenData { /** * @return Metadata */ - public String getMeta() { + public Map getMeta() { return meta; } } diff --git a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java index 272de50..3d068af 100644 --- a/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java +++ b/src/test/java/de/stklcode/jvault/connector/model/response/TokenResponseTest.java @@ -39,6 +39,8 @@ public class TokenResponseTest { private static final Integer TOKEN_CREATION_TIME = 1457533232; private static final Integer TOKEN_TTL = 2764800; private static final String TOKEN_DISPLAY_NAME = "token"; + private static final String TOKEN_META_KEY = "foo"; + private static final String TOKEN_META_VALUE = "bar"; private static final Integer TOKEN_NUM_USES = 0; private static final Boolean TOKEN_ORPHAN = false; private static final String TOKEN_PATH = "auth/token/create"; @@ -56,7 +58,9 @@ public class TokenResponseTest { " \"creation_time\": " + TOKEN_CREATION_TIME + ",\n" + " \"creation_ttl\": " + TOKEN_TTL + ",\n" + " \"display_name\": \"" + TOKEN_DISPLAY_NAME + "\",\n" + - " \"meta\": null,\n" + + " \"meta\": {\n" + + " \"" + TOKEN_META_KEY + "\": \"" + TOKEN_META_VALUE + "\"\n" + + " },\n" + " \"num_uses\": " + TOKEN_NUM_USES + ",\n" + " \"orphan\": " + TOKEN_ORPHAN + ",\n" + " \"path\": \"" + TOKEN_PATH + "\",\n" + @@ -113,6 +117,8 @@ public class TokenResponseTest { assertThat("Incorrect token number of uses", data.getNumUses(), is(TOKEN_NUM_USES)); assertThat("Incorrect token orphan flag", data.isOrphan(), is(TOKEN_ORPHAN)); assertThat("Incorrect token path", data.getPath(), is(TOKEN_PATH)); + assertThat("Incorrect auth metadata size", data.getMeta().entrySet(), hasSize(1)); + assertThat("Incorrect auth metadata", data.getMeta().get(TOKEN_META_KEY), is(TOKEN_META_VALUE)); assertThat("Incorrect response renewable flag", res.isRenewable(), is(RES_RENEWABLE)); assertThat("Incorrect response TTL", data.getTtl(), is(RES_TTL)); assertThat("Incorrect response lease duration", res.getLeaseDuration(), is(RES_LEASE_DURATION));