root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 80 Packages Projects Releases Wiki Activity

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

This commit is contained in:
Agnès Toulet 2020-09-14 08:58:23 +02:00 committed by GitHub
parent 8759a91222
commit eb970a4985
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/http_api/org.md
View File

@ -212,7 +212,7 @@ Authorization: Bearer eyJrIjoiT0tTcG1pUlY2RnVKZTFVaDFsNFZXdE9ZWmNrMkZYbk
HTTP/1.1 200 HTTP/1.1 200
Content-Type: application/json Content-Type: application/json
{"message":"User added to organization"} {"message":"User added to organization","userId":1}
``` ```
## Admin Organizations API ## Admin Organizations API
@ -463,7 +463,7 @@ Content-Type: application/json
HTTP/1.1 200 HTTP/1.1 200
Content-Type: application/json Content-Type: application/json
{"message":"User added to organization"} {"message":"User added to organization", "userId": 1}
``` ```
### Update Users in Organization ### Update Users in Organization

5
pkg/api/org_invite.go
View File

@ -123,7 +123,10 @@ func inviteExistingUserToOrg(c *models.ReqContext, user *models.User, inviteDto
} }
} }
return Success(fmt.Sprintf("Existing Grafana user %s added to org %s", user.NameOrFallback(), c.OrgName)) return JSON(200, util.DynMap{
"message": fmt.Sprintf("Existing Grafana user %s added to org %s", user.NameOrFallback(), c.OrgName),
"userId": user.Id,
})
} }
func RevokeInvite(c *models.ReqContext) Response { func RevokeInvite(c *models.ReqContext) Response {

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/api/dtos"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/models" "github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/util"
) )
// POST /api/org/users // POST /api/org/users
@ -35,12 +36,18 @@ func addOrgUserHelper(cmd models.AddOrgUserCommand) Response {
if err := bus.Dispatch(&cmd); err != nil { if err := bus.Dispatch(&cmd); err != nil {
if err == models.ErrOrgUserAlreadyAdded { 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 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 // GET /api/org/users