TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle userID and context correctly (#5755)

Browse Source 
* fix: handle userID and context correctly

* fix linting
This commit is contained in:
Livio Spring 2023-04-26 16:19:32 +02:00 committed by GitHub
parent e4a4b7cfbe
commit 6774e7f444
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 95 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/api/grpc/user/v2/user.go
View File

@ -6,6 +6,7 @@ import (
"golang.org/x/text/language" "golang.org/x/text/language"
"github.com/zitadel/zitadel/internal/api/authz"
"github.com/zitadel/zitadel/internal/api/grpc/object/v2" "github.com/zitadel/zitadel/internal/api/grpc/object/v2"
"github.com/zitadel/zitadel/internal/command" "github.com/zitadel/zitadel/internal/command"
"github.com/zitadel/zitadel/internal/domain" "github.com/zitadel/zitadel/internal/domain"
@ -18,7 +19,11 @@ func (s *Server) AddHumanUser(ctx context.Context, req *user.AddHumanUserRequest
if err != nil { if err != nil {
return nil, err return nil, err
} }
err = s.command.AddHuman(ctx, req.GetOrganisation().GetOrgId(), human, false) orgID := req.GetOrganisation().GetOrgId()
if orgID == "" {
orgID = authz.GetCtxData(ctx).OrgID
}
err = s.command.AddHuman(ctx, orgID, human, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }

4
internal/command/instance.go
View File

@ -333,9 +333,9 @@ func (c *Commands) SetUpInstance(ctx context.Context, setup *InstanceSetup) (str
validations = append(validations, prepareAddUserMachineKey(machineKey, c.machineKeySize)) validations = append(validations, prepareAddUserMachineKey(machineKey, c.machineKeySize))
} }
} else if setup.Org.Human != nil { } else if setup.Org.Human != nil {
setup.Org.Human.ID = userAgg.ID setup.Org.Human.ID = userID
validations = append(validations, validations = append(validations,
c.AddHumanCommand(userAgg, setup.Org.Human, c.userPasswordAlg, c.userEncryption, true), c.AddHumanCommand(setup.Org.Human, orgID, c.userPasswordAlg, c.userEncryption, true),
) )
} }

67
internal/command/org.go
View File

