mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 03:24:26 +00:00
dfcc26de1e
* fix: assign instance ID to aggregate ID when converting from v1 to v2 feature This change fixes a mismatch between v1 and v2 aggregate IDs for instance feature events. The old v1 used a random aggregate ID, while v2 uses the instance ID as aggregate ID. The adapter was not correctly mapping, which resulted in the projections.instance_features table being filled with wrong instance IDs. Closes #7501 * fix unit test
109 lines
2.9 KiB
Go
109 lines
2.9 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/feature"
|
|
feature_v1 "github.com/zitadel/zitadel/internal/repository/feature"
|
|
"github.com/zitadel/zitadel/internal/repository/feature/feature_v2"
|
|
)
|
|
|
|
type InstanceFeaturesReadModel struct {
|
|
*eventstore.ReadModel
|
|
system *SystemFeatures
|
|
instance *InstanceFeatures
|
|
}
|
|
|
|
func NewInstanceFeaturesReadModel(ctx context.Context, system *SystemFeatures) *InstanceFeaturesReadModel {
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
m := &InstanceFeaturesReadModel{
|
|
ReadModel: &eventstore.ReadModel{
|
|
AggregateID: instanceID,
|
|
ResourceOwner: instanceID,
|
|
},
|
|
instance: new(InstanceFeatures),
|
|
system: system,
|
|
}
|
|
m.populateFromSystem()
|
|
return m
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) Reduce() (err error) {
|
|
for _, event := range m.Events {
|
|
switch e := event.(type) {
|
|
case *feature_v2.ResetEvent:
|
|
m.reduceReset()
|
|
case *feature_v1.SetEvent[feature_v1.Boolean]:
|
|
err = m.reduceBoolFeature(
|
|
feature_v1.DefaultLoginInstanceEventToV2(e),
|
|
)
|
|
case *feature_v2.SetEvent[bool]:
|
|
err = m.reduceBoolFeature(e)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return m.ReadModel.Reduce()
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) Query() *eventstore.SearchQueryBuilder {
|
|
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent).
|
|
AwaitOpenTransactions().
|
|
AddQuery().
|
|
AggregateTypes(feature_v2.AggregateType).
|
|
EventTypes(
|
|
feature_v1.DefaultLoginInstanceEventType,
|
|
feature_v2.InstanceResetEventType,
|
|
feature_v2.InstanceLoginDefaultOrgEventType,
|
|
feature_v2.InstanceTriggerIntrospectionProjectionsEventType,
|
|
feature_v2.InstanceLegacyIntrospectionEventType,
|
|
).
|
|
Builder().ResourceOwner(m.ResourceOwner)
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) reduceReset() {
|
|
if m.populateFromSystem() {
|
|
return
|
|
}
|
|
m.instance.LoginDefaultOrg = FeatureSource[bool]{}
|
|
m.instance.TriggerIntrospectionProjections = FeatureSource[bool]{}
|
|
m.instance.LegacyIntrospection = FeatureSource[bool]{}
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) populateFromSystem() bool {
|
|
if m.system == nil {
|
|
return false
|
|
}
|
|
m.instance.LoginDefaultOrg = m.system.LoginDefaultOrg
|
|
m.instance.TriggerIntrospectionProjections = m.system.TriggerIntrospectionProjections
|
|
m.instance.LegacyIntrospection = m.system.LegacyIntrospection
|
|
return true
|
|
}
|
|
|
|
func (m *InstanceFeaturesReadModel) reduceBoolFeature(event *feature_v2.SetEvent[bool]) error {
|
|
level, key, err := event.FeatureInfo()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
var dst *FeatureSource[bool]
|
|
|
|
switch key {
|
|
case feature.KeyUnspecified:
|
|
return nil
|
|
case feature.KeyLoginDefaultOrg:
|
|
dst = &m.instance.LoginDefaultOrg
|
|
case feature.KeyTriggerIntrospectionProjections:
|
|
dst = &m.instance.TriggerIntrospectionProjections
|
|
case feature.KeyLegacyIntrospection:
|
|
dst = &m.instance.LegacyIntrospection
|
|
}
|
|
*dst = FeatureSource[bool]{
|
|
Level: level,
|
|
Value: event.Value,
|
|
}
|
|
return nil
|
|
}
|