fixup! fixup! fixup! fixup! fixup! fixup! Merge branch 'main' into org_api

This commit is contained in:
Iraq Jaber
2025-05-08 12:23:36 +02:00
parent 9fe44bdc99
commit 92403be9ac

View File

@@ -19,93 +19,93 @@ import "zitadel/filter/v2beta/filter.proto";
option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2beta;org"; option go_package = "github.com/zitadel/zitadel/pkg/grpc/org/v2beta;org";
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { // option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = {
info: { // info: {
title: "Organization Service"; // title: "Organization Service (Beta)";
version: "2.0-beta"; // version: "2.0-beta";
description: "This API is intended to manage organizations in a ZITADEL instance. This project is in beta state. It can AND will continue breaking until the services provide the same functionality as the current login."; // description: "This API is intended to manage organizations in a ZITADEL instance. This project is in beta state. It can AND will continue breaking until the services provide the same functionality as the current login.";
contact:{ // contact:{
name: "ZITADEL" // name: "ZITADEL"
url: "https://zitadel.com" // url: "https://zitadel.com"
email: "hi@zitadel.com" // email: "hi@zitadel.com"
} // }
license: { // license: {
name: "Apache 2.0", // name: "Apache 2.0",
url: "https://github.com/zitadel/zitadel/blob/main/LICENSING.md"; // url: "https://github.com/zitadel/zitadel/blob/main/LICENSING.md";
}; // };
}; // };
schemes: HTTPS; // schemes: HTTPS;
schemes: HTTP; // schemes: HTTP;
consumes: "application/json"; // consumes: "application/json";
consumes: "application/grpc"; // consumes: "application/grpc";
produces: "application/json"; // produces: "application/json";
produces: "application/grpc"; // produces: "application/grpc";
consumes: "application/grpc-web+proto"; // consumes: "application/grpc-web+proto";
produces: "application/grpc-web+proto"; // produces: "application/grpc-web+proto";
host: "$CUSTOM-DOMAIN"; // host: "$CUSTOM-DOMAIN";
base_path: "/"; // base_path: "/";
external_docs: { // external_docs: {
description: "Detailed information about ZITADEL", // description: "Detailed information about ZITADEL",
url: "https://zitadel.com/docs" // url: "https://zitadel.com/docs"
} // }
security_definitions: { // security_definitions: {
security: { // security: {
key: "OAuth2"; // key: "OAuth2";
value: { // value: {
type: TYPE_OAUTH2; // type: TYPE_OAUTH2;
flow: FLOW_ACCESS_CODE; // flow: FLOW_ACCESS_CODE;
authorization_url: "$CUSTOM-DOMAIN/oauth/v2/authorize"; // authorization_url: "$CUSTOM-DOMAIN/oauth/v2/authorize";
token_url: "$CUSTOM-DOMAIN/oauth/v2/token"; // token_url: "$CUSTOM-DOMAIN/oauth/v2/token";
scopes: { // scopes: {
scope: { // scope: {
key: "openid"; // key: "openid";
value: "openid"; // value: "openid";
} // }
scope: { // scope: {
key: "urn:zitadel:iam:org:project:id:zitadel:aud"; // key: "urn:zitadel:iam:org:project:id:zitadel:aud";
value: "urn:zitadel:iam:org:project:id:zitadel:aud"; // value: "urn:zitadel:iam:org:project:id:zitadel:aud";
} // }
} // }
} // }
} // }
} // }
security: { // security: {
security_requirement: { // security_requirement: {
key: "OAuth2"; // key: "OAuth2";
value: { // value: {
scope: "openid"; // scope: "openid";
scope: "urn:zitadel:iam:org:project:id:zitadel:aud"; // scope: "urn:zitadel:iam:org:project:id:zitadel:aud";
} // }
} // }
} // }
responses: { // responses: {
key: "403"; // key: "403";
value: { // value: {
description: "Returned when the user does not have permission to access the resource."; // description: "Returned when the user does not have permission to access the resource.";
schema: { // schema: {
json_schema: { // json_schema: {
ref: "#/definitions/rpcStatus"; // ref: "#/definitions/rpcStatus";
} // }
} // }
} // }
} // }
responses: { // responses: {
key: "404"; // key: "404";
value: { // value: {
description: "Returned when the resource does not exist."; // description: "Returned when the resource does not exist.";
schema: { // schema: {
json_schema: { // json_schema: {
ref: "#/definitions/rpcStatus"; // ref: "#/definitions/rpcStatus";
} // }
} // }
} // }
} // }
}; // };
service OrganizationService { service OrganizationService {
@@ -659,7 +659,6 @@ message DeleteOrganizationDomainRequest {
string domain = 2 [ string domain = 2 [
(validate.rules).string = {min_len: 1, max_len: 200}, (validate.rules).string = {min_len: 1, max_len: 200},
(google.api.field_behavior) = REQUIRED, (google.api.field_behavior) = REQUIRED,
// repeated ProjectRoleFilter filters = 4;
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
min_length: 1; min_length: 1;
max_length: 200; max_length: 200;
@@ -703,11 +702,13 @@ message GenerateOrganizationDomainValidationRequest {
} }
message GenerateOrganizationDomainValidationResponse { message GenerateOrganizationDomainValidationResponse {
// The token verify domain.
string token = 1 [ string token = 1 [
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"ofSBHsSAVHAoTIE4Iv2gwhaYhTjcY5QX\""; example: "\"ofSBHsSAVHAoTIE4Iv2gwhaYhTjcY5QX\"";
} }
]; ];
// URL used to verify the domain.
string url = 2 [ string url = 2 [
(grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = {
example: "\"https://testdomain.com/.well-known/zitadel-challenge/ofSBHsSAVHAoTIE4Iv2gwhaYhTjcY5QX\""; example: "\"https://testdomain.com/.well-known/zitadel-challenge/ofSBHsSAVHAoTIE4Iv2gwhaYhTjcY5QX\"";
@@ -748,7 +749,9 @@ message VerifyOrganizationDomainResponse {
} }
message Metadata { message Metadata {
// Key in the metadata key/value pair.
string key = 1 [(validate.rules).string = {min_len: 1, max_len: 200}]; string key = 1 [(validate.rules).string = {min_len: 1, max_len: 200}];
// Value in the metadata key/value pair.
bytes value = 2 [(validate.rules).bytes = {min_len: 1, max_len: 500000}]; bytes value = 2 [(validate.rules).bytes = {min_len: 1, max_len: 500000}];
} }
message SetOrganizationMetadataRequest{ message SetOrganizationMetadataRequest{