diff options
author | Zach Smith <zach@driver.xyz> | 2018-01-25 14:40:50 -0800 |
---|---|---|
committer | Zach Smith <zach@driver.xyz> | 2018-02-20 10:34:22 -0800 |
commit | 32496bbc8f64f84c8b9bd8b567aa8cc13343414b (patch) | |
tree | 36f8042a3cd5510b15b7bf498f2cfd6b3a2f2790 | |
parent | b7e059da67bee48986b3165c94835f32b84cf76d (diff) | |
download | driver-core-32496bbc8f64f84c8b9bd8b567aa8cc13343414b.tar.gz driver-core-32496bbc8f64f84c8b9bd8b567aa8cc13343414b.tar.bz2 driver-core-32496bbc8f64f84c8b9bd8b567aa8cc13343414b.zip |
Refactor DriverRoute to use shared directives
-rw-r--r-- | src/main/scala/xyz/driver/core/rest/DriverRoute.scala | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala index 4c483c6..5f961b6 100644 --- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala +++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala @@ -24,17 +24,9 @@ trait DriverRoute { } protected def defaultResponseHeaders: Directive0 = { - (extractRequest & optionalHeaderValueByType[Origin](())) tflatMap { - case (request, originHeader) => - val tracingHeader = RawHeader(ContextHeaders.TrackingIdHeader, rest.extractTrackingId(request)) - val responseHeaders = List[HttpHeader]( - tracingHeader, - allowOrigin(originHeader), - `Access-Control-Allow-Headers`(AllowedHeaders: _*), - `Access-Control-Expose-Headers`(AllowedHeaders: _*) - ) - - respondWithHeaders(responseHeaders) + extractRequest flatMap { request => + val tracingHeader = RawHeader(ContextHeaders.TrackingIdHeader, rest.extractTrackingId(request)) + respondWithHeader(tracingHeader) & respondWithCorsHeaders } } |