mirror of
https://github.com/zitadel/zitadel.git
synced 2026-10-25 23:50:11 -05: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>
(cherry picked from commit 6082e59d47)
136 lines
3.3 KiB
Go
136 lines
3.3 KiB
Go
package command
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/user"
|
|
)
|
|
|
|
type UserAccessTokenWriteModel struct {
|
|
eventstore.WriteModel
|
|
|
|
TokenID string
|
|
ApplicationID string
|
|
UserAgentID string
|
|
Audience []string
|
|
Scopes []string
|
|
Expiration time.Time
|
|
PreferredLanguage string
|
|
Reason domain.TokenReason
|
|
Actor *domain.TokenActor
|
|
|
|
UserState domain.UserState
|
|
}
|
|
|
|
func NewUserAccessTokenWriteModel(userID, resourceOwner, tokenID string) *UserAccessTokenWriteModel {
|
|
return &UserAccessTokenWriteModel{
|
|
WriteModel: eventstore.WriteModel{
|
|
AggregateID: userID,
|
|
ResourceOwner: resourceOwner,
|
|
},
|
|
TokenID: tokenID,
|
|
}
|
|
}
|
|
|
|
func (wm *UserAccessTokenWriteModel) AppendEvents(events ...eventstore.Event) {
|
|
for _, event := range events {
|
|
switch e := event.(type) {
|
|
case *user.UserTokenAddedEvent:
|
|
if wm.TokenID != e.TokenID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.UserTokenRemovedEvent:
|
|
if wm.TokenID != e.TokenID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.HumanSignedOutEvent:
|
|
if wm.UserAgentID != e.UserAgentID {
|
|
continue
|
|
}
|
|
wm.WriteModel.AppendEvents(e)
|
|
case *user.UserLockedEvent,
|
|
*user.UserDeactivatedEvent,
|
|
*user.UserRemovedEvent:
|
|
wm.WriteModel.AppendEvents(e)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (wm *UserAccessTokenWriteModel) Reduce() error {
|
|
for _, event := range wm.Events {
|
|
switch e := event.(type) {
|
|
case *user.UserTokenAddedEvent:
|
|
wm.TokenID = e.TokenID
|
|
wm.ApplicationID = e.ApplicationID
|
|
wm.UserAgentID = e.UserAgentID
|
|
wm.Audience = e.Audience
|
|
wm.Scopes = e.Scopes
|
|
wm.Expiration = e.Expiration
|
|
wm.PreferredLanguage = e.PreferredLanguage
|
|
wm.UserState = domain.UserStateActive
|
|
wm.Reason = e.Reason
|
|
wm.Actor = e.Actor
|
|
if e.Expiration.Before(time.Now()) {
|
|
wm.UserState = domain.UserStateDeleted
|
|
}
|
|
case *user.UserTokenRemovedEvent,
|
|
*user.HumanSignedOutEvent,
|
|
*user.UserLockedEvent,
|
|
*user.UserDeactivatedEvent,
|
|
*user.UserRemovedEvent:
|
|
|
|
wm.TokenID = ""
|
|
wm.ApplicationID = ""
|
|
wm.UserAgentID = ""
|
|
wm.Audience = nil
|
|
wm.Scopes = nil
|
|
wm.Expiration = time.Time{}
|
|
wm.PreferredLanguage = ""
|
|
wm.Reason = domain.TokenReasonUnspecified
|
|
wm.Actor = nil
|
|
wm.UserState = domain.UserStateDeleted
|
|
|
|
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
|
|
|
wm.TokenID = ""
|
|
wm.ApplicationID = ""
|
|
wm.UserAgentID = ""
|
|
wm.Audience = nil
|
|
wm.Scopes = nil
|
|
wm.Expiration = time.Time{}
|
|
wm.PreferredLanguage = ""
|
|
wm.Reason = domain.TokenReasonUnspecified
|
|
wm.Actor = nil
|
|
wm.UserState = domain.UserStateUnspecified
|
|
}
|
|
}
|
|
return wm.WriteModel.Reduce()
|
|
}
|
|
|
|
func (wm *UserAccessTokenWriteModel) Query() *eventstore.SearchQueryBuilder {
|
|
query := eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AddQuery().
|
|
AggregateTypes(user.AggregateType).
|
|
AggregateIDs(wm.AggregateID).
|
|
EventTypes(
|
|
user.HumanAddedType,
|
|
user.HumanRegisteredType,
|
|
user.MachineAddedEventType,
|
|
user.UserTokenAddedType,
|
|
user.UserTokenRemovedType,
|
|
user.HumanSignedOutType,
|
|
user.UserLockedType,
|
|
user.UserDeactivatedType,
|
|
user.UserRemovedType).
|
|
Builder()
|
|
|
|
if wm.ResourceOwner != "" {
|
|
query.ResourceOwner(wm.ResourceOwner)
|
|
}
|
|
return query
|
|
}
|