IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 09:26:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

switch to Result

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

6
pkg/api/login_oauth.go
View File

@ -164,18 +164,18 @@ func OAuthLogin(ctx *m.ReqContext) {
}
// add/update user in grafana
userQuery := &m.UpsertUserCommand{
cmd := &m.UpsertUserCommand{
ExternalUser: &extUser,
SignupAllowed: connect.IsSignupAllowed(),
}
err = login.UpsertUser(ctx, userQuery)
err = login.UpsertUser(ctx, cmd)
if err != nil {
redirectWithError(ctx, err)
return
}
// login
loginUserWithUser(userQuery.User, ctx)
loginUserWithUser(cmd.Result, ctx)
metrics.M_Api_Login_OAuth.Inc()

10
pkg/login/ext_user.go
View File

@ -39,15 +39,15 @@ var UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
return ErrUsersQuotaReached
}
cmd.User, err = createUser(extUser)
cmd.Result, err = createUser(extUser)
if err != nil {
return err
}
} else {
cmd.User = userQuery.User
cmd.Result = userQuery.User
// sync user info
err = updateUser(cmd.User, extUser)
err = updateUser(cmd.Result, extUser)
if err != nil {
return err
}
@ -55,7 +55,7 @@ var UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
if userQuery.UserAuth == nil && extUser.AuthModule != "" && extUser.AuthId != "" {
cmd2 := m.SetAuthInfoCommand{
UserId: cmd.User.Id,
UserId: cmd.Result.Id,
AuthModule: extUser.AuthModule,
AuthId: extUser.AuthId,
}
@ -64,7 +64,7 @@ var UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
}
}
err = syncOrgRoles(cmd.User, extUser)
err = syncOrgRoles(cmd.Result, extUser)
if err != nil {
return err
}

2
pkg/login/ldap.go
View File

@ -199,7 +199,7 @@ func (a *ldapAuther) GetGrafanaUserFor(ctx *m.ReqContext, ldapUser *LdapUserInfo
return nil, err
}
return userQuery.User, nil
return userQuery.Result, nil
}
func (a *ldapAuther) serverBind() error {

6
pkg/middleware/auth_proxy.go
View File

@ -71,17 +71,17 @@ func initContextWithAuthProxy(ctx *m.ReqContext, orgID int64) bool {
}
// add/update user in grafana
userQuery := &m.UpsertUserCommand{
cmd := &m.UpsertUserCommand{
ExternalUser: &extUser,
SignupAllowed: setting.AuthProxyAutoSignUp,
}
err := login.UpsertUser(ctx, userQuery)
err := login.UpsertUser(ctx, cmd)
if err != nil {
ctx.Handle(500, "Failed to login as user specified in auth proxy header", err)
return true
}
query.UserId = userQuery.User.Id
query.UserId = cmd.Result.Id
if err := bus.Dispatch(query); err != nil {
ctx.Handle(500, "Failed to find user", err)

6
pkg/middleware/middleware_test.go
View File

@ -184,7 +184,7 @@ func TestMiddlewareContext(t *testing.T) {
})
login.UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
cmd.User = &m.User{Id: 12}
cmd.Result = &m.User{Id: 12}
return nil
}
@ -215,7 +215,7 @@ func TestMiddlewareContext(t *testing.T) {
})
login.UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
cmd.User = &m.User{Id: 33}
cmd.Result = &m.User{Id: 33}
return nil
}
@ -277,7 +277,7 @@ func TestMiddlewareContext(t *testing.T) {
})
login.UpsertUser = func(ctx *m.ReqContext, cmd *m.UpsertUserCommand) error {
cmd.User = &m.User{Id: 33}
cmd.Result = &m.User{Id: 33}
return nil
}

2
pkg/models/user_auth.go
View File

@ -29,7 +29,7 @@ type UpsertUserCommand struct {
ExternalUser *ExternalUserInfo
SignupAllowed bool
User *User
Result *User
}
type SetAuthInfoCommand struct {