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

Users: Fix org user always getting org id = 1 on auto assign false (#63708)

Browse Source 
* fix org user always getting org id = 1 on auto assign false

* make tests explicit

* use correct cfg in service accounts

* fix api tests

* fix database test of ac

* fix InsertOrgUser returning affected rows as orgID
This commit is contained in:
Jo
2023-02-24 17:08:44 +00:00
committed by GitHub
parent 823aaaeb7c
commit c8db771939
8 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/services/user/userimpl/user.go
View File

@@ -149,11 +149,11 @@ func (s *Service) Create(ctx context.Context, cmd *user.CreateUserCommand) (*use
Updated: time.Now(),
}
if setting.AutoAssignOrg && !usr.IsAdmin {
if s.cfg.AutoAssignOrg && !usr.IsAdmin {
if len(cmd.DefaultOrgRole) > 0 {
orgUser.Role = org.RoleType(cmd.DefaultOrgRole)
} else {
orgUser.Role = org.RoleType(setting.AutoAssignOrgRole)
orgUser.Role = org.RoleType(s.cfg.AutoAssignOrgRole)
}
}
_, err = s.orgService.InsertOrgUser(ctx, &orgUser)