Fixed Oxpecker handler definitions (#494)

* Fixed Oxpecker handler definitions
* Applied Oxpecker author suggestions

Author: xperiandri

samples/star-wars-api/Startup.fs

@@ -1,15 +1,16 @@
 namespace FSharp.Data.GraphQL.Samples.StarWarsApi
 
 open System
+open System.Threading.Tasks
 open Microsoft.AspNetCore.Builder
 open Microsoft.AspNetCore.Http
 open Microsoft.Extensions.Configuration
 open Microsoft.Extensions.DependencyInjection
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.Hosting
-open Giraffe
+open Oxpecker
 open FSharp.Data.GraphQL.Server.AspNetCore
-open FSharp.Data.GraphQL.Server.AspNetCore.Giraffe
+open FSharp.Data.GraphQL.Server.AspNetCore.Oxpecker
 
 type Startup private () =
 
@@ -25,20 +26,13 @@ type Startup private () =
         Startup ()
         then this.Configuration <- configuration
 
-    member _.ConfigureServices (services : IServiceCollection) =
+    member _.ConfigureServices (services : IServiceCollection) : unit =
         services
-            .AddGiraffe()
+            .AddOxpecker()
             .AddGraphQL<Root> (Schema.executor, rootFactory, configure = configure)
         |> ignore
 
-    member _.Configure
-        (
-            app : IApplicationBuilder,
-            env : IHostEnvironment
-        ) =
-        let errorHandler (ex : Exception) (log : ILogger) =
-            log.LogError (EventId (), ex, "An unhandled exception has occurred while executing the request.")
-            clearResponse >=> setStatusCode 500
+    member _.Configure (app : IApplicationBuilder, env : IHostEnvironment) : unit =
 
         if env.IsDevelopment () then
             app.UseGraphQLAltair "/altair" |> ignore
@@ -50,15 +44,19 @@ type Startup private () =
             |> ignore
 
         app
-            .UseGiraffeErrorHandler(errorHandler)
+            //.UseGiraffeErrorHandler(errorHandler)
+            .UseRouting()
             .UseWebSockets()
             .UseWebSocketsForGraphQL<Root>()
-            .UseGiraffe (
-                // 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>
-            )
+            .UseEndpoints (fun endpoints ->
+                // Simple declaration
+                //endpoints.MapOxpeckerEndpoint (HttpEndpoints.graphQL<Root>("/", id))
+                let handler =
+                    setHttpHeader "Access-Control-Allow-Origin" "*"
+                    >=> setHttpHeader "Access-Control-Allow-Headers" "content-type"
+                    >=> (setHttpHeader "Request-Type" "Classic") // For integration testing purposes
+                    >=> HttpEndpointHandlers.graphQL<Root>
+                endpoints.MapOxpeckerEndpoint (route "/" handler))
+        |> ignore
 
     member val Configuration : IConfiguration = null with get, set

samples/star-wars-api/star-wars-api.fsproj

@@ -25,8 +25,8 @@
 
   <ItemGroup Label="ProjectReferences">
     <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Server.AspNetCore\FSharp.Data.GraphQL.Server.AspNetCore.fsproj" />
-    <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Server.Giraffe\FSharp.Data.GraphQL.Server.Giraffe.fsproj" />
     <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Server.Middleware\FSharp.Data.GraphQL.Server.Middleware.fsproj" />
+    <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Server.Oxpecker\FSharp.Data.GraphQL.Server.Oxpecker.fsproj" />
     <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Server.Relay\FSharp.Data.GraphQL.Server.Relay.fsproj" />
     <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Server\FSharp.Data.GraphQL.Server.fsproj" />
     <ProjectReference Include="..\..\src\FSharp.Data.GraphQL.Shared\FSharp.Data.GraphQL.Shared.fsproj" />

src/FSharp.Data.GraphQL.Server.Oxpecker/HttpEndpoints.fs

@@ -1,4 +1,4 @@
-namespace FSharp.Data.GraphQL.Server.AspNetCore.Giraffe
+namespace FSharp.Data.GraphQL.Server.AspNetCore.Oxpecker
 
 open System.Runtime.InteropServices
 open System.Threading.Tasks
@@ -10,16 +10,19 @@ open Oxpecker
 
 open FSharp.Data.GraphQL.Server.AspNetCore
 
-module HttpEndpoints =
+module HttpEndpointHandlers =
 
-    let internal writeIResult2 (ctx : HttpContext) (taskRes: Task<Result<IResult, IResult>>) : Task = task {
+    let internal writeIResult2 (ctx : HttpContext) (taskRes : Task<Result<IResult, IResult>>) : Task = task {
         let! result = taskRes |> TaskResult.defaultWith id
         do! ctx.Write result
     }
 
-    let private handleGraphQL<'Root> (ctx : HttpContext) : Task =
+    let graphQL<'Root> (ctx : HttpContext) : Task =
 
-        let request = ctx.RequestServices.GetRequiredService<GraphQLRequestHandler<'Root>>()
+        let request = ctx.RequestServices.GetRequiredService<GraphQLRequestHandler<'Root>> ()
         request.HandleAsync () |> writeIResult2 ctx
 
-    let graphQL<'Root> (route, [<Optional>] configure) : Endpoint = SimpleEndpoint(Verbs [HttpVerb.GET; HttpVerb.POST], route, handleGraphQL<'Root>, configure)
+module HttpEndpoints =
+
+    let graphQL<'Root> (route, configure) : Endpoint =
+        SimpleEndpoint (Verbs [ HttpVerb.GET; HttpVerb.POST ], route, HttpEndpointHandlers.graphQL<'Root>, configure)