Resolve Routes environment via context providing middleware

zio-http/src/main/scala/zio/http/HandlerAspect.scala

@@ -22,6 +22,7 @@ import java.nio.charset._
 import zio._
 import zio.metrics._
 
+import zio.http.endpoint.EndpointMiddleware.None.Err
 import zio.http.template._
 
 /**
@@ -42,7 +43,7 @@ import zio.http.template._
  * specialized to entuple contexts, so that each layer may only add context to
  * the contextual output.
  */
-final case class HandlerAspect[-Env, +CtxOut](
+final case class HandlerAspect[-Env, +CtxOut: Tag](
   protocol: ProtocolStack[
     Env,
     Request,
@@ -59,7 +60,7 @@ final case class HandlerAspect[-Env, +CtxOut](
    * incoming requests, and first on outgoing responses. Context from both
    * middleware will be combined using tuples.
    */
-  def ++[Env1 <: Env, CtxOut2](
+  def ++[Env1 <: Env, CtxOut2: Tag](
     that: HandlerAspect[Env1, CtxOut2],
   )(implicit zippable: Zippable[CtxOut, CtxOut2]): HandlerAspect[Env1, zippable.Out] =
     HandlerAspect {
@@ -125,6 +126,20 @@ final case class HandlerAspect[-Env, +CtxOut](
     }
   }
 
+  def applyHandlerContextAsEnvRoutes[Err](
+    routes: Routes[CtxOut, Err],
+  ): Routes[Env, Err] = {
+    routes.transform[Env] { handler =>
+      for {
+        tuple <- protocol.incomingHandler
+        (state, (request, ctxOut)) = tuple
+        either   <- Handler.fromZIO(handler(request)).either.provideEnvironment(ZEnvironment(ctxOut))
+        response <- Handler.fromZIO(protocol.outgoingHandler((state, either.merge)))
+        response <- if (either.isLeft) Handler.fail(response) else Handler.succeed(response)
+      } yield response
+    }
+  }
+
   def applyHandler[Env1 <: Env](handler: RequestHandler[Env1, Response]): RequestHandler[Env1, Response] =
     if (self == HandlerAspect.identity) handler
     else {
@@ -141,14 +156,14 @@ final case class HandlerAspect[-Env, +CtxOut](
    * Returns new middleware that transforms the context of the middleware to the
    * specified constant.
    */
-  def as[CtxOut2](ctxOut2: => CtxOut2): HandlerAspect[Env, CtxOut2] =
+  def as[CtxOut2: Tag](ctxOut2: => CtxOut2): HandlerAspect[Env, CtxOut2] =
     map(_ => ctxOut2)
 
   /**
    * Returns new middleware that transforms the context of the middleware using
    * the specified function.
    */
-  def map[CtxOut2](f: CtxOut => CtxOut2): HandlerAspect[Env, CtxOut2] =
+  def map[CtxOut2: Tag](f: CtxOut => CtxOut2): HandlerAspect[Env, CtxOut2] =
     HandlerAspect(protocol.mapIncoming { case (request, ctx) => (request, f(ctx)) })
 
   /**
@@ -351,7 +366,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * requests to be passed on to the app, and provides a context to the request
    * handlers.
    */
-  final def customAuthProviding[Context](
+  final def customAuthProviding[Context: Tag](
     provide: Request => Option[Context],
     responseHeaders: Headers = Headers.empty,
     responseStatus: Status = Status.Unauthorized,
@@ -363,7 +378,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * requests to be passed on to the app, and provides a context to the request
    * handlers.
    */
-  def customAuthProvidingZIO[Env, Context](
+  def customAuthProvidingZIO[Env, Context: Tag](
     provide: Request => ZIO[Env, Nothing, Option[Context]],
     responseHeaders: Headers = Headers.empty,
     responseStatus: Status = Status.Unauthorized,
@@ -454,7 +469,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * another based on the result of the predicate, applied to the incoming
    * request's headers.
    */
-  def ifHeaderThenElse[Env, Ctx](
+  def ifHeaderThenElse[Env, Ctx: Tag](
     condition: Headers => Boolean,
   )(
     ifTrue: HandlerAspect[Env, Ctx],
@@ -467,7 +482,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * another based on the result of the predicate, applied to the incoming
    * request's method.
    */
-  def ifMethodThenElse[Env, Ctx](
+  def ifMethodThenElse[Env, Ctx: Tag](
     condition: Method => Boolean,
   )(
     ifTrue: HandlerAspect[Env, Ctx],
@@ -480,7 +495,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * another based on the result of the predicate, applied to the incoming
    * request.
    */
-  def ifRequestThenElse[Env, CtxOut](
+  def ifRequestThenElse[Env, CtxOut: Tag](
     predicate: Request => Boolean,
   )(
     ifTrue: HandlerAspect[Env, CtxOut],
@@ -497,7 +512,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * another based on the result of the predicate, effectfully applied to the
    * incoming request.
    */
-  def ifRequestThenElseZIO[Env, CtxOut](
+  def ifRequestThenElseZIO[Env, CtxOut: Tag](
     predicate: Request => ZIO[Env, Response, Boolean],
   )(
     ifTrue: HandlerAspect[Env, CtxOut],
@@ -525,7 +540,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * incoming and outgoing requests. If the incoming handler fails, then the
    * outgoing handler will not be invoked.
    */
-  def interceptHandler[Env, CtxOut](
+  def interceptHandler[Env, CtxOut: Tag](
     incoming0: Handler[Env, Response, Request, (Request, CtxOut)],
   )(
     outgoing0: Handler[Env, Nothing, Response, Response],
@@ -537,7 +552,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * incoming and outgoing requests. If the incoming handler fails, then the
    * outgoing handler will not be invoked.
    */
-  def interceptHandlerStateful[Env, State0, CtxOut](
+  def interceptHandlerStateful[Env, State0, CtxOut: Tag](
     incoming0: Handler[
       Env,
       Response,
@@ -553,7 +568,7 @@ private[http] trait HandlerAspects extends zio.http.internal.HeaderModifier[Hand
    * Creates middleware that will apply the specified handler to incoming
    * requests.
    */
-  def interceptIncomingHandler[Env, CtxOut](
+  def interceptIncomingHandler[Env, CtxOut: Tag](
     handler: Handler[Env, Response, Request, (Request, CtxOut)],
   ): HandlerAspect[Env, CtxOut] =
     interceptHandler(handler)(Handler.identity)

zio-http/src/main/scala/zio/http/Routes.scala

@@ -57,6 +57,9 @@ final class Routes[-Env, +Err] private (val routes: Chunk[zio.http.Route[Env, Er
   def @@[Env1 <: Env](aspect: Middleware[Env1]): Routes[Env1, Err] =
     aspect(self)
 
+  def @@[Env1](aspect: HandlerAspect[Env1, Env]): Routes[Env1, Err] =
+    aspect.applyHandlerContextAsEnvRoutes(self)
+
   def asEnvType[Env2](implicit ev: Env2 <:< Env): Routes[Env2, Err] =
     self.asInstanceOf[Routes[Env2, Err]]
 

zio-http/src/main/scala/zio/http/endpoint/EndpointMiddleware.scala

@@ -17,7 +17,7 @@
 package zio.http.endpoint
 
 import zio.stacktracer.TracingImplicits.disableAutoTrace
-import zio.{Chunk, Trace, ZIO}
+import zio.{Chunk, Tag, Trace, ZIO}
 
 import zio.http.Header.Accept.MediaTypeWithQFactor
 import zio.http._
@@ -52,7 +52,7 @@ sealed trait EndpointMiddleware { self =>
   def ??(doc: Doc): EndpointMiddleware.Typed[In, Err, Out] =
     EndpointMiddleware.Spec(input, output, error, doc)
 
-  def implement[R, S](incoming: In => ZIO[R, Err, S])(
+  def implement[R, S: Tag](incoming: In => ZIO[R, Err, S])(
     outgoing: S => ZIO[R, Err, Out],
   )(implicit trace: Trace): HandlerAspect[R, S] =
     HandlerAspect.interceptHandlerStateful(

zio-http/src/test/scala/zio/http/endpoint/RoundtripSpec.scala

@@ -322,7 +322,7 @@ object RoundtripSpec extends ZIOHttpSpec {
         val routes = endpointRoute
 
         val app = routes.toHttpApp @@ alwaysFailingMiddleware
-          .implement(_ => ZIO.fail("FAIL"))(_ => ZIO.unit)
+          .implement(_ => ZIO.fail("FAIL"))((_: Any) => ZIO.unit)
 
         for {
           port <- Server.install(app)
@@ -361,7 +361,7 @@ object RoundtripSpec extends ZIOHttpSpec {
         val routes = endpointRoute
 
         val app = routes.toHttpApp @@ alwaysFailingMiddleware
-          .implement(_ => ZIO.fail("FAIL"))(_ => ZIO.unit)
+          .implement(_ => ZIO.fail("FAIL"))((_: Any) => ZIO.unit)
 
         for {
           port <- Server.install(app)

zio-http/src/test/scala/zio/http/internal/middlewares/AuthSpec.scala

@@ -16,10 +16,13 @@
 
 package zio.http.internal.middlewares
 
+import java.net.URLDecoder
+
 import zio.test.Assertion._
 import zio.test._
 import zio.{Ref, ZIO}
 
+import zio.http.Header.ContentTransferEncoding.Base64
 import zio.http._
 import zio.http.internal.HttpAppTestExtensions
 
@@ -77,6 +80,20 @@ object AuthSpec extends ZIOHttpSpec with HttpAppTestExtensions {
         } @@ basicAuthContextM).merge.mapZIO(_.body.asString)
         assertZIO(app.runZIO(Request.get(URL.empty).copy(headers = successBasicHeader)))(equalTo("user"))
       },
+      test("Extract basic auth username and pw via context providing through environment") {
+        val app = {
+          Routes(
+            (Method.GET / "context") -> Handler.fromZIO(
+              ZIO.serviceWith[Header.Authorization.Basic](s => Response.text(s"${s.username}:${s.password}")),
+            ),
+          ) @@ Middleware.customAuthProviding[Header.Authorization.Basic](_.headers.get(Header.Authorization).collect {
+            case basicAuth @ Header.Authorization.Basic(_, _) => basicAuth
+          })
+        }.toHttpApp
+        assertZIO(
+          app.runZIO(Request.get(URL.root / "context").copy(headers = successBasicHeader)).flatMap(_.body.asString),
+        )(equalTo("user:resu"))
+      },
       test("Extract username via context with Routes") {
         val app = {
           Routes(