Add GraphQLFeaturesHeader and update related code to use headers package constants

Author: omgitsads

pkg/http/headers/headers.go

@@ -43,4 +43,11 @@ const (
 	MCPInsidersHeader = "X-MCP-Insiders"
 	// MCPFeaturesHeader is a comma-separated list of feature flags to enable.
 	MCPFeaturesHeader = "X-MCP-Features"
+
+	// GitHub-specific headers.
+
+	// GraphQLFeaturesHeader is a comma-separated list of GraphQL feature flags to enable for GraphQL requests.
+	GraphQLFeaturesHeader = "GraphQL-Features"
+	// GitHubAPIVersionHeader is the header used to specify the GitHub API version.
+	GitHubAPIVersionHeader = "X-GitHub-Api-Version"
 )

pkg/http/middleware/token_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	ghcontext "github.com/github/github-mcp-server/pkg/context"
+	"github.com/github/github-mcp-server/pkg/http/headers"
 	"github.com/github/github-mcp-server/pkg/http/oauth"
 	"github.com/github/github-mcp-server/pkg/utils"
 	"github.com/stretchr/testify/assert"
@@ -181,7 +182,7 @@ func TestExtractUserToken(t *testing.T) {
 
 			req := httptest.NewRequest(http.MethodGet, "/test", nil)
 			if tt.authHeader != "" {
-				req.Header.Set("Authorization", tt.authHeader)
+				req.Header.Set(headers.AuthorizationHeader, tt.authHeader)
 			}
 			rr := httptest.NewRecorder()
 
@@ -220,7 +221,7 @@ func TestExtractUserToken_NilOAuthConfig(t *testing.T) {
 	handler := middleware(nextHandler)
 
 	req := httptest.NewRequest(http.MethodGet, "/test", nil)
-	req.Header.Set("Authorization", "Bearer ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
+	req.Header.Set(headers.AuthorizationHeader, "Bearer ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")
 	rr := httptest.NewRecorder()
 
 	handler.ServeHTTP(rr, req)

pkg/http/transport/bearer.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	ghcontext "github.com/github/github-mcp-server/pkg/context"
+	headers "github.com/github/github-mcp-server/pkg/http/headers"
 )
 
 type BearerAuthTransport struct {
@@ -14,11 +15,11 @@ type BearerAuthTransport struct {
 
 func (t *BearerAuthTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = req.Clone(req.Context())
-	req.Header.Set("Authorization", "Bearer "+t.Token)
+	req.Header.Set(headers.AuthorizationHeader, "Bearer "+t.Token)
 
 	// Check for GraphQL-Features in context and add header if present
 	if features := ghcontext.GetGraphQLFeatures(req.Context()); len(features) > 0 {
-		req.Header.Set("GraphQL-Features", strings.Join(features, ", "))
+		req.Header.Set(headers.GraphQLFeaturesHeader, strings.Join(features, ", "))
 	}
 
 	return t.Transport.RoundTrip(req)

pkg/http/transport/graphql_features_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	ghcontext "github.com/github/github-mcp-server/pkg/context"
+	"github.com/github/github-mcp-server/pkg/http/headers"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -56,8 +57,8 @@ func TestGraphQLFeaturesTransport(t *testing.T) {
 
 			// Create a test server that captures the request header
 			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				capturedHeader = r.Header.Get("GraphQL-Features")
-				headerExists = r.Header.Get("GraphQL-Features") != ""
+				capturedHeader = r.Header.Get(headers.GraphQLFeaturesHeader)
+				headerExists = r.Header.Get(headers.GraphQLFeaturesHeader) != ""
 				w.WriteHeader(http.StatusOK)
 			}))
 			defer server.Close()
@@ -97,7 +98,7 @@ func TestGraphQLFeaturesTransport_NilTransport(t *testing.T) {
 
 	// Create a test server
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		capturedHeader = r.Header.Get("GraphQL-Features")
+		capturedHeader = r.Header.Get(headers.GraphQLFeaturesHeader)
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer server.Close()
@@ -141,13 +142,13 @@ func TestGraphQLFeaturesTransport_DoesNotMutateOriginalRequest(t *testing.T) {
 	require.NoError(t, err)
 
 	// Store the original header value
-	originalHeader := req.Header.Get("GraphQL-Features")
+	originalHeader := req.Header.Get(headers.GraphQLFeaturesHeader)
 
 	// Execute the request
 	resp, err := transport.RoundTrip(req)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
 	// Verify the original request was not mutated
-	assert.Equal(t, originalHeader, req.Header.Get("GraphQL-Features"))
+	assert.Equal(t, originalHeader, req.Header.Get(headers.GraphQLFeaturesHeader))
 }

pkg/http/transport/user_agent.go

@@ -1,6 +1,10 @@
 package transport
 
-import "net/http"
+import (
+	"net/http"
+
+	"github.com/github/github-mcp-server/pkg/http/headers"
+)
 
 type UserAgentTransport struct {
 	Transport http.RoundTripper
@@ -9,6 +13,6 @@ type UserAgentTransport struct {
 
 func (t *UserAgentTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	req = req.Clone(req.Context())
-	req.Header.Set("User-Agent", t.Agent)
+	req.Header.Set(headers.UserAgentHeader, t.Agent)
 	return t.Transport.RoundTrip(req)
 }

pkg/scopes/fetcher.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/github/github-mcp-server/pkg/http/headers"
 	"github.com/github/github-mcp-server/pkg/utils"
 )
 
@@ -78,9 +79,9 @@ func (f *Fetcher) FetchTokenScopes(ctx context.Context, token string) ([]string,
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}
 
-	req.Header.Set("Authorization", "Bearer "+token)
-	req.Header.Set("Accept", "application/vnd.github+json")
-	req.Header.Set("X-GitHub-Api-Version", "2022-11-28")
+	req.Header.Set(headers.AuthorizationHeader, "Bearer "+token)
+	req.Header.Set(headers.AcceptHeader, "application/vnd.github+json")
+	req.Header.Set(headers.GitHubAPIVersionHeader, "2022-11-28")
 
 	resp, err := f.client.Do(req)
 	if err != nil {