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

Org API: enrich add user to org endpoints with user ID in the response (#27551)

Browse Source
This commit is contained in:
Agnès Toulet
2020-09-14 08:58:23 +02:00
committed by GitHub
parent 8759a91222
commit eb970a4985
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/org_users.go
View File

@ -4,6 +4,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/util"
)
// POST /api/org/users
@ -35,12 +36,18 @@ func addOrgUserHelper(cmd models.AddOrgUserCommand) Response {
if err := bus.Dispatch(&cmd); err != nil {
if err == models.ErrOrgUserAlreadyAdded {
return Error(409, "User is already member of this organization", nil)
return JSON(409, util.DynMap{
"message": "User is already member of this organization",
"userId": cmd.UserId,
})
}
return Error(500, "Could not add user to organization", err)
}
return Success("User added to organization")
return JSON(200, util.DynMap{
"message": "User added to organization",
"userId": cmd.UserId,
})
}
// GET /api/org/users