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>
131 lines
3.2 KiB
Go
131 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/project"
|
|
)
|
|
|
|
type ProjectRoleWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
Key string
|
|
DisplayName string
|
|
Group string
|
|
State domain.ProjectRoleState
|
|
}
|
|
|
|
func (wm *ProjectRoleWriteModel) GetWriteModel() *eventstore.WriteModel {
|
|
return &wm.WriteModel
|
|
}
|
|
|
|
func NewProjectRoleWriteModelWithKey(key, projectID, resourceOwner string) *ProjectRoleWriteModel {
|
|
return &ProjectRoleWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: projectID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
Key: key,
|
|
}
|
|
}
|
|
|
|
func NewProjectRoleWriteModel(projectID, resourceOwner string) *ProjectRoleWriteModel {
|
|
return &ProjectRoleWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: projectID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *ProjectRoleWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *project.RoleAddedEvent:
|
|
if e.Key == wm.Key {
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
case *project.RoleChangedEvent:
|
|
if e.Key == wm.Key {
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
case *project.RoleRemovedEvent:
|
|
if e.Key == wm.Key {
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
default:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *ProjectRoleWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *project.RoleAddedEvent:
|
|
wm.Key = e.Key
|
|
wm.DisplayName = e.DisplayName
|
|
wm.Group = e.Group
|
|
wm.State = domain.ProjectRoleStateActive
|
|
case *project.RoleChangedEvent:
|
|
wm.Key = e.Key
|
|
if e.DisplayName != nil {
|
|
wm.DisplayName = *e.DisplayName
|
|
}
|
|
if e.Group != nil {
|
|
wm.Group = *e.Group
|
|
}
|
|
case *project.RoleRemovedEvent:
|
|
wm.State = domain.ProjectRoleStateRemoved
|
|
case *project.ProjectAddedEvent:
|
|
wm.State = domain.ProjectRoleStateUnspecified
|
|
case *project.ProjectRemovedEvent:
|
|
wm.State = domain.ProjectRoleStateRemoved
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *ProjectRoleWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(project.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
project.ProjectAddedType,
|
|
project.RoleAddedType,
|
|
project.RoleChangedType,
|
|
project.RoleRemovedType,
|
|
project.ProjectRemovedType).
|
|
Builder()
|
|
}
|
|
|
|
func (wm *ProjectRoleWriteModel) NewProjectRoleChangedEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
key,
|
|
displayName,
|
|
group string,
|
|
) (*project.RoleChangedEvent, bool, error) {
|
|
changes := make([]project.RoleChanges, 0)
|
|
var err error
|
|
|
|
if wm.DisplayName != displayName {
|
|
changes = append(changes, project.ChangeDisplayName(displayName))
|
|
}
|
|
if wm.Group != group {
|
|
changes = append(changes, project.ChangeGroup(group))
|
|
}
|
|
if len(changes) == 0 {
|
|
return nil, false, nil
|
|
}
|
|
changeEvent, err := project.NewRoleChangedEvent(ctx, aggregate, key, changes)
|
|
if err != nil {
|
|
return nil, false, err
|
|
}
|
|
return changeEvent, true, nil
|
|
}
|