feat: member queries (#2796)

* refactor(domain): add user type

* fix(projections): start with login names

* fix(login_policy): correct handling of user domain claimed event

* fix(projections): add members

* refactor: simplify member projections

* add migration for members

* add metadata to member projections

* refactor: login name projection

* fix: set correct suffixes on login name projections

* test(projections): login name reduces

* fix: correct cols in reduce member

* test(projections): org, iam, project members

* member additional cols and conds as opt,
add project grant members

* fix(migration): members

* fix(migration): correct database name

* migration version

* migs

* better naming for member cond and col

* split project and project grant members

* prepare member columns

* feat(queries): membership query

* test(queries): membership prepare

* fix(queries): multiple projections for latest sequence

* fix(api): use query for membership queries in auth and management

* feat: org member queries

* fix(api): use query for iam member calls

* fix(queries): org members

* fix(queries): project members

* fix(queries): project grant members

* fix(query): member queries and user avatar column

* member cols

* fix(queries): membership stmt

* fix user test

* fix user test

* fix(membership): correct display name

* fix(projection): additional member manipulation events

* additional member tests

* fix(projections): additional events of idp links

* fix: use query for memberships (#2797)

* fix(api): use query for memberships

* remove comment

* handle err

* refactor(projections): idp user link user aggregate type

* fix(projections): handle old user events

* fix(api): add asset prefix

* no image for iam members

internal/api/grpc/admin/iam_member.go

@@ -18,13 +18,18 @@ func (s *Server) ListIAMMemberRoles(ctx context.Context, req *admin_pb.ListIAMMe
 }
 
 func (s *Server) ListIAMMembers(ctx context.Context, req *admin_pb.ListIAMMembersRequest) (*admin_pb.ListIAMMembersResponse, error) {
-	res, err := s.iam.SearchIAMMembers(ctx, ListIAMMemberRequestToModel(req))
+	queries, err := ListIAMMembersRequestToQuery(req)
+	if err != nil {
+		return nil, err
+	}
+	res, err := s.query.IAMMembers(ctx, queries)
 	if err != nil {
 		return nil, err
 	}
 	return &admin_pb.ListIAMMembersResponse{
-		Details: object.ToListDetails(res.TotalResult, res.Sequence, res.Timestamp),
-		Result:  member.IAMMembersToPb(res.Result),
+		Details: object.ToListDetails(res.Count, res.Sequence, res.Timestamp),
+		//TODO: resource owner of user of the member instead of the membership resource owner
+		Result: member.MembersToPb("", res.Members),
 	}, nil
 }
 

internal/api/grpc/admin/iam_member_converter.go

@@ -4,7 +4,7 @@ import (
 	member_grpc "github.com/caos/zitadel/internal/api/grpc/member"
 	"github.com/caos/zitadel/internal/api/grpc/object"
 	"github.com/caos/zitadel/internal/domain"
-	"github.com/caos/zitadel/internal/iam/model"
+	"github.com/caos/zitadel/internal/query"
 	admin_pb "github.com/caos/zitadel/pkg/grpc/admin"
 )
 
@@ -22,13 +22,21 @@ func UpdateIAMMemberToDomain(req *admin_pb.UpdateIAMMemberRequest) *domain.Membe
 	}
 }
 
