root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 266 Packages Projects Releases Wiki Activity

Revert "Identity: Remove id token from extra info (#91169)" (#91350) 

This reverts commit 10170cb839.
This commit is contained in:
Charandas 2024-07-31 11:27:46 -07:00 committed by GitHub
parent e81fa0e4c5
commit a3d3f9a1e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/apiserver/auth/authenticator/signedinuser_test.go
View File

@ -47,6 +47,7 @@ func TestSignedInUser(t *testing.T) {
require.Equal(t, u.GetName(), res.User.GetName()) require.Equal(t, u.GetName(), res.User.GetName())
require.Equal(t, u.GetUID(), res.User.GetUID()) require.Equal(t, u.GetUID(), res.User.GetUID())
require.Equal(t, []string{"1", "2"}, res.User.GetGroups()) require.Equal(t, []string{"1", "2"}, res.User.GetGroups())
require.Empty(t, res.User.GetExtra()["id-token"])
}) })
t.Run("should set ID token when available", func(t *testing.T) { t.Run("should set ID token when available", func(t *testing.T) {
@ -71,6 +72,7 @@ func TestSignedInUser(t *testing.T) {
require.Equal(t, u.GetName(), res.User.GetName()) require.Equal(t, u.GetName(), res.User.GetName())
require.Equal(t, u.GetUID(), res.User.GetUID()) require.Equal(t, u.GetUID(), res.User.GetUID())
require.Equal(t, []string{"1", "2"}, res.User.GetGroups()) require.Equal(t, []string{"1", "2"}, res.User.GetGroups())
require.Equal(t, "test-id-token", res.User.GetExtra()["id-token"][0])
}) })
} }

9
pkg/services/authn/identity.go
View File

@ -89,7 +89,14 @@ func (i *Identity) GetIdentityType() identity.IdentityType {
// GetExtra implements identity.Requester. // GetExtra implements identity.Requester.
func (i *Identity) GetExtra() map[string][]string { func (i *Identity) GetExtra() map[string][]string {
return map[string][]string{} extra := map[string][]string{}
if i.IDToken != "" {
extra["id-token"] = []string{i.IDToken}
}
if i.GetOrgRole().IsValid() {
extra["user-instance-role"] = []string{string(i.GetOrgRole())}
}
return extra
} }
// GetGroups implements identity.Requester. // GetGroups implements identity.Requester.

9
pkg/services/user/identity.go
View File

@ -94,7 +94,14 @@ func (u *SignedInUser) GetName() string {
// GetExtra implements Requester. // GetExtra implements Requester.
func (u *SignedInUser) GetExtra() map[string][]string { func (u *SignedInUser) GetExtra() map[string][]string {
return map[string][]string{} extra := map[string][]string{}
if u.IDToken != "" {
extra["id-token"] = []string{u.IDToken}
}
if u.OrgRole.IsValid() {
extra["user-instance-role"] = []string{string(u.GetOrgRole())}
}
return extra
} }
// GetGroups implements Requester. // GetGroups implements Requester.