diff options
| author | vlad <vlad@driver.xyz> | 2017-05-23 21:54:06 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-05-23 21:54:06 -0700 |
| commit | 9cff219fa07f516517e13300c14c63ac71043476 (patch) | |
| tree | 7c014a9d6f64eb83f8b9c4b794a66013a94deb98 | |
| parent | 6427b9dc1a60b670c70aca05f419e3fc3313cf6a (diff) | |
| download | driver-core-9cff219fa07f516517e13300c14c63ac71043476.tar.gz driver-core-9cff219fa07f516517e13300c14c63ac71043476.tar.bz2 driver-core-9cff219fa07f516517e13300c14c63ac71043476.zip | |
Allow websites to work directly with Scala APIs
| -rw-r--r-- | src/main/scala/xyz/driver/core/app.scala | 7 | ||||
| -rw-r--r-- | src/main/scala/xyz/driver/core/file/S3Storage.scala | 12 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/main/scala/xyz/driver/core/app.scala b/src/main/scala/xyz/driver/core/app.scala index e35c300..1977d6a 100644 --- a/src/main/scala/xyz/driver/core/app.scala +++ b/src/main/scala/xyz/driver/core/app.scala @@ -7,7 +7,7 @@ import akka.http.scaladsl.Http import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport import akka.http.scaladsl.model.StatusCodes._ import akka.http.scaladsl.model._ -import akka.http.scaladsl.model.headers.RawHeader +import akka.http.scaladsl.model.headers.{HttpOriginRange, RawHeader, `Access-Control-Allow-Origin`} import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server.RouteResult._ import akka.http.scaladsl.server.{ExceptionHandler, Route, RouteConcatenation} @@ -97,7 +97,10 @@ object app { handleExceptions(ExceptionHandler(exceptionHandler))({ c => requestLogging.flatMap { _ => - respondWithHeaders(List(RawHeader(ContextHeaders.TrackingIdHeader, trackingId))) { + val responseHeaders = List[HttpHeader](RawHeader(ContextHeaders.TrackingIdHeader, trackingId), + `Access-Control-Allow-Origin`(HttpOriginRange.*)) + + respondWithHeaders(responseHeaders) { modules.map(_.route).foldLeft(versionRt ~ healthRoute ~ swaggerRoutes)(_ ~ _) }(c) } diff --git a/src/main/scala/xyz/driver/core/file/S3Storage.scala b/src/main/scala/xyz/driver/core/file/S3Storage.scala index 50bfe85..933b01a 100644 --- a/src/main/scala/xyz/driver/core/file/S3Storage.scala +++ b/src/main/scala/xyz/driver/core/file/S3Storage.scala @@ -53,11 +53,13 @@ class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionC result.isTruncated } flatMap { result => result.getObjectSummaries.asScala.toList.map { summary => - FileLink(Name[File](summary.getKey), - Paths.get(path.toString + "/" + summary.getKey), - Revision[File](summary.getETag), - Time(summary.getLastModified.getTime), - summary.getSize) + FileLink( + Name[File](summary.getKey), + Paths.get(path.toString + "/" + summary.getKey), + Revision[File](summary.getETag), + Time(summary.getLastModified.getTime), + summary.getSize + ) } filterNot isInSubFolder(path) } toList }) |