mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-20 14:34:25 +00:00
5f34d1af8f
# Which Problems Are Solved Recent changes to the v2beta and v2 API of the organization service were directly merged to the `next` branch and release on v4.x, since the ongoing move to the relation table, blocked it from being merged into main. # How the Problems Are Solved This PR ports the following changes into main: - fix(api): correct permission check in organization v2beta service: https://github.com/zitadel/zitadel/commit/8dcfff97ed52a8b9fc77ecb1f972744f42cff3ed - fix(actions v1): return org metadata again (https://github.com/zitadel/zitadel/pull/11040) - feat(api): move organization api (https://github.com/zitadel/zitadel/pull/11045) # Additional Changes None # Additional Context relates to #10772 --------- Co-authored-by: Gayathri Vijayan <[email protected]>
85 lines
2.6 KiB
Go
85 lines
2.6 KiB
Go
package metadata
|
|
|
|
import (
|
|
"google.golang.org/protobuf/types/known/timestamppb"
|
|
|
|
filter_v2 "github.com/zitadel/zitadel/internal/api/grpc/filter/v2"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
meta_pb "github.com/zitadel/zitadel/pkg/grpc/metadata/v2"
|
|
)
|
|
|
|
func UserMetadataListToPb(dataList []*query.UserMetadata) []*meta_pb.Metadata {
|
|
mds := make([]*meta_pb.Metadata, len(dataList))
|
|
for i, data := range dataList {
|
|
mds[i] = UserMetadataToPb(data)
|
|
}
|
|
return mds
|
|
}
|
|
|
|
func UserMetadataToPb(data *query.UserMetadata) *meta_pb.Metadata {
|
|
return &meta_pb.Metadata{
|
|
Key: data.Key,
|
|
Value: data.Value,
|
|
CreationDate: timestamppb.New(data.CreationDate),
|
|
ChangeDate: timestamppb.New(data.ChangeDate),
|
|
}
|
|
}
|
|
|
|
func UserMetadataFiltersToQuery(queries []*meta_pb.MetadataSearchFilter) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = UserMetadataFilterToQuery(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func UserMetadataFilterToQuery(filter *meta_pb.MetadataSearchFilter) (query.SearchQuery, error) {
|
|
switch q := filter.Filter.(type) {
|
|
case *meta_pb.MetadataSearchFilter_KeyFilter:
|
|
return query.NewUserMetadataKeySearchQuery(q.KeyFilter.Key, filter_v2.TextMethodPbToQuery(q.KeyFilter.Method))
|
|
default:
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "METAD-fdg23", "List.Query.Invalid")
|
|
}
|
|
}
|
|
|
|
func OrgMetadataListToPb(dataList []*query.OrgMetadata) []*meta_pb.Metadata {
|
|
mds := make([]*meta_pb.Metadata, len(dataList))
|
|
for i, data := range dataList {
|
|
mds[i] = OrgMetadataToPb(data)
|
|
}
|
|
return mds
|
|
}
|
|
|
|
func OrgMetadataToPb(data *query.OrgMetadata) *meta_pb.Metadata {
|
|
return &meta_pb.Metadata{
|
|
Key: data.Key,
|
|
Value: data.Value,
|
|
CreationDate: timestamppb.New(data.CreationDate),
|
|
ChangeDate: timestamppb.New(data.ChangeDate),
|
|
}
|
|
}
|
|
|
|
func OrgMetadataQueriesToQuery(queries []*meta_pb.MetadataSearchFilter) (_ []query.SearchQuery, err error) {
|
|
q := make([]query.SearchQuery, len(queries))
|
|
for i, query := range queries {
|
|
q[i], err = OrgMetadataFilterToQuery(query)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
return q, nil
|
|
}
|
|
|
|
func OrgMetadataFilterToQuery(filter *meta_pb.MetadataSearchFilter) (query.SearchQuery, error) {
|
|
switch q := filter.Filter.(type) {
|
|
case *meta_pb.MetadataSearchFilter_KeyFilter:
|
|
return query.NewOrgMetadataKeySearchQuery(q.KeyFilter.Key, filter_v2.TextMethodPbToQuery(q.KeyFilter.Method))
|
|
default:
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "METAD-fdg23", "List.Query.Invalid")
|
|
}
|
|
}
|