From 0b5f3cd10a831aa9ca8f2eb5ccfbd26beebdb3d5 Mon Sep 17 00:00:00 2001 From: Alexander Hebel Date: Thu, 23 Nov 2023 15:38:05 +0100 Subject: [PATCH] refactor test code --- mocks/mockServer.go | 4 ++-- tokenclient/tokenFlows_test.go | 13 +------------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/mocks/mockServer.go b/mocks/mockServer.go index 97c45af..9d3524c 100644 --- a/mocks/mockServer.go +++ b/mocks/mockServer.go @@ -93,7 +93,7 @@ func newOIDCMockServer(customIssuer string) (*MockServer, error) { CustomIssuer: customIssuer, } - r.Use(verifyUserAgent) + r.Use(VerifyUserAgent) r.HandleFunc("/.well-known/openid-configuration", mockServer.WellKnownHandler).Methods(http.MethodGet) r.HandleFunc("/oauth2/certs", mockServer.JWKsHandlerInvalidAppTID).Methods(http.MethodGet).Headers("x-app_tid", InvalidAppTID) r.HandleFunc("/oauth2/certs", mockServer.JWKsHandler).Methods(http.MethodGet) @@ -102,7 +102,7 @@ func newOIDCMockServer(customIssuer string) (*MockServer, error) { return mockServer, nil } -func verifyUserAgent(next http.Handler) http.Handler { +func VerifyUserAgent(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.Header.Get("User-Agent") != httpclient.UserAgent { w.WriteHeader(http.StatusBadRequest) diff --git a/tokenclient/tokenFlows_test.go b/tokenclient/tokenFlows_test.go index 928023e..dd2b0d1 100644 --- a/tokenclient/tokenFlows_test.go +++ b/tokenclient/tokenFlows_test.go @@ -15,7 +15,6 @@ import ( "github.com/gorilla/mux" "github.com/sap/cloud-security-client-go/env" - "github.com/sap/cloud-security-client-go/httpclient" "github.com/sap/cloud-security-client-go/mocks" "github.com/stretchr/testify/assert" ) @@ -174,7 +173,7 @@ func TestClientCredentialsTokenFlow_UsingMockServer_Succeeds(t *testing.T) { func setupNewTLSServer(t *testing.T, f func(http.ResponseWriter, *http.Request)) *httptest.Server { r := mux.NewRouter() - r.Use(verifyUserAgent) + r.Use(mocks.VerifyUserAgent) r.HandleFunc("/oauth2/token", f).Methods(http.MethodPost).Headers("Content-Type", "application/x-www-form-urlencoded") r.HandleFunc("/oauth/token", f).Methods(http.MethodPost).Headers("Content-Type", "application/x-www-form-urlencoded") @@ -184,16 +183,6 @@ func setupNewTLSServer(t *testing.T, f func(http.ResponseWriter, *http.Request)) return httptest.NewTLSServer(r) } -func verifyUserAgent(next http.Handler) http.Handler { - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if r.Header.Get("User-Agent") != httpclient.UserAgent { - w.WriteHeader(http.StatusBadRequest) - _, _ = w.Write([]byte("wrong user agent, expected: " + httpclient.UserAgent)) - } - next.ServeHTTP(w, r) - }) -} - // tokenHandler is the http handler which serves the /oauth2/token endpoint. func tokenHandler(w http.ResponseWriter, r *http.Request) { buf := new(bytes.Buffer)