fix: converters (#1413)

* fix: converters

* fix: converters

* comments
This commit is contained in:
Livio Amstutz
2021-03-12 14:06:05 +01:00
committed by GitHub
parent af55c4a65c
commit e9eb5b7848
27 changed files with 149 additions and 58 deletions

View File

@@ -10,10 +10,11 @@ func ModelLabelPolicyToPb(policy *model.LabelPolicyView) *policy_pb.LabelPolicy
return &policy_pb.LabelPolicy{
PrimaryColor: policy.PrimaryColor,
SecondaryColor: policy.SecondaryColor,
Details: object.ToDetailsPb(
Details: object.ToViewDetailsPb(
policy.Sequence,
policy.CreationDate,
policy.ChangeDate,
"policy.ResourceOwner", //TODO: für da haui öppert
"", //TODO: resourceowner
),
}
}

View File

@@ -10,10 +10,11 @@ func OrgIAMPolicyToPb(policy *model.OrgIAMPolicyView) *policy_pb.OrgIAMPolicy {
return &policy_pb.OrgIAMPolicy{
UserLoginMustBeDomain: policy.UserLoginMustBeDomain,
IsDefault: policy.Default,
Details: object.ToDetailsPb(
Details: object.ToViewDetailsPb(
policy.Sequence,
policy.CreationDate,
policy.ChangeDate,
"policy.ResourceOwner", //TODO: resource owner
"", //TODO: resource owner
),
}
}

View File

@@ -10,10 +10,11 @@ func ModelPasswordAgePolicyToPb(policy *model.PasswordAgePolicyView) *policy_pb.
return &policy_pb.PasswordAgePolicy{
MaxAgeDays: policy.MaxAgeDays,
ExpireWarnDays: policy.ExpireWarnDays,
Details: object.ToDetailsPb(
Details: object.ToViewDetailsPb(
policy.Sequence,
policy.CreationDate,
policy.ChangeDate,
"policy.ResourceOwner", //TODO: uueli
"", //TODO: resourceowner
),
}
}

View File

@@ -13,10 +13,11 @@ func ModelPasswordComplexityPolicyToPb(policy *model.PasswordComplexityPolicyVie
HasLowercase: policy.HasLowercase,
HasNumber: policy.HasNumber,
HasSymbol: policy.HasSymbol,
Details: object.ToDetailsPb(
Details: object.ToViewDetailsPb(
policy.Sequence,
policy.CreationDate,
policy.ChangeDate,
"policy.ResourceOwner", //TODO: ro
"", //TODO: ro
),
}
}

View File

@@ -2,7 +2,6 @@ package policy
import (
"github.com/caos/zitadel/internal/api/grpc/object"
"github.com/caos/zitadel/internal/domain"
"github.com/caos/zitadel/internal/iam/model"
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
)
@@ -11,22 +10,11 @@ func ModelPasswordLockoutPolicyToPb(policy *model.PasswordLockoutPolicyView) *po
return &policy_pb.PasswordLockoutPolicy{
MaxAttempts: policy.MaxAttempts,
ShowLockoutFailure: policy.ShowLockOutFailures,
Details: object.ToDetailsPb(
Details: object.ToViewDetailsPb(
policy.Sequence,
policy.CreationDate,
policy.ChangeDate,
"policy.ResourceOwner", //TODO: uuueli
),
}
}
func PasswordLockoutPolicyToDomain(policy *domain.PasswordLockoutPolicy) *policy_pb.PasswordLockoutPolicy {
return &policy_pb.PasswordLockoutPolicy{
MaxAttempts: policy.MaxAttempts,
ShowLockoutFailure: policy.ShowLockOutFailures,
Details: object.ToDetailsPb(
policy.Sequence,
policy.ChangeDate,
policy.ResourceOwner,
"", //TODO: resourceowner
),
}
}