mirror of
https://github.com/zitadel/zitadel.git
synced 2026-08-19 01:14:48 -05:00
Silvanandabhishek kumar gupta
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>
105 lines
2.8 KiB
Go
105 lines
2.8 KiB
Go
package command
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/project"
|
|
)
|
|
|
|
type ProjectGrantMemberWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
GrantID string
|
|
UserID string
|
|
Roles []string
|
|
|
|
State domain.MemberState
|
|
}
|
|
|
|
func NewProjectGrantMemberWriteModel(projectID, userID, grantID, resourceOwner string) *ProjectGrantMemberWriteModel {
|
|
return &ProjectGrantMemberWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: projectID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
UserID: userID,
|
|
GrantID: grantID,
|
|
}
|
|
}
|
|
|
|
func (wm *ProjectGrantMemberWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *project.GrantMemberAddedEvent:
|
|
if e.UserID != wm.UserID || e.GrantID != wm.GrantID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.GrantMemberChangedEvent:
|
|
if e.UserID != wm.UserID || e.GrantID != wm.GrantID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.GrantMemberRemovedEvent:
|
|
if e.UserID != wm.UserID || e.GrantID != wm.GrantID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.GrantMemberCascadeRemovedEvent:
|
|
if e.UserID != wm.UserID || e.GrantID != wm.GrantID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.GrantRemovedEvent:
|
|
if e.GrantID != wm.GrantID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *project.ProjectRemovedEvent:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *ProjectGrantMemberWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *project.GrantMemberAddedEvent:
|
|
wm.Roles = e.Roles
|
|
wm.State = domain.MemberStateActive
|
|
wm.ResourceOwner = e.Aggregate().ResourceOwner
|
|
case *project.GrantMemberChangedEvent:
|
|
wm.Roles = e.Roles
|
|
case *project.GrantMemberRemovedEvent:
|
|
wm.State = domain.MemberStateRemoved
|
|
case *project.GrantMemberCascadeRemovedEvent:
|
|
wm.State = domain.MemberStateRemoved
|
|
case *project.GrantRemovedEvent, *project.ProjectRemovedEvent:
|
|
wm.Roles = nil
|
|
wm.State = domain.MemberStateRemoved
|
|
case *project.ProjectAddedEvent:
|
|
wm.Roles = nil
|
|
wm.State = domain.MemberStateUnspecified
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *ProjectGrantMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(project.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
project.ProjectAddedType,
|
|
project.GrantMemberAddedType,
|
|
project.GrantMemberChangedType,
|
|
project.GrantMemberRemovedType,
|
|
project.GrantMemberCascadeRemovedType,
|
|
project.GrantRemovedType,
|
|
project.ProjectRemovedType).
|
|
Builder()
|
|
return query
|
|
}
|