diff options
author | vlad <vlad@driver.xyz> | 2017-02-28 10:58:55 -0800 |
---|---|---|
committer | vlad <vlad@driver.xyz> | 2017-02-28 10:58:55 -0800 |
commit | 030d19fa13fac35224e4727b83973a1ea7ba6f49 (patch) | |
tree | 7c9348c9cdcc9598c4032f873d4f304283dd49c9 /src | |
parent | 424ab6883278a8cbfe69735291ec9df1c91c2a2d (diff) | |
parent | 707ff2a8425afa3018520b6b666c2645ff0d1e0c (diff) | |
download | driver-core-030d19fa13fac35224e4727b83973a1ea7ba6f49.tar.gz driver-core-030d19fa13fac35224e4727b83973a1ea7ba6f49.tar.bz2 driver-core-030d19fa13fac35224e4727b83973a1ea7ba6f49.zip |
Merge remote-tracking branch 'origin/master' into master3v0.10.14
Diffstat (limited to 'src')
-rw-r--r-- | src/main/scala/xyz/driver/core/date.scala | 1 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 11 |
2 files changed, 9 insertions, 3 deletions
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 945e3be..4cfea6d 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 = "WWW-Authenticate" - 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 } |