Fix OAuth2 Client Credentials middleware too (#2629)

Signed-off-by: ItalyPaleAle <43508+ItalyPaleAle@users.noreply.github.com>

middleware/http/oauth2/oauth2_middleware.go

@@ -90,6 +90,7 @@ func (m *Middleware) GetHandler(ctx context.Context, metadata middleware.Metadat
 				return
 			}
 
+			// Redirect to the auth server
 			state := r.URL.Query().Get(stateParam)
 			if state == "" {
 				id, err := uuid.NewRandom()

middleware/http/oauth2/oauth2_middleware_test.go

@@ -27,15 +27,8 @@ import (
 	"github.com/dapr/kit/logger"
 )
 
-func mockedRequestHandler(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusOK)
-	w.Write([]byte("from mock"))
-}
-
 func TestOAuth2CreatesAuthorizationHeaderWhenInSessionState(t *testing.T) {
 	var metadata middleware.Metadata
-	metadata.Properties = map[string]string{}
-
 	metadata.Properties = map[string]string{
 		"clientID":       "testId",
 		"clientSecret":   "testSecret",
@@ -60,7 +53,12 @@ func TestOAuth2CreatesAuthorizationHeaderWhenInSessionState(t *testing.T) {
 	cookie := w.Header().Get("Set-Cookie")
 	r.Header.Add("Cookie", cookie)
 
-	handler(http.HandlerFunc(mockedRequestHandler)).ServeHTTP(w, r)
+	handler(
+		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.WriteHeader(http.StatusOK)
+			w.Write([]byte("from mock"))
+		}),
+	).ServeHTTP(w, r)
 
 	assert.Equal(t, "Bearer abcd", r.Header.Get("someHeader"))
 }

middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware.go

@@ -117,7 +117,7 @@ func (m *Middleware) GetHandler(_ context.Context, metadata middleware.Metadata)
 				headerValue = cachedToken.(string)
 			}
 
-			w.Header().Add(meta.HeaderName, headerValue)
+			r.Header.Add(meta.HeaderName, headerValue)
 			next.ServeHTTP(w, r)
 		})
 	}, nil

middleware/http/oauth2clientcredentials/oauth2clientcredentials_middleware_test.go

@@ -119,7 +119,7 @@ func TestOAuth2ClientCredentialsToken(t *testing.T) {
 	handler(http.HandlerFunc(mockedRequestHandler)).ServeHTTP(w, r)
 
 	// Assertion
-	assert.Equal(t, "Bearer abcd", w.Header().Get("someHeader"))
+	assert.Equal(t, "Bearer abcd", r.Header.Get("someHeader"))
 }
 
 // TestOAuth2ClientCredentialsCache will check
@@ -179,7 +179,7 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) {
 	handler(http.HandlerFunc(mockedRequestHandler)).ServeHTTP(w, r)
 
 	// Assertion
-	assert.Equal(t, "Bearer abc", w.Header().Get("someHeader"))
+	assert.Equal(t, "Bearer abc", r.Header.Get("someHeader"))
 
 	// Second handler call should still return 'cached' abc Token
 	r = httptest.NewRequest(http.MethodGet, "http://dapr.io", nil)
@@ -187,7 +187,7 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) {
 	handler(http.HandlerFunc(mockedRequestHandler)).ServeHTTP(w, r)
 
 	// Assertion
-	assert.Equal(t, "Bearer abc", w.Header().Get("someHeader"))
+	assert.Equal(t, "Bearer abc", r.Header.Get("someHeader"))
 
 	// Wait at a second to invalidate cache entry for abc
 	time.Sleep(1 * time.Second)
@@ -198,5 +198,5 @@ func TestOAuth2ClientCredentialsCache(t *testing.T) {
 	handler(http.HandlerFunc(mockedRequestHandler)).ServeHTTP(w, r)
 
 	// Assertion
-	assert.Equal(t, "MAC def", w.Header().Get("someHeader"))
+	assert.Equal(t, "MAC def", r.Header.Get("someHeader"))
 }