fixup! Merge branch 'main' into org_api

This commit is contained in:
Iraq Jaber
2025-05-07 13:36:50 +02:00
parent 7383c24931
commit 25d4f1af78
8 changed files with 117 additions and 84 deletions

View File

@@ -45,7 +45,7 @@ enum OrgFieldName {
ORG_FIELD_NAME_CREATION_DATE = 2;
}
message OrgQuery {
message OrgQueryFilter {
oneof query {
option (validate.required) = true;

View File

@@ -15,6 +15,7 @@ import "google/protobuf/struct.proto";
import "protoc-gen-openapiv2/options/annotations.proto";
import "validate/validate.proto";
import "google/protobuf/timestamp.proto";
import "zitadel/filter/v2beta/filter.proto";
option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2beta;org";
@@ -488,21 +489,21 @@ message ListOrganizationsRequest {
json_schema: {
description: "Search query for lists";
required: ["query"]
};
};
};
// list limitations and ordering
zitadel.object.v2beta.ListQuery query = 1;
// List limitations and ordering.
optional zitadel.filter.v2beta.PaginationRequest pagination = 1;
// the field the result is sorted
zitadel.org.v2beta.OrgFieldName sorting_column = 2;
//criteria the client is looking for
repeated zitadel.org.v2beta.OrgQuery queries = 3;
// Define the criteria to query for.
// repeated ProjectRoleFilter filters = 4;
repeated zitadel.org.v2beta.OrgQueryFilter filter = 3;
}
message ListOrganizationsResponse {
zitadel.object.v2beta.ListDetails details = 1;
zitadel.org.v2beta.OrgFieldName sorting_column = 2;
repeated zitadel.org.v2beta.Organization result = 3;
zitadel.filter.v2beta.PaginationResponse pagination = 1;
repeated zitadel.org.v2beta.Organization result = 2;
}
message DeleteOrganizationRequest {
@@ -613,14 +614,15 @@ message ListOrganizationDomainsRequest {
description: "Organization ID of the organization you want the domains of."
}
];
//list limitations and ordering
zitadel.object.v2beta.ListQuery query = 2;
//criteria the client is looking for
repeated DomainSearchQuery queries = 3;
// List limitations and ordering.
optional zitadel.filter.v2beta.PaginationRequest pagination = 2;
// Define the criteria to query for.
repeated DomainSearchQuery filter = 3;
}
message ListOrganizationDomainsResponse {
zitadel.object.v2beta.ListDetails details = 1;
zitadel.filter.v2beta.PaginationResponse pagination = 1;
repeated Domain result = 2;
}
@@ -638,6 +640,7 @@ message DeleteOrganizationDomainRequest {
string domain = 2 [
(validate.rules).string = {min_len: 1, max_len: 200},
(google.api.field_behavior) = REQUIRED,
// repeated ProjectRoleFilter filters = 4;
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
min_length: 1;
max_length: 200;
@@ -746,17 +749,25 @@ message SetOrganizationMetadataResponse{
}
message ListOrganizationMetadataRequest {
string id = 1;
zitadel.object.v2beta.ListQuery query = 2;
repeated zitadel.metadata.v2beta.MetadataQuery queries = 3 [
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
title: "Medata Query"
description: "Metadata object-specific queries."
}];
// Organization ID
string id = 1 [
(validate.rules).string = {min_len: 1, max_len: 200},
(google.api.field_behavior) = REQUIRED,
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
min_length: 1;
max_length: 200;
example: "\"69629012906488334\"";
}
];
// List limitations and ordering.
optional zitadel.filter.v2beta.PaginationRequest pagination = 2;
// Define the criteria to query for.
repeated zitadel.metadata.v2beta.MetadataQuery filter = 3;
}
message ListOrganizationMetadataResponse {
zitadel.object.v2beta.ListDetails details = 1;
zitadel.filter.v2beta.PaginationResponse pagination = 1;
repeated zitadel.metadata.v2beta.Metadata result = 2;
}