Merged Pull Request '#54 ClientsidePropertyServiceCore-allow-origin->…

…main : Clientside property service core allow origin' Clientside property service core allow origin
51Degrees · Apr 16, 2024 · a2fb572 · a2fb572
2 parents c517520 + f26f7f6
commit a2fb572
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/...eline.web/src/main/java/fiftyone/pipeline/web/services/ClientsidePropertyServiceCore.java b/...eline.web/src/main/java/fiftyone/pipeline/web/services/ClientsidePropertyServiceCore.java
@@ -239,13 +239,14 @@ public void serveContent(
                     default:
                         break;
                 }
-                response.getWriter().write(content);
 
                 setHeaders(
                     response,
                     hash,
                     content == null ? 0 : content.length(),
                     contentType == ContentTypes.JavaScript ? "x-javascript" : "json");
+
+                response.getWriter().write(content);
             }
 
         }
@@ -270,6 +271,7 @@ private void setHeaders(
             response.setHeader("Cache-Control", stringJoin(cacheControl, ","));
             response.setHeader("Vary", stringJoin(headersAffectingJavaScript, ","));
             response.setHeader("ETag", Integer.toString(hash));
+            response.setHeader("Access-Control-Allow-Origin", "*");
         }
     }
 }
diff --git a/...ages/pipeline.web/src/test/java/fiftyone/pipeline/web/ClientsidePropertyServiceTests.java b/...ages/pipeline.web/src/test/java/fiftyone/pipeline/web/ClientsidePropertyServiceTests.java
@@ -253,6 +253,8 @@ private void ValidateResponse(
     else {
       verify(response, times(0)).setHeader(eq("ETag"), anyString());
     }
+
+    verify(response).setHeader(eq("Access-Control-Allow-Origin"), eq("*"));
   }
 
   @SuppressWarnings("rawtypes")
-Original file line number
+Diff line change
@@ Expand Up / @@ -253,6 +253,8 @@ private void ValidateResponse( @@
         else {
           verify(response, times(0)).setHeader(eq("ETag"), anyString());
         }
+        verify(response).setHeader(eq("Access-Control-Allow-Origin"), eq("*"));
       }
       @SuppressWarnings("rawtypes")
@@ Expand Down @@