Compare commits
1 Commits
sriram/SQL
...
colin-stua
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f140eef4b |
@@ -699,10 +699,6 @@ export interface FeatureToggles {
|
|||||||
*/
|
*/
|
||||||
playlistsReconciler?: boolean;
|
playlistsReconciler?: boolean;
|
||||||
/**
|
/**
|
||||||
* Enable passwordless login via magic link authentication
|
|
||||||
*/
|
|
||||||
passwordlessMagicLinkAuthentication?: boolean;
|
|
||||||
/**
|
|
||||||
* Display Related Logs in Grafana Metrics Drilldown
|
* Display Related Logs in Grafana Metrics Drilldown
|
||||||
*/
|
*/
|
||||||
exploreMetricsRelatedLogs?: boolean;
|
exploreMetricsRelatedLogs?: boolean;
|
||||||
|
|||||||
@@ -226,8 +226,7 @@ func (hs *HTTPServer) registerRoutes() {
|
|||||||
r.Post("/api/user/email/start-verify", reqSignedInNoAnonymous, routing.Wrap(hs.StartEmailVerificaton))
|
r.Post("/api/user/email/start-verify", reqSignedInNoAnonymous, routing.Wrap(hs.StartEmailVerificaton))
|
||||||
}
|
}
|
||||||
|
|
||||||
//nolint:staticcheck // not yet migrated to OpenFeature
|
if hs.Cfg.PasswordlessMagicLinkAuth.Enabled {
|
||||||
if hs.Cfg.PasswordlessMagicLinkAuth.Enabled && hs.Features.IsEnabledGlobally(featuremgmt.FlagPasswordlessMagicLinkAuthentication) {
|
|
||||||
r.Post("/api/login/passwordless/start", requestmeta.SetOwner(requestmeta.TeamAuth), quota(string(auth.QuotaTargetSrv)), hs.StartPasswordless)
|
r.Post("/api/login/passwordless/start", requestmeta.SetOwner(requestmeta.TeamAuth), quota(string(auth.QuotaTargetSrv)), hs.StartPasswordless)
|
||||||
r.Post("/api/login/passwordless/authenticate", requestmeta.SetOwner(requestmeta.TeamAuth), quota(string(auth.QuotaTargetSrv)), routing.Wrap(hs.LoginPasswordless))
|
r.Post("/api/login/passwordless/authenticate", requestmeta.SetOwner(requestmeta.TeamAuth), quota(string(auth.QuotaTargetSrv)), routing.Wrap(hs.LoginPasswordless))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -410,8 +410,7 @@ func (hs *HTTPServer) getFrontendSettings(c *contextmodel.ReqContext) (*dtos.Fro
|
|||||||
DisableSignoutMenu: hs.Cfg.DisableSignoutMenu,
|
DisableSignoutMenu: hs.Cfg.DisableSignoutMenu,
|
||||||
}
|
}
|
||||||
|
|
||||||
//nolint:staticcheck // not yet migrated to OpenFeature
|
if hs.Cfg.PasswordlessMagicLinkAuth.Enabled {
|
||||||
if hs.Cfg.PasswordlessMagicLinkAuth.Enabled && hs.Features.IsEnabled(c.Req.Context(), featuremgmt.FlagPasswordlessMagicLinkAuthentication) {
|
|
||||||
hasEnabledProviders := hs.samlEnabled() || hs.authnService.IsClientEnabled(authn.ClientLDAP)
|
hasEnabledProviders := hs.samlEnabled() || hs.authnService.IsClientEnabled(authn.ClientLDAP)
|
||||||
|
|
||||||
if !hasEnabledProviders {
|
if !hasEnabledProviders {
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package authnimpl
|
package authnimpl
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/grafana/grafana/pkg/infra/log"
|
"github.com/grafana/grafana/pkg/infra/log"
|
||||||
"github.com/grafana/grafana/pkg/infra/remotecache"
|
"github.com/grafana/grafana/pkg/infra/remotecache"
|
||||||
"github.com/grafana/grafana/pkg/infra/tracing"
|
"github.com/grafana/grafana/pkg/infra/tracing"
|
||||||
@@ -83,8 +81,7 @@ func ProvideRegistration(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//nolint:staticcheck // not yet migrated to OpenFeature
|
if cfg.PasswordlessMagicLinkAuth.Enabled {
|
||||||
if cfg.PasswordlessMagicLinkAuth.Enabled && features.IsEnabled(context.Background(), featuremgmt.FlagPasswordlessMagicLinkAuthentication) {
|
|
||||||
hasEnabledProviders := authnSvc.IsClientEnabled(authn.ClientSAML) || authnSvc.IsClientEnabled(authn.ClientLDAP)
|
hasEnabledProviders := authnSvc.IsClientEnabled(authn.ClientSAML) || authnSvc.IsClientEnabled(authn.ClientLDAP)
|
||||||
if !hasEnabledProviders {
|
if !hasEnabledProviders {
|
||||||
oauthInfos := socialService.GetOAuthInfoProviders()
|
oauthInfos := socialService.GetOAuthInfoProviders()
|
||||||
|
|||||||
@@ -1155,14 +1155,7 @@ var (
|
|||||||
Owner: grafanaAppPlatformSquad,
|
Owner: grafanaAppPlatformSquad,
|
||||||
RequiresRestart: true,
|
RequiresRestart: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "passwordlessMagicLinkAuthentication",
|
|
||||||
Description: "Enable passwordless login via magic link authentication",
|
|
||||||
Stage: FeatureStageExperimental,
|
|
||||||
Owner: identityAccessTeam,
|
|
||||||
HideFromDocs: true,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "exploreMetricsRelatedLogs",
|
Name: "exploreMetricsRelatedLogs",
|
||||||
Description: "Display Related Logs in Grafana Metrics Drilldown",
|
Description: "Display Related Logs in Grafana Metrics Drilldown",
|
||||||
Stage: FeatureStageExperimental,
|
Stage: FeatureStageExperimental,
|
||||||
|
|||||||
1
pkg/services/featuremgmt/toggles_gen.csv
generated
1
pkg/services/featuremgmt/toggles_gen.csv
generated
@@ -160,7 +160,6 @@ timeRangePan,experimental,@grafana/dataviz-squad,false,false,true
|
|||||||
newTimeRangeZoomShortcuts,experimental,@grafana/dataviz-squad,false,false,true
|
newTimeRangeZoomShortcuts,experimental,@grafana/dataviz-squad,false,false,true
|
||||||
azureMonitorDisableLogLimit,GA,@grafana/partner-datasources,false,false,false
|
azureMonitorDisableLogLimit,GA,@grafana/partner-datasources,false,false,false
|
||||||
playlistsReconciler,experimental,@grafana/grafana-app-platform-squad,false,true,false
|
playlistsReconciler,experimental,@grafana/grafana-app-platform-squad,false,true,false
|
||||||
passwordlessMagicLinkAuthentication,experimental,@grafana/identity-access-team,false,false,false
|
|
||||||
exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true
|
exploreMetricsRelatedLogs,experimental,@grafana/observability-metrics,false,false,true
|
||||||
prometheusSpecialCharsInLabelValues,experimental,@grafana/oss-big-tent,false,false,true
|
prometheusSpecialCharsInLabelValues,experimental,@grafana/oss-big-tent,false,false,true
|
||||||
enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false
|
enableExtensionsAdminPage,experimental,@grafana/plugins-platform-backend,false,true,false
|
||||||
|
|||||||
|
4
pkg/services/featuremgmt/toggles_gen.go
generated
4
pkg/services/featuremgmt/toggles_gen.go
generated
@@ -483,10 +483,6 @@ const (
|
|||||||
// Enables experimental reconciler for playlists
|
// Enables experimental reconciler for playlists
|
||||||
FlagPlaylistsReconciler = "playlistsReconciler"
|
FlagPlaylistsReconciler = "playlistsReconciler"
|
||||||
|
|
||||||
// FlagPasswordlessMagicLinkAuthentication
|
|
||||||
// Enable passwordless login via magic link authentication
|
|
||||||
FlagPasswordlessMagicLinkAuthentication = "passwordlessMagicLinkAuthentication"
|
|
||||||
|
|
||||||
// FlagEnableExtensionsAdminPage
|
// FlagEnableExtensionsAdminPage
|
||||||
// Enables the extension admin page regardless of development mode
|
// Enables the extension admin page regardless of development mode
|
||||||
FlagEnableExtensionsAdminPage = "enableExtensionsAdminPage"
|
FlagEnableExtensionsAdminPage = "enableExtensionsAdminPage"
|
||||||
|
|||||||
3
pkg/services/featuremgmt/toggles_gen.json
generated
3
pkg/services/featuremgmt/toggles_gen.json
generated
@@ -2661,7 +2661,8 @@
|
|||||||
"metadata": {
|
"metadata": {
|
||||||
"name": "passwordlessMagicLinkAuthentication",
|
"name": "passwordlessMagicLinkAuthentication",
|
||||||
"resourceVersion": "1764664939750",
|
"resourceVersion": "1764664939750",
|
||||||
"creationTimestamp": "2024-11-14T13:50:55Z"
|
"creationTimestamp": "2024-11-14T13:50:55Z",
|
||||||
|
"deletionTimestamp": "2026-01-08T15:33:29Z"
|
||||||
},
|
},
|
||||||
"spec": {
|
"spec": {
|
||||||
"description": "Enable passwordless login via magic link authentication",
|
"description": "Enable passwordless login via magic link authentication",
|
||||||
|
|||||||
Reference in New Issue
Block a user