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/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,
-	}
-}