Skip to content

add base cors #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

add base cors #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d315ccc
add base cors
Bestils Dec 10, 2020
95b852e
Merge branch 'master' into feature/CORS
Bestils Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/g8/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ val akkaHttpVersion = "10.2.2"
val akkaVersion = "2.6.10"
val slickVersion = "3.3.3"
val zioVersion = "1.0.3"
$if(add_cors.truthy)$
val akkaHttpCorsVersion = "1.1.0"
$endif$
val zioLoggingVersion = "0.5.4"
val zioConfigVersion = "1.0.0-RC31-1"
val flywayVersion = "7.3.2"
Expand Down Expand Up @@ -31,6 +34,9 @@ val root = (project in file("."))
name := "$name$",
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
libraryDependencies ++= Seq(
$if(add_cors.truthy)$
"ch.megard" %% "akka-http-cors" % akkaHttpCorsVersion,
$endif$
"com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
"de.heikoseeberger" %% "akka-http-play-json" % "1.35.2",
"com.typesafe.akka" %% "akka-actor-typed" % akkaVersion,
Expand Down
1 change: 1 addition & 0 deletions src/main/g8/default.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ scala_version=2.13.4
add_caliban_endpoint=yes
add_server_sent_events_endpoint=yes
add_websocket_endpoint=yes
add_cors=yes
organization=com.example
package=$organization$
248 changes: 133 additions & 115 deletions src/main/g8/src/main/scala/$package$/api/Api.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package $package$.api

import akka.event.Logging._
import akka.http.scaladsl.model.{HttpResponse, StatusCodes}
import akka.http.scaladsl.model.{ HttpResponse, StatusCodes }
import akka.http.scaladsl.server.Directives._
import akka.http.scaladsl.server.{Directives, Route}
import akka.http.scaladsl.server.{ Directives, ExceptionHandler, RejectionHandler, Route }
import akka.http.interop._
import akka.http.scaladsl.model.StatusCodes.NoContent
import play.api.libs.json.JsObject
Expand Down Expand Up @@ -44,128 +44,146 @@ object Api {
case ValidationError(_) => HttpResponse(StatusCodes.BadRequest)
}

val itemRoute: Route =
path("healthcheck") {
get {
complete(HealthCheckService.healthCheck.provide(env))
} ~ head(complete(NoContent))
} ~ pathPrefix("items") {
logRequestResult(("items", InfoLevel)) {
pathEnd {
get {
complete(ApplicationService.getItems.provide(env))
} ~
post {
entity(Directives.as[CreateItemRequest]) { req =>
ApplicationService
.addItem(req.name, req.price)
.provide(env)
.map { id =>
complete {
Item(id, req.name, req.price)
import ch.megard.akka.http.cors.scaladsl.CorsDirectives._

// Your CORS settings are loaded from `application.conf`

// Your rejection handler
val rejectionHandler = corsRejectionHandler.withFallback(RejectionHandler.default)

// Your exception handler
val exceptionHandler = ExceptionHandler { case e: NoSuchElementException =>
complete(StatusCodes.NotFound -> e.getMessage)
}
// Combining the two handlers only for convenience
val handleErrors = handleRejections(rejectionHandler) & handleExceptions(exceptionHandler)

val itemRoute: Route =
handleErrors {
cors() {
handleErrors {
path("healthcheck") {
get {
complete(HealthCheckService.healthCheck.provide(env))
} ~ head(complete(NoContent))
} ~ pathPrefix("items") {
logRequestResult(("items", InfoLevel)) {
pathEnd {
get {
complete(ApplicationService.getItems.provide(env))
} ~
post {
entity(Directives.as[CreateItemRequest]) { req =>
ApplicationService
.addItem(req.name, req.price)
.provide(env)
.map { id =>
complete {
Item(id, req.name, req.price)
}
}
}
}
} ~
path(LongNumber) {
itemId =>
delete {
complete(
ApplicationService
.deleteItem(ItemId(itemId))
.provide(env)
.as(JsObject.empty)
)
} ~
get {
complete(ApplicationService.getItem(ItemId(itemId)).provide(env))
} ~
patch {
entity(Directives.as[PartialUpdateItemRequest]) { req =>
complete(
ApplicationService
.partialUpdateItem(ItemId(itemId), req.name, req.price)
.provide(env)
.as(JsObject.empty)
)
}
} ~
put {
entity(Directives.as[UpdateItemRequest]) { req =>
complete(
ApplicationService
.updateItem(ItemId(itemId), req.name, req.price)
.provide(env)
.as(JsObject.empty)
)
}
}
}
}
}
}
} ~
path(LongNumber) {
itemId =>
delete {
complete(
ApplicationService
.deleteItem(ItemId(itemId))
.provide(env)
.as(JsObject.empty)
)
} ~
get {
complete(ApplicationService.getItem(ItemId(itemId)).provide(env))
} ~
patch {
entity(Directives.as[PartialUpdateItemRequest]) { req =>
complete(
ApplicationService
.partialUpdateItem(ItemId(itemId), req.name, req.price)
.provide(env)
.as(JsObject.empty)
)
}
} ~
put {
entity(Directives.as[UpdateItemRequest]) { req =>
complete(
ApplicationService
.updateItem(ItemId(itemId), req.name, req.price)
.provide(env)
.as(JsObject.empty)
)
}
}
}
}
} $if(add_server_sent_events_endpoint.truthy)$ ~
pathPrefix("sse" / "items") {
import akka.http.scaladsl.marshalling.sse.EventStreamMarshalling._
} $if (add_server_sent_events_endpoint.truthy) $ ~pathPrefix("sse" / "items") {
import akka.http.scaladsl.marshalling.sse.EventStreamMarshalling._

logRequestResult(("sse/items", InfoLevel)) {
pathPrefix("deleted") {
get {
complete {
ApplicationService.deletedEvents.toPublisher
.map(p =>
Source
.fromPublisher(p)
.map(itemId => ServerSentEvent(itemId.value.toString))
.keepAlive(1.second, () => ServerSentEvent.heartbeat)
)
.provide(env)
logRequestResult(("sse/items", InfoLevel)) {
pathPrefix("deleted") {
get {
complete {
ApplicationService.deletedEvents.toPublisher
.map(p =>
Source
.fromPublisher(p)
.map(itemId => ServerSentEvent(itemId.value.toString))
.keepAlive(1.second, () => ServerSentEvent.heartbeat)
)
.provide(env)
}
}
}
}
}
}
}
} $endif$ $if(add_websocket_endpoint.truthy)$ ~
pathPrefix("ws" / "items") {
logRequestResult(("ws/items", InfoLevel)) {
val greeterWebSocketService =
Flow[Message].flatMapConcat {
case tm: TextMessage if tm.getStrictText == "deleted" =>
Source.futureSource(
unsafeRunToFuture(
ApplicationService.deletedEvents.toPublisher
.map(p =>
Source
.fromPublisher(p)
.map(itemId => TextMessage(s"deleted: \${itemId.value}"))
} $endif$ $if(add_websocket_endpoint.truthy) $ ~pathPrefix("ws" / "items") {
logRequestResult(("ws/items", InfoLevel)) {
val greeterWebSocketService =
Flow[Message].flatMapConcat {
case tm: TextMessage if tm.getStrictText == "deleted" =>
Source.futureSource(
unsafeRunToFuture(
ApplicationService.deletedEvents.toPublisher
.map(p =>
Source
.fromPublisher(p)
.map(itemId => TextMessage(s"deleted: \${itemId.value}"))
)
.provide(env)
)
)
.provide(env)
)
)
case tm: TextMessage =>
Try(tm.getStrictText.toLong) match {
case Success(value) =>
Source.futureSource(
unsafeRunToFuture(
ApplicationService
.getItem(ItemId(value))
.bimap(
_.asThrowable,
o => Source(o.toList.map(i => TextMessage(i.toString)))
case tm: TextMessage =>
Try(tm.getStrictText.toLong) match {
case Success(value) =>
Source.futureSource(
unsafeRunToFuture(
ApplicationService
.getItem(ItemId(value))
.bimap(
_.asThrowable,
o => Source(o.toList.map(i => TextMessage(i.toString)))
)
.provide(env)
)
)
.provide(env)
)
)
case Failure(_) => Source.empty
}
case bm: BinaryMessage =>
bm.getStreamedData.runWith(Sink.ignore, env.get[ActorSystem])
Source.empty
}
case Failure(_) => Source.empty
}
case bm: BinaryMessage =>
bm.getStreamedData.runWith(Sink.ignore, env.get[ActorSystem])
Source.empty
}

handleWebSocketMessages(greeterWebSocketService)
handleWebSocketMessages(greeterWebSocketService)
}
}
$endif$
}
}
}
$endif$
}
}
)

// accessors
Expand Down