mirror of
https://github.com/zitadel/zitadel.git
synced 2026-07-25 18:28:00 +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 <abhishek818t@gmail.com>
103 lines
2.7 KiB
Go
103 lines
2.7 KiB
Go
package command
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
)
|
|
|
|
type OrgMetadataWriteModel struct {
|
|
MetadataWriteModel
|
|
}
|
|
|
|
func NewOrgMetadataWriteModel(orgID, key string) *OrgMetadataWriteModel {
|
|
return &OrgMetadataWriteModel{
|
|
MetadataWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: orgID,
|
|
ResourceOwner: orgID,
|
|
},
|
|
Key: key,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *OrgMetadataWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *org.MetadataSetEvent:
|
|
wm.MetadataWriteModel.AppendEvents(&e.SetEvent)
|
|
case *org.MetadataRemovedEvent:
|
|
wm.MetadataWriteModel.AppendEvents(&e.RemovedEvent)
|
|
case *org.MetadataRemovedAllEvent:
|
|
wm.MetadataWriteModel.AppendEvents(&e.RemovedAllEvent)
|
|
default:
|
|
wm.MetadataWriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *OrgMetadataWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateIDs(wm.MetadataWriteModel.AggregateID).
|
|
AggregateTypes(org.AggregateType).
|
|
EventTypes(
|
|
org.OrgAddedEventType,
|
|
org.OrgRemovedEventType,
|
|
org.MetadataSetType,
|
|
org.MetadataRemovedType,
|
|
org.MetadataRemovedAllType).
|
|
Builder()
|
|
}
|
|
|
|
type OrgMetadataListWriteModel struct {
|
|
MetadataListWriteModel
|
|
}
|
|
|
|
func NewOrgMetadataListWriteModel(orgID string) *OrgMetadataListWriteModel {
|
|
return &OrgMetadataListWriteModel{
|
|
MetadataListWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: orgID,
|
|
ResourceOwner: orgID,
|
|
},
|
|
metadataList: make(map[string][]byte),
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *OrgMetadataListWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *org.MetadataSetEvent:
|
|
wm.MetadataListWriteModel.AppendEvents(&e.SetEvent)
|
|
case *org.MetadataRemovedEvent:
|
|
wm.MetadataListWriteModel.AppendEvents(&e.RemovedEvent)
|
|
case *org.MetadataRemovedAllEvent:
|
|
wm.MetadataListWriteModel.AppendEvents(&e.RemovedAllEvent)
|
|
default:
|
|
wm.MetadataListWriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *OrgMetadataListWriteModel) Reduce() error {
|
|
return wm.MetadataListWriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *OrgMetadataListWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateIDs(wm.MetadataListWriteModel.AggregateID).
|
|
AggregateTypes(org.AggregateType).
|
|
EventTypes(
|
|
org.OrgAddedEventType,
|
|
org.OrgRemovedEventType,
|
|
org.MetadataSetType,
|
|
org.MetadataRemovedType,
|
|
org.MetadataRemovedAllType).
|
|
Builder()
|
|
}
|