Repository: knox Updated Branches: refs/heads/master 8b128c2f1 -> 59311f757
KNOX-1545 - KnoxTokenCredentialCollector should expose the type of the collected token Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/59311f75 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/59311f75 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/59311f75 Branch: refs/heads/master Commit: 59311f757e51297cb1baf6986dba0307911b292e Parents: 8b128c2 Author: Phil Zampino <pzamp...@apache.org> Authored: Wed Oct 31 09:53:20 2018 -0400 Committer: Phil Zampino <pzamp...@apache.org> Committed: Wed Oct 31 12:33:03 2018 -0400 ---------------------------------------------------------------------- .../knox/gateway/shell/KnoxTokenCredentialCollector.java | 7 +++++++ 1 file changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/59311f75/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java index c0ade6a..e05f00a 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxTokenCredentialCollector.java @@ -37,6 +37,8 @@ public class KnoxTokenCredentialCollector extends AbstractCredentialCollector { private String targetUrl = null; + private String tokenType = null; + /* (non-Javadoc) * @see CredentialCollector#collect() */ @@ -52,6 +54,7 @@ public class KnoxTokenCredentialCollector extends AbstractCredentialCollector { Map<String, String> attrs = JsonUtils.getMapFromJsonString(lines.get(0)); value = attrs.get("access_token"); targetUrl = attrs.get("target_url"); + tokenType = attrs.get("token_type"); Date expires = new Date(Long.parseLong(attrs.get("expires_in"))); if (expires.before(new Date())) { throw new CredentialCollectionException("Cached knox token has expired. Please relogin through knoxinit."); @@ -68,6 +71,10 @@ public class KnoxTokenCredentialCollector extends AbstractCredentialCollector { return targetUrl; } + public String getTokenType() { + return tokenType; + } + /* (non-Javadoc) * @see CredentialCollector#name() */
