mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 19:14:23 +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>
519 lines
15 KiB
Go
519 lines
15 KiB
Go
package projection
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"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/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"
|
|
)
|
|
|
|
func TestAuthNKeyProjection_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: "reduceAuthNKeyAdded app",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.ApplicationKeyAddedEventType),
|
|
project.AggregateType,
|
|
[]byte(`{"applicationId": "appId", "clientId":"clientId","keyId": "keyId", "type": 1, "expirationDate": "2021-11-30T15:00:00Z", "publicKey": "cHVibGljS2V5"}`),
|
|
), project.ApplicationKeyAddedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyAdded,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "INSERT INTO projections.authn_keys2 (id, creation_date, change_date, resource_owner, instance_id, aggregate_id, sequence, object_id, expiration, identifier, public_key, type) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)",
|
|
expectedArgs: []interface{}{
|
|
"keyId",
|
|
anyArg{},
|
|
anyArg{},
|
|
"ro-id",
|
|
"instance-id",
|
|
"agg-id",
|
|
uint64(15),
|
|
"appId",
|
|
anyArg{},
|
|
"clientId",
|
|
[]byte("publicKey"),
|
|
domain.AuthNKeyTypeJSON,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyAdded user",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(user.MachineKeyAddedEventType),
|
|
user.AggregateType,
|
|
[]byte(`{"keyId": "keyId", "type": 1, "expirationDate": "2021-11-30T15:00:00Z", "publicKey": "cHVibGljS2V5"}`),
|
|
), user.MachineKeyAddedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyAdded,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("user"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "INSERT INTO projections.authn_keys2 (id, creation_date, change_date, resource_owner, instance_id, aggregate_id, sequence, object_id, expiration, identifier, public_key, type) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)",
|
|
expectedArgs: []interface{}{
|
|
"keyId",
|
|
anyArg{},
|
|
anyArg{},
|
|
"ro-id",
|
|
"instance-id",
|
|
"agg-id",
|
|
uint64(15),
|
|
"agg-id",
|
|
anyArg{},
|
|
"agg-id",
|
|
[]byte("publicKey"),
|
|
domain.AuthNKeyTypeJSON,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved app key",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.ApplicationKeyRemovedEventType),
|
|
project.AggregateType,
|
|
[]byte(`{"keyId": "keyId"}`),
|
|
), project.ApplicationKeyRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"keyId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyEnabledChanged api no change",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.APIConfigChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId"}`),
|
|
), project.APIConfigChangedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyEnabledChanged,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyEnabledChanged api config basic",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.APIConfigChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId", "authMethodType": 0}`),
|
|
), project.APIConfigChangedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyEnabledChanged,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.authn_keys2 SET (change_date, sequence, enabled) = ($1, $2, $3) WHERE (object_id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
false,
|
|
"appId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyEnabledChanged api config jwt",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.APIConfigChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId", "authMethodType": 1}`),
|
|
), project.APIConfigChangedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyEnabledChanged,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.authn_keys2 SET (change_date, sequence, enabled) = ($1, $2, $3) WHERE (object_id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
true,
|
|
"appId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved app key",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(user.MachineKeyRemovedEventType),
|
|
user.AggregateType,
|
|
[]byte(`{"keyId": "keyId"}`),
|
|
), user.MachineKeyRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("user"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"keyId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceInstanceRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(instance.InstanceRemovedEventType),
|
|
instance.AggregateType,
|
|
nil,
|
|
), instance.InstanceRemovedEventMapper),
|
|
},
|
|
reduce: reduceInstanceRemovedHelper(AuthNKeyInstanceIDCol),
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("instance"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (instance_id = $1)",
|
|
expectedArgs: []interface{}{
|
|
"agg-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyEnabledChanged oidc no change",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.OIDCConfigChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId"}`),
|
|
), project.OIDCConfigChangedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyEnabledChanged,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyEnabledChanged oidc config basic",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.OIDCConfigChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId", "authMethodType": 0}`),
|
|
), project.OIDCConfigChangedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyEnabledChanged,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.authn_keys2 SET (change_date, sequence, enabled) = ($1, $2, $3) WHERE (object_id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
false,
|
|
"appId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyEnabledChanged oidc config jwt",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.OIDCConfigChangedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId", "authMethodType": 3}`),
|
|
), project.OIDCConfigChangedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyEnabledChanged,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.authn_keys2 SET (change_date, sequence, enabled) = ($1, $2, $3) WHERE (object_id = $4) AND (instance_id = $5)",
|
|
expectedArgs: []interface{}{
|
|
anyArg{},
|
|
uint64(15),
|
|
true,
|
|
"appId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved app key removed",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.ApplicationKeyRemovedEventType),
|
|
project.AggregateType,
|
|
[]byte(`{"keyId": "keyId"}`),
|
|
), project.ApplicationKeyRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"keyId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved app removed",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.ApplicationRemovedType),
|
|
project.AggregateType,
|
|
[]byte(`{"appId": "appId"}`),
|
|
), project.ApplicationRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (object_id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"appId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved project removed",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(project.ProjectRemovedType),
|
|
project.AggregateType,
|
|
nil,
|
|
), project.ProjectRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("project"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (aggregate_id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved machine key removed",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(user.MachineKeyRemovedEventType),
|
|
user.AggregateType,
|
|
[]byte(`{"keyId": "keyId"}`),
|
|
), user.MachineKeyRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("user"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"keyId",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceAuthNKeyRemoved user removed",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(user.UserRemovedType),
|
|
user.AggregateType,
|
|
[]byte(`{"keyId": "keyId"}`),
|
|
), user.UserRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceAuthNKeyRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("user"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "DELETE FROM projections.authn_keys2 WHERE (aggregate_id = $1) AND (instance_id = $2)",
|
|
expectedArgs: []interface{}{
|
|
"agg-id",
|
|
"instance-id",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "reduceOwnerRemoved",
|
|
args: args{
|
|
event: getEvent(testEvent(
|
|
repository.EventType(org.OrgRemovedEventType),
|
|
org.AggregateType,
|
|
nil,
|
|
), org.OrgRemovedEventMapper),
|
|
},
|
|
reduce: (&authNKeyProjection{}).reduceOwnerRemoved,
|
|
want: wantReduce{
|
|
aggregateType: eventstore.AggregateType("org"),
|
|
sequence: 15,
|
|
previousSequence: 10,
|
|
executer: &testExecuter{
|
|
executions: []execution{
|
|
{
|
|
expectedStmt: "UPDATE projections.authn_keys2 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",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
event := baseEvent(t)
|
|
got, err := tt.reduce(event)
|
|
if !errors.IsErrorInvalidArgument(err) {
|
|
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, AuthNKeyTable, tt.want)
|
|
})
|
|
}
|
|
}
|