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>
2025-08-11 21:07:31 +00:00 · 2021-03-09 10:30:11 +01:00
parent 9f417f3957
commit dabd5920dc
372 changed files with 17881 additions and 22036 deletions
--- a/internal/api/grpc/user/user_grant.go
+++ b/internal/api/grpc/user/user_grant.go
@@ -0,0 +1,185 @@
+package user
+
+import (
+	"github.com/caos/zitadel/internal/api/grpc/object"
+	"github.com/caos/zitadel/internal/domain"
+	usr_grant_model "github.com/caos/zitadel/internal/usergrant/model"
+	user_pb "github.com/caos/zitadel/pkg/grpc/user"
+)
+
+func UserGrantsToPb(grants []*usr_grant_model.UserGrantView) []*user_pb.UserGrant {
+	u := make([]*user_pb.UserGrant, len(grants))
+	for i, grant := range grants {
+		u[i] = UserGrantToPb(grant)
+	}
+	return u
+}
+
+func UserGrantToPb(grant *usr_grant_model.UserGrantView) *user_pb.UserGrant {
+	return &user_pb.UserGrant{
+		GrantId:     grant.ID,
+		UserId:      grant.UserID,
+		State:       ModelUserGrantStateToPb(grant.State),
+		RoleKeys:    grant.RoleKeys,
+		UserName:    grant.UserName,
+		FirstName:   grant.FirstName,
+		LastName:    grant.LastName,
+		Email:       grant.Email,
+		DisplayName: grant.DisplayName,
+		OrgId:       grant.ResourceOwner,
+		OrgDomain:   grant.OrgPrimaryDomain,
+		OrgName:     grant.OrgName,
+		ProjectId:   grant.ProjectID,
+		ProjectName: grant.ProjectName,
+		Details: object.ToDetailsPb(
+			grant.Sequence,
+			grant.ChangeDate,
+			grant.ResourceOwner,
+		),
+	}
+}
+
+func UserGrantQueriesToModel(queries []*user_pb.UserGrantQuery) []*usr_grant_model.UserGrantSearchQuery {
+	q := make([]*usr_grant_model.UserGrantSearchQuery, len(queries))
+	for i, query := range queries {
+		q[i] = UserGrantQueryToModel(query)
+	}
+	return q
+}
+
+func UserGrantQueryToModel(query *user_pb.UserGrantQuery) *usr_grant_model.UserGrantSearchQuery {
+	switch q := query.Query.(type) {
+	case *user_pb.UserGrantQuery_DisplayNameQuery:
+		return UserGrantDisplayNameQueryToModel(q.DisplayNameQuery)
+	case *user_pb.UserGrantQuery_EmailQuery:
+		return UserGrantEmailQueryToModel(q.EmailQuery)
+	case *user_pb.UserGrantQuery_FirstNameQuery:
+		return UserGrantFirstNameQueryToModel(q.FirstNameQuery)
+	case *user_pb.UserGrantQuery_LastNameQuery:
+		return UserGrantLastNameQueryToModel(q.LastNameQuery)
+	case *user_pb.UserGrantQuery_OrgDomainQuery:
+		return UserGrantOrgDomainQueryToModel(q.OrgDomainQuery)
+	case *user_pb.UserGrantQuery_OrgNameQuery:
+		return UserGrantOrgNameQueryToModel(q.OrgNameQuery)
+	case *user_pb.UserGrantQuery_ProjectGrantIdQuery:
+		return UserGrantProjectGrantIDQueryToModel(q.ProjectGrantIdQuery)
+	case *user_pb.UserGrantQuery_ProjectIdQuery:
+		return UserGrantProjectIDQueryToModel(q.ProjectIdQuery)
+	case *user_pb.UserGrantQuery_ProjectNameQuery:
+		return UserGrantProjectNameQueryToModel(q.ProjectNameQuery)
+	case *user_pb.UserGrantQuery_RoleKeyQuery:
+		return UserGrantRoleKeyQueryToModel(q.RoleKeyQuery)
+	case *user_pb.UserGrantQuery_UserIdQuery:
+		return UserGrantUserIDQueryToModel(q.UserIdQuery)
+	case *user_pb.UserGrantQuery_UserNameQuery:
+		return UserGrantUserNameQueryToModel(q.UserNameQuery)
+	case *user_pb.UserGrantQuery_WithGrantedQuery:
+		return UserGrantWithGrantedQueryToModel(q.WithGrantedQuery)
+	default:
+		return nil
+	}
+}
+
+func UserGrantDisplayNameQueryToModel(q *user_pb.UserGrantDisplayNameQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyDisplayName,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.DisplayName,
+	}
+}
+
+func UserGrantEmailQueryToModel(q *user_pb.UserGrantEmailQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyEmail,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.Email,
+	}
+}
+
+func UserGrantFirstNameQueryToModel(q *user_pb.UserGrantFirstNameQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyFirstName,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.FirstName,
+	}
+}
+
+func UserGrantLastNameQueryToModel(q *user_pb.UserGrantLastNameQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyLastName,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.LastName,
+	}
+}
+
+func UserGrantOrgDomainQueryToModel(q *user_pb.UserGrantOrgDomainQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyOrgDomain,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.OrgDomain,
+	}
+}
+
+func UserGrantOrgNameQueryToModel(q *user_pb.UserGrantOrgNameQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyOrgName,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.OrgName,
+	}
+}
+
+func UserGrantProjectIDQueryToModel(q *user_pb.UserGrantProjectIDQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyProjectID,
+		Method: domain.SearchMethodEquals,
+		Value:  q.ProjectId,
+	}
+}
+
+func UserGrantProjectGrantIDQueryToModel(q *user_pb.UserGrantProjectGrantIDQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyGrantID,
+		Method: domain.SearchMethodEquals,
+		Value:  q.ProjectGrantId,
+	}
+}
+
+func UserGrantProjectNameQueryToModel(q *user_pb.UserGrantProjectNameQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyProjectName,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.ProjectName,
+	}
+}
+
+func UserGrantRoleKeyQueryToModel(q *user_pb.UserGrantRoleKeyQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyRoleKey,
+		Method: domain.SearchMethodListContains,
+		Value:  q.RoleKey,
+	}
+}
+
+func UserGrantUserIDQueryToModel(q *user_pb.UserGrantUserIDQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyUserID,
+		Method: domain.SearchMethodEquals,
+		Value:  q.UserId,
+	}
+}
+
+func UserGrantUserNameQueryToModel(q *user_pb.UserGrantUserNameQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyUserName,
+		Method: object.TextMethodToModel(q.Method),
+		Value:  q.UserName,
+	}
+}
+
+func UserGrantWithGrantedQueryToModel(q *user_pb.UserGrantWithGrantedQuery) *usr_grant_model.UserGrantSearchQuery {
+	return &usr_grant_model.UserGrantSearchQuery{
+		Key:    usr_grant_model.UserGrantSearchKeyWithGranted,
+		Method: domain.SearchMethodEquals,
+		Value:  q.WithGranted,
+	}
+}