mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-21 12:28:46 +00:00
chore: forward port organization v2 API changes (#11207)
# 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]>
This commit is contained in:
co-authored by
Gayathri Vijayan
parent
4c8a668585
commit
5f34d1af8f
@@ -7,10 +7,14 @@ import (
|
||||
|
||||
orgv2 "github.com/zitadel/zitadel/backend/v3/api/org/v2"
|
||||
"github.com/zitadel/zitadel/internal/api/authz"
|
||||
"github.com/zitadel/zitadel/internal/api/grpc/filter/v2"
|
||||
"github.com/zitadel/zitadel/internal/api/grpc/metadata/v2"
|
||||
"github.com/zitadel/zitadel/internal/api/grpc/object/v2"
|
||||
"github.com/zitadel/zitadel/internal/config/systemdefaults"
|
||||
"github.com/zitadel/zitadel/internal/domain"
|
||||
"github.com/zitadel/zitadel/internal/query"
|
||||
"github.com/zitadel/zitadel/internal/zerrors"
|
||||
filter_pb "github.com/zitadel/zitadel/pkg/grpc/filter/v2"
|
||||
"github.com/zitadel/zitadel/pkg/grpc/org/v2"
|
||||
)
|
||||
|
||||
@@ -33,6 +37,81 @@ func (s *Server) ListOrganizations(ctx context.Context, req *connect.Request[org
|
||||
}), nil
|
||||
}
|
||||
|
||||
func (s *Server) ListOrganizationMetadata(ctx context.Context, request *connect.Request[org.ListOrganizationMetadataRequest]) (*connect.Response[org.ListOrganizationMetadataResponse], error) {
|
||||
metadataQueries, err := listOrgMetadataToDomain(s.systemDefaults, request.Msg)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
res, err := s.query.SearchOrgMetadata(ctx, true, request.Msg.GetOrganizationId(), metadataQueries, false, true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return connect.NewResponse(&org.ListOrganizationMetadataResponse{
|
||||
Metadata: metadata.OrgMetadataListToPb(res.Metadata),
|
||||
Pagination: &filter_pb.PaginationResponse{
|
||||
TotalResult: res.Count,
|
||||
AppliedLimit: uint64(request.Msg.GetPagination().GetLimit()),
|
||||
},
|
||||
}), nil
|
||||
}
|
||||
|
||||
func (s *Server) ListOrganizationDomains(ctx context.Context, req *connect.Request[org.ListOrganizationDomainsRequest]) (*connect.Response[org.ListOrganizationDomainsResponse], error) {
|
||||
queries, err := listOrgDomainsRequestToDomain(s.systemDefaults, req.Msg)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
orgIDQuery, err := query.NewOrgDomainOrgIDSearchQuery(req.Msg.GetOrganizationId())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
queries.Queries = append(queries.Queries, orgIDQuery)
|
||||
|
||||
domains, err := s.query.SearchOrgDomains(ctx, queries, false, true)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return connect.NewResponse(&org.ListOrganizationDomainsResponse{
|
||||
Domains: domainsToPb(domains.Domains),
|
||||
Pagination: &filter_pb.PaginationResponse{
|
||||
TotalResult: domains.Count,
|
||||
AppliedLimit: uint64(req.Msg.GetPagination().GetLimit()),
|
||||
},
|
||||
}), nil
|
||||
}
|
||||
|
||||
func listOrgDomainsRequestToDomain(systemDefaults systemdefaults.SystemDefaults, request *org.ListOrganizationDomainsRequest) (*query.OrgDomainSearchQueries, error) {
|
||||
offset, limit, asc, err := filter.PaginationPbToQuery(systemDefaults, request.Pagination)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
queries, err := DomainQueriesToModel(request.Filters)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &query.OrgDomainSearchQueries{
|
||||
SearchRequest: query.SearchRequest{
|
||||
Offset: offset,
|
||||
Limit: limit,
|
||||
Asc: asc,
|
||||
SortingColumn: fieldNameToOrganizationDomainColumn(request.GetSortingColumn()),
|
||||
},
|
||||
Queries: queries,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func fieldNameToOrganizationDomainColumn(column org.DomainFieldName) query.Column {
|
||||
switch column {
|
||||
case org.DomainFieldName_DOMAIN_FIELD_NAME_NAME:
|
||||
return query.OrgDomainDomainCol
|
||||
case org.DomainFieldName_DOMAIN_FIELD_NAME_CREATION_DATE:
|
||||
return query.OrgDomainCreationDateCol
|
||||
case org.DomainFieldName_DOMAIN_FIELD_NAME_UNSPECIFIED:
|
||||
return query.Column{}
|
||||
default:
|
||||
return query.Column{}
|
||||
}
|
||||
}
|
||||
|
||||
func listOrgRequestToModel(ctx context.Context, req *connect.Request[org.ListOrganizationsRequest]) (*connect.Response[query.OrgSearchQueries], error) {
|
||||
offset, limit, asc := object.ListQueryToQuery(req.Msg.Query)
|
||||
queries, err := orgQueriesToQuery(ctx, req.Msg.Queries)
|
||||
@@ -112,6 +191,8 @@ func fieldNameToOrganizationColumn(fieldName org.OrganizationFieldName) query.Co
|
||||
switch fieldName {
|
||||
case org.OrganizationFieldName_ORGANIZATION_FIELD_NAME_NAME:
|
||||
return query.OrgColumnName
|
||||
case org.OrganizationFieldName_ORGANIZATION_FIELD_NAME_CREATION_DATE:
|
||||
return query.OrgColumnCreationDate
|
||||
case org.OrganizationFieldName_ORGANIZATION_FIELD_NAME_UNSPECIFIED:
|
||||
return query.Column{}
|
||||
default:
|
||||
@@ -141,3 +222,73 @@ func organizationToPb(organization *query.Org) *org.Organization {
|
||||
State: orgStateToPb(organization.State),
|
||||
}
|
||||
}
|
||||
|
||||
func listOrgMetadataToDomain(systemDefaults systemdefaults.SystemDefaults, request *org.ListOrganizationMetadataRequest) (*query.OrgMetadataSearchQueries, error) {
|
||||
offset, limit, asc, err := filter.PaginationPbToQuery(systemDefaults, request.Pagination)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
queries, err := metadata.OrgMetadataQueriesToQuery(request.GetFilters())
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &query.OrgMetadataSearchQueries{
|
||||
SearchRequest: query.SearchRequest{
|
||||
Offset: offset,
|
||||
Limit: limit,
|
||||
Asc: asc,
|
||||
},
|
||||
Queries: queries,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func DomainQueriesToModel(queries []*org.DomainSearchFilter) (_ []query.SearchQuery, err error) {
|
||||
q := make([]query.SearchQuery, len(queries))
|
||||
for i, query := range queries {
|
||||
q[i], err = DomainQueryToModel(query)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
return q, nil
|
||||
}
|
||||
|
||||
func DomainQueryToModel(searchQuery *org.DomainSearchFilter) (query.SearchQuery, error) {
|
||||
switch q := searchQuery.Filter.(type) {
|
||||
case *org.DomainSearchFilter_DomainFilter:
|
||||
return query.NewOrgDomainDomainSearchQuery(object.TextMethodToQuery(q.DomainFilter.Method), q.DomainFilter.GetDomain())
|
||||
default:
|
||||
return nil, zerrors.ThrowInvalidArgument(nil, "ORG-Ags89", "List.Query.Invalid")
|
||||
}
|
||||
}
|
||||
|
||||
func domainsToPb(domains []*query.Domain) []*org.Domain {
|
||||
d := make([]*org.Domain, len(domains))
|
||||
for i, domain := range domains {
|
||||
d[i] = domainToPb(domain)
|
||||
}
|
||||
return d
|
||||
}
|
||||
|
||||
func domainToPb(d *query.Domain) *org.Domain {
|
||||
return &org.Domain{
|
||||
OrganizationId: d.OrgID,
|
||||
Domain: d.Domain,
|
||||
IsVerified: d.IsVerified,
|
||||
IsPrimary: d.IsPrimary,
|
||||
ValidationType: domainValidationTypeToPb(d.ValidationType),
|
||||
}
|
||||
}
|
||||
|
||||
func domainValidationTypeToPb(validationType domain.OrgDomainValidationType) org.DomainValidationType {
|
||||
switch validationType {
|
||||
case domain.OrgDomainValidationTypeDNS:
|
||||
return org.DomainValidationType_DOMAIN_VALIDATION_TYPE_DNS
|
||||
case domain.OrgDomainValidationTypeHTTP:
|
||||
return org.DomainValidationType_DOMAIN_VALIDATION_TYPE_HTTP
|
||||
case domain.OrgDomainValidationTypeUnspecified:
|
||||
return org.DomainValidationType_DOMAIN_VALIDATION_TYPE_UNSPECIFIED
|
||||
default:
|
||||
return org.DomainValidationType_DOMAIN_VALIDATION_TYPE_UNSPECIFIED
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user