New eventstore policies (#1084)

* feat: login policy

* feat: password complexity policy

* feat: org iam policy

* feat: label policy

* feat: add and change policies

* feat: second factors

* feat: second and multi factors

* feat: better naming

* feat: better naming

internal/v2/repository/org/policy_label.go

@@ -2,45 +2,45 @@ package org
 
 import (
 	"github.com/caos/zitadel/internal/eventstore/v2"
-	"github.com/caos/zitadel/internal/v2/repository/policy"
+	"github.com/caos/zitadel/internal/v2/repository/policy/label"
 )
 
 var (
-	LabelPolicyAddedEventType   = orgEventTypePrefix + policy.LabelPolicyAddedEventType
-	LabelPolicyChangedEventType = orgEventTypePrefix + policy.LabelPolicyChangedEventType
+	LabelPolicyAddedEventType   = orgEventTypePrefix + label.LabelPolicyAddedEventType
+	LabelPolicyChangedEventType = orgEventTypePrefix + label.LabelPolicyChangedEventType
 )
 
-type LabelPolicyReadModel struct{ policy.LabelPolicyReadModel }
+type LabelPolicyReadModel struct{ label.ReadModel }
 
 func (rm *LabelPolicyReadModel) AppendEvents(events ...eventstore.EventReader) {
 	for _, event := range events {
 		switch e := event.(type) {
 		case *LabelPolicyAddedEvent:
-			rm.ReadModel.AppendEvents(&e.LabelPolicyAddedEvent)
+			rm.ReadModel.AppendEvents(&e.AddedEvent)
 		case *LabelPolicyChangedEvent:
-			rm.ReadModel.AppendEvents(&e.LabelPolicyChangedEvent)
-		case *policy.LabelPolicyAddedEvent, *policy.LabelPolicyChangedEvent:
+			rm.ReadModel.AppendEvents(&e.ChangedEvent)
+		case *label.AddedEvent, *label.ChangedEvent:
 			rm.ReadModel.AppendEvents(e)
 		}
 	}
 }
 
 type LabelPolicyAddedEvent struct {
-	policy.LabelPolicyAddedEvent
+	label.AddedEvent
 }
 
 type LabelPolicyChangedEvent struct {
-	policy.LabelPolicyChangedEvent
+	label.ChangedEvent
 }
 
-// func NewLabelPolicyAddedEvent(
+// func NewAddedEvent(
 // 	ctx context.Context,
 // 	primaryColor,
 // 	secondaryColor string,
-// ) *LabelPolicyAddedEvent {
+// ) *AddedEvent {
 
-// 	return &LabelPolicyAddedEvent{
-// 		LabelPolicyAddedEvent: *policy.NewLabelPolicyAddedEvent(
+// 	return &AddedEvent{
+// 		AddedEvent: *policy.NewAddedEvent(
 // 			ctx,
 // 			primaryColor,
 // 			secondaryColor,
@@ -48,14 +48,14 @@ type LabelPolicyChangedEvent struct {
 // 	}
 // }
 
-// func NewLabelPolicyChangedEvent(
+// func NewChangedEvent(
 // 	ctx context.Context,
 // 	primaryColor,
 // 	secondaryColor string,
 // ) *MemberChangedEvent {
 
-// 	return &LabelPolicyChangedEvent{
-// 		LabelPolicyChangedEvent: *policy.NewLabelPolicyChangedEvent(
+// 	return &ChangedEvent{
+// 		ChangedEvent: *policy.NewChangedEvent(
 // 			ctx,
 // 			primaryColor,
 // 			secondaryColor,

internal/v2/repository/org/policy_login.go

@@ -2,33 +2,33 @@ package org
 
 import (
 	"github.com/caos/zitadel/internal/eventstore/v2"
-	"github.com/caos/zitadel/internal/v2/repository/policy"
+	"github.com/caos/zitadel/internal/v2/repository/policy/login"
 )
 
 var (
-	LoginPolicyAddedEventType   = orgEventTypePrefix + policy.LoginPolicyAddedEventType
-	LoginPolicyChangedEventType = orgEventTypePrefix + policy.LoginPolicyChangedEventType
+	LoginPolicyAddedEventType   = orgEventTypePrefix + login.LoginPolicyAddedEventType
+	LoginPolicyChangedEventType = orgEventTypePrefix + login.LoginPolicyChangedEventType
 )
 
-type LoginPolicyReadModel struct{ policy.LoginPolicyReadModel }
+type LoginPolicyReadModel struct{ login.ReadModel }
 
 func (rm *LoginPolicyReadModel) AppendEvents(events ...eventstore.EventReader) {
 	for _, event := range events {
 		switch e := event.(type) {
 		case *LoginPolicyAddedEvent:
-			rm.ReadModel.AppendEvents(&e.LoginPolicyAddedEvent)
+			rm.ReadModel.AppendEvents(&e.AddedEvent)
 		case *LoginPolicyChangedEvent:
-			rm.ReadModel.AppendEvents(&e.LoginPolicyChangedEvent)
-		case *policy.LoginPolicyAddedEvent, *policy.LoginPolicyChangedEvent:
+			rm.ReadModel.AppendEvents(&e.ChangedEvent)
+		case *login.AddedEvent, *login.ChangedEvent:
 			rm.ReadModel.AppendEvents(e)
 		}
 	}
 }
 
 type LoginPolicyAddedEvent struct {
-	policy.LoginPolicyAddedEvent
+	login.AddedEvent
 }
 
 type LoginPolicyChangedEvent struct {
-	policy.LoginPolicyChangedEvent
+	login.ChangedEvent
 }

internal/v2/repository/org/policy_org_iam.go

@@ -2,26 +2,26 @@ package org
 
 import (
 	"github.com/caos/zitadel/internal/eventstore/v2"
-	"github.com/caos/zitadel/internal/v2/repository/policy"
+	"github.com/caos/zitadel/internal/v2/repository/policy/org_iam"
 )
 
 var (
-	OrgIAMPolicyAddedEventType = orgEventTypePrefix + policy.OrgIAMPolicyAddedEventType
+	OrgIAMPolicyAddedEventType = orgEventTypePrefix + org_iam.OrgIAMPolicyAddedEventType
 )
 
-type OrgIAMPolicyReadModel struct{ policy.OrgIAMPolicyReadModel }
+type OrgIAMPolicyReadModel struct{ org_iam.ReadModel }
 
 func (rm *OrgIAMPolicyReadModel) AppendEvents(events ...eventstore.EventReader) {
 	for _, event := range events {
 		switch e := event.(type) {
 		case *OrgIAMPolicyAddedEvent:
-			rm.ReadModel.AppendEvents(&e.OrgIAMPolicyAddedEvent)
-		case *policy.OrgIAMPolicyAddedEvent:
+			rm.ReadModel.AppendEvents(&e.AddedEvent)
+		case *org_iam.AddedEvent:
 			rm.ReadModel.AppendEvents(e)
 		}
 	}
 }
 
 type OrgIAMPolicyAddedEvent struct {
-	policy.OrgIAMPolicyAddedEvent
+	org_iam.AddedEvent
 }

internal/v2/repository/org/policy_password_age.go

@@ -2,35 +2,35 @@ package org
 
 import (
 	"github.com/caos/zitadel/internal/eventstore/v2"
-	"github.com/caos/zitadel/internal/v2/repository/policy"
+	"github.com/caos/zitadel/internal/v2/repository/policy/password_age"
 )
 
 var (
-	PasswordAgePolicyAddedEventType   = orgEventTypePrefix + policy.PasswordAgePolicyAddedEventType
-	PasswordAgePolicyChangedEventType = orgEventTypePrefix + policy.PasswordAgePolicyChangedEventType
+	PasswordAgePolicyAddedEventType   = orgEventTypePrefix + password_age.PasswordAgePolicyAddedEventType
+	PasswordAgePolicyChangedEventType = orgEventTypePrefix + password_age.PasswordAgePolicyChangedEventType
 )
 
 type PasswordAgePolicyReadModel struct {
-	policy.PasswordAgePolicyReadModel
+	password_age.ReadModel
 }
 
 func (rm *PasswordAgePolicyReadModel) AppendEvents(events ...eventstore.EventReader) {
 	for _, event := range events {
 		switch e := event.(type) {
 		case *PasswordAgePolicyAddedEvent:
-			rm.ReadModel.AppendEvents(&e.PasswordAgePolicyAddedEvent)
+			rm.ReadModel.AppendEvents(&e.AddedEvent)
 		case *PasswordAgePolicyChangedEvent:
-			rm.ReadModel.AppendEvents(&e.PasswordAgePolicyChangedEvent)
-		case *policy.PasswordAgePolicyAddedEvent, *policy.PasswordAgePolicyChangedEvent:
+			rm.ReadModel.AppendEvents(&e.ChangedEvent)
+		case *password_age.AddedEvent, *password_age.ChangedEvent:
 			rm.ReadModel.AppendEvents(e)
 		}
 	}
 }
 
 type PasswordAgePolicyAddedEvent struct {
-	policy.PasswordAgePolicyAddedEvent
+	password_age.AddedEvent
 }
 
 type PasswordAgePolicyChangedEvent struct {
-	policy.PasswordAgePolicyChangedEvent
+	password_age.ChangedEvent
 }

internal/v2/repository/org/policy_password_complexity.go

@@ -2,35 +2,35 @@ package org
 
 import (
 	"github.com/caos/zitadel/internal/eventstore/v2"
-	"github.com/caos/zitadel/internal/v2/repository/policy"
+	"github.com/caos/zitadel/internal/v2/repository/policy/password_complexity"
 )
 
 var (
-	PasswordComplexityPolicyAddedEventType   = orgEventTypePrefix + policy.PasswordComplexityPolicyAddedEventType
-	PasswordComplexityPolicyChangedEventType = orgEventTypePrefix + policy.PasswordComplexityPolicyChangedEventType
+	PasswordComplexityPolicyAddedEventType   = orgEventTypePrefix + password_complexity.PasswordComplexityPolicyAddedEventType
+	PasswordComplexityPolicyChangedEventType = orgEventTypePrefix + password_complexity.PasswordComplexityPolicyChangedEventType
 )
 
 type PasswordComplexityPolicyReadModel struct {
-	policy.PasswordComplexityPolicyReadModel
+	password_complexity.ReadModel
 }
 
 func (rm *PasswordComplexityPolicyReadModel) AppendEvents(events ...eventstore.EventReader) {
 	for _, event := range events {
 		switch e := event.(type) {
 		case *PasswordComplexityPolicyAddedEvent:
-			rm.ReadModel.AppendEvents(&e.PasswordComplexityPolicyAddedEvent)
+			rm.ReadModel.AppendEvents(&e.AddedEvent)
 		case *PasswordComplexityPolicyChangedEvent:
-			rm.ReadModel.AppendEvents(&e.PasswordComplexityPolicyChangedEvent)
-		case *policy.PasswordComplexityPolicyAddedEvent, *policy.PasswordComplexityPolicyChangedEvent:
+			rm.ReadModel.AppendEvents(&e.ChangedEvent)
+		case *password_complexity.AddedEvent, *password_complexity.ChangedEvent:
 			rm.ReadModel.AppendEvents(e)
 		}
 	}
 }
 
 type PasswordComplexityPolicyAddedEvent struct {
-	policy.PasswordComplexityPolicyAddedEvent
+	password_complexity.AddedEvent
 }
 
 type PasswordComplexityPolicyChangedEvent struct {
-	policy.PasswordComplexityPolicyChangedEvent
+	password_complexity.ChangedEvent
 }

internal/v2/repository/org/policy_password_lockout.go

@@ -2,35 +2,35 @@ package org
 
 import (
 	"github.com/caos/zitadel/internal/eventstore/v2"
-	"github.com/caos/zitadel/internal/v2/repository/policy"
+	"github.com/caos/zitadel/internal/v2/repository/policy/password_lockout"
 )
 
 var (
-	PasswordLockoutPolicyAddedEventType   = orgEventTypePrefix + policy.PasswordLockoutPolicyAddedEventType
-	PasswordLockoutPolicyChangedEventType = orgEventTypePrefix + policy.PasswordLockoutPolicyChangedEventType
+	PasswordLockoutPolicyAddedEventType   = orgEventTypePrefix + password_lockout.PasswordLockoutPolicyAddedEventType
+	PasswordLockoutPolicyChangedEventType = orgEventTypePrefix + password_lockout.PasswordLockoutPolicyChangedEventType
 )
 
 type PasswordLockoutPolicyReadModel struct {
-	policy.PasswordLockoutPolicyReadModel
+	password_lockout.ReadModel
 }
 
 func (rm *PasswordLockoutPolicyReadModel) AppendEvents(events ...eventstore.EventReader) {
 	for _, event := range events {
 		switch e := event.(type) {
 		case *PasswordLockoutPolicyAddedEvent:
-			rm.ReadModel.AppendEvents(&e.PasswordLockoutPolicyAddedEvent)
+			rm.ReadModel.AppendEvents(&e.AddedEvent)
 		case *PasswordLockoutPolicyChangedEvent:
-			rm.ReadModel.AppendEvents(&e.PasswordLockoutPolicyChangedEvent)
-		case *policy.PasswordLockoutPolicyAddedEvent, *policy.PasswordLockoutPolicyChangedEvent:
+			rm.ReadModel.AppendEvents(&e.ChangedEvent)
+		case *password_lockout.AddedEvent, *password_lockout.ChangedEvent:
 			rm.ReadModel.AppendEvents(e)
 		}
 	}
 }
 
 type PasswordLockoutPolicyAddedEvent struct {
-	policy.PasswordLockoutPolicyAddedEvent
+	password_lockout.AddedEvent
 }
 
 type PasswordLockoutPolicyChangedEvent struct {
-	policy.PasswordLockoutPolicyChangedEvent
+	password_lockout.ChangedEvent
 }