refactor: use new protoc plugin for api v2 (#5798)

* refactor: use new protoc plugin for api v2

* simplify code
This commit is contained in:
Livio Spring
2023-05-04 10:50:19 +02:00
committed by GitHub
parent e772ae55ab
commit f1534c0c4c
9 changed files with 252 additions and 17 deletions

View File

@@ -0,0 +1,26 @@
syntax = "proto3";
package zitadel.protoc_gen_zitadel.v2;
import "google/protobuf/descriptor.proto";
option go_package = "github.com/zitadel/zitadel/pkg/grpc/protoc/v2;protoc";
extend google.protobuf.MethodOptions {
Options options = 50001;
}
message Options {
AuthOption auth_option = 1;
CustomHTTPResponse http_response = 2;
}
message AuthOption {
reserved 2;
string permission = 1;
string org_field = 3;
}
message CustomHTTPResponse {
int32 success_code = 1;
}

View File

@@ -2,7 +2,8 @@ syntax = "proto3";
package zitadel.session.v2alpha;
import "zitadel/options.proto";
import "zitadel/protoc_gen_zitadel/v2/options.proto";
import "zitadel/session/v2alpha/session.proto";
import "google/api/annotations.proto";
import "validate/validate.proto";
@@ -19,8 +20,10 @@ service SessionService {
get: "/v2alpha/sessions/{id}"
};
option (zitadel.v1.auth_option) = {
permission: "authenticated"
option (zitadel.protoc_gen_zitadel.v2.options) = {
auth_option: {
permission: "authenticated"
}
};
}
}

View File

@@ -2,8 +2,8 @@ syntax = "proto3";
package zitadel.user.v2alpha;
import "zitadel/options.proto";
import "zitadel/object/v2alpha/object.proto";
import "zitadel/protoc_gen_zitadel/v2/options.proto";
import "zitadel/user/v2alpha/email.proto";
import "zitadel/user/v2alpha/password.proto";
import "zitadel/user/v2alpha/user.proto";
@@ -82,8 +82,14 @@ service UserService {
body: "*"
};
option (zitadel.v1.auth_option) = {
permission: "user.write"
option (zitadel.protoc_gen_zitadel.v2.options) = {
auth_option: {
permission: "user.write"
org_field: "organisation"
}
http_response: {
success_code: 201
}
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
@@ -105,8 +111,10 @@ service UserService {
body: "*"
};
option (zitadel.v1.auth_option) = {
permission: "authenticated"
option (zitadel.protoc_gen_zitadel.v2.options) = {
auth_option: {
permission: "authenticated"
}
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {
@@ -128,8 +136,10 @@ service UserService {
body: "*"
};
option (zitadel.v1.auth_option) = {
permission: "authenticated"
option (zitadel.protoc_gen_zitadel.v2.options) = {
auth_option: {
permission: "authenticated"
}
};
option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_operation) = {