TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 04:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: user query (#3075)

Browse Source 
* user queries

* user query

* user query

* user tests

* remove old code

* user metadata

* cleanup

* fix merge

* cleanup

* cleanup

* fixes
This commit is contained in:
Livio Amstutz
2022-01-20 15:40:25 +01:00
committed by GitHub
parent 087ef8d31c
commit 44d78df4d4
62 changed files with 2597 additions and 2392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
internal/api/grpc/user/converter.go
View File

@@ -5,26 +5,25 @@ import (
"github.com/caos/zitadel/internal/domain"
"github.com/caos/zitadel/internal/eventstore/v1/models"
"github.com/caos/zitadel/internal/query"
"github.com/caos/zitadel/internal/user/model"
usr_grant_model "github.com/caos/zitadel/internal/usergrant/model"
user_pb "github.com/caos/zitadel/pkg/grpc/user"
)
func UsersToPb(users []*model.UserView) []*user_pb.User {
func UsersToPb(users []*query.User, assetPrefix string) []*user_pb.User {
u := make([]*user_pb.User, len(users))
for i, user := range users {
u[i] = UserToPb(user)
u[i] = UserToPb(user, assetPrefix)
}
return u
}
func UserToPb(user *model.UserView) *user_pb.User {
func UserToPb(user *query.User, assetPrefix string) *user_pb.User {
return &user_pb.User{
Id: user.ID,
State: ModelUserStateToPb(user.State),
UserName: user.UserName,
State: UserStateToPb(user.State),
UserName: user.Username,
LoginNames: user.LoginNames,
PreferredLoginName: user.PreferredLoginName,
Type: UserTypeToPb(user),
Type: UserTypeToPb(user, assetPrefix),
Details: object.ToViewDetailsPb(
user.Sequence,
user.CreationDate,
@@ -34,30 +33,30 @@ func UserToPb(user *model.UserView) *user_pb.User {
}
}
func UserTypeToPb(user *model.UserView) user_pb.UserType {
if user.HumanView != nil {
func UserTypeToPb(user *query.User, assetPrefix string) user_pb.UserType {
if user.Human != nil {
return &user_pb.User_Human{
Human: HumanToPb(user.HumanView),
Human: HumanToPb(user.Human, assetPrefix, user.ResourceOwner),
}
}
if user.MachineView != nil {
if user.Machine != nil {
return &user_pb.User_Machine{
Machine: MachineToPb(user.MachineView),
Machine: MachineToPb(user.Machine),
}
}
return nil
}
func HumanToPb(view *model.HumanView) *user_pb.Human {
func HumanToPb(view *query.Human, assetPrefix, owner string) *user_pb.Human {
return &user_pb.Human{
Profile: &user_pb.Profile{
FirstName: view.FirstName,
LastName: view.LastName,
NickName: view.NickName,
DisplayName: view.DisplayName,
PreferredLanguage: view.PreferredLanguage,
PreferredLanguage: view.PreferredLanguage.String(),
Gender: GenderToPb(view.Gender),
AvatarUrl: view.AvatarURL,
AvatarUrl: domain.AvatarURL(assetPrefix, owner, view.AvatarKey),
},
Email: &user_pb.Email{
Email: view.Email,
@@ -70,14 +69,14 @@ func HumanToPb(view *model.HumanView) *user_pb.Human {
}
}
func MachineToPb(view *model.MachineView) *user_pb.Machine {
func MachineToPb(view *query.Machine) *user_pb.Machine {
return &user_pb.Machine{
Name: view.Name,
Description: view.Description,
}
}
func ProfileToPb(profile *model.Profile) *user_pb.Profile {
func ProfileToPb(profile *query.Profile, assetPrefix string) *user_pb.Profile {
return &user_pb.Profile{
FirstName: profile.FirstName,
LastName: profile.LastName,
@@ -85,35 +84,35 @@ func ProfileToPb(profile *model.Profile) *user_pb.Profile {
DisplayName: profile.DisplayName,
PreferredLanguage: profile.PreferredLanguage.String(),
Gender: GenderToPb(profile.Gender),
AvatarUrl: profile.AvatarURL,
AvatarUrl: domain.AvatarURL(assetPrefix, profile.ResourceOwner, profile.AvatarKey),
}
}
func EmailToPb(email *model.Email) *user_pb.Email {
func EmailToPb(email *query.Email) *user_pb.Email {
return &user_pb.Email{
Email: email.EmailAddress,
IsEmailVerified: email.IsEmailVerified,
Email: email.Email,
IsEmailVerified: email.IsVerified,
}
}
func PhoneToPb(phone *model.Phone) *user_pb.Phone {
func PhoneToPb(phone *query.Phone) *user_pb.Phone {
return &user_pb.Phone{
Phone: phone.PhoneNumber,
IsPhoneVerified: phone.IsPhoneVerified,
Phone: phone.Phone,
IsPhoneVerified: phone.IsVerified,
}
}
func ModelEmailToPb(email *model.Email) *user_pb.Email {
func ModelEmailToPb(email *query.Email) *user_pb.Email {
return &user_pb.Email{
Email: email.EmailAddress,
IsEmailVerified: email.IsEmailVerified,
Email: email.Email,
IsEmailVerified: email.IsVerified,
}
}
func ModelPhoneToPb(phone *model.Phone) *user_pb.Phone {
func ModelPhoneToPb(phone *query.Phone) *user_pb.Phone {
return &user_pb.Phone{
Phone: phone.PhoneNumber,
IsPhoneVerified: phone.IsPhoneVerified,
Phone: phone.Phone,
IsPhoneVerified: phone.IsVerified,
}
}
@@ -130,19 +129,19 @@ func GenderToDomain(gender user_pb.Gender) domain.Gender {
}
}
func ModelUserStateToPb(state model.UserState) user_pb.UserState {
func UserStateToPb(state domain.UserState) user_pb.UserState {
switch state {
case model.UserStateActive:
case domain.UserStateActive:
return user_pb.UserState_USER_STATE_ACTIVE
case model.UserStateInactive:
case domain.UserStateInactive:
return user_pb.UserState_USER_STATE_INACTIVE
case model.UserStateDeleted:
case domain.UserStateDeleted:
return user_pb.UserState_USER_STATE_DELETED
case model.UserStateInitial:
case domain.UserStateInitial:
return user_pb.UserState_USER_STATE_INITIAL
case model.UserStateLocked:
case domain.UserStateLocked:
return user_pb.UserState_USER_STATE_LOCKED
case model.UserStateSuspend:
case domain.UserStateSuspend:
return user_pb.UserState_USER_STATE_SUSPEND
default:
return user_pb.UserState_USER_STATE_UNSPECIFIED
@@ -160,13 +159,13 @@ func ModelUserGrantStateToPb(state usr_grant_model.UserGrantState) user_pb.UserG
}
}
func GenderToPb(gender model.Gender) user_pb.Gender {
func GenderToPb(gender domain.Gender) user_pb.Gender {
switch gender {
case model.GenderDiverse:
case domain.GenderDiverse:
return user_pb.Gender_GENDER_DIVERSE
case model.GenderFemale:
case domain.GenderFemale:
return user_pb.Gender_GENDER_FEMALE
case model.GenderMale:
case domain.GenderMale:
return user_pb.Gender_GENDER_MALE
default:
return user_pb.Gender_GENDER_UNSPECIFIED

120
internal/api/grpc/user/query.go
View File

@@ -2,123 +2,79 @@ package user
import (
"github.com/caos/zitadel/internal/api/grpc/object"
"github.com/caos/zitadel/internal/domain"
user_model "github.com/caos/zitadel/internal/user/model"
"github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/query"
user_pb "github.com/caos/zitadel/pkg/grpc/user"
)
func UserQueriesToModel(queries []*user_pb.SearchQuery) []*user_model.UserSearchQuery {
q := make([]*user_model.UserSearchQuery, len(queries))
func UserQueriesToQuery(queries []*user_pb.SearchQuery) (_ []query.SearchQuery, err error) {
q := make([]query.SearchQuery, len(queries))
for i, query := range queries {
q[i] = UserQueryToModel(query)
q[i], err = UserQueryToQuery(query)
if err != nil {
return nil, err
}
}
return q
return q, nil
}
func UserQueryToModel(query *user_pb.SearchQuery) *user_model.UserSearchQuery {
func UserQueryToQuery(query *user_pb.SearchQuery) (query.SearchQuery, error) {
switch q := query.Query.(type) {
case *user_pb.SearchQuery_UserNameQuery:
return UserNameQueryToModel(q.UserNameQuery)
return UserNameQueryToQuery(q.UserNameQuery)
case *user_pb.SearchQuery_FirstNameQuery:
return FirstNameQueryToModel(q.FirstNameQuery)
return FirstNameQueryToQuery(q.FirstNameQuery)
case *user_pb.SearchQuery_LastNameQuery:
return LastNameQueryToModel(q.LastNameQuery)
return LastNameQueryToQuery(q.LastNameQuery)
case *user_pb.SearchQuery_NickNameQuery:
return NickNameQueryToModel(q.NickNameQuery)
return NickNameQueryToQuery(q.NickNameQuery)
case *user_pb.SearchQuery_DisplayNameQuery:
return DisplayNameQueryToModel(q.DisplayNameQuery)
return DisplayNameQueryToQuery(q.DisplayNameQuery)
case *user_pb.SearchQuery_EmailQuery:
return EmailQueryToModel(q.EmailQuery)
return EmailQueryToQuery(q.EmailQuery)
case *user_pb.SearchQuery_StateQuery:
return StateQueryToModel(q.StateQuery)
return StateQueryToQuery(q.StateQuery)
case *user_pb.SearchQuery_TypeQuery:
return TypeQueryToModel(q.TypeQuery)
return TypeQueryToQuery(q.TypeQuery)
case *user_pb.SearchQuery_ResourceOwner:
return ResourceOwnerQueryToModel(q.ResourceOwner)
return ResourceOwnerQueryToQuery(q.ResourceOwner)
default:
return nil
return nil, errors.ThrowInvalidArgument(nil, "GRPC-vR9nC", "List.Query.Invalid")
}
}
func UserNameQueryToModel(q *user_pb.UserNameQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyUserName,
Method: object.TextMethodToModel(q.Method),
Value: q.UserName,
}
func UserNameQueryToQuery(q *user_pb.UserNameQuery) (query.SearchQuery, error) {
return query.NewUserUsernameSearchQuery(q.UserName, object.TextMethodToQuery(q.Method))
}
func FirstNameQueryToModel(q *user_pb.FirstNameQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyFirstName,
Method: object.TextMethodToModel(q.Method),
Value: q.FirstName,
}
func FirstNameQueryToQuery(q *user_pb.FirstNameQuery) (query.SearchQuery, error) {
return query.NewUserFirstNameSearchQuery(q.FirstName, object.TextMethodToQuery(q.Method))
}
func LastNameQueryToModel(q *user_pb.LastNameQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyLastName,
Method: object.TextMethodToModel(q.Method),
Value: q.LastName,
}
func LastNameQueryToQuery(q *user_pb.LastNameQuery) (query.SearchQuery, error) {
return query.NewUserLastNameSearchQuery(q.LastName, object.TextMethodToQuery(q.Method))
}
func NickNameQueryToModel(q *user_pb.NickNameQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyNickName,
Method: object.TextMethodToModel(q.Method),
Value: q.NickName,
}
func NickNameQueryToQuery(q *user_pb.NickNameQuery) (query.SearchQuery, error) {
return query.NewUserNickNameSearchQuery(q.NickName, object.TextMethodToQuery(q.Method))
}
func DisplayNameQueryToModel(q *user_pb.DisplayNameQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyDisplayName,
Method: object.TextMethodToModel(q.Method),
Value: q.DisplayName,
}
func DisplayNameQueryToQuery(q *user_pb.DisplayNameQuery) (query.SearchQuery, error) {
return query.NewUserDisplayNameSearchQuery(q.DisplayName, object.TextMethodToQuery(q.Method))
}
func EmailQueryToModel(q *user_pb.EmailQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyEmail,
Method: object.TextMethodToModel(q.Method),
Value: q.EmailAddress,
}
func EmailQueryToQuery(q *user_pb.EmailQuery) (query.SearchQuery, error) {
return query.NewUserEmailSearchQuery(q.EmailAddress, object.TextMethodToQuery(q.Method))
}
func StateQueryToModel(q *user_pb.StateQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyState,
Method: domain.SearchMethodEquals,
Value: q.State,
}
func StateQueryToQuery(q *user_pb.StateQuery) (query.SearchQuery, error) {
return query.NewUserStateSearchQuery(int32(q.State))
}
func TypeQueryToModel(q *user_pb.TypeQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyType,
Method: domain.SearchMethodEquals,
Value: UserTypeToModel(q.Type),
}
func TypeQueryToQuery(q *user_pb.TypeQuery) (query.SearchQuery, error) {
return query.NewUserTypeSearchQuery(int32(q.Type))
}
func UserTypeToModel(t user_pb.Type) string {
switch t {
case user_pb.Type_TYPE_HUMAN:
return "human"
case user_pb.Type_TYPE_MACHINE:
return "machine"
default:
return ""
}
}
func ResourceOwnerQueryToModel(q *user_pb.ResourceOwnerQuery) *user_model.UserSearchQuery {
return &user_model.UserSearchQuery{
Key: user_model.UserSearchKeyResourceOwner,
Method: domain.SearchMethodEquals,
Value: q.OrgID,
}
func ResourceOwnerQueryToQuery(q *user_pb.ResourceOwnerQuery) (query.SearchQuery, error) {
return query.NewUserResourceOwnerSearchQuery(q.OrgID, query.TextEquals)
}