diff options
author | Zach Smith <zach@driver.xyz> | 2018-01-22 11:25:35 -0800 |
---|---|---|
committer | Zach Smith <zach@driver.xyz> | 2018-02-20 10:34:22 -0800 |
commit | b7e059da67bee48986b3165c94835f32b84cf76d (patch) | |
tree | c59e50fa0ce3db8ab218ad4469814c9d1fa4564f /src/main/scala/xyz/driver/core/app/DriverApp.scala | |
parent | e207352038e171e899695c895108fcca833ef70b (diff) | |
download | driver-core-b7e059da67bee48986b3165c94835f32b84cf76d.tar.gz driver-core-b7e059da67bee48986b3165c94835f32b84cf76d.tar.bz2 driver-core-b7e059da67bee48986b3165c94835f32b84cf76d.zip |
Move directives to rest package
Diffstat (limited to 'src/main/scala/xyz/driver/core/app/DriverApp.scala')
-rw-r--r-- | src/main/scala/xyz/driver/core/app/DriverApp.scala | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala index bc9d634..d95e254 100644 --- a/src/main/scala/xyz/driver/core/app/DriverApp.scala +++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala @@ -223,25 +223,6 @@ class DriverApp( } object DriverApp { - def defaultCorsHeaders: Directive0 = { - optionalHeaderValueByType[Origin](()) flatMap { originHeader => - respondWithHeaders( - List[HttpHeader]( - allowOrigin(originHeader), - `Access-Control-Allow-Headers`(AllowedHeaders: _*), - `Access-Control-Expose-Headers`(AllowedHeaders: _*) - )) - } - } - - def corsAllowedMethodHeaders(methods: scala.collection.immutable.Seq[HttpMethod]): Directive0 = { - respondWithHeaders( - List[HttpHeader]( - Allow(methods), - `Access-Control-Allow-Methods`(methods) - )) - } - implicit def rejectionHandler: RejectionHandler = RejectionHandler .newBuilder() @@ -250,8 +231,8 @@ object DriverApp { lazy val names = methods map (_.name) mkString ", " options { - defaultCorsHeaders { - corsAllowedMethodHeaders(methods) { + respondWithCorsHeaders { + respondWithCorsAllowedMethodHeaders(methods) { complete(s"Supported methods: $names.") } } @@ -259,9 +240,10 @@ object DriverApp { complete(MethodNotAllowed -> s"HTTP method not allowed, supported methods: $names!") } .handleAll[Rejection] { rejections => - defaultCorsHeaders { - RejectionHandler.default(rejections).getOrElse(reject) + respondWithCorsHeaders { + reject(rejections: _*) } } .result() + .seal } |