From d48d30ff0616954c2983c32f8a31d6581bd960e4 Mon Sep 17 00:00:00 2001
From: bcmmbaga <bethuelmbaga12@gmail.com>
Date: Mon, 7 Sep 2026 22:07:19 +0300
Subject: [PATCH] Apply the grant allowlist on the non-YAML provider startup
 path

---
 idp/dex/provider.go      |  6 ++++++
 idp/dex/provider_test.go | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/idp/dex/provider.go b/idp/dex/provider.go
index db33928eb..5cda3e93d 100644
--- a/idp/dex/provider.go
+++ b/idp/dex/provider.go
@@ -90,6 +90,11 @@ func NewProvider(ctx context.Context, config *Config) (*Provider, error) {
 		return nil, fmt.Errorf("failed to ensure local connector: %w", err)
 	}
 
+	if err := ensureConnectorGrantTypes(ctx, stor); err != nil {
+		stor.Close()
+		return nil, fmt.Errorf("failed to ensure connector grant types: %w", err)
+	}
+
 	// Ensure issuer ends with /oauth2 for proper path mounting
 	issuer := strings.TrimSuffix(config.Issuer, "/")
 	if !strings.HasSuffix(issuer, "/oauth2") {
@@ -118,6 +123,7 @@ func NewProvider(ctx context.Context, config *Config) (*Provider, error) {
 		Storage:                    stor,
 		SkipApprovalScreen:         true,
 		SupportedResponseTypes:     []string{"code"},
+		AllowedGrantTypes:          DefaultGrantTypes,
 		ContinueOnConnectorFailure: true,
 		Logger:                     logger,
 		PrometheusRegistry:         prometheus.NewRegistry(),
diff --git a/idp/dex/provider_test.go b/idp/dex/provider_test.go
index afd5a3e98..a4edf4cd4 100644
--- a/idp/dex/provider_test.go
+++ b/idp/dex/provider_test.go
@@ -756,3 +756,30 @@ connectors:
 		assert.Equal(t, DefaultGrantTypes, conn.GrantTypes, "connector %s", conn.ID)
 	}
 }
+
+func TestNewProvider_SetsGrantTypes(t *testing.T) {
+	ctx := context.Background()
+
+	provider, err := NewProvider(ctx, &Config{
+		Issuer:  "https://example.com/oauth2",
+		Port:    5556,
+		DataDir: t.TempDir(),
+	})
+	require.NoError(t, err)
+	defer func() { _ = provider.Stop(ctx) }()
+
+	req := httptest.NewRequest(http.MethodGet, "/oauth2/.well-known/openid-configuration", nil)
+	rec := httptest.NewRecorder()
+	provider.Handler().ServeHTTP(rec, req)
+	require.Equal(t, http.StatusOK, rec.Code)
+
+	var discovery struct {
+		GrantTypes []string `json:"grant_types_supported"`
+	}
+	require.NoError(t, json.Unmarshal(rec.Body.Bytes(), &discovery))
+	assert.ElementsMatch(t, DefaultGrantTypes, discovery.GrantTypes)
+
+	local, err := provider.storage.GetConnector(ctx, "local")
+	require.NoError(t, err)
+	assert.Equal(t, DefaultGrantTypes, local.GrantTypes)
+}