From e9c494041cdc48e466e18b008e32d84c5ca34e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <tim+github@zitadel.com>
Date: Mon, 25 Sep 2023 19:32:01 +0300
Subject: [PATCH] add withClient unit test

---
 pkg/op/server_http_test.go | 92 +++++++++++++++++++++++++++++---------
 1 file changed, 70 insertions(+), 22 deletions(-)

diff --git a/pkg/op/server_http_test.go b/pkg/op/server_http_test.go
index 40fece5..6ff4678 100644
--- a/pkg/op/server_http_test.go
+++ b/pkg/op/server_http_test.go
@@ -147,6 +147,28 @@ func (c *testClient) ClockSkew() time.Duration {
 	return 0
 }
 
+type requestVerifier struct {
+	UnimplementedServer
+	client Client
+}
+
+func (s *requestVerifier) VerifyAuthRequest(ctx context.Context, r *Request[oidc.AuthRequest]) (*ClientRequest[oidc.AuthRequest], error) {
+	if s.client == nil {
+		return nil, oidc.ErrServerError()
+	}
+	return &ClientRequest[oidc.AuthRequest]{
+		Request: r,
+		Client:  s.client,
+	}, nil
+}
+
+func (s *requestVerifier) VerifyClient(ctx context.Context, r *Request[ClientCredentials]) (Client, error) {
+	if s.client == nil {
+		return nil, oidc.ErrServerError()
+	}
+	return s.client, nil
+}
+
 var testDecoder = func() *schema.Decoder {
 	decoder := schema.NewDecoder()
 	decoder.IgnoreUnknownKeys(true)
@@ -172,6 +194,54 @@ func runWebServerTest(t *testing.T, handler http.HandlerFunc, r *http.Request, w
 	assert.JSONEq(t, want.wantBody, string(body))
 }
 
+func Test_webServer_withClient(t *testing.T) {
+	tests := []struct {
+		name string
+		r    *http.Request
+		want webServerResult
+	}{
+		{
+			name: "parse error",
+			r:    httptest.NewRequest(http.MethodPost, "/", bytes.NewReader(make([]byte, 11<<20))),
+			want: webServerResult{
+				wantStatus: http.StatusBadRequest,
+				wantBody:   `{"error":"invalid_request", "error_description":"error parsing form"}`,
+			},
+		},
+		{
+			name: "invalid grant type",
+			r:    httptest.NewRequest(http.MethodPost, "/", strings.NewReader("client_id=native&grant_type=bad&foo=bar")),
+			want: webServerResult{
+				wantStatus: http.StatusBadRequest,
+				wantBody:   `{"error":"unauthorized_client", "error_description":"grant_type \"bad\" not allowed"}`,
+			},
+		},
+		{
+			name: "no grant type",
+			r:    httptest.NewRequest(http.MethodPost, "/", strings.NewReader("client_id=native&foo=bar")),
+			want: webServerResult{
+				wantStatus: http.StatusOK,
+				wantBody:   `{"foo":"bar"}`,
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			s := &webServer{
+				server: &requestVerifier{
+					client: newClient(clientTypeNative),
+				},
+				decoder: testDecoder,
+				logger:  slog.Default(),
+			}
+			handler := func(w http.ResponseWriter, r *http.Request, client Client) {
+				fmt.Fprintf(w, `{"foo":%q}`, r.FormValue("foo"))
+			}
+			runWebServerTest(t, s.withClient(handler), tt.r, tt.want)
+		})
+	}
+}
+
 func Test_webServer_verifyRequestClient(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -249,28 +319,6 @@ func Test_webServer_verifyRequestClient(t *testing.T) {
 	}
 }
 
-type requestVerifier struct {
-	UnimplementedServer
-	client Client
-}
-
-func (s *requestVerifier) VerifyAuthRequest(ctx context.Context, r *Request[oidc.AuthRequest]) (*ClientRequest[oidc.AuthRequest], error) {
-	if s.client == nil {
-		return nil, oidc.ErrServerError()
-	}
-	return &ClientRequest[oidc.AuthRequest]{
-		Request: r,
-		Client:  s.client,
-	}, nil
-}
-
-func (s *requestVerifier) VerifyClient(ctx context.Context, r *Request[ClientCredentials]) (Client, error) {
-	if s.client == nil {
-		return nil, oidc.ErrServerError()
-	}
-	return s.client, nil
-}
-
 func Test_webServer_authorizeHandler(t *testing.T) {
 	type fields struct {
 		server  Server