Orgs: Remove auto assign globals (#63754)

* remove auto assign globals * add missing gitignore entries
2023-02-27 10:23:38 +01:00
parent c6331c7c10
commit 3b22955ebb
6 changed files with 11 additions and 14 deletions
@@ -282,8 +282,8 @@ func (auth *AuthProxy) loginViaHeader(reqCtx *contextmodel.ReqContext) (int64, e
 				if rt.IsValid() {
 					extUser.OrgRoles = map[int64]org.RoleType{}
 					orgID := int64(1)
-					if setting.AutoAssignOrg && setting.AutoAssignOrgId > 0 {
-						orgID = int64(setting.AutoAssignOrgId)
+					if auth.cfg.AutoAssignOrg && auth.cfg.AutoAssignOrgId > 0 {
+						orgID = int64(auth.cfg.AutoAssignOrgId)
 					}
 					extUser.OrgRoles[orgID] = rt
 				}