fix: remove legacy events (#10464)

# Which Problems Are Solved Some events that are now unused are clogging the event queue from time to time. # How the Problems Are Solved Remove the events described in #10458 # Additional Changes - Updated `stringer` and `enumer` in Makefile target `core_generate_all` to resolve generated files compilation issues # Notes It looks like there are a lot of changes, but most of it is fixing translation files. I suggest doing a review per-commit # Additional Context - Closes #10458 - Depends on https://github.com/zitadel/zitadel/pull/10513 (cherry picked from commit e8a9cd6964)
2025-12-06 16:02:15 +00:00 · 2025-08-19 15:22:34 +02:00
parent f2651893ea
commit db7096628a
58 changed files with 242 additions and 729 deletions
--- a/internal/repository/feature/feature_v2/eventstore.go
+++ b/internal/repository/feature/feature_v2/eventstore.go
@@ -12,7 +12,6 @@ func init() {
 	eventstore.RegisterFilterEventMapper(AggregateType, SystemTokenExchangeEventType, eventstore.GenericEventMapper[SetEvent[bool]])
 	eventstore.RegisterFilterEventMapper(AggregateType, SystemImprovedPerformanceEventType, eventstore.GenericEventMapper[SetEvent[[]feature.ImprovedPerformanceType]])
 	eventstore.RegisterFilterEventMapper(AggregateType, SystemOIDCSingleV1SessionTerminationEventType, eventstore.GenericEventMapper[SetEvent[bool]])
-	eventstore.RegisterFilterEventMapper(AggregateType, SystemDisableUserTokenEvent, eventstore.GenericEventMapper[SetEvent[bool]])
 	eventstore.RegisterFilterEventMapper(AggregateType, SystemEnableBackChannelLogout, eventstore.GenericEventMapper[SetEvent[bool]])
 	eventstore.RegisterFilterEventMapper(AggregateType, SystemLoginVersion, eventstore.GenericEventMapper[SetEvent[*feature.LoginV2]])
 	eventstore.RegisterFilterEventMapper(AggregateType, SystemPermissionCheckV2, eventstore.GenericEventMapper[SetEvent[bool]])
@@ -24,7 +23,6 @@ func init() {
 	eventstore.RegisterFilterEventMapper(AggregateType, InstanceImprovedPerformanceEventType, eventstore.GenericEventMapper[SetEvent[[]feature.ImprovedPerformanceType]])
 	eventstore.RegisterFilterEventMapper(AggregateType, InstanceDebugOIDCParentErrorEventType, eventstore.GenericEventMapper[SetEvent[bool]])
 	eventstore.RegisterFilterEventMapper(AggregateType, InstanceOIDCSingleV1SessionTerminationEventType, eventstore.GenericEventMapper[SetEvent[bool]])
-	eventstore.RegisterFilterEventMapper(AggregateType, InstanceDisableUserTokenEvent, eventstore.GenericEventMapper[SetEvent[bool]])
 	eventstore.RegisterFilterEventMapper(AggregateType, InstanceEnableBackChannelLogout, eventstore.GenericEventMapper[SetEvent[bool]])
 	eventstore.RegisterFilterEventMapper(AggregateType, InstanceLoginVersion, eventstore.GenericEventMapper[SetEvent[*feature.LoginV2]])
 	eventstore.RegisterFilterEventMapper(AggregateType, InstancePermissionCheckV2, eventstore.GenericEventMapper[SetEvent[bool]])
--- a/internal/repository/feature/feature_v2/feature.go
+++ b/internal/repository/feature/feature_v2/feature.go
@@ -17,7 +17,6 @@ var (
 	SystemTokenExchangeEventType                  = setEventTypeFromFeature(feature.LevelSystem, feature.KeyTokenExchange)
 	SystemImprovedPerformanceEventType            = setEventTypeFromFeature(feature.LevelSystem, feature.KeyImprovedPerformance)
 	SystemOIDCSingleV1SessionTerminationEventType = setEventTypeFromFeature(feature.LevelSystem, feature.KeyOIDCSingleV1SessionTermination)
-	SystemDisableUserTokenEvent                   = setEventTypeFromFeature(feature.LevelSystem, feature.KeyDisableUserTokenEvent)
 	SystemEnableBackChannelLogout                 = setEventTypeFromFeature(feature.LevelSystem, feature.KeyEnableBackChannelLogout)
 	SystemLoginVersion                            = setEventTypeFromFeature(feature.LevelSystem, feature.KeyLoginV2)
 	SystemPermissionCheckV2                       = setEventTypeFromFeature(feature.LevelSystem, feature.KeyPermissionCheckV2)
@@ -29,7 +28,6 @@ var (
 	InstanceImprovedPerformanceEventType            = setEventTypeFromFeature(feature.LevelInstance, feature.KeyImprovedPerformance)
 	InstanceDebugOIDCParentErrorEventType           = setEventTypeFromFeature(feature.LevelInstance, feature.KeyDebugOIDCParentError)
 	InstanceOIDCSingleV1SessionTerminationEventType = setEventTypeFromFeature(feature.LevelInstance, feature.KeyOIDCSingleV1SessionTermination)
-	InstanceDisableUserTokenEvent                   = setEventTypeFromFeature(feature.LevelInstance, feature.KeyDisableUserTokenEvent)
 	InstanceEnableBackChannelLogout                 = setEventTypeFromFeature(feature.LevelInstance, feature.KeyEnableBackChannelLogout)
 	InstanceLoginVersion                            = setEventTypeFromFeature(feature.LevelInstance, feature.KeyLoginV2)
 	InstancePermissionCheckV2                       = setEventTypeFromFeature(feature.LevelInstance, feature.KeyPermissionCheckV2)
--- a/internal/repository/user/eventstore.go
+++ b/internal/repository/user/eventstore.go
@@ -42,7 +42,6 @@ func init() {
 	eventstore.RegisterFilterEventMapper(AggregateType, UserReactivatedType, UserReactivatedEventMapper)
 	eventstore.RegisterFilterEventMapper(AggregateType, UserRemovedType, UserRemovedEventMapper)
 	eventstore.RegisterFilterEventMapper(AggregateType, UserTokenAddedType, UserTokenAddedEventMapper)
-	eventstore.RegisterFilterEventMapper(AggregateType, UserTokenV2AddedType, eventstore.GenericEventMapper[UserTokenV2AddedEvent])
 	eventstore.RegisterFilterEventMapper(AggregateType, UserImpersonatedType, eventstore.GenericEventMapper[UserImpersonatedEvent])
 	eventstore.RegisterFilterEventMapper(AggregateType, UserTokenRemovedType, UserTokenRemovedEventMapper)
 	eventstore.RegisterFilterEventMapper(AggregateType, UserDomainClaimedType, DomainClaimedEventMapper)
@@ -134,8 +133,6 @@ func init() {
 	eventstore.RegisterFilterEventMapper(AggregateType, PersonalAccessTokenRemovedType, PersonalAccessTokenRemovedEventMapper)
 	eventstore.RegisterFilterEventMapper(AggregateType, MachineSecretSetType, MachineSecretSetEventMapper)
 	eventstore.RegisterFilterEventMapper(AggregateType, MachineSecretRemovedType, MachineSecretRemovedEventMapper)
-	eventstore.RegisterFilterEventMapper(AggregateType, MachineSecretCheckSucceededType, MachineSecretCheckSucceededEventMapper)
-	eventstore.RegisterFilterEventMapper(AggregateType, MachineSecretCheckFailedType, MachineSecretCheckFailedEventMapper)
 	eventstore.RegisterFilterEventMapper(AggregateType, MachineSecretHashUpdatedType, eventstore.GenericEventMapper[MachineSecretHashUpdatedEvent])
 	eventstore.RegisterFilterEventMapper(AggregateType, HumanInviteCodeAddedType, eventstore.GenericEventMapper[HumanInviteCodeAddedEvent])
 	eventstore.RegisterFilterEventMapper(AggregateType, HumanInviteCodeSentType, eventstore.GenericEventMapper[HumanInviteCodeSentEvent])
--- a/internal/repository/user/machine_secret.go
+++ b/internal/repository/user/machine_secret.go
@@ -9,12 +9,10 @@ import (
 )

 const (
-	machineSecretPrefix             = machineEventPrefix + "secret."
-	MachineSecretSetType            = machineSecretPrefix + "set"
-	MachineSecretHashUpdatedType    = machineSecretPrefix + "updated"
-	MachineSecretRemovedType        = machineSecretPrefix + "removed"
-	MachineSecretCheckSucceededType = machineSecretPrefix + "check.succeeded"
-	MachineSecretCheckFailedType    = machineSecretPrefix + "check.failed"
+	machineSecretPrefix          = machineEventPrefix + "secret."
+	MachineSecretSetType         = machineSecretPrefix + "set"
+	MachineSecretHashUpdatedType = machineSecretPrefix + "updated"
+	MachineSecretRemovedType     = machineSecretPrefix + "removed"
 )

 type MachineSecretSetEvent struct {
@@ -98,80 +96,6 @@ func MachineSecretRemovedEventMapper(event eventstore.Event) (eventstore.Event,
 	return credentialsRemoved, nil
 }

-type MachineSecretCheckSucceededEvent struct {
-	eventstore.BaseEvent `json:"-"`
-}
-
-func (e *MachineSecretCheckSucceededEvent) Payload() interface{} {
-	return e
-}
-
-func (e *MachineSecretCheckSucceededEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
-	return nil
-}
-
-func NewMachineSecretCheckSucceededEvent(
-	ctx context.Context,
-	aggregate *eventstore.Aggregate,
-) *MachineSecretCheckSucceededEvent {
-	return &MachineSecretCheckSucceededEvent{
-		BaseEvent: *eventstore.NewBaseEventForPush(
-			ctx,
-			aggregate,
-			MachineSecretCheckSucceededType,
-		),
-	}
-}
-
-func MachineSecretCheckSucceededEventMapper(event eventstore.Event) (eventstore.Event, error) {
-	check := &MachineSecretCheckSucceededEvent{
-		BaseEvent: *eventstore.BaseEventFromRepo(event),
-	}
-	err := event.Unmarshal(check)
-	if err != nil {
-		return nil, zerrors.ThrowInternal(err, "USER-x002n1p", "unable to unmarshal machine secret check succeeded")
-	}
-
-	return check, nil
-}
-
-type MachineSecretCheckFailedEvent struct {
-	eventstore.BaseEvent `json:"-"`
-}
-
-func (e *MachineSecretCheckFailedEvent) Payload() interface{} {
-	return e
-}
-
-func (e *MachineSecretCheckFailedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
-	return nil
-}
-
-func NewMachineSecretCheckFailedEvent(
-	ctx context.Context,
-	aggregate *eventstore.Aggregate,
-) *MachineSecretCheckFailedEvent {
-	return &MachineSecretCheckFailedEvent{
-		BaseEvent: *eventstore.NewBaseEventForPush(
-			ctx,
-			aggregate,
-			MachineSecretCheckFailedType,
-		),
-	}
-}
-
-func MachineSecretCheckFailedEventMapper(event eventstore.Event) (eventstore.Event, error) {
-	check := &MachineSecretCheckFailedEvent{
-		BaseEvent: *eventstore.BaseEventFromRepo(event),
-	}
-	err := event.Unmarshal(check)
-	if err != nil {
-		return nil, zerrors.ThrowInternal(err, "USER-x7901b1l", "unable to unmarshal machine secret check failed")
-	}
-
-	return check, nil
-}
-
 type MachineSecretHashUpdatedEvent struct {
 	*eventstore.BaseEvent `json:"-"`
 	HashedSecret          string `json:"hashedSecret,omitempty"`
--- a/internal/repository/user/user.go
+++ b/internal/repository/user/user.go
@@ -19,7 +19,6 @@ const (
 	UserReactivatedType       = userEventTypePrefix + "reactivated"
 	UserRemovedType           = userEventTypePrefix + "removed"
 	UserTokenAddedType        = userEventTypePrefix + "token.added"
-	UserTokenV2AddedType      = userEventTypePrefix + "token.v2.added"
 	UserTokenRemovedType      = userEventTypePrefix + "token.removed"
 	UserImpersonatedType      = userEventTypePrefix + "impersonated"
 	UserDomainClaimedType     = userEventTypePrefix + "domain.claimed"
@@ -280,39 +279,6 @@ func UserTokenAddedEventMapper(event eventstore.Event) (eventstore.Event, error)
 	return tokenAdded, nil
 }

-type UserTokenV2AddedEvent struct {
-	*eventstore.BaseEvent `json:"-"`
-
-	TokenID string `json:"tokenId,omitempty"`
-}
-
-func (e *UserTokenV2AddedEvent) Payload() interface{} {
-	return e
-}
-
-func (e *UserTokenV2AddedEvent) SetBaseEvent(b *eventstore.BaseEvent) {
-	e.BaseEvent = b
-}
-
-func (e *UserTokenV2AddedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
-	return nil
-}
-
-func NewUserTokenV2AddedEvent(
-	ctx context.Context,
-	aggregate *eventstore.Aggregate,
-	tokenID string,
-) *UserTokenV2AddedEvent {
-	return &UserTokenV2AddedEvent{
-		BaseEvent: eventstore.NewBaseEventForPush(
-			ctx,
-			aggregate,
-			UserTokenV2AddedType,
-		),
-		TokenID: tokenID,
-	}
-}
-
 type UserImpersonatedEvent struct {
 	eventstore.BaseEvent `json:"-"`