mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:17:32 +00:00
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
This commit is contained in:
@@ -1,6 +1,14 @@
|
||||
package query
|
||||
|
||||
import "github.com/caos/zitadel/internal/query/projection"
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
"github.com/lib/pq"
|
||||
)
|
||||
|
||||
var (
|
||||
projectMemberTable = table{
|
||||
@@ -36,3 +44,129 @@ var (
|
||||
table: projectMemberTable,
|
||||
}
|
||||
)
|
||||
|
||||
type ProjectMembersQuery struct {
|
||||
MembersQuery
|
||||
ProjectID string
|
||||
}
|
||||
|
||||
func (q *ProjectMembersQuery) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
||||
return q.MembersQuery.
|
||||
toQuery(query).
|
||||
Where(sq.Eq{ProjectMemberProjectID.identifier(): q.ProjectID})
|
||||
}
|
||||
|
||||
func (q *Queries) ProjectMembers(ctx context.Context, queries *ProjectMembersQuery) (*Members, error) {
|
||||
query, scan := prepareProjectMembersQuery()
|
||||
stmt, args, err := queries.toQuery(query).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInvalidArgument(err, "QUERY-T8CuT", "Errors.Query.InvalidRequest")
|
||||
}
|
||||
|
||||
currentSequence, err := q.latestSequence(ctx, projectMemberTable)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rows, err := q.client.QueryContext(ctx, stmt, args...)
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-uh6pj", "Errors.Internal")
|
||||
}
|
||||
members, err := scan(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
members.LatestSequence = currentSequence
|
||||
return members, err
|
||||
}
|
||||
|
||||
func prepareProjectMembersQuery() (sq.SelectBuilder, func(*sql.Rows) (*Members, error)) {
|
||||
return sq.Select(
|
||||
ProjectMemberCreationDate.identifier(),
|
||||
ProjectMemberChangeDate.identifier(),
|
||||
ProjectMemberSequence.identifier(),
|
||||
ProjectMemberResourceOwner.identifier(),
|
||||
ProjectMemberUserID.identifier(),
|
||||
ProjectMemberRoles.identifier(),
|
||||
LoginNameNameCol.identifier(),
|
||||
HumanEmailCol.identifier(),
|
||||
HumanFirstNameCol.identifier(),
|
||||
HumanLastNameCol.identifier(),
|
||||
HumanDisplayNameCol.identifier(),
|
||||
MachineNameCol.identifier(),
|
||||
HumanAvaterURLCol.identifier(),
|
||||
countColumn.identifier(),
|
||||
).From(projectMemberTable.identifier()).
|
||||
LeftJoin(join(HumanUserIDCol, ProjectMemberUserID)).
|
||||
LeftJoin(join(MachineUserIDCol, ProjectMemberUserID)).
|
||||
LeftJoin(join(LoginNameUserIDCol, ProjectMemberUserID)).
|
||||
Where(
|
||||
sq.Eq{LoginNameIsPrimaryCol.identifier(): true},
|
||||
).PlaceholderFormat(sq.Dollar),
|
||||
func(rows *sql.Rows) (*Members, error) {
|
||||
members := make([]*Member, 0)
|
||||
var count uint64
|
||||
|
||||
for rows.Next() {
|
||||
member := new(Member)
|
||||
roles := pq.StringArray{}
|
||||
|
||||
var (
|
||||
preferredLoginName = sql.NullString{}
|
||||
email = sql.NullString{}
|
||||
firstName = sql.NullString{}
|
||||
lastName = sql.NullString{}
|
||||
displayName = sql.NullString{}
|
||||
machineName = sql.NullString{}
|
||||
avatarURL = sql.NullString{}
|
||||
)
|
||||
|
||||
err := rows.Scan(
|
||||
&member.CreationDate,
|
||||
&member.ChangeDate,
|
||||
&member.Sequence,
|
||||
&member.ResourceOwner,
|
||||
&member.UserID,
|
||||
&roles,
|
||||
&preferredLoginName,
|
||||
&email,
|
||||
&firstName,
|
||||
&lastName,
|
||||
&displayName,
|
||||
&machineName,
|
||||
&avatarURL,
|
||||
|
||||
&count,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
member.Roles = roles
|
||||
member.PreferredLoginName = preferredLoginName.String
|
||||
member.Email = email.String
|
||||
member.FirstName = firstName.String
|
||||
member.LastName = lastName.String
|
||||
member.AvatarURL = avatarURL.String
|
||||
if displayName.Valid {
|
||||
member.DisplayName = displayName.String
|
||||
} else {
|
||||
member.DisplayName = machineName.String
|
||||
}
|
||||
|
||||
members = append(members, member)
|
||||
}
|
||||
|
||||
if err := rows.Close(); err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-ZJ1Ii", "Errors.Query.CloseRows")
|
||||
}
|
||||
|
||||
return &Members{
|
||||
Members: members,
|
||||
SearchResponse: SearchResponse{
|
||||
Count: count,
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user