mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 03:57:32 +00:00
feat: permit all features to every instance and organisation (#3566)
This commit is contained in:
Livio Amstutz
@@ -87,7 +87,7 @@ func (q *Queries) changes(ctx context.Context, query func(query *eventstore.Sear
|
||||
}
|
||||
changes := make([]*Change, 0, len(events))
|
||||
for _, event := range events {
|
||||
if event.CreationDate().Before(time.Now().Add(-auditLogRetention)) {
|
||||
if auditLogRetention != 0 && event.CreationDate().Before(time.Now().Add(-auditLogRetention)) {
|
||||
continue
|
||||
}
|
||||
change := &Change{
|
||||
|
||||
@@ -1,327 +0,0 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
errs "errors"
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/api/authz"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/errors"
|
||||
"github.com/zitadel/zitadel/internal/query/projection"
|
||||
)
|
||||
|
||||
type Features struct {
|
||||
AggregateID string
|
||||
ChangeDate time.Time
|
||||
Sequence uint64
|
||||
IsDefault bool
|
||||
TierName string
|
||||
TierDescription string
|
||||
State domain.FeaturesState
|
||||
StateDescription string
|
||||
AuditLogRetention time.Duration
|
||||
LoginPolicyFactors bool
|
||||
LoginPolicyIDP bool
|
||||
LoginPolicyPasswordless bool
|
||||
LoginPolicyRegistration bool
|
||||
LoginPolicyUsernameLogin bool
|
||||
LoginPolicyPasswordReset bool
|
||||
PasswordComplexityPolicy bool
|
||||
LabelPolicyPrivateLabel bool
|
||||
LabelPolicyWatermark bool
|
||||
CustomDomain bool
|
||||
PrivacyPolicy bool
|
||||
MetadataUser bool
|
||||
CustomTextMessage bool
|
||||
CustomTextLogin bool
|
||||
LockoutPolicy bool
|
||||
ActionsAllowed domain.ActionsAllowed
|
||||
MaxActions int32
|
||||
}
|
||||
|
||||
var (
|
||||
featureTable = table{
|
||||
name: projection.FeatureTable,
|
||||
}
|
||||
FeatureColumnAggregateID = Column{
|
||||
name: projection.FeatureAggregateIDCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureColumnInstanceID = Column{
|
||||
name: projection.FeatureInstanceIDCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureColumnChangeDate = Column{
|
||||
name: projection.FeatureChangeDateCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureColumnSequence = Column{
|
||||
name: projection.FeatureSequenceCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureColumnIsDefault = Column{
|
||||
name: projection.FeatureIsDefaultCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureTierName = Column{
|
||||
name: projection.FeatureTierNameCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureTierDescription = Column{
|
||||
name: projection.FeatureTierDescriptionCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureState = Column{
|
||||
name: projection.FeatureStateCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureStateDescription = Column{
|
||||
name: projection.FeatureStateDescriptionCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureAuditLogRetention = Column{
|
||||
name: projection.FeatureAuditLogRetentionCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLoginPolicyFactors = Column{
|
||||
name: projection.FeatureLoginPolicyFactorsCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLoginPolicyIDP = Column{
|
||||
name: projection.FeatureLoginPolicyIDPCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLoginPolicyPasswordless = Column{
|
||||
name: projection.FeatureLoginPolicyPasswordlessCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLoginPolicyRegistration = Column{
|
||||
name: projection.FeatureLoginPolicyRegistrationCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLoginPolicyUsernameLogin = Column{
|
||||
name: projection.FeatureLoginPolicyUsernameLoginCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLoginPolicyPasswordReset = Column{
|
||||
name: projection.FeatureLoginPolicyPasswordResetCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeaturePasswordComplexityPolicy = Column{
|
||||
name: projection.FeaturePasswordComplexityPolicyCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLabelPolicyPrivateLabel = Column{
|
||||
name: projection.FeatureLabelPolicyPrivateLabelCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLabelPolicyWatermark = Column{
|
||||
name: projection.FeatureLabelPolicyWatermarkCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureCustomDomain = Column{
|
||||
name: projection.FeatureCustomDomainCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeaturePrivacyPolicy = Column{
|
||||
name: projection.FeaturePrivacyPolicyCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureMetadataUser = Column{
|
||||
name: projection.FeatureMetadataUserCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureCustomTextMessage = Column{
|
||||
name: projection.FeatureCustomTextMessageCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureCustomTextLogin = Column{
|
||||
name: projection.FeatureCustomTextLoginCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureLockoutPolicy = Column{
|
||||
name: projection.FeatureLockoutPolicyCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureActionsAllowed = Column{
|
||||
name: projection.FeatureActionsAllowedCol,
|
||||
table: featureTable,
|
||||
}
|
||||
FeatureMaxActions = Column{
|
||||
name: projection.FeatureMaxActionsCol,
|
||||
table: featureTable,
|
||||
}
|
||||
)
|
||||
|
||||
func (q *Queries) FeaturesByOrgID(ctx context.Context, orgID string) (*Features, error) {
|
||||
query, scan := prepareFeaturesQuery()
|
||||
stmt, args, err := query.Where(
|
||||
sq.And{
|
||||
sq.Eq{
|
||||
FeatureColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
||||
},
|
||||
sq.Or{
|
||||
sq.Eq{
|
||||
FeatureColumnAggregateID.identifier(): orgID,
|
||||
},
|
||||
sq.Eq{
|
||||
FeatureColumnAggregateID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
||||
},
|
||||
},
|
||||
}).
|
||||
OrderBy(FeatureColumnIsDefault.identifier()).
|
||||
Limit(1).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-P9gwg", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, stmt, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) DefaultFeatures(ctx context.Context) (*Features, error) {
|
||||
query, scan := prepareFeaturesQuery()
|
||||
stmt, args, err := query.Where(sq.Eq{
|
||||
FeatureColumnAggregateID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
||||
FeatureColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
||||
}).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-1Ndlg", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, stmt, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func prepareFeaturesQuery() (sq.SelectBuilder, func(*sql.Row) (*Features, error)) {
|
||||
return sq.Select(
|
||||
FeatureColumnAggregateID.identifier(),
|
||||
FeatureColumnChangeDate.identifier(),
|
||||
FeatureColumnSequence.identifier(),
|
||||
FeatureColumnIsDefault.identifier(),
|
||||
FeatureTierName.identifier(),
|
||||
FeatureTierDescription.identifier(),
|
||||
FeatureState.identifier(),
|
||||
FeatureStateDescription.identifier(),
|
||||
FeatureAuditLogRetention.identifier(),
|
||||
FeatureLoginPolicyFactors.identifier(),
|
||||
FeatureLoginPolicyIDP.identifier(),
|
||||
FeatureLoginPolicyPasswordless.identifier(),
|
||||
FeatureLoginPolicyRegistration.identifier(),
|
||||
FeatureLoginPolicyUsernameLogin.identifier(),
|
||||
FeatureLoginPolicyPasswordReset.identifier(),
|
||||
FeaturePasswordComplexityPolicy.identifier(),
|
||||
FeatureLabelPolicyPrivateLabel.identifier(),
|
||||
FeatureLabelPolicyWatermark.identifier(),
|
||||
FeatureCustomDomain.identifier(),
|
||||
FeaturePrivacyPolicy.identifier(),
|
||||
FeatureMetadataUser.identifier(),
|
||||
FeatureCustomTextMessage.identifier(),
|
||||
FeatureCustomTextLogin.identifier(),
|
||||
FeatureLockoutPolicy.identifier(),
|
||||
FeatureActionsAllowed.identifier(),
|
||||
FeatureMaxActions.identifier(),
|
||||
).From(featureTable.identifier()).PlaceholderFormat(sq.Dollar),
|
||||
func(row *sql.Row) (*Features, error) {
|
||||
p := new(Features)
|
||||
tierName := sql.NullString{}
|
||||
tierDescription := sql.NullString{}
|
||||
stateDescription := sql.NullString{}
|
||||
err := row.Scan(
|
||||
&p.AggregateID,
|
||||
&p.ChangeDate,
|
||||
&p.Sequence,
|
||||
&p.IsDefault,
|
||||
&tierName,
|
||||
&tierDescription,
|
||||
&p.State,
|
||||
&stateDescription,
|
||||
&p.AuditLogRetention,
|
||||
&p.LoginPolicyFactors,
|
||||
&p.LoginPolicyIDP,
|
||||
&p.LoginPolicyPasswordless,
|
||||
&p.LoginPolicyRegistration,
|
||||
&p.LoginPolicyUsernameLogin,
|
||||
&p.LoginPolicyPasswordReset,
|
||||
&p.PasswordComplexityPolicy,
|
||||
&p.LabelPolicyPrivateLabel,
|
||||
&p.LabelPolicyWatermark,
|
||||
&p.CustomDomain,
|
||||
&p.PrivacyPolicy,
|
||||
&p.MetadataUser,
|
||||
&p.CustomTextMessage,
|
||||
&p.CustomTextLogin,
|
||||
&p.LockoutPolicy,
|
||||
&p.ActionsAllowed,
|
||||
&p.MaxActions,
|
||||
)
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-M9fse", "Errors.Features.NotFound")
|
||||
}
|
||||
return nil, errors.ThrowInternal(err, "QUERY-3o9gd", "Errors.Internal")
|
||||
}
|
||||
p.TierName = tierName.String
|
||||
p.TierDescription = tierDescription.String
|
||||
p.StateDescription = stateDescription.String
|
||||
return p, nil
|
||||
}
|
||||
}
|
||||
|
||||
func (f *Features) EnabledFeatureTypes() []string {
|
||||
list := make([]string, 0)
|
||||
if f.LoginPolicyFactors {
|
||||
list = append(list, domain.FeatureLoginPolicyFactors)
|
||||
}
|
||||
if f.LoginPolicyIDP {
|
||||
list = append(list, domain.FeatureLoginPolicyIDP)
|
||||
}
|
||||
if f.LoginPolicyPasswordless {
|
||||
list = append(list, domain.FeatureLoginPolicyPasswordless)
|
||||
}
|
||||
if f.LoginPolicyRegistration {
|
||||
list = append(list, domain.FeatureLoginPolicyRegistration)
|
||||
}
|
||||
if f.LoginPolicyUsernameLogin {
|
||||
list = append(list, domain.FeatureLoginPolicyUsernameLogin)
|
||||
}
|
||||
if f.LoginPolicyPasswordReset {
|
||||
list = append(list, domain.FeatureLoginPolicyPasswordReset)
|
||||
}
|
||||
if f.PasswordComplexityPolicy {
|
||||
list = append(list, domain.FeaturePasswordComplexityPolicy)
|
||||
}
|
||||
if f.LabelPolicyPrivateLabel {
|
||||
list = append(list, domain.FeatureLabelPolicyPrivateLabel)
|
||||
}
|
||||
if f.LabelPolicyWatermark {
|
||||
list = append(list, domain.FeatureLabelPolicyWatermark)
|
||||
}
|
||||
if f.CustomDomain {
|
||||
list = append(list, domain.FeatureCustomDomain)
|
||||
}
|
||||
if f.PrivacyPolicy {
|
||||
list = append(list, domain.FeaturePrivacyPolicy)
|
||||
}
|
||||
if f.MetadataUser {
|
||||
list = append(list, domain.FeatureMetadataUser)
|
||||
}
|
||||
if f.CustomTextMessage {
|
||||
list = append(list, domain.FeatureCustomTextMessage)
|
||||
}
|
||||
if f.CustomTextLogin {
|
||||
list = append(list, domain.FeatureCustomTextLogin)
|
||||
}
|
||||
if f.LockoutPolicy {
|
||||
list = append(list, domain.FeatureLockoutPolicy)
|
||||
}
|
||||
if f.ActionsAllowed != domain.ActionsNotAllowed {
|
||||
list = append(list, domain.FeatureActions)
|
||||
}
|
||||
return list
|
||||
}
|
||||
@@ -1,358 +0,0 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"database/sql/driver"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
errs "github.com/zitadel/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
func Test_FeaturesPrepares(t *testing.T) {
|
||||
type want struct {
|
||||
sqlExpectations sqlExpectation
|
||||
err checkErr
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
prepare interface{}
|
||||
want want
|
||||
object interface{}
|
||||
}{
|
||||
{
|
||||
name: "prepareFeaturesQuery no result",
|
||||
prepare: prepareFeaturesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.features.aggregate_id,`+
|
||||
` projections.features.change_date,`+
|
||||
` projections.features.sequence,`+
|
||||
` projections.features.is_default,`+
|
||||
` projections.features.tier_name,`+
|
||||
` projections.features.tier_description,`+
|
||||
` projections.features.state,`+
|
||||
` projections.features.state_description,`+
|
||||
` projections.features.audit_log_retention,`+
|
||||
` projections.features.login_policy_factors,`+
|
||||
` projections.features.login_policy_idp,`+
|
||||
` projections.features.login_policy_passwordless,`+
|
||||
` projections.features.login_policy_registration,`+
|
||||
` projections.features.login_policy_username_login,`+
|
||||
` projections.features.login_policy_password_reset,`+
|
||||
` projections.features.password_complexity_policy,`+
|
||||
` projections.features.label_policy_private_label,`+
|
||||
` projections.features.label_policy_watermark,`+
|
||||
` projections.features.custom_domain,`+
|
||||
` projections.features.privacy_policy,`+
|
||||
` projections.features.metadata_user,`+
|
||||
` projections.features.custom_text_message,`+
|
||||
` projections.features.custom_text_login,`+
|
||||
` projections.features.lockout_policy,`+
|
||||
` projections.features.actions_allowed,`+
|
||||
` projections.features.max_actions`+
|
||||
` FROM projections.features`),
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errs.IsNotFound(err) {
|
||||
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: (*Features)(nil),
|
||||
},
|
||||
{
|
||||
name: "prepareFeaturesQuery found",
|
||||
prepare: prepareFeaturesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.features.aggregate_id,`+
|
||||
` projections.features.change_date,`+
|
||||
` projections.features.sequence,`+
|
||||
` projections.features.is_default,`+
|
||||
` projections.features.tier_name,`+
|
||||
` projections.features.tier_description,`+
|
||||
` projections.features.state,`+
|
||||
` projections.features.state_description,`+
|
||||
` projections.features.audit_log_retention,`+
|
||||
` projections.features.login_policy_factors,`+
|
||||
` projections.features.login_policy_idp,`+
|
||||
` projections.features.login_policy_passwordless,`+
|
||||
` projections.features.login_policy_registration,`+
|
||||
` projections.features.login_policy_username_login,`+
|
||||
` projections.features.login_policy_password_reset,`+
|
||||
` projections.features.password_complexity_policy,`+
|
||||
` projections.features.label_policy_private_label,`+
|
||||
` projections.features.label_policy_watermark,`+
|
||||
` projections.features.custom_domain,`+
|
||||
` projections.features.privacy_policy,`+
|
||||
` projections.features.metadata_user,`+
|
||||
` projections.features.custom_text_message,`+
|
||||
` projections.features.custom_text_login,`+
|
||||
` projections.features.lockout_policy,`+
|
||||
` projections.features.actions_allowed,`+
|
||||
` projections.features.max_actions`+
|
||||
` FROM projections.features`),
|
||||
[]string{
|
||||
"aggregate_id",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"is_default",
|
||||
"tier_name",
|
||||
"tier_description",
|
||||
"state",
|
||||
"state_description",
|
||||
"audit_log_retention",
|
||||
"login_policy_factors",
|
||||
"login_policy_idp",
|
||||
"login_policy_passwordless",
|
||||
"login_policy_registration",
|
||||
"login_policy_username_login",
|
||||
"login_policy_password_reset",
|
||||
"password_complexity_policy",
|
||||
"label_policy_private_label",
|
||||
"label_policy_watermark",
|
||||
"custom_domain",
|
||||
"privacy_policy",
|
||||
"metadata_user",
|
||||
"custom_text_message",
|
||||
"custom_text_login",
|
||||
"lockout_policy",
|
||||
"actions_allowed",
|
||||
"max_actions",
|
||||
},
|
||||
[]driver.Value{
|
||||
"aggregate-id",
|
||||
testNow,
|
||||
uint64(20211115),
|
||||
true,
|
||||
"tier-name",
|
||||
"tier-description",
|
||||
1,
|
||||
"state-description",
|
||||
uint(604800000000000), // 7days in nanoseconds
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
domain.ActionsMaxAllowed,
|
||||
10,
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &Features{
|
||||
AggregateID: "aggregate-id",
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211115,
|
||||
IsDefault: true,
|
||||
TierName: "tier-name",
|
||||
TierDescription: "tier-description",
|
||||
State: domain.FeaturesStateActive,
|
||||
StateDescription: "state-description",
|
||||
AuditLogRetention: 7 * 24 * time.Hour,
|
||||
LoginPolicyFactors: true,
|
||||
LoginPolicyIDP: true,
|
||||
LoginPolicyPasswordless: true,
|
||||
LoginPolicyRegistration: true,
|
||||
LoginPolicyUsernameLogin: true,
|
||||
LoginPolicyPasswordReset: true,
|
||||
PasswordComplexityPolicy: true,
|
||||
LabelPolicyPrivateLabel: true,
|
||||
LabelPolicyWatermark: true,
|
||||
CustomDomain: true,
|
||||
PrivacyPolicy: true,
|
||||
MetadataUser: true,
|
||||
CustomTextMessage: true,
|
||||
CustomTextLogin: true,
|
||||
LockoutPolicy: true,
|
||||
ActionsAllowed: domain.ActionsMaxAllowed,
|
||||
MaxActions: 10,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareFeaturesQuery found with empty",
|
||||
prepare: prepareFeaturesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
regexp.QuoteMeta(`SELECT projections.features.aggregate_id,`+
|
||||
` projections.features.change_date,`+
|
||||
` projections.features.sequence,`+
|
||||
` projections.features.is_default,`+
|
||||
` projections.features.tier_name,`+
|
||||
` projections.features.tier_description,`+
|
||||
` projections.features.state,`+
|
||||
` projections.features.state_description,`+
|
||||
` projections.features.audit_log_retention,`+
|
||||
` projections.features.login_policy_factors,`+
|
||||
` projections.features.login_policy_idp,`+
|
||||
` projections.features.login_policy_passwordless,`+
|
||||
` projections.features.login_policy_registration,`+
|
||||
` projections.features.login_policy_username_login,`+
|
||||
` projections.features.login_policy_password_reset,`+
|
||||
` projections.features.password_complexity_policy,`+
|
||||
` projections.features.label_policy_private_label,`+
|
||||
` projections.features.label_policy_watermark,`+
|
||||
` projections.features.custom_domain,`+
|
||||
` projections.features.privacy_policy,`+
|
||||
` projections.features.metadata_user,`+
|
||||
` projections.features.custom_text_message,`+
|
||||
` projections.features.custom_text_login,`+
|
||||
` projections.features.lockout_policy,`+
|
||||
` projections.features.actions_allowed,`+
|
||||
` projections.features.max_actions`+
|
||||
` FROM projections.features`),
|
||||
[]string{
|
||||
"aggregate_id",
|
||||
"change_date",
|
||||
"sequence",
|
||||
"is_default",
|
||||
"tier_name",
|
||||
"tier_description",
|
||||
"state",
|
||||
"state_description",
|
||||
"audit_log_retention",
|
||||
"login_policy_factors",
|
||||
"login_policy_idp",
|
||||
"login_policy_passwordless",
|
||||
"login_policy_registration",
|
||||
"login_policy_username_login",
|
||||
"login_policy_password_reset",
|
||||
"password_complexity_policy",
|
||||
"label_policy_private_label",
|
||||
"label_policy_watermark",
|
||||
"custom_domain",
|
||||
"privacy_policy",
|
||||
"metadata_user",
|
||||
"custom_text_message",
|
||||
"custom_text_login",
|
||||
"lockout_policy",
|
||||
"actions_allowed",
|
||||
"max_actions",
|
||||
},
|
||||
[]driver.Value{
|
||||
"aggregate-id",
|
||||
testNow,
|
||||
uint64(20211115),
|
||||
true,
|
||||
nil,
|
||||
nil,
|
||||
1,
|
||||
nil,
|
||||
uint(604800000000000), // 7days in nanoseconds
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
domain.ActionsMaxAllowed,
|
||||
10,
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &Features{
|
||||
AggregateID: "aggregate-id",
|
||||
ChangeDate: testNow,
|
||||
Sequence: 20211115,
|
||||
IsDefault: true,
|
||||
TierName: "",
|
||||
TierDescription: "",
|
||||
State: domain.FeaturesStateActive,
|
||||
StateDescription: "",
|
||||
AuditLogRetention: 7 * 24 * time.Hour,
|
||||
LoginPolicyFactors: true,
|
||||
LoginPolicyIDP: true,
|
||||
LoginPolicyPasswordless: true,
|
||||
LoginPolicyRegistration: true,
|
||||
LoginPolicyUsernameLogin: true,
|
||||
LoginPolicyPasswordReset: true,
|
||||
PasswordComplexityPolicy: true,
|
||||
LabelPolicyPrivateLabel: true,
|
||||
LabelPolicyWatermark: true,
|
||||
CustomDomain: true,
|
||||
PrivacyPolicy: true,
|
||||
MetadataUser: true,
|
||||
CustomTextMessage: true,
|
||||
CustomTextLogin: true,
|
||||
LockoutPolicy: true,
|
||||
ActionsAllowed: domain.ActionsMaxAllowed,
|
||||
MaxActions: 10,
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareFeaturesQuery sql err",
|
||||
prepare: prepareFeaturesQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
regexp.QuoteMeta(`SELECT projections.features.aggregate_id,`+
|
||||
` projections.features.change_date,`+
|
||||
` projections.features.sequence,`+
|
||||
` projections.features.is_default,`+
|
||||
` projections.features.tier_name,`+
|
||||
` projections.features.tier_description,`+
|
||||
` projections.features.state,`+
|
||||
` projections.features.state_description,`+
|
||||
` projections.features.audit_log_retention,`+
|
||||
` projections.features.login_policy_factors,`+
|
||||
` projections.features.login_policy_idp,`+
|
||||
` projections.features.login_policy_passwordless,`+
|
||||
` projections.features.login_policy_registration,`+
|
||||
` projections.features.login_policy_username_login,`+
|
||||
` projections.features.login_policy_password_reset,`+
|
||||
` projections.features.password_complexity_policy,`+
|
||||
` projections.features.label_policy_private_label,`+
|
||||
` projections.features.label_policy_watermark,`+
|
||||
` projections.features.custom_domain,`+
|
||||
` projections.features.privacy_policy,`+
|
||||
` projections.features.metadata_user,`+
|
||||
` projections.features.custom_text_message,`+
|
||||
` projections.features.custom_text_login,`+
|
||||
` projections.features.lockout_policy,`+
|
||||
` projections.features.actions_allowed,`+
|
||||
` projections.features.max_actions`+
|
||||
` FROM projections.features`),
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errors.Is(err, sql.ErrConnDone) {
|
||||
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -1,237 +0,0 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/errors"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/handler"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/handler/crdb"
|
||||
"github.com/zitadel/zitadel/internal/repository/features"
|
||||
"github.com/zitadel/zitadel/internal/repository/instance"
|
||||
"github.com/zitadel/zitadel/internal/repository/org"
|
||||
)
|
||||
|
||||
const (
|
||||
FeatureTable = "projections.features"
|
||||
|
||||
FeatureAggregateIDCol = "aggregate_id"
|
||||
FeatureInstanceIDCol = "instance_id"
|
||||
FeatureChangeDateCol = "change_date"
|
||||
FeatureSequenceCol = "sequence"
|
||||
FeatureIsDefaultCol = "is_default"
|
||||
FeatureTierNameCol = "tier_name"
|
||||
FeatureTierDescriptionCol = "tier_description"
|
||||
FeatureStateCol = "state"
|
||||
FeatureStateDescriptionCol = "state_description"
|
||||
FeatureAuditLogRetentionCol = "audit_log_retention"
|
||||
FeatureLoginPolicyFactorsCol = "login_policy_factors"
|
||||
FeatureLoginPolicyIDPCol = "login_policy_idp"
|
||||
FeatureLoginPolicyPasswordlessCol = "login_policy_passwordless"
|
||||
FeatureLoginPolicyRegistrationCol = "login_policy_registration"
|
||||
FeatureLoginPolicyUsernameLoginCol = "login_policy_username_login"
|
||||
FeatureLoginPolicyPasswordResetCol = "login_policy_password_reset"
|
||||
FeaturePasswordComplexityPolicyCol = "password_complexity_policy"
|
||||
FeatureLabelPolicyPrivateLabelCol = "label_policy_private_label"
|
||||
FeatureLabelPolicyWatermarkCol = "label_policy_watermark"
|
||||
FeatureCustomDomainCol = "custom_domain"
|
||||
FeaturePrivacyPolicyCol = "privacy_policy"
|
||||
FeatureMetadataUserCol = "metadata_user"
|
||||
FeatureCustomTextMessageCol = "custom_text_message"
|
||||
FeatureCustomTextLoginCol = "custom_text_login"
|
||||
FeatureLockoutPolicyCol = "lockout_policy"
|
||||
FeatureActionsAllowedCol = "actions_allowed"
|
||||
FeatureMaxActionsCol = "max_actions"
|
||||
)
|
||||
|
||||
type FeatureProjection struct {
|
||||
crdb.StatementHandler
|
||||
}
|
||||
|
||||
func NewFeatureProjection(ctx context.Context, config crdb.StatementHandlerConfig) *FeatureProjection {
|
||||
p := new(FeatureProjection)
|
||||
config.ProjectionName = FeatureTable
|
||||
config.Reducers = p.reducers()
|
||||
config.InitCheck = crdb.NewTableCheck(
|
||||
crdb.NewTable([]*crdb.Column{
|
||||
crdb.NewColumn(FeatureAggregateIDCol, crdb.ColumnTypeText),
|
||||
crdb.NewColumn(FeatureInstanceIDCol, crdb.ColumnTypeText),
|
||||
crdb.NewColumn(FeatureChangeDateCol, crdb.ColumnTypeTimestamp),
|
||||
crdb.NewColumn(FeatureSequenceCol, crdb.ColumnTypeInt64),
|
||||
crdb.NewColumn(FeatureIsDefaultCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureTierNameCol, crdb.ColumnTypeText),
|
||||
crdb.NewColumn(FeatureTierDescriptionCol, crdb.ColumnTypeText, crdb.Nullable()),
|
||||
crdb.NewColumn(FeatureStateCol, crdb.ColumnTypeEnum, crdb.Default(0)),
|
||||
crdb.NewColumn(FeatureStateDescriptionCol, crdb.ColumnTypeText, crdb.Nullable()),
|
||||
crdb.NewColumn(FeatureAuditLogRetentionCol, crdb.ColumnTypeInt64, crdb.Default(0)),
|
||||
crdb.NewColumn(FeatureLoginPolicyFactorsCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLoginPolicyIDPCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLoginPolicyPasswordlessCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLoginPolicyRegistrationCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLoginPolicyUsernameLoginCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLoginPolicyPasswordResetCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeaturePasswordComplexityPolicyCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLabelPolicyPrivateLabelCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLabelPolicyWatermarkCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureCustomDomainCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeaturePrivacyPolicyCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureMetadataUserCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureCustomTextMessageCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureCustomTextLoginCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureLockoutPolicyCol, crdb.ColumnTypeBool, crdb.Default(false)),
|
||||
crdb.NewColumn(FeatureActionsAllowedCol, crdb.ColumnTypeEnum, crdb.Default(0)),
|
||||
crdb.NewColumn(FeatureMaxActionsCol, crdb.ColumnTypeInt64, crdb.Default(0)),
|
||||
},
|
||||
crdb.NewPrimaryKey(FeatureInstanceIDCol, FeatureAggregateIDCol),
|
||||
),
|
||||
)
|
||||
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
||||
return p
|
||||
}
|
||||
|
||||
func (p *FeatureProjection) reducers() []handler.AggregateReducer {
|
||||
return []handler.AggregateReducer{
|
||||
{
|
||||
Aggregate: org.AggregateType,
|
||||
EventRedusers: []handler.EventReducer{
|
||||
{
|
||||
Event: org.FeaturesSetEventType,
|
||||
Reduce: p.reduceFeatureSet,
|
||||
},
|
||||
{
|
||||
Event: org.FeaturesRemovedEventType,
|
||||
Reduce: p.reduceFeatureRemoved,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
Aggregate: instance.AggregateType,
|
||||
EventRedusers: []handler.EventReducer{
|
||||
{
|
||||
Event: instance.FeaturesSetEventType,
|
||||
Reduce: p.reduceFeatureSet,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (p *FeatureProjection) reduceFeatureSet(event eventstore.Event) (*handler.Statement, error) {
|
||||
var featureEvent features.FeaturesSetEvent
|
||||
var isDefault bool
|
||||
switch e := event.(type) {
|
||||
case *instance.FeaturesSetEvent:
|
||||
featureEvent = e.FeaturesSetEvent
|
||||
isDefault = true
|
||||
case *org.FeaturesSetEvent:
|
||||
featureEvent = e.FeaturesSetEvent
|
||||
isDefault = false
|
||||
default:
|
||||
return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-K0erf", "reduce.wrong.event.type %v", []eventstore.EventType{org.FeaturesSetEventType, instance.FeaturesSetEventType})
|
||||
}
|
||||
|
||||
cols := []handler.Column{
|
||||
handler.NewCol(FeatureAggregateIDCol, featureEvent.Aggregate().ID),
|
||||
handler.NewCol(FeatureInstanceIDCol, featureEvent.Aggregate().InstanceID),
|
||||
handler.NewCol(FeatureChangeDateCol, featureEvent.CreationDate()),
|
||||
handler.NewCol(FeatureSequenceCol, featureEvent.Sequence()),
|
||||
handler.NewCol(FeatureIsDefaultCol, isDefault),
|
||||
}
|
||||
if featureEvent.TierName != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureTierNameCol, *featureEvent.TierName))
|
||||
}
|
||||
if featureEvent.TierDescription != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureTierDescriptionCol, *featureEvent.TierDescription))
|
||||
}
|
||||
if featureEvent.State != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureStateCol, *featureEvent.State))
|
||||
}
|
||||
if featureEvent.StateDescription != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureStateDescriptionCol, *featureEvent.StateDescription))
|
||||
}
|
||||
if featureEvent.AuditLogRetention != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureAuditLogRetentionCol, *featureEvent.AuditLogRetention))
|
||||
}
|
||||
if featureEvent.LoginPolicyFactors != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLoginPolicyFactorsCol, *featureEvent.LoginPolicyFactors))
|
||||
}
|
||||
if featureEvent.LoginPolicyIDP != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLoginPolicyIDPCol, *featureEvent.LoginPolicyIDP))
|
||||
}
|
||||
if featureEvent.LoginPolicyPasswordless != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLoginPolicyPasswordlessCol, *featureEvent.LoginPolicyPasswordless))
|
||||
}
|
||||
if featureEvent.LoginPolicyRegistration != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLoginPolicyRegistrationCol, *featureEvent.LoginPolicyRegistration))
|
||||
}
|
||||
if featureEvent.LoginPolicyUsernameLogin != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLoginPolicyUsernameLoginCol, *featureEvent.LoginPolicyUsernameLogin))
|
||||
}
|
||||
if featureEvent.LoginPolicyPasswordReset != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLoginPolicyPasswordResetCol, *featureEvent.LoginPolicyPasswordReset))
|
||||
}
|
||||
if featureEvent.PasswordComplexityPolicy != nil {
|
||||
cols = append(cols, handler.NewCol(FeaturePasswordComplexityPolicyCol, *featureEvent.PasswordComplexityPolicy))
|
||||
}
|
||||
if featureEvent.LabelPolicyPrivateLabel != nil || featureEvent.LabelPolicy != nil {
|
||||
var value bool
|
||||
if featureEvent.LabelPolicyPrivateLabel != nil {
|
||||
value = *featureEvent.LabelPolicyPrivateLabel
|
||||
} else {
|
||||
value = *featureEvent.LabelPolicy
|
||||
}
|
||||
cols = append(cols, handler.NewCol(FeatureLabelPolicyPrivateLabelCol, value))
|
||||
}
|
||||
if featureEvent.LabelPolicyWatermark != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLabelPolicyWatermarkCol, *featureEvent.LabelPolicyWatermark))
|
||||
}
|
||||
if featureEvent.CustomDomain != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureCustomDomainCol, *featureEvent.CustomDomain))
|
||||
}
|
||||
if featureEvent.PrivacyPolicy != nil {
|
||||
cols = append(cols, handler.NewCol(FeaturePrivacyPolicyCol, *featureEvent.PrivacyPolicy))
|
||||
}
|
||||
if featureEvent.MetadataUser != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureMetadataUserCol, *featureEvent.MetadataUser))
|
||||
}
|
||||
if featureEvent.CustomTextMessage != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureCustomTextMessageCol, *featureEvent.CustomTextMessage))
|
||||
}
|
||||
if featureEvent.CustomTextLogin != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureCustomTextLoginCol, *featureEvent.CustomTextLogin))
|
||||
}
|
||||
if featureEvent.LockoutPolicy != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureLockoutPolicyCol, *featureEvent.LockoutPolicy))
|
||||
}
|
||||
if featureEvent.Actions != nil {
|
||||
actionsAllowed := domain.ActionsNotAllowed
|
||||
if *featureEvent.Actions {
|
||||
actionsAllowed = domain.ActionsAllowedUnlimited
|
||||
}
|
||||
cols = append(cols, handler.NewCol(FeatureActionsAllowedCol, actionsAllowed))
|
||||
}
|
||||
if featureEvent.ActionsAllowed != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureActionsAllowedCol, *featureEvent.ActionsAllowed))
|
||||
}
|
||||
if featureEvent.MaxActions != nil {
|
||||
cols = append(cols, handler.NewCol(FeatureMaxActionsCol, *featureEvent.MaxActions))
|
||||
}
|
||||
return crdb.NewUpsertStatement(
|
||||
&featureEvent,
|
||||
cols), nil
|
||||
}
|
||||
|
||||
func (p *FeatureProjection) reduceFeatureRemoved(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*org.FeaturesRemovedEvent)
|
||||
if !ok {
|
||||
return nil, errors.ThrowInvalidArgumentf(nil, "HANDL-0p4rf", "reduce.wrong.event.type %s", org.FeaturesRemovedEventType)
|
||||
}
|
||||
return crdb.NewDeleteStatement(
|
||||
e,
|
||||
[]handler.Condition{
|
||||
handler.NewCond(FeatureAggregateIDCol, e.Aggregate().ID),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
@@ -1,398 +0,0 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/errors"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/handler"
|
||||
"github.com/zitadel/zitadel/internal/eventstore/repository"
|
||||
"github.com/zitadel/zitadel/internal/repository/instance"
|
||||
"github.com/zitadel/zitadel/internal/repository/org"
|
||||
)
|
||||
|
||||
func TestFeatureProjection_reduces(t *testing.T) {
|
||||
type args struct {
|
||||
event func(t *testing.T) eventstore.Event
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
reduce func(event eventstore.Event) (*handler.Statement, error)
|
||||
want wantReduce
|
||||
}{
|
||||
{
|
||||
name: "org.reduceFeatureSet new",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(org.FeaturesSetEventType),
|
||||
org.AggregateType,
|
||||
[]byte(`{
|
||||
"tierName": "TierName",
|
||||
"tierDescription": "TierDescription",
|
||||
"state": 1,
|
||||
"stateDescription": "StateDescription",
|
||||
"auditLogRetention": 1,
|
||||
"loginPolicyFactors": true,
|
||||
"loginPolicyIDP": true,
|
||||
"loginPolicyPasswordless": true,
|
||||
"loginPolicyRegistration": true,
|
||||
"loginPolicyUsernameLogin": true,
|
||||
"loginPolicyPasswordReset": true,
|
||||
"passwordComplexityPolicy": true,
|
||||
"labelPolicyPrivateLabel": true,
|
||||
"labelPolicyWatermark": true,
|
||||
"customDomain": true,
|
||||
"privacyPolicy": true,
|
||||
"metadataUser": true,
|
||||
"customTextMessage": true,
|
||||
"customTextLogin": true,
|
||||
"lockoutPolicy": true,
|
||||
"actionsAllowed": 1,
|
||||
"maxActions": 10
|
||||
}`),
|
||||
), org.FeaturesSetEventMapper),
|
||||
},
|
||||
reduce: (&FeatureProjection{}).reduceFeatureSet,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("org"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: FeatureTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPSERT INTO projections.features (aggregate_id, instance_id, change_date, sequence, is_default, tier_name, tier_description, state, state_description, audit_log_retention, login_policy_factors, login_policy_idp, login_policy_passwordless, login_policy_registration, login_policy_username_login, login_policy_password_reset, password_complexity_policy, label_policy_private_label, label_policy_watermark, custom_domain, privacy_policy, metadata_user, custom_text_message, custom_text_login, lockout_policy, actions_allowed, max_actions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
"instance-id",
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
false,
|
||||
"TierName",
|
||||
"TierDescription",
|
||||
domain.FeaturesStateActive,
|
||||
"StateDescription",
|
||||
time.Nanosecond,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
domain.ActionsMaxAllowed,
|
||||
10,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "org.reduceFeatureSet old",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(org.FeaturesSetEventType),
|
||||
org.AggregateType,
|
||||
[]byte(`{
|
||||
"tierName": "TierName",
|
||||
"tierDescription": "TierDescription",
|
||||
"state": 1,
|
||||
"stateDescription": "StateDescription",
|
||||
"auditLogRetention": 1,
|
||||
"loginPolicyFactors": true,
|
||||
"loginPolicyIDP": true,
|
||||
"loginPolicyPasswordless": true,
|
||||
"loginPolicyRegistration": true,
|
||||
"loginPolicyUsernameLogin": true,
|
||||
"loginPolicyPasswordReset": true,
|
||||
"passwordComplexityPolicy": true,
|
||||
"labelPolicy": true,
|
||||
"labelPolicyWatermark": true,
|
||||
"customDomain": true,
|
||||
"privacyPolicy": true,
|
||||
"metadataUser": true,
|
||||
"customTextMessage": true,
|
||||
"customTextLogin": true,
|
||||
"lockoutPolicy": true,
|
||||
"actions": true
|
||||
}`),
|
||||
), org.FeaturesSetEventMapper),
|
||||
},
|
||||
reduce: (&FeatureProjection{}).reduceFeatureSet,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("org"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: FeatureTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPSERT INTO projections.features (aggregate_id, instance_id, change_date, sequence, is_default, tier_name, tier_description, state, state_description, audit_log_retention, login_policy_factors, login_policy_idp, login_policy_passwordless, login_policy_registration, login_policy_username_login, login_policy_password_reset, password_complexity_policy, label_policy_private_label, label_policy_watermark, custom_domain, privacy_policy, metadata_user, custom_text_message, custom_text_login, lockout_policy, actions_allowed) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
"instance-id",
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
false,
|
||||
"TierName",
|
||||
"TierDescription",
|
||||
domain.FeaturesStateActive,
|
||||
"StateDescription",
|
||||
time.Nanosecond,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
domain.ActionsAllowedUnlimited,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "org.reduceFeatureSet required values only",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(org.FeaturesSetEventType),
|
||||
org.AggregateType,
|
||||
[]byte(`{}`),
|
||||
), org.FeaturesSetEventMapper),
|
||||
},
|
||||
reduce: (&FeatureProjection{}).reduceFeatureSet,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("org"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: FeatureTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPSERT INTO projections.features (aggregate_id, instance_id, change_date, sequence, is_default) VALUES ($1, $2, $3, $4, $5)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
"instance-id",
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
false,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "org.reduceFeatureRemoved",
|
||||
reduce: (&FeatureProjection{}).reduceFeatureRemoved,
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(org.FeaturesRemovedEventType),
|
||||
org.AggregateType,
|
||||
nil,
|
||||
), org.FeaturesRemovedEventMapper),
|
||||
},
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("org"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: FeatureTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "DELETE FROM projections.features WHERE (aggregate_id = $1)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "instance.reduceFeatureSet old",
|
||||
reduce: (&FeatureProjection{}).reduceFeatureSet,
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(instance.FeaturesSetEventType),
|
||||
instance.AggregateType,
|
||||
[]byte(`{
|
||||
"tierName": "TierName",
|
||||
"tierDescription": "TierDescription",
|
||||
"state": 1,
|
||||
"stateDescription": "StateDescription",
|
||||
"auditLogRetention": 1,
|
||||
"loginPolicyFactors": true,
|
||||
"loginPolicyIDP": true,
|
||||
"loginPolicyPasswordless": true,
|
||||
"loginPolicyRegistration": true,
|
||||
"loginPolicyUsernameLogin": true,
|
||||
"loginPolicyPasswordReset": true,
|
||||
"passwordComplexityPolicy": true,
|
||||
"labelPolicy": true,
|
||||
"labelPolicyWatermark": true,
|
||||
"customDomain": true,
|
||||
"privacyPolicy": true,
|
||||
"metadataUser": true,
|
||||
"customTextMessage": true,
|
||||
"customTextLogin": true,
|
||||
"lockoutPolicy": true,
|
||||
"actions": true
|
||||
}`),
|
||||
), instance.FeaturesSetEventMapper),
|
||||
},
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("instance"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: FeatureTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPSERT INTO projections.features (aggregate_id, instance_id, change_date, sequence, is_default, tier_name, tier_description, state, state_description, audit_log_retention, login_policy_factors, login_policy_idp, login_policy_passwordless, login_policy_registration, login_policy_username_login, login_policy_password_reset, password_complexity_policy, label_policy_private_label, label_policy_watermark, custom_domain, privacy_policy, metadata_user, custom_text_message, custom_text_login, lockout_policy, actions_allowed) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
"instance-id",
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
true,
|
||||
"TierName",
|
||||
"TierDescription",
|
||||
domain.FeaturesStateActive,
|
||||
"StateDescription",
|
||||
time.Nanosecond,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
domain.ActionsAllowedUnlimited,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "instance.reduceFeatureSet new",
|
||||
reduce: (&FeatureProjection{}).reduceFeatureSet,
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(instance.FeaturesSetEventType),
|
||||
instance.AggregateType,
|
||||
[]byte(`{
|
||||
"tierName": "TierName",
|
||||
"tierDescription": "TierDescription",
|
||||
"state": 1,
|
||||
"stateDescription": "StateDescription",
|
||||
"auditLogRetention": 1,
|
||||
"loginPolicyFactors": true,
|
||||
"loginPolicyIDP": true,
|
||||
"loginPolicyPasswordless": true,
|
||||
"loginPolicyRegistration": true,
|
||||
"loginPolicyUsernameLogin": true,
|
||||
"loginPolicyPasswordReset": true,
|
||||
"passwordComplexityPolicy": true,
|
||||
"labelPolicyPrivateLabel": true,
|
||||
"labelPolicyWatermark": true,
|
||||
"customDomain": true,
|
||||
"privacyPolicy": true,
|
||||
"metadataUser": true,
|
||||
"customTextMessage": true,
|
||||
"customTextLogin": true,
|
||||
"lockoutPolicy": true,
|
||||
"actionsAllowed": 1,
|
||||
"maxActions": 10
|
||||
}`),
|
||||
), instance.FeaturesSetEventMapper),
|
||||
},
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("instance"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: FeatureTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPSERT INTO projections.features (aggregate_id, instance_id, change_date, sequence, is_default, tier_name, tier_description, state, state_description, audit_log_retention, login_policy_factors, login_policy_idp, login_policy_passwordless, login_policy_registration, login_policy_username_login, login_policy_password_reset, password_complexity_policy, label_policy_private_label, label_policy_watermark, custom_domain, privacy_policy, metadata_user, custom_text_message, custom_text_login, lockout_policy, actions_allowed, max_actions) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23, $24, $25, $26, $27)",
|
||||
expectedArgs: []interface{}{
|
||||
"agg-id",
|
||||
"instance-id",
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
true,
|
||||
"TierName",
|
||||
"TierDescription",
|
||||
domain.FeaturesStateActive,
|
||||
"StateDescription",
|
||||
time.Nanosecond,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
true,
|
||||
domain.ActionsMaxAllowed,
|
||||
10,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
event := baseEvent(t)
|
||||
got, err := tt.reduce(event)
|
||||
if !errors.IsErrorInvalidArgument(err) {
|
||||
t.Errorf("no wrong event mapping: %v, got: %v", err, got)
|
||||
}
|
||||
|
||||
event = tt.args.event(t)
|
||||
got, err = tt.reduce(event)
|
||||
assertReduce(t, got, err, tt.want)
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -55,7 +55,6 @@ func Start(ctx context.Context, sqlClient *sql.DB, es *eventstore.Eventstore, co
|
||||
NewMailTemplateProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["mail_templates"]))
|
||||
NewMessageTextProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["message_texts"]))
|
||||
NewCustomTextProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["custom_texts"]))
|
||||
NewFeatureProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["features"]))
|
||||
NewUserProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["users"]))
|
||||
NewLoginNameProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["login_names"]))
|
||||
NewOrgMemberProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["org_members"]))
|
||||
|
||||
Reference in New Issue
Block a user