mirror of
https://github.com/zitadel/zitadel.git
synced 2026-07-25 18:28:00 +00:00
# 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>
114 lines
3.2 KiB
Go
114 lines
3.2 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/group"
|
|
)
|
|
|
|
// GroupWriteModel represents the write-model for a group.
|
|
type GroupWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
Name string
|
|
Description string
|
|
|
|
State domain.GroupState
|
|
|
|
UserIDs []string
|
|
existingUserIDs map[string]struct{}
|
|
}
|
|
|
|
// NewGroupWriteModel initializes a new instance of GroupWriteModel from the given Group.
|
|
func NewGroupWriteModel(groupID, orgID string, userIDs []string) *GroupWriteModel {
|
|
return &GroupWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: groupID,
|
|
ResourceOwner: orgID,
|
|
},
|
|
UserIDs: userIDs,
|
|
existingUserIDs: make(map[string]struct{}),
|
|
}
|
|
}
|
|
|
|
func (g *GroupWriteModel) GetWriteModel() *eventstore.WriteModel {
|
|
return &g.WriteModel
|
|
}
|
|
|
|
// Query constructs a search query for retrieving group-related events based on the GroupWriteModel attributes.
|
|
func (g *GroupWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
eventTypes := []eventstore.EventType{
|
|
group.GroupAddedEventType,
|
|
group.GroupChangedEventType,
|
|
group.GroupRemovedEventType,
|
|
}
|
|
if g.UserIDs != nil {
|
|
eventTypes = append(eventTypes, group.GroupUsersAddedEventType, group.GroupUsersRemovedEventType)
|
|
}
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(g.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(group.AggregateType).
|
|
AggregateIDs(g.AggregateID).
|
|
EventTypes(eventTypes...).Builder()
|
|
}
|
|
|
|
func (g *GroupWriteModel) Reduce() error {
|
|
for _, event := range g.Events {
|
|
switch e := event.(type) {
|
|
case *group.GroupAddedEvent:
|
|
g.AggregateID = e.Aggregate().ID
|
|
g.Name = e.Name
|
|
g.Description = e.Description
|
|
g.State = domain.GroupStateActive
|
|
case *group.GroupChangedEvent:
|
|
if e.Name != nil {
|
|
g.Name = *e.Name
|
|
}
|
|
if e.Description != nil {
|
|
g.Description = *e.Description
|
|
}
|
|
case *group.GroupRemovedEvent:
|
|
g.Name = ""
|
|
g.Description = ""
|
|
g.UserIDs = nil
|
|
g.existingUserIDs = make(map[string]struct{})
|
|
g.State = domain.GroupStateRemoved
|
|
case *group.GroupUsersAddedEvent:
|
|
for _, userID := range e.UserIDs {
|
|
g.existingUserIDs[userID] = struct{}{}
|
|
}
|
|
case *group.GroupUsersRemovedEvent:
|
|
for _, userID := range e.UserIDs {
|
|
delete(g.existingUserIDs, userID)
|
|
}
|
|
}
|
|
}
|
|
return g.WriteModel.Reduce()
|
|
}
|
|
|
|
func (g *GroupWriteModel) NewChangedEvent(ctx context.Context, agg *eventstore.Aggregate, name, description *string) *group.GroupChangedEvent {
|
|
changes := make([]group.GroupChanges, 0)
|
|
oldName := ""
|
|
|
|
if name != nil && g.Name != *name {
|
|
oldName = g.Name
|
|
changes = append(changes, group.ChangeName(name))
|
|
}
|
|
if description != nil && g.Description != *description {
|
|
changes = append(changes, group.ChangeDescription(description))
|
|
}
|
|
if len(changes) == 0 {
|
|
return nil
|
|
}
|
|
|
|
return group.NewGroupChangedEvent(ctx, agg, oldName, changes)
|
|
}
|
|
|
|
// GroupAggregateFromWriteModel maps a WriteModel to a group-specific Aggregate using its type and version.
|
|
func GroupAggregateFromWriteModel(ctx context.Context, wm *eventstore.WriteModel) *eventstore.Aggregate {
|
|
return eventstore.AggregateFromWriteModelCtx(ctx, wm, group.AggregateType, group.AggregateVersion)
|
|
}
|