@ -11,7 +11,7 @@ import (
"github.com/zitadel/zitadel/internal/eventstore" "github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/org" "github.com/zitadel/zitadel/internal/repository/org"
"github.com/zitadel/zitadel/internal/repository/project" "github.com/zitadel/zitadel/internal/repository/project"
user_repo "github.com/zitadel/zitadel/internal/repository/user" "github.com/zitadel/zitadel/internal/repository/user"
) )
type OrgSetup struct { type OrgSetup struct {
@ -22,22 +22,13 @@ type OrgSetup struct {
Roles []string Roles []string
} }
func (c *Commands) SetUpOrgWithIDs(ctx context.Context, o *OrgSetup, orgID, userID string, userIDs ...string) (string, *domain.ObjectDetails, error) { func (c *Commands) setUpOrgWithIDs(ctx context.Context, o *OrgSetup, orgID string, userIDs ...string) (userID string, token string, machineKey *MachineKey, details *domain.ObjectDetails, err error) {
existingOrg, err := c.getOrgWriteModelByID(ctx, orgID) userID, err = c.idGenerator.Next()
if err != nil { if err != nil {
return "", nil, err return "", "", nil, nil, err
} }
if existingOrg != nil {
return "", nil, errors.ThrowPreconditionFailed(nil, "COMMAND-poaj2", "Errors.Org.AlreadyExisting")
}
userID, _, _, details, err := c.setUpOrgWithIDs(ctx, o, orgID, userID, userIDs...)
return userID, details, err
}
func (c *Commands) setUpOrgWithIDs(ctx context.Context, o *OrgSetup, orgID, userID string, userIDs ...string) (string, string, *MachineKey, *domain.ObjectDetails, error) {
orgAgg := org.NewAggregate(orgID) orgAgg := org.NewAggregate(orgID)
userAgg := user_repo.NewAggregate(userID, orgID) userAgg := user.NewAggregate(userID, orgID)
roles := []string{domain.RoleOrgOwner} roles := []string{domain.RoleOrgOwner}
if len(o.Roles) > 0 { if len(o.Roles) > 0 {
@ -49,9 +40,9 @@ func (c *Commands) setUpOrgWithIDs(ctx context.Context, o *OrgSetup, orgID, user
} }
var pat *PersonalAccessToken var pat *PersonalAccessToken
var machineKey *MachineKey
if o.Human != nil { if o.Human != nil {
validations = append(validations, c.AddHumanCommand(userAgg, o.Human, c.userPasswordAlg, c.userEncryption, true)) o.Human.ID = userID
validations = append(validations, c.AddHumanCommand(o.Human, orgID, c.userPasswordAlg, c.userEncryption, true))
} else if o.Machine != nil { } else if o.Machine != nil {
validations = append(validations, AddMachineCommand(userAgg, o.Machine.Machine)) validations = append(validations, AddMachineCommand(userAgg, o.Machine.Machine))
if o.Machine.Pat != nil { if o.Machine.Pat != nil {
@ -89,7 +80,6 @@ func (c *Commands) setUpOrgWithIDs(ctx context.Context, o *OrgSetup, orgID, user
return "", "", nil, nil, err return "", "", nil, nil, err
} }
var token string
if pat != nil { if pat != nil {
token = pat.Token token = pat.Token
} }
@ -107,12 +97,7 @@ func (c *Commands) SetUpOrg(ctx context.Context, o *OrgSetup, userIDs ...string)
return "", nil, err return "", nil, err
} }
userID, err := c.idGenerator.Next() userID, _, _, details, err := c.setUpOrgWithIDs(ctx, o, orgID, userIDs...)
if err != nil {
return "", nil, err
}
userID, _, _, details, err := c.setUpOrgWithIDs(ctx, o, orgID, userID, userIDs...)
return userID, details, err return userID, details, err
} }
@ -365,9 +350,9 @@ func OrgUserIDPLinks(ctx context.Context, filter preparation.FilterToQueryReduce
ResourceOwner(orgID). ResourceOwner(orgID).
OrderAsc(). OrderAsc().
AddQuery(). AddQuery().
AggregateTypes(user_repo.AggregateType). AggregateTypes(user.AggregateType).
EventTypes( EventTypes(
user_repo.UserIDPLinkAddedType, user_repo.UserIDPLinkRemovedType, user_repo.UserIDPLinkCascadeRemovedType, user.UserIDPLinkAddedType, user.UserIDPLinkRemovedType, user.UserIDPLinkCascadeRemovedType,
).Builder()) ).Builder())
if err != nil { if err != nil {
return nil, err return nil, err
@ -375,13 +360,13 @@ func OrgUserIDPLinks(ctx context.Context, filter preparation.FilterToQueryReduce
links := make([]*domain.UserIDPLink, 0) links := make([]*domain.UserIDPLink, 0)
for _, event := range events { for _, event := range events {
switch eventTyped := event.(type) { switch eventTyped := event.(type) {
case *user_repo.UserIDPLinkAddedEvent: case *user.UserIDPLinkAddedEvent:
links = append(links, &domain.UserIDPLink{ links = append(links, &domain.UserIDPLink{
IDPConfigID: eventTyped.IDPConfigID, IDPConfigID: eventTyped.IDPConfigID,
ExternalUserID: eventTyped.ExternalUserID, ExternalUserID: eventTyped.ExternalUserID,
DisplayName: eventTyped.DisplayName, DisplayName: eventTyped.DisplayName,
}) })
case *user_repo.UserIDPLinkRemovedEvent: case *user.UserIDPLinkRemovedEvent:
for i := range links { for i := range links {
if links[i].ExternalUserID == eventTyped.ExternalUserID && if links[i].ExternalUserID == eventTyped.ExternalUserID &&
links[i].IDPConfigID == eventTyped.IDPConfigID { links[i].IDPConfigID == eventTyped.IDPConfigID {
@ -392,7 +377,7 @@ func OrgUserIDPLinks(ctx context.Context, filter preparation.FilterToQueryReduce
} }
} }
case *user_repo.UserIDPLinkCascadeRemovedEvent: case *user.UserIDPLinkCascadeRemovedEvent:
for i := range links { for i := range links {
if links[i].ExternalUserID == eventTyped.ExternalUserID && if links[i].ExternalUserID == eventTyped.ExternalUserID &&
links[i].IDPConfigID == eventTyped.IDPConfigID { links[i].IDPConfigID == eventTyped.IDPConfigID {
@ -495,14 +480,14 @@ func OrgUsers(ctx context.Context, filter preparation.FilterToQueryReducer, orgI
ResourceOwner(orgID). ResourceOwner(orgID).
OrderAsc(). OrderAsc().
AddQuery(). AddQuery().
AggregateTypes(user_repo.AggregateType). AggregateTypes(user.AggregateType).
EventTypes( EventTypes(
user_repo.HumanAddedType, user.HumanAddedType,
user_repo.MachineAddedEventType, user.MachineAddedEventType,
user_repo.HumanRegisteredType, user.HumanRegisteredType,
user_repo.UserDomainClaimedType, user.UserDomainClaimedType,
user_repo.UserUserNameChangedType, user.UserUserNameChangedType,
user_repo.UserRemovedType, user.UserRemovedType,
).Builder()) ).Builder())
if err != nil { if err != nil {
return nil, err return nil, err
@ -511,25 +496,25 @@ func OrgUsers(ctx context.Context, filter preparation.FilterToQueryReducer, orgI
users := make([]userIDName, 0) users := make([]userIDName, 0)
for _, event := range events { for _, event := range events {
switch eventTyped := event.(type) { switch eventTyped := event.(type) {
case *user_repo.HumanAddedEvent: case *user.HumanAddedEvent:
users = append(users, userIDName{eventTyped.UserName, eventTyped.Aggregate().ID}) users = append(users, userIDName{eventTyped.UserName, eventTyped.Aggregate().ID})
case *user_repo.MachineAddedEvent: case *user.MachineAddedEvent:
users = append(users, userIDName{eventTyped.UserName, eventTyped.Aggregate().ID}) users = append(users, userIDName{eventTyped.UserName, eventTyped.Aggregate().ID})
case *user_repo.HumanRegisteredEvent: case *user.HumanRegisteredEvent:
users = append(users, userIDName{eventTyped.UserName, eventTyped.Aggregate().ID}) users = append(users, userIDName{eventTyped.UserName, eventTyped.Aggregate().ID})
case *user_repo.DomainClaimedEvent: case *user.DomainClaimedEvent:
for i := range users { for i := range users {
if users[i].id == eventTyped.Aggregate().ID { if users[i].id == eventTyped.Aggregate().ID {
users[i].name = eventTyped.UserName users[i].name = eventTyped.UserName
} }
} }
case *user_repo.UsernameChangedEvent: case *user.UsernameChangedEvent:
for i := range users { for i := range users {
if users[i].id == eventTyped.Aggregate().ID { if users[i].id == eventTyped.Aggregate().ID {
users[i].name = eventTyped.UserName users[i].name = eventTyped.UserName
} }
} }
case *user_repo.UserRemovedEvent: case *user.UserRemovedEvent:
for i := range users { for i := range users {
if users[i].id == eventTyped.Aggregate().ID { if users[i].id == eventTyped.Aggregate().ID {
users[i] = users[len(users)-1] users[i] = users[len(users)-1]

26
internal/command/user_human.go
View File

@ -27,7 +27,7 @@ func (c *Commands) getHuman(ctx context.Context, userID, resourceowner string) (
} }
type AddHuman struct { type AddHuman struct {
// ID is optional // ID is optional, if empty it will be generated
ID string ID string
// Username is required // Username is required
Username string Username string
@ -114,11 +114,10 @@ func (c *Commands) AddHuman(ctx context.Context, resourceOwner string, human *Ad
if resourceOwner == "" { if resourceOwner == "" {
return errors.ThrowInvalidArgument(nil, "COMMA-5Ky74", "Errors.Internal") return errors.ThrowInvalidArgument(nil, "COMMA-5Ky74", "Errors.Internal")
} }
agg := user.NewAggregate(human.ID, resourceOwner)
cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter, cmds, err := preparation.PrepareCommands(ctx, c.eventstore.Filter,
c.AddHumanCommand( c.AddHumanCommand(
agg,
human, human,
resourceOwner,
c.userPasswordAlg, c.userPasswordAlg,
c.userEncryption, c.userEncryption,
allowInitMail, allowInitMail,
@ -146,16 +145,17 @@ type humanCreationCommand interface {
AddPasswordData(secret *crypto.CryptoValue, changeRequired bool) AddPasswordData(secret *crypto.CryptoValue, changeRequired bool)
} }
func (c *Commands) AddHumanCommand(a *user.Aggregate, human *AddHuman, passwordAlg crypto.HashAlgorithm, codeAlg crypto.EncryptionAlgorithm, allowInitMail bool) preparation.Validation { func (c *Commands) AddHumanCommand(human *AddHuman, orgID string, passwordAlg crypto.HashAlgorithm, codeAlg crypto.EncryptionAlgorithm, allowInitMail bool) preparation.Validation {
return func() (_ preparation.CreateCommands, err error) { return func() (_ preparation.CreateCommands, err error) {
if err := human.Validate(); err != nil { if err := human.Validate(); err != nil {
return nil, err return nil, err
} }
return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) { return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
if err := c.addHumanCommandCheckID(ctx, filter, a, human); err != nil { if err := c.addHumanCommandCheckID(ctx, filter, human, orgID); err != nil {
return nil, err return nil, err
} }
a := user.NewAggregate(human.ID, orgID)
domainPolicy, err := domainPolicyWriteModel(ctx, filter, a.ResourceOwner) domainPolicy, err := domainPolicyWriteModel(ctx, filter, a.ResourceOwner)
if err != nil { if err != nil {
@ -274,22 +274,20 @@ func (c *Commands) addHumanCommandPhone(ctx context.Context, filter preparation.
return append(cmds, user.NewHumanPhoneCodeAddedEvent(ctx, &a.Aggregate, phoneCode.Crypted, phoneCode.Expiry)), nil return append(cmds, user.NewHumanPhoneCodeAddedEvent(ctx, &a.Aggregate, phoneCode.Crypted, phoneCode.Expiry)), nil
} }
func (c *Commands) addHumanCommandCheckID(ctx context.Context, filter preparation.FilterToQueryReducer, a *user.Aggregate, human *AddHuman) (err error) { func (c *Commands) addHumanCommandCheckID(ctx context.Context, filter preparation.FilterToQueryReducer, human *AddHuman, orgID string) (err error) {
if human.ID != "" { if human.ID == "" {
existingHuman, err := humanWriteModelByID(ctx, filter, human.ID, a.ResourceOwner) human.ID, err = c.idGenerator.Next()
if err != nil { if err != nil {
return err return err
} }
if isUserStateExists(existingHuman.UserState) {
return errors.ThrowPreconditionFailed(nil, "COMMAND-k2unb", "Errors.User.AlreadyExisting")
}
return nil
} }
human.ID, err = c.idGenerator.Next() existingHuman, err := humanWriteModelByID(ctx, filter, human.ID, orgID)
if err != nil { if err != nil {
return err return err
} }
a.ID = human.ID if isUserStateExists(existingHuman.UserState) {
return errors.ThrowPreconditionFailed(nil, "COMMAND-k2unb", "Errors.User.AlreadyExisting")
}
return nil return nil
} }

76
internal/command/user_human_test.go
View File

@ -145,6 +145,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
t, t,
expectFilter(), expectFilter(),
expectFilter(), expectFilter(),
expectFilter(),
), ),
}, },
args: args{ args: args{
@ -173,6 +174,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "user1"), idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "user1"),
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -214,6 +216,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -303,6 +306,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -393,6 +397,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -472,6 +477,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -552,6 +558,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -621,6 +628,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -690,6 +698,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -759,6 +768,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -811,6 +821,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -909,6 +920,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -1007,6 +1019,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -1094,6 +1107,7 @@ func TestCommandSide_AddHuman(t *testing.T) {
fields: fields{ fields: fields{
eventstore: eventstoreExpect( eventstore: eventstoreExpect(
t, t,
expectFilter(),
expectFilter( expectFilter(
eventFromEventPusher( eventFromEventPusher(
org.NewDomainPolicyAddedEvent(context.Background(), org.NewDomainPolicyAddedEvent(context.Background(),
@ -3781,8 +3795,8 @@ func TestAddHumanCommand(t *testing.T) {
idGenerator id.Generator idGenerator id.Generator
} }
type args struct { type args struct {
a *user.Aggregate
human *AddHuman human *AddHuman
orgID string
passwordAlg crypto.HashAlgorithm passwordAlg crypto.HashAlgorithm
filter preparation.FilterToQueryReducer filter preparation.FilterToQueryReducer
codeAlg crypto.EncryptionAlgorithm codeAlg crypto.EncryptionAlgorithm
@ -3798,12 +3812,12 @@ func TestAddHumanCommand(t *testing.T) {
{ {
name: "invalid email", name: "invalid email",
args: args{ args: args{
a: agg,
human: &AddHuman{ human: &AddHuman{
Email: Email{ Email: Email{
Address: "invalid", Address: "invalid",
}, },
}, },
orgID: "ro",
}, },
want: Want{ want: Want{
ValidationErr: caos_errs.ThrowInvalidArgument(nil, "EMAIL-599BI", "Errors.User.Email.Invalid"), ValidationErr: caos_errs.ThrowInvalidArgument(nil, "EMAIL-599BI", "Errors.User.Email.Invalid"),
@ -3812,7 +3826,6 @@ func TestAddHumanCommand(t *testing.T) {
{ {
name: "invalid first name", name: "invalid first name",
args: args{ args: args{
a: agg,
human: &AddHuman{ human: &AddHuman{
Username: "username", Username: "username",
PreferredLanguage: language.English, PreferredLanguage: language.English,
@ -3820,6 +3833,7 @@ func TestAddHumanCommand(t *testing.T) {
Address: "support@zitadel.com", Address: "support@zitadel.com",
}, },
}, },
orgID: "ro",
}, },
want: Want{ want: Want{
ValidationErr: caos_errs.ThrowInvalidArgument(nil, "USER-UCej2", "Errors.User.Profile.FirstNameEmpty"), ValidationErr: caos_errs.ThrowInvalidArgument(nil, "USER-UCej2", "Errors.User.Profile.FirstNameEmpty"),
@ -3828,13 +3842,13 @@ func TestAddHumanCommand(t *testing.T) {
{ {
name: "invalid last name", name: "invalid last name",
args: args{ args: args{
a: agg,
human: &AddHuman{ human: &AddHuman{
Username: "username", Username: "username",
PreferredLanguage: language.English, PreferredLanguage: language.English,
FirstName: "hurst", FirstName: "hurst",
Email: Email{Address: "support@zitadel.com"}, Email: Email{Address: "support@zitadel.com"},
}, },
orgID: "ro",
}, },
want: Want{ want: Want{
ValidationErr: caos_errs.ThrowInvalidArgument(nil, "USER-4hB7d", "Errors.User.Profile.LastNameEmpty"), ValidationErr: caos_errs.ThrowInvalidArgument(nil, "USER-4hB7d", "Errors.User.Profile.LastNameEmpty"),
@ -3846,7 +3860,6 @@ func TestAddHumanCommand(t *testing.T) {
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "id"), idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "id"),
}, },
args: args{ args: args{
a: agg,
human: &AddHuman{ human: &AddHuman{
Email: Email{Address: "support@zitadel.com"}, Email: Email{Address: "support@zitadel.com"},
PreferredLanguage: language.English, PreferredLanguage: language.English,
@ -3855,23 +3868,28 @@ func TestAddHumanCommand(t *testing.T) {
Password: "short", Password: "short",
Username: "username", Username: "username",
}, },
orgID: "ro",
filter: NewMultiFilter().Append( filter: NewMultiFilter().Append(
func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
return []eventstore.Event{ return []eventstore.Event{}, nil
org.NewDomainPolicyAddedEvent(
context.Background(),
&org.NewAggregate("id").Aggregate,
true,
true,
true,
),
}, nil
}). }).
Append(
func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
return []eventstore.Event{
org.NewDomainPolicyAddedEvent(
ctx,
&org.NewAggregate("id").Aggregate,
true,
true,
true,
),
}, nil
}).
Append( Append(
func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
return []eventstore.Event{ return []eventstore.Event{
org.NewPasswordComplexityPolicyAddedEvent( org.NewPasswordComplexityPolicyAddedEvent(
context.Background(), ctx,
&org.NewAggregate("id").Aggregate, &org.NewAggregate("id").Aggregate,
8, 8,
true, true,
@ -3893,7 +3911,6 @@ func TestAddHumanCommand(t *testing.T) {
idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "id"), idGenerator: id_mock.NewIDGeneratorExpectIDs(t, "id"),
}, },
args: args{ args: args{
a: agg,
human: &AddHuman{ human: &AddHuman{
Email: Email{Address: "support@zitadel.com", Verified: true}, Email: Email{Address: "support@zitadel.com", Verified: true},
PreferredLanguage: language.English, PreferredLanguage: language.English,
@ -3902,25 +3919,30 @@ func TestAddHumanCommand(t *testing.T) {
Password: "password", Password: "password",
Username: "username", Username: "username",
}, },
orgID: "ro",
passwordAlg: crypto.CreateMockHashAlg(gomock.NewController(t)), passwordAlg: crypto.CreateMockHashAlg(gomock.NewController(t)),
codeAlg: crypto.CreateMockEncryptionAlg(gomock.NewController(t)), codeAlg: crypto.CreateMockEncryptionAlg(gomock.NewController(t)),
filter: NewMultiFilter().Append( filter: NewMultiFilter().Append(
func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
return []eventstore.Event{ return []eventstore.Event{}, nil
org.NewDomainPolicyAddedEvent(
context.Background(),
&org.NewAggregate("id").Aggregate,
true,
true,
true,
),
}, nil
}). }).
Append(
func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
return []eventstore.Event{
org.NewDomainPolicyAddedEvent(
ctx,
&org.NewAggregate("id").Aggregate,
true,
true,
true,
),
}, nil
}).
Append( Append(
func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) { func(ctx context.Context, queryFactory *eventstore.SearchQueryBuilder) ([]eventstore.Event, error) {
return []eventstore.Event{ return []eventstore.Event{
org.NewPasswordComplexityPolicyAddedEvent( org.NewPasswordComplexityPolicyAddedEvent(
context.Background(), ctx,
&org.NewAggregate("id").Aggregate, &org.NewAggregate("id").Aggregate,
2, 2,
false, false,
@ -3966,7 +3988,7 @@ func TestAddHumanCommand(t *testing.T) {
c := &Commands{ c := &Commands{
idGenerator: tt.fields.idGenerator, idGenerator: tt.fields.idGenerator,
} }
AssertValidation(t, context.Background(), c.AddHumanCommand(tt.args.a, tt.args.human, tt.args.passwordAlg, tt.args.codeAlg, tt.args.allowInitMail), tt.args.filter, tt.want) AssertValidation(t, context.Background(), c.AddHumanCommand(tt.args.human, tt.args.orgID, tt.args.passwordAlg, tt.args.codeAlg, tt.args.allowInitMail), tt.args.filter, tt.want)
}) })
} }
} }