Refactor organization of scope aware request utils

Reorganized the structure of the Request Utils due to their widespread use
resulting in circular imports issues (mostly because of middleware & logger).

pkg/middleware/scope.go

@@ -1,39 +1,20 @@
 package middleware
 
 import (
-	"context"
 	"net/http"
 
 	"github.com/justinas/alice"
 	middlewareapi "github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/middleware"
-	"github.com/oauth2-proxy/oauth2-proxy/v7/pkg/apis/options"
 )
 
-type scopeKey string
-
-// requestScopeKey uses a typed string to reduce likelihood of clashing
-// with other context keys
-const requestScopeKey scopeKey = "request-scope"
-
-func NewScope(opts *options.Options) alice.Constructor {
+func NewScope(reverseProxy bool) alice.Constructor {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
 			scope := &middlewareapi.RequestScope{
-				ReverseProxy: opts.ReverseProxy,
+				ReverseProxy: reverseProxy,
 			}
-			contextWithScope := context.WithValue(req.Context(), requestScopeKey, scope)
-			requestWithScope := req.WithContext(contextWithScope)
-			next.ServeHTTP(rw, requestWithScope)
+			req = middlewareapi.AddRequestScope(req, scope)
+			next.ServeHTTP(rw, req)
 		})
 	}
 }
-
-// GetRequestScope returns the current request scope from the given request
-func GetRequestScope(req *http.Request) *middlewareapi.RequestScope {
-	scope := req.Context().Value(requestScopeKey)
-	if scope == nil {
-		return nil
-	}
-
-	return scope.(*middlewareapi.RequestScope)
-}