From bc9fab6f305d5225e5adac92f2b009d21e8af48e Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Fri, 27 Oct 2023 10:20:49 +0200
Subject: [PATCH] IDForwarding: Update settings name (#77257)

Update settings name
---
 pkg/services/auth/id.go                                       | 2 +-
 .../clientmiddleware/forward_id_middleware_test.go            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/services/auth/id.go b/pkg/services/auth/id.go
index 4a0364db707..82aa7905a5b 100644
--- a/pkg/services/auth/id.go
+++ b/pkg/services/auth/id.go
@@ -22,7 +22,7 @@ type IDClaims struct {
 	jwt.Claims
 }
 
-const settingsKey = "forwardIdToken"
+const settingsKey = "forwardGrafanaIdToken"
 
 func IsIDForwardingEnabledForDataSource(ds *datasources.DataSource) bool {
 	return ds.JsonData != nil && ds.JsonData.Get(settingsKey).MustBool()
diff --git a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go
index 087bf29729e..42c0953cad4 100644
--- a/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go
+++ b/pkg/services/pluginsintegration/clientmiddleware/forward_id_middleware_test.go
@@ -18,12 +18,12 @@ import (
 
 func TestForwardIDMiddleware(t *testing.T) {
 	settingWithEnabled, err := json.Marshal(map[string]any{
-		"forwardIdToken": true,
+		"forwardGrafanaIdToken": true,
 	})
 	require.NoError(t, err)
 
 	settingWithDisabled, err := json.Marshal(map[string]any{
-		"forwardIdToken": false,
+		"forwardGrafanaIdToken": false,
 	})
 	require.NoError(t, err)