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

API: return resource ID for auth key creation, folder permissions update and user invite complete endpoints (#27419)

Browse Source 
* API: add ID to auth key and folder endpoints

* API: add test for folder permissions update

* API: add created user id for /invite/complete endpoint
This commit is contained in:
Agnès Toulet
2020-09-07 17:06:11 +02:00
committed by GitHub
parent 61bd33c241
commit 6dd109b927
7 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/sources/http_api/auth.md
View File

@@ -128,7 +128,7 @@ Error statuses:
```http
HTTP/1.1 200
Content-Type: application/json
Content-Type: application/json
```
## Delete API Key

2
docs/sources/http_api/folder_permissions.md
View File

@@ -138,7 +138,7 @@ HTTP/1.1 200 OK
Content-Type: application/json; charset=UTF-8
Content-Length: 35
{"message":"Folder permissions updated"}
{"message":"Folder permissions updated","id":1,"title":"Department ABC"}
```
Status Codes:

4
pkg/api/apikey.go
View File

@@ -80,8 +80,10 @@ func (hs *HTTPServer) AddAPIKey(c *models.ReqContext, cmd models.AddApiKeyComman
}
result := &dtos.NewApiKeyResult{
ID: cmd.Result.Id,
Name: cmd.Result.Name,
Key: newKeyInfo.ClientSecret}
Key: newKeyInfo.ClientSecret,
}
return JSON(200, result)
}

1
pkg/api/dtos/apikey.go
View File

@@ -1,6 +1,7 @@
package dtos
type NewApiKeyResult struct {
ID int64 `json:"id"`
Name string `json:"name"`
Key string `json:"key"`
}

7
pkg/api/folder_permission.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/dashboards"
"github.com/grafana/grafana/pkg/services/guardian"
"github.com/grafana/grafana/pkg/util"
)
func GetFolderPermissionList(c *models.ReqContext) Response {
@@ -109,5 +110,9 @@ func UpdateFolderPermissions(c *models.ReqContext, apiCmd dtos.UpdateDashboardAc
return Error(500, "Failed to create permission", err)
}
return Success("Folder permissions updated")
return JSON(200, util.DynMap{
"message": "Folder permissions updated",
"id": folder.Id,
"title": folder.Title,
})
}

4
pkg/api/folder_permission_test.go
View File

@@ -125,6 +125,10 @@ func TestFolderPermissionApiEndpoint(t *testing.T) {
updateFolderPermissionScenario("When calling POST on", "/api/folders/uid/permissions", "/api/folders/:uid/permissions", cmd, func(sc *scenarioContext) {
callUpdateFolderPermissions(sc)
So(sc.resp.Code, ShouldEqual, 200)
respJSON, err := simplejson.NewJson(sc.resp.Body.Bytes())
So(err, ShouldBeNil)
So(respJSON.Get("id").MustInt(), ShouldEqual, 1)
So(respJSON.Get("title").MustString(), ShouldEqual, "Folder")
})
Reset(func() {

5
pkg/api/org_invite.go
View File

@@ -211,7 +211,10 @@ func (hs *HTTPServer) CompleteInvite(c *models.ReqContext, completeInvite dtos.C
metrics.MApiUserSignUpCompleted.Inc()
metrics.MApiUserSignUpInvite.Inc()
return Success("User created and logged in")
return JSON(200, util.DynMap{
"message": "User created and logged in",
"id": user.Id,
})
}
func updateTempUserStatus(code string, status models.TempUserStatus) (bool, Response) {