Moved Giraffe request handlers out of the GraphQL handler

fsprojects · Mar 11, 2024 · 8e4943d · 8e4943d
1 parent a3ce3c6
commit 8e4943d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/samples/star-wars-api/Startup.fs b/samples/star-wars-api/Startup.fs
@@ -46,8 +46,11 @@ type Startup private () =
             .UseWebSockets()
             .UseWebSocketsForGraphQL<Root>()
             .UseGiraffe (
-                HttpHandlers.graphQL<Root>
-                >=> (setHttpHeader "Request-Type" "Classic")
+                // Set CORS to allow external servers (React samples) to call this API
+                setHttpHeader "Access-Control-Allow-Origin" "*"
+                >=> setHttpHeader "Access-Control-Allow-Headers" "content-type"
+                >=> (setHttpHeader "Request-Type" "Classic") // For integration testing purposes
+                >=> HttpHandlers.graphQL<Root>
             )
 
     member val Configuration : IConfiguration = null with get, set
diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/Giraffe/HttpHandlers.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/Giraffe/HttpHandlers.fs
@@ -33,11 +33,6 @@ module HttpHandlers =
         |> TaskResult.defaultWith id
         |> ofTaskIResult ctx
 
-    /// Set CORS to allow external servers (React samples) to call this API
-    let setCorsHeaders : HttpHandler =
-        setHttpHeader "Access-Control-Allow-Origin" "*"
-        >=> setHttpHeader "Access-Control-Allow-Headers" "content-type"
-
     let private handleGraphQL<'Root> (next : HttpFunc) (ctx : HttpContext) =
         let sp = ctx.RequestServices
 
@@ -258,11 +253,10 @@ module HttpHandlers =
 
         taskResult {
             let executor = options.SchemaExecutor
-            ctx.Response.Headers.Add("Request-Type", "Classic") // For integration testing purposes
             match! checkOperationType ctx with
             | IntrospectionQuery optionalAstDocument -> return! executeIntrospectionQuery executor optionalAstDocument
             | OperationQuery content -> return! executeOperation executor content
         }
         |> ofTaskIResult2 ctx
 
-    let graphQL<'Root> : HttpHandler = setCorsHeaders >=> choose [ POST; GET ] >=> handleGraphQL<'Root>
+    let graphQL<'Root> : HttpHandler = choose [ POST; GET ] >=> handleGraphQL<'Root>