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>
140 lines
4.3 KiB
Go
140 lines
4.3 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"slices"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/project"
|
|
)
|
|
|
|
type ProjectWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
Name string
|
|
ProjectRoleAssertion bool
|
|
ProjectRoleCheck bool
|
|
HasProjectCheck bool
|
|
PrivateLabelingSetting domain.PrivateLabelingSetting
|
|
State domain.ProjectState
|
|
}
|
|
|
|
func NewProjectWriteModel(projectID string, resourceOwner string) *ProjectWriteModel {
|
|
return &ProjectWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: projectID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *ProjectWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *project.ProjectAddedEvent:
|
|
wm.Name = e.Name
|
|
wm.ProjectRoleAssertion = e.ProjectRoleAssertion
|
|
wm.ProjectRoleCheck = e.ProjectRoleCheck
|
|
wm.HasProjectCheck = e.HasProjectCheck
|
|
wm.PrivateLabelingSetting = e.PrivateLabelingSetting
|
|
wm.State = domain.ProjectStateActive
|
|
case *project.ProjectChangeEvent:
|
|
if e.Name != nil {
|
|
wm.Name = *e.Name
|
|
}
|
|
if e.ProjectRoleAssertion != nil {
|
|
wm.ProjectRoleAssertion = *e.ProjectRoleAssertion
|
|
}
|
|
if e.ProjectRoleCheck != nil {
|
|
wm.ProjectRoleCheck = *e.ProjectRoleCheck
|
|
}
|
|
if e.HasProjectCheck != nil {
|
|
wm.HasProjectCheck = *e.HasProjectCheck
|
|
}
|
|
if e.PrivateLabelingSetting != nil {
|
|
wm.PrivateLabelingSetting = *e.PrivateLabelingSetting
|
|
}
|
|
case *project.ProjectDeactivatedEvent:
|
|
if wm.State == domain.ProjectStateRemoved {
|
|
continue
|
|
}
|
|
wm.State = domain.ProjectStateInactive
|
|
case *project.ProjectReactivatedEvent:
|
|
if wm.State == domain.ProjectStateRemoved {
|
|
continue
|
|
}
|
|
wm.State = domain.ProjectStateActive
|
|
case *project.ProjectRemovedEvent:
|
|
wm.Name = ""
|
|
wm.ProjectRoleAssertion = false
|
|
wm.ProjectRoleCheck = false
|
|
wm.HasProjectCheck = false
|
|
wm.PrivateLabelingSetting = domain.PrivateLabelingSettingUnspecified
|
|
wm.State = domain.ProjectStateRemoved
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *ProjectWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(project.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(project.ProjectAddedType,
|
|
project.ProjectChangedType,
|
|
project.ProjectDeactivatedType,
|
|
project.ProjectReactivatedType,
|
|
project.ProjectRemovedType).
|
|
Builder()
|
|
}
|
|
|
|
func (wm *ProjectWriteModel) NewChangedEvent(
|
|
ctx context.Context,
|
|
aggregate *eventstore.Aggregate,
|
|
name *string,
|
|
projectRoleAssertion,
|
|
projectRoleCheck,
|
|
hasProjectCheck *bool,
|
|
privateLabelingSetting *domain.PrivateLabelingSetting,
|
|
) *project.ProjectChangeEvent {
|
|
changes := make([]project.ProjectChanges, 0)
|
|
|
|
oldName := ""
|
|
if name != nil && wm.Name != *name {
|
|
oldName = wm.Name
|
|
changes = append(changes, project.ChangeName(*name))
|
|
}
|
|
if projectRoleAssertion != nil && wm.ProjectRoleAssertion != *projectRoleAssertion {
|
|
changes = append(changes, project.ChangeProjectRoleAssertion(*projectRoleAssertion))
|
|
}
|
|
if projectRoleCheck != nil && wm.ProjectRoleCheck != *projectRoleCheck {
|
|
changes = append(changes, project.ChangeProjectRoleCheck(*projectRoleCheck))
|
|
}
|
|
if hasProjectCheck != nil && wm.HasProjectCheck != *hasProjectCheck {
|
|
changes = append(changes, project.ChangeHasProjectCheck(*hasProjectCheck))
|
|
}
|
|
if privateLabelingSetting != nil && wm.PrivateLabelingSetting != *privateLabelingSetting {
|
|
changes = append(changes, project.ChangePrivateLabelingSetting(*privateLabelingSetting))
|
|
}
|
|
if len(changes) == 0 {
|
|
return nil
|
|
}
|
|
return project.NewProjectChangeEvent(ctx, aggregate, oldName, changes)
|
|
}
|
|
|
|
func isProjectStateExists(state domain.ProjectState) bool {
|
|
return !slices.Contains([]domain.ProjectState{domain.ProjectStateRemoved, domain.ProjectStateUnspecified}, state)
|
|
}
|
|
|
|
// Deprecated: use ProjectAggregateFromWriteModelWithCTX
|
|
func ProjectAggregateFromWriteModel(wm *eventstore.WriteModel) *eventstore.Aggregate {
|
|
return eventstore.AggregateFromWriteModel(wm, project.AggregateType, project.AggregateVersion)
|
|
}
|
|
|
|
func ProjectAggregateFromWriteModelWithCTX(ctx context.Context, wm *eventstore.WriteModel) *eventstore.Aggregate {
|
|
return project.AggregateFromWriteModel(ctx, wm)
|
|
}
|