Added option for forwarding upload request

Author: develeon

adapters/quick/src/main/scala/caliban/QuickAdapter.scala

@@ -7,22 +7,22 @@ import zio.http.netty.NettyConfig
 import zio.http.netty.NettyConfig.LeakDetectionLevel
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
-final class QuickAdapter[R] private (requestHandler: QuickRequestHandler[R]) {
+final class QuickAdapter[R] private (requestHandler: QuickRequestHandler[R], forwardUploadRequest: Boolean) {
 
   private implicit val trace: Trace = Trace.empty
 
   /**
    * Converts this adapter to a [[QuickHandlers]] which contains [[zio.http.RequestHandler]]s for manually constructing zio-http routes
    */
   val handlers: QuickHandlers[R] = QuickHandlers(
-    api = Handler.fromFunctionZIO[Request](requestHandler.handleHttpRequest),
+    api = Handler.fromFunctionZIO[Request](requestHandler.handleHttpRequest(forwardUploadRequest)),
     upload = Handler.fromFunctionZIO[Request](requestHandler.handleUploadRequest),
     webSocket = Handler.fromFunctionZIO[Request](requestHandler.handleWebSocketRequest)
   )
 
   @deprecated("Use `handlers` instead", "2.5.0")
   lazy val handler: RequestHandler[R, Nothing] =
-    Handler.fromFunctionZIO[Request](requestHandler.handleHttpRequest)
+    Handler.fromFunctionZIO[Request](requestHandler.handleHttpRequest(forwardUploadRequest))
 
   /**
    * Converts this adapter to a `Routes` serving the GraphQL API at the specified path.
@@ -93,8 +93,8 @@ final class QuickAdapter[R] private (requestHandler: QuickRequestHandler[R]) {
 object QuickAdapter {
   type Configurator[-R] = URIO[R & Scope, Unit]
 
-  def apply[R](interpreter: GraphQLInterpreter[R, Any]): QuickAdapter[R] =
-    new QuickAdapter(new QuickRequestHandler(interpreter, quick.WebSocketConfig.default))
+  def apply[R](interpreter: GraphQLInterpreter[R, Any], forwardUploadRequest: Boolean = false): QuickAdapter[R] =
+    new QuickAdapter(new QuickRequestHandler(interpreter, quick.WebSocketConfig.default), forwardUploadRequest)
 
   def handlers[R](implicit tag: Tag[R], trace: Trace): URIO[QuickAdapter[R], QuickHandlers[R]] =
     ZIO.serviceWith(_.handlers)

adapters/quick/src/main/scala/caliban/QuickRequestHandler.scala

@@ -42,14 +42,25 @@ final private class QuickRequestHandler[R](
   def configureWebSocket[R1](config: quick.WebSocketConfig[R1]): QuickRequestHandler[R & R1] =
     new QuickRequestHandler[R & R1](interpreter, config)
 
-  def handleHttpRequest(request: Request)(implicit trace: Trace): URIO[R, Response] = ZIO.suspendSucceed {
-    transformHttpRequest(request)
-      .flatMap(executeRequest(request.method, _))
-      .foldZIO(
-        Exit.succeed,
-        resp => Exit.succeed(transformResponse(request, resp))
+  def handleHttpRequest(forwardUploadRequests: Boolean = false)(request: Request)(implicit
+    trace: Trace
+  ): URIO[R, Response] =
+    if (
+      forwardUploadRequests && request.headers.exists(
+        _.renderedValue.contains(MediaType.multipart.`form-data`.fullType)
       )
-  }
+    ) {
+      handleUploadRequest(request)
+    } else {
+      ZIO.suspendSucceed {
+        transformHttpRequest(request)
+          .flatMap(executeRequest(request.method, _))
+          .foldZIO(
+            Exit.succeed,
+            resp => Exit.succeed(transformResponse(request, resp))
+          )
+      }
+    }
 
   def handleUploadRequest(request: Request)(implicit trace: Trace): URIO[R, Response] = ZIO.suspendSucceed {
     transformUploadRequest(request).flatMap { case (req, fileHandle) =>