aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Smith <zach@driver.xyz>2017-10-25 16:41:04 -0700
committerZach Smith <zach@driver.xyz>2017-10-31 09:19:04 -0700
commitd28544ead7aefc6c2ed1fe0b9a0f75fac25c81d6 (patch)
tree03d50708e642998d9d8b36ba788582c21ef06a4a
parent5db157103a1982f00ca72e8f6b925344debce36e (diff)
downloaddriver-core-d28544ead7aefc6c2ed1fe0b9a0f75fac25c81d6.tar.gz
driver-core-d28544ead7aefc6c2ed1fe0b9a0f75fac25c81d6.tar.bz2
driver-core-d28544ead7aefc6c2ed1fe0b9a0f75fac25c81d6.zip
Remove duplicate CORS header code from errorResponse method
-rw-r--r--src/main/scala/xyz/driver/core/rest/DriverRoute.scala17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
index d42bd75..9af6657 100644
--- a/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
+++ b/src/main/scala/xyz/driver/core/rest/DriverRoute.scala
@@ -99,21 +99,8 @@ trait DriverRoute {
statusCode: StatusCode,
message: String,
exception: T): Route = {
-
- val trackingId = rest.extractTrackingId(ctx.request)
- val tracingHeader = RawHeader(ContextHeaders.TrackingIdHeader, rest.extractTrackingId(ctx.request))
-
+ val trackingId = rest.extractTrackingId(ctx.request)
MDC.put("trackingId", trackingId)
-
- optionalHeaderValueByType[Origin](()) { originHeader =>
- val responseHeaders = List[HttpHeader](tracingHeader,
- allowOrigin(originHeader),
- `Access-Control-Allow-Headers`(AllowedHeaders: _*),
- `Access-Control-Expose-Headers`(AllowedHeaders: _*))
-
- respondWithHeaders(responseHeaders) {
- complete(HttpResponse(statusCode, entity = message))
- }
- }
+ complete(HttpResponse(statusCode, entity = message))
}
}