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

9
pkg/services/accesscontrol/database/database_test.go
View File

@@ -263,6 +263,7 @@ func createUsersAndTeams(t *testing.T, svcs helperServices, orgID int64, users [
IsAdmin: users[i].isAdmin,
})
require.NoError(t, err)
require.Equal(t, orgID, user.OrgID)
// User is not member of the org
if users[i].orgRole == "" {
@@ -292,11 +293,19 @@ func createUsersAndTeams(t *testing.T, svcs helperServices, orgID int64, users [
func setupTestEnv(t testing.TB) (*AccessControlStore, rs.Store, user.Service, team.Service, org.Service) {
sql, cfg := db.InitTestDBwithCfg(t)
cfg.AutoAssignOrg = true
cfg.AutoAssignOrgRole = "Viewer"
cfg.AutoAssignOrgId = 1
acstore := ProvideService(sql)
permissionStore := rs.NewStore(sql)
teamService := teamimpl.ProvideService(sql, cfg)
orgService, err := orgimpl.ProvideService(sql, cfg, quotatest.New(false, nil))
require.NoError(t, err)
orgID, err := orgService.GetOrCreate(context.Background(), "test")
require.Equal(t, int64(1), orgID)
require.NoError(t, err)
userService, err := userimpl.ProvideService(sql, orgService, cfg, teamService, localcache.ProvideService(), quotatest.New(false, nil), supportbundlestest.NewFakeBundleService())
require.NoError(t, err)
return acstore, permissionStore, userService, teamService, orgService