TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 07:47:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: member queries (#2796)

Browse Source 
* 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:
Silvan
2021-12-16 14:25:38 +01:00
committed by GitHub
parent fb43b13232
commit d2ea9a1b8c
44 changed files with 2820 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/api/grpc/user/membership.go
View File

@@ -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, ""
}