diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go index c11585f93e..d7baa4c7a1 100644 --- a/connector/oidc/oidc.go +++ b/connector/oidc/oidc.go @@ -211,8 +211,8 @@ func (c *Config) Open(id string, logger log.Logger) (conn connector.Connector, e return nil, err } - ctx, cancel := context.WithCancel(context.Background()) - ctx = context.WithValue(ctx, oauth2.HTTPClient, httpClient) + bgctx, cancel := context.WithCancel(context.Background()) + ctx := context.WithValue(bgctx, oauth2.HTTPClient, httpClient) provider, err := getProvider(ctx, c.Issuer, c.ProviderDiscoveryOverrides) if err != nil { diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go index 435dd6e8d0..950d158338 100644 --- a/connector/oidc/oidc_test.go +++ b/connector/oidc/oidc_test.go @@ -585,10 +585,6 @@ func TestTokenIdentity(t *testing.T) { } func TestProviderOverride(t *testing.T) { - ctx := context.Background() - ctx, cancel := context.WithCancel(ctx) - defer cancel() - testServer, err := setupServer(map[string]any{ "sub": "subvalue", "name": "namevalue",