mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-25 09:07:48 +00:00
f3e6f3b23b
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
604 lines
16 KiB
Go
604 lines
16 KiB
Go
package projection
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler"
|
|
"github.com/zitadel/zitadel/internal/eventstore/handler/crdb"
|
|
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
"github.com/zitadel/zitadel/internal/repository/project"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
"github.com/zitadel/zitadel/internal/repository/usergrant"
|
|
)
|
|
|
|
func TestUserGrantProjection_reduces(t *testing.T) {
|
|
type args struct {
|
|
event func(t *testing.T) eventstore.Event
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
args args
|
|
reduce func(event eventstore.Event) (*handler.Statement, error)
|
|
want wantReduce
|
|
}{
|
|
{
|
|
name: "reduceAdded",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantAddedType),
|
|
usergrant.AggregateType,
|
|
[]byte(`{
|
|
"userId": "user-id",
|
|
"projectId": "project-id",
|
|
"roleKeys": ["role"]
|
|
}`),
|
|
), usergrant.UserGrantAddedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{
|
|
StatementHandler: getStatementHandlerWithFilters(
|
|
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,
|
|
),
|
|
)(t)}).reduceAdded,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "INSERT INTO projections.user_grants3 (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.StringArray{"role"},
|
|
domain.UserGrantStateActive,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAdded with projectgrant",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantAddedType),
|
|
usergrant.AggregateType,
|
|
[]byte(`{
|
|
"userId": "user-id",
|
|
"projectId": "project-id",
|
|
"grantId": "grant-id",
|
|
"roleKeys": ["role"]
|
|
}`),
|
|
), usergrant.UserGrantAddedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{
|
|
StatementHandler: getStatementHandlerWithFilters(
|
|
user.NewHumanAddedEvent(context.Background(),
|
|
&user.NewAggregate("user-id", "org1").Aggregate,
|
|
"username1",
|
|
"firstname1",
|
|
"lastname1",
|
|
"nickname1",
|
|
"displayname1",
|
|
language.German,
|
|
domain.GenderMale,
|
|
"email1",
|
|
true,
|
|
),
|
|
project.NewGrantAddedEvent(context.Background(),
|
|
&project.NewAggregate("project-id", "org2").Aggregate,
|
|
"grant-id",
|
|
"org3",
|
|
[]string{},
|
|
),
|
|
)(t)}).reduceAdded,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "INSERT INTO projections.user_grants3 (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",
|
|
"",
|
|
"grant-id",
|
|
"org3",
|
|
database.StringArray{"role"},
|
|
domain.UserGrantStateActive,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceChanged",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantChangedType),
|
|
usergrant.AggregateType,
|
|
[]byte(`{
|
|
"roleKeys": ["role"]
|
|
}`),
|
|
), usergrant.UserGrantChangedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceChanged,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, roles, sequence) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
database.StringArray{"role"},
|
|
uint64(15),
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceCascadeChanged",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantCascadeChangedType),
|
|
usergrant.AggregateType,
|
|
[]byte(`{
|
|
"roleKeys": ["role"]
|
|
}`),
|
|
), usergrant.UserGrantCascadeChangedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceChanged,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, roles, sequence) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
database.StringArray{"role"},
|
|
uint64(15),
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantRemovedType),
|
|
usergrant.AggregateType,
|
|
nil,
|
|
), usergrant.UserGrantRemovedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceRemoved,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.user_grants3 WHERE (id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "instance reduceInstanceRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(instance.InstanceRemovedEventType),
|
|
instance.AggregateType,
|
|
nil,
|
|
), instance.InstanceRemovedEventMapper),
|
|
},
|
|
reduce: reduceInstanceRemovedHelper(UserGrantInstanceID),
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("instance"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.user_grants3 WHERE (instance_id = $1)",
|
|
expectedArgs: []interface{}{
|
|
"agg-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceCascadeRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantCascadeRemovedType),
|
|
usergrant.AggregateType,
|
|
nil,
|
|
), usergrant.UserGrantCascadeRemovedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceRemoved,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.user_grants3 WHERE (id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceDeactivated",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantDeactivatedType),
|
|
usergrant.AggregateType,
|
|
nil,
|
|
), usergrant.UserGrantDeactivatedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceDeactivated,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, state, sequence) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
domain.UserGrantStateInactive,
|
|
uint64(15),
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceReactivated",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(usergrant.UserGrantReactivatedType),
|
|
usergrant.AggregateType,
|
|
nil,
|
|
), usergrant.UserGrantDeactivatedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceReactivated,
|
|
want: wantReduce{
|
|
aggregateType: usergrant.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, state, sequence) = ($1, $2, $3) WHERE (id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
domain.UserGrantStateActive,
|
|
uint64(15),
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceUserRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(user.UserRemovedType),
|
|
user.AggregateType,
|
|
nil,
|
|
), user.UserRemovedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceUserRemoved,
|
|
want: wantReduce{
|
|
aggregateType: user.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.user_grants3 WHERE (user_id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceProjectRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.ProjectRemovedType),
|
|
project.AggregateType,
|
|
nil,
|
|
), project.ProjectRemovedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceProjectRemoved,
|
|
want: wantReduce{
|
|
aggregateType: project.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.user_grants3 WHERE (project_id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceProjectGrantRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.GrantRemovedType),
|
|
project.AggregateType,
|
|
[]byte(`{"grantId": "grantID"}`),
|
|
), project.GrantRemovedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceProjectGrantRemoved,
|
|
want: wantReduce{
|
|
aggregateType: project.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.user_grants3 WHERE (grant_id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"grantID",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceRoleRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.RoleRemovedType),
|
|
project.AggregateType,
|
|
[]byte(`{"key": "key"}`),
|
|
), project.RoleRemovedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceRoleRemoved,
|
|
want: wantReduce{
|
|
aggregateType: project.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET roles = array_remove(roles, $1) WHERE (project_id = $2) AND (instance_id = $3)",
|
|
expectedArgs: []interface{}{
|
|
"key",
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceProjectGrantChanged",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.GrantChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"grantId": "grantID", "roleKeys": ["key"]}`),
|
|
), project.GrantChangedEventMapper),
|
|
},
|
|
reduce: (&userGrantProjection{}).reduceProjectGrantChanged,
|
|
want: wantReduce{
|
|
aggregateType: project.AggregateType,
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (roles) = (SELECT ARRAY( SELECT UNNEST(roles) INTERSECT SELECT UNNEST ($1::TEXT[]))) WHERE (grant_id = $2) AND (instance_id = $3)",
|
|
expectedArgs: []interface{}{
|
|
database.StringArray{"key"},
|
|
"grantID",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "org.reduceOwnerRemoved",
|
|
reduce: (&userGrantProjection{}).reduceOwnerRemoved,
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(org.OrgRemovedEventType),
|
|
org.AggregateType,
|
|
nil,
|
|
), org.OrgRemovedEventMapper),
|
|
},
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("org"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, sequence, owner_removed) = ($1, $2, $3) WHERE (instance_id = $4) AND (resource_owner = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
true,
|
|
"instance-id",
|
|
"agg-id",
|
|
},
|
|
},
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, sequence, user_owner_removed) = ($1, $2, $3) WHERE (instance_id = $4) AND (resource_owner_user = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
true,
|
|
"instance-id",
|
|
"agg-id",
|
|
},
|
|
},
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, sequence, project_owner_removed) = ($1, $2, $3) WHERE (instance_id = $4) AND (resource_owner_project = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
true,
|
|
"instance-id",
|
|
"agg-id",
|
|
},
|
|
},
|
|
{
|
|
expectedStmt: "UPDATE projections.user_grants3 SET (change_date, sequence, granted_org_removed) = ($1, $2, $3) WHERE (instance_id = $4) AND (granted_org = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
true,
|
|
"instance-id",
|
|
"agg-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
event := baseEvent(t)
|
|
got, err := tt.reduce(event)
|
|
if _, ok := err.(errors.InvalidArgument); !ok {
|
|
t.Errorf("no wrong event mapping: %v, got: %v", err, got)
|
|
}
|
|
|
|
event = tt.args.event(t)
|
|
got, err = tt.reduce(event)
|
|
assertReduce(t, got, err, UserGrantProjectionTable, tt.want)
|
|
})
|
|
}
|
|
}
|
|
|
|
func getStatementHandlerWithFilters(events ...eventstore.Command) func(t *testing.T) crdb.StatementHandler {
|
|
filters := make([]expect, 0)
|
|
for _, event := range events {
|
|
filters = append(filters,
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
event,
|
|
),
|
|
),
|
|
)
|
|
}
|
|
|
|
return func(t *testing.T) crdb.StatementHandler {
|
|
return crdb.StatementHandler{
|
|
ProjectionHandler: &handler.ProjectionHandler{
|
|
Handler: handler.Handler{
|
|
Eventstore: eventstoreExpect(
|
|
t,
|
|
filters...,
|
|
),
|
|
},
|
|
},
|
|
}
|
|
}
|
|
}
|