-func ListIAMMemberRequestToModel(req *admin_pb.ListIAMMembersRequest) *model.IAMMemberSearchRequest {
+func ListIAMMembersRequestToQuery(req *admin_pb.ListIAMMembersRequest) (*query.IAMMembersQuery, error) {
 	offset, limit, asc := object.ListQueryToModel(req.Query)
-	return &model.IAMMemberSearchRequest{
-		Offset: offset,
-		Limit:  limit,
-		Asc:    asc,
-		// SortingColumn: model.IAMMemberSearchKey, //TOOD: not implemented in proto
-		Queries: member_grpc.MemberQueriesToIAMMember(req.Queries),
+	queries, err := member_grpc.MemberQueriesToQuery(req.Queries)
+	if err != nil {
+		return nil, err
 	}
+	return &query.IAMMembersQuery{
+		MembersQuery: query.MembersQuery{
+			SearchRequest: query.SearchRequest{
+				Offset: offset,
+				Limit:  limit,
+				Asc:    asc,
+				// SortingColumn: model.IAMMemberSearchKey, //TOOD: not implemented in proto
+			},
+			Queries: queries,
+		},
+	}, nil
 }

internal/api/grpc/admin/server.go

@@ -20,28 +20,30 @@ var _ admin.AdminServiceServer = (*Server)(nil)
 
 type Server struct {
 	admin.UnimplementedAdminServiceServer
-	command       *command.Commands
-	query         *query.Queries
-	iam           repository.IAMRepository
-	administrator repository.AdministratorRepository
-	repo          repository.Repository
-	users         repository.UserRepository
-	iamDomain     string
+	command         *command.Commands
+	query           *query.Queries
+	iam             repository.IAMRepository
+	administrator   repository.AdministratorRepository
+	repo            repository.Repository
+	users           repository.UserRepository
+	iamDomain       string
+	assetsAPIDomain string
 }
 
 type Config struct {
 	Repository eventsourcing.Config
 }
 
-func CreateServer(command *command.Commands, query *query.Queries, repo repository.Repository, iamDomain string) *Server {
+func CreateServer(command *command.Commands, query *query.Queries, repo repository.Repository, iamDomain, assetsAPIDomain string) *Server {
 	return &Server{
-		command:       command,
-		query:         query,
-		iam:           repo,
-		administrator: repo,
-		repo:          repo,
-		users:         repo,
-		iamDomain:     iamDomain,
+		command:         command,
+		query:           query,
+		iam:             repo,
+		administrator:   repo,
+		repo:            repo,
+		users:           repo,
+		iamDomain:       iamDomain,
+		assetsAPIDomain: assetsAPIDomain,
 	}
 }
 

internal/api/grpc/management/org.go

@@ -11,7 +11,6 @@ import (
 	policy_grpc "github.com/caos/zitadel/internal/api/grpc/policy"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
-	org_model "github.com/caos/zitadel/internal/org/model"
 	"github.com/caos/zitadel/internal/query"
 	usr_model "github.com/caos/zitadel/internal/user/model"
 	mgmt_pb "github.com/caos/zitadel/pkg/grpc/management"
@@ -216,36 +215,24 @@ func (s *Server) ListOrgMemberRoles(ctx context.Context, req *mgmt_pb.ListOrgMem
 }
 
 func (s *Server) ListOrgMembers(ctx context.Context, req *mgmt_pb.ListOrgMembersRequest) (*mgmt_pb.ListOrgMembersResponse, error) {
-	queries, err := ListOrgMembersRequestToModel(req)
+	queries, err := ListOrgMembersRequestToModel(ctx, req)
 	if err != nil {
 		return nil, err
 	}
-	members, err := s.org.SearchMyOrgMembers(ctx, queries)
+	members, err := s.query.OrgMembers(ctx, queries)
 	if err != nil {
 		return nil, err
 	}
 	return &mgmt_pb.ListOrgMembersResponse{
-		Result: member_grpc.OrgMembersToPb(members.Result),
+		Result: member_grpc.MembersToPb(s.assetAPIPrefix, members.Members),
 		Details: object.ToListDetails(
-			members.TotalResult,
+			members.Count,
 			members.Sequence,
 			members.Timestamp,
 		),
 	}, nil
 }
 
-func ListOrgMembersRequestToModel(req *mgmt_pb.ListOrgMembersRequest) (*org_model.OrgMemberSearchRequest, error) {
-	offset, limit, asc := object.ListQueryToModel(req.Query)
-	queries := member_grpc.MemberQueriesToOrgMember(req.Queries)
-	return &org_model.OrgMemberSearchRequest{
-		Offset: offset,
-		Limit:  limit,
-		Asc:    asc,
-		//SortingColumn: //TODO: sorting
-		Queries: queries,
-	}, nil
-}
-
 func (s *Server) AddOrgMember(ctx context.Context, req *mgmt_pb.AddOrgMemberRequest) (*mgmt_pb.AddOrgMemberResponse, error) {
 	addedMember, err := s.command.AddOrgMember(ctx, AddOrgMemberRequestToDomain(ctx, req))
 	if err != nil {

internal/api/grpc/management/org_converter.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/caos/zitadel/internal/api/authz"
+	member_grpc "github.com/caos/zitadel/internal/api/grpc/member"
 	"github.com/caos/zitadel/internal/api/grpc/object"
 	org_grpc "github.com/caos/zitadel/internal/api/grpc/org"
 	"github.com/caos/zitadel/internal/domain"
@@ -72,3 +73,29 @@ func AddOrgMemberRequestToDomain(ctx context.Context, req *mgmt_pb.AddOrgMemberR
 func UpdateOrgMemberRequestToDomain(ctx context.Context, req *mgmt_pb.UpdateOrgMemberRequest) *domain.Member {
 	return domain.NewMember(authz.GetCtxData(ctx).OrgID, req.UserId, req.Roles...)
 }
+
+func ListOrgMembersRequestToModel(ctx context.Context, req *mgmt_pb.ListOrgMembersRequest) (*query.OrgMembersQuery, error) {
+	ctxData := authz.GetCtxData(ctx)
+	offset, limit, asc := object.ListQueryToModel(req.Query)
+	queries, err := member_grpc.MemberQueriesToQuery(req.Queries)
+	if err != nil {
+		return nil, err
+	}
+	ownerQuery, err := query.NewMemberResourceOwnerSearchQuery(ctxData.OrgID)
+	if err != nil {
+		return nil, err
+	}
+	queries = append(queries, ownerQuery)
+	return &query.OrgMembersQuery{
+		MembersQuery: query.MembersQuery{
+			SearchRequest: query.SearchRequest{
+				Offset: offset,
+				Limit:  limit,
+				Asc:    asc,
+				//SortingColumn: //TODO: sorting
+			},
+			Queries: queries,
+		},
+		OrgID: ctxData.OrgID,
+	}, nil
+}

internal/api/grpc/management/project.go

@@ -279,19 +279,18 @@ func (s *Server) ListProjectMemberRoles(ctx context.Context, _ *mgmt_pb.ListProj
 }
 
 func (s *Server) ListProjectMembers(ctx context.Context, req *mgmt_pb.ListProjectMembersRequest) (*mgmt_pb.ListProjectMembersResponse, error) {
-	queries, err := ListProjectMembersRequestToModel(req)
+	queries, err := ListProjectMembersRequestToModel(ctx, req)
 	if err != nil {
 		return nil, err
 	}
-	queries.AppendProjectQuery(req.ProjectId)
-	members, err := s.project.SearchProjectMembers(ctx, queries)
+	members, err := s.query.ProjectMembers(ctx, queries)
 	if err != nil {
 		return nil, err
 	}
 	return &mgmt_pb.ListProjectMembersResponse{
-		Result: member_grpc.ProjectMembersToPb(members.Result),
+		Result: member_grpc.MembersToPb(s.assetAPIPrefix, members.Members),
 		Details: object_grpc.ToListDetails(
-			members.TotalResult,
+			members.Count,
 			members.Sequence,
 			members.Timestamp,
 		),

internal/api/grpc/management/project_converter.go

@@ -1,12 +1,14 @@
 package management
 
 import (
+	"context"
+
+	"github.com/caos/zitadel/internal/api/authz"
 	member_grpc "github.com/caos/zitadel/internal/api/grpc/member"
 	"github.com/caos/zitadel/internal/api/grpc/object"
 	proj_grpc "github.com/caos/zitadel/internal/api/grpc/project"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
-	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/query"
 	mgmt_pb "github.com/caos/zitadel/pkg/grpc/management"
 	proj_pb "github.com/caos/zitadel/pkg/grpc/project"
@@ -163,14 +165,27 @@ func listGrantedProjectRolesRequestToModel(req *mgmt_pb.ListGrantedProjectRolesR
 	}, nil
 }
 
-func ListProjectMembersRequestToModel(req *mgmt_pb.ListProjectMembersRequest) (*proj_model.ProjectMemberSearchRequest, error) {
+func ListProjectMembersRequestToModel(ctx context.Context, req *mgmt_pb.ListProjectMembersRequest) (*query.ProjectMembersQuery, error) {
 	offset, limit, asc := object.ListQueryToModel(req.Query)
-	queries := member_grpc.MemberQueriesToProjectMember(req.Queries)
-	return &proj_model.ProjectMemberSearchRequest{
-		Offset: offset,
-		Limit:  limit,
-		Asc:    asc,
-		//SortingColumn: //TODO: sorting
-		Queries: queries,
+	queries, err := member_grpc.MemberQueriesToQuery(req.Queries)
+	if err != nil {
+		return nil, err
+	}
+	ownerQuery, err := query.NewMemberResourceOwnerSearchQuery(authz.GetCtxData(ctx).OrgID)
+	if err != nil {
+		return nil, err
+	}
+	queries = append(queries, ownerQuery)
+	return &query.ProjectMembersQuery{
+		MembersQuery: query.MembersQuery{
+			SearchRequest: query.SearchRequest{
+				Offset: offset,
+				Limit:  limit,
+				Asc:    asc,
+				//SortingColumn: //TODO: sorting
+			},
+			Queries: queries,
+		},
+		ProjectID: req.ProjectId,
 	}, nil
 }

internal/api/grpc/management/project_grant.go

@@ -134,14 +134,18 @@ func (s *Server) ListProjectGrantMemberRoles(ctx context.Context, req *mgmt_pb.L
 }
 
 func (s *Server) ListProjectGrantMembers(ctx context.Context, req *mgmt_pb.ListProjectGrantMembersRequest) (*mgmt_pb.ListProjectGrantMembersResponse, error) {
-	response, err := s.project.SearchProjectGrantMembers(ctx, ListProjectGrantMembersRequestToModel(req))
+	queries, err := ListProjectGrantMembersRequestToModel(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	response, err := s.query.ProjectGrantMembers(ctx, queries)
 	if err != nil {
 		return nil, err
 	}
 	return &mgmt_pb.ListProjectGrantMembersResponse{
-		Result: member_grpc.ProjectGrantMembersToPb(response.Result),
+		Result: member_grpc.MembersToPb(s.assetAPIPrefix, response.Members),
 		Details: object_grpc.ToListDetails(
-			response.TotalResult,
+			response.Count,
 			response.Sequence,
 			response.Timestamp,
 		),

internal/api/grpc/management/project_grant_converter.go

@@ -1,12 +1,14 @@
 package management
 
 import (
+	"context"
+
+	"github.com/caos/zitadel/internal/api/authz"
 	member_grpc "github.com/caos/zitadel/internal/api/grpc/member"
 	"github.com/caos/zitadel/internal/api/grpc/object"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
-	proj_model "github.com/caos/zitadel/internal/project/model"
 	"github.com/caos/zitadel/internal/query"
 	mgmt_pb "github.com/caos/zitadel/pkg/grpc/management"
 	proj_pb "github.com/caos/zitadel/pkg/grpc/project"
@@ -118,27 +120,30 @@ func UpdateProjectGrantRequestToDomain(req *mgmt_pb.UpdateProjectGrantRequest) *
 	}
 }
 
-func ListProjectGrantMembersRequestToModel(req *mgmt_pb.ListProjectGrantMembersRequest) *proj_model.ProjectGrantMemberSearchRequest {
+func ListProjectGrantMembersRequestToModel(ctx context.Context, req *mgmt_pb.ListProjectGrantMembersRequest) (*query.ProjectGrantMembersQuery, error) {
 	offset, limit, asc := object.ListQueryToModel(req.Query)
-	queries := member_grpc.MemberQueriesToProjectGrantMember(req.Queries)
-	queries = append(queries,
-		&proj_model.ProjectGrantMemberSearchQuery{
-			Key:    proj_model.ProjectGrantMemberSearchKeyProjectID,
-			Method: domain.SearchMethodEquals,
-			Value:  req.ProjectId,
-		},
-		&proj_model.ProjectGrantMemberSearchQuery{
-			Key:    proj_model.ProjectGrantMemberSearchKeyGrantID,
-			Method: domain.SearchMethodEquals,
-			Value:  req.GrantId,
-		})
-	return &proj_model.ProjectGrantMemberSearchRequest{
-		Offset: offset,
-		Limit:  limit,
-		Asc:    asc,
-		//SortingColumn: //TODO: sorting
-		Queries: queries,
+	queries, err := member_grpc.MemberQueriesToQuery(req.Queries)
+	if err != nil {
+		return nil, err
 	}
+	ownerQuery, err := query.NewMemberResourceOwnerSearchQuery(authz.GetCtxData(ctx).OrgID)
+	if err != nil {
+		return nil, err
+	}
+	queries = append(queries, ownerQuery)
+	return &query.ProjectGrantMembersQuery{
+		MembersQuery: query.MembersQuery{
+			SearchRequest: query.SearchRequest{
+				Offset: offset,
+				Limit:  limit,
+				Asc:    asc,
+				//SortingColumn: //TODO: sorting
+			},
+			Queries: queries,
+		},
+		ProjectID: req.ProjectId,
+		GrantID:   req.GrantId,
+	}, nil
 }
 
 func AddProjectGrantMemberRequestToDomain(req *mgmt_pb.AddProjectGrantMemberRequest) *domain.ProjectGrantMember {

internal/api/grpc/management/server.go

@@ -30,13 +30,14 @@ type Server struct {
 	iam            repository.IamRepository
 	authZ          authz.Config
 	systemDefaults systemdefaults.SystemDefaults
+	assetAPIPrefix string
 }
 
 type Config struct {
 	Repository eventsourcing.Config
 }
 
-func CreateServer(command *command.Commands, query *query.Queries, repo repository.Repository, sd systemdefaults.SystemDefaults) *Server {
+func CreateServer(command *command.Commands, query *query.Queries, repo repository.Repository, sd systemdefaults.SystemDefaults, assetAPIPrefix string) *Server {
 	return &Server{
 		command:        command,
 		query:          query,
@@ -46,6 +47,7 @@ func CreateServer(command *command.Commands, query *query.Queries, repo reposito
 		usergrant:      repo,
 		iam:            repo,
 		systemDefaults: sd,
+		assetAPIPrefix: assetAPIPrefix,
 	}
 }
 

internal/api/grpc/member/converter.go

@@ -1,7 +1,10 @@
 package member
 
 import (
+	"github.com/caos/zitadel/internal/api/grpc/object"
 	"github.com/caos/zitadel/internal/domain"
+	"github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/query"
 	member_pb "github.com/caos/zitadel/pkg/grpc/member"
 )
 
@@ -11,3 +14,56 @@ func MemberToDomain(member *member_pb.Member) *domain.Member {
 		Roles:  member.Roles,
 	}
 }
+
+func MembersToPb(assetAPIPrefix string, members []*query.Member) []*member_pb.Member {
+	m := make([]*member_pb.Member, len(members))
+	for i, member := range members {
+		m[i] = MemberToPb(assetAPIPrefix, member)
+	}
+	return m
+}
+
+func MemberToPb(assetAPIPrefix string, m *query.Member) *member_pb.Member {
+	return &member_pb.Member{
+		UserId:             m.UserID,
+		Roles:              m.Roles,
+		PreferredLoginName: m.PreferredLoginName,
+		Email:              m.Email,
+		FirstName:          m.FirstName,
+		LastName:           m.LastName,
+		DisplayName:        m.DisplayName,
+		AvatarUrl:          domain.AvatarURL(assetAPIPrefix, m.ResourceOwner, m.AvatarURL),
+		Details: object.ToViewDetailsPb(
+			m.Sequence,
+			m.CreationDate,
+			m.ChangeDate,
+			m.ResourceOwner,
+		),
+	}
+}
+
+func MemberQueriesToQuery(queries []*member_pb.SearchQuery) (q []query.SearchQuery, err error) {
+	q = make([]query.SearchQuery, len(queries))
+	for i, query := range queries {
+		q[i], err = MemberQueryToMember(query)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return q, nil
+}
+
+func MemberQueryToMember(search *member_pb.SearchQuery) (query.SearchQuery, error) {
+	switch q := search.Query.(type) {
+	case *member_pb.SearchQuery_EmailQuery:
+		return query.NewMemberEmailSearchQuery(object.TextMethodToQuery(q.EmailQuery.Method), q.EmailQuery.Email)
+	case *member_pb.SearchQuery_FirstNameQuery:
+		return query.NewMemberFirstNameSearchQuery(object.TextMethodToQuery(q.FirstNameQuery.Method), q.FirstNameQuery.FirstName)
+	case *member_pb.SearchQuery_LastNameQuery:
+		return query.NewMemberLastNameSearchQuery(object.TextMethodToQuery(q.LastNameQuery.Method), q.LastNameQuery.LastName)
+	case *member_pb.SearchQuery_UserIdQuery:
+		return query.NewMemberUserIDSearchQuery(q.UserIdQuery.UserId)
+	default:
+		return nil, errors.ThrowInvalidArgument(nil, "MEMBE-7Bb92", "Errors.Query.InvalidRequest")
+	}
+}

internal/api/grpc/member/iam_member.go

@@ -1,90 +0,0 @@
-package member
-
-import (
-	"github.com/caos/zitadel/internal/api/grpc/object"
-	"github.com/caos/zitadel/internal/domain"
-	iam_model "github.com/caos/zitadel/internal/iam/model"
-	member_pb "github.com/caos/zitadel/pkg/grpc/member"
-)
-
-func IAMMembersToPb(members []*iam_model.IAMMemberView) []*member_pb.Member {
-	m := make([]*member_pb.Member, len(members))
-	for i, member := range members {
-		m[i] = IAMMemberToPb(member)
-	}
-	return m
-}
-
-func IAMMemberToPb(m *iam_model.IAMMemberView) *member_pb.Member {
-	return &member_pb.Member{
-		UserId:             m.UserID,
-		Roles:              m.Roles,
-		PreferredLoginName: m.PreferredLoginName,
-		Email:              m.Email,
-		FirstName:          m.FirstName,
-		LastName:           m.LastName,
-		DisplayName:        m.DisplayName,
-		AvatarUrl:          m.AvatarURL,
-		Details: object.ToViewDetailsPb(
-			m.Sequence,
-			m.CreationDate,
-			m.ChangeDate,
-			"", //TODO: not returnd
-		),
-	}
-}
-
-func MemberQueriesToIAMMember(queries []*member_pb.SearchQuery) []*iam_model.IAMMemberSearchQuery {
-	q := make([]*iam_model.IAMMemberSearchQuery, len(queries))
-	for i, query := range queries {
-		q[i] = MemberQueryToIAMMember(query)
-	}
-	return q
-}
-
-func MemberQueryToIAMMember(query *member_pb.SearchQuery) *iam_model.IAMMemberSearchQuery {
-	switch q := query.Query.(type) {
-	case *member_pb.SearchQuery_EmailQuery:
-		return EmailQueryToIAMMemberQuery(q.EmailQuery)
-	case *member_pb.SearchQuery_FirstNameQuery:
-		return FirstNameQueryToIAMMemberQuery(q.FirstNameQuery)
-	case *member_pb.SearchQuery_LastNameQuery:
-		return LastNameQueryToIAMMemberQuery(q.LastNameQuery)
-	case *member_pb.SearchQuery_UserIdQuery:
-		return UserIDQueryToIAMMemberQuery(q.UserIdQuery)
-	default:
-		return nil
-	}
-}
-
-func FirstNameQueryToIAMMemberQuery(query *member_pb.FirstNameQuery) *iam_model.IAMMemberSearchQuery {
-	return &iam_model.IAMMemberSearchQuery{
-		Key:    iam_model.IAMMemberSearchKeyFirstName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.FirstName,
-	}
-}
-
-func LastNameQueryToIAMMemberQuery(query *member_pb.LastNameQuery) *iam_model.IAMMemberSearchQuery {
-	return &iam_model.IAMMemberSearchQuery{
-		Key:    iam_model.IAMMemberSearchKeyLastName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.LastName,
-	}
-}
-
-func EmailQueryToIAMMemberQuery(query *member_pb.EmailQuery) *iam_model.IAMMemberSearchQuery {
-	return &iam_model.IAMMemberSearchQuery{
-		Key:    iam_model.IAMMemberSearchKeyEmail,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.Email,
-	}
-}
-
-func UserIDQueryToIAMMemberQuery(query *member_pb.UserIDQuery) *iam_model.IAMMemberSearchQuery {
-	return &iam_model.IAMMemberSearchQuery{
-		Key:    iam_model.IAMMemberSearchKeyUserID,
-		Method: domain.SearchMethodEquals,
-		Value:  query.UserId,
-	}
-}

internal/api/grpc/member/org_member.go

@@ -1,90 +0,0 @@
-package member
-
-import (
-	"github.com/caos/zitadel/internal/api/grpc/object"
-	"github.com/caos/zitadel/internal/domain"
-	org_model "github.com/caos/zitadel/internal/org/model"
-	member_pb "github.com/caos/zitadel/pkg/grpc/member"
-)
-
-func OrgMembersToPb(members []*org_model.OrgMemberView) []*member_pb.Member {
-	m := make([]*member_pb.Member, len(members))
-	for i, member := range members {
-		m[i] = OrgMemberToPb(member)
-	}
-	return m
-}
-
-func OrgMemberToPb(m *org_model.OrgMemberView) *member_pb.Member {
-	return &member_pb.Member{
-		UserId:             m.UserID,
-		Roles:              m.Roles,
-		PreferredLoginName: m.PreferredLoginName,
-		Email:              m.Email,
-		FirstName:          m.FirstName,
-		LastName:           m.LastName,
-		DisplayName:        m.DisplayName,
-		AvatarUrl:          m.AvatarURL,
-		Details: object.ToViewDetailsPb(
-			m.Sequence,
-			m.CreationDate,
-			m.ChangeDate,
-			"", //TODO: not returnd
-		),
-	}
-}
-
-func MemberQueriesToOrgMember(queries []*member_pb.SearchQuery) []*org_model.OrgMemberSearchQuery {
-	q := make([]*org_model.OrgMemberSearchQuery, len(queries))
-	for i, query := range queries {
-		q[i] = MemberQueryToOrgMember(query)
-	}
-	return q
-}
-
-func MemberQueryToOrgMember(query *member_pb.SearchQuery) *org_model.OrgMemberSearchQuery {
-	switch q := query.Query.(type) {
-	case *member_pb.SearchQuery_EmailQuery:
-		return EmailQueryToOrgMemberQuery(q.EmailQuery)
-	case *member_pb.SearchQuery_FirstNameQuery:
-		return FirstNameQueryToOrgMemberQuery(q.FirstNameQuery)
-	case *member_pb.SearchQuery_LastNameQuery:
-		return LastNameQueryToOrgMemberQuery(q.LastNameQuery)
-	case *member_pb.SearchQuery_UserIdQuery:
-		return UserIDQueryToOrgMemberQuery(q.UserIdQuery)
-	default:
-		return nil
-	}
-}
-
-func FirstNameQueryToOrgMemberQuery(query *member_pb.FirstNameQuery) *org_model.OrgMemberSearchQuery {
-	return &org_model.OrgMemberSearchQuery{
-		Key:    org_model.OrgMemberSearchKeyFirstName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.FirstName,
-	}
-}
-
-func LastNameQueryToOrgMemberQuery(query *member_pb.LastNameQuery) *org_model.OrgMemberSearchQuery {
-	return &org_model.OrgMemberSearchQuery{
-		Key:    org_model.OrgMemberSearchKeyLastName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.LastName,
-	}
-}
-
-func EmailQueryToOrgMemberQuery(query *member_pb.EmailQuery) *org_model.OrgMemberSearchQuery {
-	return &org_model.OrgMemberSearchQuery{
-		Key:    org_model.OrgMemberSearchKeyEmail,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.Email,
-	}
-}
-
-func UserIDQueryToOrgMemberQuery(query *member_pb.UserIDQuery) *org_model.OrgMemberSearchQuery {
-	return &org_model.OrgMemberSearchQuery{
-		Key:    org_model.OrgMemberSearchKeyUserID,
-		Method: domain.SearchMethodEquals,
-		Value:  query.UserId,
-	}
-}

internal/api/grpc/member/project_grant_member.go

@@ -1,90 +0,0 @@
-package member
-
-import (
-	"github.com/caos/zitadel/internal/api/grpc/object"
-	"github.com/caos/zitadel/internal/domain"
-	proj_model "github.com/caos/zitadel/internal/project/model"
-	member_pb "github.com/caos/zitadel/pkg/grpc/member"
-)
-
-func ProjectGrantMembersToPb(members []*proj_model.ProjectGrantMemberView) []*member_pb.Member {
-	m := make([]*member_pb.Member, len(members))
-	for i, member := range members {
-		m[i] = ProjectGrantMemberToPb(member)
-	}
-	return m
-}
-
-func ProjectGrantMemberToPb(m *proj_model.ProjectGrantMemberView) *member_pb.Member {
-	return &member_pb.Member{
-		UserId:             m.UserID,
-		Roles:              m.Roles,
-		PreferredLoginName: m.PreferredLoginName,
-		Email:              m.Email,
-		FirstName:          m.FirstName,
-		LastName:           m.LastName,
-		DisplayName:        m.DisplayName,
-		AvatarUrl:          m.AvatarURL,
-		Details: object.ToViewDetailsPb(
-			m.Sequence,
-			m.CreationDate,
-			m.ChangeDate,
-			"", //TODO: not returnd
-		),
-	}
-}
-
-func MemberQueriesToProjectGrantMember(queries []*member_pb.SearchQuery) []*proj_model.ProjectGrantMemberSearchQuery {
-	q := make([]*proj_model.ProjectGrantMemberSearchQuery, len(queries))
-	for i, query := range queries {
-		q[i] = MemberQueryToProjectGrantMember(query)
-	}
-	return q
-}
-
-func MemberQueryToProjectGrantMember(query *member_pb.SearchQuery) *proj_model.ProjectGrantMemberSearchQuery {
-	switch q := query.Query.(type) {
-	case *member_pb.SearchQuery_EmailQuery:
-		return EmailQueryToProjectGrantMemberQuery(q.EmailQuery)
-	case *member_pb.SearchQuery_FirstNameQuery:
-		return FirstNameQueryToProjectGrantMemberQuery(q.FirstNameQuery)
-	case *member_pb.SearchQuery_LastNameQuery:
-		return LastNameQueryToProjectGrantMemberQuery(q.LastNameQuery)
-	case *member_pb.SearchQuery_UserIdQuery:
-		return UserIDQueryToProjectGrantMemberQuery(q.UserIdQuery)
-	default:
-		return nil
-	}
-}
-
-func FirstNameQueryToProjectGrantMemberQuery(query *member_pb.FirstNameQuery) *proj_model.ProjectGrantMemberSearchQuery {
-	return &proj_model.ProjectGrantMemberSearchQuery{
-		Key:    proj_model.ProjectGrantMemberSearchKeyFirstName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.FirstName,
-	}
-}
-
-func LastNameQueryToProjectGrantMemberQuery(query *member_pb.LastNameQuery) *proj_model.ProjectGrantMemberSearchQuery {
-	return &proj_model.ProjectGrantMemberSearchQuery{
-		Key:    proj_model.ProjectGrantMemberSearchKeyLastName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.LastName,
-	}
-}
-
-func EmailQueryToProjectGrantMemberQuery(query *member_pb.EmailQuery) *proj_model.ProjectGrantMemberSearchQuery {
-	return &proj_model.ProjectGrantMemberSearchQuery{
-		Key:    proj_model.ProjectGrantMemberSearchKeyEmail,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.Email,
-	}
-}
-
-func UserIDQueryToProjectGrantMemberQuery(query *member_pb.UserIDQuery) *proj_model.ProjectGrantMemberSearchQuery {
-	return &proj_model.ProjectGrantMemberSearchQuery{
-		Key:    proj_model.ProjectGrantMemberSearchKeyUserID,
-		Method: domain.SearchMethodEquals,
-		Value:  query.UserId,
-	}
-}

internal/api/grpc/member/project_member.go

@@ -1,90 +0,0 @@
-package member
-
-import (
-	"github.com/caos/zitadel/internal/api/grpc/object"
-	"github.com/caos/zitadel/internal/domain"
-	proj_model "github.com/caos/zitadel/internal/project/model"
-	member_pb "github.com/caos/zitadel/pkg/grpc/member"
-)
-
-func ProjectMembersToPb(members []*proj_model.ProjectMemberView) []*member_pb.Member {
-	m := make([]*member_pb.Member, len(members))
-	for i, member := range members {
-		m[i] = ProjectMemberToPb(member)
-	}
-	return m
-}
-
-func ProjectMemberToPb(m *proj_model.ProjectMemberView) *member_pb.Member {
-	return &member_pb.Member{
-		UserId:             m.UserID,
-		Roles:              m.Roles,
-		PreferredLoginName: m.PreferredLoginName,
-		Email:              m.Email,
-		FirstName:          m.FirstName,
-		LastName:           m.LastName,
-		DisplayName:        m.DisplayName,
-		AvatarUrl:          m.AvatarURL,
-		Details: object.ToViewDetailsPb(
-			m.Sequence,
-			m.CreationDate,
-			m.ChangeDate,
-			"", //TODO: not returnd
-		),
-	}
-}
-
-func MemberQueriesToProjectMember(queries []*member_pb.SearchQuery) []*proj_model.ProjectMemberSearchQuery {
-	q := make([]*proj_model.ProjectMemberSearchQuery, len(queries))
-	for i, query := range queries {
-		q[i] = MemberQueryToProjectMember(query)
-	}
-	return q
-}
-
-func MemberQueryToProjectMember(query *member_pb.SearchQuery) *proj_model.ProjectMemberSearchQuery {
-	switch q := query.Query.(type) {
-	case *member_pb.SearchQuery_EmailQuery:
-		return EmailQueryToProjectMemberQuery(q.EmailQuery)
-	case *member_pb.SearchQuery_FirstNameQuery:
-		return FirstNameQueryToProjectMemberQuery(q.FirstNameQuery)
-	case *member_pb.SearchQuery_LastNameQuery:
-		return LastNameQueryToProjectMemberQuery(q.LastNameQuery)
-	case *member_pb.SearchQuery_UserIdQuery:
-		return UserIDQueryToProjectMemberQuery(q.UserIdQuery)
-	default:
-		return nil
-	}
-}
-
-func FirstNameQueryToProjectMemberQuery(query *member_pb.FirstNameQuery) *proj_model.ProjectMemberSearchQuery {
-	return &proj_model.ProjectMemberSearchQuery{
-		Key:    proj_model.ProjectMemberSearchKeyFirstName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.FirstName,
-	}
-}
-
-func LastNameQueryToProjectMemberQuery(query *member_pb.LastNameQuery) *proj_model.ProjectMemberSearchQuery {
-	return &proj_model.ProjectMemberSearchQuery{
-		Key:    proj_model.ProjectMemberSearchKeyLastName,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.LastName,
-	}
-}
-
-func EmailQueryToProjectMemberQuery(query *member_pb.EmailQuery) *proj_model.ProjectMemberSearchQuery {
-	return &proj_model.ProjectMemberSearchQuery{
-		Key:    proj_model.ProjectMemberSearchKeyEmail,
-		Method: object.TextMethodToModel(query.Method),
-		Value:  query.Email,
-	}
-}
-
-func UserIDQueryToProjectMemberQuery(query *member_pb.UserIDQuery) *proj_model.ProjectMemberSearchQuery {
-	return &proj_model.ProjectMemberSearchQuery{
-		Key:    proj_model.ProjectMemberSearchKeyUserID,
-		Method: domain.SearchMethodEquals,
-		Value:  query.UserId,
-	}
-}

internal/api/grpc/user/membership.go

@@ -101,10 +101,11 @@ func MembershipsToMembershipsPb(memberships []*query.Membership) []*user_pb.Memb
 }
 
 func MembershipToMembershipPb(membership *query.Membership) *user_pb.Membership {
+	typ, name := memberTypeToPb(membership)
 	return &user_pb.Membership{
 		UserId:      membership.UserID,
-		Type:        memberTypeToPb(membership),
-		DisplayName: membership.DisplayName,
+		Type:        typ,
+		DisplayName: name,
 		Roles:       membership.Roles,
 		Details: object.ToViewDetailsPb(
 			membership.Sequence,
@@ -115,23 +116,23 @@ func MembershipToMembershipPb(membership *query.Membership) *user_pb.Membership
 	}
 }
 
-func memberTypeToPb(membership *query.Membership) user_pb.MembershipType {
+func memberTypeToPb(membership *query.Membership) (user_pb.MembershipType, string) {
 	if membership.Org != nil {
 		return &user_pb.Membership_OrgId{
 			OrgId: membership.Org.OrgID,
-		}
+		}, membership.Org.Name
 	} else if membership.Project != nil {
 		return &user_pb.Membership_ProjectId{
 			ProjectId: membership.Project.ProjectID,
-		}
+		}, membership.Project.Name
 	} else if membership.ProjectGrant != nil {
 		return &user_pb.Membership_ProjectGrantId{
 			ProjectGrantId: membership.ProjectGrant.GrantID,
-		}
+		}, membership.ProjectGrant.ProjectName
 	} else if membership.IAM != nil {
 		return &user_pb.Membership_Iam{
 			Iam: true,
-		}
+		}, membership.IAM.Name
 	}
-	return nil
+	return nil, ""
 }