public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Access-control: use role UID when adding/removing roles (#32438)

Browse Source
This commit is contained in:
Alexander Zobnin
2021-03-29 17:36:48 +02:00
committed by GitHub
parent c4d5a67b38
commit 20f6ba5ba4
4 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/accesscontrol/models.go
+12 -12
View File
@@ -148,27 +148,27 @@ type DeleteRoleCommand struct {
}
type AddTeamRoleCommand struct {
OrgID int64 `json:"org_id"`
RoleID int64 `json:"role_id"`
TeamID int64 `json:"team_id"`
OrgID int64 `json:"org_id"`
RoleUID string `json:"role_uid"`
TeamID int64 `json:"team_id"`
}
type RemoveTeamRoleCommand struct {
OrgID int64 `json:"org_id"`
RoleID int64 `json:"role_id"`
TeamID int64 `json:"team_id"`
OrgID int64 `json:"org_id"`
RoleUID string `json:"role_uid"`
TeamID int64 `json:"team_id"`
}
type AddUserRoleCommand struct {
OrgID int64 `json:"org_id"`
RoleID int64 `json:"role_id"`
UserID int64 `json:"user_id"`
OrgID int64 `json:"org_id"`
RoleUID string `json:"role_uid"`
UserID int64 `json:"user_id"`
}
type RemoveUserRoleCommand struct {
OrgID int64 `json:"org_id"`
RoleID int64 `json:"role_id"`
UserID int64 `json:"user_id"`
OrgID int64 `json:"org_id"`
RoleUID string `json:"role_uid"`
UserID int64 `json:"user_id"`
}
type EvaluationResult struct {