From ae93dea9eeac99cc99de78a9a337e409a67eaf57 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Thu, 23 Feb 2017 10:52:12 -0800 Subject: Add november to date package Month --- src/main/scala/xyz/driver/core/date.scala | 1 + src/main/scala/xyz/driver/core/rest.scala | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/scala/xyz/driver/core/date.scala b/src/main/scala/xyz/driver/core/date.scala index f0b9bf6..5a6f736 100644 --- a/src/main/scala/xyz/driver/core/date.scala +++ b/src/main/scala/xyz/driver/core/date.scala @@ -18,6 +18,7 @@ object date { val AUGUST = tagMonth(Calendar.AUGUST) val SEPTEMBER = tagMonth(Calendar.SEPTEMBER) val OCTOBER = tagMonth(Calendar.OCTOBER) + val NOVEMBER = tagMonth(Calendar.NOVEMBER) val DECEMBER = tagMonth(Calendar.DECEMBER) } diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index da6df96..0159526 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -33,7 +33,7 @@ object rest { } object ContextHeaders { - val AuthenticationTokenHeader = "WWW-Authenticate" + val AuthenticationTokenHeader = "Authorization" val TrackingIdHeader = "X-Trace" object LinkerD { -- cgit v1.2.3 From 74788a689d323ee49019b3d131c953041b2b2be7 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Thu, 23 Feb 2017 11:33:00 -0800 Subject: Strip Bearer prefix from auth header --- src/main/scala/xyz/driver/core/rest.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index 0159526..ecc3027 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -33,8 +33,9 @@ object rest { } object ContextHeaders { - val AuthenticationTokenHeader = "Authorization" - val TrackingIdHeader = "X-Trace" + val AuthenticationTokenHeader = "Authorization" + val AuthenticationHeaderPrefix = "Bearer" + val TrackingIdHeader = "X-Trace" object LinkerD { // https://linkerd.io/doc/0.7.4/linkerd/protocol-http/ @@ -61,7 +62,11 @@ object rest { h.name === ContextHeaders.AuthenticationTokenHeader || h.name === ContextHeaders.TrackingIdHeader // || ContextHeaders.LinkerD.isLinkerD(h.lowercaseName) } map { header => - header.name -> header.value + if (header.name === ContextHeaders.AuthenticationTokenHeader) { + header.name -> header.value.stripPrefix(ContextHeaders.AuthenticationHeaderPrefix).trim + } else { + header.name -> header.value + } } toMap } -- cgit v1.2.3