Fixed middelware tesrs

internal/handler/helpres.go

@@ -1,6 +1,8 @@
 package handler
 
-import "github.com/gorilla/mux"
+import (
+	"github.com/gorilla/mux"
+)
 
 func setPath(route *mux.Route, path string) {
 	if len(path) > 0 {

internal/handler/proxy/middleware_test.go

@@ -8,6 +8,8 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/evg4b/uncors/internal/helpers"
+
 	"github.com/evg4b/uncors/internal/configuration"
 
 	"github.com/evg4b/uncors/internal/handler/proxy"
@@ -92,7 +94,7 @@ func TestProxyMiddleware(t *testing.T) {
 			headerKey   string
 		}{
 			{
-				name:        "transform Location",
+				name:        "transform location",
 				URL:         "https://premium.api.com/app",
 				expectedURL: "http://premium.local.com/app",
 				headerKey:   headers.Location,
@@ -125,10 +127,10 @@ func TestProxyMiddleware(t *testing.T) {
 
 				req, err := http.NewRequestWithContext(context.TODO(), http.MethodPost, expectedURL.Path, nil)
 				testutils.CheckNoError(t, err)
-
 				req.URL.Scheme = expectedURL.Scheme
 				req.Host = expectedURL.Host
 				req.URL.Path = expectedURL.Path
+				helpers.NormaliseRequest(req)
 
 				recorder := httptest.NewRecorder()
 
@@ -159,9 +161,9 @@ func TestProxyMiddleware(t *testing.T) {
 
 		req, err := http.NewRequestWithContext(context.TODO(), http.MethodPost, "/", nil)
 		testutils.CheckNoError(t, err)
-
 		req.URL.Scheme = "http"
 		req.Host = "premium.local.com"
+		helpers.NormaliseRequest(req)
 
 		recorder := httptest.NewRecorder()
 

internal/helpers/http.go

@@ -0,0 +1,13 @@
+package helpers
+
+import "net/http"
+
+func NormaliseRequest(request *http.Request) {
+	request.URL.Host = request.Host
+
+	if request.TLS != nil {
+		request.URL.Scheme = "https"
+	} else {
+		request.URL.Scheme = "http"
+	}
+}

internal/server/server.go

@@ -7,6 +7,8 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/evg4b/uncors/internal/helpers"
+
 	"github.com/evg4b/uncors/internal/log"
 
 	"golang.org/x/net/context"
@@ -28,7 +30,7 @@ func NewUncorsServer(ctx context.Context, handler http.Handler) *UncorsServer {
 		},
 		ReadHeaderTimeout: readHeaderTimeout,
 		Handler: http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
-			patchRequest(request)
+			helpers.NormaliseRequest(request)
 			handler.ServeHTTP(writer, request)
 		}),
 		ErrorLog: log.StandardErrorLogAdapter(),
@@ -121,13 +123,3 @@ func (srv *UncorsServer) internalShutdown() {
 		log.Debug("finish: UNCORS server closed")
 	}
 }
-
-func patchRequest(request *http.Request) {
-	request.URL.Host = request.Host
-
-	if request.TLS != nil {
-		request.URL.Scheme = "https"
-	} else {
-		request.URL.Scheme = "http"
-	}
-}