mirror of
https://github.com/grafana/grafana.git
synced 2025-02-09 23:16:16 -06:00
* AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * move some changes from branch to the skeleton PR * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * moving resourceservice to the main wire file pt2 * move team related actions so that they can be reused * PR feedback * fix * typo * Access Control: adding hooks for team member endpoints (#43991) * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * add access control to list and add team member endpoint, and hooks for adding team members * member permission type is 0 * add ID scope for team permission checks * add more team actions, use Member for member permission name * protect team member update endpoint with FGAC permissions * update SQL functions for teams and the corresponding tests * also protect team member removal endpoint with FGAC permissions and add a hook to permission service * a few small fixes, provide team permission service to test setup * AccessControl: cover team permissions Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Add background service as a consumer to resource_services Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Define actions in roles.go Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * Remove action from accesscontrol model Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com> * As suggested by kalle * move some changes from branch to the skeleton PR * remove resource services from wireexts * remove unneeded actions * linting fix * remove comments * feedback fixes * feedback * simplifying * remove team member within the same transaction * fix a mistake with the error * call the correct sql fction * linting * Access control: tests for team member endpoints (#44177) * tests for team member endpoints * clean up and fix the tests * fixing tests take 2 * don't import enterprise test license * don't import enterprise test license * remove unused variable Co-authored-by: gamab <gabi.mabs@gmail.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: ievaVasiljeva <ieva.vasiljeva@grafana.com>
77 lines
1.7 KiB
Go
77 lines
1.7 KiB
Go
package models
|
|
|
|
import (
|
|
"errors"
|
|
"time"
|
|
)
|
|
|
|
// Typed errors
|
|
var (
|
|
ErrTeamMemberAlreadyAdded = errors.New("User is already added to this team")
|
|
)
|
|
|
|
// TeamMember model
|
|
type TeamMember struct {
|
|
Id int64
|
|
OrgId int64
|
|
TeamId int64
|
|
UserId int64
|
|
External bool // Signals that the membership has been created by an external systems, such as LDAP
|
|
Permission PermissionType
|
|
|
|
Created time.Time
|
|
Updated time.Time
|
|
}
|
|
|
|
// ---------------------
|
|
// COMMANDS
|
|
|
|
type AddTeamMemberCommand struct {
|
|
UserId int64 `json:"userId" binding:"Required"`
|
|
OrgId int64 `json:"-"`
|
|
TeamId int64 `json:"-"`
|
|
External bool `json:"-"`
|
|
Permission PermissionType `json:"-"`
|
|
}
|
|
|
|
type UpdateTeamMemberCommand struct {
|
|
UserId int64 `json:"-"`
|
|
OrgId int64 `json:"-"`
|
|
TeamId int64 `json:"-"`
|
|
Permission PermissionType `json:"permission"`
|
|
}
|
|
|
|
type RemoveTeamMemberCommand struct {
|
|
OrgId int64 `json:"-"`
|
|
UserId int64
|
|
TeamId int64
|
|
}
|
|
|
|
// ----------------------
|
|
// QUERIES
|
|
|
|
type GetTeamMembersQuery struct {
|
|
OrgId int64
|
|
TeamId int64
|
|
UserId int64
|
|
External bool
|
|
Result []*TeamMemberDTO
|
|
}
|
|
|
|
// ----------------------
|
|
// Projections and DTOs
|
|
|
|
type TeamMemberDTO struct {
|
|
OrgId int64 `json:"orgId"`
|
|
TeamId int64 `json:"teamId"`
|
|
UserId int64 `json:"userId"`
|
|
External bool `json:"-"`
|
|
AuthModule string `json:"auth_module"`
|
|
Email string `json:"email"`
|
|
Name string `json:"name"`
|
|
Login string `json:"login"`
|
|
AvatarUrl string `json:"avatarUrl"`
|
|
Labels []string `json:"labels"`
|
|
Permission PermissionType `json:"permission"`
|
|
}
|