mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 13:52:51 +00:00
6082e59d47
# Which Problems Are Solved - The eventstore did not support intentionally overwriting the resource owner when creating events for aggregates that may be reused across owners. - Resource owner handling was implicit and could not be controlled per command/event type. - We needed a safe way to distinguish between: - keeping the existing aggregate owner, and - explicitly setting a new owner for specific create-like events. # How the Problems Are Solved - Introduced a new eventstore command type with an explicit enforce_owner flag. - Updated eventstore.commands_to_events and eventstore.push so owner assignment is now explicit: - if enforce_owner is true, the command owner is written - if enforce_owner is false, the existing aggregate owner is retained when present - Added EnforceResourceOwnerCommand and wiring so command types can opt in to enforced owner behavior. - Wired the new behavior through the v3 eventstore push path, including compatibility fallback for older command type mapping. - Added migration/setup changes to register and use the new command type and SQL functions. - Added and updated tests for owner overwrite and aggregate ID reuse scenarios. # Additional Changes - Added small migration/setup robustness improvements related to eventstore setup ordering and helper reuse. - Added focused test coverage for enforced owner behavior and sequencing. - Events that currently allow owner changes (implement EnforceResourceOwner) are: - AddedEvent (action) - GroupAddedEvent - StartedEvent (idp intent) - ProjectAddedEvent - HumanAddedEvent - HumanRegisteredEvent - MachineAddedEvent - CreatedEvent (schema user) # Additional Context - Follow-up for eventstore owner-handling correctness in create flows and aggregate ID reuse cases. - No additional issue link was attached for this change. --------- Co-authored-by: abhishek kumar gupta <[email protected]>
101 lines
2.9 KiB
Go
101 lines
2.9 KiB
Go
package command
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
)
|
|
|
|
type UserIDPLinkWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
IDPConfigID string
|
|
ExternalUserID string
|
|
DisplayName string
|
|
|
|
State domain.UserIDPLinkState
|
|
}
|
|
|
|
func NewUserIDPLinkWriteModel(userID, idpConfigID, externalUserID, resourceOwner string) *UserIDPLinkWriteModel {
|
|
return &UserIDPLinkWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: userID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
IDPConfigID: idpConfigID,
|
|
ExternalUserID: externalUserID,
|
|
}
|
|
}
|
|
|
|
func (wm *UserIDPLinkWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *user.UserIDPLinkAddedEvent:
|
|
if e.IDPConfigID != wm.IDPConfigID || e.ExternalUserID != wm.ExternalUserID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.UserIDPExternalIDMigratedEvent:
|
|
if e.IDPConfigID != wm.IDPConfigID || e.PreviousID != wm.ExternalUserID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.UserIDPLinkRemovedEvent:
|
|
if e.IDPConfigID != wm.IDPConfigID || e.ExternalUserID != wm.ExternalUserID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.UserIDPLinkCascadeRemovedEvent:
|
|
if e.IDPConfigID != wm.IDPConfigID || e.ExternalUserID != wm.ExternalUserID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
default:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *UserIDPLinkWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *user.UserIDPLinkAddedEvent:
|
|
wm.IDPConfigID = e.IDPConfigID
|
|
wm.DisplayName = e.DisplayName
|
|
wm.ExternalUserID = e.ExternalUserID
|
|
wm.State = domain.UserIDPLinkStateActive
|
|
case *user.UserIDPExternalIDMigratedEvent:
|
|
wm.ExternalUserID = e.NewID
|
|
case *user.UserIDPLinkRemovedEvent:
|
|
wm.State = domain.UserIDPLinkStateRemoved
|
|
case *user.UserIDPLinkCascadeRemovedEvent:
|
|
wm.State = domain.UserIDPLinkStateRemoved
|
|
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
|
wm.DisplayName = ""
|
|
wm.State = domain.UserIDPLinkStateUnspecified
|
|
case *user.UserRemovedEvent:
|
|
wm.DisplayName = ""
|
|
wm.State = domain.UserIDPLinkStateRemoved
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *UserIDPLinkWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(user.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
user.HumanAddedType,
|
|
user.HumanRegisteredType,
|
|
user.MachineAddedEventType,
|
|
user.UserIDPLinkAddedType,
|
|
user.UserIDPExternalIDMigratedType,
|
|
user.UserIDPLinkRemovedType,
|
|
user.UserIDPLinkCascadeRemovedType,
|
|
user.UserRemovedType).
|
|
Builder()
|
|
}
|