From d28544ead7aefc6c2ed1fe0b9a0f75fac25c81d6 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Wed, 25 Oct 2017 16:41:04 -0700 Subject: Remove duplicate CORS header code from errorResponse method --- src/main/scala/xyz/driver/core/rest/DriverRoute.scala | 17 ++--------------- 1 file 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)) } } -- cgit v1.2.3