TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-13 16:07:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixup! fix(import/export): allow import of deleted resoruces

Browse Source
This commit is contained in:
Iraq Jaber
2025-06-25 12:59:28 +02:00
parent e953f48212
commit 7766d02899
5 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/repository/org/org.go
View File

@@ -5,6 +5,7 @@ import (
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/repository/member"
"github.com/zitadel/zitadel/internal/repository/project"
"github.com/zitadel/zitadel/internal/repository/user"
"github.com/zitadel/zitadel/internal/zerrors"
@@ -278,6 +279,7 @@ type OrgRemovedEvent struct {
eventstore.BaseEvent `json:"-"`
name string
usernames []string
members []string
loginMustBeDomain bool
domains []string
externalIDPs []*domain.UserIDPLink
@@ -295,6 +297,9 @@ func (e *OrgRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
for _, name := range e.usernames {
constraints = append(constraints, user.NewRemoveUsernameUniqueConstraint(name, e.Aggregate().ID, e.loginMustBeDomain))
}
for _, id := range e.members {
constraints = append(constraints, member.NewRemoveMemberUniqueConstraint(e.Aggregate().ID, id))
}
for _, domain := range e.domains {
constraints = append(constraints, NewRemoveOrgDomainUniqueConstraint(domain))
}
@@ -314,7 +319,7 @@ func (e *OrgRemovedEvent) Fields() []*eventstore.FieldOperation {
}
}
func NewOrgRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name string, usernames []string, loginMustBeDomain bool, domains []string, externalIDPs []*domain.UserIDPLink, samlEntityIDs []string) *OrgRemovedEvent {
func NewOrgRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, name string, usernames []string, members []string, loginMustBeDomain bool, domains []string, externalIDPs []*domain.UserIDPLink, samlEntityIDs []string) *OrgRemovedEvent {
return &OrgRemovedEvent{
BaseEvent: *eventstore.NewBaseEventForPush(
ctx,
@@ -323,6 +328,7 @@ func NewOrgRemovedEvent(ctx context.Context, aggregate *eventstore.Aggregate, na
),
name: name,
usernames: usernames,
members: members,
domains: domains,
externalIDPs: externalIDPs,
samlEntityIDs: samlEntityIDs,