mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-23 16:26:43 +00:00
# Which Problems Are Solved 1. Adding users to user groups and removing users from user groups. 2. Searching for users in user groups by group IDs or user IDs # How the Problems Are Solved By adding: 1. The API definitions to manage users in users groups 3. The command-layer implementation of adding users/removing users to/from user groups. 4. The projection table group_users1 5. Query-side implementation to search for users in user groups # Additional Changes 1. Remove debug statements from unit tests. 2. Fix removal of groups when orgs are removed 3. Add unit tests for groups projection # Additional Context * Related to #9702 * Follow-up for PRs * https://github.com/zitadel/zitadel/pull/10455 * https://github.com/zitadel/zitadel/pull/10758 * https://github.com/zitadel/zitadel/pull/10853
222 lines
7.3 KiB
Go
222 lines
7.3 KiB
Go
package group
|
|
|
|
import (
|
|
"context"
|
|
|
|
"connectrpc.com/connect"
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/grpc/filter/v2"
|
|
"github.com/zitadel/zitadel/internal/config/systemdefaults"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
authorization_v2beta "github.com/zitadel/zitadel/pkg/grpc/authorization/v2beta"
|
|
group_v2 "github.com/zitadel/zitadel/pkg/grpc/group/v2"
|
|
)
|
|
|
|
// GetGroup returns a group that matches the group ID in the request
|
|
func (s *Server) GetGroup(ctx context.Context, req *connect.Request[group_v2.GetGroupRequest]) (*connect.Response[group_v2.GetGroupResponse], error) {
|
|
group, err := s.query.GetGroupByID(ctx, req.Msg.GetId(), s.checkPermission)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&group_v2.GetGroupResponse{
|
|
Group: groupToPb(group),
|
|
}), nil
|
|
}
|
|
|
|
// ListGroups returns a list of groups that match the search criteria
|
|
func (s *Server) ListGroups(ctx context.Context, req *connect.Request[group_v2.ListGroupsRequest]) (*connect.Response[group_v2.ListGroupsResponse], error) {
|
|
queries, err := listGroupsRequestToModel(req.Msg, s.systemDefaults)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := s.query.SearchGroups(ctx, queries, s.checkPermission)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&group_v2.ListGroupsResponse{
|
|
Groups: groupsToPb(resp.Groups),
|
|
Pagination: filter.QueryToPaginationPb(queries.SearchRequest, resp.SearchResponse),
|
|
}), nil
|
|
}
|
|
|
|
// ListGroupUsers returns a list of users from user groupUsers that match the search criteria
|
|
func (s *Server) ListGroupUsers(ctx context.Context, req *connect.Request[group_v2.ListGroupUsersRequest]) (*connect.Response[group_v2.ListGroupUsersResponse], error) {
|
|
queries, err := listGroupUsersRequestToModel(req.Msg, s.systemDefaults)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
resp, err := s.query.SearchGroupUsers(ctx, queries, s.checkPermission)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return connect.NewResponse(&group_v2.ListGroupUsersResponse{
|
|
GroupUsers: groupUsersToPb(resp.GroupUsers),
|
|
Pagination: filter.QueryToPaginationPb(queries.SearchRequest, resp.SearchResponse),
|
|
}), nil
|
|
}
|
|
|
|
func listGroupsRequestToModel(req *group_v2.ListGroupsRequest, systemDefaults systemdefaults.SystemDefaults) (*query.GroupSearchQuery, error) {
|
|
offset, limit, asc, err := filter.PaginationPbToQuery(systemDefaults, req.GetPagination())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
queries, err := groupSearchFiltersToQuery(req.GetFilters())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &query.GroupSearchQuery{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
SortingColumn: groupFieldNameToSortingColumn(req.SortingColumn),
|
|
},
|
|
Queries: queries,
|
|
}, nil
|
|
}
|
|
|
|
func groupSearchFiltersToQuery(filters []*group_v2.GroupsSearchFilter) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(filters))
|
|
for i, f := range filters {
|
|
q[i], err = groupFilterToQuery(f)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func groupFilterToQuery(f *group_v2.GroupsSearchFilter) (query.SearchQuery, error) {
|
|
switch q := f.Filter.(type) {
|
|
case *group_v2.GroupsSearchFilter_GroupIds:
|
|
return query.NewGroupIDsSearchQuery(q.GroupIds.GetIds())
|
|
case *group_v2.GroupsSearchFilter_NameFilter:
|
|
return query.NewGroupNameSearchQuery(q.NameFilter.GetName(), filter.TextMethodPbToQuery(q.NameFilter.GetMethod()))
|
|
case *group_v2.GroupsSearchFilter_OrganizationId:
|
|
return query.NewGroupOrganizationIdSearchQuery(q.OrganizationId.GetId())
|
|
default:
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "GRPC-g3f4g", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func groupFieldNameToSortingColumn(field *group_v2.FieldName) query.Column {
|
|
if field == nil {
|
|
return query.GroupColumnCreationDate
|
|
}
|
|
switch *field {
|
|
case group_v2.FieldName_FIELD_NAME_CREATION_DATE, group_v2.FieldName_FIELD_NAME_UNSPECIFIED:
|
|
return query.GroupColumnCreationDate
|
|
case group_v2.FieldName_FIELD_NAME_ID:
|
|
return query.GroupColumnID
|
|
case group_v2.FieldName_FIELD_NAME_NAME:
|
|
return query.GroupColumnName
|
|
case group_v2.FieldName_FIELD_NAME_CHANGE_DATE:
|
|
return query.GroupColumnChangeDate
|
|
default:
|
|
return query.GroupColumnCreationDate
|
|
}
|
|
}
|
|
|
|
func groupsToPb(groups []*query.Group) []*group_v2.Group {
|
|
pbGroups := make([]*group_v2.Group, len(groups))
|
|
for i, g := range groups {
|
|
pbGroups[i] = groupToPb(g)
|
|
}
|
|
return pbGroups
|
|
}
|
|
|
|
func groupToPb(g *query.Group) *group_v2.Group {
|
|
return &group_v2.Group{
|
|
Id: g.ID,
|
|
Name: g.Name,
|
|
Description: g.Description,
|
|
OrganizationId: g.ResourceOwner,
|
|
CreationDate: timestamppb.New(g.CreationDate),
|
|
ChangeDate: timestamppb.New(g.ChangeDate),
|
|
}
|
|
}
|
|
|
|
func listGroupUsersRequestToModel(req *group_v2.ListGroupUsersRequest, systemDefaults systemdefaults.SystemDefaults) (*query.GroupUsersSearchQuery, error) {
|
|
offset, limit, asc, err := filter.PaginationPbToQuery(systemDefaults, req.GetPagination())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
queries, err := groupUsersSearchFiltersToQuery(req.GetFilters())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &query.GroupUsersSearchQuery{
|
|
SearchRequest: query.SearchRequest{
|
|
Offset: offset,
|
|
Limit: limit,
|
|
Asc: asc,
|
|
SortingColumn: groupUsersFieldNameToSortingColumn(req.SortingColumn),
|
|
},
|
|
Queries: queries,
|
|
}, nil
|
|
}
|
|
|
|
func groupUsersSearchFiltersToQuery(filters []*group_v2.GroupUsersSearchFilter) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(filters))
|
|
for i, f := range filters {
|
|
q[i], err = groupUsersFilterToQuery(f)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func groupUsersFilterToQuery(f *group_v2.GroupUsersSearchFilter) (query.SearchQuery, error) {
|
|
switch q := f.Filter.(type) {
|
|
case *group_v2.GroupUsersSearchFilter_UserIds:
|
|
return query.NewGroupUsersUserIDsSearchQuery(q.UserIds.GetIds())
|
|
case *group_v2.GroupUsersSearchFilter_GroupIds:
|
|
return query.NewGroupUsersGroupIDsSearchQuery(q.GroupIds.GetIds())
|
|
default:
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "GRPC-osMHhx", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func groupUsersFieldNameToSortingColumn(field *group_v2.GroupUserFieldName) query.Column {
|
|
if field == nil {
|
|
return query.GroupUsersColumnCreationDate
|
|
}
|
|
switch *field {
|
|
case group_v2.GroupUserFieldName_GROUP_USER_FIELD_NAME_CREATION_DATE,
|
|
group_v2.GroupUserFieldName_GROUP_USER_FIELD_NAME_UNSPECIFIED:
|
|
return query.GroupUsersColumnCreationDate
|
|
case group_v2.GroupUserFieldName_GROUP_USER_FIELD_NAME_USER_ID:
|
|
return query.GroupUsersColumnUserID
|
|
case group_v2.GroupUserFieldName_GROUP_USER_FIELD_NAME_GROUP_ID:
|
|
return query.GroupUsersColumnGroupID
|
|
default:
|
|
return query.GroupUsersColumnCreationDate
|
|
}
|
|
}
|
|
|
|
func groupUsersToPb(groupUsers []*query.GroupUser) []*group_v2.GroupUser {
|
|
pbGroupUsers := make([]*group_v2.GroupUser, len(groupUsers))
|
|
for i, gu := range groupUsers {
|
|
pbGroupUsers[i] = groupUserToPb(gu)
|
|
}
|
|
return pbGroupUsers
|
|
}
|
|
|
|
func groupUserToPb(gu *query.GroupUser) *group_v2.GroupUser {
|
|
return &group_v2.GroupUser{
|
|
GroupId: gu.GroupID,
|
|
OrganizationId: gu.ResourceOwner,
|
|
User: &authorization_v2beta.User{
|
|
Id: gu.UserID,
|
|
PreferredLoginName: gu.PreferredLoginName,
|
|
DisplayName: gu.DisplayName,
|
|
AvatarUrl: gu.AvatarUrl,
|
|
OrganizationId: gu.ResourceOwner,
|
|
},
|
|
CreationDate: timestamppb.New(gu.CreationDate),
|
|
}
|
|
}
|