opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-02 04:09:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

switch to passing ReqContext as a property

Browse Source
This commit is contained in:
Dan Cech
2018-03-23 15:50:07 -04:00
parent e53315dce8
commit d837be91ec
13 changed files with 75 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/middleware/auth_proxy.go
View File

@ -50,7 +50,7 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
return true
}
} else {
extUser := m.ExternalUserInfo{
extUser := &m.ExternalUserInfo{
AuthModule: "authproxy",
AuthId: proxyHeaderValue,
}
@ -73,10 +73,11 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
// add/update user in grafana
cmd := &m.UpsertUserCommand{
ExternalUser: &extUser,
ReqContext: ctx,
ExternalUser: extUser,
SignupAllowed: setting.AuthProxyAutoSignUp,
}
err := login.UpsertUser(ctx, cmd)
err := bus.Dispatch(cmd)
if err != nil {
ctx.Handle(500, "Failed to login as user specified in auth proxy header", err)
return true