mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 21:17:32 +00:00
feat: protos refactoring
* start with user * user first try done in all services * user, org, idp for discussion * remove unused stuff * bla * dockerbuild * rename search, get multiple to list... * add annotation * update proto dependencies * update proto dependencies * change proto imports * replace all old imports * fix go out * remove unused lines * correct protoc flags * grpc and openapi flags * go out source path relative * -p * remove dead code * sourcepath relative * ls * is onenapi the problem? * hobla * authoption output * wrong field name * gopf * correct option, add correct flags * small improvments * SIMPLYFY * relative path * gopf bin ich en tubel * correct path * default policies in admin * grpc generation in one file * remove non ascii * metadata on manipulations * correct auth_option import * fixes * larry * idp provider to idp * fix generate * admin and auth nearly done * admin and auth nearly done * gen * healthz * imports * deleted too much imports * fix org * add import * imports * import * naming * auth_opt * gopf * management * imports * _TYPE_UNSPECIFIED * improts * auth opts * management policies * imports * passwordlessType to MFAType * auth_opt * add user grant calls * add missing messages * result * fix option * improvements * ids * fix http * imports * fixes * fields * body * add fields * remove wrong member query * fix request response * fixes * add copy files * variable versions * generate all files * improvements * add dependencies * factors * user session * oidc information, iam * remove unused file * changes * enums * dockerfile * fix build * remove unused folder * update readme for build * move old server impl * add event type to change * some changes * start admin * remove wrong field * admin only list calls missing * fix proto numbers * surprisingly it compiles * service ts changes * admin mgmt * mgmt * auth manipulation and gets done, lists missing * validations and some field changes * validations * enum validations * remove todo * move proto files to proto/zitadel * change proto path in dockerfile * it compiles! * add validate import * remove duplicate import * fix protos * fix import * tests * cleanup * remove unimplemented methods * iam member multiple queries * all auth and admin calls * add initial password on crate human * message names * management user server * machine done * fix: todos (#1346) * fix: pub sub in new eventstore * fix: todos * fix: todos * fix: todos * fix: todos * fix: todos * fix tests * fix: search method domain * admin service, user import type typescript * admin changes * admin changes * fix: search method domain * more user grpc and begin org, fix configs * fix: return object details * org grpc * remove creation date add details * app * fix: return object details * fix: return object details * mgmt service, project members * app * fix: convert policies * project, members, granted projects, searches * fix: convert usergrants * fix: convert usergrants * auth user detail, user detail, mfa, second factor, auth * fix: convert usergrants * mfa, memberships, password, owned proj detail * fix: convert usergrants * project grant * missing details * changes, userview * idp table, keys * org list and user table filter * unify rest paths (#1381) * unify rest paths * post for all searches, mfa to multi_factor, secondfactor to second_factor * remove v1 * fix tests * rename api client key to app key * machine keys, age policy * user list, machine keys, changes * fix: org states * add default flag to policy * second factor to type * idp id * app type * unify ListQuery, ListDetails, ObjectDetails field names * user grants, apps, memberships * fix type params * metadata to detail, linke idps * api create, membership, app detail, create * idp, app, policy * queries, multi -> auth factors and missing fields * update converters * provider to user, remove old mgmt refs * temp remove authfactor dialog, build finish Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
This commit is contained in:
19
internal/api/grpc/policy/label_policy.go
Normal file
19
internal/api/grpc/policy/label_policy.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/api/grpc/object"
|
||||
"github.com/caos/zitadel/internal/iam/model"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func ModelLabelPolicyToPb(policy *model.LabelPolicyView) *policy_pb.LabelPolicy {
|
||||
return &policy_pb.LabelPolicy{
|
||||
PrimaryColor: policy.PrimaryColor,
|
||||
SecondaryColor: policy.SecondaryColor,
|
||||
Details: object.ToDetailsPb(
|
||||
policy.Sequence,
|
||||
policy.ChangeDate,
|
||||
"policy.ResourceOwner", //TODO: für da haui öppert
|
||||
),
|
||||
}
|
||||
}
|
39
internal/api/grpc/policy/login_policy.go
Normal file
39
internal/api/grpc/policy/login_policy.go
Normal file
@@ -0,0 +1,39 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/iam/model"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func ModelLoginPolicyToPb(policy *model.LoginPolicyView) *policy_pb.LoginPolicy {
|
||||
return &policy_pb.LoginPolicy{
|
||||
AllowUsernamePassword: policy.AllowUsernamePassword,
|
||||
AllowRegister: policy.AllowRegister,
|
||||
AllowExternalIdp: policy.AllowRegister,
|
||||
ForceMfa: policy.ForceMFA,
|
||||
PasswordlessType: ModelPasswordlessTypeToPb(policy.PasswordlessType),
|
||||
}
|
||||
}
|
||||
|
||||
func PasswordlessTypeToDomain(passwordlessType policy_pb.PasswordlessType) domain.PasswordlessType {
|
||||
switch passwordlessType {
|
||||
case policy_pb.PasswordlessType_PASSWORDLESS_TYPE_ALLOWED:
|
||||
return domain.PasswordlessTypeAllowed
|
||||
case policy_pb.PasswordlessType_PASSWORDLESS_TYPE_NOT_ALLOWED:
|
||||
return domain.PasswordlessTypeNotAllowed
|
||||
default:
|
||||
return -1
|
||||
}
|
||||
}
|
||||
|
||||
func ModelPasswordlessTypeToPb(passwordlessType model.PasswordlessType) policy_pb.PasswordlessType {
|
||||
switch passwordlessType {
|
||||
case model.PasswordlessTypeAllowed:
|
||||
return policy_pb.PasswordlessType_PASSWORDLESS_TYPE_ALLOWED
|
||||
case model.PasswordlessTypeNotAllowed:
|
||||
return policy_pb.PasswordlessType_PASSWORDLESS_TYPE_NOT_ALLOWED
|
||||
default:
|
||||
return policy_pb.PasswordlessType_PASSWORDLESS_TYPE_NOT_ALLOWED
|
||||
}
|
||||
}
|
14
internal/api/grpc/policy/multi_factor.go
Normal file
14
internal/api/grpc/policy/multi_factor.go
Normal file
@@ -0,0 +1,14 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func MultiFactorTypeToDomain(multiFactorType policy_pb.MultiFactorType) domain.MultiFactorType {
|
||||
switch multiFactorType {
|
||||
//TODO: gap between proto and backend
|
||||
default:
|
||||
return domain.MultiFactorTypeUnspecified
|
||||
}
|
||||
}
|
19
internal/api/grpc/policy/org_iam_policy.go
Normal file
19
internal/api/grpc/policy/org_iam_policy.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/api/grpc/object"
|
||||
"github.com/caos/zitadel/internal/iam/model"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func OrgIAMPolicyToPb(policy *model.OrgIAMPolicyView) *policy_pb.OrgIAMPolicy {
|
||||
return &policy_pb.OrgIAMPolicy{
|
||||
UserLoginMustBeDomain: policy.UserLoginMustBeDomain,
|
||||
IsDefault: policy.Default,
|
||||
Details: object.ToDetailsPb(
|
||||
policy.Sequence,
|
||||
policy.ChangeDate,
|
||||
"policy.ResourceOwner", //TODO: resource owner
|
||||
),
|
||||
}
|
||||
}
|
19
internal/api/grpc/policy/password_age_policy.go
Normal file
19
internal/api/grpc/policy/password_age_policy.go
Normal file
@@ -0,0 +1,19 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/api/grpc/object"
|
||||
"github.com/caos/zitadel/internal/iam/model"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func ModelPasswordAgePolicyToPb(policy *model.PasswordAgePolicyView) *policy_pb.PasswordAgePolicy {
|
||||
return &policy_pb.PasswordAgePolicy{
|
||||
MaxAgeDays: policy.MaxAgeDays,
|
||||
ExpireWarnDays: policy.ExpireWarnDays,
|
||||
Details: object.ToDetailsPb(
|
||||
policy.Sequence,
|
||||
policy.ChangeDate,
|
||||
"policy.ResourceOwner", //TODO: uueli
|
||||
),
|
||||
}
|
||||
}
|
22
internal/api/grpc/policy/password_complexity_policy.go
Normal file
22
internal/api/grpc/policy/password_complexity_policy.go
Normal file
@@ -0,0 +1,22 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/api/grpc/object"
|
||||
"github.com/caos/zitadel/internal/iam/model"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func ModelPasswordComplexityPolicyToPb(policy *model.PasswordComplexityPolicyView) *policy_pb.PasswordComplexityPolicy {
|
||||
return &policy_pb.PasswordComplexityPolicy{
|
||||
MinLength: policy.MinLength,
|
||||
HasUppercase: policy.HasUppercase,
|
||||
HasLowercase: policy.HasLowercase,
|
||||
HasNumber: policy.HasNumber,
|
||||
HasSymbol: policy.HasSymbol,
|
||||
Details: object.ToDetailsPb(
|
||||
policy.Sequence,
|
||||
policy.ChangeDate,
|
||||
"policy.ResourceOwner", //TODO: ro
|
||||
),
|
||||
}
|
||||
}
|
32
internal/api/grpc/policy/password_lockout_policy.go
Normal file
32
internal/api/grpc/policy/password_lockout_policy.go
Normal file
@@ -0,0 +1,32 @@
|
||||
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"
|
||||
)
|
||||
|
||||
func ModelPasswordLockoutPolicyToPb(policy *model.PasswordLockoutPolicyView) *policy_pb.PasswordLockoutPolicy {
|
||||
return &policy_pb.PasswordLockoutPolicy{
|
||||
MaxAttempts: policy.MaxAttempts,
|
||||
ShowLockoutFailure: policy.ShowLockOutFailures,
|
||||
Details: object.ToDetailsPb(
|
||||
policy.Sequence,
|
||||
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,
|
||||
),
|
||||
}
|
||||
}
|
54
internal/api/grpc/policy/second_factor.go
Normal file
54
internal/api/grpc/policy/second_factor.go
Normal file
@@ -0,0 +1,54 @@
|
||||
package policy
|
||||
|
||||
import (
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/iam/model"
|
||||
policy_pb "github.com/caos/zitadel/pkg/grpc/policy"
|
||||
)
|
||||
|
||||
func SecondFactorTypeToDomain(secondFactorType policy_pb.SecondFactorType) domain.SecondFactorType {
|
||||
switch secondFactorType {
|
||||
case policy_pb.SecondFactorType_SECOND_FACTOR_TYPE_OTP:
|
||||
return domain.SecondFactorTypeOTP
|
||||
case policy_pb.SecondFactorType_SECOND_FACTOR_TYPE_U2F:
|
||||
return domain.SecondFactorTypeU2F
|
||||
default:
|
||||
return domain.SecondFactorTypeUnspecified
|
||||
}
|
||||
}
|
||||
|
||||
func ModelSecondFactorTypesToPb(types []model.SecondFactorType) []policy_pb.SecondFactorType {
|
||||
t := make([]policy_pb.SecondFactorType, len(types))
|
||||
for i, typ := range types {
|
||||
t[i] = ModelSecondFactorTypeToPb(typ)
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
func ModelSecondFactorTypeToPb(secondFactorType model.SecondFactorType) policy_pb.SecondFactorType {
|
||||
switch secondFactorType {
|
||||
case model.SecondFactorTypeOTP:
|
||||
return policy_pb.SecondFactorType_SECOND_FACTOR_TYPE_OTP
|
||||
case model.SecondFactorTypeU2F:
|
||||
return policy_pb.SecondFactorType_SECOND_FACTOR_TYPE_U2F
|
||||
default:
|
||||
return policy_pb.SecondFactorType_SECOND_FACTOR_TYPE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func ModelMultiFactorTypesToPb(types []model.MultiFactorType) []policy_pb.MultiFactorType {
|
||||
t := make([]policy_pb.MultiFactorType, len(types))
|
||||
for i, typ := range types {
|
||||
t[i] = ModelMultiFactorTypeToPb(typ)
|
||||
}
|
||||
return t
|
||||
}
|
||||
|
||||
func ModelMultiFactorTypeToPb(typ model.MultiFactorType) policy_pb.MultiFactorType {
|
||||
switch typ {
|
||||
case model.MultiFactorTypeU2FWithPIN:
|
||||
return policy_pb.MultiFactorType_MULTI_FACTOR_TYPE_U2F_WITH_VERIFICATION
|
||||
default:
|
||||
return policy_pb.MultiFactorType_MULTI_FACTOR_TYPE_UNSPECIFIED
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user