mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-20 20:08:46 +00:00
fix: handle org features downgrades (#1578)
* features * features * features * fix json tags * add features handler to auth * mocks for tests * add setup step * fixes * add featurelist to auth api * fx proto merge * remove policies * factors * handle auth factors * test org features * cleanup
This commit is contained in:
@@ -3,6 +3,7 @@ package command
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
"github.com/caos/zitadel/internal/repository/org"
|
||||
)
|
||||
|
||||
@@ -93,3 +94,99 @@ func (wm *OrgMultiFactorWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
org.LoginPolicyMultiFactorAddedEventType,
|
||||
org.LoginPolicyMultiFactorRemovedEventType)
|
||||
}
|
||||
|
||||
func NewOrgAuthFactorsAllowedWriteModel(orgID string) *OrgAuthFactorsAllowedWriteModel {
|
||||
return &OrgAuthFactorsAllowedWriteModel{
|
||||
WriteModel: eventstore.WriteModel{
|
||||
AggregateID: orgID,
|
||||
ResourceOwner: orgID,
|
||||
},
|
||||
SecondFactors: map[domain.SecondFactorType]*factorState{},
|
||||
MultiFactors: map[domain.MultiFactorType]*factorState{},
|
||||
}
|
||||
}
|
||||
|
||||
type OrgAuthFactorsAllowedWriteModel struct {
|
||||
eventstore.WriteModel
|
||||
SecondFactors map[domain.SecondFactorType]*factorState
|
||||
MultiFactors map[domain.MultiFactorType]*factorState
|
||||
}
|
||||
|
||||
type factorState struct {
|
||||
IAM domain.FactorState
|
||||
Org domain.FactorState
|
||||
}
|
||||
|
||||
func (wm *OrgAuthFactorsAllowedWriteModel) Reduce() error {
|
||||
for _, event := range wm.Events {
|
||||
switch e := event.(type) {
|
||||
case *iam.LoginPolicySecondFactorAddedEvent:
|
||||
wm.ensureSecondFactor(e.MFAType)
|
||||
wm.SecondFactors[e.MFAType].IAM = domain.FactorStateActive
|
||||
case *iam.LoginPolicySecondFactorRemovedEvent:
|
||||
wm.ensureSecondFactor(e.MFAType)
|
||||
wm.SecondFactors[e.MFAType].IAM = domain.FactorStateRemoved
|
||||
case *org.LoginPolicySecondFactorAddedEvent:
|
||||
wm.ensureSecondFactor(e.MFAType)
|
||||
wm.SecondFactors[e.MFAType].Org = domain.FactorStateActive
|
||||
case *org.LoginPolicySecondFactorRemovedEvent:
|
||||
wm.ensureSecondFactor(e.MFAType)
|
||||
wm.SecondFactors[e.MFAType].Org = domain.FactorStateRemoved
|
||||
case *iam.LoginPolicyMultiFactorAddedEvent:
|
||||
wm.ensureMultiFactor(e.MFAType)
|
||||
wm.MultiFactors[e.MFAType].IAM = domain.FactorStateActive
|
||||
case *iam.LoginPolicyMultiFactorRemovedEvent:
|
||||
wm.ensureMultiFactor(e.MFAType)
|
||||
wm.MultiFactors[e.MFAType].IAM = domain.FactorStateRemoved
|
||||
case *org.LoginPolicyMultiFactorAddedEvent:
|
||||
wm.ensureMultiFactor(e.MFAType)
|
||||
wm.MultiFactors[e.MFAType].Org = domain.FactorStateActive
|
||||
case *org.LoginPolicyMultiFactorRemovedEvent:
|
||||
wm.ensureMultiFactor(e.MFAType)
|
||||
wm.MultiFactors[e.MFAType].Org = domain.FactorStateRemoved
|
||||
}
|
||||
}
|
||||
return wm.WriteModel.Reduce()
|
||||
}
|
||||
|
||||
func (wm *OrgAuthFactorsAllowedWriteModel) ensureSecondFactor(secondFactor domain.SecondFactorType) {
|
||||
_, ok := wm.SecondFactors[secondFactor]
|
||||
if !ok {
|
||||
wm.SecondFactors[secondFactor] = &factorState{}
|
||||
}
|
||||
}
|
||||
|
||||
func (wm *OrgAuthFactorsAllowedWriteModel) ensureMultiFactor(multiFactor domain.MultiFactorType) {
|
||||
_, ok := wm.MultiFactors[multiFactor]
|
||||
if !ok {
|
||||
wm.MultiFactors[multiFactor] = &factorState{}
|
||||
}
|
||||
}
|
||||
|
||||
func (wm *OrgAuthFactorsAllowedWriteModel) Query() *eventstore.SearchQueryBuilder {
|
||||
return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType, org.AggregateType).
|
||||
AggregateIDs(domain.IAMID, wm.WriteModel.AggregateID).
|
||||
EventTypes(
|
||||
iam.LoginPolicySecondFactorAddedEventType,
|
||||
iam.LoginPolicySecondFactorRemovedEventType,
|
||||
iam.LoginPolicyMultiFactorAddedEventType,
|
||||
iam.LoginPolicyMultiFactorRemovedEventType,
|
||||
org.LoginPolicySecondFactorAddedEventType,
|
||||
org.LoginPolicySecondFactorRemovedEventType,
|
||||
org.LoginPolicyMultiFactorAddedEventType,
|
||||
org.LoginPolicyMultiFactorRemovedEventType)
|
||||
}
|
||||
|
||||
func (wm *OrgAuthFactorsAllowedWriteModel) ToSecondFactorWriteModel(factor domain.SecondFactorType) *OrgSecondFactorWriteModel {
|
||||
orgSecondFactorWriteModel := NewOrgSecondFactorWriteModel(wm.AggregateID, factor)
|
||||
orgSecondFactorWriteModel.ProcessedSequence = wm.ProcessedSequence
|
||||
orgSecondFactorWriteModel.State = wm.SecondFactors[factor].Org
|
||||
return orgSecondFactorWriteModel
|
||||
}
|
||||
|
||||
func (wm *OrgAuthFactorsAllowedWriteModel) ToMultiFactorWriteModel(factor domain.MultiFactorType) *OrgMultiFactorWriteModel {
|
||||
orgMultiFactorWriteModel := NewOrgMultiFactorWriteModel(wm.AggregateID, factor)
|
||||
orgMultiFactorWriteModel.ProcessedSequence = wm.ProcessedSequence
|
||||
orgMultiFactorWriteModel.State = wm.MultiFactors[factor].Org
|
||||
return orgMultiFactorWriteModel
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user