From 2111171904142b210e17da087ec681c05693334e Mon Sep 17 00:00:00 2001 From: Sylvain Le Bon Date: Thu, 12 Feb 2015 20:44:16 +0100 Subject: [PATCH 1/2] update: headers for CORS --- app/controllers/ldp/ReadWriteWebControllerGeneric.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/controllers/ldp/ReadWriteWebControllerGeneric.scala b/app/controllers/ldp/ReadWriteWebControllerGeneric.scala index d8cf6e44..ac5db66f 100644 --- a/app/controllers/ldp/ReadWriteWebControllerGeneric.scala +++ b/app/controllers/ldp/ReadWriteWebControllerGeneric.scala @@ -79,7 +79,7 @@ trait ReadWriteWebControllerGeneric extends ReadWriteWebControllerTrait { private def allowHeaders(authResult: AuthResult[NamedResource[Rdf]]): List[(String, String)] = { val modesAllowed = authResult.authInfo.modesAllowed val isLDPC = authResult.result.isInstanceOf[LocalLDPC[_]] - val allow = "Allow" -> { + val allow = "Access-Control-Allow-Methods" -> { val headerStr = modesAllowed.collect { case Method.Append => authResult.result match { @@ -204,7 +204,9 @@ trait ReadWriteWebControllerGeneric extends ReadWriteWebControllerTrait { writerFor[Rdf#Graph](request).map { wr => val headers = "Access-Control-Allow-Origin" -> "*" :: - "Accept-Patch" -> Syntax.SparqlUpdate.mimeTypes.head.mime :: //todo: something that is more flexible + "Access-Control-Allow-Headers" -> "content-type, If-Match" :: + "Access-Control-Expose-Headers" -> "Etag" :: + "Accept-Patch" -> Syntax.SparqlUpdate.mimeTypes.head.mime :: //todo: something that is more flexible linkHeaders(ldpr) :: commonHeaders result(200, wr, Map(headers: _*))(ldpr.relativeGraph) From c5d33b6cd77917019e14064f0e0b1a54e14b1057 Mon Sep 17 00:00:00 2001 From: Sylvain Le Bon Date: Sat, 18 Jul 2015 23:35:34 +0200 Subject: [PATCH 2/2] update: added allowed headers for container creation --- app/controllers/ldp/ReadWriteWebControllerGeneric.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/ldp/ReadWriteWebControllerGeneric.scala b/app/controllers/ldp/ReadWriteWebControllerGeneric.scala index ac5db66f..12187432 100644 --- a/app/controllers/ldp/ReadWriteWebControllerGeneric.scala +++ b/app/controllers/ldp/ReadWriteWebControllerGeneric.scala @@ -204,7 +204,7 @@ trait ReadWriteWebControllerGeneric extends ReadWriteWebControllerTrait { writerFor[Rdf#Graph](request).map { wr => val headers = "Access-Control-Allow-Origin" -> "*" :: - "Access-Control-Allow-Headers" -> "content-type, If-Match" :: + "Access-Control-Allow-Headers" -> "content-type, If-Match, Link, Slug" :: "Access-Control-Expose-Headers" -> "Etag" :: "Accept-Patch" -> Syntax.SparqlUpdate.mimeTypes.head.mime :: //todo: something that is more flexible linkHeaders(ldpr) ::