modelcontextprotocol · maciej-kisiel · Mar 27, 2026
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -50,7 +50,7 @@ jobs:
         uses: modelcontextprotocol/conformance@a2855b03582a6c0b31065ad4d9af248316ce61a3 # v0.1.15
         with:
           mode: client 
-          command: go run -tags mcp_go_client_oauth ./conformance/everything-client
+          command: go run ./conformance/everything-client
           suite: core
           expected-failures: ./conformance/baseline.yml
           node-version: 22
diff --git a/auth/authorization_code.go b/auth/authorization_code.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by the license
 // that can be found in the LICENSE file.
 
-//go:build mcp_go_client_oauth
-
 package auth
 
 import (
@@ -127,8 +125,6 @@ type AuthorizationCodeHandler struct {
 
 var _ OAuthHandler = (*AuthorizationCodeHandler)(nil)
 
-func (h *AuthorizationCodeHandler) isOAuthHandler() {}
-
 func (h *AuthorizationCodeHandler) TokenSource(ctx context.Context) (oauth2.TokenSource, error) {
 	return h.tokenSource, nil
 }

diff --git a/auth/authorization_code_test.go b/auth/authorization_code_test.go
@@ -2,8 +2,6 @@
 // Use of this source code is governed by the license
 // that can be found in the LICENSE file.
 
-//go:build mcp_go_client_oauth
-
 package auth
 
 import (

diff --git a/auth/client.go b/auth/client.go
@@ -22,8 +22,6 @@ import (
 // [github.com/modelcontextprotocol/go-sdk/mcp.StreamableClientTransport]
 // for an example.
 type OAuthHandler interface {
-	isOAuthHandler()
-
 	// TokenSource returns a token source to be used for outgoing requests.
 	// Returned token source might be nil. In that case, the transport will not
 	// add any authorization headers to the request.

diff --git a/auth/client_private.go b/auth/client_private.go
diff --git a/auth/client_test.go b/auth/client_test.go