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

fix: combine resourceowner query in reduce function for user grant (#7383)

Browse Source 
* fix: projection reduce correction with unit tests

* fix: remove eventcout variable as not used anymore

* fix: add errors if resoureowner is not found in user grants reduce
This commit is contained in:
Stefan Benz
2024-03-08 08:52:59 +01:00
committed by GitHub
parent 213c425806
commit 6df4b1b2c2
7 changed files with 551 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
internal/query/projection/user_grant_test.go
View File

@@ -28,7 +28,85 @@ func TestUserGrantProjection_reduces(t *testing.T) {
args args
reduce func(event eventstore.Event) (*handler.Statement, error)
want wantReduce
}{
}{{
name: "reduceAdded, multiple import",
args: args{
event: getEvent(
testEvent(
usergrant.UserGrantAddedType,
usergrant.AggregateType,
[]byte(`{
"userId": "user-id",
"projectId": "project-id",
"roleKeys": ["role"]
}`),
), usergrant.UserGrantAddedEventMapper),
},
reduce: (&userGrantProjection{
es: newMockEventStore().
appendFilterResponse([]eventstore.Event{
user.NewHumanAddedEvent(context.Background(),
&user.NewAggregate("user-id", "org2").Aggregate,
"username1",
"firstname1",
"lastname1",
"nickname1",
"displayname1",
language.German,
domain.GenderMale,
"email1",
true,
),
user.NewHumanAddedEvent(context.Background(),
&user.NewAggregate("user-id", "org1").Aggregate,
"username1",
"firstname1",
"lastname1",
"nickname1",
"displayname1",
language.German,
domain.GenderMale,
"email1",
true,
),
project.NewProjectAddedEvent(context.Background(),
&project.NewAggregate("project-id", "org2").Aggregate,
"project",
false,
false,
false,
domain.PrivateLabelingSettingUnspecified,
),
}),
}).reduceAdded,
want: wantReduce{
aggregateType: usergrant.AggregateType,
sequence: 15,
executer: &testExecuter{
executions: []execution{
{
expectedStmt: "INSERT INTO projections.user_grants4 (id, resource_owner, instance_id, creation_date, change_date, sequence, user_id, resource_owner_user, project_id, resource_owner_project, grant_id, granted_org, roles, state) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14)",
expectedArgs: []interface{}{
"agg-id",
"ro-id",
"instance-id",
anyArg{},
anyArg{},
uint64(15),
"user-id",
"org1",
"project-id",
"org2",
"",
"",
database.TextArray[string]{"role"},
domain.UserGrantStateActive,
},
},
},
},
},
},
{
name: "reduceAdded",
args: args{
@@ -126,6 +204,11 @@ func TestUserGrantProjection_reduces(t *testing.T) {
"email1",
true,
),
project.NewProjectAddedEvent(context.Background(),
&project.NewAggregate("project-id", "org2").Aggregate,
"project", true, true, true,
domain.PrivateLabelingSettingUnspecified,
),
project.NewGrantAddedEvent(context.Background(),
&project.NewAggregate("project-id", "org2").Aggregate,
"grant-id",
@@ -151,7 +234,7 @@ func TestUserGrantProjection_reduces(t *testing.T) {
"user-id",
"org1",
"project-id",
"",
"org2",
"grant-id",
"org3",
database.TextArray[string]{"role"},
@@ -637,6 +720,52 @@ func Test_getResourceOwners(t *testing.T) {
wantErr: false,
},
},
{
name: "user RO, import",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(
eventFromEventPusher(
user.NewHumanAddedEvent(context.Background(),
&user.NewAggregate("user", "org2").Aggregate,
"username1",
"firstname1",
"lastname1",
"nickname1",
"displayname1",
language.German,
domain.GenderMale,
"email1",
true,
),
),
eventFromEventPusher(
user.NewHumanAddedEvent(context.Background(),
&user.NewAggregate("user", "org1").Aggregate,
"username1",
"firstname1",
"lastname1",
"nickname1",
"displayname1",
language.German,
domain.GenderMale,
"email1",
true,
),
),
),
),
},
args: args{
instanceID: "instance",
userID: "user",
},
want: want{
userRO: "org1",
wantErr: false,
},
},
{
name: "user RO, no user",
fields: fields{
@@ -650,7 +779,7 @@ func Test_getResourceOwners(t *testing.T) {
userID: "user",
},
want: want{
wantErr: true,
wantErr: false,
},
},
{
@@ -726,7 +855,8 @@ func Test_getResourceOwners(t *testing.T) {
projectID: "project",
},
want: want{
wantErr: true,
userRO: "org",
wantErr: false,
},
},
{
@@ -772,6 +902,63 @@ func Test_getResourceOwners(t *testing.T) {
wantErr: false,
},
},
{
name: "user and grant RO, import",
fields: fields{
eventstore: eventstoreExpect(
t,
expectFilter(
eventFromEventPusher(
user.NewHumanAddedEvent(context.Background(),
&user.NewAggregate("user", "org2").Aggregate,
"username1",
"firstname1",
"lastname1",
"nickname1",
"displayname1",
language.German,
domain.GenderMale,
"email1",
true,
),
),
eventFromEventPusher(
user.NewHumanAddedEvent(context.Background(),
&user.NewAggregate("user", "org").Aggregate,
"username1",
"firstname1",
"lastname1",
"nickname1",
"displayname1",
language.German,
domain.GenderMale,
"email1",
true,
),
),
eventFromEventPusher(
project.NewGrantAddedEvent(context.Background(),
&project.NewAggregate("project", "org").Aggregate,
"projectgrant1",
"grantedorg1",
[]string{"key1"},
),
),
),
),
},
args: args{
instanceID: "instance",
userID: "user",
projectID: "project",
grantID: "projectgrant1",
},
want: want{
userRO: "org",
grantedOrg: "grantedorg1",
wantErr: false,
},
},
{
name: "user and grant RO, no grant",
fields: fields{
@@ -802,7 +989,8 @@ func Test_getResourceOwners(t *testing.T) {
grantID: "projectgrant1",
},
want: want{
wantErr: true,
userRO: "org",
wantErr: false,
},
},
{
@@ -829,7 +1017,8 @@ func Test_getResourceOwners(t *testing.T) {
grantID: "projectgrant1",
},
want: want{
wantErr: true,
grantedOrg: "grantedorg1",
wantErr: false,
},
},
}