TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 22:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: setup step 21 (#2864)

Browse Source
This commit is contained in:
Livio Amstutz 2021-12-17 11:11:57 +01:00 committed by GitHub
parent 28d7acdf99
commit 27f87df676
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
internal/command/org_domain_test.go
View File

@ -63,13 +63,13 @@ func TestCommandSide_AddOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -97,7 +97,7 @@ func TestCommandSide_AddOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
@ -105,7 +105,7 @@ func TestCommandSide_AddOrgDomain(t *testing.T) {
expectPush( expectPush(
[]*repository.Event{ []*repository.Event{
eventFromEventPusher(org.NewDomainAddedEvent(context.Background(), eventFromEventPusher(org.NewDomainAddedEvent(context.Background(),
&org.NewAggregate("", "").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
)), )),
}, },
@ -115,11 +115,18 @@ func TestCommandSide_AddOrgDomain(t *testing.T) {
args: args{ args: args{
ctx: context.Background(), ctx: context.Background(),
domain: &domain.OrgDomain{ domain: &domain.OrgDomain{
ObjectRoot: models.ObjectRoot{
AggregateID: "org1",
},
Domain: "domain.ch", Domain: "domain.ch",
}, },
}, },
res: res{ res: res{
want: &domain.OrgDomain{ want: &domain.OrgDomain{
ObjectRoot: models.ObjectRoot{
AggregateID: "org1",
ResourceOwner: "org1",
},
Domain: "domain.ch", Domain: "domain.ch",
}, },
}, },
@ -228,7 +235,7 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
@ -257,19 +264,19 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerifiedEvent(context.Background(), org.NewDomainVerifiedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -298,13 +305,13 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -350,13 +357,13 @@ func TestCommandSide_GenerateOrgDomainValidation(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -483,7 +490,7 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
@ -512,19 +519,19 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerifiedEvent(context.Background(), org.NewDomainVerifiedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -553,13 +560,13 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -588,19 +595,19 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerificationAddedEvent(context.Background(), org.NewDomainVerificationAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
domain.OrgDomainValidationTypeDNS, domain.OrgDomainValidationTypeDNS,
&crypto.CryptoValue{ &crypto.CryptoValue{
@ -646,19 +653,19 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerificationAddedEvent(context.Background(), org.NewDomainVerificationAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
domain.OrgDomainValidationTypeDNS, domain.OrgDomainValidationTypeDNS,
&crypto.CryptoValue{ &crypto.CryptoValue{
@ -707,19 +714,19 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerificationAddedEvent(context.Background(), org.NewDomainVerificationAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
domain.OrgDomainValidationTypeDNS, domain.OrgDomainValidationTypeDNS,
&crypto.CryptoValue{ &crypto.CryptoValue{
@ -770,19 +777,19 @@ func TestCommandSide_ValidateOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerificationAddedEvent(context.Background(), org.NewDomainVerificationAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
domain.OrgDomainValidationTypeDNS, domain.OrgDomainValidationTypeDNS,
&crypto.CryptoValue{ &crypto.CryptoValue{
@ -941,7 +948,7 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
@ -970,13 +977,13 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -1004,19 +1011,19 @@ func TestCommandSide_SetPrimaryDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerifiedEvent(context.Background(), org.NewDomainVerifiedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -1128,7 +1135,7 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
@ -1157,25 +1164,25 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerifiedEvent(context.Background(), org.NewDomainVerifiedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPrimarySetEvent(context.Background(), org.NewDomainPrimarySetEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -1203,13 +1210,13 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
@ -1247,19 +1254,19 @@ func TestCommandSide_RemoveOrgDomain(t *testing.T) {
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewOrgAddedEvent(context.Background(), org.NewOrgAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"name", "name",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainAddedEvent(context.Background(), org.NewDomainAddedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),
eventFromEventPusher( eventFromEventPusher(
org.NewDomainVerifiedEvent(context.Background(), org.NewDomainVerifiedEvent(context.Background(),
&user.NewAggregate("user1", "org1").Aggregate, &org.NewAggregate("org1", "org1").Aggregate,
"domain.ch", "domain.ch",
), ),
), ),

7
internal/command/setup_step21.go
View File

@ -43,14 +43,15 @@ func (c *Commands) SetupStep21(ctx context.Context, step *Step21) error {
type globalOrgMembersWriteModel struct { type globalOrgMembersWriteModel struct {
eventstore.WriteModel eventstore.WriteModel
orgID string
role string role string
members map[string][]string members map[string][]string
} }
func newGlobalOrgMemberWriteModel(orgID, role string) *globalOrgMembersWriteModel { func newGlobalOrgMemberWriteModel(orgID, role string) *globalOrgMembersWriteModel {
return &globalOrgMembersWriteModel{ return &globalOrgMembersWriteModel{
orgID: orgID, WriteModel: eventstore.WriteModel{
ResourceOwner: orgID,
},
role: role, role: role,
members: make(map[string][]string), members: make(map[string][]string),
} }
@ -89,7 +90,7 @@ func (wm *globalOrgMembersWriteModel) Query() *eventstore.SearchQueryBuilder {
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent). return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
AddQuery(). AddQuery().
AggregateTypes(org.AggregateType). AggregateTypes(org.AggregateType).
AggregateIDs(wm.orgID). AggregateIDs(wm.ResourceOwner).
EventTypes( EventTypes(
org.MemberAddedEventType, org.MemberAddedEventType,
org.MemberChangedEventType, org.MemberChangedEventType,

12
internal/eventstore/eventstore.go
View File

@ -64,6 +64,18 @@ func eventsToRepository(pushEvents []EventPusher) (events []*repository.Event, c
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }
if event.Aggregate().ID == "" {
return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Afdfe", "aggregate id must not be empty")
}
if event.Aggregate().Type == "" {
return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Dfg32", "aggregate type must not be empty")
}
if event.Type() == "" {
return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Drg34", "event type must not be empty")
}
if event.Aggregate().Version == "" {
return nil, nil, errors.ThrowInvalidArgument(nil, "V2-Dgfg4", "aggregate version must not be empty")
}
events[i] = &repository.Event{ events[i] = &repository.Event{
AggregateID: event.Aggregate().ID, AggregateID: event.Aggregate().ID,
AggregateType: repository.AggregateType(event.Aggregate().Type), AggregateType: repository.AggregateType(event.Aggregate().Type),