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

Chore: Use UIDs as identifiers for teams frontend (#94345)

Browse Source 
* Team frontend now uses UIDs as identifiers. Safe to revert
This commit is contained in:
Jo
2024-10-08 09:48:35 +02:00
committed by GitHub
parent 945dd052b1
commit 9eea0e99fc
19 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/services/team/teamapi/team.go
View File

@@ -59,6 +59,7 @@ func (tapi *TeamAPI) createTeam(c *contextmodel.ReqContext) response.Response {
return response.JSON(http.StatusOK, &util.DynMap{
"teamId": t.ID,
"uid": t.UID,
"message": "Team created",
})
}
@@ -230,7 +231,7 @@ func (tapi *TeamAPI) getTeamByID(c *contextmodel.ReqContext) response.Response {
}
// Add accesscontrol metadata
queryResult.AccessControl = tapi.getAccessControlMetadata(c, c.SignedInUser.GetOrgID(), "teams:id:", strconv.FormatInt(queryResult.ID, 10))
queryResult.AccessControl = tapi.getAccessControlMetadata(c, "teams:id:", strconv.FormatInt(queryResult.ID, 10))
queryResult.AvatarURL = dtos.GetGravatarUrlWithDefault(tapi.cfg, queryResult.Email, queryResult.Name)
return response.JSON(http.StatusOK, &queryResult)
@@ -362,6 +363,7 @@ type CreateTeamResponse struct {
// in: body
Body struct {
TeamId int64 `json:"teamId"`
Uid string `json:"uid"`
Message string `json:"message"`
} `json:"body"`
}
@@ -384,7 +386,7 @@ func (tapi *TeamAPI) getMultiAccessControlMetadata(c *contextmodel.ReqContext,
// Metadata helpers
// getAccessControlMetadata returns the accesscontrol metadata associated with a given resource
func (tapi *TeamAPI) getAccessControlMetadata(c *contextmodel.ReqContext,
orgID int64, prefix string, resourceID string) accesscontrol.Metadata {
prefix string, resourceID string) accesscontrol.Metadata {
ids := map[string]bool{resourceID: true}
return tapi.getMultiAccessControlMetadata(c, prefix, ids)[resourceID]
}