mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 04:57:33 +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:
Silvan
237
internal/api/grpc/idp/converter.go
Normal file
237
internal/api/grpc/idp/converter.go
Normal file
@@ -0,0 +1,237 @@
|
||||
package idp
|
||||
|
||||
import (
|
||||
obj_grpc "github.com/caos/zitadel/internal/api/grpc/object"
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
iam_model "github.com/caos/zitadel/internal/iam/model"
|
||||
user_model "github.com/caos/zitadel/internal/user/model"
|
||||
idp_pb "github.com/caos/zitadel/pkg/grpc/idp"
|
||||
)
|
||||
|
||||
func IDPViewsToPb(idps []*iam_model.IDPConfigView) []*idp_pb.IDP {
|
||||
resp := make([]*idp_pb.IDP, len(idps))
|
||||
for i, idp := range idps {
|
||||
resp[i] = ModelIDPViewToPb(idp)
|
||||
}
|
||||
return resp
|
||||
}
|
||||
|
||||
func ModelIDPViewToPb(idp *iam_model.IDPConfigView) *idp_pb.IDP {
|
||||
return &idp_pb.IDP{
|
||||
Id: idp.IDPConfigID,
|
||||
State: ModelIDPStateToPb(idp.State),
|
||||
Name: idp.Name,
|
||||
StylingType: ModelIDPStylingTypeToPb(idp.StylingType),
|
||||
Owner: ModelIDPProviderTypeToPb(idp.IDPProviderType),
|
||||
Config: ModelIDPViewToConfigPb(idp),
|
||||
Details: obj_grpc.ToDetailsPb(
|
||||
idp.Sequence,
|
||||
idp.ChangeDate,
|
||||
"idp.ResourceOwner", //TODO: backend
|
||||
),
|
||||
}
|
||||
}
|
||||
|
||||
func IDPViewToPb(idp *domain.IDPConfigView) *idp_pb.IDP {
|
||||
mapped := &idp_pb.IDP{
|
||||
Id: idp.AggregateID,
|
||||
State: IDPStateToPb(idp.State),
|
||||
Name: idp.Name,
|
||||
StylingType: IDPStylingTypeToPb(idp.StylingType),
|
||||
Config: IDPViewToConfigPb(idp),
|
||||
Details: obj_grpc.ToDetailsPb(idp.Sequence, idp.ChangeDate, "idp.ResourceOwner"), //TODO: resource owner in view
|
||||
}
|
||||
return mapped
|
||||
}
|
||||
|
||||
func ExternalIDPViewsToLoginPolicyLinkPb(links []*iam_model.IDPProviderView) []*idp_pb.IDPLoginPolicyLink {
|
||||
l := make([]*idp_pb.IDPLoginPolicyLink, len(links))
|
||||
for i, link := range links {
|
||||
l[i] = ExternalIDPViewToLoginPolicyLinkPb(link)
|
||||
}
|
||||
return l
|
||||
}
|
||||
|
||||
func ExternalIDPViewToLoginPolicyLinkPb(link *iam_model.IDPProviderView) *idp_pb.IDPLoginPolicyLink {
|
||||
return &idp_pb.IDPLoginPolicyLink{
|
||||
IdpId: link.IDPConfigID,
|
||||
IdpName: link.Name,
|
||||
IdpType: idp_pb.IDPType_IDP_TYPE_OIDC,
|
||||
}
|
||||
}
|
||||
|
||||
func IDPsToUserLinkPb(res []*user_model.ExternalIDPView) []*idp_pb.IDPUserLink {
|
||||
links := make([]*idp_pb.IDPUserLink, len(res))
|
||||
for i, link := range res {
|
||||
links[i] = ExternalIDPViewToUserLinkPb(link)
|
||||
}
|
||||
return links
|
||||
}
|
||||
|
||||
func ExternalIDPViewToUserLinkPb(link *user_model.ExternalIDPView) *idp_pb.IDPUserLink {
|
||||
return &idp_pb.IDPUserLink{
|
||||
UserId: link.UserID,
|
||||
IdpId: link.IDPConfigID,
|
||||
IdpName: link.IDPName,
|
||||
ProvidedUserId: link.ExternalUserID,
|
||||
ProvidedUserName: link.UserDisplayName,
|
||||
//TODO: as soon as saml is implemented we need to switch here
|
||||
IdpType: idp_pb.IDPType_IDP_TYPE_OIDC,
|
||||
}
|
||||
}
|
||||
|
||||
func IDPStateToPb(state domain.IDPConfigState) idp_pb.IDPState {
|
||||
switch state {
|
||||
case domain.IDPConfigStateActive:
|
||||
return idp_pb.IDPState_IDP_STATE_ACTIVE
|
||||
case domain.IDPConfigStateInactive:
|
||||
return idp_pb.IDPState_IDP_STATE_INACTIVE
|
||||
default:
|
||||
return idp_pb.IDPState_IDP_STATE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func ModelIDPStateToPb(state iam_model.IDPConfigState) idp_pb.IDPState {
|
||||
switch state {
|
||||
case iam_model.IDPConfigStateActive:
|
||||
return idp_pb.IDPState_IDP_STATE_ACTIVE
|
||||
case iam_model.IDPConfigStateInactive:
|
||||
return idp_pb.IDPState_IDP_STATE_INACTIVE
|
||||
default:
|
||||
return idp_pb.IDPState_IDP_STATE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func IDPStylingTypeToDomain(stylingType idp_pb.IDPStylingType) domain.IDPConfigStylingType {
|
||||
switch stylingType {
|
||||
case idp_pb.IDPStylingType_STYLING_TYPE_GOOGLE:
|
||||
return domain.IDPConfigStylingTypeGoogle
|
||||
default:
|
||||
return domain.IDPConfigStylingTypeUnspecified
|
||||
}
|
||||
}
|
||||
|
||||
func ModelIDPStylingTypeToPb(stylingType iam_model.IDPStylingType) idp_pb.IDPStylingType {
|
||||
switch stylingType {
|
||||
case iam_model.IDPStylingTypeGoogle:
|
||||
return idp_pb.IDPStylingType_STYLING_TYPE_GOOGLE
|
||||
default:
|
||||
return idp_pb.IDPStylingType_STYLING_TYPE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func IDPStylingTypeToPb(stylingType domain.IDPConfigStylingType) idp_pb.IDPStylingType {
|
||||
switch stylingType {
|
||||
case domain.IDPConfigStylingTypeGoogle:
|
||||
return idp_pb.IDPStylingType_STYLING_TYPE_GOOGLE
|
||||
default:
|
||||
return idp_pb.IDPStylingType_STYLING_TYPE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func ModelIDPViewToConfigPb(config *iam_model.IDPConfigView) *idp_pb.IDP_OidcConfig {
|
||||
return &idp_pb.IDP_OidcConfig{
|
||||
OidcConfig: &idp_pb.OIDCConfig{
|
||||
ClientId: config.OIDCClientID,
|
||||
Issuer: config.OIDCIssuer,
|
||||
Scopes: config.OIDCScopes,
|
||||
DisplayNameMapping: ModelMappingFieldToPb(config.OIDCIDPDisplayNameMapping),
|
||||
UsernameMapping: ModelMappingFieldToPb(config.OIDCUsernameMapping),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func IDPViewToConfigPb(config *domain.IDPConfigView) *idp_pb.IDP_OidcConfig {
|
||||
return &idp_pb.IDP_OidcConfig{
|
||||
OidcConfig: &idp_pb.OIDCConfig{
|
||||
ClientId: config.OIDCClientID,
|
||||
Issuer: config.OIDCIssuer,
|
||||
Scopes: config.OIDCScopes,
|
||||
DisplayNameMapping: MappingFieldToPb(config.OIDCIDPDisplayNameMapping),
|
||||
UsernameMapping: MappingFieldToPb(config.OIDCUsernameMapping),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func OIDCConfigToPb(config *domain.OIDCIDPConfig) *idp_pb.IDP_OidcConfig {
|
||||
return &idp_pb.IDP_OidcConfig{
|
||||
OidcConfig: &idp_pb.OIDCConfig{
|
||||
ClientId: config.ClientID,
|
||||
Issuer: config.Issuer,
|
||||
Scopes: config.Scopes,
|
||||
DisplayNameMapping: MappingFieldToPb(config.IDPDisplayNameMapping),
|
||||
UsernameMapping: MappingFieldToPb(config.UsernameMapping),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func FieldNameToModel(fieldName idp_pb.IDPFieldName) iam_model.IDPConfigSearchKey {
|
||||
switch fieldName {
|
||||
// case admin.IdpSearchKey_IDPSEARCHKEY_IDP_CONFIG_ID: //TODO: not implemented in proto
|
||||
// return iam_model.IDPConfigSearchKeyIdpConfigID
|
||||
case idp_pb.IDPFieldName_IDP_FIELD_NAME_NAME:
|
||||
return iam_model.IDPConfigSearchKeyName
|
||||
default:
|
||||
return iam_model.IDPConfigSearchKeyUnspecified
|
||||
}
|
||||
}
|
||||
|
||||
func ModelMappingFieldToPb(mappingField iam_model.OIDCMappingField) idp_pb.OIDCMappingField {
|
||||
switch mappingField {
|
||||
case iam_model.OIDCMappingFieldEmail:
|
||||
return idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_EMAIL
|
||||
case iam_model.OIDCMappingFieldPreferredLoginName:
|
||||
return idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_PREFERRED_USERNAME
|
||||
default:
|
||||
return idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func MappingFieldToPb(mappingField domain.OIDCMappingField) idp_pb.OIDCMappingField {
|
||||
switch mappingField {
|
||||
case domain.OIDCMappingFieldEmail:
|
||||
return idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_EMAIL
|
||||
case domain.OIDCMappingFieldPreferredLoginName:
|
||||
return idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_PREFERRED_USERNAME
|
||||
default:
|
||||
return idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func MappingFieldToDomain(mappingField idp_pb.OIDCMappingField) domain.OIDCMappingField {
|
||||
switch mappingField {
|
||||
case idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_EMAIL:
|
||||
return domain.OIDCMappingFieldEmail
|
||||
case idp_pb.OIDCMappingField_OIDC_MAPPING_FIELD_PREFERRED_USERNAME:
|
||||
return domain.OIDCMappingFieldPreferredLoginName
|
||||
default:
|
||||
return domain.OIDCMappingFieldUnspecified
|
||||
}
|
||||
}
|
||||
|
||||
func ModelIDPProviderTypeToPb(typ iam_model.IDPProviderType) idp_pb.IDPOwnerType {
|
||||
switch typ {
|
||||
case iam_model.IDPProviderTypeOrg:
|
||||
return idp_pb.IDPOwnerType_IDP_OWNER_TYPE_ORG
|
||||
case iam_model.IDPProviderTypeSystem:
|
||||
return idp_pb.IDPOwnerType_IDP_OWNER_TYPE_SYSTEM
|
||||
default:
|
||||
return idp_pb.IDPOwnerType_IDP_OWNER_TYPE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
func IDPIDQueryToModel(query *idp_pb.IDPIDQuery) *iam_model.IDPConfigSearchQuery {
|
||||
return &iam_model.IDPConfigSearchQuery{
|
||||
Key: iam_model.IDPConfigSearchKeyIdpConfigID, //TODO: whats the difference between idpconfigid and aggregateid search key?
|
||||
Method: domain.SearchMethodEquals,
|
||||
Value: query.Id,
|
||||
}
|
||||
}
|
||||
|
||||
func IDPNameQueryToModel(query *idp_pb.IDPNameQuery) *iam_model.IDPConfigSearchQuery {
|
||||
return &iam_model.IDPConfigSearchQuery{
|
||||
Key: iam_model.IDPConfigSearchKeyName,
|
||||
Method: obj_grpc.TextMethodToModel(query.Method),
|
||||
Value: query.Name,
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user