TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:57:31 +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

241
internal/query/user_membership_test.go
View File

@@ -23,8 +23,8 @@ var (
", memberships.iam_id" +
", memberships.project_id" +
", memberships.grant_id" +
", zitadel.projections.users_humans.display_name" +
", zitadel.projections.users_machines.name" +
", zitadel.projections.projects.name" +
", zitadel.projections.orgs.name" +
", COUNT(*) OVER ()" +
" FROM (" +
"SELECT members.user_id" +
@@ -75,8 +75,8 @@ var (
", members.grant_id" +
" FROM zitadel.projections.project_grant_members as members" +
") AS memberships" +
" LEFT JOIN zitadel.projections.users_humans ON memberships.user_id = zitadel.projections.users_humans.user_id" +
" LEFT JOIN zitadel.projections.users_machines ON memberships.user_id = zitadel.projections.users_machines.user_id")
" LEFT JOIN zitadel.projections.projects ON memberships.project_id = zitadel.projections.projects.id" +
" LEFT JOIN zitadel.projections.orgs ON memberships.org_id = zitadel.projections.orgs.id")
membershipCols = []string{
"user_id",
"roles",
@@ -88,8 +88,8 @@ var (
"iam_id",
"project_id",
"grant_id",
"display_name",
"name",
"name", //project name
"name", //org name
"count",
}
)
@@ -118,50 +118,7 @@ func Test_MembershipPrepares(t *testing.T) {
object: &Memberships{Memberships: []*Membership{}},
},
{
name: "prepareMembershipsQuery one org member human",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
membershipsStmt,
membershipCols,
[][]driver.Value{
{
"user-id",
pq.StringArray{"role1", "role2"},
testNow,
testNow,
uint64(20211202),
"ro",
"org-id",
nil,
nil,
nil,
"display name",
nil,
},
},
),
},
object: &Memberships{
SearchResponse: SearchResponse{
Count: 1,
},
Memberships: []*Membership{
{
UserID: "user-id",
Roles: []string{"role1", "role2"},
CreationDate: testNow,
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
Org: &OrgMembership{OrgID: "org-id"},
DisplayName: "display name",
},
},
},
},
{
name: "prepareMembershipsQuery one org member machine",
name: "prepareMembershipsQuery one org member",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
@@ -180,7 +137,7 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
nil,
nil,
"machine-name",
"org-name",
},
},
),
@@ -197,57 +154,13 @@ func Test_MembershipPrepares(t *testing.T) {
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
Org: &OrgMembership{OrgID: "org-id"},
DisplayName: "machine-name",
Org: &OrgMembership{OrgID: "org-id", Name: "org-name"},
},
},
},
},
{
name: "prepareMembershipsQuery one iam member human",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
membershipsStmt,
membershipCols,
[][]driver.Value{
{
"user-id",
pq.StringArray{"role1", "role2"},
testNow,
testNow,
uint64(20211202),
"ro",
nil,
"iam-id",
nil,
nil,
"display name",
nil,
},
},
),
},
object: &Memberships{
SearchResponse: SearchResponse{
Count: 1,
},
Memberships: []*Membership{
{
UserID: "user-id",
Roles: []string{"role1", "role2"},
CreationDate: testNow,
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
IAM: &IAMMembership{IAMID: "iam-id"},
DisplayName: "display name",
},
},
},
},
{
name: "prepareMembershipsQuery one iam member machine",
name: "prepareMembershipsQuery one iam member",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
@@ -266,7 +179,7 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
nil,
nil,
"machine-name",
nil,
},
},
),
@@ -283,14 +196,13 @@ func Test_MembershipPrepares(t *testing.T) {
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
IAM: &IAMMembership{IAMID: "iam-id"},
DisplayName: "machine-name",
IAM: &IAMMembership{IAMID: "iam-id", Name: "iam-id"},
},
},
},
},
{
name: "prepareMembershipsQuery one project member human",
name: "prepareMembershipsQuery one project member",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
@@ -308,7 +220,7 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
"project-id",
nil,
"display name",
"project-name",
nil,
},
},
@@ -326,57 +238,13 @@ func Test_MembershipPrepares(t *testing.T) {
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
Project: &ProjectMembership{ProjectID: "project-id"},
DisplayName: "display name",
Project: &ProjectMembership{ProjectID: "project-id", Name: "project-name"},
},
},
},
},
{
name: "prepareMembershipsQuery one project member machine",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
membershipsStmt,
membershipCols,
[][]driver.Value{
{
"user-id",
pq.StringArray{"role1", "role2"},
testNow,
testNow,
uint64(20211202),
"ro",
nil,
nil,
"project-id",
nil,
nil,
"machine-name",
},
},
),
},
object: &Memberships{
SearchResponse: SearchResponse{
Count: 1,
},
Memberships: []*Membership{
{
UserID: "user-id",
Roles: []string{"role1", "role2"},
CreationDate: testNow,
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
Project: &ProjectMembership{ProjectID: "project-id"},
DisplayName: "machine-name",
},
},
},
},
{
name: "prepareMembershipsQuery one project grant member human",
name: "prepareMembershipsQuery one project grant member",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
@@ -394,7 +262,7 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
"project-id",
"grant-id",
"display name",
"project-name",
nil,
},
},
@@ -413,56 +281,10 @@ func Test_MembershipPrepares(t *testing.T) {
Sequence: 20211202,
ResourceOwner: "ro",
ProjectGrant: &ProjectGrantMembership{
GrantID: "grant-id",
ProjectID: "project-id",
GrantID: "grant-id",
ProjectID: "project-id",
ProjectName: "project-name",
},
DisplayName: "display name",
},
},
},
},
{
name: "prepareMembershipsQuery one project grant member machine",
prepare: prepareMembershipsQuery,
want: want{
sqlExpectations: mockQueries(
membershipsStmt,
membershipCols,
[][]driver.Value{
{
"user-id",
pq.StringArray{"role1", "role2"},
testNow,
testNow,
uint64(20211202),
"ro",
nil,
nil,
"project-id",
"grant-id",
nil,
"machine-name",
},
},
),
},
object: &Memberships{
SearchResponse: SearchResponse{
Count: 1,
},
Memberships: []*Membership{
{
UserID: "user-id",
Roles: []string{"role1", "role2"},
CreationDate: testNow,
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
ProjectGrant: &ProjectGrantMembership{
GrantID: "grant-id",
ProjectID: "project-id",
},
DisplayName: "machine-name",
},
},
},
@@ -486,8 +308,8 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
nil,
nil,
"display name",
nil,
"org-name",
},
{
"user-id",
@@ -500,7 +322,7 @@ func Test_MembershipPrepares(t *testing.T) {
"iam-id",
nil,
nil,
"display name",
nil,
nil,
},
{
@@ -514,7 +336,7 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
"project-id",
nil,
"display name",
"project-name",
nil,
},
{
@@ -528,7 +350,7 @@ func Test_MembershipPrepares(t *testing.T) {
nil,
"project-id",
"grant-id",
"display name",
"project-name",
nil,
},
},
@@ -546,8 +368,7 @@ func Test_MembershipPrepares(t *testing.T) {
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
Org: &OrgMembership{OrgID: "org-id"},
DisplayName: "display name",
Org: &OrgMembership{OrgID: "org-id", Name: "org-name"},
},
{
UserID: "user-id",
@@ -556,8 +377,7 @@ func Test_MembershipPrepares(t *testing.T) {
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
IAM: &IAMMembership{IAMID: "iam-id"},
DisplayName: "display name",
IAM: &IAMMembership{IAMID: "iam-id", Name: "iam-id"},
},
{
UserID: "user-id",
@@ -566,8 +386,7 @@ func Test_MembershipPrepares(t *testing.T) {
ChangeDate: testNow,
Sequence: 20211202,
ResourceOwner: "ro",
Project: &ProjectMembership{ProjectID: "project-id"},
DisplayName: "display name",
Project: &ProjectMembership{ProjectID: "project-id", Name: "project-name"},
},
{
UserID: "user-id",
@@ -577,10 +396,10 @@ func Test_MembershipPrepares(t *testing.T) {
Sequence: 20211202,
ResourceOwner: "ro",
ProjectGrant: &ProjectGrantMembership{
ProjectID: "project-id",
GrantID: "grant-id",
ProjectID: "project-id",
GrantID: "grant-id",
ProjectName: "project-name",
},
DisplayName: "display name",
},
},
},