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

feat(invite): existing grafana users now result in new org user directly, no temp user is created, #2353

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-07-18 11:43:34 +02:00
parent a82aa8203b
commit e92f2ecea1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/api/org_invite.go
View File

@ -23,6 +23,22 @@ func AddOrgInvite(c *middleware.Context, inviteDto dtos.AddInviteForm) Response
return ApiError(400, "Invalid role specified", nil) return ApiError(400, "Invalid role specified", nil)
} }
// first try get existing user
userQuery := m.GetUserByLoginQuery{LoginOrEmail: inviteDto.Email}
if err := bus.Dispatch(&userQuery); err != nil {
if err != m.ErrUserNotFound {
return ApiError(500, "Failed to query db for existing user check", err)
}
} else {
// user exists, add org role
createOrgUserCmd := m.AddOrgUserCommand{OrgId: c.OrgId, UserId: userQuery.Result.Id, Role: inviteDto.Role}
if err := bus.Dispatch(&createOrgUserCmd); err != nil {
return ApiError(500, "Error while trying to create org user", err)
} else {
return ApiSuccess("Existing Grafana user added to org " + c.OrgName)
}
}
cmd := m.CreateTempUserCommand{} cmd := m.CreateTempUserCommand{}
cmd.OrgId = c.OrgId cmd.OrgId = c.OrgId
cmd.Email = inviteDto.Email cmd.Email = inviteDto.Email