IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Allow to auto-assign empty role (#73326)

Browse Source 
Allow to auto-assign empty role
This commit is contained in:
linoman 2023-08-17 18:32:58 +02:00 committed by GitHub
parent f33f3a55a0
commit 2e050f25bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/user/userimpl/store_test.go
View File

@ -965,7 +965,7 @@ func TestMetricsUsage(t *testing.T) {
_, usrSvc := createOrgAndUserSvc(t, ss, ss.Cfg) _, usrSvc := createOrgAndUserSvc(t, ss, ss.Cfg)
t.Run("", func(t *testing.T) { t.Run("Get empty role metrics for an org", func(t *testing.T) {
orgId := int64(1) orgId := int64(1)
// create first user // create first user

1
pkg/setting/setting.go
View File

@ -1680,6 +1680,7 @@ func readUserSettings(iniFile *ini.File, cfg *Cfg) error {
cfg.AutoAssignOrgId = users.Key("auto_assign_org_id").MustInt(1) cfg.AutoAssignOrgId = users.Key("auto_assign_org_id").MustInt(1)
cfg.AutoAssignOrgRole = users.Key("auto_assign_org_role").In( cfg.AutoAssignOrgRole = users.Key("auto_assign_org_role").In(
string(roletype.RoleViewer), []string{ string(roletype.RoleViewer), []string{
string(roletype.RoleNone),
string(roletype.RoleViewer), string(roletype.RoleViewer),
string(roletype.RoleEditor), string(roletype.RoleEditor),
string(roletype.RoleAdmin)}) string(roletype.RoleAdmin)})