mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 00:57:33 +00:00
feat(queries): user membership (#2768)
* 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 * fix(query): member queries and user avatar column * member cols * fix(queries): membership stmt * fix user test * fix user test
This commit is contained in:
@@ -2,9 +2,67 @@ package query
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
"github.com/caos/zitadel/internal/telemetry/tracing"
|
||||
)
|
||||
|
||||
type MembersQuery struct {
|
||||
SearchRequest
|
||||
Queries []SearchQuery
|
||||
}
|
||||
|
||||
func (q *MembersQuery) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
||||
query = q.SearchRequest.toQuery(query)
|
||||
for _, q := range q.Queries {
|
||||
query = q.toQuery(query)
|
||||
}
|
||||
return query
|
||||
}
|
||||
|
||||
func NewMemberEmailSearchQuery(method TextComparison, value string) (SearchQuery, error) {
|
||||
return NewTextQuery(HumanEmailCol, value, method)
|
||||
}
|
||||
|
||||
func NewMemberFirstNameSearchQuery(method TextComparison, value string) (SearchQuery, error) {
|
||||
return NewTextQuery(HumanFirstNameCol, value, method)
|
||||
}
|
||||
|
||||
func NewMemberLastNameSearchQuery(method TextComparison, value string) (SearchQuery, error) {
|
||||
return NewTextQuery(HumanLastNameCol, value, method)
|
||||
}
|
||||
|
||||
func NewMemberUserIDSearchQuery(value string) (SearchQuery, error) {
|
||||
return NewTextQuery(memberUserID, value, TextEquals)
|
||||
}
|
||||
func NewMemberResourceOwnerSearchQuery(value string) (SearchQuery, error) {
|
||||
return NewTextQuery(memberResourceOwner, value, TextEquals)
|
||||
}
|
||||
|
||||
type Members struct {
|
||||
SearchResponse
|
||||
Members []*Member
|
||||
}
|
||||
|
||||
type Member struct {
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
Sequence uint64
|
||||
ResourceOwner string
|
||||
|
||||
UserID string
|
||||
Roles []string
|
||||
PreferredLoginName string
|
||||
Email string
|
||||
FirstName string
|
||||
LastName string
|
||||
DisplayName string
|
||||
AvatarURL string
|
||||
}
|
||||
|
||||
func (r *Queries) IAMMemberByID(ctx context.Context, iamID, userID string) (member *IAMMemberReadModel, err error) {
|
||||
ctx, span := tracing.NewSpan(ctx)
|
||||
defer func() { span.EndWithError(err) }()
|
||||
@@ -17,3 +75,18 @@ func (r *Queries) IAMMemberByID(ctx context.Context, iamID, userID string) (memb
|
||||
|
||||
return member, nil
|
||||
}
|
||||
|
||||
var (
|
||||
memberTableAlias = table{
|
||||
name: "members",
|
||||
alias: "members",
|
||||
}
|
||||
memberUserID = Column{
|
||||
name: projection.MemberUserIDCol,
|
||||
table: memberTableAlias,
|
||||
}
|
||||
memberResourceOwner = Column{
|
||||
name: projection.MemberResourceOwner,
|
||||
table: memberTableAlias,
|
||||
}
|
||||
)
|
||||
|
Reference in New Issue
Block a user