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

cleanup

Browse Source
This commit is contained in:
Dan Cech 2018-03-23 11:58:38 -04:00
parent a1b1d2fe80
commit e53315dce8
No known key found for this signature in database
GPG Key ID: 6F1146C5B66FBD41
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/login/ext_user.go
View File

@ -117,8 +117,8 @@ func updateUser(user *m.User, extUser *m.ExternalUserInfo) error {
} }
func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error { func syncOrgRoles(user *m.User, extUser *m.ExternalUserInfo) error {
// don't sync org roles if none are specified
if len(extUser.OrgRoles) == 0 { if len(extUser.OrgRoles) == 0 {
// log.Warn("No group mappings defined")
return nil return nil
} }

1
pkg/middleware/auth_proxy.go
View File

@ -68,6 +68,7 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
extUser.Login = proxyHeaderValue extUser.Login = proxyHeaderValue
} else { } else {
ctx.Handle(500, "Auth proxy header property invalid", nil) ctx.Handle(500, "Auth proxy header property invalid", nil)
return true
} }
// add/update user in grafana // add/update user in grafana

2
pkg/services/sqlstore/user_auth.go
View File

@ -15,7 +15,7 @@ func init() {
} }
func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error { func GetUserByAuthInfo(query *m.GetUserByAuthInfoQuery) error {
user := new(m.User) user := &m.User{}
has := false has := false
var err error var err error