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>
278 lines
7.1 KiB
Go
278 lines
7.1 KiB
Go
package command
|
|
|
|
import (
|
|
"golang.org/x/text/language"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
)
|
|
|
|
type HumanWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
UserName string
|
|
|
|
FirstName string
|
|
LastName string
|
|
NickName string
|
|
DisplayName string
|
|
PreferredLanguage language.Tag
|
|
Gender domain.Gender
|
|
Avatar string
|
|
|
|
Email domain.EmailAddress
|
|
IsEmailVerified bool
|
|
|
|
Phone domain.PhoneNumber
|
|
IsPhoneVerified bool
|
|
|
|
Country string
|
|
Locality string
|
|
PostalCode string
|
|
Region string
|
|
StreetAddress string
|
|
|
|
UserState domain.UserState
|
|
}
|
|
|
|
func NewHumanWriteModel(userID, resourceOwner string) *HumanWriteModel {
|
|
return &HumanWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: userID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
}
|
|
}
|
|
|
|
func (wm *HumanWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *user.HumanAddedEvent:
|
|
wm.reduceHumanAddedEvent(e)
|
|
case *user.HumanRegisteredEvent:
|
|
wm.reduceHumanRegisteredEvent(e)
|
|
case *user.HumanInitialCodeAddedEvent:
|
|
wm.UserState = domain.UserStateInitial
|
|
case *user.HumanInitializedCheckSucceededEvent:
|
|
wm.UserState = domain.UserStateActive
|
|
case *user.UsernameChangedEvent:
|
|
wm.UserName = e.UserName
|
|
case *user.HumanProfileChangedEvent:
|
|
wm.reduceHumanProfileChangedEvent(e)
|
|
case *user.HumanEmailChangedEvent:
|
|
wm.reduceHumanEmailChangedEvent(e)
|
|
case *user.HumanEmailVerifiedEvent:
|
|
wm.reduceHumanEmailVerifiedEvent()
|
|
case *user.HumanPhoneChangedEvent:
|
|
wm.reduceHumanPhoneChangedEvent(e)
|
|
case *user.HumanPhoneVerifiedEvent:
|
|
wm.reduceHumanPhoneVerifiedEvent()
|
|
case *user.HumanPhoneRemovedEvent:
|
|
wm.reduceHumanPhoneRemovedEvent()
|
|
case *user.HumanAvatarAddedEvent:
|
|
wm.Avatar = e.StoreKey
|
|
case *user.HumanAvatarRemovedEvent:
|
|
wm.Avatar = ""
|
|
case *user.UserLockedEvent:
|
|
if wm.UserState != domain.UserStateDeleted {
|
|
wm.UserState = domain.UserStateLocked
|
|
}
|
|
case *user.UserUnlockedEvent:
|
|
if wm.UserState != domain.UserStateDeleted {
|
|
wm.UserState = domain.UserStateActive
|
|
}
|
|
case *user.UserDeactivatedEvent:
|
|
if wm.UserState != domain.UserStateDeleted {
|
|
wm.UserState = domain.UserStateInactive
|
|
}
|
|
case *user.UserReactivatedEvent:
|
|
if wm.UserState != domain.UserStateDeleted {
|
|
wm.UserState = domain.UserStateActive
|
|
}
|
|
case *user.UserRemovedEvent:
|
|
wm.UserName = ""
|
|
wm.FirstName = ""
|
|
wm.LastName = ""
|
|
wm.NickName = ""
|
|
wm.DisplayName = ""
|
|
wm.PreferredLanguage = language.Und
|
|
wm.Gender = domain.GenderUnspecified
|
|
wm.Avatar = ""
|
|
wm.Email = ""
|
|
wm.IsEmailVerified = false
|
|
wm.Phone = ""
|
|
wm.IsPhoneVerified = false
|
|
wm.Country = ""
|
|
wm.Locality = ""
|
|
wm.PostalCode = ""
|
|
wm.Region = ""
|
|
wm.StreetAddress = ""
|
|
wm.UserState = domain.UserStateDeleted
|
|
case *user.MachineAddedEvent:
|
|
wm.UserName = ""
|
|
wm.FirstName = ""
|
|
wm.LastName = ""
|
|
wm.NickName = ""
|
|
wm.DisplayName = ""
|
|
wm.PreferredLanguage = language.Und
|
|
wm.Gender = domain.GenderUnspecified
|
|
wm.Avatar = ""
|
|
wm.Email = ""
|
|
wm.IsEmailVerified = false
|
|
wm.Phone = ""
|
|
wm.IsPhoneVerified = false
|
|
wm.Country = ""
|
|
wm.Locality = ""
|
|
wm.PostalCode = ""
|
|
wm.Region = ""
|
|
wm.StreetAddress = ""
|
|
wm.UserState = domain.UserStateUnspecified
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *HumanWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
ResourceOwner(wm.ResourceOwner).
|
|
AddQuery().
|
|
AggregateTypes(user.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
user.HumanAddedType,
|
|
user.HumanRegisteredType,
|
|
user.MachineAddedEventType,
|
|
user.HumanInitialCodeAddedType,
|
|
user.HumanInitializedCheckSucceededType,
|
|
user.UserUserNameChangedType,
|
|
user.HumanProfileChangedType,
|
|
user.HumanEmailChangedType,
|
|
user.HumanEmailVerifiedType,
|
|
user.HumanPhoneChangedType,
|
|
user.HumanPhoneVerifiedType,
|
|
user.HumanPhoneRemovedType,
|
|
user.HumanAvatarAddedType,
|
|
user.HumanAvatarRemovedType,
|
|
user.UserLockedType,
|
|
user.UserUnlockedType,
|
|
user.UserDeactivatedType,
|
|
user.UserReactivatedType,
|
|
user.UserRemovedType,
|
|
user.UserV1AddedType,
|
|
user.UserV1RegisteredType,
|
|
user.UserV1InitialCodeAddedType,
|
|
user.UserV1InitializedCheckSucceededType,
|
|
user.UserV1ProfileChangedType,
|
|
user.UserV1EmailChangedType,
|
|
user.UserV1EmailVerifiedType,
|
|
user.UserV1PhoneChangedType,
|
|
user.UserV1PhoneVerifiedType,
|
|
user.UserV1PhoneRemovedType).
|
|
Builder()
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanAddedEvent(e *user.HumanAddedEvent) {
|
|
wm.UserName = e.UserName
|
|
wm.FirstName = e.FirstName
|
|
wm.LastName = e.LastName
|
|
wm.NickName = e.NickName
|
|
wm.DisplayName = e.DisplayName
|
|
wm.PreferredLanguage = e.PreferredLanguage
|
|
wm.Gender = e.Gender
|
|
wm.Avatar = ""
|
|
wm.Email = e.EmailAddress
|
|
wm.IsEmailVerified = false
|
|
wm.Phone = e.PhoneNumber
|
|
wm.IsPhoneVerified = false
|
|
wm.Country = e.Country
|
|
wm.Locality = e.Locality
|
|
wm.PostalCode = e.PostalCode
|
|
wm.Region = e.Region
|
|
wm.StreetAddress = e.StreetAddress
|
|
wm.UserState = domain.UserStateActive
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanRegisteredEvent(e *user.HumanRegisteredEvent) {
|
|
wm.UserName = e.UserName
|
|
wm.FirstName = e.FirstName
|
|
wm.LastName = e.LastName
|
|
wm.NickName = e.NickName
|
|
wm.DisplayName = e.DisplayName
|
|
wm.PreferredLanguage = e.PreferredLanguage
|
|
wm.Gender = e.Gender
|
|
wm.Avatar = ""
|
|
wm.Email = e.EmailAddress
|
|
wm.IsEmailVerified = false
|
|
wm.Phone = e.PhoneNumber
|
|
wm.IsPhoneVerified = false
|
|
wm.Country = e.Country
|
|
wm.Locality = e.Locality
|
|
wm.PostalCode = e.PostalCode
|
|
wm.Region = e.Region
|
|
wm.StreetAddress = e.StreetAddress
|
|
wm.UserState = domain.UserStateActive
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanProfileChangedEvent(e *user.HumanProfileChangedEvent) {
|
|
if e.FirstName != "" {
|
|
wm.FirstName = e.FirstName
|
|
}
|
|
if e.LastName != "" {
|
|
wm.LastName = e.LastName
|
|
}
|
|
if e.NickName != nil {
|
|
wm.NickName = *e.NickName
|
|
}
|
|
if e.DisplayName != nil {
|
|
wm.DisplayName = *e.DisplayName
|
|
}
|
|
if e.PreferredLanguage != nil {
|
|
wm.PreferredLanguage = *e.PreferredLanguage
|
|
}
|
|
if e.Gender != nil {
|
|
wm.Gender = *e.Gender
|
|
}
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanEmailChangedEvent(e *user.HumanEmailChangedEvent) {
|
|
wm.Email = e.EmailAddress
|
|
wm.IsEmailVerified = false
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanEmailVerifiedEvent() {
|
|
wm.IsEmailVerified = true
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanPhoneChangedEvent(e *user.HumanPhoneChangedEvent) {
|
|
wm.Phone = e.PhoneNumber
|
|
wm.IsPhoneVerified = false
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanPhoneVerifiedEvent() {
|
|
wm.IsPhoneVerified = true
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanPhoneRemovedEvent() {
|
|
wm.Phone = ""
|
|
wm.IsPhoneVerified = false
|
|
}
|
|
|
|
func (wm *HumanWriteModel) reduceHumanAddressChangedEvent(e *user.HumanAddressChangedEvent) {
|
|
if e.Country != nil {
|
|
wm.Country = *e.Country
|
|
}
|
|
if e.Locality != nil {
|
|
wm.Locality = *e.Locality
|
|
}
|
|
if e.PostalCode != nil {
|
|
wm.PostalCode = *e.PostalCode
|
|
}
|
|
if e.Region != nil {
|
|
wm.Region = *e.Region
|
|
}
|
|
if e.StreetAddress != nil {
|
|
wm.StreetAddress = *e.StreetAddress
|
|
}
|
|
}
|