mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-19 19:48:45 +00:00
fix(eventstore): allow overwriting resource owner of events (#12261)
# 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 <[email protected]>
This commit is contained in:
co-authored by
abhishek kumar gupta
parent
4459a1380c
commit
6082e59d47
@@ -71,6 +71,10 @@ func (g *GroupWriteModel) Reduce() error {
|
||||
g.Description = *e.Description
|
||||
}
|
||||
case *group.GroupRemovedEvent:
|
||||
g.Name = ""
|
||||
g.Description = ""
|
||||
g.UserIDs = nil
|
||||
g.existingUserIDs = make(map[string]struct{})
|
||||
g.State = domain.GroupStateRemoved
|
||||
case *group.GroupUsersAddedEvent:
|
||||
for _, userID := range e.UserIDs {
|
||||
|
||||
@@ -4,6 +4,8 @@ import (
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/repository/metadata"
|
||||
"github.com/zitadel/zitadel/internal/repository/org"
|
||||
"github.com/zitadel/zitadel/internal/repository/user"
|
||||
)
|
||||
|
||||
type MetadataWriteModel struct {
|
||||
@@ -17,6 +19,10 @@ type MetadataWriteModel struct {
|
||||
func (wm *MetadataWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent, *user.UserRemovedEvent,
|
||||
*org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.Value = nil
|
||||
wm.State = domain.MetadataStateUnspecified
|
||||
case *metadata.SetEvent:
|
||||
if wm.Key != e.Key {
|
||||
continue
|
||||
@@ -44,6 +50,9 @@ type MetadataListWriteModel struct {
|
||||
func (wm *MetadataListWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent, *user.UserRemovedEvent,
|
||||
*org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.metadataList = make(map[string][]byte)
|
||||
case *metadata.SetEvent:
|
||||
wm.metadataList[e.Key] = e.Value
|
||||
case *metadata.RemovedEvent:
|
||||
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/repository/action"
|
||||
"github.com/zitadel/zitadel/internal/repository/org"
|
||||
)
|
||||
|
||||
type ActionWriteModel struct {
|
||||
@@ -55,6 +56,10 @@ func (wm *ActionWriteModel) Reduce() error {
|
||||
case *action.ReactivatedEvent:
|
||||
wm.State = domain.ActionStateActive
|
||||
case *action.RemovedEvent:
|
||||
wm.Name = ""
|
||||
wm.Script = ""
|
||||
wm.Timeout = 0
|
||||
wm.AllowedToFail = false
|
||||
wm.State = domain.ActionStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -140,6 +145,8 @@ func (wm *ActionExistsModel) Reduce() error {
|
||||
break
|
||||
}
|
||||
}
|
||||
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.checkedIDs = nil
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -151,8 +158,10 @@ func (wm *ActionExistsModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(action.AggregateType).
|
||||
AggregateIDs(wm.actionIDs...).
|
||||
EventTypes(action.AddedEventType,
|
||||
action.RemovedEventType).
|
||||
EventTypes(action.AddedEventType, action.RemovedEventType).
|
||||
Or().
|
||||
AggregateTypes(org.AggregateType).
|
||||
EventTypes(org.OrgAddedEventType, org.OrgRemovedEventType).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -174,6 +183,8 @@ func NewActionsListByOrgModel(resourceOwner string) *ActionsListByOrgModel {
|
||||
func (wm *ActionsListByOrgModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.Actions = make(map[string]*ActionWriteModel)
|
||||
case *action.AddedEvent:
|
||||
wm.Actions[e.Aggregate().ID] = &ActionWriteModel{
|
||||
WriteModel: eventstore.WriteModel{
|
||||
@@ -198,10 +209,13 @@ func (wm *ActionsListByOrgModel) Query() *eventstore.SearchQueryBuilder {
|
||||
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
||||
ResourceOwner(wm.ResourceOwner).
|
||||
AddQuery().
|
||||
AggregateTypes(action.AggregateType).
|
||||
AggregateTypes(action.AggregateType, org.AggregateType).
|
||||
EventTypes(action.AddedEventType,
|
||||
action.DeactivatedEventType,
|
||||
action.ReactivatedEventType,
|
||||
action.RemovedEventType).
|
||||
action.RemovedEventType,
|
||||
org.OrgAddedEventType,
|
||||
org.OrgRemovedEventType,
|
||||
).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -19,6 +19,14 @@ type OrgDomainWriteModel struct {
|
||||
State domain.OrgDomainState
|
||||
}
|
||||
|
||||
func (wm *OrgDomainWriteModel) reset() {
|
||||
wm.ValidationType = domain.OrgDomainValidationTypeUnspecified
|
||||
wm.ValidationCode = nil
|
||||
wm.Primary = false
|
||||
wm.Verified = false
|
||||
wm.State = domain.OrgDomainStateUnspecified
|
||||
}
|
||||
|
||||
func NewOrgDomainWriteModel(orgID string, domain string) *OrgDomainWriteModel {
|
||||
return &OrgDomainWriteModel{
|
||||
WriteModel: eventstore.WriteModel{
|
||||
@@ -59,6 +67,8 @@ func (wm *OrgDomainWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -82,6 +92,8 @@ func (wm *OrgDomainWriteModel) Reduce() error {
|
||||
wm.Primary = false
|
||||
wm.ValidationType = domain.OrgDomainValidationTypeUnspecified
|
||||
wm.ValidationCode = nil
|
||||
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.reset()
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -99,7 +111,10 @@ func (wm *OrgDomainWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
org.OrgDomainVerificationAddedEventType,
|
||||
org.OrgDomainVerifiedEventType,
|
||||
org.OrgDomainPrimarySetEventType,
|
||||
org.OrgDomainRemovedEventType).
|
||||
org.OrgDomainRemovedEventType,
|
||||
org.OrgAddedEventType,
|
||||
org.OrgRemovedEventType,
|
||||
).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -132,6 +147,12 @@ func (wm *OrgDomainsWriteModel) Reduce() error {
|
||||
switch e := event.(type) {
|
||||
case *org.OrgAddedEvent:
|
||||
wm.OrgName = e.Name
|
||||
wm.Domains = nil
|
||||
wm.PrimaryDomain = ""
|
||||
case *org.OrgRemovedEvent:
|
||||
wm.OrgName = ""
|
||||
wm.Domains = nil
|
||||
wm.PrimaryDomain = ""
|
||||
case *org.OrgChangedEvent:
|
||||
wm.OrgName = e.Name
|
||||
case *org.DomainAddedEvent:
|
||||
@@ -171,7 +192,9 @@ func (wm *OrgDomainsWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
org.OrgDomainVerificationAddedEventType,
|
||||
org.OrgDomainVerifiedEventType,
|
||||
org.OrgDomainPrimarySetEventType,
|
||||
org.OrgDomainRemovedEventType).
|
||||
org.OrgDomainRemovedEventType,
|
||||
org.OrgRemovedEventType,
|
||||
).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -202,7 +225,7 @@ func (wm *OrgDomainVerifiedWriteModel) AppendEvents(events ...eventstore.Event)
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *org.OrgRemovedEvent:
|
||||
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -216,7 +239,7 @@ func (wm *OrgDomainVerifiedWriteModel) Reduce() error {
|
||||
wm.ResourceOwner = e.Aggregate().ResourceOwner
|
||||
case *org.DomainRemovedEvent:
|
||||
wm.Verified = false
|
||||
case *org.OrgRemovedEvent:
|
||||
case *org.OrgAddedEvent, *org.OrgRemovedEvent:
|
||||
if wm.ResourceOwner != e.Aggregate().ID {
|
||||
continue
|
||||
}
|
||||
@@ -233,6 +256,8 @@ func (wm *OrgDomainVerifiedWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
EventTypes(
|
||||
org.OrgDomainVerifiedEventType,
|
||||
org.OrgDomainRemovedEventType,
|
||||
org.OrgRemovedEventType).
|
||||
org.OrgRemovedEventType,
|
||||
org.OrgAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -30,6 +30,8 @@ func (wm *OrgMetadataWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
wm.MetadataWriteModel.AppendEvents(&e.RemovedEvent)
|
||||
case *org.MetadataRemovedAllEvent:
|
||||
wm.MetadataWriteModel.AppendEvents(&e.RemovedAllEvent)
|
||||
default:
|
||||
wm.MetadataWriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -41,6 +43,8 @@ func (wm *OrgMetadataWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateIDs(wm.MetadataWriteModel.AggregateID).
|
||||
AggregateTypes(org.AggregateType).
|
||||
EventTypes(
|
||||
org.OrgAddedEventType,
|
||||
org.OrgRemovedEventType,
|
||||
org.MetadataSetType,
|
||||
org.MetadataRemovedType,
|
||||
org.MetadataRemovedAllType).
|
||||
@@ -72,6 +76,8 @@ func (wm *OrgMetadataListWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
wm.MetadataListWriteModel.AppendEvents(&e.RemovedEvent)
|
||||
case *org.MetadataRemovedAllEvent:
|
||||
wm.MetadataListWriteModel.AppendEvents(&e.RemovedAllEvent)
|
||||
default:
|
||||
wm.MetadataListWriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -87,6 +93,8 @@ func (wm *OrgMetadataListWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateIDs(wm.MetadataListWriteModel.AggregateID).
|
||||
AggregateTypes(org.AggregateType).
|
||||
EventTypes(
|
||||
org.OrgAddedEventType,
|
||||
org.OrgRemovedEventType,
|
||||
org.MetadataSetType,
|
||||
org.MetadataRemovedType,
|
||||
org.MetadataRemovedAllType).
|
||||
|
||||
@@ -123,7 +123,21 @@ func (wm *APIApplicationWriteModel) Reduce() error {
|
||||
case *project.APIConfigSecretHashUpdatedEvent:
|
||||
wm.HashedSecret = e.HashedSecret
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.AppName = ""
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.ClientSecretString = ""
|
||||
wm.AuthMethodType = domain.APIAuthMethodTypeBasic
|
||||
wm.api = false
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.AppName = ""
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.ClientSecretString = ""
|
||||
wm.AuthMethodType = domain.APIAuthMethodTypeBasic
|
||||
wm.api = false
|
||||
wm.State = domain.AppStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -149,6 +163,7 @@ func (wm *APIApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationAddedType,
|
||||
project.ApplicationChangedType,
|
||||
project.ApplicationDeactivatedType,
|
||||
|
||||
@@ -97,7 +97,19 @@ func (wm *ApplicationKeyWriteModel) Reduce() error {
|
||||
case *project.ApplicationKeyRemovedEvent:
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.ClientID = ""
|
||||
wm.KeyID = ""
|
||||
wm.KeyType = domain.AuthNKeyTypeNONE
|
||||
wm.ExpirationDate = time.Time{}
|
||||
wm.KeysAllowed = false
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.ClientID = ""
|
||||
wm.KeyID = ""
|
||||
wm.KeyType = domain.AuthNKeyTypeNONE
|
||||
wm.ExpirationDate = time.Time{}
|
||||
wm.KeysAllowed = false
|
||||
wm.State = domain.AppStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -132,6 +144,7 @@ func (wm *ApplicationKeyWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationRemovedType,
|
||||
project.OIDCConfigAddedType,
|
||||
project.OIDCConfigChangedType,
|
||||
|
||||
@@ -60,7 +60,7 @@ func (wm *ApplicationWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *project.ProjectRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -87,7 +87,11 @@ func (wm *ApplicationWriteModel) Reduce() error {
|
||||
case *project.ApplicationRemovedEvent:
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.Name = ""
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.Name = ""
|
||||
wm.State = domain.AppStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -100,6 +104,7 @@ func (wm *ApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationAddedType,
|
||||
project.ApplicationChangedType,
|
||||
project.ApplicationDeactivatedType,
|
||||
|
||||
@@ -108,7 +108,7 @@ func (wm *OIDCApplicationWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *project.ProjectRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -118,6 +118,29 @@ func (wm *OIDCApplicationWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *project.ApplicationAddedEvent:
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.ClientSecretString = ""
|
||||
wm.RedirectUris = nil
|
||||
wm.ResponseTypes = nil
|
||||
wm.GrantTypes = nil
|
||||
wm.ApplicationType = domain.OIDCApplicationTypeWeb
|
||||
wm.AuthMethodType = domain.OIDCAuthMethodTypeBasic
|
||||
wm.PostLogoutRedirectUris = nil
|
||||
wm.OIDCVersion = domain.OIDCVersionV1
|
||||
wm.Compliance = nil
|
||||
wm.DevMode = false
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.AccessTokenRoleAssertion = false
|
||||
wm.IDTokenRoleAssertion = false
|
||||
wm.IDTokenUserinfoAssertion = false
|
||||
wm.ClockSkew = 0
|
||||
wm.AdditionalOrigins = nil
|
||||
wm.SkipNativeAppSuccessPage = false
|
||||
wm.BackChannelLogoutURI = ""
|
||||
wm.LoginVersion = domain.LoginVersionUnspecified
|
||||
wm.LoginBaseURI = ""
|
||||
wm.oidc = false
|
||||
wm.AppName = e.Name
|
||||
wm.State = domain.AppStateActive
|
||||
case *project.ApplicationChangedEvent:
|
||||
@@ -143,6 +166,30 @@ func (wm *OIDCApplicationWriteModel) Reduce() error {
|
||||
case *project.OIDCConfigSecretHashUpdatedEvent:
|
||||
wm.HashedSecret = e.HashedSecret
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.AppName = ""
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.ClientSecretString = ""
|
||||
wm.RedirectUris = nil
|
||||
wm.ResponseTypes = nil
|
||||
wm.GrantTypes = nil
|
||||
wm.ApplicationType = domain.OIDCApplicationTypeWeb
|
||||
wm.AuthMethodType = domain.OIDCAuthMethodTypeBasic
|
||||
wm.PostLogoutRedirectUris = nil
|
||||
wm.OIDCVersion = domain.OIDCVersionV1
|
||||
wm.Compliance = nil
|
||||
wm.DevMode = false
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.AccessTokenRoleAssertion = false
|
||||
wm.IDTokenRoleAssertion = false
|
||||
wm.IDTokenUserinfoAssertion = false
|
||||
wm.ClockSkew = 0
|
||||
wm.AdditionalOrigins = nil
|
||||
wm.SkipNativeAppSuccessPage = false
|
||||
wm.BackChannelLogoutURI = ""
|
||||
wm.LoginVersion = domain.LoginVersionUnspecified
|
||||
wm.LoginBaseURI = ""
|
||||
wm.oidc = false
|
||||
wm.State = domain.AppStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -237,6 +284,7 @@ func (wm *OIDCApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationAddedType,
|
||||
project.ApplicationChangedType,
|
||||
project.ApplicationDeactivatedType,
|
||||
|
||||
@@ -112,7 +112,23 @@ func (wm *SAMLApplicationWriteModel) Reduce() error {
|
||||
case *project.SAMLConfigChangedEvent:
|
||||
wm.appendChangeSAMLEvent(e)
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.AppName = ""
|
||||
wm.EntityID = ""
|
||||
wm.Metadata = nil
|
||||
wm.MetadataURL = ""
|
||||
wm.LoginVersion = domain.LoginVersionUnspecified
|
||||
wm.LoginBaseURI = ""
|
||||
wm.saml = false
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.AppName = ""
|
||||
wm.EntityID = ""
|
||||
wm.Metadata = nil
|
||||
wm.MetadataURL = ""
|
||||
wm.LoginVersion = domain.LoginVersionUnspecified
|
||||
wm.LoginBaseURI = ""
|
||||
wm.saml = false
|
||||
wm.State = domain.AppStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -153,6 +169,7 @@ func (wm *SAMLApplicationWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationAddedType,
|
||||
project.ApplicationChangedType,
|
||||
project.ApplicationDeactivatedType,
|
||||
|
||||
@@ -105,7 +105,17 @@ func (wm *ApplicationSecretWriteModel) Reduce() error {
|
||||
case *project.APIConfigSecretHashUpdatedEvent:
|
||||
wm.HashedSecret = e.HashedSecret
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.SecretAllowed = false
|
||||
wm.IsAPI = false
|
||||
wm.State = domain.AppStateRemoved
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.ClientID = ""
|
||||
wm.HashedSecret = ""
|
||||
wm.SecretAllowed = false
|
||||
wm.IsAPI = false
|
||||
wm.State = domain.AppStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -144,6 +154,7 @@ func (wm *ApplicationSecretWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.ApplicationRemovedType,
|
||||
project.OIDCConfigAddedType,
|
||||
project.OIDCConfigChangedType,
|
||||
|
||||
@@ -75,7 +75,11 @@ func (wm *ProjectGrantMemberWriteModel) Reduce() error {
|
||||
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()
|
||||
@@ -88,6 +92,7 @@ func (wm *ProjectGrantMemberWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.GrantMemberAddedType,
|
||||
project.GrantMemberChangedType,
|
||||
project.GrantMemberRemovedType,
|
||||
|
||||
@@ -61,7 +61,7 @@ func (wm *ProjectGrantWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
wm.FoundGrantID = ""
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
case *project.ProjectRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -104,6 +104,10 @@ func (wm *ProjectGrantWriteModel) Reduce() error {
|
||||
wm.State = domain.ProjectGrantStateRemoved
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.State = domain.ProjectGrantStateRemoved
|
||||
wm.RoleKeys = nil
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.State = domain.ProjectGrantStateUnspecified
|
||||
wm.RoleKeys = nil
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -116,6 +120,7 @@ func (wm *ProjectGrantWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.GrantAddedType,
|
||||
project.GrantChangedType,
|
||||
project.GrantCascadeChangedType,
|
||||
|
||||
@@ -66,6 +66,11 @@ func (wm *ProjectWriteModel) Reduce() error {
|
||||
}
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ func (wm *ProjectRoleWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
if e.Key == wm.Key {
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
case *project.ProjectRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -79,6 +79,8 @@ func (wm *ProjectRoleWriteModel) Reduce() error {
|
||||
}
|
||||
case *project.RoleRemovedEvent:
|
||||
wm.State = domain.ProjectRoleStateRemoved
|
||||
case *project.ProjectAddedEvent:
|
||||
wm.State = domain.ProjectRoleStateUnspecified
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.State = domain.ProjectRoleStateRemoved
|
||||
}
|
||||
@@ -93,6 +95,7 @@ func (wm *ProjectRoleWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(project.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
project.ProjectAddedType,
|
||||
project.RoleAddedType,
|
||||
project.RoleChangedType,
|
||||
project.RoleRemovedType,
|
||||
|
||||
@@ -987,10 +987,6 @@ func TestCommands_updateSession(t *testing.T) {
|
||||
fields{
|
||||
eventstore: expectEventstore(
|
||||
expectFilter(
|
||||
eventFromEventPusher(
|
||||
user.NewHumanAddedEvent(context.Background(), &user.NewAggregate("userID", "org1").Aggregate,
|
||||
"username", "", "", "", "", language.English, domain.GenderUnspecified, "", false),
|
||||
),
|
||||
eventFromEventPusher(
|
||||
idpintent.NewStartedEvent(context.Background(),
|
||||
&idpintent.NewAggregate("id", "instance1").Aggregate,
|
||||
@@ -1029,7 +1025,7 @@ func TestCommands_updateSession(t *testing.T) {
|
||||
"userID", "org1", testNow, &language.Afrikaans),
|
||||
session.NewIntentCheckedEvent(context.Background(), &session.NewAggregate("sessionID", "instance1").Aggregate,
|
||||
testNow),
|
||||
idpintent.NewConsumedEvent(context.Background(), &idpintent.NewAggregate("intent", "org1").Aggregate),
|
||||
idpintent.NewConsumedEvent(context.Background(), &idpintent.NewAggregate("intent", "instance1").Aggregate),
|
||||
session.NewTokenSetEvent(context.Background(), &session.NewAggregate("sessionID", "instance1").Aggregate,
|
||||
"tokenID"),
|
||||
),
|
||||
|
||||
@@ -134,6 +134,8 @@ func (wm *UserGrantPreConditionReadModel) Reduce() error {
|
||||
// We store the organization of the project for later checks, e.g. in case of a project grant
|
||||
wm.ProjectResourceOwner = e.Aggregate().ResourceOwner
|
||||
case *project.ProjectRemovedEvent:
|
||||
wm.ExistingRoleKeysProject = nil
|
||||
wm.ExistingRoleKeysGrant = nil
|
||||
wm.ProjectExists = false
|
||||
case *project.GrantAddedEvent:
|
||||
if projectGrantExistsOnOrganization(wm.ProjectGrantID, wm.ResourceOwner, e.GrantID, e.GrantedOrgID) {
|
||||
|
||||
@@ -82,7 +82,30 @@ func (wm *UserAccessTokenWriteModel) Reduce() error {
|
||||
*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()
|
||||
@@ -94,6 +117,9 @@ func (wm *UserAccessTokenWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserTokenAddedType,
|
||||
user.UserTokenRemovedType,
|
||||
user.HumanSignedOutType,
|
||||
|
||||
@@ -63,7 +63,19 @@ func (wm *HumanAddressWriteModel) Reduce() error {
|
||||
wm.StreetAddress = *e.StreetAddress
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Country = ""
|
||||
wm.Locality = ""
|
||||
wm.PostalCode = ""
|
||||
wm.Region = ""
|
||||
wm.StreetAddress = ""
|
||||
wm.State = domain.AddressStateRemoved
|
||||
case *user.MachineAddedEvent:
|
||||
wm.Country = ""
|
||||
wm.Locality = ""
|
||||
wm.PostalCode = ""
|
||||
wm.Region = ""
|
||||
wm.StreetAddress = ""
|
||||
wm.State = domain.AddressStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -80,6 +92,7 @@ func (wm *HumanAddressWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
user.UserV1AddressChangedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanAddressChangedType,
|
||||
user.UserRemovedType).
|
||||
Builder()
|
||||
|
||||
@@ -37,9 +37,19 @@ func (wm *HumanEmailWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent:
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
wm.Email = e.EmailAddress
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanRegisteredEvent:
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
wm.Email = e.EmailAddress
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanInitialCodeAddedEvent:
|
||||
@@ -59,7 +69,23 @@ func (wm *HumanEmailWriteModel) Reduce() error {
|
||||
wm.IsEmailVerified = true
|
||||
wm.Code = nil
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Email = ""
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.MachineAddedEvent:
|
||||
wm.Email = ""
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -74,6 +100,7 @@ func (wm *HumanEmailWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
user.HumanAddedType,
|
||||
user.UserV1RegisteredType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserV1InitialCodeAddedType,
|
||||
user.HumanInitialCodeAddedType,
|
||||
user.UserV1InitializedCheckSucceededType,
|
||||
|
||||
@@ -37,9 +37,19 @@ func (wm *HumanInitCodeWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent:
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
wm.Email = e.EmailAddress
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanRegisteredEvent:
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
wm.Email = e.EmailAddress
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanEmailChangedEvent:
|
||||
@@ -57,7 +67,21 @@ func (wm *HumanInitCodeWriteModel) Reduce() error {
|
||||
wm.Code = nil
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Email = ""
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.MachineAddedEvent:
|
||||
wm.Email = ""
|
||||
wm.IsEmailVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.AuthRequestID = ""
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -73,6 +97,7 @@ func (wm *HumanInitCodeWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
user.HumanAddedType,
|
||||
user.UserV1RegisteredType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserV1EmailChangedType,
|
||||
user.HumanEmailChangedType,
|
||||
user.UserV1EmailVerifiedType,
|
||||
|
||||
@@ -91,7 +91,43 @@ func (wm *HumanWriteModel) Reduce() error {
|
||||
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()
|
||||
@@ -106,6 +142,7 @@ func (wm *HumanWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanInitialCodeAddedType,
|
||||
user.HumanInitializedCheckSucceededType,
|
||||
user.UserUserNameChangedType,
|
||||
@@ -143,8 +180,11 @@ func (wm *HumanWriteModel) reduceHumanAddedEvent(e *user.HumanAddedEvent) {
|
||||
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
|
||||
@@ -161,8 +201,11 @@ func (wm *HumanWriteModel) reduceHumanRegisteredEvent(e *user.HumanRegisteredEve
|
||||
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
|
||||
|
||||
@@ -48,7 +48,15 @@ func (wm *HumanTOTPWriteModel) Reduce() error {
|
||||
case *user.HumanOTPRemovedEvent:
|
||||
wm.State = domain.MFAStateRemoved
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Secret = nil
|
||||
wm.CheckFailedCount = 0
|
||||
wm.UserLocked = false
|
||||
wm.State = domain.MFAStateRemoved
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.Secret = nil
|
||||
wm.CheckFailedCount = 0
|
||||
wm.UserLocked = false
|
||||
wm.State = domain.MFAStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -59,7 +67,11 @@ func (wm *HumanTOTPWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.HumanMFAOTPAddedType,
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanMFAOTPAddedType,
|
||||
user.HumanMFAOTPVerifiedType,
|
||||
user.HumanMFAOTPRemovedType,
|
||||
user.HumanMFAOTPCheckSucceededType,
|
||||
@@ -129,7 +141,11 @@ func (wm *HumanOTPSMSWriteModel) Reduce() error {
|
||||
case *user.HumanOTPSMSRemovedEvent:
|
||||
wm.otpAdded = false
|
||||
case *user.HumanPhoneRemovedEvent,
|
||||
*user.UserRemovedEvent:
|
||||
*user.UserRemovedEvent,
|
||||
*user.HumanAddedEvent,
|
||||
*user.HumanRegisteredEvent,
|
||||
*user.MachineAddedEvent:
|
||||
|
||||
wm.phoneVerified = false
|
||||
wm.otpAdded = false
|
||||
}
|
||||
@@ -147,6 +163,9 @@ func (wm *HumanOTPSMSWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
user.HumanOTPSMSRemovedType,
|
||||
user.HumanPhoneRemovedType,
|
||||
user.UserRemovedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
|
||||
@@ -300,7 +319,7 @@ func (wm *HumanOTPEmailWriteModel) Reduce() error {
|
||||
wm.otpAdded = true
|
||||
case *user.HumanOTPEmailRemovedEvent:
|
||||
wm.otpAdded = false
|
||||
case *user.UserRemovedEvent:
|
||||
case *user.UserRemovedEvent, *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.emailVerified = false
|
||||
wm.otpAdded = false
|
||||
}
|
||||
@@ -314,6 +333,9 @@ func (wm *HumanOTPEmailWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanEmailVerifiedType,
|
||||
user.HumanOTPEmailAddedType,
|
||||
user.HumanOTPEmailRemovedType,
|
||||
|
||||
@@ -58,13 +58,35 @@ func (wm *HumanPasswordWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent:
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.PasswordCheckFailedCount = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.EncodedHash = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash)
|
||||
wm.SecretChangeRequired = e.ChangeRequired
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanRegisteredEvent:
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.PasswordCheckFailedCount = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.EncodedHash = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash)
|
||||
wm.SecretChangeRequired = e.ChangeRequired
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.MachineAddedEvent:
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.PasswordCheckFailedCount = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.EncodedHash = ""
|
||||
wm.SecretChangeRequired = false
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
case *user.HumanInitialCodeAddedEvent:
|
||||
wm.UserState = domain.UserStateInitial
|
||||
case *user.HumanInitializedCheckSucceededEvent:
|
||||
@@ -98,6 +120,14 @@ func (wm *HumanPasswordWriteModel) Reduce() error {
|
||||
wm.UserState = domain.UserStateActive
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
wm.EncodedHash = ""
|
||||
wm.SecretChangeRequired = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.PasswordCheckFailedCount = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.HumanPasswordHashUpdatedEvent:
|
||||
wm.EncodedHash = e.EncodedHash
|
||||
@@ -113,6 +143,7 @@ func (wm *HumanPasswordWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanInitialCodeAddedType,
|
||||
user.HumanInitializedCheckSucceededType,
|
||||
user.HumanPasswordChangedType,
|
||||
|
||||
@@ -39,17 +39,45 @@ func (wm *HumanPhoneWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent:
|
||||
if e.PhoneNumber != "" {
|
||||
wm.Phone = e.PhoneNumber
|
||||
wm.IsPhoneVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.Phone = e.PhoneNumber
|
||||
|
||||
if wm.Phone != "" {
|
||||
wm.State = domain.PhoneStateActive
|
||||
} else {
|
||||
wm.State = domain.PhoneStateUnspecified
|
||||
}
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanRegisteredEvent:
|
||||
if e.PhoneNumber != "" {
|
||||
wm.Phone = e.PhoneNumber
|
||||
wm.IsPhoneVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.Phone = e.PhoneNumber
|
||||
|
||||
if wm.Phone != "" {
|
||||
wm.State = domain.PhoneStateActive
|
||||
} else {
|
||||
wm.State = domain.PhoneStateUnspecified
|
||||
}
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.MachineAddedEvent:
|
||||
wm.IsPhoneVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.Phone = ""
|
||||
wm.State = domain.PhoneStateUnspecified
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
case *user.HumanInitialCodeAddedEvent:
|
||||
wm.UserState = domain.UserStateInitial
|
||||
case *user.HumanInitializedCheckSucceededEvent:
|
||||
@@ -75,6 +103,12 @@ func (wm *HumanPhoneWriteModel) Reduce() error {
|
||||
wm.IsPhoneVerified = false
|
||||
wm.Phone = ""
|
||||
case *user.UserRemovedEvent:
|
||||
wm.IsPhoneVerified = false
|
||||
wm.Code = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiry = 0
|
||||
wm.GeneratorID = ""
|
||||
wm.VerificationID = ""
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
wm.IsPhoneVerified = false
|
||||
wm.Phone = ""
|
||||
|
||||
@@ -71,7 +71,21 @@ func (wm *HumanProfileWriteModel) Reduce() error {
|
||||
wm.Gender = *e.Gender
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
wm.FirstName = ""
|
||||
wm.LastName = ""
|
||||
wm.NickName = ""
|
||||
wm.DisplayName = ""
|
||||
wm.PreferredLanguage = language.Und
|
||||
wm.Gender = domain.GenderUnspecified
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.MachineAddedEvent:
|
||||
wm.FirstName = ""
|
||||
wm.LastName = ""
|
||||
wm.NickName = ""
|
||||
wm.DisplayName = ""
|
||||
wm.PreferredLanguage = language.Und
|
||||
wm.Gender = domain.GenderUnspecified
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -83,8 +97,10 @@ func (wm *HumanProfileWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.HumanAddedType,
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanProfileChangedType,
|
||||
user.UserRemovedType,
|
||||
user.UserV1AddedType,
|
||||
|
||||
@@ -63,7 +63,15 @@ func (wm *HumanRecoveryCodeWriteModel) Reduce() error {
|
||||
wm.userLocked = false
|
||||
wm.FailedAttempts = 0
|
||||
case *user.UserRemovedEvent:
|
||||
wm.FailedAttempts = 0
|
||||
wm.codes = nil
|
||||
wm.userLocked = false
|
||||
wm.State = domain.MFAStateRemoved
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.FailedAttempts = 0
|
||||
wm.codes = nil
|
||||
wm.userLocked = false
|
||||
wm.State = domain.MFAStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -74,7 +82,11 @@ func (wm *HumanRecoveryCodeWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.HumanRecoveryCodesAddedType,
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanRecoveryCodesAddedType,
|
||||
user.HumanRecoveryCodesRemovedType,
|
||||
user.HumanRecoveryCodeCheckSucceededType,
|
||||
user.HumanRecoveryCodeCheckFailedType,
|
||||
|
||||
@@ -309,7 +309,7 @@ func TestHumanRecoveryCodeWriteModel_Reduce(t *testing.T) {
|
||||
},
|
||||
State: domain.MFAStateRemoved,
|
||||
FailedAttempts: 0,
|
||||
codes: []string{"code1", "code2", "code3"},
|
||||
codes: nil,
|
||||
userLocked: false,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -84,7 +84,25 @@ func (wm *HumanRefreshTokenWriteModel) Reduce() error {
|
||||
*user.UserLockedEvent,
|
||||
*user.UserDeactivatedEvent,
|
||||
*user.UserRemovedEvent:
|
||||
|
||||
wm.TokenID = ""
|
||||
wm.RefreshToken = ""
|
||||
wm.AuthTime = time.Time{}
|
||||
wm.IdleExpiration = time.Time{}
|
||||
wm.Expiration = time.Time{}
|
||||
wm.UserAgentID = ""
|
||||
wm.AuthMethodsReferences = nil
|
||||
wm.Actor = nil
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.TokenID = ""
|
||||
wm.RefreshToken = ""
|
||||
wm.AuthTime = time.Time{}
|
||||
wm.IdleExpiration = time.Time{}
|
||||
wm.Expiration = time.Time{}
|
||||
wm.UserAgentID = ""
|
||||
wm.AuthMethodsReferences = nil
|
||||
wm.Actor = nil
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -96,6 +114,9 @@ func (wm *HumanRefreshTokenWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanRefreshTokenAddedType,
|
||||
user.HumanRefreshTokenRenewedType,
|
||||
user.HumanRefreshTokenRemovedType,
|
||||
|
||||
@@ -87,7 +87,7 @@ func (wm *HumanWebAuthNWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
if wm.WebauthNTokenID == e.WebAuthNTokenID {
|
||||
wm.WriteModel.AppendEvents(&e.HumanWebAuthNRemovedEvent)
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -104,7 +104,15 @@ func (wm *HumanWebAuthNWriteModel) Reduce() error {
|
||||
wm.SignCount = e.SignCount
|
||||
case *user.HumanWebAuthNRemovedEvent:
|
||||
wm.State = domain.MFAStateRemoved
|
||||
case *user.UserRemovedEvent:
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent, *user.UserRemovedEvent:
|
||||
wm.Challenge = ""
|
||||
wm.KeyID = nil
|
||||
wm.PublicKey = nil
|
||||
wm.AttestationType = ""
|
||||
wm.AAGUID = nil
|
||||
wm.SignCount = 0
|
||||
wm.WebAuthNTokenName = ""
|
||||
wm.RPID = ""
|
||||
wm.State = domain.MFAStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -134,7 +142,11 @@ func (wm *HumanWebAuthNWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.HumanU2FTokenAddedType,
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanU2FTokenAddedType,
|
||||
user.HumanPasswordlessTokenAddedType,
|
||||
user.HumanU2FTokenAddedType,
|
||||
user.HumanPasswordlessTokenAddedType,
|
||||
@@ -206,7 +218,11 @@ func (wm *HumanU2FTokensReadModel) Reduce() error {
|
||||
wm.WebAuthNTokens[len(wm.WebAuthNTokens)-1] = nil
|
||||
wm.WebAuthNTokens = wm.WebAuthNTokens[:len(wm.WebAuthNTokens)-1]
|
||||
case *user.UserRemovedEvent:
|
||||
wm.WebAuthNTokens = nil
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.WebAuthNTokens = nil
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -221,7 +237,12 @@ func (rm *HumanU2FTokensReadModel) Query() *eventstore.SearchQueryBuilder {
|
||||
EventTypes(
|
||||
user.HumanU2FTokenAddedType,
|
||||
user.HumanU2FTokenVerifiedType,
|
||||
user.HumanU2FTokenRemovedType).
|
||||
user.HumanU2FTokenRemovedType,
|
||||
user.UserRemovedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
|
||||
}
|
||||
@@ -293,7 +314,11 @@ func (wm *HumanPasswordlessTokensReadModel) Reduce() error {
|
||||
wm.WebAuthNTokens[len(wm.WebAuthNTokens)-1] = nil
|
||||
wm.WebAuthNTokens = wm.WebAuthNTokens[:len(wm.WebAuthNTokens)-1]
|
||||
case *user.UserRemovedEvent:
|
||||
wm.WebAuthNTokens = nil
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.WebAuthNTokens = nil
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -308,7 +333,12 @@ func (rm *HumanPasswordlessTokensReadModel) Query() *eventstore.SearchQueryBuild
|
||||
EventTypes(
|
||||
user.HumanPasswordlessTokenAddedType,
|
||||
user.HumanPasswordlessTokenVerifiedType,
|
||||
user.HumanPasswordlessTokenRemovedType).
|
||||
user.HumanPasswordlessTokenRemovedType,
|
||||
user.UserRemovedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
|
||||
}
|
||||
@@ -354,7 +384,7 @@ func (wm *HumanU2FLoginReadModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *user.UserRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -369,7 +399,15 @@ func (wm *HumanU2FLoginReadModel) Reduce() error {
|
||||
wm.UserVerification = e.UserVerification
|
||||
wm.State = domain.UserStateActive
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Challenge = ""
|
||||
wm.AllowedCredentialIDs = nil
|
||||
wm.UserVerification = domain.UserVerificationRequirementUnspecified
|
||||
wm.State = domain.UserStateDeleted
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.Challenge = ""
|
||||
wm.AllowedCredentialIDs = nil
|
||||
wm.UserVerification = domain.UserVerificationRequirementUnspecified
|
||||
wm.State = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -383,7 +421,11 @@ func (rm *HumanU2FLoginReadModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateIDs(rm.AggregateID).
|
||||
EventTypes(
|
||||
user.HumanU2FTokenBeginLoginType,
|
||||
user.UserRemovedType).
|
||||
user.UserRemovedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -415,7 +457,7 @@ func (wm *HumanPasswordlessLoginReadModel) AppendEvents(events ...eventstore.Eve
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *user.UserRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -430,7 +472,15 @@ func (wm *HumanPasswordlessLoginReadModel) Reduce() error {
|
||||
wm.UserVerification = e.UserVerification
|
||||
wm.State = domain.UserStateActive
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Challenge = ""
|
||||
wm.AllowedCredentialIDs = nil
|
||||
wm.UserVerification = domain.UserVerificationRequirementUnspecified
|
||||
wm.State = domain.UserStateDeleted
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.Challenge = ""
|
||||
wm.AllowedCredentialIDs = nil
|
||||
wm.UserVerification = domain.UserVerificationRequirementUnspecified
|
||||
wm.State = domain.UserStateUnspecified
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
@@ -444,7 +494,11 @@ func (rm *HumanPasswordlessLoginReadModel) Query() *eventstore.SearchQueryBuilde
|
||||
AggregateIDs(rm.AggregateID).
|
||||
EventTypes(
|
||||
user.HumanPasswordlessTokenBeginLoginType,
|
||||
user.UserRemovedType).
|
||||
user.UserRemovedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
|
||||
}
|
||||
@@ -493,7 +547,7 @@ func (wm *HumanPasswordlessInitCodeWriteModel) AppendEvents(events ...eventstore
|
||||
if wm.CodeID == e.ID {
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -512,7 +566,12 @@ func (wm *HumanPasswordlessInitCodeWriteModel) Reduce() error {
|
||||
wm.appendCheckFailedEvent(e)
|
||||
case *user.HumanPasswordlessInitCodeCheckSucceededEvent:
|
||||
wm.State = domain.PasswordlessInitCodeStateRemoved
|
||||
case *user.UserRemovedEvent:
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent, *user.UserRemovedEvent:
|
||||
wm.Attempts = 0
|
||||
wm.CryptoCode = nil
|
||||
wm.CodeCreationDate = time.Time{}
|
||||
wm.CodeExpiration = 0
|
||||
wm.State = domain.PasswordlessInitCodeStateUnspecified
|
||||
wm.State = domain.PasswordlessInitCodeStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -554,6 +613,10 @@ func (wm *HumanPasswordlessInitCodeWriteModel) Query() *eventstore.SearchQueryBu
|
||||
user.HumanPasswordlessInitCodeSentType,
|
||||
user.HumanPasswordlessInitCodeCheckFailedType,
|
||||
user.HumanPasswordlessInitCodeCheckSucceededType,
|
||||
user.UserRemovedType).
|
||||
user.UserRemovedType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
).
|
||||
Builder()
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ func (wm *UserIDPLinkWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *user.UserRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -70,7 +70,11 @@ func (wm *UserIDPLinkWriteModel) Reduce() error {
|
||||
wm.State = domain.UserIDPLinkStateRemoved
|
||||
case *user.UserIDPLinkCascadeRemovedEvent:
|
||||
wm.State = domain.UserIDPLinkStateRemoved
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent:
|
||||
wm.DisplayName = ""
|
||||
wm.State = domain.UserIDPLinkStateUnspecified
|
||||
case *user.UserRemovedEvent:
|
||||
wm.DisplayName = ""
|
||||
wm.State = domain.UserIDPLinkStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -83,7 +87,11 @@ func (wm *UserIDPLinkWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.UserIDPLinkAddedType,
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserIDPLinkAddedType,
|
||||
user.UserIDPExternalIDMigratedType,
|
||||
user.UserIDPLinkRemovedType,
|
||||
user.UserIDPLinkCascadeRemovedType,
|
||||
|
||||
@@ -41,7 +41,7 @@ func (wm *MachineKeyWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
continue
|
||||
}
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
case *user.UserRemovedEvent:
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,14 @@ func (wm *MachineKeyWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
func (wm *MachineKeyWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent:
|
||||
wm.KeyType = domain.AuthNKeyTypeNONE
|
||||
wm.ExpirationDate = time.Time{}
|
||||
wm.State = domain.MachineKeyStateUnspecified
|
||||
case *user.MachineAddedEvent:
|
||||
wm.KeyType = domain.AuthNKeyTypeNONE
|
||||
wm.ExpirationDate = time.Time{}
|
||||
wm.State = domain.MachineKeyStateUnspecified
|
||||
case *user.MachineKeyAddedEvent:
|
||||
wm.KeyID = e.KeyID
|
||||
wm.KeyType = e.KeyType
|
||||
@@ -58,6 +66,8 @@ func (wm *MachineKeyWriteModel) Reduce() error {
|
||||
case *user.MachineKeyRemovedEvent:
|
||||
wm.State = domain.MachineKeyStateRemoved
|
||||
case *user.UserRemovedEvent:
|
||||
wm.KeyType = domain.AuthNKeyTypeNONE
|
||||
wm.ExpirationDate = time.Time{}
|
||||
wm.State = domain.MachineKeyStateRemoved
|
||||
}
|
||||
}
|
||||
@@ -71,6 +81,9 @@ func (wm *MachineKeyWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.MachineKeyAddedEventType,
|
||||
user.MachineKeyRemovedEventType,
|
||||
user.UserRemovedType).
|
||||
|
||||
@@ -34,11 +34,19 @@ func (wm *MachineWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.MachineAddedEvent:
|
||||
wm.HashedSecret = ""
|
||||
wm.UserName = e.UserName
|
||||
wm.Name = e.Name
|
||||
wm.Description = e.Description
|
||||
wm.AccessTokenType = e.AccessTokenType
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.HumanAddedEvent, *user.HumanRegisteredEvent:
|
||||
wm.Name = ""
|
||||
wm.Description = ""
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.HashedSecret = ""
|
||||
// We set the state to unspecified because it is not a valid machine.
|
||||
wm.UserState = domain.UserStateUnspecified
|
||||
case *user.UsernameChangedEvent:
|
||||
wm.UserName = e.UserName
|
||||
case *user.MachineChangedEvent:
|
||||
@@ -68,6 +76,10 @@ func (wm *MachineWriteModel) Reduce() error {
|
||||
wm.UserState = domain.UserStateActive
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
wm.Name = ""
|
||||
wm.Description = ""
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.HashedSecret = ""
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.MachineSecretSetEvent:
|
||||
wm.HashedSecret = crypto.SecretOrEncodedHash(e.ClientSecret, e.HashedSecret)
|
||||
@@ -86,7 +98,10 @@ func (wm *MachineWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
AggregateIDs(wm.AggregateID).
|
||||
EventTypes(user.MachineAddedEventType,
|
||||
EventTypes(
|
||||
user.MachineAddedEventType,
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.UserUserNameChangedType,
|
||||
user.MachineChangedEventType,
|
||||
user.UserLockedType,
|
||||
|
||||
@@ -31,6 +31,8 @@ func (wm *UserMetadataWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
wm.MetadataWriteModel.AppendEvents(&e.RemovedEvent)
|
||||
case *user.MetadataRemovedAllEvent:
|
||||
wm.MetadataWriteModel.AppendEvents(&e.RemovedAllEvent)
|
||||
default:
|
||||
wm.MetadataWriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,6 +44,10 @@ func (wm *UserMetadataWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateIDs(wm.MetadataWriteModel.AggregateID).
|
||||
AggregateTypes(user.AggregateType).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserRemovedType,
|
||||
user.MetadataSetType,
|
||||
user.MetadataRemovedType,
|
||||
user.MetadataRemovedAllType).
|
||||
@@ -73,6 +79,8 @@ func (wm *UserMetadataListWriteModel) AppendEvents(events ...eventstore.Event) {
|
||||
wm.MetadataListWriteModel.AppendEvents(&e.RemovedEvent)
|
||||
case *user.MetadataRemovedAllEvent:
|
||||
wm.MetadataListWriteModel.AppendEvents(&e.RemovedAllEvent)
|
||||
default:
|
||||
wm.MetadataListWriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -88,6 +96,10 @@ func (wm *UserMetadataListWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
AggregateIDs(wm.MetadataListWriteModel.AggregateID).
|
||||
AggregateTypes(user.AggregateType).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserRemovedType,
|
||||
user.MetadataSetType,
|
||||
user.MetadataRemovedType,
|
||||
user.MetadataRemovedAllType).
|
||||
@@ -117,6 +129,8 @@ func (wm *UserMetadataByOrgListWriteModel) AppendEvents(events ...eventstore.Eve
|
||||
wm.WriteModel.AppendEvents(&e.RemovedEvent)
|
||||
case *user.MetadataRemovedAllEvent:
|
||||
wm.WriteModel.AppendEvents(&e.RemovedAllEvent)
|
||||
default:
|
||||
wm.WriteModel.AppendEvents(e)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -136,7 +150,7 @@ func (wm *UserMetadataByOrgListWriteModel) Reduce() error {
|
||||
if val, ok := wm.UserMetadata[e.Aggregate().ID]; ok {
|
||||
delete(val, e.Key)
|
||||
}
|
||||
case *metadata.RemovedAllEvent:
|
||||
case *metadata.RemovedAllEvent, *user.HumanAddedEvent, *user.HumanRegisteredEvent, *user.MachineAddedEvent, *user.UserRemovedEvent:
|
||||
delete(wm.UserMetadata, e.Aggregate().ID)
|
||||
}
|
||||
}
|
||||
@@ -149,6 +163,10 @@ func (wm *UserMetadataByOrgListWriteModel) Query() *eventstore.SearchQueryBuilde
|
||||
AddQuery().
|
||||
AggregateTypes(user.AggregateType).
|
||||
EventTypes(
|
||||
user.HumanAddedType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.UserRemovedType,
|
||||
user.MetadataSetType,
|
||||
user.MetadataRemovedType,
|
||||
user.MetadataRemovedAllType).
|
||||
|
||||
@@ -34,10 +34,12 @@ func (wm *UserWriteModel) Reduce() error {
|
||||
wm.UserName = e.UserName
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.UserType = domain.UserTypeHuman
|
||||
wm.IDPLinks = nil
|
||||
case *user.HumanRegisteredEvent:
|
||||
wm.UserName = e.UserName
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.UserType = domain.UserTypeHuman
|
||||
wm.IDPLinks = nil
|
||||
case *user.HumanInitialCodeAddedEvent:
|
||||
wm.UserState = domain.UserStateInitial
|
||||
case *user.HumanInitializedCheckSucceededEvent:
|
||||
@@ -64,6 +66,7 @@ func (wm *UserWriteModel) Reduce() error {
|
||||
wm.UserName = e.UserName
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.UserType = domain.UserTypeMachine
|
||||
wm.IDPLinks = nil
|
||||
case *user.UsernameChangedEvent:
|
||||
wm.UserName = e.UserName
|
||||
case *user.UserLockedEvent:
|
||||
@@ -83,6 +86,9 @@ func (wm *UserWriteModel) Reduce() error {
|
||||
wm.UserState = domain.UserStateActive
|
||||
}
|
||||
case *user.UserRemovedEvent:
|
||||
wm.UserName = ""
|
||||
wm.IDPLinks = nil
|
||||
wm.UserType = domain.UserTypeUnspecified
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,17 +44,31 @@ func (wm *UserV2InviteWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent:
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.AuthMethodSet = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash) != ""
|
||||
wm.EmptyInviteCode()
|
||||
wm.ApplicationName = ""
|
||||
wm.AuthRequestID = ""
|
||||
wm.URLTemplate = ""
|
||||
wm.CodeReturned = false
|
||||
wm.EmailVerified = false
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.AuthMethodSet = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash) != ""
|
||||
case *user.HumanRegisteredEvent:
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.AuthMethodSet = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash) != ""
|
||||
wm.EmptyInviteCode()
|
||||
wm.ApplicationName = ""
|
||||
wm.AuthRequestID = ""
|
||||
wm.URLTemplate = ""
|
||||
wm.CodeReturned = false
|
||||
wm.EmailVerified = false
|
||||
wm.UserState = domain.UserStateActive
|
||||
wm.AuthMethodSet = crypto.SecretOrEncodedHash(e.Secret, e.EncodedHash) != ""
|
||||
case *user.MachineAddedEvent:
|
||||
wm.EmptyInviteCode()
|
||||
wm.ApplicationName = ""
|
||||
wm.AuthRequestID = ""
|
||||
wm.URLTemplate = ""
|
||||
wm.CodeReturned = false
|
||||
wm.EmailVerified = false
|
||||
wm.AuthMethodSet = false
|
||||
case *user.HumanInviteCodeAddedEvent:
|
||||
wm.SetInviteCode(e.Code, e.Expiry, e.CreationDate())
|
||||
wm.URLTemplate = e.URLTemplate
|
||||
@@ -83,6 +97,13 @@ func (wm *UserV2InviteWriteModel) Reduce() error {
|
||||
case *user.UserReactivatedEvent:
|
||||
wm.UserState = domain.UserStateActive
|
||||
case *user.UserRemovedEvent:
|
||||
wm.EmptyInviteCode()
|
||||
wm.ApplicationName = ""
|
||||
wm.AuthRequestID = ""
|
||||
wm.URLTemplate = ""
|
||||
wm.CodeReturned = false
|
||||
wm.EmailVerified = false
|
||||
wm.AuthMethodSet = false
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
case *user.HumanPasswordChangedEvent:
|
||||
wm.AuthMethodSet = true
|
||||
@@ -118,6 +139,7 @@ func (wm *UserV2InviteWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
user.HumanAddedType,
|
||||
user.UserV1RegisteredType,
|
||||
user.HumanRegisteredType,
|
||||
user.MachineAddedEventType,
|
||||
user.HumanInviteCodeAddedType,
|
||||
user.HumanInviteCheckSucceededType,
|
||||
user.HumanInviteCheckFailedType,
|
||||
|
||||
@@ -218,8 +218,10 @@ func (wm *UserV2WriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *user.HumanAddedEvent:
|
||||
wm.reset()
|
||||
wm.reduceHumanAddedEvent(e)
|
||||
case *user.HumanRegisteredEvent:
|
||||
wm.reset()
|
||||
wm.reduceHumanRegisteredEvent(e)
|
||||
|
||||
case *user.HumanInitialCodeAddedEvent:
|
||||
@@ -248,6 +250,7 @@ func (wm *UserV2WriteModel) Reduce() error {
|
||||
}
|
||||
|
||||
case *user.MachineAddedEvent:
|
||||
wm.reset()
|
||||
wm.UserName = e.UserName
|
||||
wm.Name = e.Name
|
||||
wm.Description = e.Description
|
||||
@@ -301,6 +304,7 @@ func (wm *UserV2WriteModel) Reduce() error {
|
||||
wm.UserState = domain.UserStateActive
|
||||
|
||||
case *user.UserRemovedEvent:
|
||||
wm.reset()
|
||||
wm.UserState = domain.UserStateDeleted
|
||||
|
||||
case *user.HumanPasswordHashUpdatedEvent:
|
||||
@@ -628,3 +632,45 @@ func (wm *UserV2WriteModel) IDPLinkByID(idpID, externalUserID string) (idx int,
|
||||
}
|
||||
return -1, nil
|
||||
}
|
||||
|
||||
func (wm *UserV2WriteModel) reset() {
|
||||
wm.UserName = ""
|
||||
wm.Name = ""
|
||||
wm.Description = ""
|
||||
wm.AccessTokenType = domain.OIDCTokenTypeBearer
|
||||
wm.ClientSecret = nil
|
||||
wm.FirstName = ""
|
||||
wm.LastName = ""
|
||||
wm.NickName = ""
|
||||
wm.DisplayName = ""
|
||||
wm.PreferredLanguage = language.Und
|
||||
wm.Gender = domain.GenderUnspecified
|
||||
wm.Avatar = ""
|
||||
wm.InitCode = nil
|
||||
wm.InitCodeCreationDate = time.Time{}
|
||||
wm.InitCodeExpiry = 0
|
||||
wm.InitCheckFailedCount = 0
|
||||
wm.PasswordEncodedHash = ""
|
||||
wm.PasswordChangeRequired = false
|
||||
wm.PasswordCode = nil
|
||||
wm.PasswordCodeCreationDate = time.Time{}
|
||||
wm.PasswordCodeExpiry = 0
|
||||
wm.PasswordCheckFailedCount = 0
|
||||
wm.PasswordCodeGeneratorID = ""
|
||||
wm.PasswordCodeVerificationID = ""
|
||||
wm.Email = ""
|
||||
wm.IsEmailVerified = false
|
||||
wm.EmailCode = nil
|
||||
wm.EmailCodeCreationDate = time.Time{}
|
||||
wm.EmailCodeExpiry = 0
|
||||
wm.EmailCheckFailedCount = 0
|
||||
wm.Phone = ""
|
||||
wm.IsPhoneVerified = false
|
||||
wm.PhoneCode = nil
|
||||
wm.PhoneCodeCreationDate = time.Time{}
|
||||
wm.PhoneCodeExpiry = 0
|
||||
wm.PhoneCheckFailedCount = 0
|
||||
wm.IDPLinks = nil
|
||||
wm.Metadata = nil
|
||||
wm.CreationDate = time.Time{}
|
||||
}
|
||||
|
||||
@@ -409,14 +409,14 @@ func TestCommandSide_userExistsWriteModel(t *testing.T) {
|
||||
ProcessedSequence: 0,
|
||||
ResourceOwner: "org1",
|
||||
},
|
||||
UserName: "username",
|
||||
FirstName: "firstname",
|
||||
LastName: "lastname",
|
||||
DisplayName: "firstname lastname",
|
||||
PreferredLanguage: language.English,
|
||||
PasswordEncodedHash: "$plain$x$password",
|
||||
PasswordChangeRequired: true,
|
||||
Email: "[email protected]",
|
||||
UserName: "",
|
||||
FirstName: "",
|
||||
LastName: "",
|
||||
DisplayName: "",
|
||||
PreferredLanguage: language.Und,
|
||||
PasswordEncodedHash: "",
|
||||
PasswordChangeRequired: false,
|
||||
Email: "",
|
||||
IsEmailVerified: false,
|
||||
UserState: domain.UserStateDeleted,
|
||||
},
|
||||
@@ -455,9 +455,9 @@ func TestCommandSide_userExistsWriteModel(t *testing.T) {
|
||||
ProcessedSequence: 0,
|
||||
ResourceOwner: "org1",
|
||||
},
|
||||
UserName: "username",
|
||||
Name: "name",
|
||||
Description: "description",
|
||||
UserName: "",
|
||||
Name: "",
|
||||
Description: "",
|
||||
AccessTokenType: domain.OIDCTokenTypeBearer,
|
||||
UserState: domain.UserStateDeleted,
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user