diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 71fa78c0d67..1cf9218c71f 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -165,7 +165,6 @@ export interface FeatureToggles { kubernetesAggregator?: boolean; expressionParser?: boolean; groupByVariable?: boolean; - authAPIAccessTokenAuth?: boolean; scopeFilters?: boolean; ssoSettingsSAML?: boolean; oauthRequireSubClaim?: boolean; diff --git a/pkg/services/authn/authnimpl/registration.go b/pkg/services/authn/authnimpl/registration.go index 04e074040aa..593a0d823fc 100644 --- a/pkg/services/authn/authnimpl/registration.go +++ b/pkg/services/authn/authnimpl/registration.go @@ -115,7 +115,7 @@ func ProvideRegistration( authnSvc.RegisterClient(clients.ProvideJWT(jwtService, cfg)) } - if cfg.ExtJWTAuth.Enabled && features.IsEnabledGlobally(featuremgmt.FlagAuthAPIAccessTokenAuth) { + if cfg.ExtJWTAuth.Enabled { authnSvc.RegisterClient(clients.ProvideExtendedJWT(cfg)) } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 3e737bb1f45..e1ff68d42bc 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -1109,14 +1109,6 @@ var ( HideFromDocs: true, HideFromAdminPage: true, }, - { - Name: "authAPIAccessTokenAuth", - Description: "Enables the use of Auth API access tokens for authentication", - Stage: FeatureStageExperimental, - Owner: identityAccessTeam, - HideFromDocs: true, - HideFromAdminPage: true, - }, { Name: "scopeFilters", Description: "Enables the use of scope filters in Grafana", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index 3b653f76b4e..9eab6e5ed1f 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -146,7 +146,6 @@ tlsMemcached,GA,@grafana/grafana-operator-experience-squad,false,false,false kubernetesAggregator,experimental,@grafana/grafana-app-platform-squad,false,true,false expressionParser,experimental,@grafana/grafana-app-platform-squad,false,true,false groupByVariable,experimental,@grafana/dashboards-squad,false,false,false -authAPIAccessTokenAuth,experimental,@grafana/identity-access-team,false,false,false scopeFilters,experimental,@grafana/dashboards-squad,false,false,false ssoSettingsSAML,preview,@grafana/identity-access-team,false,false,false oauthRequireSubClaim,experimental,@grafana/identity-access-team,false,false,false diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 3a5db419907..4e293dc9a47 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -595,10 +595,6 @@ const ( // Enable groupBy variable support in scenes dashboards FlagGroupByVariable = "groupByVariable" - // FlagAuthAPIAccessTokenAuth - // Enables the use of Auth API access tokens for authentication - FlagAuthAPIAccessTokenAuth = "authAPIAccessTokenAuth" - // FlagScopeFilters // Enables the use of scope filters in Grafana FlagScopeFilters = "scopeFilters" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index e39d9ef150e..ba79b481cba 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -547,7 +547,8 @@ "metadata": { "name": "authAPIAccessTokenAuth", "resourceVersion": "1718727528075", - "creationTimestamp": "2024-04-02T15:45:15Z" + "creationTimestamp": "2024-04-02T15:45:15Z", + "deletionTimestamp": "2025-02-04T14:58:33Z" }, "spec": { "description": "Enables the use of Auth API access tokens for authentication",