From a4b2648a288110350c0ff8dc784626668112ab84 Mon Sep 17 00:00:00 2001
From: Zach Smith <zach@driver.xyz>
Date: Fri, 26 Jan 2018 11:43:52 -0800
Subject: Remove rejection handler, respond with default set of allowed methods
 and origins to all options requests in DriverRoute

---
 src/main/scala/xyz/driver/core/app/DriverApp.scala | 33 ++--------------------
 src/main/scala/xyz/driver/core/app/module.scala    |  5 ++--
 2 files changed, 6 insertions(+), 32 deletions(-)

(limited to 'src/main/scala/xyz/driver/core/app')

diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala
index d95e254..a593893 100644
--- a/src/main/scala/xyz/driver/core/app/DriverApp.scala
+++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala
@@ -2,7 +2,6 @@ package xyz.driver.core.app
 
 import akka.actor.ActorSystem
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
-import akka.http.scaladsl.model.StatusCodes._
 import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers._
 import akka.http.scaladsl.server.Directives._
@@ -42,7 +41,6 @@ class DriverApp(
     port: Int = 8080,
     tracer: Tracer = NoTracer)(implicit actorSystem: ActorSystem, executionContext: ExecutionContext) {
   self =>
-  import DriverApp._
 
   implicit private lazy val materializer: ActorMaterializer = ActorMaterializer()(actorSystem)
   private lazy val http: HttpExt                            = Http()(actorSystem)
@@ -73,8 +71,9 @@ class DriverApp(
     val swaggerRoute   = swaggerService.routes ~ swaggerService.swaggerUI
     val versionRt      = versionRoute(version, gitHash, time.currentTime())
     val basicRoutes = new DriverRoute {
-      override def log: Logger  = self.log
-      override def route: Route = versionRt ~ healthRoute ~ swaggerRoute
+      override def log: Logger    = self.log
+      override def config: Config = xyz.driver.core.config.loadDefaultConfig
+      override def route: Route   = versionRt ~ healthRoute ~ swaggerRoute
     }
     val combinedRoute = modules.map(_.route).foldLeft(basicRoutes.routeWithDefaults)(_ ~ _)
 
@@ -221,29 +220,3 @@ class DriverApp(
     })
   }
 }
-
-object DriverApp {
-  implicit def rejectionHandler: RejectionHandler =
-    RejectionHandler
-      .newBuilder()
-      .handleAll[MethodRejection] { rejections =>
-        val methods    = rejections map (_.supported)
-        lazy val names = methods map (_.name) mkString ", "
-
-        options {
-          respondWithCorsHeaders {
-            respondWithCorsAllowedMethodHeaders(methods) {
-              complete(s"Supported methods: $names.")
-            }
-          }
-        } ~
-          complete(MethodNotAllowed -> s"HTTP method not allowed, supported methods: $names!")
-      }
-      .handleAll[Rejection] { rejections =>
-        respondWithCorsHeaders {
-          reject(rejections: _*)
-        }
-      }
-      .result()
-      .seal
-}
diff --git a/src/main/scala/xyz/driver/core/app/module.scala b/src/main/scala/xyz/driver/core/app/module.scala
index 7be38eb..0a255fb 100644
--- a/src/main/scala/xyz/driver/core/app/module.scala
+++ b/src/main/scala/xyz/driver/core/app/module.scala
@@ -30,8 +30,9 @@ class EmptyModule extends Module {
 
 class SimpleModule(override val name: String, theRoute: Route, routeType: Type) extends Module {
   private val driverRoute: DriverRoute = new DriverRoute {
-    override def route: Route = theRoute
-    override val log: Logger  = xyz.driver.core.logging.NoLogger
+    override def route: Route   = theRoute
+    override val config: Config = xyz.driver.core.config.loadDefaultConfig
+    override val log: Logger    = xyz.driver.core.logging.NoLogger
   }
 
   override def route: Route          = driverRoute.routeWithDefaults
-- 
cgit v1.2.3