mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 11:04:25 +00:00
fix: check if org exists when setting features (#1813)
* fix: check if org exists when setting features * fix tests
This commit is contained in:
parent
73d37459bb
commit
9ffc9d9330
@ -13,8 +13,12 @@ func (c *Commands) SetOrgFeatures(ctx context.Context, resourceOwner string, fea
|
|||||||
if resourceOwner == "" {
|
if resourceOwner == "" {
|
||||||
return nil, caos_errs.ThrowInvalidArgument(nil, "Features-G5tg", "Errors.ResourceOwnerMissing")
|
return nil, caos_errs.ThrowInvalidArgument(nil, "Features-G5tg", "Errors.ResourceOwnerMissing")
|
||||||
}
|
}
|
||||||
|
err := c.checkOrgExists(ctx, resourceOwner)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
existingFeatures := NewOrgFeaturesWriteModel(resourceOwner)
|
existingFeatures := NewOrgFeaturesWriteModel(resourceOwner)
|
||||||
err := c.eventstore.FilterToQueryReducer(ctx, existingFeatures)
|
err = c.eventstore.FilterToQueryReducer(ctx, existingFeatures)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -104,11 +104,51 @@ func TestCommandSide_SetOrgFeatures(t *testing.T) {
|
|||||||
err: caos_errs.IsPreconditionFailed,
|
err: caos_errs.IsPreconditionFailed,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "org does not exist, error",
|
||||||
|
fields: fields{
|
||||||
|
eventstore: eventstoreExpect(
|
||||||
|
t,
|
||||||
|
expectFilter(),
|
||||||
|
),
|
||||||
|
},
|
||||||
|
args: args{
|
||||||
|
ctx: context.Background(),
|
||||||
|
resourceOwner: "org1",
|
||||||
|
features: &domain.Features{
|
||||||
|
TierName: "Test",
|
||||||
|
State: domain.FeaturesStateActive,
|
||||||
|
AuditLogRetention: time.Hour,
|
||||||
|
LoginPolicyFactors: false,
|
||||||
|
LoginPolicyIDP: false,
|
||||||
|
LoginPolicyPasswordless: false,
|
||||||
|
LoginPolicyRegistration: false,
|
||||||
|
LoginPolicyUsernameLogin: false,
|
||||||
|
LoginPolicyPasswordReset: false,
|
||||||
|
PasswordComplexityPolicy: false,
|
||||||
|
LabelPolicyPrivateLabel: false,
|
||||||
|
LabelPolicyWatermark: false,
|
||||||
|
CustomDomain: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
res: res{
|
||||||
|
err: caos_errs.IsPreconditionFailed,
|
||||||
|
},
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "set with default policies, ok",
|
name: "set with default policies, ok",
|
||||||
fields: fields{
|
fields: fields{
|
||||||
eventstore: eventstoreExpect(
|
eventstore: eventstoreExpect(
|
||||||
t,
|
t,
|
||||||
|
expectFilter(
|
||||||
|
eventFromEventPusher(
|
||||||
|
org.NewOrgAddedEvent(
|
||||||
|
context.Background(),
|
||||||
|
&org.NewAggregate("org1", "org1").Aggregate,
|
||||||
|
"org1",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
expectFilter(),
|
expectFilter(),
|
||||||
expectFilter(
|
expectFilter(
|
||||||
eventFromEventPusher(
|
eventFromEventPusher(
|
||||||
@ -226,6 +266,15 @@ func TestCommandSide_SetOrgFeatures(t *testing.T) {
|
|||||||
fields: fields{
|
fields: fields{
|
||||||
eventstore: eventstoreExpect(
|
eventstore: eventstoreExpect(
|
||||||
t,
|
t,
|
||||||
|
expectFilter(
|
||||||
|
eventFromEventPusher(
|
||||||
|
org.NewOrgAddedEvent(
|
||||||
|
context.Background(),
|
||||||
|
&org.NewAggregate("org1", "org1").Aggregate,
|
||||||
|
"org1",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
expectFilter(),
|
expectFilter(),
|
||||||
expectFilter(
|
expectFilter(
|
||||||
eventFromEventPusher(
|
eventFromEventPusher(
|
||||||
@ -371,6 +420,15 @@ func TestCommandSide_SetOrgFeatures(t *testing.T) {
|
|||||||
fields: fields{
|
fields: fields{
|
||||||
eventstore: eventstoreExpect(
|
eventstore: eventstoreExpect(
|
||||||
t,
|
t,
|
||||||
|
expectFilter(
|
||||||
|
eventFromEventPusher(
|
||||||
|
org.NewOrgAddedEvent(
|
||||||
|
context.Background(),
|
||||||
|
&org.NewAggregate("org1", "org1").Aggregate,
|
||||||
|
"org1",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
expectFilter(),
|
expectFilter(),
|
||||||
expectFilter(
|
expectFilter(
|
||||||
eventFromEventPusher(
|
eventFromEventPusher(
|
||||||
@ -526,6 +584,15 @@ func TestCommandSide_SetOrgFeatures(t *testing.T) {
|
|||||||
fields: fields{
|
fields: fields{
|
||||||
eventstore: eventstoreExpect(
|
eventstore: eventstoreExpect(
|
||||||
t,
|
t,
|
||||||
|
expectFilter(
|
||||||
|
eventFromEventPusher(
|
||||||
|
org.NewOrgAddedEvent(
|
||||||
|
context.Background(),
|
||||||
|
&org.NewAggregate("org1", "org1").Aggregate,
|
||||||
|
"org1",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
expectFilter(),
|
expectFilter(),
|
||||||
expectFilter(
|
expectFilter(
|
||||||
eventFromEventPusher(
|
eventFromEventPusher(
|
||||||
@ -691,6 +758,16 @@ func TestCommandSide_SetOrgFeatures(t *testing.T) {
|
|||||||
fields: fields{
|
fields: fields{
|
||||||
eventstore: eventstoreExpect(
|
eventstore: eventstoreExpect(
|
||||||
t,
|
t,
|
||||||
|
//checkOrgExists
|
||||||
|
expectFilter(
|
||||||
|
eventFromEventPusher(
|
||||||
|
org.NewOrgAddedEvent(
|
||||||
|
context.Background(),
|
||||||
|
&org.NewAggregate("org1", "org1").Aggregate,
|
||||||
|
"org1",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
//NewOrgFeaturesWriteModel
|
//NewOrgFeaturesWriteModel
|
||||||
expectFilter(),
|
expectFilter(),
|
||||||
//begin ensureOrgSettingsToFeatures
|
//begin ensureOrgSettingsToFeatures
|
||||||
|
Loading…
Reference in New Issue
Block a user