From baed5d37fd49353844a5cc0061503d840f3692a4 Mon Sep 17 00:00:00 2001 From: Robert Fink Date: Thu, 8 Jun 2017 17:54:04 +0200 Subject: [PATCH] Revert getRequestPropertyKey to "com.palantir.tokens.auth" (#45) --- .../tokens2/auth/http/BearerTokenLoggingFilter.java | 2 +- .../auth/http/BearerTokenLoggingFilterTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/auth-tokens-filter/src/main/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilter.java b/auth-tokens-filter/src/main/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilter.java index 3fbe5643..725eacfc 100644 --- a/auth-tokens-filter/src/main/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilter.java +++ b/auth-tokens-filter/src/main/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilter.java @@ -75,6 +75,6 @@ private void setUnverifiedContext(ContainerRequestContext requestContext, String } public static String getRequestPropertyKey(String key) { - return "com.palantir.tokens2.auth." + key; + return "com.palantir.tokens.auth." + key; } } diff --git a/auth-tokens-filter/src/test/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilterTest.java b/auth-tokens-filter/src/test/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilterTest.java index 39e0a18c..dbfeb109 100644 --- a/auth-tokens-filter/src/test/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilterTest.java +++ b/auth-tokens-filter/src/test/java/com/palantir/tokens2/auth/http/BearerTokenLoggingFilterTest.java @@ -97,6 +97,16 @@ public void mdcClearedIfInvalidAuthHeaderProvided() { assertThatMdcIsCleared(); } + @Test + public void assertContextPropKeyPrefixIsStable() { + when(requestContext.getHeaderString(HttpHeaders.AUTHORIZATION)).thenReturn(AUTH_HEADER); + filter.filter(requestContext); + + assertThat(MDC.get(USER_ID_KEY)).isEqualTo(USER_ID); + assertThat(requestContext.getProperty("com.palantir.tokens.auth.userId")) + .isEqualTo(USER_ID); + } + @Test public void userIdInformationIsSet() { when(requestContext.getHeaderString(HttpHeaders.AUTHORIZATION)).thenReturn(AUTH_HEADER);