switch to passing ReqContext as a property

pkg/middleware/auth_proxy.go

@@ -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

pkg/middleware/auth_proxy_test.go

@@ -116,7 +116,7 @@ type mockLdapAuthenticator struct {
 	syncSignedInUserCalled bool
 }
 
-func (a *mockLdapAuthenticator) Login(ctx *m.ReqContext, query *m.LoginUserQuery) error {
+func (a *mockLdapAuthenticator) Login(query *m.LoginUserQuery) error {
 	return nil
 }
 

pkg/middleware/middleware_test.go

@@ -9,7 +9,6 @@ import (
 
 	ms "github.com/go-macaron/session"
 	"github.com/grafana/grafana/pkg/bus"
-	"github.com/grafana/grafana/pkg/login"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/services/session"
 	"github.com/grafana/grafana/pkg/setting"
@@ -183,10 +182,10 @@ func TestMiddlewareContext(t *testing.T) {
 				return nil
 			})
 
-			login.UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
+			bus.AddHandler("test", func(cmd *m.UpsertUserCommand) error {
 				cmd.Result = &m.User{Id: 12}
 				return nil
-			}
+			})
 
 			sc.fakeReq("GET", "/")
 			sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
@@ -214,10 +213,10 @@ func TestMiddlewareContext(t *testing.T) {
 				}
 			})
 
-			login.UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
+			bus.AddHandler("test", func(cmd *m.UpsertUserCommand) error {
 				cmd.Result = &m.User{Id: 33}
 				return nil
-			}
+			})
 
 			sc.fakeReq("GET", "/")
 			sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
@@ -276,10 +275,10 @@ func TestMiddlewareContext(t *testing.T) {
 				return nil
 			})
 
-			login.UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
+			bus.AddHandler("test", func(cmd *m.UpsertUserCommand) error {
 				cmd.Result = &m.User{Id: 33}
 				return nil
-			}
+			})
 
 			sc.fakeReq("GET", "/")
 			sc.req.Header.Add("X-WEBAUTH-USER", "torkelo")
@@ -299,6 +298,11 @@ func TestMiddlewareContext(t *testing.T) {
 			setting.AuthProxyHeaderProperty = "username"
 			setting.AuthProxyWhitelist = ""
 
+			bus.AddHandler("test", func(query *m.UpsertUserCommand) error {
+				query.Result = &m.User{Id: 32}
+				return nil
+			})
+
 			bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
 				query.Result = &m.SignedInUser{OrgId: 4, UserId: 32}
 				return nil
@@ -334,6 +338,11 @@ func TestMiddlewareContext(t *testing.T) {
 				return nil
 			}
 
+			bus.AddHandler("test", func(query *m.UpsertUserCommand) error {
+				query.Result = &m.User{Id: 32}
+				return nil
+			})
+
 			bus.AddHandler("test", func(query *m.GetSignedInUserQuery) error {
 				query.Result = &m.SignedInUser{OrgId: 4, UserId: 32}
 				return nil