mirror of
https://github.com/zitadel/zitadel.git
synced 2025-03-01 17:04:22 +00:00
b664ffe993
Update the ../proto/zitadel/member.proto to include the UserResourceOwner as part of member. Update the queries to include UserResourceOwner for the following : zitadel/internal/query/iam_member.go zitadel/internal/query/org_member.go zitadel/internal/query/project_member.go zitadel/internal/query/project_grant_member.go Non Breaking Changes # Which Problems Are Solved https://github.com/zitadel/zitadel/issues/5062 # How the Problems Are Solved - Updated the member.proto file to include user_resource_owner. I have compiled using` make compile` command . - Changed the queries to include the userResourceOwner as part of Member. - Then, updated the converter to map the userResourceOwner. # Additional Changes Replace this example text with a concise list of additional changes that this PR introduces, that are not directly solving the initial problem but are related. For example: - The docs explicitly describe that the property XY is mandatory - Adds missing translations for validations. # Additional Context - Closes #5062 - https://discordapp.com/channels/927474939156643850/1326245856193544232/1326476710752948316
66 lines
2.2 KiB
Go
66 lines
2.2 KiB
Go
package member
|
|
|
|
import (
|
|
"github.com/zitadel/zitadel/internal/api/grpc/object"
|
|
"github.com/zitadel/zitadel/internal/api/grpc/user"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
member_pb "github.com/zitadel/zitadel/pkg/grpc/member"
|
|
)
|
|
|
|
func MembersToPb(assetAPIPrefix string, members []*query.Member) []*member_pb.Member {
|
|
m := make([]*member_pb.Member, len(members))
|
|
for i, member := range members {
|
|
m[i] = MemberToPb(assetAPIPrefix, member)
|
|
}
|
|
return m
|
|
}
|
|
|
|
func MemberToPb(assetAPIPrefix string, m *query.Member) *member_pb.Member {
|
|
return &member_pb.Member{
|
|
UserId: m.UserID,
|
|
Roles: m.Roles,
|
|
PreferredLoginName: m.PreferredLoginName,
|
|
Email: m.Email,
|
|
FirstName: m.FirstName,
|
|
LastName: m.LastName,
|
|
DisplayName: m.DisplayName,
|
|
AvatarUrl: domain.AvatarURL(assetAPIPrefix, m.ResourceOwner, m.AvatarURL),
|
|
UserType: user.TypeToPb(m.UserType),
|
|
Details: object.ToViewDetailsPb(
|
|
m.Sequence,
|
|
m.CreationDate,
|
|
m.ChangeDate,
|
|
m.ResourceOwner,
|
|
),
|
|
UserResourceOwner: m.UserResourceOwner,
|
|
}
|
|
}
|
|
|
|
func MemberQueriesToQuery(queries []*member_pb.SearchQuery) (q []query.SearchQuery, err error) {
|
|
q = make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = MemberQueryToMember(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func MemberQueryToMember(search *member_pb.SearchQuery) (query.SearchQuery, error) {
|
|
switch q := search.Query.(type) {
|
|
case *member_pb.SearchQuery_EmailQuery:
|
|
return query.NewMemberEmailSearchQuery(object.TextMethodToQuery(q.EmailQuery.Method), q.EmailQuery.Email)
|
|
case *member_pb.SearchQuery_FirstNameQuery:
|
|
return query.NewMemberFirstNameSearchQuery(object.TextMethodToQuery(q.FirstNameQuery.Method), q.FirstNameQuery.FirstName)
|
|
case *member_pb.SearchQuery_LastNameQuery:
|
|
return query.NewMemberLastNameSearchQuery(object.TextMethodToQuery(q.LastNameQuery.Method), q.LastNameQuery.LastName)
|
|
case *member_pb.SearchQuery_UserIdQuery:
|
|
return query.NewMemberUserIDSearchQuery(q.UserIdQuery.UserId)
|
|
default:
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "MEMBE-7Bb92", "Errors.Query.InvalidRequest")
|
|
}
|
|
}
|