Require an API host when creating scope fetchers

Author: omgitsads

internal/ghmcp/server.go

@@ -366,9 +366,7 @@ func fetchTokenScopesForHost(ctx context.Context, token, host string) ([]string,
 		return nil, fmt.Errorf("failed to parse API host: %w", err)
 	}
 
-	fetcher := scopes.NewFetcher(scopes.FetcherOptions{
-		APIHost: apiHost,
-	})
+	fetcher := scopes.NewFetcher(apiHost, scopes.FetcherOptions{})
 
 	return fetcher.FetchTokenScopes(ctx, token)
 }

pkg/http/handler.go

@@ -93,9 +93,7 @@ func NewHTTPMcpHandler(
 
 	scopeFetcher := opts.ScopeFetcher
 	if scopeFetcher == nil {
-		scopeFetcher = scopes.NewFetcher(scopes.FetcherOptions{
-			APIHost: apiHost,
-		})
+		scopeFetcher = scopes.NewFetcher(apiHost, scopes.FetcherOptions{})
 	}
 
 	inventoryFactory := opts.InventoryFactory
@@ -121,6 +119,7 @@ func (h *Handler) RegisterMiddleware(r chi.Router) {
 	r.Use(
 		middleware.ExtractUserToken(h.oauthCfg),
 		middleware.WithRequestConfig,
+		middleware.WithMCPParse(),
 	)
 
 	if h.config.ScopeChallenge {

pkg/http/handler_test.go

@@ -276,7 +276,8 @@ func TestHTTPHandlerRoutes(t *testing.T) {
 			// Create feature checker that reads from context (same as production)
 			featureChecker := createHTTPFeatureChecker()
 
-			apiHost := utils.NewDefaultAPIHostResolver()
+			apiHost, err := utils.NewAPIHost("https://api.github.com")
+			require.NoError(t, err)
 
 			// Create inventory factory that captures the built inventory
 			inventoryFactory := func(r *http.Request) (*inventory.Inventory, error) {

pkg/http/server.go

@@ -131,16 +131,14 @@ func RunHTTPServer(cfg ServerConfig) error {
 		ResourcePath: cfg.ResourcePath,
 	}
 
-	severOptions := []HandlerOption{}
+	serverOptions := []HandlerOption{}
 	if cfg.ScopeChallenge {
-		scopeFetcher := scopes.NewFetcher(scopes.FetcherOptions{
-			APIHost: apiHost,
-		})
-		severOptions = append(severOptions, WithScopeFetcher(scopeFetcher))
+		scopeFetcher := scopes.NewFetcher(apiHost, scopes.FetcherOptions{})
+		serverOptions = append(serverOptions, WithScopeFetcher(scopeFetcher))
 	}
 
 	r := chi.NewRouter()
-	handler := NewHTTPMcpHandler(ctx, &cfg, deps, t, logger, apiHost, append(severOptions, WithFeatureChecker(featureChecker), WithOAuthConfig(oauthCfg))...)
+	handler := NewHTTPMcpHandler(ctx, &cfg, deps, t, logger, apiHost, append(serverOptions, WithFeatureChecker(featureChecker), WithOAuthConfig(oauthCfg))...)
 	oauthHandler, err := oauth.NewAuthHandler(oauthCfg)
 	if err != nil {
 		return fmt.Errorf("failed to create OAuth handler: %w", err)

pkg/scopes/fetcher.go

@@ -40,17 +40,12 @@ type Fetcher struct {
 }
 
 // NewFetcher creates a new scope fetcher with the given options.
-func NewFetcher(opts FetcherOptions) *Fetcher {
+func NewFetcher(apiHost utils.APIHostResolver, opts FetcherOptions) *Fetcher {
 	client := opts.HTTPClient
 	if client == nil {
 		client = &http.Client{Timeout: DefaultFetchTimeout}
 	}
 
-	apiHost := opts.APIHost
-	if apiHost == nil {
-		apiHost = utils.NewDefaultAPIHostResolver()
-	}
-
 	return &Fetcher{
 		client:  client,
 		apiHost: apiHost,
@@ -126,11 +121,16 @@ func ParseScopeHeader(header string) []string {
 // FetchTokenScopes is a convenience function that creates a default fetcher
 // and fetches the token scopes.
 func FetchTokenScopes(ctx context.Context, token string) ([]string, error) {
-	return NewFetcher(FetcherOptions{}).FetchTokenScopes(ctx, token)
+	apiHost, err := utils.NewAPIHost("https://api.github.com/")
+	if err != nil {
+		return nil, fmt.Errorf("failed to create default API host: %w", err)
+	}
+
+	return NewFetcher(apiHost, FetcherOptions{}).FetchTokenScopes(ctx, token)
 }
 
 // FetchTokenScopesWithHost is a convenience function that creates a fetcher
 // for a specific API host and fetches the token scopes.
 func FetchTokenScopesWithHost(ctx context.Context, token string, apiHost utils.APIHostResolver) ([]string, error) {
-	return NewFetcher(FetcherOptions{APIHost: apiHost}).FetchTokenScopes(ctx, token)
+	return NewFetcher(apiHost, FetcherOptions{}).FetchTokenScopes(ctx, token)
 }

pkg/scopes/fetcher_test.go

@@ -164,10 +164,8 @@ func TestFetcher_FetchTokenScopes(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			server := httptest.NewServer(tt.handler)
 			defer server.Close()
-
-			fetcher := NewFetcher(FetcherOptions{
-				APIHost: testAPIHostResolver{baseURL: server.URL},
-			})
+			apiHost := testAPIHostResolver{baseURL: server.URL}
+			fetcher := NewFetcher(apiHost, FetcherOptions{})
 
 			scopes, err := fetcher.FetchTokenScopes(context.Background(), "test-token")
 
@@ -185,12 +183,13 @@ func TestFetcher_FetchTokenScopes(t *testing.T) {
 }
 
 func TestFetcher_DefaultOptions(t *testing.T) {
-	fetcher := NewFetcher(FetcherOptions{})
+	apiHost := testAPIHostResolver{baseURL: "https://api.github.com"}
+	fetcher := NewFetcher(apiHost, FetcherOptions{})
 
 	// Verify default API host is set
 	apiURL, err := fetcher.apiHost.BaseRESTURL(context.Background())
 	require.NoError(t, err)
-	assert.Equal(t, "https://api.github.com/", apiURL.String())
+	assert.Equal(t, "https://api.github.com", apiURL.String())
 
 	// Verify default HTTP client is set with timeout
 	assert.NotNil(t, fetcher.client)
@@ -200,17 +199,17 @@ func TestFetcher_DefaultOptions(t *testing.T) {
 func TestFetcher_CustomHTTPClient(t *testing.T) {
 	customClient := &http.Client{Timeout: 5 * time.Second}
 
-	fetcher := NewFetcher(FetcherOptions{
+	apiHost := testAPIHostResolver{baseURL: "https://api.github.com"}
+	fetcher := NewFetcher(apiHost, FetcherOptions{
 		HTTPClient: customClient,
 	})
 
 	assert.Equal(t, customClient, fetcher.client)
 }
 
 func TestFetcher_CustomAPIHost(t *testing.T) {
-	fetcher := NewFetcher(FetcherOptions{
-		APIHost: testAPIHostResolver{baseURL: "https://api.github.enterprise.com"},
-	})
+	apiHost := testAPIHostResolver{baseURL: "https://api.github.enterprise.com"}
+	fetcher := NewFetcher(apiHost, FetcherOptions{})
 
 	apiURL, err := fetcher.apiHost.BaseRESTURL(context.Background())
 	require.NoError(t, err)
@@ -224,9 +223,8 @@ func TestFetcher_ContextCancellation(t *testing.T) {
 	}))
 	defer server.Close()
 
-	fetcher := NewFetcher(FetcherOptions{
-		APIHost: testAPIHostResolver{baseURL: server.URL},
-	})
+	apiHost := testAPIHostResolver{baseURL: server.URL}
+	fetcher := NewFetcher(apiHost, FetcherOptions{})
 
 	ctx, cancel := context.WithCancel(context.Background())
 	cancel() // Cancel immediately

pkg/utils/api.go

@@ -25,15 +25,6 @@ type APIHost struct {
 
 var _ APIHostResolver = APIHost{}
 
-func NewDefaultAPIHostResolver() APIHostResolver {
-	a, err := newDotcomHost()
-	if err != nil {
-		// This should never happen
-		panic(fmt.Sprintf("failed to create default API host resolver: %v", err))
-	}
-	return a
-}
-
 func NewAPIHost(s string) (APIHostResolver, error) {
 	a, err := parseAPIHost(s)