Strip Bearer prefix from auth header

1 files 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
   }