Merge pull request #86 from drivergroup/zsmith/cors-headers-basic-routesv1.6.2v1.6.1

Add default headers to basic routes defined in DriverApp

1 files changed, 7 insertions, 2 deletions

diff --git a/src/main/scala/xyz/driver/core/app/DriverApp.scala b/src/main/scala/xyz/driver/core/app/DriverApp.scala
index 751bef7..5297c90 100644
--- a/src/main/scala/xyz/driver/core/app/DriverApp.scala
+++ b/src/main/scala/xyz/driver/core/app/DriverApp.scala
@@ -44,6 +44,7 @@ class DriverApp(appName: String,
                 scheme: String = "http",
                 port: Int = 8080,
                 tracer: Tracer = NoTracer)(implicit actorSystem: ActorSystem, executionContext: ExecutionContext) {
+  self =>
   import DriverApp._
 
   implicit private lazy val materializer: ActorMaterializer = ActorMaterializer()(actorSystem)
@@ -69,12 +70,16 @@ class DriverApp(appName: String,
   private def extractHeader(request: HttpRequest)(headerName: String): Option[String] =
     request.headers.find(_.name().toLowerCase === headerName).map(_.value())
 
-  protected def appRoute: Route = {
+  def appRoute: Route = {
     val serviceTypes   = modules.flatMap(_.routeTypes)
     val swaggerService = swaggerOverride(serviceTypes)
     val swaggerRoute   = swaggerService.routes ~ swaggerService.swaggerUI
     val versionRt      = versionRoute(version, gitHash, time.currentTime())
-    val combinedRoute  = modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoute)(_ ~ _)
+    val basicRoutes = new DriverRoute {
+      override def log: Logger  = self.log
+      override def route: Route = versionRt ~ healthRoute ~ swaggerRoute
+    }
+    val combinedRoute = modules.map(_.route).foldLeft(basicRoutes.routeWithDefaults)(_ ~ _)
 
     (extractHost & extractClientIP & trace(tracer)) {
       case (origin, ip) =>