mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 04:57:33 +00:00
feat: new es testing2 (#1428)
* fix: org tests * fix: org tests * fix: user grant test * fix: user grant test * fix: project and project role test * fix: project grant test * fix: project grant test * fix: project member, grant member, app changed tests * fix: application tests * fix: application tests * fix: add oidc app test * fix: add oidc app test * fix: add api keys test * fix: iam policies * fix: iam and org member tests * fix: idp config tests * fix: iam tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: user tests * fix: org domain test * fix: org tests * fix: org tests * fix: implement org idps * fix: pr requests * fix: email tests * fix: fix idp check * fix: fix user profile
This commit is contained in:
@@ -23,7 +23,6 @@ func NewIdentityProviderAddedEvent(
|
||||
ctx context.Context,
|
||||
aggregate *eventstore.Aggregate,
|
||||
idpConfigID string,
|
||||
idpProviderType domain.IdentityProviderType,
|
||||
) *IdentityProviderAddedEvent {
|
||||
|
||||
return &IdentityProviderAddedEvent{
|
||||
@@ -33,7 +32,7 @@ func NewIdentityProviderAddedEvent(
|
||||
aggregate,
|
||||
LoginPolicyIDPProviderAddedEventType),
|
||||
idpConfigID,
|
||||
idpProviderType),
|
||||
domain.IdentityProviderTypeSystem),
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -247,14 +247,15 @@ func (e *DomainRemovedEvent) UniqueConstraints() []*eventstore.EventUniqueConstr
|
||||
return []*eventstore.EventUniqueConstraint{NewRemoveOrgDomainUniqueConstraint(e.Domain)}
|
||||
}
|
||||
|
||||
func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string) *DomainRemovedEvent {
|
||||
func NewDomainRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, domain string, verified bool) *DomainRemovedEvent {
|
||||
return &DomainRemovedEvent{
|
||||
BaseEvent: *eventstore.NewBaseEventForPush(
|
||||
ctx,
|
||||
aggregate,
|
||||
OrgDomainRemovedEventType,
|
||||
),
|
||||
Domain: domain,
|
||||
Domain: domain,
|
||||
isVerified: verified,
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -32,14 +32,57 @@ func (e *HumanAddressChangedEvent) UniqueConstraints() []*eventstore.EventUnique
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewHumanAddressChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanAddressChangedEvent {
|
||||
return &HumanAddressChangedEvent{
|
||||
func NewAddressChangedEvent(
|
||||
ctx context.Context,
|
||||
aggregate *eventstore.Aggregate,
|
||||
changes []AddressChanges,
|
||||
) (*HumanAddressChangedEvent, error) {
|
||||
if len(changes) == 0 {
|
||||
return nil, errors.ThrowPreconditionFailed(nil, "USER-3n8fs", "Errors.NoChangesFound")
|
||||
}
|
||||
changeEvent := &HumanAddressChangedEvent{
|
||||
BaseEvent: *eventstore.NewBaseEventForPush(
|
||||
ctx,
|
||||
aggregate,
|
||||
HumanAddressChangedType,
|
||||
),
|
||||
}
|
||||
for _, change := range changes {
|
||||
change(changeEvent)
|
||||
}
|
||||
return changeEvent, nil
|
||||
}
|
||||
|
||||
type AddressChanges func(event *HumanAddressChangedEvent)
|
||||
|
||||
func ChangeCountry(country string) func(event *HumanAddressChangedEvent) {
|
||||
return func(e *HumanAddressChangedEvent) {
|
||||
e.Country = &country
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeLocality(locality string) func(event *HumanAddressChangedEvent) {
|
||||
return func(e *HumanAddressChangedEvent) {
|
||||
e.Locality = &locality
|
||||
}
|
||||
}
|
||||
|
||||
func ChangePostalCode(code string) func(event *HumanAddressChangedEvent) {
|
||||
return func(e *HumanAddressChangedEvent) {
|
||||
e.PostalCode = &code
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeRegion(region string) func(event *HumanAddressChangedEvent) {
|
||||
return func(e *HumanAddressChangedEvent) {
|
||||
e.Region = ®ion
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeStreetAddress(street string) func(event *HumanAddressChangedEvent) {
|
||||
return func(e *HumanAddressChangedEvent) {
|
||||
e.StreetAddress = &street
|
||||
}
|
||||
}
|
||||
|
||||
func HumanAddressChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) {
|
||||
|
@@ -34,13 +34,14 @@ func (e *HumanEmailChangedEvent) UniqueConstraints() []*eventstore.EventUniqueCo
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewHumanEmailChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanEmailChangedEvent {
|
||||
func NewHumanEmailChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate, emailAddress string) *HumanEmailChangedEvent {
|
||||
return &HumanEmailChangedEvent{
|
||||
BaseEvent: *eventstore.NewBaseEventForPush(
|
||||
ctx,
|
||||
aggregate,
|
||||
HumanEmailChangedType,
|
||||
),
|
||||
EmailAddress: emailAddress,
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -35,13 +35,14 @@ func (e *HumanPhoneChangedEvent) UniqueConstraints() []*eventstore.EventUniqueCo
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewHumanPhoneChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanPhoneChangedEvent {
|
||||
func NewHumanPhoneChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate, phone string) *HumanPhoneChangedEvent {
|
||||
return &HumanPhoneChangedEvent{
|
||||
BaseEvent: *eventstore.NewBaseEventForPush(
|
||||
ctx,
|
||||
aggregate,
|
||||
HumanPhoneChangedType,
|
||||
),
|
||||
PhoneNumber: phone,
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -35,14 +35,63 @@ func (e *HumanProfileChangedEvent) UniqueConstraints() []*eventstore.EventUnique
|
||||
return nil
|
||||
}
|
||||
|
||||
func NewHumanProfileChangedEvent(ctx context.Context, aggregate *eventstore.Aggregate) *HumanProfileChangedEvent {
|
||||
return &HumanProfileChangedEvent{
|
||||
func NewHumanProfileChangedEvent(
|
||||
ctx context.Context,
|
||||
aggregate *eventstore.Aggregate,
|
||||
changes []ProfileChanges,
|
||||
) (*HumanProfileChangedEvent, error) {
|
||||
if len(changes) == 0 {
|
||||
return nil, errors.ThrowPreconditionFailed(nil, "USER-33n8F", "Errors.NoChangesFound")
|
||||
}
|
||||
changeEvent := &HumanProfileChangedEvent{
|
||||
BaseEvent: *eventstore.NewBaseEventForPush(
|
||||
ctx,
|
||||
aggregate,
|
||||
HumanProfileChangedType,
|
||||
),
|
||||
}
|
||||
for _, change := range changes {
|
||||
change(changeEvent)
|
||||
}
|
||||
return changeEvent, nil
|
||||
}
|
||||
|
||||
type ProfileChanges func(event *HumanProfileChangedEvent)
|
||||
|
||||
func ChangeFirstName(firstName string) func(event *HumanProfileChangedEvent) {
|
||||
return func(e *HumanProfileChangedEvent) {
|
||||
e.FirstName = firstName
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeLastName(lastName string) func(event *HumanProfileChangedEvent) {
|
||||
return func(e *HumanProfileChangedEvent) {
|
||||
e.LastName = lastName
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeNickName(nickName string) func(event *HumanProfileChangedEvent) {
|
||||
return func(e *HumanProfileChangedEvent) {
|
||||
e.NickName = &nickName
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeDisplayName(displayName string) func(event *HumanProfileChangedEvent) {
|
||||
return func(e *HumanProfileChangedEvent) {
|
||||
e.DisplayName = &displayName
|
||||
}
|
||||
}
|
||||
|
||||
func ChangePreferredLanguage(language language.Tag) func(event *HumanProfileChangedEvent) {
|
||||
return func(e *HumanProfileChangedEvent) {
|
||||
e.PreferredLanguage = &language
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeGender(gender domain.Gender) func(event *HumanProfileChangedEvent) {
|
||||
return func(e *HumanProfileChangedEvent) {
|
||||
e.Gender = &gender
|
||||
}
|
||||
}
|
||||
|
||||
func HumanProfileChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) {
|
||||
|
@@ -19,7 +19,7 @@ type MachineAddedEvent struct {
|
||||
eventstore.BaseEvent `json:"-"`
|
||||
|
||||
UserName string `json:"userName"`
|
||||
UserLoginMustBeDomain bool
|
||||
userLoginMustBeDomain bool `json:"-"`
|
||||
|
||||
Name string `json:"name,omitempty"`
|
||||
Description string `json:"description,omitempty"`
|
||||
@@ -30,7 +30,7 @@ func (e *MachineAddedEvent) Data() interface{} {
|
||||
}
|
||||
|
||||
func (e *MachineAddedEvent) UniqueConstraints() []*eventstore.EventUniqueConstraint {
|
||||
return []*eventstore.EventUniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.UserLoginMustBeDomain)}
|
||||
return []*eventstore.EventUniqueConstraint{NewAddUsernameUniqueConstraint(e.UserName, e.Aggregate().ResourceOwner, e.userLoginMustBeDomain)}
|
||||
}
|
||||
|
||||
func NewMachineAddedEvent(
|
||||
@@ -50,7 +50,7 @@ func NewMachineAddedEvent(
|
||||
UserName: userName,
|
||||
Name: name,
|
||||
Description: description,
|
||||
UserLoginMustBeDomain: userLoginMustBeDomain,
|
||||
userLoginMustBeDomain: userLoginMustBeDomain,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,14 +86,36 @@ func (e *MachineChangedEvent) UniqueConstraints() []*eventstore.EventUniqueConst
|
||||
func NewMachineChangedEvent(
|
||||
ctx context.Context,
|
||||
aggregate *eventstore.Aggregate,
|
||||
) *MachineChangedEvent {
|
||||
return &MachineChangedEvent{
|
||||
changes []MachineChanges,
|
||||
) (*MachineChangedEvent, error) {
|
||||
if len(changes) == 0 {
|
||||
return nil, errors.ThrowPreconditionFailed(nil, "USER-3M9fs", "Errors.NoChangesFound")
|
||||
}
|
||||
changeEvent := &MachineChangedEvent{
|
||||
BaseEvent: *eventstore.NewBaseEventForPush(
|
||||
ctx,
|
||||
aggregate,
|
||||
MachineChangedEventType,
|
||||
),
|
||||
}
|
||||
for _, change := range changes {
|
||||
change(changeEvent)
|
||||
}
|
||||
return changeEvent, nil
|
||||
}
|
||||
|
||||
type MachineChanges func(event *MachineChangedEvent)
|
||||
|
||||
func ChangeName(name string) func(event *MachineChangedEvent) {
|
||||
return func(e *MachineChangedEvent) {
|
||||
e.Name = &name
|
||||
}
|
||||
}
|
||||
|
||||
func ChangeDescription(description string) func(event *MachineChangedEvent) {
|
||||
return func(e *MachineChangedEvent) {
|
||||
e.Description = &description
|
||||
}
|
||||
}
|
||||
|
||||
func MachineChangedEventMapper(event *repository.Event) (eventstore.EventReader, error) {
|
||||
|
Reference in New Issue
Block a user